mtrx-cli 0.1.20 → 0.1.21

package/package.json

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

package/src/matrx/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.19"
+__version__ = "0.1.21"

package/src/matrx/cli/launcher.py

@@ -537,6 +537,11 @@ def _build_codex_env(
             header_parts.append(f'"X-Matrx-Group" = "{group_id}"')
         if project_id:
             header_parts.append(f'"X-Matrx-Project-Id" = "{project_id}"')
+        _git_branch, _git_commit = _capture_git_context(_workspace_cwd(env))
+        if _git_branch:
+            header_parts.append(f'"X-Matrx-Branch" = "{_git_branch}"')
+        if _git_commit:
+            header_parts.append(f'"X-Matrx-Commit" = "{_git_commit}"')
         if env_b64:
             header_parts.append(f'"X-Matrx-Env" = "{env_b64}"')
         headers_str = ", ".join(header_parts)
@@ -680,6 +685,11 @@ def _build_claude_env(
             custom_headers += f"\nx-matrx-group: {group_id}"
         if project_id:
             custom_headers += f"\nx-matrx-project-id: {project_id}"
+        _git_branch, _git_commit = _capture_git_context(_workspace_cwd(env))
+        if _git_branch:
+            custom_headers += f"\nx-matrx-branch: {_git_branch}"
+        if _git_commit:
+            custom_headers += f"\nx-matrx-commit: {_git_commit}"
         if env_b64:
             custom_headers += f"\nx-matrx-env: {env_b64}"
         env["ANTHROPIC_CUSTOM_HEADERS"] = custom_headers

package/src/matrx/cli/main.py

@@ -466,10 +466,13 @@ def _cmd_login(args) -> int:
 
     key = (args.key or "").strip()
     if provider == "matrx":
+        url_changed = False
         if args.base_url:
             state["auth"]["matrx"]["base_url"] = args.base_url.strip()
+            url_changed = True
         if args.app_url:
             state["auth"]["matrx"]["app_url"] = args.app_url.strip()
+            url_changed = True
         elif not state["auth"]["matrx"].get("app_url"):
             state["auth"]["matrx"]["app_url"] = ensure_app_url(
                 None,
@@ -484,13 +487,14 @@ def _cmd_login(args) -> int:
             except ValueError as exc:
                 print(str(exc), file=sys.stderr)
                 return 1
-            if changed:
+            if changed or url_changed:
                 path = save_state(state)
                 print(f"Saved {args.provider} credentials to {path}")
                 print(f"Matrx base URL: {ensure_v1_url(state['auth']['matrx']['base_url'])}")
                 return 0
-            print("Matrx login did not change the current state", file=sys.stderr)
-            return 1
+            if not url_changed:
+                print("Matrx login did not change the current state", file=sys.stderr)
+                return 1
 
     if not key:
         print("--key is required for this login command", file=sys.stderr)
@@ -585,11 +589,18 @@ def _cmd_status() -> int:
         print("Active project: none (run: mtrx project switch <name>)")
 
     print("Defaults:")
+    for tool in ("codex", "claude", "gemini", "cursor"):
+        route = configured_route(state, tool) or "not set"
+        print(f"  {tool}: {route}")
     print("Auth:")
+    config_base = auth["matrx"].get("base_url")
+    env_base = (os.environ.get("MATRX_BASE_URL") or "").strip()
+    effective_base = ensure_v1_url(env_base or config_base)
+    base_source = "MATRX_BASE_URL env" if env_base else "config"
     print(
         "  matrx: "
         f"{mask_secret(auth['matrx'].get('key'))} "
-        f"({ensure_v1_url(auth['matrx'].get('base_url'))})"
+        f"({effective_base}) [{base_source}]"
     )
     print(f"  matrx app: {ensure_app_url(auth['matrx'].get('app_url'), base_url=auth['matrx'].get('base_url'))}")
     print(f"  openai: {mask_secret(auth['openai'].get('key'))}")
@@ -617,6 +628,24 @@ def _cmd_status() -> int:
     proxy_running = is_proxy_running()
     print(f"  cursor proxy: {'running' if proxy_running else 'not running'}")
 
+    # Matrx API proxy health (when base_url configured)
+    base_url = auth["matrx"].get("base_url")
+    if base_url:
+        try:
+            health_url = f"{ensure_root_url(base_url).rstrip('/')}/health/wiring"
+            with httpx.Client(timeout=5) as client:
+                resp = client.get(health_url)
+            if resp.status_code == 200:
+                data = resp.json()
+                wiring = "ok" if data.get("proxy_wiring_ok") else "incomplete"
+                kv = data.get("key_vault", {})
+                enc = "configured" if kv.get("encryption_configured") else "not configured"
+                print(f"  matrx proxy: reachable (wiring={wiring}, key_vault={enc})")
+            else:
+                print(f"  matrx proxy: HTTP {resp.status_code}")
+        except Exception as exc:
+            print(f"  matrx proxy: unreachable ({exc})")
+
     print("Executables:")
     print(f"  codex: {find_executable('codex') or 'not found'}")
     print(f"  claude: {find_executable('claude') or 'not found'}")
@@ -822,6 +851,35 @@ def _cmd_doctor() -> int:
         else:
             print(f"[warn] {tool} native config not configured")
 
+    # Proxy health check — when using matrx route, verify server is reachable
+    base_url = state.get("auth", {}).get("matrx", {}).get("base_url")
+    mx_key = matrx_key or workspace_matrx_key or env_matrx_key
+    if base_url and mx_key:
+        try:
+            health_url = f"{ensure_root_url(base_url).rstrip('/')}/health/wiring"
+            with httpx.Client(timeout=10) as client:
+                resp = client.get(health_url)
+            if resp.status_code == 200:
+                data = resp.json()
+                if data.get("proxy_wiring_ok"):
+                    print("[ok] Matrx proxy reachable and wired")
+                else:
+                    comps = data.get("components", {})
+                    missing = [k for k, v in comps.items() if not v]
+                    print(f"[warn] Matrx proxy incomplete: missing {missing}")
+                kv = data.get("key_vault", {})
+                if not kv.get("encryption_configured"):
+                    print(
+                        "[warn] Key vault encryption not configured on server — "
+                        "provider keys may fail to decrypt; set KEY_VAULT_ENCRYPTION_KEY"
+                    )
+            else:
+                print(f"[warn] Matrx proxy health check failed: {resp.status_code}")
+        except httpx.HTTPError as exc:
+            print(f"[warn] Matrx proxy unreachable: {exc}")
+        except Exception as exc:
+            print(f"[warn] Matrx proxy check failed: {exc}")
+
     return 1 if failures else 0