diff --git a/docs/help.md b/docs/help.md
index 90ff7f4..fa4bbec 100644
--- a/docs/help.md
+++ b/docs/help.md
@@ -30,6 +30,7 @@ pwcli
 │   └── testservers (ts)
 │       ├── create (c) ................................ d ts c
 │       ├── delete (d) ................................ d ts d
+│       ├── grab (g) .................................. d ts g
 │       ├── status (s) ................................ d ts s
 │       └── update (u) ................................ d ts u
 │
@@ -132,6 +133,14 @@ Deployment and test server management
 ##### **testservers** (alias: `ts`) - Deploy to testservers
 - **create** (alias: `c`) - Create new testserver on AWS
 - **delete** (alias: `d`) - Choose a testserver to delete
+- **grab** (alias: `g`) - Auto-pick a free testserver and update it with your current branch
+  - Picks the "most free" server using this priority: branch is `master` → issue closed → last commit >1 month → no linked issue. Excludes named servers (`-ingrid`, `-usa`) and failed/in-progress stacks.
+  - If your branch is already deployed on a server, exits early with the URL.
+  - If no free servers are found, prints the full status table.
+  - Flags:
+    - `--dry-run` - Show which server would be picked and why, without deploying
+    - `--skip-confirm` / `-y` - Skip the confirmation prompt
+    - `--json` - Output result in JSON format (implies `--skip-confirm`)
 - **status** (alias: `s`) - Show status for available testservers
   - Flags:
     - `--json` - Output status information in JSON format (non-interactive)
@@ -146,6 +155,9 @@ Deployment and test server management
 - `pwcli d ts s` - View testserver status (interactive)
 - `pwcli d ts s --json` - View testserver status as JSON
 - `pwcli d ts c` - Create new testserver
+- `pwcli d ts g` - Auto-grab a free testserver with your current branch
+- `pwcli d ts g --dry-run` - Preview which server would be grabbed and why
+- `pwcli d ts g --skip-confirm` - Grab without confirmation prompt
 - `pwcli d ts u` - Update existing testserver (interactive)
 - `pwcli d ts u --branch feature/123 --stack test-01` - Update test-01 with feature/123 branch (with confirmation)
 - `pwcli d ts u --branch feature/123 --stack test-01 --skip-confirm` - Update without confirmation
diff --git a/readme.md b/readme.md
index 980d0aa..e659120 100644
--- a/readme.md
+++ b/readme.md
@@ -21,6 +21,7 @@ Run commands interactively with prompts and menus:
 
 ```bash
 pwcli              # Open interactive menu
+pwcli d ts g       # Auto-grab a free testserver with your current branch
 pwcli d ts u       # Update testserver with interactive prompts
 pwcli d ts s       # View testserver status in table format
 ```