mtrx-cli 0.1.10 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mtrx-cli",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "MATRX CLI for routing Codex and Claude through Matrx",
   "homepage": "https://mtrx.so",
   "repository": {

package/src/matrx/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.10"
+__version__ = "0.1.11"

package/src/matrx/cli/main.py

@@ -38,8 +38,8 @@ from matrx.cli.cursor_config import (
     read_cursor_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 +74,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.route)
 
     parser.print_help()
     return 1
@@ -115,7 +115,6 @@ 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)
 
     return parser
 
@@ -489,9 +488,30 @@ 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
+    prev_path = config_dir() / "cursor-previous-settings.json"
+    db_path = cursor_state_db_path()
+    if not prev_path.exists() or not db_path.exists():
+        return
+    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 settings restored to previous values.")
+        else:
+            print("[warn] Could not auto-restore Cursor 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"]
@@ -780,15 +800,30 @@ 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(route: str | None) -> int:
     state = load_state()
     route, promoted = _maybe_promote_direct_route(state, "cursor", route)
     effective_route = resolve_route(state, "cursor", route)
 
+    db_path = cursor_state_db_path()
+
     if effective_route == "direct":
+        if db_path.exists():
+            previous_json = config_dir() / "cursor-previous-settings.json"
+            if previous_json.exists():
+                import json as _json
+                try:
+                    previous = _json.loads(previous_json.read_text(encoding="utf-8"))
+                    if restore_cursor_settings(previous, db_path=db_path):
+                        previous_json.unlink(missing_ok=True)
+                        print("Cursor settings restored to previous values.")
+                    else:
+                        print("[warn] Could not restore Cursor settings automatically.")
+                except Exception:
+                    pass
         print("Cursor route set to direct — MTRX proxy disabled.")
+        if cursor_is_running():
+            print("  Restart Cursor for settings to take effect.")
         return 0
 
     try:
@@ -811,10 +846,7 @@ def _cmd_cursor(route: str | None, port: int) -> int:
         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()
+    proxy_url = f"{matrx_base_url.rstrip('/')}/v1"
 
     if initialized or login_changed or promoted:
         save_state(state)
@@ -824,71 +856,34 @@ 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.")
-        else:
-            print_manual_setup_instructions(proxy_url)
-    else:
+    if not db_path.exists():
         print_manual_setup_instructions(proxy_url)
+        print(f"  Use API Key: {mx_key}")
+        return 0
 
-    print()
-    print("Press Ctrl+C to stop the proxy and restore settings.")
-
-    stop_event = threading.Event()
-
-    def _on_signal(sig, frame):
-        stop_event.set()
-
-    _signal.signal(_signal.SIGINT, _on_signal)
-    _signal.signal(_signal.SIGTERM, _on_signal)
+    previous_settings = configure_cursor_for_proxy(
+        proxy_url, proxy_api_key=mx_key, db_path=db_path,
+    )
+    if previous_settings is None:
+        print_manual_setup_instructions(proxy_url)
+        print(f"  Use API Key: {mask_secret(mx_key)}")
+        return 0
 
-    stop_event.wait()
+    import json as _json
+    prev_path = config_dir() / "cursor-previous-settings.json"
+    config_dir().mkdir(parents=True, exist_ok=True)
+    prev_path.write_text(_json.dumps(previous_settings), encoding="utf-8")
 
+    print("Cursor configured to route through MTRX.")
+    print(f"  base_url:   {proxy_url}")
+    print(f"  api_key:    {mask_secret(mx_key)}")
     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.")
+    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("  To disable: mtrx use cursor direct")
     return 0