mtrx-cli 0.1.10 → 0.1.13

package/src/matrx/cli/main.py

@@ -32,14 +32,17 @@ from matrx.cli.launcher import (
 )
 from matrx.cli.cursor_config import (
     configure_cursor_for_proxy,
+    configure_cursor_proxy_settings,
     cursor_is_running,
+    cursor_settings_json_path,
     cursor_state_db_path,
     print_manual_setup_instructions,
     read_cursor_settings,
+    restore_cursor_proxy_settings,
     restore_cursor_settings,
 )
-from matrx.cli.cursor_proxy import CursorProxyServer
 from matrx.cli.state import (
+    config_dir,
     ensure_app_url,
     ensure_root_url,
     ensure_v1_url,
@@ -74,7 +77,7 @@ def main(argv: list[str] | None = None) -> int:
     if args.command in {"codex", "claude"}:
         return _cmd_launch(args.command, args.route, remainder)
     if args.command == "cursor":
-        return _cmd_cursor(args.route, args.port)
+        return _cmd_cursor(args)
 
     parser.print_help()
     return 1
@@ -115,7 +118,8 @@ def _build_parser() -> argparse.ArgumentParser:
 
     cursor = subparsers.add_parser("cursor")
     cursor.add_argument("--route", choices=["direct", "matrx"])
-    cursor.add_argument("--port", type=int, default=0)
+    cursor.add_argument("--status", action="store_true", help="Check proxy status")
+    cursor.add_argument("--stop", action="store_true", help="Stop the proxy service")
 
     return parser
 
@@ -489,9 +493,50 @@ def _cmd_use(args) -> int:
     print(f"Saved to {path}")
     if args.tool == "claude" and args.route == "direct":
         _print_claude_shell_proxy_hint()
+    if args.tool == "cursor" and args.route == "direct":
+        _restore_cursor_if_needed()
     return 0
 
 
+def _restore_cursor_if_needed() -> None:
+    import json as _json
+
+    from matrx.cli.cursor_service import is_proxy_running, uninstall_service
+
+    # Stop the MITM proxy service if it's running
+    if is_proxy_running():
+        uninstall_service()
+        print("MTRX Cursor proxy service stopped.")
+
+    # Restore settings.json (MITM proxy settings)
+    proxy_prev_path = config_dir() / "cursor-proxy-previous-settings.json"
+    if proxy_prev_path.exists():
+        try:
+            previous = _json.loads(proxy_prev_path.read_text(encoding="utf-8"))
+            if restore_cursor_proxy_settings(previous):
+                proxy_prev_path.unlink(missing_ok=True)
+                print("Cursor proxy settings restored.")
+        except Exception:
+            pass
+
+    # Restore state.vscdb (legacy Override Base URL settings)
+    prev_path = config_dir() / "cursor-previous-settings.json"
+    db_path = cursor_state_db_path()
+    if prev_path.exists() and db_path.exists():
+        try:
+            previous = _json.loads(prev_path.read_text(encoding="utf-8"))
+            if restore_cursor_settings(previous, db_path=db_path):
+                prev_path.unlink(missing_ok=True)
+                print("Cursor DB settings restored to previous values.")
+            else:
+                print("[warn] Could not auto-restore Cursor DB settings.")
+        except Exception:
+            pass
+
+    if cursor_is_running():
+        print("  Restart Cursor for settings to take effect.")
+
+
 def _cmd_status() -> int:
     state = load_state()
     auth = state["auth"]
@@ -526,6 +571,11 @@ def _cmd_status() -> int:
         location = config_status["config_path"] or "unknown"
         verified_at = config_status["last_verified_at"] or "-"
         print(f"  {tool}: {status_label} ({location}, verified={verified_at})")
+    # Cursor proxy status
+    from matrx.cli.cursor_service import is_proxy_running
+    proxy_running = is_proxy_running()
+    print(f"  cursor proxy: {'running' if proxy_running else 'not running'}")
+
     print("Executables:")
     print(f"  codex: {find_executable('codex') or 'not found'}")
     print(f"  claude: {find_executable('claude') or 'not found'}")
@@ -780,17 +830,55 @@ def _cmd_launch(tool: str, route: str | None, remainder: list[str]) -> int:
     return launch(plan)
 
 
-def _cmd_cursor(route: str | None, port: int) -> int:
-    import signal as _signal
+def _cmd_cursor(args) -> int:
+    import json as _json
+
+    from matrx.cli.cursor_ca import (
+        ca_cert_path,
+        ca_exists,
+        generate_ca,
+        is_ca_trusted,
+        trust_ca_system,
+    )
+    from matrx.cli.cursor_proxy import DEFAULT_PORT, PROXY_HOST
+    from matrx.cli.cursor_service import (
+        get_proxy_status,
+        install_service,
+        is_proxy_running,
+        uninstall_service,
+    )
+
+    route = args.route
+
+    # --status: just report proxy health
+    if args.status:
+        status = get_proxy_status()
+        if status:
+            print("MTRX Cursor proxy: running")
+            print(f"  requests processed: {status.get('requests', '?')}")
+        else:
+            print("MTRX Cursor proxy: not running")
+        return 0
+
+    # --stop: tear down the proxy
+    if args.stop:
+        _restore_cursor_if_needed()
+        print("Cursor route set to direct — MTRX proxy disabled.")
+        return 0
 
     state = load_state()
     route, promoted = _maybe_promote_direct_route(state, "cursor", route)
     effective_route = resolve_route(state, "cursor", route)
 
     if effective_route == "direct":
+        _restore_cursor_if_needed()
         print("Cursor route set to direct — MTRX proxy disabled.")
+        if cursor_is_running():
+            print("  Restart Cursor for settings to take effect.")
         return 0
 
+    # --- matrx route: set up the MITM proxy ---
+
     try:
         state, login_changed = _complete_matrx_login(state)
     except ValueError as exc:
@@ -810,11 +898,9 @@ def _cmd_cursor(route: str | None, port: int) -> int:
         print("No Matrx key available. Run: mtrx login matrx --key mx_...", file=sys.stderr)
         return 1
 
-    matrx_base_url = ensure_root_url(state.get("auth", {}).get("matrx", {}).get("base_url"))
-
-    binding = get_workspace_binding(state, cwd=os.getcwd()) or {}
-    group_id = (os.environ.get("MTRX_GROUP_ID") or binding.get("group_id") or "").strip()
-    project_id = (os.environ.get("MTRX_PROJECT_ID") or binding.get("project_id") or "").strip()
+    matrx_base_url = ensure_root_url(
+        state.get("auth", {}).get("matrx", {}).get("base_url")
+    )
 
     if initialized or login_changed or promoted:
         save_state(state)
@@ -824,71 +910,66 @@ def _cmd_cursor(route: str | None, port: int) -> int:
             "Use `mtrx use cursor direct` to opt out.",
         )
 
-    proxy = CursorProxyServer(
-        matrx_key=mx_key,
-        matrx_base_url=matrx_base_url,
-        group_id=group_id,
-        project_id=project_id,
-        port=port,
-    )
-    try:
-        proxy.start_background()
-    except RuntimeError as exc:
-        print(f"Failed to start proxy: {exc}", file=sys.stderr)
-        return 1
-
-    proxy_url = proxy.url
-    print(f"MTRX Cursor proxy running at {proxy_url}")
-    print(f"  session:    {proxy.session_id}")
-    print(f"  matrx_key:  {mask_secret(mx_key)}")
-    print(f"  upstream:   {matrx_base_url}")
-    if group_id:
-        print(f"  group:      {group_id}")
-    if project_id:
-        print(f"  project:    {project_id}")
-
-    previous_settings = None
-    db_path = cursor_state_db_path()
-    if db_path.exists():
-        if cursor_is_running():
-            print()
-            print("  [warn] Cursor is currently running.")
-            print("  Settings changes may require restarting Cursor to take effect.")
-        previous_settings = configure_cursor_for_proxy(proxy_url, db_path=db_path)
-        if previous_settings is not None:
-            print()
-            print("  Cursor settings configured automatically.")
-            print("  Restart Cursor if it is already open.")
+    # Step 1: Generate CA certificate if needed
+    if not ca_exists():
+        print("Generating MTRX CA certificate...")
+        generate_ca()
+        print(f"  CA cert: {ca_cert_path()}")
+
+    # Step 2: Trust CA (one-time)
+    if not is_ca_trusted():
+        print("Trusting MTRX CA certificate (may require password)...")
+        if trust_ca_system():
+            print("  CA trusted in system keychain.")
         else:
-            print_manual_setup_instructions(proxy_url)
-    else:
-        print_manual_setup_instructions(proxy_url)
-
-    print()
-    print("Press Ctrl+C to stop the proxy and restore settings.")
-
-    stop_event = threading.Event()
+            print(
+                f"  [warn] Could not auto-trust CA. Cursor needs NODE_EXTRA_CA_CERTS={ca_cert_path()}"
+            )
+            print(
+                "  You can manually trust it or set the env var before launching Cursor."
+            )
 
-    def _on_signal(sig, frame):
-        stop_event.set()
+    # Step 3: Install and start the proxy service
+    proxy_url = f"http://{PROXY_HOST}:{DEFAULT_PORT}"
+    if is_proxy_running():
+        print(f"MTRX proxy already running on {proxy_url}")
+    else:
+        print("Starting MTRX Cursor proxy service...")
+        if install_service(
+            matrx_key=mx_key,
+            matrx_base_url=matrx_base_url,
+            host=PROXY_HOST,
+            port=DEFAULT_PORT,
+        ):
+            print(f"  Proxy running on {proxy_url}")
+        else:
+            print("[warn] Proxy service may not have started. Check logs at:")
+            print(f"  {config_dir() / 'logs' / 'cursor-proxy.err.log'}")
 
-    _signal.signal(_signal.SIGINT, _on_signal)
-    _signal.signal(_signal.SIGTERM, _on_signal)
+    # Step 4: Configure Cursor's settings.json
+    conf_dir = config_dir()
+    conf_dir.mkdir(parents=True, exist_ok=True)
 
-    stop_event.wait()
+    previous = configure_cursor_proxy_settings(
+        proxy_url=proxy_url,
+        ca_cert_path=str(ca_cert_path()),
+    )
+    prev_path = conf_dir / "cursor-proxy-previous-settings.json"
+    prev_path.write_text(_json.dumps(previous), encoding="utf-8")
 
     print()
-    print("Shutting down MTRX Cursor proxy...")
-    proxy.stop()
-
-    if previous_settings is not None:
-        if restore_cursor_settings(previous_settings, db_path=db_path):
-            print("Cursor settings restored to previous values.")
-        else:
-            print("[warn] Could not restore Cursor settings automatically.")
-            print("  You may need to reset your OpenAI API Key and Base URL in Cursor Settings > Models.")
-
-    print("Done.")
+    print("Cursor configured to route ALL traffic through MTRX.")
+    print(f"  proxy:      {proxy_url}")
+    print(f"  ca_cert:    {ca_cert_path()}")
+    print(f"  telemetry:  {matrx_base_url}/v1/telemetry/cursor")
+    print()
+    if cursor_is_running():
+        print("  Cursor is running — restart it for settings to take effect.")
+    else:
+        print("  Settings will apply next time Cursor starts.")
+    print()
+    print("  Check status: mtrx cursor --status")
+    print("  To disable:   mtrx use cursor direct")
     return 0