codeprobe 0.3.1__tar.gz → 0.3.3__tar.gz

{codeprobe-0.3.1 → codeprobe-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeprobe
-Version: 0.3.1
+Version: 0.3.3
 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.1 → codeprobe-0.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codeprobe"
-version = "0.3.1"
+version = "0.3.3"
 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.1 → codeprobe-0.3.3}/src/codeprobe/core/executor.py

@@ -700,7 +700,9 @@ def execute_config(
         owns_isolation = False
         active_isolation = isolation
         if active_isolation is None:
-            active_isolation = WorktreeIsolation(repo_path, pool_size=workers)
+            active_isolation = WorktreeIsolation(
+                repo_path, pool_size=workers, namespace=experiment_config.label
+            )
             owns_isolation = True
 
         def _run_isolated(task_dir: Path, repeat_index: int) -> TaskResult:

{codeprobe-0.3.1 → codeprobe-0.3.3}/src/codeprobe/core/isolation.py

@@ -53,7 +53,7 @@ def git_restore_clean(workdir: Path, *, extra_excludes: tuple[str, ...] = ()) ->
         "-e",
         ".codeprobe",
         "-e",
-        ".codeprobe-worktrees",
+        ".codeprobe-worktrees*",
     ]
     # Auto-discover experiment directories inside the repo
     for exp_dir in _discover_experiment_dirs(workdir):
@@ -91,12 +91,15 @@ class WorktreeIsolation:
     slot is free, ``release()`` resets and returns the slot to the pool.
     """
 
-    def __init__(self, repo_path: Path, pool_size: int) -> None:
+    def __init__(self, repo_path: Path, pool_size: int, namespace: str = "") -> None:
         if pool_size < 1:
             raise ValueError(f"pool_size must be >= 1, got {pool_size}")
         self._repo_path = repo_path.resolve()
         self._pool_size = pool_size
-        self._base_dir = self._repo_path / ".codeprobe-worktrees"
+        base_name = ".codeprobe-worktrees"
+        if namespace:
+            base_name = f"{base_name}-{namespace}"
+        self._base_dir = self._repo_path / base_name
         self._available: queue.Queue[Path] = queue.Queue()
         self._all_paths: list[Path] = []
         self._lock = threading.Lock()
@@ -107,20 +110,49 @@ class WorktreeIsolation:
         with self._lock:
             if self._created:
                 return
+            # Prune stale worktree records left by previous interrupted runs
+            subprocess.run(
+                ["git", "worktree", "prune"],
+                cwd=self._repo_path,
+                capture_output=True,
+            )
             self._base_dir.mkdir(parents=True, exist_ok=True)
             for i in range(self._pool_size):
                 wt_path = self._base_dir / f"slot-{i}"
                 if not wt_path.exists():
-                    subprocess.run(
-                        ["git", "worktree", "add", "--detach", str(wt_path)],
-                        cwd=self._repo_path,
-                        check=True,
-                        capture_output=True,
-                    )
+                    self._add_worktree(wt_path)
                 self._all_paths.append(wt_path)
                 self._available.put(wt_path)
             self._created = True
 
+    def _add_worktree(self, wt_path: Path) -> None:
+        """Add a detached worktree, recovering from stale git state."""
+        try:
+            subprocess.run(
+                ["git", "worktree", "add", "--detach", str(wt_path)],
+                cwd=self._repo_path,
+                check=True,
+                capture_output=True,
+            )
+        except subprocess.CalledProcessError:
+            # Stale record may remain even after prune — force-remove and retry
+            subprocess.run(
+                ["git", "worktree", "remove", "--force", str(wt_path)],
+                cwd=self._repo_path,
+                capture_output=True,
+            )
+            subprocess.run(
+                ["git", "worktree", "prune"],
+                cwd=self._repo_path,
+                capture_output=True,
+            )
+            subprocess.run(
+                ["git", "worktree", "add", "--detach", str(wt_path)],
+                cwd=self._repo_path,
+                check=True,
+                capture_output=True,
+            )
+
     def acquire(self) -> Path:
         """Get a worktree from the pool (blocks until available)."""
         if not self._created:
@@ -148,6 +180,8 @@ class WorktreeIsolation:
 
     def cleanup(self) -> None:
         """Remove all managed worktrees."""
+        import shutil
+
         for wt_path in self._all_paths:
             try:
                 subprocess.run(
@@ -156,9 +190,23 @@ class WorktreeIsolation:
                     check=True,
                     capture_output=True,
                 )
-            except (subprocess.CalledProcessError, OSError) as exc:
-                logger.warning("Failed to remove worktree %s: %s", wt_path, exc)
+            except (subprocess.CalledProcessError, OSError):
+                # Force-remove failed — delete the directory and let prune
+                # clean up git's internal records.
+                try:
+                    if wt_path.exists():
+                        shutil.rmtree(wt_path)
+                except OSError as rm_exc:
+                    logger.warning(
+                        "Failed to remove worktree dir %s: %s", wt_path, rm_exc
+                    )
         self._all_paths.clear()
+        # Prune any stale records so future runs start clean
+        subprocess.run(
+            ["git", "worktree", "prune"],
+            cwd=self._repo_path,
+            capture_output=True,
+        )
         # Clean up base directory if empty
         try:
             if self._base_dir.exists() and not any(self._base_dir.iterdir()):

{codeprobe-0.3.1 → codeprobe-0.3.3}/src/codeprobe.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeprobe
-Version: 0.3.1
+Version: 0.3.3
 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.1 → codeprobe-0.3.3}/tests/test_executor.py

@@ -562,11 +562,16 @@ def test_execute_config_no_reset_in_parallel_mode(tmp_path: Path):
     exp_config = ExperimentConfig(label="baseline")
     agent_config = AgentConfig()
 
-    with patch("codeprobe.core.executor._git_reset_workdir") as mock_reset:
+    fake_iso = MagicMock()
+    fake_iso.acquire.return_value = tmp_path
+    with (
+        patch("codeprobe.core.executor._git_reset_workdir") as mock_reset,
+        patch("codeprobe.core.executor.WorktreeIsolation", return_value=fake_iso),
+    ):
         execute_config(
             adapter=adapter,
             task_dirs=tasks,
-            repo_path=Path("/repo"),
+            repo_path=tmp_path,
             experiment_config=exp_config,
             agent_config=agent_config,
             parallel=3,
@@ -604,9 +609,10 @@ class TestWorktreeIsolation:
             # Force pool creation by acquiring
             iso._base_dir.mkdir(parents=True, exist_ok=True)
             iso._create_pool()
-            # Should call git worktree add twice
-            assert mock_run.call_count == 2
-            for c in mock_run.call_args_list:
+            # Should call git worktree prune once + git worktree add twice
+            assert mock_run.call_count == 3
+            assert mock_run.call_args_list[0][0][0] == ["git", "worktree", "prune"]
+            for c in mock_run.call_args_list[1:]:
                 assert c[0][0][0:3] == ["git", "worktree", "add"]
 
     def test_acquire_returns_path(self, tmp_path: Path) -> None:
@@ -635,7 +641,7 @@ class TestWorktreeIsolation:
                 "-e",
                 ".codeprobe",
                 "-e",
-                ".codeprobe-worktrees",
+                ".codeprobe-worktrees*",
             ]
 
     def test_release_resets_and_returns_to_pool(self, tmp_path: Path) -> None:
@@ -656,9 +662,11 @@ class TestWorktreeIsolation:
             iso._create_pool()
         with patch("subprocess.run") as mock_run:
             iso.cleanup()
-            assert mock_run.call_count == 2
-            for c in mock_run.call_args_list:
+            # 2 worktree removes + 1 prune
+            assert mock_run.call_count == 3
+            for c in mock_run.call_args_list[:2]:
                 assert c[0][0][0:3] == ["git", "worktree", "remove"]
+            assert mock_run.call_args_list[2][0][0] == ["git", "worktree", "prune"]
 
     def test_pool_size_validation(self) -> None:
         """pool_size must be >= 1."""