drydock-cli 3.1.38__tar.gz → 3.1.39__tar.gz

{drydock_cli-3.1.38/drydock_cli.egg-info → drydock_cli-3.1.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.1.38
+Version: 3.1.39
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0

{drydock_cli-3.1.38 → drydock_cli-3.1.39}/drydock/ratchet.py

@@ -87,6 +87,30 @@ class VerifyResult:
         return self.total > 0 and self.passed >= self.total
 
 
+def run_shell_bounded(command: str, cwd: str | None, timeout: float) -> tuple[str, int, bool]:
+    """Run a shell command with a timeout that actually holds: the command runs in its
+    own process group and the whole group is killed on timeout. (subprocess.run with
+    shell=True only kills /bin/sh; a hung child — e.g. pytest stuck in an infinite loop —
+    keeps the output pipes open and the call blocks far past the timeout.)
+    Returns (combined output, returncode, timed_out)."""
+    import signal
+
+    proc = subprocess.Popen(command, shell=True, cwd=cwd, stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE, text=True, start_new_session=True)
+    try:
+        out, err = proc.communicate(timeout=timeout)
+        timed_out = False
+    except subprocess.TimeoutExpired:
+        try:
+            os.killpg(proc.pid, signal.SIGKILL)
+        except (ProcessLookupError, PermissionError):
+            proc.kill()
+        out, err = proc.communicate()
+        timed_out = True
+    text = (out or "") + ("\n" + err if err else "")
+    return text, (124 if timed_out else proc.returncode), timed_out
+
+
 @dataclass
 class Verifier:
     """Runs a shell command and scores it. The command is the ground truth the
@@ -99,15 +123,11 @@ class Verifier:
 
     def run(self) -> VerifyResult:
         try:
-            proc = subprocess.run(
-                self.command, shell=True, cwd=self.cwd,
-                capture_output=True, text=True, timeout=self.timeout,
-            )
-            out = (proc.stdout or "") + ("\n" + proc.stderr if proc.stderr else "")
-            rc = proc.returncode
-        except subprocess.TimeoutExpired as e:
-            out = (e.output or "") + "\n[verifier timed out]"
-            rc = 124
+            out, rc, timed_out = run_shell_bounded(self.command, self.cwd, self.timeout)
+        except OSError as e:
+            out, rc, timed_out = f"[verifier failed to start: {e}]", 127, False
+        if timed_out:
+            out += "\n[verifier timed out]"
         p, t = score_output(out, self.mode, rc)
         return VerifyResult(p, t, rc, out)
 

{drydock_cli-3.1.38 → drydock_cli-3.1.39}/drydock/swarm.py

@@ -589,21 +589,21 @@ VerifyFn = Callable[["Candidate"], "tuple[int, int]"]
 
 
 def make_shell_verifier(verify_cmd: str, fitness: str = "auto",
-                        timeout: int = 1800) -> VerifyFn:
+                        timeout: int = 600) -> VerifyFn:
     """A verifier that runs `verify_cmd` in the candidate's worktree and scores the output
     with drydock.ratchet.score_output — the same scorer the ratchet/eratchet use, so a
     candidate is judged by a real test run, never by the builder's self-report (§18/§20)."""
-    from drydock.ratchet import score_output
+    from drydock.ratchet import run_shell_bounded, score_output
 
     def verify(cand: Candidate) -> tuple[int, int]:
         if not cand.worktree or not Path(cand.worktree).exists():
             return 0, 0
         try:
-            r = subprocess.run(verify_cmd, cwd=cand.worktree, shell=True,
-                               capture_output=True, text=True, timeout=timeout)
+            out, rc, _ = run_shell_bounded(verify_cmd, cand.worktree, timeout)
         except (OSError, subprocess.SubprocessError):
             return 0, 1
-        return score_output((r.stdout or "") + (r.stderr or ""), fitness, r.returncode)
+        # a hung candidate (killed at the timeout) scores whatever finished before the kill
+        return score_output(out, fitness, rc)
 
     return verify
 

{drydock_cli-3.1.38 → drydock_cli-3.1.39/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.1.38
+Version: 3.1.39
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0

{drydock_cli-3.1.38 → drydock_cli-3.1.39}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 # PyPI distribution name is drydock-cli (the established install name, continued
 # from the retired v2 fork); the import package + CLI command stay `drydock`.
 name = "drydock-cli"
-version = "3.1.38"
+version = "3.1.39"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

{drydock_cli-3.1.38 → drydock_cli-3.1.39}/tests/test_swarm.py

@@ -496,3 +496,17 @@ def test_run_swarm_cancel_stops_queued_waves_and_verification(tmp_path):
     assert verified == []                         # verification skipped on cancel
     assert "cancelled" in events and "judge" in events
     assert len([c for c in res.candidates if c.commit]) == 1
+
+
+def test_shell_verifier_timeout_kills_hung_child(tmp_path):
+    import time
+
+    wt = tmp_path / "wt"
+    wt.mkdir()
+    cand = swarm.Candidate(id="c-1", agent="a", commit="x", worktree=str(wt))
+    # the shell spawns a child that outlives the shell's own kill and holds the pipes open
+    verify = swarm.make_shell_verifier("sleep 30 & sleep 30; echo done", timeout=1)
+    t0 = time.monotonic()
+    passed, _total = verify(cand)
+    assert time.monotonic() - t0 < 10
+    assert passed == 0