mtrx-cli 0.1.23 → 0.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mtrx-cli",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "MATRX CLI for routing Codex, Claude, and Cursor through Matrx",
   "homepage": "https://mtrx.so",
   "repository": {
@@ -33,6 +33,8 @@
     "src/matrx/cli/cursor_proxy.py",
     "src/matrx/cli/cursor_reroute.py",
     "src/matrx/cli/cursor_service.py",
+    "src/matrx/cli/bootstrap.py",
+    "src/matrx/cli/gemini_env_bootstrap.cjs",
     "src/matrx/cli/launcher.py",
     "src/matrx/cli/main.py",
     "src/matrx/cli/project_cmds.py",

package/src/matrx/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.23"
+__version__ = "0.1.24"

package/src/matrx/cli/bootstrap.py

@@ -0,0 +1,119 @@
+"""
+Bootstrap command — warms the system registry for an existing project.
+Called by `mtrx init`.
+"""
+from __future__ import annotations
+
+import json
+import subprocess
+from pathlib import Path
+
+_DEFAULT_SYSTEMS_TEMPLATE = [
+    {
+        "id": "memory",
+        "name": "Memory System",
+        "description": "Memory flywheel: extract, store, retrieve, inject",
+        "file_patterns": ["core/memory.py", "services/memory.py", "core/extractor.py", "core/profile_builder.py"]
+    },
+    {
+        "id": "proxy",
+        "name": "Proxy Service",
+        "description": "Intercepts all LLM calls, applies compression + injection",
+        "file_patterns": ["services/proxy.py", "core/compressor.py", "core/summarizer.py"]
+    },
+    {
+        "id": "auth",
+        "name": "Auth & Multi-Org",
+        "description": "Clerk JWT validation, org/project scoping, API keys",
+        "file_patterns": ["middleware/auth.py", "api/auth.py", "api/orgs.py", "models/org_member.py"]
+    },
+    {
+        "id": "analytics",
+        "name": "Analytics",
+        "description": "Usage snapshots, memory hit rate, token tracking",
+        "file_patterns": ["services/analytics.py", "api/analytics.py"]
+    },
+]
+
+
+def run_init(project_root: str = ".") -> None:
+    """Entry point for `mtrx init`."""
+    root = Path(project_root).resolve()
+    print(f"Matrx init: analyzing {root}")
+
+    # Step 1: Load or create .matrx/systems.json
+    matrx_dir = root / ".matrx"
+    matrx_dir.mkdir(exist_ok=True)
+    systems_path = matrx_dir / "systems.json"
+
+    if not systems_path.exists():
+        _seed_systems_json(root, systems_path)
+        print(f"  Created {systems_path}")
+    else:
+        print(f"  Found existing {systems_path}")
+
+    # Step 2: Analyze git log for hot systems
+    hot_files = _get_hot_files(root, days=30)
+    print(f"  Found {len(hot_files)} recently modified files")
+
+    # Step 3: Map to systems
+    systems = json.loads(systems_path.read_text()).get("systems", [])
+    hot_systems = _rank_systems_by_activity(hot_files, systems)
+
+    if hot_systems:
+        print("\n  Active systems detected:")
+        for sys_id, count, depth in hot_systems:
+            meta = next((s for s in systems if s["id"] == sys_id), None)
+            if meta:
+                print(f"    {meta['name']:<25} {count:>3} touches → {depth} card")
+    else:
+        print("\n  No recently active systems detected (no git history or no matches).")
+
+    print(f"\n  Matrx will generate cards for detected systems on first use.")
+    print(f"  Run your agent — cards will be ready within the first few calls.\n")
+    print("  Done.")
+
+
+def _get_hot_files(root: Path, days: int = 30) -> dict[str, int]:
+    """Parse git log, return file → touch count mapping."""
+    try:
+        result = subprocess.run(
+            ["git", "log", f"--since={days} days ago", "--name-only", "--pretty=format:"],
+            cwd=root, capture_output=True, text=True, timeout=10,
+        )
+        counts: dict[str, int] = {}
+        for line in result.stdout.splitlines():
+            line = line.strip()
+            if line and not line.startswith("commit"):
+                counts[line] = counts.get(line, 0) + 1
+        return counts
+    except Exception:
+        return {}
+
+
+def _rank_systems_by_activity(
+    hot_files: dict[str, int], systems: list[dict]
+) -> list[tuple[str, int, str]]:
+    """Return [(system_id, touch_count, depth)] sorted by activity."""
+    ranked = []
+    for s in systems:
+        patterns = s.get("file_patterns", [])
+        total = sum(
+            count for f, count in hot_files.items()
+            if any(pat in f or f.endswith(pat) for pat in patterns)
+        )
+        if total > 0:
+            ranked.append((s["id"], total, "standard"))
+
+    ranked.sort(key=lambda x: x[1], reverse=True)
+    # Re-assign depths by rank
+    result = []
+    for i, (sid, count, _) in enumerate(ranked):
+        depth = "full" if i < 3 else ("standard" if i < 8 else "distilled")
+        result.append((sid, count, depth))
+    return result
+
+
+def _seed_systems_json(root: Path, out_path: Path) -> None:
+    """Write default systems.json. Users can hand-edit afterward."""
+    out_path.write_text(json.dumps({"systems": _DEFAULT_SYSTEMS_TEMPLATE}, indent=2))

package/src/matrx/cli/gemini_env_bootstrap.cjs

@@ -0,0 +1,34 @@
+"use strict";
+
+function decodeBase64Env(name) {
+  const value = process.env[name];
+  if (!value) {
+    return undefined;
+  }
+  try {
+    return Buffer.from(value, "base64").toString("utf8");
+  } catch {
+    return undefined;
+  }
+}
+
+const envMappings = [
+  ["MTRX_GEMINI_CUSTOM_HEADERS_B64", "GEMINI_CLI_CUSTOM_HEADERS"],
+  ["MTRX_CODE_ASSIST_ENDPOINT_B64", "CODE_ASSIST_ENDPOINT"],
+  ["MTRX_GEMINI_API_ENDPOINT_B64", "GEMINI_API_ENDPOINT"],
+];
+
+for (const [sourceName, targetName] of envMappings) {
+  const decoded = decodeBase64Env(sourceName);
+  if (decoded && !process.env[targetName]) {
+    process.env[targetName] = decoded;
+  }
+}
+
+if (
+  process.env.MTRX_GEMINI_API_KEY_AUTH_MECHANISM &&
+  !process.env.GEMINI_API_KEY_AUTH_MECHANISM
+) {
+  process.env.GEMINI_API_KEY_AUTH_MECHANISM =
+    process.env.MTRX_GEMINI_API_KEY_AUTH_MECHANISM;
+}

package/src/matrx/cli/launcher.py

@@ -95,6 +95,46 @@ def _runtime_agent_basename(tool: str) -> tuple[str, str, list[str], str]:
     return normalized, f"{tool.capitalize()} CLI", ["cli", tool], tool
 
 
+def _append_sandbox_env(env: dict[str, str], key: str, value: str | None) -> None:
+    if not value:
+        return
+    entry = f"{key}={value}"
+    existing = [item.strip() for item in (env.get("SANDBOX_ENV") or "").split(",") if item.strip()]
+    filtered = [item for item in existing if not item.startswith(f"{key}=")]
+    filtered.append(entry)
+    env["SANDBOX_ENV"] = ",".join(filtered)
+
+
+def _remove_sandbox_env_keys(env: dict[str, str], keys: tuple[str, ...]) -> None:
+    existing = [item.strip() for item in (env.get("SANDBOX_ENV") or "").split(",") if item.strip()]
+    filtered = [
+        item for item in existing
+        if not any(item.startswith(f"{key}=") for key in keys)
+    ]
+    if filtered:
+        env["SANDBOX_ENV"] = ",".join(filtered)
+    else:
+        env.pop("SANDBOX_ENV", None)
+
+
+def _ensure_node_require(env: dict[str, str], script_path: str) -> None:
+    require_flag = f"--require={script_path}"
+    existing = (env.get("NODE_OPTIONS") or "").strip()
+    if require_flag in existing.split():
+        return
+    env["NODE_OPTIONS"] = f"{existing} {require_flag}".strip()
+
+
+def _remove_node_require(env: dict[str, str], script_path: str) -> None:
+    require_flag = f"--require={script_path}"
+    existing = (env.get("NODE_OPTIONS") or "").split()
+    filtered = [part for part in existing if part != require_flag]
+    if filtered:
+        env["NODE_OPTIONS"] = " ".join(filtered)
+    else:
+        env.pop("NODE_OPTIONS", None)
+
+
 def configured_route(state: dict, tool: str) -> str | None:
     route = state.get("defaults", {}).get(tool)
     if route in VALID_ROUTES:
@@ -467,6 +507,20 @@ def _capture_git_context(cwd: str | None = None) -> tuple[str, str]:
     return branch, commit
 
 
+def _capture_git_remote_url(cwd: str | None = None) -> str:
+    root = cwd or os.getcwd()
+    try:
+        r = subprocess.run(
+            ["git", "-C", root, "remote", "get-url", "origin"],
+            capture_output=True, text=True, timeout=2, check=False,
+        )
+        if r.returncode == 0:
+            return r.stdout.strip()
+    except (OSError, subprocess.SubprocessError):
+        pass
+    return ""
+
+
 def _resolve_matrx_context_overrides(
     state: dict,
     env: dict[str, str],
@@ -544,10 +598,13 @@ def _build_codex_env(
         if project_id:
             header_parts.append(f'"X-Matrx-Project-Id" = "{project_id}"')
         _git_branch, _git_commit = _capture_git_context(_workspace_cwd(env))
+        _git_repo_url = _capture_git_remote_url(_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 _git_repo_url:
+            header_parts.append(f'"X-Matrx-Repo-Url" = "{_git_repo_url}"')
         if env_b64:
             header_parts.append(f'"X-Matrx-Env" = "{env_b64}"')
         headers_str = ", ".join(header_parts)
@@ -589,6 +646,7 @@ def _build_gemini_env(
     proxy_base = ensure_v1_url(matrx.get("base_url"))
     mx_key, matrx_auth_source = _resolve_matrx_route_key(state, env)
     direct_key = (env.get("GEMINI_API_KEY") or env.get("GOOGLE_API_KEY") or "").strip()
+    bootstrap_script = str(Path(__file__).with_name("gemini_env_bootstrap.cjs").resolve())
 
     if route == "matrx":
         if not mx_key:
@@ -610,6 +668,7 @@ def _build_gemini_env(
         if runtime_agent_id:
             ctx_params.append(f"mtrx_agent={runtime_agent_id}")
         git_branch, git_commit = _capture_git_context(_workspace_cwd(env))
+        git_repo_url = _capture_git_remote_url(_workspace_cwd(env))
         if git_branch:
             ctx_params.append(f"mtrx_branch={git_branch}")
         if git_commit:
@@ -632,6 +691,8 @@ def _build_gemini_env(
             custom_headers.append(f"x-matrx-branch: {git_branch}")
         if git_commit:
             custom_headers.append(f"x-matrx-commit: {git_commit}")
+        if git_repo_url:
+            custom_headers.append(f"x-matrx-repo-url: {git_repo_url}")
         if env_b64:
             custom_headers.append(f"x-matrx-env: {env_b64}")
 
@@ -641,6 +702,27 @@ def _build_gemini_env(
         env["CODE_ASSIST_ENDPOINT"] = proxy_base
         env["GEMINI_CLI_CUSTOM_HEADERS"] = ", ".join(custom_headers)
         env["GEMINI_API_KEY_AUTH_MECHANISM"] = "bearer"
+        _ensure_node_require(env, bootstrap_script)
+        _append_sandbox_env(
+            env,
+            "MTRX_GEMINI_CUSTOM_HEADERS_B64",
+            base64.b64encode(env["GEMINI_CLI_CUSTOM_HEADERS"].encode("utf-8")).decode("ascii"),
+        )
+        _append_sandbox_env(
+            env,
+            "MTRX_CODE_ASSIST_ENDPOINT_B64",
+            base64.b64encode(env["CODE_ASSIST_ENDPOINT"].encode("utf-8")).decode("ascii"),
+        )
+        _append_sandbox_env(
+            env,
+            "MTRX_GEMINI_API_ENDPOINT_B64",
+            base64.b64encode(env["GEMINI_API_ENDPOINT"].encode("utf-8")).decode("ascii"),
+        )
+        _append_sandbox_env(
+            env,
+            "MTRX_GEMINI_API_KEY_AUTH_MECHANISM",
+            env["GEMINI_API_KEY_AUTH_MECHANISM"],
+        )
 
         return env, matrx_auth_source
 
@@ -655,6 +737,16 @@ def _build_gemini_env(
         value = (env.get(key) or "").strip()
         if "matrx" in value.lower() or "mtrx.so" in value.lower():
             env.pop(key, None)
+    _remove_node_require(env, bootstrap_script)
+    _remove_sandbox_env_keys(
+        env,
+        (
+            "MTRX_GEMINI_CUSTOM_HEADERS_B64",
+            "MTRX_CODE_ASSIST_ENDPOINT_B64",
+            "MTRX_GEMINI_API_ENDPOINT_B64",
+            "MTRX_GEMINI_API_KEY_AUTH_MECHANISM",
+        ),
+    )
 
     custom_headers = (env.get("GEMINI_CLI_CUSTOM_HEADERS") or "").strip().lower()
     if "x-matrx-" in custom_headers:
@@ -718,10 +810,13 @@ def _build_claude_env(
         if project_id:
             custom_headers += f"\nx-matrx-project-id: {project_id}"
         _git_branch, _git_commit = _capture_git_context(_workspace_cwd(env))
+        _git_repo_url = _capture_git_remote_url(_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 _git_repo_url:
+            custom_headers += f"\nx-matrx-repo-url: {_git_repo_url}"
         if env_b64:
             custom_headers += f"\nx-matrx-env: {env_b64}"
         env["ANTHROPIC_CUSTOM_HEADERS"] = custom_headers
@@ -973,6 +1068,12 @@ def _validate_gemini_launch_plan(plan: LaunchPlan, state: dict) -> None:
     if "x-matrx-agent-id:" not in custom_headers:
         raise ValueError("Gemini Matrx route is missing GEMINI_CLI_CUSTOM_HEADERS with X-Matrx-Agent-Id")
 
+    sandbox_env = (plan.env.get("SANDBOX_ENV") or "").strip()
+    if "MTRX_GEMINI_CUSTOM_HEADERS_B64=" not in sandbox_env:
+        raise ValueError("Gemini Matrx route is missing sandbox bootstrap for GEMINI_CLI_CUSTOM_HEADERS")
+    if "MTRX_CODE_ASSIST_ENDPOINT_B64=" not in sandbox_env:
+        raise ValueError("Gemini Matrx route is missing sandbox bootstrap for CODE_ASSIST_ENDPOINT")
+
 
 def _validate_codex_launch_plan(plan: LaunchPlan, state: dict) -> None:
     if plan.route != "matrx":

package/src/matrx/cli/main.py

@@ -144,7 +144,7 @@ def _build_parser() -> argparse.ArgumentParser:
     cursor.add_argument(
         "--launch",
         action="store_true",
-        help="Launch Cursor with proxy env (required for traffic to flow)",
+        help="Launch Cursor after applying the current Matrx settings",
     )
 
     return parser
@@ -932,6 +932,7 @@ def _cmd_launch(tool: str, route: str | None, remainder: list[str]) -> int:
 
 def _cmd_cursor(args) -> int:
     from matrx.cli.cursor_hooks import install_mtrx_hooks, is_mtrx_hooks_installed
+    from matrx.cli.cursor_service import is_proxy_running
     from matrx.cli.cursor_launcher import find_cursor_executable
 
     route = args.route
@@ -942,10 +943,13 @@ def _cmd_cursor(args) -> int:
         hooks_installed = is_mtrx_hooks_installed()
         base_url = ensure_v1_url(state.get("auth", {}).get("matrx", {}).get("base_url"))
         prev_path = config_dir() / "cursor-previous-settings.json"
+        legacy_proxy_prev_path = config_dir() / "cursor-proxy-previous-settings.json"
         configured = prev_path.exists()
+        legacy_proxy_active = is_proxy_running() or legacy_proxy_prev_path.exists()
         print("MTRX Cursor integration:")
         print(f"  mode: {'Base URL override (all models)' if configured else 'not configured'}")
         print(f"  hooks: {'active (sessionEnd, stop → telemetry)' if hooks_installed else 'not installed'}")
+        print(f"  legacy MITM proxy: {'active' if legacy_proxy_active else 'not active'}")
         if configured:
             print(f"  matrx: {base_url}")
         return 0
@@ -1001,6 +1005,11 @@ def _cmd_cursor(args) -> int:
             "Use `mtrx use cursor direct` to opt out.",
         )
 
+    # Ensure legacy MITM routing is fully torn down before enabling the
+    # current Cursor base-URL override flow. Leaving both active causes
+    # Cursor traffic to keep flowing through the old telemetry proxy.
+    _restore_cursor_if_needed()
+
     # Configure Cursor's Override Base URL — sends chat to MTRX (any model: Claude, GPT-5, Gemini, etc.)
     prev_path = config_dir() / "cursor-previous-settings.json"
     previous = configure_cursor_for_proxy(matrx_proxy_url, mx_key)