codeprobe 0.3.7__tar.gz → 0.3.9__tar.gz

{codeprobe-0.3.7 → codeprobe-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeprobe
-Version: 0.3.7
+Version: 0.3.9
 Summary: Benchmark AI coding agents against your own codebase. Mine real tasks from repo history, run agents, interpret results.
 Author: codeprobe contributors
 License-Expression: Apache-2.0

{codeprobe-0.3.7 → codeprobe-0.3.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codeprobe"
-version = "0.3.7"
+version = "0.3.9"
 description = "Benchmark AI coding agents against your own codebase. Mine real tasks from repo history, run agents, interpret results."
 readme = "README.md"
 license = "Apache-2.0"

{codeprobe-0.3.7 → codeprobe-0.3.9}/src/codeprobe/__init__.py

@@ -1,3 +1,3 @@
 """codeprobe — Benchmark AI coding agents against your own codebase."""
 
-__version__ = "0.3.7"
+__version__ = "0.3.9"

{codeprobe-0.3.7 → codeprobe-0.3.9}/src/codeprobe/cli/init_cmd.py

@@ -194,43 +194,90 @@ def _prompt_sourcegraph_url() -> str | None:
     return url if url else None
 
 
+def _extract_sourcegraph_mcp(
+    discovered: list[tuple[Path, list[str]]],
+) -> dict | None:
+    """Load the Sourcegraph MCP config from a discovered config file.
+
+    Returns the full MCP config dict with only the Sourcegraph server,
+    or None if no Sourcegraph server is found.
+    """
+    import json
+
+    sg_names = {"sourcegraph", "sg", "sourcegraph-mcp"}
+    for path, server_names in discovered:
+        matching = [n for n in server_names if n.lower() in sg_names]
+        if not matching:
+            continue
+        try:
+            data = json.loads(path.read_text(encoding="utf-8"))
+        except (json.JSONDecodeError, OSError):
+            continue
+        servers = data.get("mcpServers", {})
+        for name in matching:
+            if name in servers:
+                return {"mcpServers": {name: servers[name]}}
+    return None
+
+
+def _load_discovered_config(path: Path) -> dict | None:
+    """Load a discovered MCP config file and return its mcpServers dict."""
+    import json
+
+    try:
+        data = json.loads(path.read_text(encoding="utf-8"))
+    except (json.JSONDecodeError, OSError):
+        return None
+    servers = data.get("mcpServers", {})
+    if servers:
+        return {"mcpServers": servers}
+    return None
+
+
 def _goal_mcp(agents: list[str], name: str) -> _Result:
     """Goal 1: MCP comparison prompts."""
     agent = _prompt_agent(agents)
     model = _prompt_model()
 
-    # Check if Sourcegraph is available in discovered MCP configs
     discovered = discover_mcp_configs()
-    use_sourcegraph = False
 
-    if _detect_sourcegraph_in_mcp(discovered):
+    # Auto-detect: if any MCP configs are discovered, let the user pick one
+    if discovered:
         click.echo()
-        click.echo("Detected Sourcegraph MCP server in your configuration.")
-        click.echo("codeprobe can use the HTTP endpoint for better performance.")
-        use_sourcegraph = click.confirm("Use Sourcegraph HTTP MCP?", default=True)
-    else:
+        click.echo("Discovered MCP configurations:")
+        for i, (p, servers) in enumerate(discovered, 1):
+            server_list = ", ".join(servers)
+            click.echo(f"  {i}. {p}  ({server_list})")
+        manual_idx = len(discovered) + 1
+        click.echo(f"  {manual_idx}. Enter a Sourcegraph token manually")
         click.echo()
-        click.echo("Would you like to use Sourcegraph as the MCP server?")
-        use_sourcegraph = click.confirm("Use Sourcegraph?", default=False)
-
-    if use_sourcegraph:
-        token = _prompt_sourcegraph_token()
-        sg_url = _prompt_sourcegraph_url()
-        return ask_mcp_comparison(
-            experiment_name=name,
-            agent=agent,
-            model=model,
-            sourcegraph_token=token,
-            sourcegraph_url=sg_url,
-        )
 
-    # Fall back to generic MCP config path
-    mcp_path = _prompt_mcp_config()
+        choice = click.prompt(
+            "Select MCP config",
+            type=click.IntRange(1, manual_idx),
+            default=1,
+        )
+        if choice <= len(discovered):
+            path = discovered[choice - 1][0]
+            mcp_config = _load_discovered_config(path)
+            if mcp_config:
+                click.echo(f"  Using {path}")
+                return ask_mcp_comparison(
+                    experiment_name=name,
+                    agent=agent,
+                    model=model,
+                    mcp_config=mcp_config,
+                )
+
+    # No discovered configs or user chose manual entry
+    token = _prompt_sourcegraph_token()
+    sg_url = _prompt_sourcegraph_url()
     return ask_mcp_comparison(
         experiment_name=name,
         agent=agent,
         model=model,
-        mcp_config_path=mcp_path,
+        sourcegraph_token=token,
+        sourcegraph_url=sg_url,
     )
 
 

{codeprobe-0.3.7 → codeprobe-0.3.9}/src/codeprobe/cli/wizard.py

@@ -45,26 +45,35 @@ def ask_mcp_comparison(
     agent: str,
     model: str | None,
     mcp_config_path: str | None = None,
+    mcp_config: dict | None = None,
     sourcegraph_token: str | None = None,
     sourcegraph_url: str | None = None,
 ) -> tuple[EvalrcConfig, list[ExperimentConfig]]:
     """Goal 1: Compare baseline agent vs MCP-augmented agent.
 
-    When *sourcegraph_token* is provided, generates an HTTP-based Sourcegraph
-    MCP config with an ``Authorization`` header and adds the ``sourcegraph``
-    preamble.  Otherwise falls back to loading the MCP config from
-    *mcp_config_path*.
+    Resolution order for MCP config:
+    1. *mcp_config* — pre-built dict (e.g. from discovered Claude Code config)
+    2. *sourcegraph_token* — build HTTP config with Authorization header
+    3. *mcp_config_path* — load from a JSON file on disk
     """
-    if sourcegraph_token is not None:
+    if mcp_config is not None:
+        mcp_data = mcp_config
+        # Detect if this is a Sourcegraph config for preamble
+        servers = mcp_data.get("mcpServers", {})
+        sg_names = {"sourcegraph", "sg", "sourcegraph-mcp"}
+        preambles: tuple[str, ...] = (
+            ("sourcegraph",) if any(k.lower() in sg_names for k in servers) else ()
+        )
+    elif sourcegraph_token is not None:
         mcp_data = build_sourcegraph_mcp_config(
             token=sourcegraph_token,
             url=sourcegraph_url or _DEFAULT_SOURCEGRAPH_URL,
         )
-        preambles: tuple[str, ...] = ("sourcegraph",)
+        preambles = ("sourcegraph",)
     else:
         if mcp_config_path is None:
             raise click.BadParameter(
-                "Either sourcegraph_token or mcp_config_path must be provided."
+                "Provide mcp_config, sourcegraph_token, or mcp_config_path."
             )
         mcp_data = _load_json(mcp_config_path)
         preambles = ()

{codeprobe-0.3.7 → codeprobe-0.3.9}/src/codeprobe.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeprobe
-Version: 0.3.7
+Version: 0.3.9
 Summary: Benchmark AI coding agents against your own codebase. Mine real tasks from repo history, run agents, interpret results.
 Author: codeprobe contributors
 License-Expression: Apache-2.0

{codeprobe-0.3.7 → codeprobe-0.3.9}/tests/test_init_wizard.py

@@ -465,16 +465,22 @@ class TestInitCliIntegration:
     def test_goal1_mcp_flow(
         self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
     ) -> None:
+        """When a discovered config exists, selecting it skips token prompt."""
         mcp_file = tmp_path / "mcp.json"
-        mcp_file.write_text(json.dumps({"mcpServers": {}}))
+        mcp_file.write_text(
+            json.dumps({"mcpServers": {"my-server": {"type": "stdio", "cmd": "echo"}}})
+        )
 
-        # Patch discovery so the prompt falls through to manual path entry
-        monkeypatch.setattr("codeprobe.cli.init_cmd.discover_mcp_configs", lambda: [])
+        # Patch discovery to return the test config file
+        monkeypatch.setattr(
+            "codeprobe.cli.init_cmd.discover_mcp_configs",
+            lambda: [(mcp_file, ["my-server"])],
+        )
 
         runner = CliRunner()
-        # Inputs: goal=1, experiment name (enter=default), agent (enter=default),
-        # model (enter=skip), decline Sourcegraph, mcp config path
-        input_text = f"1\n\nclaude\n\nN\n{mcp_file}\n"
+        # Inputs: goal=1, name=default, agent=claude, model=skip,
+        # select=1 (the discovered config)
+        input_text = "1\n\nclaude\n\n1\n"
         result = runner.invoke(main, ["init", str(tmp_path)], input=input_text)
         assert result.exit_code == 0, result.output
         assert not (tmp_path / ".evalrc.yaml").exists()
@@ -489,8 +495,8 @@ class TestInitCliIntegration:
 
         runner = CliRunner()
         # Inputs: goal=1, name=default, agent=claude, model=skip,
-        # use Sourcegraph=Y, choose=1 (paste token), token, url=default (enter)
-        input_text = "1\n\nclaude\n\nY\n1\ntok_test123\n\n"
+        # choose=1 (PAT), choose=1 (paste now), token, url=default (enter)
+        input_text = "1\n\nclaude\n\n1\n1\ntok_test123\n\n"
         result = runner.invoke(main, ["init", str(tmp_path)], input=input_text)
         assert result.exit_code == 0, result.output
         assert not (tmp_path / ".evalrc.yaml").exists()