mtrx-cli 0.1.4 → 0.1.6

package/package.json

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

package/src/matrx/cli/launcher.py

@@ -221,7 +221,16 @@ def codex_auth_path() -> Path:
 
 def claude_oauth_available() -> bool:
     token = read_claude_oauth_token()
-    return bool(token)
+    if token:
+        return True
+    state = _read_claude_app_state()
+    oauth_account = state.get("oauthAccount")
+    if not isinstance(oauth_account, dict):
+        return False
+    return bool(
+        (oauth_account.get("accountUuid") or "").strip()
+        or (oauth_account.get("emailAddress") or "").strip()
+    )
 
 
 def read_claude_oauth_token() -> str | None:
@@ -500,6 +509,7 @@ def _build_claude_env(
         env_b64 = base64.b64encode(json.dumps(env_snap).encode()).decode() if env_snap else ""
         custom_headers = "\n".join(
             [
+                f"x-matrx-key: {mx_key}",
                 "x-matrx-agent-id: claude-cli",
                 "x-matrx-provider: claude_code",
                 f"x-matrx-session-id: {session_id}",

package/src/matrx/cli/main.py

@@ -263,11 +263,13 @@ def _complete_codex_login() -> None:
 
 
 def _complete_claude_login(state: dict) -> tuple[dict, bool]:
-    token = (read_claude_oauth_token() or "").strip()
-    if token:
+    imported = (state.get("auth", {}).get("claude_code", {}).get("oauth_token") or "").strip()
+    if imported or claude_oauth_available():
         return state, False
     if not _is_interactive_terminal():
-        raise ValueError("Claude login required. Run: claude auth login")
+        raise ValueError(
+            "Claude login required. Run: claude auth login"
+        )
 
     print("Claude login required.")
     if not _prompt_yes_no("Run `claude auth login` now?", default=True):
@@ -275,8 +277,7 @@ def _complete_claude_login(state: dict) -> tuple[dict, bool]:
 
     executable = find_executable("claude") or "claude"
     result = subprocess.run([executable, "auth", "login"], check=False)
-    token = (read_claude_oauth_token() or "").strip()
-    if result.returncode != 0 or not token:
+    if result.returncode != 0 or not claude_oauth_available():
         raise ValueError("Claude login did not complete successfully")
 
     return state, False
@@ -310,7 +311,11 @@ def _cmd_login(args) -> int:
         token = read_claude_oauth_token()
         if not token:
             print(
-                f"No Claude OAuth token found at {claude_credentials_path()}",
+                (
+                    f"No Claude OAuth token found at {claude_credentials_path()}. "
+                    "If your Claude install no longer writes that file, use the browser-based "
+                    "`mtrx claude` flow instead, or run `claude setup-token` and import that token."
+                ),
                 file=sys.stderr,
             )
             return 1