mtrx-cli 0.1.6 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mtrx-cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "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.6"
+__version__ = "0.1.8"

package/src/matrx/cli/launcher.py

@@ -170,13 +170,6 @@ def prepare_routed_setup(
         changed = True
     if route == "matrx" and _persist_workspace_binding_from_env(state, env):
         changed = True
-    if route == "matrx" and tool == "claude":
-        mx_key, _ = _resolve_matrx_route_key(state, env)
-        if _approve_claude_custom_api_key(mx_key):
-            changed = True
-        if _sync_claude_subscription_to_matrx(state, env):
-            changed = True
-
     if _sync_tool_route_config(state, tool=tool, route=route):
         changed = True
 
@@ -500,8 +493,8 @@ def _build_claude_env(
         env.pop("MATRX_CLAUDE_MODE", None)
         env["MATRX_BASE_URL"] = proxy_root
         env["MATRX_API_KEY"] = mx_key
-        env["ANTHROPIC_BASE_URL"] = proxy_base
-        env["ANTHROPIC_API_KEY"] = mx_key
+        env["ANTHROPIC_BASE_URL"] = proxy_root
+        env.pop("ANTHROPIC_API_KEY", None)
         group_id, project_id = _resolve_matrx_context_overrides(state, env)
         session_id = str(uuid.uuid4())
         # Evolutionary scaffolding: env snapshot for AI context injection
@@ -568,7 +561,7 @@ def _validate_claude_launch_plan(plan: LaunchPlan, state: dict) -> None:
         return
 
     base_url = (plan.env.get("ANTHROPIC_BASE_URL") or "").strip()
-    expected_base_url = ensure_v1_url(state.get("auth", {}).get("matrx", {}).get("base_url"))
+    expected_base_url = ensure_root_url(state.get("auth", {}).get("matrx", {}).get("base_url"))
     if not base_url:
         raise ValueError("Claude Matrx route is missing ANTHROPIC_BASE_URL")
     if base_url != expected_base_url:
@@ -581,14 +574,12 @@ def _validate_claude_launch_plan(plan: LaunchPlan, state: dict) -> None:
     if not mx_key.startswith("mx_"):
         raise ValueError("Claude Matrx route is missing a valid MATRX_API_KEY")
 
-    anthropic_key = (plan.env.get("ANTHROPIC_API_KEY") or "").strip()
-    if anthropic_key != mx_key:
-        raise ValueError("Claude Matrx route must set ANTHROPIC_API_KEY to the same mx_ key as MATRX_API_KEY")
-
     custom_headers = (plan.env.get("ANTHROPIC_CUSTOM_HEADERS") or "").strip()
     if not custom_headers:
         raise ValueError("Claude Matrx route is missing ANTHROPIC_CUSTOM_HEADERS")
     lowered_headers = custom_headers.lower()
+    if "x-matrx-key:" not in lowered_headers:
+        raise ValueError("Claude Matrx route is missing ANTHROPIC_CUSTOM_HEADERS with X-Matrx-Key")
     if "x-matrx-session-id:" not in lowered_headers:
         raise ValueError("Claude Matrx route is missing ANTHROPIC_CUSTOM_HEADERS with X-Matrx-Session-Id")
     if "x-matrx-provider: claude_code" not in lowered_headers:
@@ -598,6 +589,8 @@ def _validate_claude_launch_plan(plan: LaunchPlan, state: dict) -> None:
 
     if plan.env.get("ANTHROPIC_AUTH_TOKEN"):
         raise ValueError("Claude Matrx route should not set ANTHROPIC_AUTH_TOKEN")
+    if plan.env.get("ANTHROPIC_API_KEY"):
+        raise ValueError("Claude Matrx route should not set ANTHROPIC_API_KEY")
 
 
 def _validate_codex_launch_plan(plan: LaunchPlan, state: dict) -> None:
@@ -647,15 +640,14 @@ def describe_launch_plan(plan: LaunchPlan, state: dict) -> list[str]:
         ]
 
     if plan.tool == "claude":
-        base_url = ensure_v1_url(state.get("auth", {}).get("matrx", {}).get("base_url"))
+        base_url = ensure_root_url(state.get("auth", {}).get("matrx", {}).get("base_url"))
         custom_headers = (plan.env.get("ANTHROPIC_CUSTOM_HEADERS") or "").strip()
-        anthropic_key = (plan.env.get("ANTHROPIC_API_KEY") or "").strip()
         return [
             "Launching claude via Matrx",
             f"  base_url: {base_url or DEFAULT_MATRX_BASE_URL}",
             f"  auth_source: {plan.auth_source}",
             f"  custom_headers_present: {bool(custom_headers)}",
-            f"  proxy_key_present: {anthropic_key.startswith('mx_')}",
+            f"  proxy_key_present: {'x-matrx-key:' in custom_headers.lower()}",
             f"  subscription_token_available: {bool(_resolve_claude_subscription_token(state))}",
             "  runtime_route: env injection",
             "  persistent_route: disabled",

package/src/matrx/cli/main.py

@@ -226,9 +226,9 @@ def _run_matrx_browser_login(
     return result
 
 
-def _complete_matrx_login(state: dict) -> tuple[dict, bool]:
+def _complete_matrx_login(state: dict, *, force: bool = False) -> tuple[dict, bool]:
     auth_cfg = state.setdefault("auth", {}).setdefault("matrx", {})
-    if _has_matrx_login(state, env=os.environ):
+    if not force and _has_matrx_login(state, env=os.environ):
         return state, False
     if not _is_interactive_terminal():
         raise ValueError("Login required. Run: mtrx login matrx --key mx_... or set MTRX_KEY")
@@ -263,8 +263,7 @@ def _complete_codex_login() -> None:
 
 
 def _complete_claude_login(state: dict) -> tuple[dict, bool]:
-    imported = (state.get("auth", {}).get("claude_code", {}).get("oauth_token") or "").strip()
-    if imported or claude_oauth_available():
+    if claude_oauth_available():
         return state, False
     if not _is_interactive_terminal():
         raise ValueError(
@@ -335,12 +334,12 @@ def _cmd_login(args) -> int:
                 None,
                 base_url=state["auth"]["matrx"].get("base_url"),
             )
-        if not key:
+        if args.web or not key:
             if not args.web and not _is_interactive_terminal():
                 print("--key is required for non-interactive Matrx login", file=sys.stderr)
                 return 1
             try:
-                state, changed = _complete_matrx_login(state)
+                state, changed = _complete_matrx_login(state, force=args.web)
             except ValueError as exc:
                 print(str(exc), file=sys.stderr)
                 return 1