patchright-cli 0.5.0__tar.gz → 0.6.0__tar.gz

{patchright_cli-0.5.0 → patchright_cli-0.6.0}/.gitignore

@@ -6,4 +6,5 @@ __pycache__/
 dist/
 build/
 docs/reddit-post.md
+docs/superpowers/
 .worktrees/

{patchright_cli-0.5.0 → patchright_cli-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patchright-cli
-Version: 0.5.0
+Version: 0.6.0
 Summary: Anti-detect browser automation CLI using Patchright (undetected Playwright fork)
 Project-URL: Homepage, https://github.com/AhaiMk01/patchright-cli
 Project-URL: Repository, https://github.com/AhaiMk01/patchright-cli
@@ -331,74 +331,41 @@ patchright-cli --port=9322 open        # Custom daemon port
 
 ---
 
-## Snapshots
-
-After each state-changing command, the CLI outputs page info and a YAML snapshot:
-
-```
-### Page
-- Page URL: https://example.com/
-- Page Title: Example Domain
-### Snapshot
-[Snapshot](.patchright-cli/page-1774376207818.yml)
-```
-
-The snapshot lists interactive elements with refs you can use in commands:
-
-```yaml
-- ref: e1
-  role: heading
-  name: Example Domain
-  level: 1
-- ref: e2
-  role: link
-  name: Learn more
-  url: "https://iana.org/domains/example"
-```
-
-> [!NOTE]
-> Use refs directly: `patchright-cli click e2`, `patchright-cli fill e5 "text"`
-
----
-
-## Anti-Detect Features
-
-> [!CAUTION]
-> This tool is for **authorized testing, security research, and legitimate automation** only.
-
-- :white_check_mark: Real Chrome browser (not Chromium)
-- :white_check_mark: Patchright patches `navigator.webdriver` and other detection vectors
-- :white_check_mark: Persistent profiles maintain cookies/sessions across runs
-- :white_check_mark: No custom user-agent or headers (natural fingerprint)
-- :white_check_mark: Headed by default (headless is more detectable)
-
----
-
 ## Agent Integration
 
-Works with any AI coding agent that supports SKILL.md skills:
+Works with Claude Code, Cursor, Gemini CLI, Codex, and [40+ other agents](https://github.com/vercel-labs/skills).
 
-| Agent | Install skill |
-|-------|--------------|
-| **Claude Code** | `mkdir -p ~/.claude/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.claude/skills/patchright-cli/SKILL.md` |
-| **OpenClaw** | `mkdir -p ~/.openclaw/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.openclaw/skills/patchright-cli/SKILL.md` |
-| **Codex CLI** | `mkdir -p ~/.codex/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.codex/skills/patchright-cli/SKILL.md` |
-| **Gemini CLI** | `mkdir -p ~/.gemini/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.gemini/skills/patchright-cli/SKILL.md` |
-| **OpenCode** | `mkdir -p ~/.opencode/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.opencode/skills/patchright-cli/SKILL.md` |
-| **Cursor** | Copy SKILL.md to `.cursor/skills/patchright-cli/` in your project |
-| **Windsurf** | Copy SKILL.md to `.windsurf/skills/patchright-cli/` in your project |
-| **Aider** | Copy SKILL.md to `.aider/skills/patchright-cli/` in your project |
+```bash
+# Install skill for all detected agents (recommended)
+npx skills add AhaiMk01/patchright-cli
+```
 
-Or auto-install for all detected agents:
+<details>
+<summary><b>Other install methods</b></summary>
 
 ```bash
+# Via patchright-cli itself
 pip install patchright-cli
 patchright-cli install --skills
+
+# Or just tell your agent:
+# "Install patchright-cli skill from https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md"
 ```
 
-Or just tell your agent:
+</details>
 
-> Install patchright-cli skill from https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md
+### Skill docs
+
+| File | Topic |
+|------|-------|
+| [`SKILL.md`](skills/patchright-cli/SKILL.md) | Main skill — commands, options, patterns |
+| [`snapshot-refs.md`](skills/patchright-cli/references/snapshot-refs.md) | Snapshots, element refs, `-i` flag |
+| [`session-management.md`](skills/patchright-cli/references/session-management.md) | Named sessions, profiles, CDP, dashboard |
+| [`request-mocking.md`](skills/patchright-cli/references/request-mocking.md) | Route mocking, network state |
+| [`storage-state.md`](skills/patchright-cli/references/storage-state.md) | Cookies, localStorage, sessionStorage |
+| [`running-code.md`](skills/patchright-cli/references/running-code.md) | eval, run-code, `--file`, stdin |
+| [`tracing.md`](skills/patchright-cli/references/tracing.md) | Trace recording and debugging |
+| [`video-recording.md`](skills/patchright-cli/references/video-recording.md) | Video, codegen, screenshot, PDF |
 
 ---
 

{patchright_cli-0.5.0 → patchright_cli-0.6.0}/README.md

@@ -298,74 +298,41 @@ patchright-cli --port=9322 open        # Custom daemon port
 
 ---
 
-## Snapshots
-
-After each state-changing command, the CLI outputs page info and a YAML snapshot:
-
-```
-### Page
-- Page URL: https://example.com/
-- Page Title: Example Domain
-### Snapshot
-[Snapshot](.patchright-cli/page-1774376207818.yml)
-```
-
-The snapshot lists interactive elements with refs you can use in commands:
-
-```yaml
-- ref: e1
-  role: heading
-  name: Example Domain
-  level: 1
-- ref: e2
-  role: link
-  name: Learn more
-  url: "https://iana.org/domains/example"
-```
-
-> [!NOTE]
-> Use refs directly: `patchright-cli click e2`, `patchright-cli fill e5 "text"`
-
----
-
-## Anti-Detect Features
-
-> [!CAUTION]
-> This tool is for **authorized testing, security research, and legitimate automation** only.
-
-- :white_check_mark: Real Chrome browser (not Chromium)
-- :white_check_mark: Patchright patches `navigator.webdriver` and other detection vectors
-- :white_check_mark: Persistent profiles maintain cookies/sessions across runs
-- :white_check_mark: No custom user-agent or headers (natural fingerprint)
-- :white_check_mark: Headed by default (headless is more detectable)
-
----
-
 ## Agent Integration
 
-Works with any AI coding agent that supports SKILL.md skills:
+Works with Claude Code, Cursor, Gemini CLI, Codex, and [40+ other agents](https://github.com/vercel-labs/skills).
 
-| Agent | Install skill |
-|-------|--------------|
-| **Claude Code** | `mkdir -p ~/.claude/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.claude/skills/patchright-cli/SKILL.md` |
-| **OpenClaw** | `mkdir -p ~/.openclaw/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.openclaw/skills/patchright-cli/SKILL.md` |
-| **Codex CLI** | `mkdir -p ~/.codex/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.codex/skills/patchright-cli/SKILL.md` |
-| **Gemini CLI** | `mkdir -p ~/.gemini/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.gemini/skills/patchright-cli/SKILL.md` |
-| **OpenCode** | `mkdir -p ~/.opencode/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.opencode/skills/patchright-cli/SKILL.md` |
-| **Cursor** | Copy SKILL.md to `.cursor/skills/patchright-cli/` in your project |
-| **Windsurf** | Copy SKILL.md to `.windsurf/skills/patchright-cli/` in your project |
-| **Aider** | Copy SKILL.md to `.aider/skills/patchright-cli/` in your project |
+```bash
+# Install skill for all detected agents (recommended)
+npx skills add AhaiMk01/patchright-cli
+```
 
-Or auto-install for all detected agents:
+<details>
+<summary><b>Other install methods</b></summary>
 
 ```bash
+# Via patchright-cli itself
 pip install patchright-cli
 patchright-cli install --skills
+
+# Or just tell your agent:
+# "Install patchright-cli skill from https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md"
 ```
 
-Or just tell your agent:
+</details>
 
-> Install patchright-cli skill from https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md
+### Skill docs
+
+| File | Topic |
+|------|-------|
+| [`SKILL.md`](skills/patchright-cli/SKILL.md) | Main skill — commands, options, patterns |
+| [`snapshot-refs.md`](skills/patchright-cli/references/snapshot-refs.md) | Snapshots, element refs, `-i` flag |
+| [`session-management.md`](skills/patchright-cli/references/session-management.md) | Named sessions, profiles, CDP, dashboard |
+| [`request-mocking.md`](skills/patchright-cli/references/request-mocking.md) | Route mocking, network state |
+| [`storage-state.md`](skills/patchright-cli/references/storage-state.md) | Cookies, localStorage, sessionStorage |
+| [`running-code.md`](skills/patchright-cli/references/running-code.md) | eval, run-code, `--file`, stdin |
+| [`tracing.md`](skills/patchright-cli/references/tracing.md) | Trace recording and debugging |
+| [`video-recording.md`](skills/patchright-cli/references/video-recording.md) | Video, codegen, screenshot, PDF |
 
 ---
 

patchright_cli-0.6.0/docs/installation.md

@@ -0,0 +1,146 @@
+# patchright-cli Installation Guide
+
+## Prerequisites
+
+- Python 3.10+
+- Google Chrome installed on the system
+
+## Install
+
+### Step 1: Ensure uv is installed
+
+uv is the recommended Python package manager. Check if it's installed:
+
+```bash
+uv --version
+```
+
+If not installed:
+
+```bash
+# macOS / Linux
+curl -LsSf https://astral.sh/uv/install.sh | sh
+
+# Windows (PowerShell)
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"
+```
+
+### Step 2: Run patchright-cli
+
+With uvx (recommended — always uses the latest version, no install needed):
+
+```bash
+uvx patchright-cli open https://example.com
+uvx patchright-cli snapshot
+uvx patchright-cli close
+```
+
+> **Note:** If you have Google Chrome installed, patchright-cli will use it directly via `channel="chrome"` for maximum stealth. If Chrome is not found, install the Patchright fallback browser: `uvx patchright install chromium`
+
+### Step 3: Verify
+
+```bash
+uvx patchright-cli --version
+uvx patchright-cli open https://example.com
+uvx patchright-cli eval "document.title"
+uvx patchright-cli close
+```
+
+<details>
+<summary><b>Alternative: pip install</b></summary>
+
+```bash
+pip install patchright-cli
+patchright-cli open https://example.com
+patchright-cli close
+```
+
+</details>
+
+### Troubleshooting
+
+If you see `browser not found` errors:
+
+```bash
+# Check if Chrome is installed
+google-chrome --version    # Linux
+/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --version  # macOS
+reg query "HKLM\SOFTWARE\Google\Chrome\BLBeacon" /v version   # Windows
+
+# If no Chrome, install the Patchright browser
+uvx patchright install chromium
+```
+
+If you see `patchright-cli: command not found`:
+
+```bash
+# Use uvx instead (no install or PATH needed)
+uvx patchright-cli --help
+```
+
+## Agent Integration
+
+Install the patchright-cli skill so your AI coding agent knows how to use it. Works with Claude Code, Cursor, Gemini CLI, Codex, and [40+ other agents](https://github.com/vercel-labs/skills).
+
+### Recommended: Skills CLI
+
+```bash
+npx skills add AhaiMk01/patchright-cli
+```
+
+This auto-detects your installed agents and installs the skill (including reference docs) to all of them.
+
+### Alternative: patchright-cli built-in
+
+```bash
+pip install patchright-cli
+patchright-cli install --skills
+```
+
+### Alternative: Tell your agent
+
+Just paste this into your agent and it will handle the rest:
+
+> Install patchright-cli skill from https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md
+
+### Manual install
+
+Copy the skill file to your agent's skills directory:
+
+```bash
+# Example for Claude Code
+mkdir -p ~/.claude/skills/patchright-cli
+curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md \
+  -o ~/.claude/skills/patchright-cli/SKILL.md
+```
+
+Replace `~/.claude` with `~/.gemini`, `~/.codex`, `~/.opencode`, `.cursor`, etc. for other agents.
+
+## Usage
+
+```bash
+# Open an anti-bot-protected site
+uvx patchright-cli open https://protected-site.com
+
+# Take a snapshot to see interactive elements
+uvx patchright-cli snapshot
+
+# Interact with elements using refs from the snapshot
+uvx patchright-cli fill e3 "username"
+uvx patchright-cli fill e4 "password"
+uvx patchright-cli click e5
+
+# Save login state for reuse
+uvx patchright-cli state-save auth.json
+
+# Later, restore the session
+uvx patchright-cli open https://protected-site.com --persistent
+uvx patchright-cli state-load auth.json
+
+# Close when done
+uvx patchright-cli close
+```
+
+## All Commands
+
+Run `patchright-cli --help` for the full command reference.

{patchright_cli-0.5.0 → patchright_cli-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "patchright-cli"
-version = "0.5.0"
+version = "0.6.0"
 description = "Anti-detect browser automation CLI using Patchright (undetected Playwright fork)"
 license = "Apache-2.0"
 requires-python = ">=3.10"

{patchright_cli-0.5.0 → patchright_cli-0.6.0}/skills/patchright-cli/SKILL.md

@@ -58,6 +58,8 @@ These go before the command:
 --timeout-action=10000  # Default action timeout (ms)
 --timeout-navigation=30000 # Default navigation timeout (ms)
 --show-port=9322        # Dashboard port (default: 9322)
+--raw                   # Strip page/snapshot decorations from output
+--json                  # Wrap full response as JSON ({success, output, ...})
 ```
 
 ---
@@ -71,7 +73,8 @@ open [url]                    # Launch browser (optionally navigate)
 open --persistent             # Keep cookies/storage between runs
 open --headless               # Headless mode
 attach --cdp=<url>            # Attach to existing Chrome via CDP
-close                         # Close session
+close                         # Close session (closes the browser)
+detach                        # Detach an attached session (keeps external browser running)
 ```
 
 ### Navigation
@@ -91,6 +94,7 @@ snapshot                      # Full page snapshot
 snapshot <ref>                # Subtree of a specific element
 snapshot --depth=N            # Limit depth
 snapshot -i                   # Interactive elements only
+snapshot --boxes              # Append [box=x,y,w,h] to each [ref=eN] line
 ```
 
 ### Interaction
@@ -102,6 +106,8 @@ click <ref> --modifiers=Alt   # Click with modifier keys
 dblclick <ref>                # Double-click
 hover <ref>                   # Hover
 drag <ref> <target-ref>       # Drag element to target
+drop <ref> --path=./file.png  # Drop file onto element (HTML5 drop from outside)
+drop <ref> --data="text/plain=hello"  # Drop arbitrary MIME data
 ```
 
 ### Form input
@@ -170,8 +176,14 @@ dialog-dismiss                # Dismiss next dialog
 ```bash
 console                       # Show console messages
 console warning               # Filter by level
-network                       # Show network requests
+network                       # Show network requests (each line is `#<id> METHOD STATUS URL`)
+requests                      # Alias for `network`
 network --static              # Include static assets
+request <id>                  # Full detail for one request (headers + body)
+request <id> --body           # Also fetch response body
+generate-locator <ref>        # Emit Playwright locator string for a ref
+highlight <ref>               # Persistent overlay on element [--style=CSS]
+highlight <ref> --hide        # Remove overlay; `highlight --hide` clears all
 ```
 
 ### Recording and capture
@@ -312,30 +324,20 @@ pip install patchright-cli
 
 ### Skill (for AI coding agents)
 
-Install the skill so your agent knows how to use patchright-cli. The same command also works to update to the latest version.
-
-**macOS / Linux (bash/zsh):**
-
-| Agent | Install / update command |
-|-------|--------------------------|
-| **Claude Code** | `mkdir -p ~/.claude/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.claude/skills/patchright-cli/SKILL.md` |
-| **Gemini CLI** | `mkdir -p ~/.gemini/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.gemini/skills/patchright-cli/SKILL.md` |
-| **Codex CLI** | `mkdir -p ~/.codex/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.codex/skills/patchright-cli/SKILL.md` |
-| **OpenCode** | `mkdir -p ~/.opencode/skills/patchright-cli && curl -sL https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md -o ~/.opencode/skills/patchright-cli/SKILL.md` |
-
-**Windows (PowerShell):**
+```bash
+# Install for all detected agents (Claude Code, Cursor, Gemini, Codex, 40+ more)
+npx skills add AhaiMk01/patchright-cli
+```
 
-| Agent | Install / update command |
-|-------|--------------------------|
-| **Claude Code** | `New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.claude\skills\patchright-cli" | Out-Null; Invoke-WebRequest -Uri "https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md" -OutFile "$env:USERPROFILE\.claude\skills\patchright-cli\SKILL.md"` |
-| **Gemini CLI** | `New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.gemini\skills\patchright-cli" | Out-Null; Invoke-WebRequest -Uri "https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md" -OutFile "$env:USERPROFILE\.gemini\skills\patchright-cli\SKILL.md"` |
-| **Codex CLI** | `New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.codex\skills\patchright-cli" | Out-Null; Invoke-WebRequest -Uri "https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md" -OutFile "$env:USERPROFILE\.codex\skills\patchright-cli\SKILL.md"` |
-| **OpenCode** | `New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.opencode\skills\patchright-cli" | Out-Null; Invoke-WebRequest -Uri "https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md" -OutFile "$env:USERPROFILE\.opencode\skills\patchright-cli\SKILL.md"` |
+Other methods:
 
-**IDE-based agents (Cursor / Windsurf / Aider):** Copy `SKILL.md` to `.<tool>/skills/patchright-cli/` in your project.
+```bash
+# Via patchright-cli itself
+pip install patchright-cli && patchright-cli install --skills
 
-**Or just tell your agent:**
-> Install patchright-cli skill from https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md
+# Or just tell your agent:
+# "Install patchright-cli skill from https://raw.githubusercontent.com/AhaiMk01/patchright-cli/main/skills/patchright-cli/SKILL.md"
+```
 
 ## Specific tasks
 

{patchright_cli-0.5.0 → patchright_cli-0.6.0}/src/patchright_cli/__init__.py

@@ -1,3 +1,3 @@
 """patchright-cli — Undetected browser automation CLI using Patchright."""
 
-__version__ = "0.5.0"
+__version__ = "0.6.0"

{patchright_cli-0.5.0 → patchright_cli-0.6.0}/src/patchright_cli/cli.py

@@ -180,12 +180,14 @@ COMMANDS_HELP = {
     "select": "select <ref> <value> Select dropdown option",
     "check": "check <ref>          Check checkbox/radio",
     "uncheck": "uncheck <ref>        Uncheck checkbox/radio",
-    "snapshot": "snapshot [ref]        Take accessibility snapshot [--filename=F] [--depth=N] [-i]",
+    "snapshot": "snapshot [ref]        Take accessibility snapshot [--filename=F] [--depth=N] [-i] [--boxes]",
     "eval": "eval <expr> [ref]     Evaluate JavaScript [--file=F or stdin]",
     "text": "text <ref|selector>  Get text content of element",
     "screenshot": "screenshot [ref]     Save screenshot [--full-page] [--filename=F]",
     "drag": "drag <from> <to>     Drag element to target",
+    "drop": "drop <ref> [--path=F] [--data=mime=value]  Drop file/data onto element",
     "close": "close                Close browser session",
+    "detach": "detach               Detach attached session (keep external browser running)",
     # Navigation
     "go-back": "go-back              Go back",
     "go-forward": "go-forward           Go forward",
@@ -260,6 +262,10 @@ COMMANDS_HELP = {
     # DevTools
     "console": "console [level]      Show console messages [--clear]",
     "network": "network              Show network requests [--static] [--clear]",
+    "requests": "requests             Alias for `network`",
+    "request": "request <id>         Show full detail for a network request [--body]",
+    "generate-locator": "generate-locator <ref>  Emit Playwright locator expression for a ref",
+    "highlight": "highlight <ref>      Show overlay on element [--style=CSS] [--hide]",
     # Session
     "list": "list                 List sessions",
     "close-all": "close-all            Close all sessions",
@@ -300,6 +306,7 @@ def _print_help():
     click.echo("  --cdp=<url>         Attach to Chrome via CDP endpoint")
     click.echo("  --show-port=N       Dashboard port (default: 9322)")
     click.echo("  --raw               Raw output (strip page/snapshot decorations)")
+    click.echo("  --json              Wrap response as JSON ({success, output, ...})")
     click.echo("  --version           Show version")
     click.echo("  --help              Show this help\n")
     click.echo("Commands:")
@@ -324,7 +331,9 @@ def _print_help():
                 "text",
                 "screenshot",
                 "drag",
+                "drop",
                 "close",
+                "detach",
             ],
         ),
         ("Navigation", ["go-back", "go-forward", "reload", "url", "title"]),
@@ -363,7 +372,7 @@ def _print_help():
         ("Tracing", ["tracing-start", "tracing-stop"]),
         ("Video", ["video-start", "video-stop", "video-chapter"]),
         ("PDF", ["pdf"]),
-        ("DevTools", ["console", "network"]),
+        ("DevTools", ["console", "network", "requests", "request", "generate-locator", "highlight"]),
         ("Session", ["list", "close-all", "kill-all", "delete-data"]),
         ("Dashboard", ["show"]),
         ("Codegen", ["codegen", "codegen-stop"]),
@@ -390,6 +399,7 @@ def main():
     port = DEFAULT_PORT
     extra_opts: dict = {}
     raw = False
+    as_json = False
 
     # Extract options
     remaining = []
@@ -484,6 +494,8 @@ def main():
             extra_opts["show-port"] = argv[i]
         elif arg == "--raw":
             raw = True
+        elif arg == "--json":
+            as_json = True
         elif arg in ("-i", "--interactive"):
             extra_opts["interactive"] = True
         elif arg in ("--version", "-v"):
@@ -579,13 +591,20 @@ def main():
 
     # Print output
     output = response.get("output", "")
-    if output:
-        if raw:
-            output = _strip_raw_output(output)
+    success = response.get("success", True)
+
+    if as_json:
+        payload = dict(response)
+        if raw and isinstance(payload.get("output"), str):
+            payload["output"] = _strip_raw_output(payload["output"])
+        click.echo(json.dumps(payload, default=str))
+    else:
         if output:
-            click.echo(output)
+            if raw:
+                output = _strip_raw_output(output)
+            if output:
+                click.echo(output)
 
-    success = response.get("success", True)
     if not success:
         sys.exit(1)