codebrain 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

codebrain/__init__.py

@@ -7,4 +7,4 @@ try:
 except PackageNotFoundError:
     # Source checkout without installation (e.g. running from a worktree).
     # Keep in sync with [project.version] in pyproject.toml.
-    __version__ = "0.3.1"
+    __version__ = "0.3.3"

codebrain/cli.py

@@ -398,32 +398,34 @@ def setup(ctx: click.Context, force: bool) -> None:
         claude_md.write_text(content)
         click.echo(f"Created {claude_md}")
 
-    # 3. Configure MCP globally
-    settings_path = Path.home() / ".claude" / "settings.json"
-    settings_path.parent.mkdir(parents=True, exist_ok=True)
-    if settings_path.exists():
-        settings = json.loads(settings_path.read_text())
+    # 3. Configure MCP scoped to *this* project via .mcp.json
+    #
+    # Project-local config is the right scope: CodeBrain's DB lives in
+    # <repo>/.codebrain/, the MCP only makes sense for the repo it was
+    # indexed against, and a global config makes every Claude session in
+    # every project fight over the same DB and PID file.
+    mcp_config_path = repo_root / ".mcp.json"
+    if mcp_config_path.exists():
+        try:
+            mcp_config = json.loads(mcp_config_path.read_text())
+        except json.JSONDecodeError:
+            mcp_config = {}
+    else:
+        mcp_config = {}
+    mcp_config.setdefault("mcpServers", {})
+    if "codebrain" in mcp_config["mcpServers"] and not force:
+        click.echo(f"MCP server already configured in {mcp_config_path}")
     else:
-        settings = {}
-    if "mcpServers" not in settings:
-        settings["mcpServers"] = {}
-    if "codebrain" not in settings["mcpServers"]:
-        # Find the codebrain package location
-        import codebrain
-        cb_root = str(Path(codebrain.__file__).parent.parent)
-        settings["mcpServers"]["codebrain"] = {
+        mcp_config["mcpServers"]["codebrain"] = {
             "command": "python",
             "args": ["-m", "codebrain.mcp_server"],
-            "cwd": cb_root,
         }
-        settings_path.write_text(json.dumps(settings, indent=2))
-        click.echo(f"Added CodeBrain MCP server to {settings_path}")
-    else:
-        click.echo("MCP server already configured")
+        mcp_config_path.write_text(json.dumps(mcp_config, indent=2) + "\n")
+        click.echo(f"Wrote MCP config to {mcp_config_path}")
 
     click.echo()
-    click.echo(click.style("Done! Restart Claude Code to activate.", bold=True))
-    click.echo("Claude Code will now use CodeBrain tools to understand your codebase.")
+    click.echo(click.style("Done! Restart Claude Code (in this repo) to activate.", bold=True))
+    click.echo("On first launch Claude Code will ask you to approve the project MCP server.")
 
 
 def _generate_claude_md(project_name: str) -> str:

codebrain/mcp_lifecycle.py

@@ -34,6 +34,12 @@ PARENT_POLL_SECONDS = 5
 IDLE_TIMEOUT_SECONDS = int(os.environ.get("CODEBRAIN_MCP_IDLE_TIMEOUT", "1800"))
 MAX_LIFETIME_SECONDS = int(os.environ.get("CODEBRAIN_MCP_MAX_LIFETIME", "0"))
 STALE_AGE_SECONDS = 3600  # 1h with no parent-death signal still counts as stale
+ANCESTOR_WALK_DEPTH = 6
+# Names of host processes that own the MCP lifecycle. If any of these is found
+# while walking up the ancestor chain, we watch *it* rather than the immediate
+# parent — survives transient launchers (cmd.exe, Electron worker shells) that
+# Claude Code uses on Windows. Match is case-insensitive substring.
+HOST_PROCESS_NAME_HINTS = ("claude", "cursor", "vscode", "code")
 
 _last_activity_lock = threading.Lock()
 _last_activity: float = time.time()
@@ -73,6 +79,38 @@ def _read_pid_file(pid_file: Path) -> int | None:
         return None
 
 
+def _predecessor_has_live_host(pid: int) -> bool:
+    """True if ``pid``'s ancestor chain contains a live host (claude/cursor/...).
+
+    Such a predecessor belongs to a *concurrent* sibling Claude session and
+    must not be terminated — its disappearance would silently break that
+    session's MCP. Without psutil we cannot tell, so be safe and assume yes.
+    """
+    try:
+        import psutil
+    except ImportError:
+        return True
+    try:
+        proc = psutil.Process(pid)
+    except (psutil.NoSuchProcess, psutil.AccessDenied):
+        return False
+    for _ in range(ANCESTOR_WALK_DEPTH):
+        try:
+            parent = proc.parent()
+        except (psutil.NoSuchProcess, psutil.AccessDenied):
+            return False
+        if parent is None:
+            return False
+        try:
+            name = (parent.name() or "").lower()
+        except (psutil.NoSuchProcess, psutil.AccessDenied):
+            return False
+        if any(hint in name for hint in HOST_PROCESS_NAME_HINTS):
+            return True
+        proc = parent
+    return False
+
+
 def _kill_stale_predecessor(pid_file: Path) -> None:
     if not pid_file.exists():
         return
@@ -90,6 +128,12 @@ def _kill_stale_predecessor(pid_file: Path) -> None:
         # PID was reused by an unrelated process. Don't touch.
         _log.debug("PID %d reused by unrelated process; leaving alone", old_pid)
         return
+    if _predecessor_has_live_host(old_pid):
+        # Concurrent sibling Claude session is still using this MCP — leave it.
+        # Without this, two Claude windows on the same repo race each other and
+        # whichever started last kills the other's MCP.
+        _log.debug("PID %d has a live IDE host; sibling MCP, leaving alone", old_pid)
+        return
     try:
         proc = psutil.Process(old_pid)
         _log.warning("Killing stale CodeBrain MCP predecessor PID %d", old_pid)
@@ -123,6 +167,54 @@ def _remove_pid_file(pid_file: Path) -> None:
         pass
 
 
+def _find_watch_target(start_pid: int) -> tuple[int, float | None]:
+    """Pick the PID whose death should kill the MCP.
+
+    Walks up the ancestor chain (up to ANCESTOR_WALK_DEPTH levels) looking
+    for a process whose name matches HOST_PROCESS_NAME_HINTS — that's the
+    real IDE host. Falls back to ``start_pid`` if no hint matches, psutil
+    is unavailable, or ``CODEBRAIN_MCP_DISABLE_ANCESTOR_WALK=1`` is set.
+
+    Why: on Windows, Claude Code spawns the MCP via a transient launcher
+    (cmd.exe wrapper or Electron worker shell). The launcher exits soon
+    after the python child starts, so watching ``os.getppid()`` directly
+    causes the parent watchdog to mis-fire while Claude Code is still up.
+    """
+    try:
+        import psutil
+    except ImportError:
+        return start_pid, None
+
+    fallback_create_time: float | None = None
+    try:
+        fallback_create_time = psutil.Process(start_pid).create_time()
+    except (psutil.NoSuchProcess, psutil.AccessDenied):
+        return start_pid, None
+
+    if os.environ.get("CODEBRAIN_MCP_DISABLE_ANCESTOR_WALK") == "1":
+        return start_pid, fallback_create_time
+
+    try:
+        proc = psutil.Process(start_pid)
+        for _ in range(ANCESTOR_WALK_DEPTH):
+            try:
+                name = (proc.name() or "").lower()
+            except (psutil.NoSuchProcess, psutil.AccessDenied):
+                break
+            if any(hint in name for hint in HOST_PROCESS_NAME_HINTS):
+                return proc.pid, proc.create_time()
+            try:
+                parent = proc.parent()
+            except (psutil.NoSuchProcess, psutil.AccessDenied):
+                break
+            if parent is None:
+                break
+            proc = parent
+    except (psutil.NoSuchProcess, psutil.AccessDenied):
+        pass
+    return start_pid, fallback_create_time
+
+
 def _parent_watchdog(initial_ppid: int, initial_create_time: float | None) -> None:
     try:
         import psutil
@@ -192,17 +284,13 @@ def install_watchdogs(repo_root: Path | None = None) -> None:
         _write_pid_file(pid_file)
         atexit.register(_remove_pid_file, pid_file)
 
-    initial_ppid = os.getppid()
-    initial_create_time: float | None = None
-    try:
-        import psutil
-        initial_create_time = psutil.Process(initial_ppid).create_time()
-    except Exception:
-        pass
+    immediate_ppid = os.getppid()
+    initial_ppid, initial_create_time = _find_watch_target(immediate_ppid)
 
     _log.info(
-        "MCP watchdogs installed (ppid=%d, idle_timeout=%ds, max_lifetime=%ds)",
+        "MCP watchdogs installed (ppid=%d via=%d, idle_timeout=%ds, max_lifetime=%ds)",
         initial_ppid,
+        immediate_ppid,
         IDLE_TIMEOUT_SECONDS,
         MAX_LIFETIME_SECONDS,
     )

{codebrain-0.3.1.dist-info → codebrain-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codebrain
-Version: 0.3.1
+Version: 0.3.3
 Summary: Know what breaks before you break it. Structural knowledge graph for codebases — impact analysis, dead code detection, health scores. No LLM required.
 Author: CodeBrain Contributors
 License: MIT License
@@ -123,15 +123,17 @@ MCP config. Restart Claude Code and it has tools like
 `mcp__codebrain__ask_codebase`, plus a few dozen more. It uses them on
 its own.
 
-Manual config (any MCP-compatible client):
+Manual config — drop `.mcp.json` at **your project's root** (not in a
+global config). CodeBrain's index lives in `<repo>/.codebrain/`, so a
+global config would make every Claude session in every project fight
+over the same database. `brain setup` writes the right thing for you.
 
 ```json
 {
   "mcpServers": {
     "codebrain": {
       "command": "python",
-      "args": ["-m", "codebrain.mcp_server"],
-      "env": { "CODEBRAIN_PROJECT": "/absolute/path/to/repo" }
+      "args": ["-m", "codebrain.mcp_server"]
     }
   }
 }

{codebrain-0.3.1.dist-info → codebrain-0.3.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
-codebrain/__init__.py,sha256=nsPZeGCmOLCMzB2G177d_qr41TxyAMLOr8l4xDXcW-E,392
+codebrain/__init__.py,sha256=hgsuOwRgYpLaAkDEScZOHphtJuwPjL4EogAfpqqV-ss,392
 codebrain/__main__.py,sha256=dgd9lRZovV1k1tScEW_wvPPjPEACXc-EcLtJ7AN3M48,115
 codebrain/agent_bridge.py,sha256=JDny3232R6rfFsQTWOoYygGgykx6rb8ektLRENPUcDQ,6262
 codebrain/analyzer.py,sha256=RxyajZp0E8XuB_1SkK1UEXD00gOo3e2vtBzS-US6ms8,40701
 codebrain/api.py,sha256=LmeFK3KyUKR1xz4tAoPteaRA06c09KA965Hk33VhV6I,31653
 codebrain/api_models.py,sha256=mE5sIsf8WLEWjGm2w6-baeyVoJH_65FOglHwFe3aJhs,1989
 codebrain/architecture.py,sha256=RCN_LUNTjd0fXYFIYDacwH17qEeFCxNCyF6irbs5yfE,29485
-codebrain/cli.py,sha256=BJIYqWmMaJXWkKS3QMaLr-z0s9n4aCcpNI0te1kuJUM,168822
+codebrain/cli.py,sha256=UKGKCU6SRsck2mD8vyl_aA5muO3KlG8bnts4Xu0w52k,169014
 codebrain/comprehension.py,sha256=eAVf1abecxVo72_2p8aEgRmSeXR7VNMyJnt_DTst47E,83023
 codebrain/config.py,sha256=UvStpfDNvulMHkN7xnGjEF3EKvdf9tF3Cv4A01FdEQw,1745
 codebrain/context.py,sha256=BFZ_WWRf242cJli-TXoz5JFqcvsKkwbmuUMBX8WvM9o,10980
@@ -23,7 +23,7 @@ codebrain/kt.py,sha256=iXeHArPbSrrr2ObH4nuyXPobdBXSOR3b7JbIqXB0kj4,17199
 codebrain/kt_video.py,sha256=quaUyPUJh8xXsj52aBCPp_L8fekNC4vHmNYrUTfCqcE,29211
 codebrain/llm.py,sha256=0D5c5BJMVkLz2OoybfMxlUdJEbz16cZoNgVmm-LzFH0,25606
 codebrain/logging.py,sha256=ORR5L8REVlh4aJz9vqErmi76aqjLN2xVKoA2gSv_jas,1110
-codebrain/mcp_lifecycle.py,sha256=VA67vULtTKzhShiA3cA1KACBjKr9wVQbQjCzqjz895c,10575
+codebrain/mcp_lifecycle.py,sha256=FzZBKk_MLUFC97TgT_M_EG0oNZgUAPZXzukm1U3LUKc,14172
 codebrain/mcp_server.py,sha256=Lb5ob3NI-S0Ln7Yp8G8HxWsKvAuzVzl123N08ZkxPyw,110648
 codebrain/migration.py,sha256=ZMcug6OsvvK-DVdfmqhWCUx-oVj0KQD0EGlBVx6Jxvk,29489
 codebrain/modernize.py,sha256=4usRjIFONEThpYhemLIjoYXb9ohEbO7j2wzVO15Dz5A,38525
@@ -74,9 +74,9 @@ codebrain/parser/typescript_treesitter.py,sha256=7RTdcA-HTgrlRhEMwSGa-63saNcjqtP
 codebrain/parser/vue_parser.py,sha256=ZWtjUOyItn_SNfvD6T8j7alV4aIfcHA94WDCS5P59Ps,13054
 codebrain/watcher/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 codebrain/watcher/file_watcher.py,sha256=EUXQ5L8gutOCvGgtNZ9wMt6RL74wA6snH7vnDnxm13A,6562
-codebrain-0.3.1.dist-info/licenses/LICENSE,sha256=Dxb0L3H90lGFFik90WQXfMkM_8utGA1BDqizqdCT3UE,1079
-codebrain-0.3.1.dist-info/METADATA,sha256=QcpdsZ2pSV2KPKYs2LmJcmg_uagdCDMm9kFIlxqIHfA,9953
-codebrain-0.3.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-codebrain-0.3.1.dist-info/entry_points.txt,sha256=FHKSyI7le7GK78HxAKQK54-yzt-yHNxX0df3VpGC5wg,44
-codebrain-0.3.1.dist-info/top_level.txt,sha256=mUxCZc80EyNOMzd2vAm22uIhnOb1Aw7ZOAUT_u-ksx4,10
-codebrain-0.3.1.dist-info/RECORD,,
+codebrain-0.3.3.dist-info/licenses/LICENSE,sha256=Dxb0L3H90lGFFik90WQXfMkM_8utGA1BDqizqdCT3UE,1079
+codebrain-0.3.3.dist-info/METADATA,sha256=h3KSuM87MlEXw-mhfoTpZDlKqyToQVPt_E594UEJPWM,10129
+codebrain-0.3.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+codebrain-0.3.3.dist-info/entry_points.txt,sha256=FHKSyI7le7GK78HxAKQK54-yzt-yHNxX0df3VpGC5wg,44
+codebrain-0.3.3.dist-info/top_level.txt,sha256=mUxCZc80EyNOMzd2vAm22uIhnOb1Aw7ZOAUT_u-ksx4,10
+codebrain-0.3.3.dist-info/RECORD,,