sourcecode 1.31.0__tar.gz → 1.31.1__tar.gz

{sourcecode-1.31.0 → sourcecode-1.31.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sourcecode
-Version: 1.31.0
+Version: 1.31.1
 Summary: Deterministic codebase context for AI coding agents
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -203,6 +203,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.9
+Requires-Dist: mcp>=1.0.0
 Requires-Dist: pathspec>=1.0
 Requires-Dist: ruamel-yaml>=0.18
 Requires-Dist: tomli>=2.0; python_version < '3.11'
@@ -224,7 +225,7 @@ Description-Content-Type: text/markdown
 
 **Deterministic, behavior-aware codebase context for AI agents and PR review.**
 
-![Version](https://img.shields.io/badge/version-1.31.0-blue)
+![Version](https://img.shields.io/badge/version-1.31.1-blue)
 ![Python](https://img.shields.io/badge/python-3.10%2B-green)
 
 ---
@@ -260,7 +261,7 @@ pipx install sourcecode
 
 ```bash
 sourcecode version
-# sourcecode 1.31.0
+# sourcecode 1.31.1
 ```
 
 ---

{sourcecode-1.31.0 → sourcecode-1.31.1}/README.md

@@ -2,7 +2,7 @@
 
 **Deterministic, behavior-aware codebase context for AI agents and PR review.**
 
-![Version](https://img.shields.io/badge/version-1.31.0-blue)
+![Version](https://img.shields.io/badge/version-1.31.1-blue)
 ![Python](https://img.shields.io/badge/python-3.10%2B-green)
 
 ---
@@ -38,7 +38,7 @@ pipx install sourcecode
 
 ```bash
 sourcecode version
-# sourcecode 1.31.0
+# sourcecode 1.31.1
 ```
 
 ---

{sourcecode-1.31.0 → sourcecode-1.31.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sourcecode"
-version = "1.31.0"
+version = "1.31.1"
 description = "Deterministic codebase context for AI coding agents"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -29,6 +29,7 @@ dependencies = [
     "pathspec>=1.0",
     "ruamel.yaml>=0.18",
     "tomli>=2.0; python_version < '3.11'",
+    "mcp>=1.0.0",
 ]
 
 [project.scripts]

{sourcecode-1.31.0 → sourcecode-1.31.1}/src/sourcecode/__init__.py

@@ -1,3 +1,3 @@
 """sourcecode — Deterministic codebase context maps for AI coding agents."""
 
-__version__ = "1.31.0"
+__version__ = "1.31.1"

{sourcecode-1.31.0 → sourcecode-1.31.1}/src/sourcecode/cli.py

@@ -2466,10 +2466,6 @@ def analyze_cmd(
 def mcp_serve() -> None:
     """Start the MCP server on stdio for AI agent integration.
 
-    \b
-    Requires the 'mcp' extra:
-      pip install sourcecode[mcp]
-
     \b
     Configure in your MCP client (e.g. Claude Desktop):
       {
@@ -2487,15 +2483,7 @@ def mcp_serve() -> None:
         level=logging.INFO,
         format="[sourcecode-mcp] %(levelname)s %(message)s",
     )
-    try:
-        from sourcecode.mcp.server import mcp as _mcp
-    except ImportError:
-        typer.echo(
-            "MCP support not available. Install with:\n"
-            "  pip install sourcecode[mcp]",
-            err=True,
-        )
-        raise typer.Exit(code=1)
+    from sourcecode.mcp.server import mcp as _mcp
 
     log = logging.getLogger(__name__)
     log.info("sourcecode-mcp starting (stdio transport)")
@@ -2513,21 +2501,44 @@ def mcp_serve() -> None:
 @mcp_app.command("init")
 def mcp_init(
     yes: bool = typer.Option(False, "--yes", "-y", help="Skip confirmation prompt."),
+    target: Optional[str] = typer.Option(
+        None,
+        "--target",
+        "-t",
+        help="Target client: claude-desktop | cursor. Default: auto-detect all.",
+    ),
 ) -> None:
     """Setup MCP integration for Claude Desktop, Cursor, and other clients.
 
     \b
     Detects installed MCP clients, backs up their config files, and safely
     inserts the sourcecode server entry. Fully idempotent — safe to re-run.
+
+    \b
+    Examples:
+      sourcecode mcp init
+      sourcecode mcp init --target claude-desktop
+      sourcecode mcp init --target cursor --yes
     """
-    from sourcecode.mcp.onboarding.detector import detect_clients
+    from sourcecode.mcp.onboarding.detector import detect_clients, is_client_running
     from sourcecode.mcp.onboarding.planner import build_install_plan
     from sourcecode.mcp.onboarding import backup, applier
 
     typer.echo("Detecting MCP clients...")
     typer.echo("")
 
-    clients = detect_clients()
+    all_clients = detect_clients()
+
+    if target:
+        target_slug = target.lower()
+        clients = [c for c in all_clients if c.slug == target_slug]
+        if not clients:
+            valid = ", ".join(c.slug for c in all_clients)
+            typer.echo(f"Unknown target '{target}'. Valid: {valid}", err=True)
+            raise typer.Exit(code=1)
+    else:
+        clients = all_clients
+
     if not clients:
         typer.echo("No MCP clients found on this system.")
         typer.echo("")
@@ -2603,36 +2614,81 @@ def mcp_init(
     typer.echo("MCP integration active.")
     typer.echo("")
 
-    restart_needed = [a.client.name for a in actionable if not a.will_create_file]
-    if restart_needed:
-        typer.echo(f"  Restart {', '.join(restart_needed)} to apply changes.")
+    # Post-write: validate config and warn if client not running
+    for a in actionable:
+        if not is_client_running(a.client):
+            typer.echo(
+                f"  ⚠ Config written but {a.client.name} is not running. "
+                f"Start {a.client.name} and run sourcecode mcp status to verify.",
+                err=False,
+            )
+        else:
+            restart_msg = "" if a.will_create_file else f" Restart {a.client.name} to apply."
+            typer.echo(f"  ✓ {a.client.name} is running.{restart_msg}")
+
+    typer.echo("")
     typer.echo("  Remove:  sourcecode mcp remove")
 
 
 @mcp_app.command("status")
 def mcp_status() -> None:
-    """Show MCP integration status for all detected clients."""
-    from sourcecode.mcp.onboarding.detector import detect_clients
+    """Show MCP integration status: dependencies, config files, and connectivity."""
+    from sourcecode.mcp.onboarding.detector import detect_clients, is_client_running
     from sourcecode.mcp.onboarding import applier
 
-    clients = detect_clients()
-    typer.echo("MCP Integration Status")
+    sep = "─" * 46
+
+    typer.echo("MCP Status")
+    typer.echo(sep)
+
+    # Stage 1: Dependencies
+    try:
+        import mcp as _mcp_pkg  # noqa: F401
+        typer.echo("Dependencies  ✓ installed")
+    except ImportError:
+        typer.echo("Dependencies  ✗ missing")
+        typer.echo("  Fix: pip install sourcecode[mcp]")
     typer.echo("")
 
+    clients = detect_clients()
     if not clients:
         typer.echo("  No MCP clients detected on this system.")
+        typer.echo(sep)
+        typer.echo("  Setup:   sourcecode mcp init")
         raise typer.Exit(code=0)
 
+    # Stage 2: Config files
+    typer.echo("Config files")
     for client in clients:
         if not client.app_installed:
-            typer.echo(f"  ○  {client.name:<18} not found")
+            typer.echo(f"  {client.name:<20} ✗ not found")
+            typer.echo(f"    Expected: {client.config_path}")
+            typer.echo(f"    Fix:      sourcecode mcp init --target {client.slug}")
             continue
         config = applier.read_config(client.config_path)
         if applier.is_installed(config):
-            typer.echo(f"  ✓  {client.name:<18} configured   {client.config_path}")
+            typer.echo(f"  {client.name:<20} ✓ configured   {client.config_path}")
         else:
-            typer.echo(f"  ✗  {client.name:<18} not configured")
+            typer.echo(f"  {client.name:<20} ✗ not configured")
+            typer.echo(f"    Fix: sourcecode mcp init --target {client.slug}")
     typer.echo("")
+
+    # Stage 3: Connectivity
+    typer.echo("Connectivity")
+    any_installed = any(c.app_installed for c in clients)
+    if not any_installed:
+        typer.echo("  (no clients to check)")
+    else:
+        for client in clients:
+            if not client.app_installed:
+                continue
+            if is_client_running(client):
+                typer.echo(f"  {client.name:<20} ✓ running")
+            else:
+                typer.echo(f"  {client.name:<20} ✗ not running")
+                typer.echo(f"    Fix: open {client.name}, then run sourcecode mcp status")
+
+    typer.echo(sep)
     typer.echo("  Setup:   sourcecode mcp init")
     typer.echo("  Remove:  sourcecode mcp remove")
 

sourcecode-1.31.1/src/sourcecode/mcp/onboarding/detector.py

@@ -0,0 +1,104 @@
+"""Detect MCP-capable clients installed on the current machine."""
+from __future__ import annotations
+
+import os
+import subprocess
+import sys
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, Dict, List
+
+
+_CLIENT_REGISTRY: List[Dict[str, Any]] = [
+    {
+        "name": "Claude Desktop",
+        "slug": "claude-desktop",
+        "paths": {
+            "darwin": "~/Library/Application Support/Claude/claude_desktop_config.json",
+            "linux": "~/.config/Claude/claude_desktop_config.json",
+            "win32": "{APPDATA}/Claude/claude_desktop_config.json",
+        },
+        "process": {
+            "darwin": "Claude",
+            "linux": "claude-desktop",
+            "win32": "Claude",
+        },
+    },
+    {
+        "name": "Cursor",
+        "slug": "cursor",
+        "paths": {
+            "darwin": "~/.cursor/mcp.json",
+            "linux": "~/.cursor/mcp.json",
+            "win32": "{USERPROFILE}/.cursor/mcp.json",
+        },
+        "process": {
+            "darwin": "Cursor",
+            "linux": "cursor",
+            "win32": "Cursor",
+        },
+    },
+]
+
+
+@dataclass(frozen=True)
+class MCPClient:
+    name: str
+    config_path: Path
+    app_installed: bool  # True if the config file (or its parent dir) exists
+    process_name: str    # OS process name for connectivity check
+    slug: str            # --target identifier (e.g. "claude-desktop")
+
+
+def _resolve(template: str) -> Path:
+    """Expand env vars in Windows-style {VAR} templates, then expanduser."""
+    result = template
+    for var in ("APPDATA", "LOCALAPPDATA", "USERPROFILE"):
+        val = os.environ.get(var, "")
+        if val:
+            result = result.replace(f"{{{var}}}", val)
+    return Path(result).expanduser()
+
+
+def detect_clients() -> list[MCPClient]:
+    """Return all known MCP clients with their resolved config paths."""
+    plat = sys.platform
+    clients: list[MCPClient] = []
+    for entry in _CLIENT_REGISTRY:
+        paths: Dict[str, str] = entry["paths"]
+        processes: Dict[str, str] = entry["process"]
+        template = paths.get(plat) or paths.get("linux", "")
+        if not template:
+            continue
+        config_path = _resolve(template)
+        app_installed = config_path.exists() or config_path.parent.exists()
+        process_name = processes.get(plat) or processes.get("linux", "")
+        clients.append(MCPClient(
+            name=entry["name"],
+            config_path=config_path,
+            app_installed=app_installed,
+            process_name=process_name,
+            slug=entry["slug"],
+        ))
+    return clients
+
+
+def is_client_running(client: MCPClient) -> bool:
+    """True if the client process is currently running."""
+    if not client.process_name:
+        return False
+    try:
+        if sys.platform == "win32":
+            result = subprocess.run(
+                ["tasklist", "/fi", f"imagename eq {client.process_name}.exe"],
+                capture_output=True, text=True, timeout=5,
+            )
+            return client.process_name.lower() in result.stdout.lower()
+        else:
+            result = subprocess.run(
+                ["pgrep", "-x", client.process_name],
+                capture_output=True, timeout=5,
+            )
+            return result.returncode == 0
+    except Exception:
+        return False

{sourcecode-1.31.0 → sourcecode-1.31.1}/src/sourcecode/mcp/runner.py

@@ -6,14 +6,18 @@ lookup, no process fork, no stdout encoding issues.
 """
 from __future__ import annotations
 
+import json
+from typing import Any
+
 from typer.testing import CliRunner
 
 _runner = CliRunner()
 
 
-def run_command(args: list[str]) -> str:
-    """Invoke a sourcecode CLI command in-process and return stdout.
+def run_command(args: list[str]) -> Any:
+    """Invoke a sourcecode CLI command in-process and return parsed output.
 
+    Returns parsed JSON dict when output is valid JSON, else the raw string.
     Raises RuntimeError on non-zero exit or empty output.
     """
     from sourcecode.cli import _detected_path, _preprocess_args, app
@@ -37,4 +41,7 @@ def run_command(args: list[str]) -> str:
             f"Args: {args}"
         )
 
-    return output
+    try:
+        return json.loads(output)
+    except json.JSONDecodeError:
+        return output

sourcecode-1.31.1/src/sourcecode/mcp/server.py

@@ -0,0 +1,119 @@
+"""MCP server for sourcecode CLI.
+
+Exposes sourcecode capabilities as MCP tools. Each tool maps to a CLI command
+and delegates execution to the in-process runner — no subprocess, no binary
+lookup, same process as the CLI.
+
+All tools return:
+  {"success": bool, "data": dict | str | None, "error": {"code": str, "message": str} | None}
+data is the parsed JSON object from the CLI output, not a shell string.
+"""
+from __future__ import annotations
+
+import os
+from typing import Any
+
+from mcp.server.fastmcp import FastMCP
+
+from sourcecode.mcp.runner import run_command
+
+mcp = FastMCP("sourcecode")
+
+
+def _ok(data: Any) -> dict:
+    return {"success": True, "data": data, "error": None}
+
+
+def _err(message: str, code: str = "EXECUTION_FAILED") -> dict:
+    return {"success": False, "data": None, "error": {"code": code, "message": message}}
+
+
+def _execute(args: list[str]) -> dict:
+    try:
+        return _ok(run_command(args))
+    except RuntimeError as exc:
+        return _err(str(exc))
+
+
+@mcp.tool()
+def get_compact_context(repo_path: str = ".") -> dict:
+    """High-signal summary of a repository (~1000-3000 tokens).
+
+    Maps to: sourcecode <repo_path> --compact
+    Returns: stacks, entry points, dependency summary, confidence, gaps.
+    repo_path: absolute path to the repository (default: current working directory).
+    """
+    if not isinstance(repo_path, str):
+        return _err("repo_path must be a string", "INVALID_ARGUMENT")
+    return _execute([repo_path, "--compact"])
+
+
+@mcp.tool()
+def get_agent_context(repo_path: str = ".") -> dict:
+    """Agent-optimised analysis: identity, entry points, dependencies, gaps.
+
+    Maps to: sourcecode <repo_path> --agent
+    Returns: structured noise-free JSON for AI agents.
+    repo_path: absolute path to the repository (default: current working directory).
+    """
+    if not isinstance(repo_path, str):
+        return _err("repo_path must be a string", "INVALID_ARGUMENT")
+    return _execute([repo_path, "--agent"])
+
+
+@mcp.tool()
+def get_endpoints(repo_path: str = ".") -> dict:
+    """API endpoint surface extraction.
+
+    Maps to: sourcecode <repo_path> --endpoints (pending CLI implementation)
+    repo_path: absolute path to the repository (default: current working directory).
+    """
+    return _err(
+        "get_endpoints requires --endpoints CLI flag (pending implementation). "
+        "Use get_compact_context for now — the output includes api_endpoint-classified files.",
+        "NOT_IMPLEMENTED",
+    )
+
+
+@mcp.tool()
+def get_module_context(repo_path: str = ".", module: str = "") -> dict:
+    """Compact analysis of a specific module or subdirectory within a repository.
+
+    Maps to: sourcecode <repo_path>/<module> --compact
+    repo_path: absolute path to the repository root.
+    module: subdirectory name relative to repo_path (e.g. 'src/auth', 'api', 'core').
+    """
+    if not isinstance(repo_path, str):
+        return _err("repo_path must be a string", "INVALID_ARGUMENT")
+    if not isinstance(module, str) or not module.strip():
+        return _err("module must be a non-empty string", "INVALID_ARGUMENT")
+    module_path = os.path.join(repo_path, module)
+    return _execute([module_path, "--compact"])
+
+
+@mcp.tool()
+def get_delta(repo_path: str = ".", since: str = "HEAD~1") -> dict:
+    """Incremental context: git-changed files since a reference commit.
+
+    Maps to: sourcecode prepare-context delta <repo_path> --since <since>
+    repo_path: absolute path to the repository (default: current working directory).
+    since: git ref to diff against (e.g. HEAD~3, main, origin/main).
+    """
+    if not isinstance(repo_path, str):
+        return _err("repo_path must be a string", "INVALID_ARGUMENT")
+    if not isinstance(since, str) or not since.strip():
+        return _err("since must be a non-empty git ref", "INVALID_ARGUMENT")
+    return _execute(["prepare-context", "delta", repo_path, "--since", since])
+
+
+@mcp.tool()
+def get_ir_summary(repo_path: str = ".") -> dict:
+    """Deterministic symbol-level IR summary for Java repositories.
+
+    Maps to: sourcecode repo-ir <repo_path> --summary-only
+    Returns: analysis summary, impact, and change_set — omits full graph nodes/edges.
+    repo_path: absolute path to the repository (default: current working directory).
+    """
+    if not isinstance(repo_path, str):
+        return _err("repo_path must be a string", "INVALID_ARGUMENT")
+    return _execute(["repo-ir", repo_path, "--summary-only"])

{sourcecode-1.31.0 → sourcecode-1.31.1}/tests/test_mcp_runner.py

@@ -13,12 +13,12 @@ def _invoke_result(exit_code: int = 0, output: str = "some output") -> MagicMock
     return m
 
 
-def test_run_command_returns_raw_string():
+def test_run_command_parses_json():
     payload = '{"project": {"primary_stack": "python"}}'
     with patch("sourcecode.mcp.runner._runner.invoke", return_value=_invoke_result(0, payload)):
         result = run_command(["--agent"])
-    assert isinstance(result, str)
-    assert result == payload
+    assert isinstance(result, dict)
+    assert result == {"project": {"primary_stack": "python"}}
 
 
 def test_run_command_returns_non_json_string():

{sourcecode-1.31.0 → sourcecode-1.31.1}/tests/test_mcp_serve.py

@@ -26,14 +26,6 @@ def test_mcp_serve_help():
     assert result.exit_code == 0
 
 
-def test_mcp_serve_missing_dependency_exits_with_hint():
-    """ImportError on mcp package → exit 1 + install hint."""
-    with patch.dict(sys.modules, {"sourcecode.mcp.server": None}):
-        result = invoke(["mcp", "serve"])
-    assert result.exit_code == 1
-    assert "sourcecode[mcp]" in result.output
-
-
 def test_mcp_serve_calls_mcp_run():
     """When mcp is available, serve calls mcp.run()."""
     mock_server_mod = MagicMock()