codecompass-mcp 6.0.0__tar.gz → 6.0.2__tar.gz

{codecompass_mcp-6.0.0 → codecompass_mcp-6.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codecompass-mcp
-Version: 6.0.0
+Version: 6.0.2
 Summary: Structural code context for AI coding agents — a local code knowledge graph for blast radius, impact, deps, dead code, and flow tracing
 Author: CodeCompass contributors
 License: MIT

{codecompass_mcp-6.0.0 → codecompass_mcp-6.0.2}/codecompass_mcp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codecompass-mcp
-Version: 6.0.0
+Version: 6.0.2
 Summary: Structural code context for AI coding agents — a local code knowledge graph for blast radius, impact, deps, dead code, and flow tracing
 Author: CodeCompass contributors
 License: MIT

{codecompass_mcp-6.0.0 → codecompass_mcp-6.0.2}/pi_setup.py

@@ -20,6 +20,7 @@ from __future__ import annotations
 import json
 import shutil
 import subprocess
+import sys
 from pathlib import Path
 
 # Where pi loads user-global skills and pi-mcp-adapter reads user-global servers.
@@ -30,21 +31,47 @@ _MCP_CONFIG = Path.home() / ".config" / "mcp" / "mcp.json"
 _ADAPTER_PKG = "npm:pi-mcp-adapter"
 _ADAPTER_NAME = "pi-mcp-adapter"
 
+def _server_command() -> str:
+    """Absolute path to the codecompass-mcp console script, when we can find it.
+
+    A bare "codecompass-mcp" only resolves if pi inherits a PATH that reaches
+    this interpreter's bin dir — which it often doesn't. Under pyenv it is
+    worse than missing: the shim resolves a *different* Python depending on the
+    launch directory's .python-version, so pi silently gets "command not found"
+    while the same name works in a shell inside the project. The script sitting
+    next to sys.executable is the one belonging to the environment codecompass
+    is actually installed in.
+    """
+    script = Path(sys.executable).with_name("codecompass-mcp")
+    return str(script) if script.exists() else "codecompass-mcp"
+
+
 # The codecompass-mcp server entry merged into the user-global mcp.json.
-_SERVER_CONFIG = {"command": "codecompass-mcp"}
+def _server_config() -> dict:
+    return {"command": _server_command()}
 
 # Shipped as the pi skill. pi has the MCP tools natively via pi-mcp-adapter;
 # this teaches the orient-first discipline and lists the capabilities.
 #
-# The marker below is what makes the skill self-updating: init-style, we only
+# The marker is what makes the skill self-updating: init-style, we only
 # overwrite files we wrote. Strip the line to take ownership of your copy.
+# It goes in the BODY, never above the frontmatter — pi requires the opening
+# `---` on line 1 and reports "description is required" for anything else.
 _SKILL_MARKER = "<!-- Installed by `codecompass setup-pi` — rewritten on upgrade. -->"
 
-_SKILL_MD = _SKILL_MARKER + """
+# Copies installed before the marker existed. A file carrying one of these is
+# ours to replace, even without the marker — otherwise every pre-6.0.0 install
+# would be pinned to its original skill text forever.
+_LEGACY_SIGNATURES = (
+    "CodeCompass maps a repo into a queryable graph",
+)
+
+_SKILL_MD = """\
 ---
 name: codecompass
 description: Orient in any indexed repo through the CodeCompass code graph before reading files. Use for discovery, impact/dependency traces, dead-code checks, and flow analysis in any repository with a .codecompass/graph.json index.
 ---
+""" + _SKILL_MARKER + """
 
 # CodeCompass
 
@@ -114,8 +141,10 @@ def _install_adapter() -> None:
     subprocess.run(["pi", "install", _ADAPTER_PKG], check=False, timeout=300)
 
 
-def _write_mcp_config() -> None:
-    """Merge the codecompass server into the user-global mcp.json, preserving others."""
+def _write_mcp_config() -> bool:
+    """Merge the codecompass server into the user-global mcp.json, preserving
+    others. Returns True if the file changed — a no-op when already correct, so
+    this is cheap enough to run on every invocation."""
     config: dict = {}
     if _MCP_CONFIG.exists():
         try:
@@ -123,19 +152,26 @@ def _write_mcp_config() -> None:
         except (json.JSONDecodeError, OSError):
             config = {}
     servers = config.setdefault("mcpServers", {})
-    servers["codecompass"] = _SERVER_CONFIG
+    wanted = _server_config()
+    if servers.get("codecompass") == wanted:
+        return False
+    servers["codecompass"] = wanted
     _MCP_CONFIG.parent.mkdir(parents=True, exist_ok=True)
     _MCP_CONFIG.write_text(json.dumps(config, indent=2) + "\n")
+    return True
 
 
 def _skill_is_current() -> bool:
     """True when the installed skill needs no write — either it is already our
-    latest text, or the user has taken it over by stripping the marker."""
+    latest text, or it is a file the user wrote and we must not touch."""
     try:
         existing = _SKILL_FILE.read_text()
     except OSError:
         return False
-    return existing == _SKILL_MD or _SKILL_MARKER not in existing
+    if existing == _SKILL_MD:
+        return True
+    ours = _SKILL_MARKER in existing or any(s in existing for s in _LEGACY_SIGNATURES)
+    return not ours
 
 
 def setup_pi(force: bool = False, quiet: bool = False) -> bool:
@@ -155,6 +191,12 @@ def setup_pi(force: bool = False, quiet: bool = False) -> bool:
         say("pi not installed; skipping CodeCompass pi setup.")
         return False
 
+    # Always reconcile the server entry: the path it should point at changes
+    # when codecompass is reinstalled into a different environment, and a stale
+    # one leaves pi with a server it cannot spawn.
+    if _write_mcp_config():
+        say(f"Pointed pi at {_server_command()} in {_MCP_CONFIG}")
+
     if _skill_is_current() and not force:
         return True
 
@@ -164,7 +206,6 @@ def setup_pi(force: bool = False, quiet: bool = False) -> bool:
 
     _SKILL_DIR.mkdir(parents=True, exist_ok=True)
     _SKILL_FILE.write_text(_SKILL_MD)
-    _write_mcp_config()
     say(f"CodeCompass wired into pi: {_SKILL_FILE}, {_MCP_CONFIG}")
     return True
 

{codecompass_mcp-6.0.0 → codecompass_mcp-6.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codecompass-mcp"
-version = "6.0.0"
+version = "6.0.2"
 description = "Structural code context for AI coding agents — a local code knowledge graph for blast radius, impact, deps, dead code, and flow tracing"
 readme = "README.md"
 license = {text = "MIT"}

codecompass_mcp-6.0.2/tests/test_pi_setup.py

@@ -0,0 +1,93 @@
+"""The pi skill file self-updates on upgrade, but never clobbers a user's copy;
+the mcp.json entry always points at a command pi can actually spawn."""
+
+import json
+
+import pi_setup
+
+
+def test_skill_frontmatter_is_first():
+    """pi parses YAML frontmatter only when `---` is line 1 — anything above it
+    (like our generated-by marker) makes it report "description is required"."""
+    lines = pi_setup._SKILL_MD.splitlines()
+    assert lines[0] == "---"
+    assert any(line.startswith("description:") for line in lines[:5])
+    closing = lines.index("---", 1)
+    assert pi_setup._SKILL_MARKER in lines[closing + 1]  # marker sits in the body
+
+
+def _install(tmp_path, monkeypatch):
+    """Point pi_setup at a temp home and pretend pi + adapter are installed."""
+    skill_file = tmp_path / "SKILL.md"
+    monkeypatch.setattr(pi_setup, "_SKILL_DIR", tmp_path)
+    monkeypatch.setattr(pi_setup, "_SKILL_FILE", skill_file)
+    monkeypatch.setattr(pi_setup, "_MCP_CONFIG", tmp_path / "mcp.json")
+    monkeypatch.setattr(pi_setup, "_pi_available", lambda: True)
+    monkeypatch.setattr(pi_setup, "_adapter_installed", lambda: True)
+    return skill_file
+
+
+def test_stale_skill_is_rewritten_but_user_edits_are_kept(tmp_path, monkeypatch):
+    skill_file = _install(tmp_path, monkeypatch)
+
+    assert pi_setup.setup_pi(quiet=True) is True
+    assert skill_file.read_text() == pi_setup._SKILL_MD
+
+    # An older release's text — marker present, content stale -> rewritten.
+    skill_file.write_text(pi_setup._SKILL_MARKER + "\nold instructions\n")
+    pi_setup.setup_pi(quiet=True)
+    assert skill_file.read_text() == pi_setup._SKILL_MD
+
+    # The user took ownership by stripping the marker -> left alone.
+    skill_file.write_text("my own skill\n")
+    pi_setup.setup_pi(quiet=True)
+    assert skill_file.read_text() == "my own skill\n"
+
+    # ...unless explicitly forced.
+    pi_setup.setup_pi(force=True, quiet=True)
+    assert skill_file.read_text() == pi_setup._SKILL_MD
+
+
+def test_pre_marker_skill_is_adopted_and_updated(tmp_path, monkeypatch):
+    """A copy installed before the marker existed is still ours to replace."""
+    skill_file = _install(tmp_path, monkeypatch)
+    skill_file.write_text(
+        "---\nname: codecompass\n---\n\n"
+        "CodeCompass maps a repo into a queryable graph so you orient...\n"
+    )
+
+    pi_setup.setup_pi(quiet=True)
+    assert skill_file.read_text() == pi_setup._SKILL_MD
+
+
+def test_mcp_config_points_at_an_absolute_command(tmp_path, monkeypatch):
+    """A bare name resolves through PATH/pyenv and can land on a Python that
+    doesn't have codecompass installed — pin the interpreter's own script."""
+    _install(tmp_path, monkeypatch)
+    config = tmp_path / "mcp.json"
+
+    script = tmp_path / "codecompass-mcp"
+    script.write_text("#!/bin/sh\n")
+    monkeypatch.setattr(pi_setup.sys, "executable", str(tmp_path / "python"))
+
+    pi_setup.setup_pi(quiet=True)
+    entry = json.loads(config.read_text())["mcpServers"]["codecompass"]
+    assert entry == {"command": str(script)}
+
+    # Other servers in the file are preserved, and a stale codecompass entry is
+    # corrected even when the skill file is already up to date.
+    config.write_text(json.dumps({"mcpServers": {
+        "other": {"command": "keep-me"},
+        "codecompass": {"command": "codecompass-mcp"},
+    }}))
+    pi_setup.setup_pi(quiet=True)
+    servers = json.loads(config.read_text())["mcpServers"]
+    assert servers["other"] == {"command": "keep-me"}
+    assert servers["codecompass"] == {"command": str(script)}
+
+
+def test_no_pi_no_write(tmp_path, monkeypatch):
+    skill_file = _install(tmp_path, monkeypatch)
+    monkeypatch.setattr(pi_setup, "_pi_available", lambda: False)
+    assert pi_setup.setup_pi(quiet=True) is False
+    assert not skill_file.exists()

codecompass_mcp-6.0.0/tests/test_pi_setup.py

@@ -1,42 +0,0 @@
-"""The pi skill file self-updates on upgrade, but never clobbers a user's copy."""
-
-import pi_setup
-
-
-def _install(tmp_path, monkeypatch):
-    """Point pi_setup at a temp home and pretend pi + adapter are installed."""
-    skill_file = tmp_path / "SKILL.md"
-    monkeypatch.setattr(pi_setup, "_SKILL_DIR", tmp_path)
-    monkeypatch.setattr(pi_setup, "_SKILL_FILE", skill_file)
-    monkeypatch.setattr(pi_setup, "_MCP_CONFIG", tmp_path / "mcp.json")
-    monkeypatch.setattr(pi_setup, "_pi_available", lambda: True)
-    monkeypatch.setattr(pi_setup, "_adapter_installed", lambda: True)
-    return skill_file
-
-
-def test_stale_skill_is_rewritten_but_user_edits_are_kept(tmp_path, monkeypatch):
-    skill_file = _install(tmp_path, monkeypatch)
-
-    assert pi_setup.setup_pi(quiet=True) is True
-    assert skill_file.read_text() == pi_setup._SKILL_MD
-
-    # An older release's text — marker present, content stale -> rewritten.
-    skill_file.write_text(pi_setup._SKILL_MARKER + "\nold instructions\n")
-    pi_setup.setup_pi(quiet=True)
-    assert skill_file.read_text() == pi_setup._SKILL_MD
-
-    # The user took ownership by stripping the marker -> left alone.
-    skill_file.write_text("my own skill\n")
-    pi_setup.setup_pi(quiet=True)
-    assert skill_file.read_text() == "my own skill\n"
-
-    # ...unless explicitly forced.
-    pi_setup.setup_pi(force=True, quiet=True)
-    assert skill_file.read_text() == pi_setup._SKILL_MD
-
-
-def test_no_pi_no_write(tmp_path, monkeypatch):
-    skill_file = _install(tmp_path, monkeypatch)
-    monkeypatch.setattr(pi_setup, "_pi_available", lambda: False)
-    assert pi_setup.setup_pi(quiet=True) is False
-    assert not skill_file.exists()