diff --git a/README.md b/README.md
index a8075e7..5a540d8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # veb
 
-Headless browser automation CLI for agents and humans. Full Playwright parity.
+Headless browser automation CLI for agents and humans.
 
 ## Installation
 
@@ -10,447 +10,253 @@ npx playwright install chromium
 pnpm build
 ```
 
-## Usage
+## Quick Start
 
 ```bash
-# Navigation
-veb open https://example.com
-veb back                         # Go back
-veb forward                      # Go forward  
-veb reload                       # Reload page
-
-# Page info
-veb url                          # Get current URL
-veb title                        # Get page title
-
-# Clicking
-veb click "#submit-btn"
-veb dblclick "#item"
-veb tap "#mobile-btn"            # Touch tap
-
-# Form input
-veb type "#search" "query"           # Type character by character
-veb fill "#email" "test@example.com" # Clear and fill (faster)
-veb check "#agree"                   # Check checkbox/radio
-veb uncheck "#newsletter"            # Uncheck checkbox
-veb select "#country" "US"           # Select dropdown
-veb clear-input "#field"             # Clear input field
-veb setvalue "#hidden" "val"         # Set value directly
-
-# Keyboard
-veb press Enter
-veb press Tab
-veb press "Control+a"                # Keyboard shortcuts
-veb press "Shift+Tab"
-
-# Mouse
-veb hover "#menu"
-veb focus "#input"
-veb drag "#source" "#target"
-veb wheel 300                        # Scroll wheel (deltaY)
-veb wheel 0 100                      # Scroll wheel (deltaX, deltaY)
-veb mousemove 100 200                # Move mouse to coordinates
-veb mousedown                        # Press mouse button
-veb mouseup                          # Release mouse button
-veb mousedown right                  # Right-click down
-
-# Text operations
-veb selectall "#input"               # Select all text
-veb clipboard copy                   # Copy to clipboard
-veb clipboard paste                  # Paste from clipboard
-veb clipboard read                   # Read clipboard content
-
-# File upload
-veb upload "#file-input" ./document.pdf
-veb upload "#files" ./a.png ./b.png
-
-# Downloads
-veb download "#download-btn" ./file.zip
-
-# Waiting
-veb wait "#loading"              # Wait for selector
-veb wait --text "Welcome"        # Wait for text
-veb wait 2000                    # Wait 2 seconds
-veb waitforurl "**/dashboard"    # Wait for URL pattern
-veb waitforload networkidle      # Wait for network idle
-veb waitforload domcontentloaded # Wait for DOM ready
-
-# Screenshots & PDF
+veb open example.com
+veb click "#submit"
+veb fill "#email" "test@example.com"
+veb get text "h1"
 veb screenshot page.png
-veb screenshot --full page.png   # Full page
-veb screenshot -s "#hero"        # Specific element
-veb pdf report.pdf
-
-# Content extraction
-veb snapshot                     # Accessibility tree (best for agents)
-veb extract "#main"              # Get HTML
-veb eval "document.title"        # Run JavaScript
-veb innertext "#message"         # Get inner text
-veb innerhtml "#container"       # Get inner HTML
-veb inputvalue "#field"          # Get input value
-
-# Element info
-veb gettext "#message"           # Get text content
-veb getattr "#link" "href"       # Get attribute
-veb isvisible "#modal"           # Check visibility
-veb isenabled "#submit"          # Check if enabled
-veb ischecked "#checkbox"        # Check if checked
-veb count ".items"               # Count matching elements
-veb boundingbox "#element"       # Get position/size
-veb highlight "#element"         # Highlight element (debugging)
-
-# Scrolling
-veb scroll down 500
-veb scroll up
-veb scroll -s "#container" down
-
-# Semantic locators (Playwright's recommended approach)
-veb role button click --name "Submit"
-veb role textbox fill "hello" --name "Email"
-veb text "Sign In" click
-veb text "Submit" click --exact
-veb label "Email" fill "test@test.com"
-veb placeholder "Search..." fill "query"
-veb alt "Logo" click              # By alt text
-veb bytitle "Close" click         # By title attribute
-veb testid "submit-btn" click     # By data-testid
-
-# Nth element (when multiple match)
-veb first "a" click               # Click first link
-veb last "a" click                # Click last link
-veb nth "a" 2 click               # Click 3rd link (0-indexed)
-veb first ".item" text            # Get text of first item
-
-# Frames/iframes
-veb frame "#iframe"              # Switch to iframe
-veb mainframe                    # Switch back to main
-
-# Network interception
-veb route "**/*.png" --abort                    # Block images
-veb route "**/api/*" --body '{"mock":true}'     # Mock API
-veb unroute                                      # Remove all routes
-veb requests                                     # View tracked requests
-veb requests --filter "api"                      # Filter requests
-
-# Browser settings
-veb viewport 1920 1080           # Set viewport size
-veb device "iPhone 14"           # Emulate device
-veb geolocation 37.7749 -122.4194  # Set location (SF)
-veb permissions grant geolocation notifications
-veb media --dark                 # Dark mode
-veb media --light                # Light mode
-veb media --print                # Print media type
-veb media --reduced-motion       # Reduced motion
-veb offline                      # Enable offline mode
-veb offline off                  # Disable offline mode
-veb headers '{"X-Custom":"value"}'  # Set extra headers
-veb credentials user pass        # HTTP basic auth
-veb timezone America/New_York    # Set timezone (at launch)
-veb locale fr-FR                 # Set locale (at launch)
-
-# Cookies
-veb cookies                      # Get all cookies
-veb cookies set '[{"name":"session","value":"abc123","domain":".example.com"}]'
-veb cookies clear
-
-# Storage
-veb storage local                # Get all localStorage
-veb storage local myKey          # Get specific key
-veb storage local set key value  # Set value
-veb storage local clear          # Clear localStorage
-veb storage session              # sessionStorage (same commands)
-
-# Dialogs (alerts, confirms, prompts)
-veb dialog accept                # Accept next dialog
-veb dialog accept "input text"   # Accept prompt with text
-veb dialog dismiss               # Dismiss next dialog
-
-# Debugging & Tracing
-veb trace start                  # Start recording trace
-veb trace start --screenshots    # With screenshots
-veb trace stop ./trace.zip       # Stop and save trace
-veb state save ./auth.json       # Save cookies/storage
-veb state load ./auth.json       # Load saved state
-veb console                      # View console messages
-veb console --clear              # Clear console
-veb errors                       # View page errors
-veb errors --clear               # Clear errors
-veb pause                        # Pause (opens inspector)
-
-# Inject scripts/styles
-veb addscript "console.log('hi')"
-veb addscript https://example.com/lib.js
-veb addstyle "body { background: red; }"
-veb addstyle https://example.com/styles.css
-veb setcontent '<h1>Hello</h1>'  # Set page HTML directly
-
-# Custom events
-veb dispatch "#btn" "click"
-veb dispatch "#input" "focus"
-
-# Tabs
-veb tab new
-veb tab list
-veb tab 0                        # Switch to tab
-veb tab close
-
-# Windows
-veb window new
-
-# Sessions (isolate multiple agents)
-veb --session agent1 open example.com
-veb --session agent2 open google.com
-VEB_SESSION=agent1 veb click "#btn"
-veb session list
-
-# Close browser
 veb close
 ```
 
-## Agent Mode
+## Commands
 
-Use `--json` flag for machine-readable output:
+### Core Commands
 
 ```bash
-veb snapshot --json
-veb eval "document.title" --json
-veb isvisible "#modal" --json
+veb open <url>              # Navigate to URL
+veb click <sel>             # Click element
+veb type <sel> <text>       # Type into element
+veb fill <sel> <text>       # Clear and fill
+veb press <key>             # Press key (Enter, Tab, Control+a)
+veb hover <sel>             # Hover element
+veb select <sel> <val>      # Select dropdown option
+veb check <sel>             # Check checkbox
+veb uncheck <sel>           # Uncheck checkbox
+veb scroll <dir> [px]       # Scroll (up/down/left/right)
+veb drag <src> <tgt>        # Drag and drop
+veb upload <sel> <files>    # Upload files
+veb screenshot [path]       # Take screenshot (--full for full page)
+veb pdf <path>              # Save as PDF
+veb snapshot                # Accessibility tree (best for AI)
+veb eval <js>               # Run JavaScript
+veb close                   # Close browser
 ```
 
-## All Commands
+### Get Info
 
-### Navigation
-| Command | Description |
-|---------|-------------|
-| `open <url>` | Navigate to URL |
-| `back` | Go back |
-| `forward` | Go forward |
-| `reload` | Reload page |
-| `url` | Get current URL |
-| `title` | Get page title |
+```bash
+veb get text <sel>          # Get text content
+veb get html <sel>          # Get innerHTML
+veb get value <sel>         # Get input value
+veb get attr <sel> <attr>   # Get attribute
+veb get title               # Get page title
+veb get url                 # Get current URL
+veb get count <sel>         # Count matching elements
+veb get box <sel>           # Get bounding box
+```
 
-### Interaction
-| Command | Description |
-|---------|-------------|
-| `click <selector>` | Click element |
-| `dblclick <selector>` | Double-click |
-| `tap <selector>` | Touch tap |
-| `type <selector> <text>` | Type text |
-| `fill <selector> <value>` | Clear & fill |
-| `press <key>` | Press key |
-| `check <selector>` | Check checkbox |
-| `uncheck <selector>` | Uncheck |
-| `select <selector> <value>` | Select option |
-| `hover <selector>` | Hover |
-| `focus <selector>` | Focus |
-| `drag <src> <target>` | Drag & drop |
-| `wheel [deltaY] [deltaX]` | Mouse wheel |
-| `clear-input <selector>` | Clear input |
-| `setvalue <selector> <val>` | Set value |
-| `selectall <selector>` | Select all text |
-| `upload <selector> <files>` | Upload files |
-| `download <selector> <path>` | Download file |
-| `scroll <dir> [amount]` | Scroll |
-| `clipboard copy\|paste\|read` | Clipboard ops |
+### Check State
 
-### Element Info
-| Command | Description |
-|---------|-------------|
-| `gettext <selector>` | Get text content |
-| `innertext <selector>` | Get inner text |
-| `innerhtml <selector>` | Get inner HTML |
-| `inputvalue <selector>` | Get input value |
-| `getattr <selector> <attr>` | Get attribute |
-| `isvisible <selector>` | Check visibility |
-| `isenabled <selector>` | Check enabled |
-| `ischecked <selector>` | Check checked |
-| `count <selector>` | Count elements |
-| `boundingbox <selector>` | Get bounds |
-| `highlight <selector>` | Highlight element |
+```bash
+veb is visible <sel>        # Check if visible
+veb is enabled <sel>        # Check if enabled
+veb is checked <sel>        # Check if checked
+```
 
-### Semantic Locators
-| Command | Description |
-|---------|-------------|
-| `role <role> <action>` | By ARIA role |
-| `text <text> <action>` | By text |
-| `label <label> <action>` | By label |
-| `placeholder <ph> <action>` | By placeholder |
-| `alt <text> <action>` | By alt text |
-| `bytitle <text> <action>` | By title attr |
-| `testid <id> <action>` | By data-testid |
-| `first <sel> <action>` | First match |
-| `last <sel> <action>` | Last match |
-| `nth <sel> <n> <action>` | Nth match |
+### Find Elements (Semantic Locators)
 
-### Content & Screenshots
-| Command | Description |
-|---------|-------------|
-| `screenshot [path]` | Screenshot |
-| `pdf <path>` | Save as PDF |
-| `snapshot` | Accessibility tree |
-| `extract <selector>` | Get HTML |
-| `setcontent <html>` | Set page HTML |
-| `eval <script>` | Run JavaScript |
-| `wait <sel\|text\|ms>` | Wait |
-| `waitforurl <pattern>` | Wait for URL |
-| `waitforload <state>` | Wait for load |
+```bash
+veb find role <role> <action> [value]       # By ARIA role
+veb find text <text> <action>               # By text content
+veb find label <label> <action> [value]     # By label
+veb find placeholder <ph> <action> [value]  # By placeholder
+veb find alt <text> <action>                # By alt text
+veb find title <text> <action>              # By title attr
+veb find testid <id> <action> [value]       # By data-testid
+veb find first <sel> <action> [value]       # First match
+veb find last <sel> <action> [value]        # Last match
+veb find nth <n> <sel> <action> [value]     # Nth match
+```
 
-### Network
-| Command | Description |
-|---------|-------------|
-| `route <url> [options]` | Intercept requests |
-| `unroute [url]` | Remove routes |
-| `requests [--filter]` | View requests |
+**Actions:** `click`, `fill`, `check`, `hover`, `text`
 
-### Browser Settings
-| Command | Description |
-|---------|-------------|
-| `viewport <w> <h>` | Set viewport |
-| `device <name>` | Emulate device |
-| `geolocation <lat> <lng>` | Set location |
-| `permissions grant\|deny` | Set permissions |
-| `media [options]` | Emulate media |
-| `offline [on\|off]` | Offline mode |
-| `headers <json>` | Extra HTTP headers |
-| `credentials <u> <p>` | HTTP basic auth |
-| `timezone <tz>` | Set timezone |
-| `locale <locale>` | Set locale |
+**Examples:**
+```bash
+veb find role button click --name "Submit"
+veb find text "Sign In" click
+veb find label "Email" fill "test@test.com"
+veb find first ".item" click
+veb find nth 2 "a" text
+```
+
+### Wait
+
+```bash
+veb wait <selector>         # Wait for element
+veb wait <ms>               # Wait for time
+veb wait --text "Welcome"   # Wait for text
+veb wait --url "**/dash"    # Wait for URL pattern
+veb wait --load networkidle # Wait for load state
+```
+
+**Load states:** `load`, `domcontentloaded`, `networkidle`
 
 ### Mouse Control
-| Command | Description |
-|---------|-------------|
-| `mousemove <x> <y>` | Move mouse |
-| `mousedown [button]` | Press button |
-| `mouseup [button]` | Release button |
 
-### Browser State
-| Command | Description |
-|---------|-------------|
-| `cookies` | Get cookies |
-| `cookies set <json>` | Set cookies |
-| `cookies clear` | Clear cookies |
-| `storage local [key]` | localStorage |
-| `storage session [key]` | sessionStorage |
-| `dialog accept\|dismiss` | Handle dialogs |
-| `state save <path>` | Save auth state |
-| `state load <path>` | Load auth state |
+```bash
+veb mouse move <x> <y>      # Move mouse
+veb mouse down [button]     # Press button (left/right/middle)
+veb mouse up [button]       # Release button
+veb mouse wheel <dy> [dx]   # Scroll wheel
+```
 
-### Debugging & Tracing
-| Command | Description |
-|---------|-------------|
-| `trace start` | Start trace recording |
-| `trace stop <path>` | Stop & save trace |
-| `console` | View console messages |
-| `console --clear` | Clear console |
-| `errors` | View page errors |
-| `errors --clear` | Clear errors |
-| `pause` | Open inspector |
-| `highlight <sel>` | Highlight element |
+### Browser Settings
 
-### Script Injection
-| Command | Description |
-|---------|-------------|
-| `addscript <url\|code>` | Add script |
-| `addstyle <url\|code>` | Add stylesheet |
-| `dispatch <sel> <event>` | Dispatch event |
+```bash
+veb set viewport <w> <h>    # Set viewport size
+veb set device <name>       # Emulate device ("iPhone 14")
+veb set geo <lat> <lng>     # Set geolocation
+veb set offline [on|off]    # Toggle offline mode
+veb set headers <json>      # Extra HTTP headers
+veb set credentials <u> <p> # HTTP basic auth
+veb set media [dark|light|print]  # Emulate media
+```
 
-### Frames & Tabs
-| Command | Description |
-|---------|-------------|
-| `frame <selector>` | Switch to frame |
-| `mainframe` | Back to main |
-| `tab new` | New tab |
-| `tab list` | List tabs |
-| `tab <index>` | Switch tab |
-| `tab close [index]` | Close tab |
-| `window new` | New window |
+### Cookies & Storage
 
-### Session & Control
-| Command | Description |
-|---------|-------------|
-| `session` | Show session |
-| `session list` | List sessions |
-| `close` | Close browser |
+```bash
+veb cookies                 # Get all cookies
+veb cookies set <json>      # Set cookies
+veb cookies clear           # Clear cookies
+
+veb storage local           # Get all localStorage
+veb storage local <key>     # Get specific key
+veb storage local set <k> <v>  # Set value
+veb storage local clear     # Clear all
+
+veb storage session         # Same for sessionStorage
+```
+
+### Network
+
+```bash
+veb network route <url>              # Intercept requests
+veb network route <url> --abort      # Block requests
+veb network route <url> --body <json>  # Mock response
+veb network unroute [url]            # Remove routes
+veb network requests                 # View tracked requests
+veb network requests --filter api    # Filter requests
+```
+
+### Tabs & Windows
+
+```bash
+veb tab                     # List tabs
+veb tab new                 # New tab
+veb tab <n>                 # Switch to tab n
+veb tab close [n]           # Close tab
+veb window new              # New window
+```
+
+### Frames
+
+```bash
+veb frame <sel>             # Switch to iframe
+veb frame main              # Back to main frame
+```
+
+### Dialogs
+
+```bash
+veb dialog accept [text]    # Accept (with optional prompt text)
+veb dialog dismiss          # Dismiss
+```
+
+### Debug
+
+```bash
+veb trace start             # Start recording trace
+veb trace stop <path>       # Stop and save trace
+veb console                 # View console messages
+veb console --clear         # Clear console
+veb errors                  # View page errors
+veb highlight <sel>         # Highlight element
+veb state save <path>       # Save auth state
+veb state load <path>       # Load auth state
+```
+
+### Navigation
+
+```bash
+veb back                    # Go back
+veb forward                 # Go forward
+veb reload                  # Reload page
+```
+
+### Sessions
+
+```bash
+veb session                 # Show current session
+veb session list            # List active sessions
+```
 
 ## Options
 
 | Option | Description |
 |--------|-------------|
-| `--session <name>` | Use isolated session |
-| `--json` | JSON output |
+| `--session <name>` | Use isolated session (or `VEB_SESSION` env) |
+| `--json` | JSON output (for agents) |
 | `--full, -f` | Full page screenshot |
-| `--selector, -s` | Target element |
 | `--name, -n` | Locator name filter |
 | `--exact` | Exact text match |
-| `--text, -t` | Wait for text |
-| `--abort` | Abort route |
-| `--body` | Route response body |
-| `--filter` | Filter requests |
-| `--clear` | Clear console/errors |
-| `--screenshots` | Include screenshots in trace |
-| `--dark` | Dark color scheme |
-| `--light` | Light color scheme |
-| `--print` | Print media type |
-| `--reduced-motion` | Reduced motion |
 | `--debug` | Debug output |
 
-## Device Emulation
-
-```bash
-# Mobile devices
-veb device "iPhone 14"
-veb device "iPhone 14 Pro Max"
-veb device "Pixel 7"
-veb device "Galaxy S23"
-
-# Tablets
-veb device "iPad Pro 11"
-veb device "Galaxy Tab S8"
-
-# Desktop
-veb viewport 1920 1080
-veb viewport 2560 1440
-```
-
 ## Sessions
 
-Sessions allow multiple agents to use veb simultaneously without interfering:
+Run multiple isolated browser instances:
 
 ```bash
-# Using --session flag
-veb --session agent1 open https://site-a.com
-veb --session agent2 open https://site-b.com
+# Different sessions
+veb --session agent1 open site-a.com
+veb --session agent2 open site-b.com
 
-# Using environment variable
-export VEB_SESSION=agent1
-veb open https://example.com
+# Or via environment
+VEB_SESSION=agent1 veb click "#btn"
 
-# List all running sessions
+# List all
 veb session list
-
-# Close a specific session
-veb --session agent1 close
 ```
 
 ## Selectors
 
-veb supports all Playwright selectors:
-
 ```bash
 # CSS
 veb click "#id"
 veb click ".class"
-veb click "div.container > button"
+veb click "div > button"
 
 # Text
-veb click "text=Click me"
+veb click "text=Submit"
 
 # XPath
-veb click "xpath=//button[@type='submit']"
+veb click "xpath=//button"
 
 # Semantic (recommended)
-veb role button click --name "Submit"
-veb label "Email" fill "test@test.com"
+veb find role button click --name "Submit"
+veb find label "Email" fill "test@test.com"
+```
+
+## Agent Mode
+
+Use `--json` for machine-readable output:
+
+```bash
+veb snapshot --json
+veb get text "h1" --json
+veb is visible ".modal" --json
 ```
 
 ## License
diff --git a/src/index.ts b/src/index.ts
index 67b618b..b721ed8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,37 +5,32 @@ import * as path from 'path';
 import { send, setDebug, setSession, getSession } from './client.js';
 import type { Response } from './types.js';
 
-/**
- * List all active veb sessions
- */
+// ============================================================================
+// Utilities
+// ============================================================================
+
 function listSessions(): string[] {
   const tmpDir = os.tmpdir();
   try {
     const files = fs.readdirSync(tmpDir);
     const sessions: string[] = [];
-    
     for (const file of files) {
       const match = file.match(/^veb-(.+)\.pid$/);
       if (match) {
         const pidFile = path.join(tmpDir, file);
         try {
           const pid = parseInt(fs.readFileSync(pidFile, 'utf8').trim(), 10);
-          // Check if process is still running
           process.kill(pid, 0);
           sessions.push(match[1]);
-        } catch {
-          // Process not running, ignore
-        }
+        } catch { /* Process not running */ }
       }
     }
-    
     return sessions;
   } catch {
     return [];
   }
 }
 
-// ANSI colors
 const colors = {
   reset: '\x1b[0m',
   bold: '\x1b[1m',
@@ -43,141 +38,97 @@ const colors = {
   red: '\x1b[31m',
   green: '\x1b[32m',
   yellow: '\x1b[33m',
-  blue: '\x1b[34m',
-  magenta: '\x1b[35m',
   cyan: '\x1b[36m',
 };
 
 const c = (color: keyof typeof colors, text: string) => `${colors[color]}${text}${colors.reset}`;
 
-function printHelp(): void {
-  console.log(`
-${c('bold', 'veb')} - headless browser automation for agents and humans
-
-${c('yellow', 'Usage:')}
-  veb <command> [options]
-
-${c('yellow', 'Commands:')}
-  ${c('cyan', 'open')} <url>                    Open a URL in the browser
-  ${c('cyan', 'click')} <selector>              Click an element
-  ${c('cyan', 'dblclick')} <selector>           Double-click an element
-  ${c('cyan', 'type')} <selector> <text>        Type text into an element
-  ${c('cyan', 'fill')} <selector> <value>       Clear and fill input
-  ${c('cyan', 'press')} <key>                   Press a keyboard key
-  ${c('cyan', 'check')} <selector>              Check a checkbox/radio
-  ${c('cyan', 'uncheck')} <selector>            Uncheck a checkbox
-  ${c('cyan', 'select')} <selector> <value>     Select dropdown option
-  ${c('cyan', 'hover')} <selector>              Hover over an element
-  ${c('cyan', 'focus')} <selector>              Focus an element
-  ${c('cyan', 'drag')} <source> <target>        Drag and drop
-  ${c('cyan', 'upload')} <selector> <file...>   Upload files
-  ${c('cyan', 'wait')} <selector|text|ms>       Wait for element, text, or duration
-  ${c('cyan', 'screenshot')} [path]             Take a screenshot
-  ${c('cyan', 'pdf')} <path>                    Save page as PDF
-  ${c('cyan', 'snapshot')}                      Get accessibility tree (for agents)
-  ${c('cyan', 'extract')} <selector>            Extract element content
-  ${c('cyan', 'eval')} <script>                 Evaluate JavaScript
-  ${c('cyan', 'scroll')} <direction> [amount]   Scroll the page
-  ${c('cyan', 'close')}                         Close browser and stop daemon
-
-${c('yellow', 'Locator Commands:')}
-  ${c('cyan', 'role')} <role> click|fill|check  Find by ARIA role
-  ${c('cyan', 'text')} <text> click|hover       Find by text content
-  ${c('cyan', 'label')} <label> click|fill      Find by label
-  ${c('cyan', 'placeholder')} <ph> click|fill   Find by placeholder
-
-${c('yellow', 'Frame Commands:')}
-  ${c('cyan', 'frame')} <selector>              Switch to iframe
-  ${c('cyan', 'mainframe')}                     Switch back to main frame
-
-${c('yellow', 'Cookie Commands:')}
-  ${c('cyan', 'cookies')}                       Get all cookies
-  ${c('cyan', 'cookies set')} <json>            Set cookies
-  ${c('cyan', 'cookies clear')}                 Clear all cookies
-
-${c('yellow', 'Storage Commands:')}
-  ${c('cyan', 'storage local')} [key]           Get localStorage
-  ${c('cyan', 'storage local set')} <k> <v>     Set localStorage
-  ${c('cyan', 'storage local clear')}           Clear localStorage
-  ${c('cyan', 'storage session')} [key]         Get sessionStorage
-  ${c('cyan', 'storage session set')} <k> <v>   Set sessionStorage
-  ${c('cyan', 'storage session clear')}         Clear sessionStorage
-
-${c('yellow', 'Dialog Commands:')}
-  ${c('cyan', 'dialog accept')} [text]          Accept next dialog
-  ${c('cyan', 'dialog dismiss')}                Dismiss next dialog
-
-${c('yellow', 'Navigation:')}
-  ${c('cyan', 'back')}                          Go back
-  ${c('cyan', 'forward')}                       Go forward
-  ${c('cyan', 'reload')}                        Reload page
-  ${c('cyan', 'url')}                           Get current URL
-  ${c('cyan', 'title')}                         Get page title
-
-${c('yellow', 'Element Info:')}
-  ${c('cyan', 'gettext')} <selector>            Get element text
-  ${c('cyan', 'getattr')} <selector> <attr>     Get attribute value
-  ${c('cyan', 'isvisible')} <selector>          Check if visible
-  ${c('cyan', 'isenabled')} <selector>          Check if enabled
-  ${c('cyan', 'ischecked')} <selector>          Check if checked
-  ${c('cyan', 'count')} <selector>              Count matching elements
-  ${c('cyan', 'boundingbox')} <selector>        Get element bounds
-
-${c('yellow', 'Network:')}
-  ${c('cyan', 'route')} <url> [--abort]         Intercept requests
-  ${c('cyan', 'route')} <url> --body <json>     Mock response
-  ${c('cyan', 'unroute')} [url]                 Remove route(s)
-  ${c('cyan', 'requests')} [--filter url]       Get tracked requests
-
-${c('yellow', 'Browser Settings:')}
-  ${c('cyan', 'viewport')} <width> <height>     Set viewport size
-  ${c('cyan', 'device')} <name>                 Emulate device
-  ${c('cyan', 'geolocation')} <lat> <lng>       Set location
-  ${c('cyan', 'permissions')} grant|deny <...>  Set permissions
-
-${c('yellow', 'Downloads:')}
-  ${c('cyan', 'download')} <selector> <path>    Download file
-
-${c('yellow', 'Tab/Window Commands:')}
-  ${c('cyan', 'tab new')}                       Open a new tab
-  ${c('cyan', 'tab list')}                      List all open tabs
-  ${c('cyan', 'tab')} <index>                   Switch to tab by index
-  ${c('cyan', 'tab close')} [index]             Close tab (current if no index)
-  ${c('cyan', 'window new')}                    Open a new window
-
-${c('yellow', 'Session Commands:')}
-  ${c('cyan', 'session')}                       Show current session name
-  ${c('cyan', 'session list')}                  List all active sessions
-
-${c('yellow', 'Options:')}
-  --session <name>              Use isolated browser session (or VEB_SESSION env)
-  --json                        Output raw JSON (for agents)
-  --selector, -s <sel>          Target specific element
-  --text, -t                    Wait for text instead of selector
-  --full, -f                    Full page screenshot
-  --debug                       Show debug output
-  --help, -h                    Show help
-
-${c('yellow', 'Examples:')}
-  veb open https://example.com
-  veb click "#submit-btn"
-  veb type "#email" "hello@example.com"
-  veb wait --text "Welcome"
-  veb wait 2000
-  veb screenshot --full page.png
-  veb extract "table" --json
-  veb eval "document.title"
-  veb scroll down 500
-  veb tab new
-  veb tab list
-  veb tab 0
-`);
-}
-
 function genId(): string {
   return Math.random().toString(36).slice(2, 10);
 }
 
+function err(msg: string): never {
+  console.error(c('red', 'Error:'), msg);
+  process.exit(1);
+}
+
+// ============================================================================
+// Help
+// ============================================================================
+
+function printHelp(): void {
+  console.log(`
+${c('bold', 'veb')} - headless browser automation
+
+${c('yellow', 'Usage:')} veb <command> [options]
+
+${c('yellow', 'Core Commands:')}
+  ${c('cyan', 'open')} <url>                 Navigate to URL
+  ${c('cyan', 'click')} <sel>                Click element
+  ${c('cyan', 'type')} <sel> <text>          Type into element
+  ${c('cyan', 'fill')} <sel> <text>          Clear and fill
+  ${c('cyan', 'press')} <key>                Press key (Enter, Tab, Control+a)
+  ${c('cyan', 'hover')} <sel>                Hover element
+  ${c('cyan', 'select')} <sel> <val>         Select dropdown option
+  ${c('cyan', 'scroll')} <dir> [px]          Scroll (up/down/left/right)
+  ${c('cyan', 'wait')} <sel|ms>              Wait for element or time
+  ${c('cyan', 'screenshot')} [path]          Take screenshot
+  ${c('cyan', 'snapshot')}                   Accessibility tree (for AI)
+  ${c('cyan', 'eval')} <js>                  Run JavaScript
+  ${c('cyan', 'close')}                      Close browser
+
+${c('yellow', 'Get Info:')}  veb get <what> [selector]
+  text, html, value, attr, title, url, count, box
+
+${c('yellow', 'Check State:')}  veb is <what> <selector>
+  visible, enabled, checked
+
+${c('yellow', 'Find Elements:')}  veb find <locator> <action> [value]
+  role, text, label, placeholder, alt, title, testid, first, last, nth
+
+${c('yellow', 'Mouse:')}  veb mouse <action> [args]
+  move <x> <y>, down, up, wheel <dy>
+
+${c('yellow', 'Storage:')}
+  ${c('cyan', 'cookies')} [get|set|clear]    Manage cookies
+  ${c('cyan', 'storage')} <local|session>    Manage web storage
+
+${c('yellow', 'Browser:')}  veb set <setting> [value]
+  viewport, device, geo, offline, headers, credentials
+
+${c('yellow', 'Network:')}  veb network <action>
+  route, unroute, requests
+
+${c('yellow', 'Tabs:')}
+  ${c('cyan', 'tab')} [new|list|close|<n>]   Manage tabs
+
+${c('yellow', 'Debug:')}
+  ${c('cyan', 'trace')} start|stop <path>    Record trace
+  ${c('cyan', 'console')}                    View console logs
+  ${c('cyan', 'errors')}                     View page errors
+
+${c('yellow', 'Options:')}
+  --session <name>    Isolated session (or VEB_SESSION env)
+  --json              JSON output
+  --full, -f          Full page screenshot
+  --debug             Debug output
+
+${c('yellow', 'Examples:')}
+  veb open example.com
+  veb click "#submit"
+  veb fill "#email" "test@example.com"
+  veb get text "h1"
+  veb is visible ".modal"
+  veb find role button click --name Submit
+  veb wait 2000
+  veb wait --load networkidle
+`);
+}
+
+// ============================================================================
+// Response Printing
+// ============================================================================
+
 function printResponse(response: Response, jsonMode: boolean): void {
   if (jsonMode) {
     console.log(JSON.stringify(response));
@@ -191,64 +142,20 @@ function printResponse(response: Response, jsonMode: boolean): void {
   
   const data = response.data as Record<string, unknown>;
   
-  // Pretty print based on data type
   if (data.url && data.title) {
     console.log(c('green', '✓'), c('bold', data.title as string));
     console.log(c('dim', `  ${data.url}`));
-  } else if (data.url && !data.title) {
-    console.log(data.url);
-  } else if (data.title && !data.url) {
-    console.log(data.title);
-  } else if (data.html) {
-    console.log(data.html);
-  } else if (data.snapshot) {
-    console.log(data.snapshot);
-  } else if (data.result !== undefined) {
-    const result = data.result;
-    if (typeof result === 'object') {
-      console.log(JSON.stringify(result, null, 2));
-    } else {
-      console.log(result);
-    }
-  } else if (data.base64) {
-    console.log(c('green', '✓'), 'Screenshot captured (base64)');
-    console.log(c('dim', `  ${(data.base64 as string).length} bytes`));
-  } else if (data.path) {
-    console.log(c('green', '✓'), `Saved to ${data.path}`);
-  } else if (data.cookies) {
-    // Cookies get
-    const cookies = data.cookies as Array<{ name: string; value: string; domain?: string }>;
-    if (cookies.length === 0) {
-      console.log(c('dim', 'No cookies'));
-    } else {
-      cookies.forEach(cookie => {
-        console.log(`${c('cyan', cookie.name)}: ${cookie.value}`);
-        if (cookie.domain) console.log(c('dim', `  domain: ${cookie.domain}`));
-      });
-    }
-  } else if (data.data) {
-    // Storage get (all)
-    const storage = data.data as Record<string, string>;
-    const keys = Object.keys(storage);
-    if (keys.length === 0) {
-      console.log(c('dim', 'Empty storage'));
-    } else {
-      keys.forEach(key => {
-        console.log(`${c('cyan', key)}: ${storage[key]}`);
-      });
-    }
-  } else if (data.value !== undefined && data.key) {
-    // Storage get (single key)
-    console.log(data.value ?? c('dim', 'null'));
-  } else if (data.uploaded) {
-    const files = data.uploaded as string[];
-    console.log(c('green', '✓'), `Uploaded ${files.length} file(s)`);
-  } else if (data.handler) {
-    console.log(c('green', '✓'), `Dialog handler set to ${data.response}`);
   } else if (data.text !== undefined) {
     console.log(data.text ?? c('dim', 'null'));
-  } else if (data.attribute !== undefined) {
+  } else if (data.html !== undefined) {
+    console.log(data.html);
+  } else if (data.value !== undefined) {
     console.log(data.value ?? c('dim', 'null'));
+  } else if (data.result !== undefined) {
+    const result = data.result;
+    console.log(typeof result === 'object' ? JSON.stringify(result, null, 2) : result);
+  } else if (data.snapshot) {
+    console.log(data.snapshot);
   } else if (data.visible !== undefined) {
     console.log(data.visible ? c('green', 'true') : c('red', 'false'));
   } else if (data.enabled !== undefined) {
@@ -259,1215 +166,684 @@ function printResponse(response: Response, jsonMode: boolean): void {
     console.log(data.count);
   } else if (data.box) {
     const box = data.box as { x: number; y: number; width: number; height: number };
-    console.log(`x: ${box.x}, y: ${box.y}, width: ${box.width}, height: ${box.height}`);
-  } else if (data.requests) {
-    const reqs = data.requests as Array<{ url: string; method: string; resourceType: string }>;
-    if (reqs.length === 0) {
-      console.log(c('dim', 'No requests tracked'));
-    } else {
-      reqs.forEach(req => {
-        console.log(`${c('cyan', req.method)} ${req.url}`);
-        console.log(c('dim', `  ${req.resourceType}`));
-      });
-    }
-  } else if (data.routed) {
-    console.log(c('green', '✓'), `Route added: ${data.routed}`);
-  } else if (data.unrouted) {
-    console.log(c('green', '✓'), `Route removed: ${data.unrouted}`);
-  } else if (data.device) {
-    const vp = data.viewport as { width: number; height: number };
-    console.log(c('green', '✓'), `Emulating ${data.device}`);
-    console.log(c('dim', `  Viewport: ${vp.width}x${vp.height}`));
-  } else if (data.latitude !== undefined) {
-    console.log(c('green', '✓'), `Location set to ${data.latitude}, ${data.longitude}`);
-  } else if (data.width !== undefined && data.height !== undefined) {
-    console.log(c('green', '✓'), `Viewport: ${data.width}x${data.height}`);
-  } else if (data.suggestedFilename) {
-    console.log(c('green', '✓'), `Downloaded: ${data.suggestedFilename}`);
-    console.log(c('dim', `  Saved to: ${data.path}`));
-  } else if (data.clicked || data.typed || data.pressed || data.hovered || data.scrolled || data.selected || data.waited || data.filled || data.checked || data.unchecked || data.focused || data.dragged || data.switched || data.set || data.cleared) {
-    console.log(c('green', '✓'), 'Done');
-  } else if (data.launched) {
-    console.log(c('green', '✓'), 'Browser launched');
-  } else if (data.closed === true) {
-    console.log(c('green', '✓'), 'Browser closed');
+    console.log(`x:${box.x} y:${box.y} w:${box.width} h:${box.height}`);
+  } else if (data.url) {
+    console.log(data.url);
+  } else if (data.title) {
+    console.log(data.title);
+  } else if (data.base64) {
+    console.log(c('green', '✓'), 'Screenshot captured');
+  } else if (data.path) {
+    console.log(c('green', '✓'), `Saved: ${data.path}`);
+  } else if (data.cookies) {
+    const cookies = data.cookies as Array<{ name: string; value: string }>;
+    if (cookies.length === 0) console.log(c('dim', 'No cookies'));
+    else cookies.forEach(ck => console.log(`${c('cyan', ck.name)}: ${ck.value}`));
   } else if (data.tabs) {
-    // Tab list
     const tabs = data.tabs as Array<{ index: number; url: string; title: string; active: boolean }>;
-    tabs.forEach(tab => {
-      const marker = tab.active ? c('green', '→') : ' ';
-      const idx = c('cyan', `[${tab.index}]`);
-      const title = tab.title || c('dim', '(untitled)');
-      console.log(`${marker} ${idx} ${title}`);
-      if (tab.url) console.log(c('dim', `     ${tab.url}`));
+    tabs.forEach(t => {
+      const marker = t.active ? c('green', '→') : ' ';
+      console.log(`${marker} [${t.index}] ${t.title || c('dim', '(untitled)')}`);
+      if (t.url) console.log(c('dim', `     ${t.url}`));
     });
   } else if (data.index !== undefined && data.total !== undefined) {
-    // Tab new / window new
-    console.log(c('green', '✓'), `Tab ${data.index} created (${data.total} total)`);
-  } else if (data.remaining !== undefined) {
-    // Tab close
-    console.log(c('green', '✓'), `Tab closed (${data.remaining} remaining)`);
-  } else if (data.started !== undefined) {
-    console.log(c('green', '✓'), 'Started');
+    console.log(c('green', '✓'), `Tab ${data.index} (${data.total} total)`);
   } else if (data.messages) {
-    // Console messages
-    const msgs = data.messages as Array<{ type: string; text: string; timestamp: number }>;
-    if (msgs.length === 0) {
-      console.log(c('dim', 'No console messages'));
-    } else {
-      msgs.forEach(msg => {
-        const typeColor = msg.type === 'error' ? 'red' : msg.type === 'warning' ? 'yellow' : 'dim';
-        console.log(`${c(typeColor, `[${msg.type}]`)} ${msg.text}`);
-      });
-    }
+    const msgs = data.messages as Array<{ type: string; text: string }>;
+    if (msgs.length === 0) console.log(c('dim', 'No messages'));
+    else msgs.forEach(m => {
+      const col = m.type === 'error' ? 'red' : m.type === 'warning' ? 'yellow' : 'dim';
+      console.log(`${c(col, `[${m.type}]`)} ${m.text}`);
+    });
   } else if (data.errors) {
-    // Page errors
-    const errs = data.errors as Array<{ message: string; timestamp: number }>;
-    if (errs.length === 0) {
-      console.log(c('dim', 'No page errors'));
-    } else {
-      errs.forEach(err => {
-        console.log(c('red', '✗'), err.message);
-      });
-    }
-  } else if (data.pressed) {
-    console.log(c('green', '✓'), `Pressed: ${data.pressed}`);
-  } else if (data.tapped) {
-    console.log(c('green', '✓'), 'Tapped');
-  } else if (data.copied) {
-    console.log(c('green', '✓'), 'Copied to clipboard');
-  } else if (data.pasted) {
-    console.log(c('green', '✓'), 'Pasted from clipboard');
-  } else if (data.highlighted) {
-    console.log(c('green', '✓'), 'Element highlighted');
-  } else if (data.dispatched) {
-    console.log(c('green', '✓'), `Event dispatched: ${data.dispatched}`);
-  } else if (data.exposed) {
-    console.log(c('green', '✓'), `Function exposed: ${data.exposed}`);
-  } else if (data.added) {
-    console.log(c('green', '✓'), 'Added');
-  } else if (data.emulated) {
-    console.log(c('green', '✓'), 'Media emulated');
-  } else if (data.offline !== undefined) {
-    console.log(c('green', '✓'), data.offline ? 'Offline mode enabled' : 'Online mode enabled');
-  } else if (data.paused) {
-    console.log(c('green', '✓'), 'Paused (Inspector open)');
+    const errs = data.errors as Array<{ message: string }>;
+    if (errs.length === 0) console.log(c('dim', 'No errors'));
+    else errs.forEach(e => console.log(c('red', '✗'), e.message));
+  } else if (data.requests) {
+    const reqs = data.requests as Array<{ method: string; url: string }>;
+    if (reqs.length === 0) console.log(c('dim', 'No requests'));
+    else reqs.forEach(r => console.log(`${c('cyan', r.method)} ${r.url}`));
+  } else if (data.moved) {
+    console.log(c('green', '✓'), `Moved to (${data.x}, ${data.y})`);
   } else if (data.note) {
     console.log(c('yellow', '⚠'), data.note);
-  } else if (data.requestCount !== undefined) {
-    console.log(c('green', '✓'), `HAR saved (${data.requestCount} requests)`);
-  } else if (data.moved) {
-    console.log(c('green', '✓'), `Mouse moved to (${data.x}, ${data.y})`);
-  } else if (data.down) {
-    console.log(c('green', '✓'), 'Mouse down');
-  } else if (data.up) {
-    console.log(c('green', '✓'), 'Mouse up');
-  } else if (data.focused) {
-    console.log(c('green', '✓'), 'Brought to front');
+  } else if (data.closed === true) {
+    console.log(c('green', '✓'), 'Browser closed');
+  } else if (data.launched) {
+    console.log(c('green', '✓'), 'Browser launched');
   } else if (data.state) {
     console.log(c('green', '✓'), `Load state: ${data.state}`);
+  } else if (Object.keys(data).some(k => ['clicked', 'typed', 'filled', 'pressed', 'hovered', 'scrolled', 'selected', 'waited', 'checked', 'unchecked', 'focused', 'set', 'cleared', 'started', 'down', 'up'].includes(k))) {
+    console.log(c('green', '✓'), 'Done');
   } else {
     console.log(c('green', '✓'), JSON.stringify(data));
   }
 }
 
+// ============================================================================
+// Command Handlers
+// ============================================================================
+
+async function handleGet(args: string[], id: string): Promise<Record<string, unknown>> {
+  const what = args[0];
+  const selector = args[1];
+  
+  switch (what) {
+    case 'text':
+      if (!selector) err('Selector required: veb get text <selector>');
+      return { id, action: 'gettext', selector };
+    case 'html':
+      if (!selector) err('Selector required: veb get html <selector>');
+      return { id, action: 'innerhtml', selector };
+    case 'value':
+      if (!selector) err('Selector required: veb get value <selector>');
+      return { id, action: 'inputvalue', selector };
+    case 'attr':
+      if (!selector || !args[2]) err('Usage: veb get attr <selector> <attribute>');
+      return { id, action: 'getattribute', selector, attribute: args[2] };
+    case 'title':
+      return { id, action: 'title' };
+    case 'url':
+      return { id, action: 'url' };
+    case 'count':
+      if (!selector) err('Selector required: veb get count <selector>');
+      return { id, action: 'count', selector };
+    case 'box':
+      if (!selector) err('Selector required: veb get box <selector>');
+      return { id, action: 'boundingbox', selector };
+    default:
+      err(`Unknown: veb get ${what}. Options: text, html, value, attr, title, url, count, box`);
+  }
+}
+
+async function handleIs(args: string[], id: string): Promise<Record<string, unknown>> {
+  const what = args[0];
+  const selector = args[1];
+  
+  if (!selector) err(`Selector required: veb is ${what} <selector>`);
+  
+  switch (what) {
+    case 'visible':
+      return { id, action: 'isvisible', selector };
+    case 'enabled':
+      return { id, action: 'isenabled', selector };
+    case 'checked':
+      return { id, action: 'ischecked', selector };
+    default:
+      err(`Unknown: veb is ${what}. Options: visible, enabled, checked`);
+  }
+}
+
+async function handleFind(args: string[], id: string, flags: Flags): Promise<Record<string, unknown>> {
+  const locator = args[0];
+  const value = args[1];
+  const subaction = args[2] || 'click';
+  const fillValue = args[3];
+  
+  if (!value) err(`Value required: veb find ${locator} <value> <action>`);
+  
+  const exact = flags.exact;
+  const name = flags.name;
+  
+  switch (locator) {
+    case 'role':
+      return { id, action: 'getbyrole', role: value, subaction, value: fillValue, name, exact };
+    case 'text':
+      return { id, action: 'getbytext', text: value, subaction, exact };
+    case 'label':
+      return { id, action: 'getbylabel', label: value, subaction, value: fillValue, exact };
+    case 'placeholder':
+      return { id, action: 'getbyplaceholder', placeholder: value, subaction, value: fillValue, exact };
+    case 'alt':
+      return { id, action: 'getbyalttext', text: value, subaction, exact };
+    case 'title':
+      return { id, action: 'getbytitle', text: value, subaction, exact };
+    case 'testid':
+      return { id, action: 'getbytestid', testId: value, subaction, value: fillValue };
+    case 'first':
+      return { id, action: 'nth', selector: value, index: 0, subaction, value: fillValue };
+    case 'last':
+      return { id, action: 'nth', selector: value, index: -1, subaction, value: fillValue };
+    case 'nth': {
+      const idx = parseInt(value, 10);
+      const sel = args[2];
+      const act = args[3] || 'click';
+      const val = args[4];
+      if (isNaN(idx) || !sel) err('Usage: veb find nth <index> <selector> <action>');
+      return { id, action: 'nth', selector: sel, index: idx, subaction: act, value: val };
+    }
+    default:
+      err(`Unknown locator: ${locator}. Options: role, text, label, placeholder, alt, title, testid, first, last, nth`);
+  }
+}
+
+async function handleMouse(args: string[], id: string): Promise<Record<string, unknown>> {
+  const action = args[0];
+  
+  switch (action) {
+    case 'move': {
+      const x = parseInt(args[1], 10);
+      const y = parseInt(args[2], 10);
+      if (isNaN(x) || isNaN(y)) err('Usage: veb mouse move <x> <y>');
+      return { id, action: 'mousemove', x, y };
+    }
+    case 'down':
+      return { id, action: 'mousedown', button: args[1] || 'left' };
+    case 'up':
+      return { id, action: 'mouseup', button: args[1] || 'left' };
+    case 'wheel': {
+      const dy = parseInt(args[1], 10) || 100;
+      const dx = parseInt(args[2], 10) || 0;
+      return { id, action: 'wheel', deltaY: dy, deltaX: dx };
+    }
+    default:
+      err(`Unknown: veb mouse ${action}. Options: move, down, up, wheel`);
+  }
+}
+
+async function handleSet(args: string[], id: string): Promise<Record<string, unknown>> {
+  const setting = args[0];
+  
+  switch (setting) {
+    case 'viewport': {
+      const w = parseInt(args[1], 10);
+      const h = parseInt(args[2], 10);
+      if (isNaN(w) || isNaN(h)) err('Usage: veb set viewport <width> <height>');
+      return { id, action: 'viewport', width: w, height: h };
+    }
+    case 'device':
+      if (!args[1]) err('Usage: veb set device <name>');
+      return { id, action: 'device', device: args[1] };
+    case 'geo':
+    case 'geolocation': {
+      const lat = parseFloat(args[1]);
+      const lng = parseFloat(args[2]);
+      if (isNaN(lat) || isNaN(lng)) err('Usage: veb set geo <lat> <lng>');
+      return { id, action: 'geolocation', latitude: lat, longitude: lng };
+    }
+    case 'offline':
+      return { id, action: 'offline', offline: args[1] !== 'off' && args[1] !== 'false' };
+    case 'headers':
+      if (!args[1]) err('Usage: veb set headers <json>');
+      try {
+        return { id, action: 'headers', headers: JSON.parse(args[1]) };
+      } catch { err('Invalid JSON for headers'); }
+      break;
+    case 'credentials':
+    case 'auth':
+      if (!args[1] || !args[2]) err('Usage: veb set credentials <user> <pass>');
+      return { id, action: 'credentials', username: args[1], password: args[2] };
+    case 'media': {
+      const colorScheme = args.includes('dark') ? 'dark' : args.includes('light') ? 'light' : undefined;
+      const media = args.includes('print') ? 'print' : args.includes('screen') ? 'screen' : undefined;
+      return { id, action: 'emulatemedia', colorScheme, media };
+    }
+    default:
+      err(`Unknown: veb set ${setting}. Options: viewport, device, geo, offline, headers, credentials, media`);
+  }
+  return {};
+}
+
+async function handleNetwork(args: string[], id: string, allArgs: string[]): Promise<Record<string, unknown>> {
+  const action = args[0];
+  
+  switch (action) {
+    case 'route': {
+      const url = args[1];
+      if (!url) err('Usage: veb network route <url> [--abort|--body <json>]');
+      const abort = allArgs.includes('--abort');
+      const bodyIdx = allArgs.indexOf('--body');
+      const body = bodyIdx !== -1 ? allArgs[bodyIdx + 1] : undefined;
+      return { id, action: 'route', url, abort, response: body ? { body, contentType: 'application/json' } : undefined };
+    }
+    case 'unroute':
+      return { id, action: 'unroute', url: args[1] };
+    case 'requests': {
+      const clear = allArgs.includes('--clear');
+      const filterIdx = allArgs.indexOf('--filter');
+      const filter = filterIdx !== -1 ? allArgs[filterIdx + 1] : undefined;
+      return { id, action: 'requests', clear, filter };
+    }
+    default:
+      err(`Unknown: veb network ${action}. Options: route, unroute, requests`);
+  }
+  return {};
+}
+
+async function handleStorage(args: string[], id: string): Promise<Record<string, unknown>> {
+  const type = args[0] as 'local' | 'session';
+  const sub = args[1];
+  
+  if (type !== 'local' && type !== 'session') {
+    err('Usage: veb storage <local|session> [get|set|clear] [key] [value]');
+  }
+  
+  if (sub === 'set') {
+    if (!args[2] || !args[3]) err(`Usage: veb storage ${type} set <key> <value>`);
+    return { id, action: 'storage_set', type, key: args[2], value: args[3] };
+  } else if (sub === 'clear') {
+    return { id, action: 'storage_clear', type };
+  } else {
+    // get (default)
+    return { id, action: 'storage_get', type, key: sub };
+  }
+}
+
+async function handleCookies(args: string[], id: string): Promise<Record<string, unknown>> {
+  const sub = args[0];
+  
+  if (sub === 'set') {
+    if (!args[1]) err('Usage: veb cookies set <json>');
+    try {
+      return { id, action: 'cookies_set', cookies: JSON.parse(args[1]) };
+    } catch { err('Invalid JSON for cookies'); }
+  } else if (sub === 'clear') {
+    return { id, action: 'cookies_clear' };
+  } else {
+    return { id, action: 'cookies_get' };
+  }
+  return {};
+}
+
+async function handleTab(args: string[], id: string): Promise<Record<string, unknown>> {
+  const sub = args[0];
+  
+  if (sub === 'new') {
+    return { id, action: 'tab_new' };
+  } else if (sub === 'list' || sub === 'ls' || !sub) {
+    return { id, action: 'tab_list' };
+  } else if (sub === 'close') {
+    const idx = args[1] !== undefined ? parseInt(args[1], 10) : undefined;
+    return { id, action: 'tab_close', index: idx };
+  } else {
+    const idx = parseInt(sub, 10);
+    if (isNaN(idx)) err(`Unknown: veb tab ${sub}. Options: new, list, close, <index>`);
+    return { id, action: 'tab_switch', index: idx };
+  }
+}
+
+async function handleTrace(args: string[], id: string): Promise<Record<string, unknown>> {
+  const sub = args[0];
+  
+  if (sub === 'start') {
+    return { id, action: 'trace_start', screenshots: true, snapshots: true };
+  } else if (sub === 'stop') {
+    if (!args[1]) err('Usage: veb trace stop <path>');
+    return { id, action: 'trace_stop', path: args[1] };
+  } else {
+    err('Usage: veb trace start|stop');
+  }
+  return {};
+}
+
+async function handleState(args: string[], id: string): Promise<Record<string, unknown>> {
+  const sub = args[0];
+  const path = args[1];
+  
+  if (sub === 'save') {
+    if (!path) err('Usage: veb state save <path>');
+    return { id, action: 'state_save', path };
+  } else if (sub === 'load') {
+    if (!path) err('Usage: veb state load <path>');
+    return { id, action: 'state_load', path };
+  } else {
+    err('Usage: veb state save|load <path>');
+  }
+  return {};
+}
+
+// ============================================================================
+// Flags Parser
+// ============================================================================
+
+interface Flags {
+  json: boolean;
+  full: boolean;
+  text: boolean;
+  debug: boolean;
+  session: string;
+  selector?: string;
+  name?: string;
+  exact: boolean;
+  url?: string;
+  load?: string;
+}
+
+function parseFlags(args: string[]): { flags: Flags; cleanArgs: string[] } {
+  const flags: Flags = {
+    json: false,
+    full: false,
+    text: false,
+    debug: false,
+    session: process.env.VEB_SESSION || 'default',
+    exact: false,
+  };
+  
+  const cleanArgs: string[] = [];
+  let i = 0;
+  
+  while (i < args.length) {
+    const arg = args[i];
+    
+    if (arg === '--json') {
+      flags.json = true;
+    } else if (arg === '--full' || arg === '-f') {
+      flags.full = true;
+    } else if (arg === '--text' || arg === '-t') {
+      flags.text = true;
+    } else if (arg === '--debug') {
+      flags.debug = true;
+    } else if (arg === '--exact') {
+      flags.exact = true;
+    } else if (arg === '--session' && args[i + 1]) {
+      flags.session = args[++i];
+    } else if ((arg === '--selector' || arg === '-s') && args[i + 1]) {
+      flags.selector = args[++i];
+    } else if ((arg === '--name' || arg === '-n') && args[i + 1]) {
+      flags.name = args[++i];
+    } else if (arg === '--url' && args[i + 1]) {
+      flags.url = args[++i];
+    } else if (arg === '--load' && args[i + 1]) {
+      flags.load = args[++i];
+    } else if (!arg.startsWith('-')) {
+      cleanArgs.push(arg);
+    }
+    i++;
+  }
+  
+  return { flags, cleanArgs };
+}
+
+// ============================================================================
+// Main
+// ============================================================================
+
 async function main(): Promise<void> {
-  const args = process.argv.slice(2);
+  const rawArgs = process.argv.slice(2);
+  const { flags, cleanArgs } = parseFlags(rawArgs);
   
-  // Enable debug mode early
-  const debugMode = args.includes('--debug');
-  if (debugMode) {
-    setDebug(true);
-  }
+  if (flags.debug) setDebug(true);
+  setSession(flags.session);
   
-  // Handle session - check --session flag first, then env var
-  const sessionIdx = args.findIndex(a => a === '--session');
-  if (sessionIdx !== -1 && args[sessionIdx + 1]) {
-    setSession(args[sessionIdx + 1]);
-  }
-  // VEB_SESSION env var is already handled by daemon.ts default
-  
-  if (args.length === 0 || args.includes('--help') || args.includes('-h')) {
+  if (cleanArgs.length === 0 || rawArgs.includes('--help') || rawArgs.includes('-h')) {
     printHelp();
     process.exit(0);
   }
   
-  const jsonMode = args.includes('--json');
-  const fullPage = args.includes('--full') || args.includes('-f');
-  const textMode = args.includes('--text') || args.includes('-t');
-  
-  // Remove flag args and their values
-  const cleanArgs = args.filter((a, i) => {
-    if (a.startsWith('-')) return false;
-    // Check if previous arg was a flag that takes a value
-    const prev = args[i - 1];
-    if (prev === '--selector' || prev === '-s') return false;
-    if (prev === '--session') return false;
-    if (prev === '--name' || prev === '-n') return false;
-    return true;
-  });
   const command = cleanArgs[0];
-  
-  // Find --selector value
-  let selectorOverride: string | undefined;
-  const sIdx = args.findIndex(a => a === '--selector' || a === '-s');
-  if (sIdx !== -1 && args[sIdx + 1]) {
-    selectorOverride = args[sIdx + 1];
-  }
-  
-  // Find --name value (for locator commands)
-  let nameOverride: string | undefined;
-  const nIdx = args.findIndex(a => a === '--name' || a === '-n');
-  if (nIdx !== -1 && args[nIdx + 1]) {
-    nameOverride = args[nIdx + 1];
-  }
-  
-  // Find --exact flag
-  const exactMode = args.includes('--exact');
-  
+  const args = cleanArgs.slice(1);
   const id = genId();
+  
   let cmd: Record<string, unknown>;
   
   switch (command) {
+    // === Core Commands ===
     case 'open':
     case 'goto':
     case 'navigate': {
-      const url = cleanArgs[1];
-      if (!url) {
-        console.error(c('red', 'Error:'), 'URL required');
-        process.exit(1);
-      }
-      // Auto-add https if missing
-      const fullUrl = url.startsWith('http') ? url : `https://${url}`;
-      cmd = { id, action: 'navigate', url: fullUrl };
+      if (!args[0]) err('URL required');
+      const url = args[0].startsWith('http') ? args[0] : `https://${args[0]}`;
+      cmd = { id, action: 'navigate', url };
       break;
     }
     
-    case 'click': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'click', selector };
+    case 'click':
+      if (!args[0]) err('Selector required');
+      cmd = { id, action: 'click', selector: args[0] };
       break;
-    }
-    
-    case 'type': {
-      const selector = cleanArgs[1];
-      const text = cleanArgs.slice(2).join(' ');
-      if (!selector || !text) {
-        console.error(c('red', 'Error:'), 'Selector and text required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'type', selector, text, clear: true };
-      break;
-    }
-    
-    case 'fill': {
-      const selector = cleanArgs[1];
-      const value = cleanArgs.slice(2).join(' ');
-      if (!selector || value === undefined) {
-        console.error(c('red', 'Error:'), 'Selector and value required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'fill', selector, value };
-      break;
-    }
-    
-    case 'check': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'check', selector };
-      break;
-    }
-    
-    case 'uncheck': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'uncheck', selector };
-      break;
-    }
     
     case 'dblclick':
-    case 'doubleclick': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'dblclick', selector };
+      if (!args[0]) err('Selector required');
+      cmd = { id, action: 'dblclick', selector: args[0] };
       break;
-    }
     
-    case 'focus': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'focus', selector };
+    case 'type':
+      if (!args[0] || !args[1]) err('Usage: veb type <selector> <text>');
+      cmd = { id, action: 'type', selector: args[0], text: args.slice(1).join(' ') };
       break;
-    }
     
-    case 'drag': {
-      const source = cleanArgs[1];
-      const target = cleanArgs[2];
-      if (!source || !target) {
-        console.error(c('red', 'Error:'), 'Source and target selectors required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'drag', source, target };
+    case 'fill':
+      if (!args[0] || !args[1]) err('Usage: veb fill <selector> <text>');
+      cmd = { id, action: 'fill', selector: args[0], value: args.slice(1).join(' ') };
       break;
-    }
     
-    case 'upload': {
-      const selector = cleanArgs[1];
-      const files = cleanArgs.slice(2);
-      if (!selector || files.length === 0) {
-        console.error(c('red', 'Error:'), 'Selector and file(s) required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'upload', selector, files };
+    case 'press':
+    case 'key':
+      if (!args[0]) err('Key required');
+      cmd = { id, action: 'press', key: args[0] };
       break;
-    }
     
-    case 'press': {
-      const key = cleanArgs[1];
-      if (!key) {
-        console.error(c('red', 'Error:'), 'Key required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'press', key, selector: selectorOverride };
+    case 'hover':
+      if (!args[0]) err('Selector required');
+      cmd = { id, action: 'hover', selector: args[0] };
+      break;
+    
+    case 'focus':
+      if (!args[0]) err('Selector required');
+      cmd = { id, action: 'focus', selector: args[0] };
+      break;
+    
+    case 'check':
+      if (!args[0]) err('Selector required');
+      cmd = { id, action: 'check', selector: args[0] };
+      break;
+    
+    case 'uncheck':
+      if (!args[0]) err('Selector required');
+      cmd = { id, action: 'uncheck', selector: args[0] };
+      break;
+    
+    case 'select':
+      if (!args[0] || !args[1]) err('Usage: veb select <selector> <value>');
+      cmd = { id, action: 'select', selector: args[0], value: args[1] };
+      break;
+    
+    case 'drag':
+      if (!args[0] || !args[1]) err('Usage: veb drag <source> <target>');
+      cmd = { id, action: 'drag', source: args[0], target: args[1] };
+      break;
+    
+    case 'upload':
+      if (!args[0] || !args[1]) err('Usage: veb upload <selector> <files...>');
+      cmd = { id, action: 'upload', selector: args[0], files: args.slice(1) };
+      break;
+    
+    case 'scroll': {
+      const dir = args[0] || 'down';
+      const amount = parseInt(args[1], 10) || 300;
+      cmd = { id, action: 'scroll', direction: dir, amount, selector: flags.selector };
       break;
     }
     
     case 'wait': {
-      const target = cleanArgs[1];
-      if (!target) {
-        console.error(c('red', 'Error:'), 'Selector, text, or milliseconds required');
-        process.exit(1);
-      }
-      
-      // Check if it's a number (milliseconds)
-      const ms = parseInt(target, 10);
-      if (!isNaN(ms)) {
-        cmd = { id, action: 'wait', timeout: ms };
-      } else if (textMode) {
-        // Wait for text - use evaluate to check for text
-        cmd = { id, action: 'wait', selector: `text=${target}` };
-      } else {
+      const target = args[0];
+      // Check for --url and --load flags
+      if (flags.url) {
+        cmd = { id, action: 'waitforurl', url: flags.url };
+      } else if (flags.load) {
+        cmd = { id, action: 'waitforloadstate', state: flags.load };
+      } else if (flags.text) {
+        if (!target) err('Text required with --text flag');
+        cmd = { id, action: 'wait', text: target };
+      } else if (target && /^\d+$/.test(target)) {
+        cmd = { id, action: 'wait', timeout: parseInt(target, 10) };
+      } else if (target) {
         cmd = { id, action: 'wait', selector: target };
+      } else {
+        err('Usage: veb wait <selector|ms|--text text|--url pattern|--load state>');
       }
       break;
     }
     
-    case 'screenshot':
-    case 'ss': {
-      const pathArg = cleanArgs[1];
-      cmd = { 
-        id, 
-        action: 'screenshot', 
-        path: pathArg,
-        fullPage,
-        selector: selectorOverride,
-      };
+    case 'screenshot': {
+      const path = args[0];
+      cmd = { id, action: 'screenshot', path, fullPage: flags.full, selector: flags.selector };
       break;
     }
     
+    case 'pdf':
+      if (!args[0]) err('Path required');
+      cmd = { id, action: 'pdf', path: args[0] };
+      break;
+    
     case 'snapshot':
-    case 'aria':
-    case 'a11y': {
       cmd = { id, action: 'snapshot' };
       break;
-    }
-    
-    case 'extract':
-    case 'html':
-    case 'content': {
-      const selector = cleanArgs[1] || selectorOverride;
-      cmd = { id, action: 'content', selector };
-      break;
-    }
     
     case 'eval':
-    case 'js': {
-      const script = cleanArgs.slice(1).join(' ');
-      if (!script) {
-        console.error(c('red', 'Error:'), 'Script required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'evaluate', script };
+      if (!args[0]) err('Script required');
+      cmd = { id, action: 'evaluate', script: args.join(' ') };
       break;
-    }
-    
-    case 'scroll': {
-      const dirOrAmount = cleanArgs[1];
-      const amount = parseInt(cleanArgs[2], 10) || 300;
-      
-      if (['up', 'down', 'left', 'right'].includes(dirOrAmount)) {
-        cmd = { id, action: 'scroll', direction: dirOrAmount, amount, selector: selectorOverride };
-      } else {
-        const y = parseInt(dirOrAmount, 10) || 300;
-        cmd = { id, action: 'scroll', y, selector: selectorOverride };
-      }
-      break;
-    }
-    
-    case 'hover': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'hover', selector };
-      break;
-    }
-    
-    case 'select': {
-      const selector = cleanArgs[1];
-      const value = cleanArgs[2];
-      if (!selector || !value) {
-        console.error(c('red', 'Error:'), 'Selector and value required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'select', selector, values: value };
-      break;
-    }
-    
-    case 'pdf': {
-      const pdfPath = cleanArgs[1];
-      if (!pdfPath) {
-        console.error(c('red', 'Error:'), 'Path required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'pdf', path: pdfPath };
-      break;
-    }
-    
-    case 'frame': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Frame selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'frame', selector };
-      break;
-    }
-    
-    case 'mainframe': {
-      cmd = { id, action: 'mainframe' };
-      break;
-    }
-    
-    case 'role': {
-      const role = cleanArgs[1];
-      const subaction = cleanArgs[2] as 'click' | 'fill' | 'check' | 'hover';
-      const value = cleanArgs[3];
-      if (!role || !subaction) {
-        console.error(c('red', 'Error:'), 'Role and action required (e.g., veb role button click --name "Submit")');
-        process.exit(1);
-      }
-      cmd = { id, action: 'getbyrole', role, name: nameOverride, subaction, value };
-      break;
-    }
-    
-    case 'text': {
-      const text = cleanArgs[1];
-      const subaction = cleanArgs[2] as 'click' | 'hover';
-      if (!text || !subaction) {
-        console.error(c('red', 'Error:'), 'Text and action required (e.g., veb text "Submit" click)');
-        process.exit(1);
-      }
-      cmd = { id, action: 'getbytext', text, exact: exactMode, subaction };
-      break;
-    }
-    
-    case 'label': {
-      const label = cleanArgs[1];
-      const subaction = cleanArgs[2] as 'click' | 'fill' | 'check';
-      const value = cleanArgs[3];
-      if (!label || !subaction) {
-        console.error(c('red', 'Error:'), 'Label and action required (e.g., veb label "Email" fill "test@test.com")');
-        process.exit(1);
-      }
-      cmd = { id, action: 'getbylabel', label, subaction, value };
-      break;
-    }
-    
-    case 'placeholder': {
-      const placeholder = cleanArgs[1];
-      const subaction = cleanArgs[2] as 'click' | 'fill';
-      const value = cleanArgs[3];
-      if (!placeholder || !subaction) {
-        console.error(c('red', 'Error:'), 'Placeholder and action required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'getbyplaceholder', placeholder, subaction, value };
-      break;
-    }
-    
-    case 'cookies': {
-      const subCmd = cleanArgs[1];
-      
-      if (subCmd === 'set') {
-        const jsonStr = cleanArgs.slice(2).join(' ');
-        try {
-          const cookies = JSON.parse(jsonStr);
-          cmd = { id, action: 'cookies_set', cookies: Array.isArray(cookies) ? cookies : [cookies] };
-        } catch {
-          console.error(c('red', 'Error:'), 'Invalid JSON for cookies');
-          process.exit(1);
-        }
-      } else if (subCmd === 'clear') {
-        cmd = { id, action: 'cookies_clear' };
-      } else {
-        cmd = { id, action: 'cookies_get' };
-      }
-      break;
-    }
-    
-    case 'storage': {
-      const storageType = cleanArgs[1]; // 'local' or 'session'
-      const subCmd = cleanArgs[2];
-      
-      if (storageType !== 'local' && storageType !== 'session') {
-        console.error(c('red', 'Error:'), 'Storage type must be "local" or "session"');
-        process.exit(1);
-      }
-      
-      if (subCmd === 'set') {
-        const key = cleanArgs[3];
-        const value = cleanArgs.slice(4).join(' ');
-        if (!key) {
-          console.error(c('red', 'Error:'), 'Key required');
-          process.exit(1);
-        }
-        cmd = { id, action: 'storage_set', type: storageType, key, value };
-      } else if (subCmd === 'clear') {
-        cmd = { id, action: 'storage_clear', type: storageType };
-      } else {
-        // Get - subCmd might be a key or undefined
-        cmd = { id, action: 'storage_get', type: storageType, key: subCmd };
-      }
-      break;
-    }
-    
-    case 'dialog': {
-      const response = cleanArgs[1];
-      const promptText = cleanArgs[2];
-      
-      if (response !== 'accept' && response !== 'dismiss') {
-        console.error(c('red', 'Error:'), 'Dialog response must be "accept" or "dismiss"');
-        process.exit(1);
-      }
-      cmd = { id, action: 'dialog', response, promptText };
-      break;
-    }
-    
-    case 'back': {
-      cmd = { id, action: 'back' };
-      break;
-    }
-    
-    case 'forward': {
-      cmd = { id, action: 'forward' };
-      break;
-    }
-    
-    case 'reload': {
-      cmd = { id, action: 'reload' };
-      break;
-    }
-    
-    case 'url': {
-      cmd = { id, action: 'url' };
-      break;
-    }
-    
-    case 'title': {
-      cmd = { id, action: 'title' };
-      break;
-    }
-    
-    case 'gettext': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'gettext', selector };
-      break;
-    }
-    
-    case 'getattr':
-    case 'getattribute': {
-      const selector = cleanArgs[1];
-      const attribute = cleanArgs[2];
-      if (!selector || !attribute) {
-        console.error(c('red', 'Error:'), 'Selector and attribute required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'getattribute', selector, attribute };
-      break;
-    }
-    
-    case 'isvisible': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'isvisible', selector };
-      break;
-    }
-    
-    case 'isenabled': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'isenabled', selector };
-      break;
-    }
-    
-    case 'ischecked': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'ischecked', selector };
-      break;
-    }
-    
-    case 'count': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'count', selector };
-      break;
-    }
-    
-    case 'boundingbox':
-    case 'bbox': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'boundingbox', selector };
-      break;
-    }
-    
-    case 'route': {
-      const url = cleanArgs[1];
-      if (!url) {
-        console.error(c('red', 'Error:'), 'URL pattern required');
-        process.exit(1);
-      }
-      
-      const abortMode = args.includes('--abort');
-      const bodyIdx = args.findIndex(a => a === '--body');
-      let response: { status?: number; body?: string; contentType?: string } | undefined;
-      
-      if (bodyIdx !== -1 && args[bodyIdx + 1]) {
-        try {
-          const body = args[bodyIdx + 1];
-          response = { body, contentType: 'application/json' };
-        } catch {
-          response = { body: args[bodyIdx + 1] };
-        }
-      }
-      
-      cmd = { id, action: 'route', url, abort: abortMode, response };
-      break;
-    }
-    
-    case 'unroute': {
-      const url = cleanArgs[1];
-      cmd = { id, action: 'unroute', url };
-      break;
-    }
-    
-    case 'requests': {
-      const clearMode = args.includes('--clear');
-      const filterIdx = args.findIndex(a => a === '--filter');
-      const filter = filterIdx !== -1 ? args[filterIdx + 1] : undefined;
-      
-      cmd = { id, action: 'requests', clear: clearMode, filter };
-      break;
-    }
-    
-    case 'viewport': {
-      const width = parseInt(cleanArgs[1], 10);
-      const height = parseInt(cleanArgs[2], 10);
-      if (isNaN(width) || isNaN(height)) {
-        console.error(c('red', 'Error:'), 'Width and height required (e.g., veb viewport 1920 1080)');
-        process.exit(1);
-      }
-      cmd = { id, action: 'viewport', width, height };
-      break;
-    }
-    
-    case 'device': {
-      const device = cleanArgs[1];
-      if (!device) {
-        console.error(c('red', 'Error:'), 'Device name required (e.g., veb device "iPhone 14")');
-        process.exit(1);
-      }
-      cmd = { id, action: 'device', device };
-      break;
-    }
-    
-    case 'geolocation':
-    case 'geo': {
-      const lat = parseFloat(cleanArgs[1]);
-      const lng = parseFloat(cleanArgs[2]);
-      if (isNaN(lat) || isNaN(lng)) {
-        console.error(c('red', 'Error:'), 'Latitude and longitude required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'geolocation', latitude: lat, longitude: lng };
-      break;
-    }
-    
-    case 'permissions': {
-      const grantOrDeny = cleanArgs[1];
-      const perms = cleanArgs.slice(2);
-      if ((grantOrDeny !== 'grant' && grantOrDeny !== 'deny') || perms.length === 0) {
-        console.error(c('red', 'Error:'), 'Usage: veb permissions grant|deny <permission...>');
-        process.exit(1);
-      }
-      cmd = { id, action: 'permissions', permissions: perms, grant: grantOrDeny === 'grant' };
-      break;
-    }
-    
-    case 'download': {
-      const selector = cleanArgs[1];
-      const downloadPath = cleanArgs[2];
-      if (!selector || !downloadPath) {
-        console.error(c('red', 'Error:'), 'Selector and path required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'download', selector, path: downloadPath };
-      break;
-    }
     
     case 'close':
     case 'quit':
-    case 'exit': {
+    case 'exit':
       cmd = { id, action: 'close' };
       break;
-    }
     
-    case 'tab': {
-      const subCmd = cleanArgs[1];
-      
-      if (subCmd === 'new') {
-        cmd = { id, action: 'tab_new' };
-      } else if (subCmd === 'list' || subCmd === 'ls') {
-        cmd = { id, action: 'tab_list' };
-      } else if (subCmd === 'close') {
-        const tabIndex = cleanArgs[2] !== undefined ? parseInt(cleanArgs[2], 10) : undefined;
-        cmd = { id, action: 'tab_close', index: tabIndex };
-      } else if (subCmd !== undefined) {
-        // Assume it's a tab index to switch to
-        const tabIndex = parseInt(subCmd, 10);
-        if (isNaN(tabIndex)) {
-          console.error(c('red', 'Error:'), `Invalid tab command or index: ${subCmd}`);
-          process.exit(1);
-        }
-        cmd = { id, action: 'tab_switch', index: tabIndex };
-      } else {
-        // No subcommand - list tabs
-        cmd = { id, action: 'tab_list' };
-      }
+    // === Navigation ===
+    case 'back':
+      cmd = { id, action: 'back' };
       break;
-    }
     
-    case 'window': {
-      const subCmd = cleanArgs[1];
-      
-      if (subCmd === 'new') {
+    case 'forward':
+      cmd = { id, action: 'forward' };
+      break;
+    
+    case 'reload':
+      cmd = { id, action: 'reload' };
+      break;
+    
+    // === Grouped Commands ===
+    case 'get':
+      cmd = await handleGet(args, id);
+      break;
+    
+    case 'is':
+      cmd = await handleIs(args, id);
+      break;
+    
+    case 'find':
+      cmd = await handleFind(args, id, flags);
+      break;
+    
+    case 'mouse':
+      cmd = await handleMouse(args, id);
+      break;
+    
+    case 'set':
+      cmd = await handleSet(args, id);
+      break;
+    
+    case 'network':
+      cmd = await handleNetwork(args, id, rawArgs);
+      break;
+    
+    case 'storage':
+      cmd = await handleStorage(args, id);
+      break;
+    
+    case 'cookies':
+      cmd = await handleCookies(args, id);
+      break;
+    
+    case 'tab':
+      cmd = await handleTab(args, id);
+      break;
+    
+    case 'window':
+      if (args[0] === 'new') {
         cmd = { id, action: 'window_new' };
       } else {
-        console.error(c('red', 'Error:'), 'Usage: veb window new');
-        process.exit(1);
+        err('Usage: veb window new');
       }
       break;
-    }
     
-    case 'session': {
-      const subCmd = cleanArgs[1];
-      
-      if (subCmd === 'list' || subCmd === 'ls') {
+    case 'frame':
+      if (!args[0]) err('Selector required');
+      if (args[0] === 'main') {
+        cmd = { id, action: 'mainframe' };
+      } else {
+        cmd = { id, action: 'frame', selector: args[0] };
+      }
+      break;
+    
+    case 'dialog':
+      if (args[0] === 'accept') {
+        cmd = { id, action: 'dialog', response: 'accept', promptText: args[1] };
+      } else if (args[0] === 'dismiss') {
+        cmd = { id, action: 'dialog', response: 'dismiss' };
+      } else {
+        err('Usage: veb dialog accept|dismiss');
+      }
+      break;
+    
+    case 'trace':
+      cmd = await handleTrace(args, id);
+      break;
+    
+    case 'state':
+      cmd = await handleState(args, id);
+      break;
+    
+    case 'console':
+      cmd = { id, action: 'console', clear: rawArgs.includes('--clear') };
+      break;
+    
+    case 'errors':
+      cmd = { id, action: 'errors', clear: rawArgs.includes('--clear') };
+      break;
+    
+    case 'highlight':
+      if (!args[0]) err('Selector required');
+      cmd = { id, action: 'highlight', selector: args[0] };
+      break;
+    
+    case 'session':
+      if (args[0] === 'list' || args[0] === 'ls') {
         const sessions = listSessions();
-        const currentSession = getSession();
-        
+        const current = getSession();
         if (sessions.length === 0) {
           console.log(c('dim', 'No active sessions'));
         } else {
-          sessions.forEach(sess => {
-            const marker = sess === currentSession ? c('green', '→') : ' ';
-            console.log(`${marker} ${c('cyan', sess)}`);
+          sessions.forEach(s => {
+            const marker = s === current ? c('green', '→') : ' ';
+            console.log(`${marker} ${c('cyan', s)}`);
           });
         }
         process.exit(0);
       } else {
-        // Show current session
         console.log(c('cyan', getSession()));
         process.exit(0);
       }
-    }
     
-    // === Advanced commands ===
-    
-    case 'trace': {
-      const subCmd = cleanArgs[1];
-      
-      if (subCmd === 'start') {
-        const screenshotsMode = args.includes('--screenshots');
-        const snapshotsMode = args.includes('--snapshots');
-        cmd = { id, action: 'trace_start', screenshots: screenshotsMode, snapshots: snapshotsMode };
-      } else if (subCmd === 'stop') {
-        const path = cleanArgs[2];
-        if (!path) {
-          console.error(c('red', 'Error:'), 'Path required for trace output');
-          process.exit(1);
-        }
-        cmd = { id, action: 'trace_stop', path };
-      } else {
-        console.error(c('red', 'Error:'), 'Usage: veb trace start|stop');
-        process.exit(1);
-      }
+    // === Legacy aliases for backwards compatibility ===
+    case 'url':
+      cmd = { id, action: 'url' };
       break;
-    }
-    
-    case 'state': {
-      const subCmd = cleanArgs[1];
-      const path = cleanArgs[2];
-      
-      if (subCmd === 'save') {
-        if (!path) {
-          console.error(c('red', 'Error:'), 'Path required');
-          process.exit(1);
-        }
-        cmd = { id, action: 'state_save', path };
-      } else if (subCmd === 'load') {
-        if (!path) {
-          console.error(c('red', 'Error:'), 'Path required');
-          process.exit(1);
-        }
-        cmd = { id, action: 'state_load', path };
-      } else {
-        console.error(c('red', 'Error:'), 'Usage: veb state save|load <path>');
-        process.exit(1);
-      }
+    case 'title':
+      cmd = { id, action: 'title' };
       break;
-    }
-    
-    case 'console': {
-      const clearMode = args.includes('--clear');
-      cmd = { id, action: 'console', clear: clearMode };
+    case 'gettext':
+      cmd = { id, action: 'gettext', selector: args[0] };
       break;
-    }
-    
-    case 'errors': {
-      const clearMode = args.includes('--clear');
-      cmd = { id, action: 'errors', clear: clearMode };
+    case 'extract':
+      cmd = { id, action: 'content', selector: args[0] };
       break;
-    }
-    
-    case 'keyboard':
-    case 'key':
-    case 'press': {
-      const keys = cleanArgs[1];
-      if (!keys) {
-        console.error(c('red', 'Error:'), 'Keys required (e.g., veb press "Control+a")');
-        process.exit(1);
-      }
-      cmd = { id, action: 'keyboard', keys };
-      break;
-    }
-    
-    case 'wheel':
-    case 'scroll-wheel': {
-      const deltaY = parseInt(cleanArgs[1], 10) || 100;
-      const deltaX = parseInt(cleanArgs[2], 10) || 0;
-      const selector = selectorOverride;
-      cmd = { id, action: 'wheel', deltaX, deltaY, selector };
-      break;
-    }
-    
-    case 'tap': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'tap', selector };
-      break;
-    }
-    
-    case 'clipboard': {
-      const operation = cleanArgs[1] as 'copy' | 'paste' | 'read';
-      if (!['copy', 'paste', 'read'].includes(operation)) {
-        console.error(c('red', 'Error:'), 'Usage: veb clipboard copy|paste|read');
-        process.exit(1);
-      }
-      cmd = { id, action: 'clipboard', operation };
-      break;
-    }
-    
-    case 'highlight': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'highlight', selector };
-      break;
-    }
-    
-    case 'clear-input':
-    case 'clearinput': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'clear', selector };
-      break;
-    }
-    
-    case 'selectall':
-    case 'select-all': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'selectall', selector };
-      break;
-    }
-    
-    case 'innertext': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'innertext', selector };
-      break;
-    }
-    
-    case 'innerhtml':
-    case 'inner-html': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'innerhtml', selector };
-      break;
-    }
-    
-    case 'inputvalue':
-    case 'input-value': {
-      const selector = cleanArgs[1];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'inputvalue', selector };
-      break;
-    }
-    
-    case 'setvalue':
-    case 'set-value': {
-      const selector = cleanArgs[1];
-      const value = cleanArgs[2];
-      if (!selector || !value) {
-        console.error(c('red', 'Error:'), 'Selector and value required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'setvalue', selector, value };
-      break;
-    }
-    
-    case 'dispatch': {
-      const selector = cleanArgs[1];
-      const event = cleanArgs[2];
-      if (!selector || !event) {
-        console.error(c('red', 'Error:'), 'Selector and event required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'dispatch', selector, event };
-      break;
-    }
-    
-    case 'addscript':
-    case 'add-script': {
-      const urlOrContent = cleanArgs[1];
-      if (!urlOrContent) {
-        console.error(c('red', 'Error:'), 'URL or content required');
-        process.exit(1);
-      }
-      if (urlOrContent.startsWith('http')) {
-        cmd = { id, action: 'addscript', url: urlOrContent };
-      } else {
-        cmd = { id, action: 'addscript', content: urlOrContent };
-      }
-      break;
-    }
-    
-    case 'addstyle':
-    case 'add-style': {
-      const urlOrContent = cleanArgs[1];
-      if (!urlOrContent) {
-        console.error(c('red', 'Error:'), 'URL or content required');
-        process.exit(1);
-      }
-      if (urlOrContent.startsWith('http')) {
-        cmd = { id, action: 'addstyle', url: urlOrContent };
-      } else {
-        cmd = { id, action: 'addstyle', content: urlOrContent };
-      }
-      break;
-    }
-    
-    case 'media': {
-      const colorScheme = args.includes('--dark') ? 'dark' : args.includes('--light') ? 'light' : undefined;
-      const media = args.includes('--print') ? 'print' : args.includes('--screen') ? 'screen' : undefined;
-      const reducedMotion = args.includes('--reduced-motion') ? 'reduce' : undefined;
-      
-      cmd = { id, action: 'emulatemedia', colorScheme, media, reducedMotion };
-      break;
-    }
-    
-    case 'offline': {
-      const offlineMode = cleanArgs[1] !== 'false' && cleanArgs[1] !== 'off';
-      cmd = { id, action: 'offline', offline: offlineMode };
-      break;
-    }
-    
-    case 'headers': {
-      const headersJson = cleanArgs[1];
-      if (!headersJson) {
-        console.error(c('red', 'Error:'), 'Headers JSON required');
-        process.exit(1);
-      }
-      try {
-        const headers = JSON.parse(headersJson);
-        cmd = { id, action: 'headers', headers };
-      } catch {
-        console.error(c('red', 'Error:'), 'Invalid JSON for headers');
-        process.exit(1);
-      }
-      break;
-    }
-    
-    case 'pause': {
-      cmd = { id, action: 'pause' };
-      break;
-    }
-    
-    case 'alttext':
-    case 'alt': {
-      const text = cleanArgs[1];
-      const subaction = cleanArgs[2] || 'click';
-      if (!text) {
-        console.error(c('red', 'Error:'), 'Alt text required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'getbyalttext', text, subaction, exact: exactMode };
-      break;
-    }
-    
-    case 'bytitle': {
-      const text = cleanArgs[1];
-      const subaction = cleanArgs[2] || 'click';
-      if (!text) {
-        console.error(c('red', 'Error:'), 'Title text required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'getbytitle', text, subaction, exact: exactMode };
-      break;
-    }
-    
-    case 'testid':
-    case 'data-testid': {
-      const testId = cleanArgs[1];
-      const subaction = cleanArgs[2] || 'click';
-      const value = cleanArgs[3];
-      if (!testId) {
-        console.error(c('red', 'Error:'), 'Test ID required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'getbytestid', testId, subaction, value };
-      break;
-    }
-    
-    case 'first': {
-      const selector = cleanArgs[1];
-      const subaction = cleanArgs[2] || 'click';
-      const value = cleanArgs[3];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'nth', selector, index: 0, subaction, value };
-      break;
-    }
-    
-    case 'last': {
-      const selector = cleanArgs[1];
-      const subaction = cleanArgs[2] || 'click';
-      const value = cleanArgs[3];
-      if (!selector) {
-        console.error(c('red', 'Error:'), 'Selector required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'nth', selector, index: -1, subaction, value };
-      break;
-    }
-    
-    case 'nth': {
-      const selector = cleanArgs[1];
-      const index = parseInt(cleanArgs[2], 10);
-      const subaction = cleanArgs[3] || 'click';
-      const value = cleanArgs[4];
-      if (!selector || isNaN(index)) {
-        console.error(c('red', 'Error:'), 'Selector and index required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'nth', selector, index, subaction, value };
-      break;
-    }
-    
-    case 'waitforurl':
-    case 'wait-for-url': {
-      const url = cleanArgs[1];
-      if (!url) {
-        console.error(c('red', 'Error:'), 'URL pattern required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'waitforurl', url };
-      break;
-    }
-    
-    case 'waitforload':
-    case 'wait-for-load': {
-      const state = cleanArgs[1] || 'load';
-      if (!['load', 'domcontentloaded', 'networkidle'].includes(state)) {
-        console.error(c('red', 'Error:'), 'State must be: load, domcontentloaded, or networkidle');
-        process.exit(1);
-      }
-      cmd = { id, action: 'waitforloadstate', state };
-      break;
-    }
-    
-    case 'setcontent':
-    case 'set-content':
-    case 'html': {
-      const html = cleanArgs[1];
-      if (!html) {
-        console.error(c('red', 'Error:'), 'HTML content required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'setcontent', html };
-      break;
-    }
-    
-    case 'timezone':
-    case 'tz': {
-      const timezone = cleanArgs[1];
-      if (!timezone) {
-        console.error(c('red', 'Error:'), 'Timezone required (e.g., America/New_York)');
-        process.exit(1);
-      }
-      cmd = { id, action: 'timezone', timezone };
-      break;
-    }
-    
-    case 'locale':
-    case 'lang': {
-      const locale = cleanArgs[1];
-      if (!locale) {
-        console.error(c('red', 'Error:'), 'Locale required (e.g., en-US)');
-        process.exit(1);
-      }
-      cmd = { id, action: 'locale', locale };
-      break;
-    }
-    
-    case 'credentials':
-    case 'auth': {
-      const username = cleanArgs[1];
-      const password = cleanArgs[2];
-      if (!username || !password) {
-        console.error(c('red', 'Error:'), 'Username and password required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'credentials', username, password };
-      break;
-    }
-    
-    case 'mousemove':
-    case 'mouse-move': {
-      const x = parseInt(cleanArgs[1], 10);
-      const y = parseInt(cleanArgs[2], 10);
-      if (isNaN(x) || isNaN(y)) {
-        console.error(c('red', 'Error:'), 'X and Y coordinates required');
-        process.exit(1);
-      }
-      cmd = { id, action: 'mousemove', x, y };
-      break;
-    }
-    
-    case 'mousedown':
-    case 'mouse-down': {
-      const button = cleanArgs[1] as 'left' | 'right' | 'middle' | undefined;
-      cmd = { id, action: 'mousedown', button };
-      break;
-    }
-    
-    case 'mouseup':
-    case 'mouse-up': {
-      const button = cleanArgs[1] as 'left' | 'right' | 'middle' | undefined;
-      cmd = { id, action: 'mouseup', button };
-      break;
-    }
-    
-    case 'focus-tab':
-    case 'bringtofront': {
-      cmd = { id, action: 'bringtofront' };
-      break;
-    }
     
     default:
-      console.error(c('red', 'Error:'), `Unknown command: ${command}`);
-      console.error(c('dim', 'Run veb --help for usage'));
+      console.error(c('red', 'Unknown command:'), command);
+      console.error(c('dim', 'Run: veb --help'));
       process.exit(1);
   }
   
   try {
     const response = await send(cmd);
-    printResponse(response, jsonMode);
+    printResponse(response, flags.json);
     process.exit(0);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    if (jsonMode) {
+    if (flags.json) {
       console.log(JSON.stringify({ id, success: false, error: message }));
     } else {
       console.error(c('red', '✗ Error:'), message);