patchright-cli 0.7.0__py3-none-any.whl → 0.9.0__py3-none-any.whl

patchright_cli/__init__.py

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

patchright_cli/cli.py

@@ -6,6 +6,7 @@ receives the result, and prints it.
 
 from __future__ import annotations
 
+import argparse
 import json
 import os
 import socket
@@ -16,7 +17,7 @@ from pathlib import Path
 import click
 
 from patchright_cli import __version__
-from patchright_cli.daemon import DEFAULT_PORT, ensure_daemon_running
+from patchright_cli.daemon import DEFAULT_PORT, ensure_daemon_running, read_daemon_token
 
 
 def _soften_output_encoding(*streams) -> None:
@@ -248,6 +249,36 @@ def _handle_install(args: list) -> None:
     click.echo(f"\npatchright-cli v{__version__} skills installed.")
 
 
+def _handle_mcp(args: list[str]) -> None:
+    """Handle the optional MCP server command."""
+    parser = argparse.ArgumentParser(
+        prog="patchright-cli mcp",
+        description="Run the MCP server. Stdio is the default transport.",
+    )
+    parser.add_argument("--http", action="store_true", help="Use Streamable HTTP instead of stdio.")
+    parser.add_argument("--host", default="127.0.0.1", help="HTTP bind host.")
+    parser.add_argument("--port", type=int, default=8000, help="HTTP bind port.")
+    options = parser.parse_args(args)
+
+    if not 1 <= options.port <= 65535:
+        parser.error("--port must be between 1 and 65535")
+    if not options.http and (options.host != "127.0.0.1" or options.port != 8000):
+        parser.error("--host and --port require --http")
+
+    try:
+        from patchright_cli.mcp_server import run_mcp_server
+    except ImportError as exc:
+        if exc.name not in {"fastmcp", "mcp", "pydantic"}:
+            raise
+        click.echo(
+            "MCP support is not installed. Install it with: pip install 'patchright-cli[mcp]'",
+            err=True,
+        )
+        raise SystemExit(1) from exc
+
+    run_mcp_server(http=options.http, host=options.host, port=options.port)
+
+
 _VERSION_CHECK_INTERVAL = 24 * 60 * 60
 _PYPI_URL = "https://pypi.org/pypi/patchright-cli/json"
 
@@ -361,6 +392,11 @@ def _send_command(command: str, args: list, options: dict, port: int = DEFAULT_P
         "options": options,
         "cwd": os.getcwd(),
     }
+    # A daemon that predates tokens writes no token file and accepts the
+    # message without one, so a missing file is not an error here.
+    token = read_daemon_token(port)
+    if token:
+        msg["token"] = token
     data = json.dumps(msg).encode("utf-8")
 
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -395,7 +431,7 @@ def _recv_exact(sock: socket.socket, n: int) -> bytes:
 
 COMMANDS_HELP = {
     # Core
-    "open": "open [url]           Open browser (starts daemon if needed)",
+    "open": "open [url]           Open browser (starts daemon if needed) [--block-networks=link-local|private] [--web-only]",
     "attach": "attach --cdp=<url> [--context=new|host]  Attach to running Chrome via CDP",
     "goto": "goto <url>           Navigate to URL",
     "click": "click <ref> [button]  Click element [--modifiers=Alt,Shift]",
@@ -510,6 +546,7 @@ COMMANDS_HELP = {
     "codegen-stop": "codegen-stop [file]   Stop recording and save script",
     # Setup
     "install": "install --skills      Install skill files for AI agents",
+    "mcp": "mcp [--http] [--host=HOST] [--port=N]  Start MCP server (stdio by default)",
 }
 
 ALL_COMMANDS = list(COMMANDS_HELP.keys())
@@ -616,7 +653,7 @@ def _print_help():
         ("Profiles", ["profile-list", "profile-delete"]),
         ("Dashboard", ["show"]),
         ("Codegen", ["codegen", "codegen-stop"]),
-        ("Setup", ["install"]),
+        ("Setup", ["install", "mcp"]),
     ]
     for cat_name, cmds in categories:
         click.echo(f"\n  {cat_name}:")
@@ -630,6 +667,13 @@ def main():
     _soften_output_encoding(sys.stdout, sys.stderr)
     argv = sys.argv[1:]
 
+    # MCP is a self-contained subcommand with its own transport options.
+    # Dispatch it before global option parsing so `patchright-cli mcp --help`
+    # shows MCP help rather than the top-level CLI help.
+    if argv and argv[0] == "mcp":
+        _handle_mcp(argv[1:])
+        return
+
     # Parse global options manually (before the command)
     headless = False
     persistent = False
@@ -649,6 +693,10 @@ def main():
     i = 0
     while i < len(argv):
         arg = argv[i]
+        if arg == "--":
+            # End of options: the rest is positional, even text that looks like a flag.
+            remaining.extend(argv[i:])
+            break
         if arg == "--headless":
             headless = True
         elif arg == "--persistent":
@@ -779,6 +827,10 @@ def main():
         _handle_install(args + [k if v is True else f"{k}={v}" for k, v in extra_opts.items()])
         sys.exit(0)
 
+    if command == "mcp":
+        _handle_mcp(args)
+        sys.exit(0)
+
     _warn_stale_skills()
 
     # Only on `open`: one browser launch already costs seconds, and this keeps
@@ -789,8 +841,13 @@ def main():
     # Separate --key=value and --flag from positional args
     positional_args = []
     cmd_opts: dict = {}
+    end_of_options = False
     for a in args:
-        if a.startswith("--") and "=" in a:
+        if end_of_options:
+            positional_args.append(a)
+        elif a == "--":
+            end_of_options = True
+        elif a.startswith("--") and "=" in a:
             k, v = a[2:].split("=", 1)
             cmd_opts[k] = v
         elif a.startswith("--"):
@@ -812,7 +869,7 @@ def main():
             except FileNotFoundError:
                 click.echo(f"File not found: {file_opt}", err=True)
                 sys.exit(1)
-        elif args and args[0] == "-":
+        elif args and args[0] == "-" and not end_of_options:
             # Read JS from stdin
             args = [sys.stdin.read()]
         elif not args and not sys.stdin.isatty():