drydock-cli 3.0.125__tar.gz → 3.0.127__tar.gz

{drydock_cli-3.0.125/drydock_cli.egg-info → drydock_cli-3.0.127}/PKG-INFO

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

{drydock_cli-3.0.125 → drydock_cli-3.0.127}/drydock/agent.py

@@ -48,7 +48,8 @@ from drydock.compaction import (
 )
 from drydock.loop_detect import LoopTracker
 from drydock.task_state import TaskState
-from drydock.verification import looks_like_verification
+from drydock.verification import looks_like_verification, parse_evidence
+from drydock.events import emit as _emit
 from drydock.tuning import (
     filter_tool_schemas,
     hallucinated_tool_message,
@@ -83,6 +84,7 @@ class AgentState:
     turn_count: int = 0
     current_effort: str = ""  # "high"/"low" of the in-flight LLM call (for the UI)
     task: "TaskState" = field(default_factory=lambda: TaskState())  # structured objective
+    events: object | None = None  # optional EventLog for a durable execution trace
 
 
 def drop_last_turn(messages: list) -> bool:
@@ -121,6 +123,9 @@ def run(
     # outside the transcript. The original objective is authoritative for the task.
     if not state.task.is_set() and isinstance(user_message, str) and user_message.strip():
         state.task = TaskState.from_objective(user_message)
+        _emit(state, "task_start", objective=state.task.objective,
+              acceptance_criteria=state.task.acceptance_criteria)
+    _emit(state, "user_message", chars=len(user_message or ""))
     # Keep the objective + acceptance criteria in the SYSTEM PROMPT every turn, so
     # they survive compaction (which only touches the message transcript, never the
     # system prompt) — the model can't drift off the goal on a long task.
@@ -154,8 +159,8 @@ def run(
         return cancel is not None and cancel.is_set()
     tool_call_count = 0
     session_has_edited = False
-    ran_verification = False   # a test/check/exec command ran (verification gate)
-    verify_gate_nudges = 0     # bounded "verify before you finish" nudges
+    last_verification = None    # VerificationEvidence of the most recent check (gate)
+    verify_gate_nudges = 0      # bounded "verify before you finish" nudges
     leaked_call_retries = 0
     plan_continue_nudges = 0  # consecutive "you stopped mid-plan" nudges
     empty_response_nudges = 0  # consecutive "you returned nothing" nudges
@@ -281,6 +286,9 @@ def run(
         state.total_output_tokens += assistant_turn.output_tokens
         state.last_input_tokens = assistant_turn.input_tokens
         yield TurnDone(assistant_turn.input_tokens, assistant_turn.output_tokens)
+        _emit(state, "turn", in_tok=assistant_turn.input_tokens,
+              out_tok=assistant_turn.output_tokens,
+              tool_calls=len(assistant_turn.tool_calls or []))
 
         # No tool calls = conversation complete — UNLESS the model emitted a
         # tool call as text (a Gemma quirk the API can't structure). In that
@@ -339,29 +347,42 @@ def run(
             # If the agent CHANGED files but never ran a test/check/its own code,
             # don't accept completion — make it verify first. Bounded so it can't
             # wedge; once it runs any check (ran_verification) the gate is satisfied.
-            if (
+            # A text-only "done" after editing is accepted only when a check has
+            # PASSED. Never ran one → nudge to VERIFY. Ran one that FAILED → the work
+            # isn't done → nudge to REPAIR. Bounded so it can't wedge.
+            _needs_gate = (
                 config.get("verify_gate", True)
                 and allow is None            # main task only — not scoped sub-agents
                 and session_has_edited
-                and not ran_verification
                 and verify_gate_nudges < 2
-            ):
+                and (last_verification is None or last_verification.status == "fail")
+            )
+            if _needs_gate:
                 verify_gate_nudges += 1
-                state.task.phase = "verify"
-                state.messages.append({
-                    "role": "user",
-                    "content": (
+                if last_verification is None:
+                    state.task.phase = "verify"
+                    _emit(state, "verify_gate", kind="unverified", nudge=verify_gate_nudges)
+                    msg = (
                         "[SYSTEM] You changed files but have not VERIFIED the work. "
-                        "Before finishing, run a concrete check: the task's own test/"
-                        "eval/build (pytest, test.sh, make, npm test, …) or run the "
-                        "code/script you produced and confirm the output is correct "
-                        "and meets EVERY requirement. Do that now with a tool call; "
-                        "if it fails, fix it and re-check."
-                    ),
-                })
+                        "Run a concrete check now: the task's own test/eval/build "
+                        "(pytest, test.sh, make, npm test, …) or run the code you "
+                        "produced, and confirm it meets EVERY requirement."
+                    )
+                else:  # a check ran and FAILED
+                    state.task.phase = "repair"
+                    _emit(state, "verify_gate", kind="failed", nudge=verify_gate_nudges,
+                          summary=last_verification.summary)
+                    msg = (
+                        f"[SYSTEM] Your verification FAILED ({last_verification.summary}). "
+                        "The task is NOT complete. Read the failure, fix the cause, then "
+                        "re-run the SAME check until it passes."
+                    )
+                state.messages.append({"role": "user", "content": msg})
                 continue
-            if session_has_edited and ran_verification:
+            if session_has_edited and last_verification and last_verification.status == "pass":
                 state.task.phase = "complete"
+            _emit(state, "done", phase=state.task.phase, edited=session_has_edited,
+                  verified=bool(last_verification and last_verification.status == "pass"))
             break
 
         # Execute each tool call
@@ -369,10 +390,6 @@ def run(
             tool_call_count += 1
             if tc["name"] in ("Edit", "Write"):
                 session_has_edited = True
-            elif tc["name"] == "Bash" and looks_like_verification(
-                (tc.get("input") or {}).get("command", "")
-            ):
-                ran_verification = True  # the agent actually ran a test/check/its code
 
             # STOP pressed: don't run the remaining tools, but still record a
             # paired result for each (the assistant message already lists all
@@ -424,6 +441,19 @@ def run(
             # advisory note when the same call is made again.
             result = loop_tracker.annotate(tc["name"], tc["input"], result)
 
+            # Verification evidence: if this Bash call was a test/check/exec, parse
+            # its result so the completion gate knows whether it PASSED, not just ran.
+            if tc["name"] == "Bash":
+                _vcmd = (tc.get("input") or {}).get("command", "")
+                if looks_like_verification(_vcmd):
+                    last_verification = parse_evidence(_vcmd, result)
+                    _emit(state, "verification", status=last_verification.status,
+                          exit_code=last_verification.exit_code)
+
+            _emit(state, "tool", name=tc["name"],
+                  input=str(tc.get("input"))[:200],
+                  result_chars=len(str(result)),
+                  error=str(result)[:80].lower().startswith("error"))
             yield ToolEnd(tc["name"], result)
 
             # Append tool result

{drydock_cli-3.0.125 → drydock_cli-3.0.127}/drydock/config.py

@@ -52,6 +52,9 @@ DEFAULTS: dict[str, object] = {
     # files but never ran a test/check/its own code, nudge it to verify first
     # instead of accepting completion. Bounded. Set false to disable.
     "verify_gate": True,
+    # Durable per-session execution trace (events.py) written as JSONL to
+    # ~/.drydock/events/ — inspect/diagnose/replay a task. Set false to disable.
+    "event_log": True,
     "theme": "harbor",
     # Optional SECOND model ("advisor") for a stronger second opinion — e.g. a
     # Gemini OpenAI-compatible endpoint on another box. Empty = disabled. The

drydock_cli-3.0.127/drydock/events.py

@@ -0,0 +1,68 @@
+"""Durable execution event log (Agent-Buildout PRD, Epic: events).
+
+Every task run appends structured events to a per-session JSONL file so a task can
+be inspected, diagnosed, replayed, and later resumed. Append-only, one event per
+line: ``{"seq", "ts", "type", ...}``. DEFENSIVE — a logging failure must never crash
+the agent, so every I/O path swallows its own errors. All logic original to Drydock.
+"""
+from __future__ import annotations
+
+import json
+import time
+from pathlib import Path
+
+
+class EventLog:
+    """Append-only JSONL sink for execution events. Cheap to call; never raises."""
+
+    def __init__(self, path):
+        self.path = Path(path)
+        self._seq = 0
+        try:
+            self.path.parent.mkdir(parents=True, exist_ok=True)
+        except OSError:
+            pass
+
+    def emit(self, type: str, **data) -> None:
+        self._seq += 1
+        rec = {"seq": self._seq, "ts": round(time.time(), 3), "type": type}
+        rec.update(data)
+        try:
+            with self.path.open("a", encoding="utf-8") as f:
+                f.write(json.dumps(rec, default=str, ensure_ascii=False) + "\n")
+        except (OSError, TypeError, ValueError):
+            pass  # logging must never break a run
+
+    @staticmethod
+    def read(path) -> list[dict]:
+        """Parse an event-log JSONL into a list of event dicts (in order). Skips any
+        unparseable line; returns [] if the file is missing."""
+        out: list[dict] = []
+        try:
+            text = Path(path).read_text("utf-8", errors="ignore")
+        except OSError:
+            return out
+        for line in text.splitlines():
+            line = line.strip()
+            if not line:
+                continue
+            try:
+                out.append(json.loads(line))
+            except json.JSONDecodeError:
+                continue
+        return out
+
+
+def emit(state, type: str, **data) -> None:
+    """Emit to the run's event log if it has one — a no-op otherwise. Lets the agent
+    loop log unconditionally without a log everywhere."""
+    log = getattr(state, "events", None)
+    if log is not None:
+        log.emit(type, **data)
+
+
+def default_event_log_path():
+    """A fresh per-session JSONL path under ~/.drydock/events/."""
+    import time
+    from pathlib import Path
+    return Path.home() / ".drydock" / "events" / f"session-{int(time.time())}.jsonl"

{drydock_cli-3.0.125 → drydock_cli-3.0.127}/drydock/tui/app.py

@@ -259,6 +259,9 @@ class DrydockApp(App):
         super().__init__()
         self.config = config
         self.state = AgentState()
+        if config.get("event_log", True):
+            from drydock.events import EventLog, default_event_log_path
+            self.state.events = EventLog(config.get("event_log_path") or default_event_log_path())
         self.system = self._build_system(config.get("model"))
         from drydock.skills import load_skills
         self._skills = load_skills(config.get("cwd") or ".")

drydock_cli-3.0.127/drydock/verification.py

@@ -0,0 +1,75 @@
+"""Verification gating (Agent-Buildout PRD, Epic B / verification):
+
+  "A text-only model response is not evidence that a task is complete."
+
+The agent loop uses this to decide, when the model claims "done", whether it
+actually VERIFIED — i.e. ran a test, a linter/type-check, a build, or executed the
+code it produced. If it changed files but ran nothing, the loop nudges it to verify
+instead of accepting completion. Deliberately small (a command classifier + the loop
+gate) so it drops into the current loop without a rewrite. Logic original to Drydock.
+"""
+from __future__ import annotations
+
+import re
+from dataclasses import dataclass
+
+# Explicit test / lint / type-check / build commands.
+_VERIFY_KEYWORDS = re.compile(
+    r"\b(pytest|py\.test|unittest|nosetests?|tox|test\.sh|run_tests|"
+    r"make(\s+\w+)?|npm\s+(test|run)|yarn\s+(test|run)|pnpm\s+(test|run)|jest|mocha|vitest|"
+    r"cargo\s+(test|check|build|run|clippy)|go\s+(test|build|run|vet)|"
+    r"ruff|flake8|pylint|mypy|pyright|eslint|tsc|prettier|"
+    r"ctest|cmake|gradle|mvn|rspec|phpunit|dotnet\s+test|bats)\b",
+    re.I,
+)
+# Executing something — running the produced script/binary counts as checking it.
+_EXEC = re.compile(r"(?:^|[\s;&|(])(?:python3?|node|deno|bun|bash|sh|ruby|perl|"
+                   r"java|javac|gcc|g\+\+|clang|\./|\.\\)")
+
+
+def looks_like_verification(cmd) -> bool:
+    """True if a shell command constitutes verifying work — running tests/checks/
+    builds, or executing the produced code. Best-effort; never raises."""
+    if not cmd or not isinstance(cmd, str):
+        return False
+    return bool(_VERIFY_KEYWORDS.search(cmd) or _EXEC.search(cmd))
+
+
+@dataclass
+class VerificationEvidence:
+    """Structured outcome of a verification command — did the check PASS, not just
+    run (PRD verification/evidence). status: 'pass' | 'fail' | 'unknown'."""
+    command: str
+    status: str
+    tests_passed: int | None = None
+    tests_failed: int | None = None
+    exit_code: int | None = None
+    summary: str = ""
+
+
+# tool_bash appends "[exit code: N]" ONLY on non-zero exit; absent => exit 0.
+_EXIT = re.compile(r"\[exit code:\s*(-?\d+)\]")
+# pytest/unittest-style tallies: "3 passed", "2 failed", "1 error".
+_TALLY = re.compile(r"(\d+)\s+(passed|failed|errors?|skipped|xfailed|xpassed)\b", re.I)
+
+
+def parse_evidence(command, result_text) -> VerificationEvidence:
+    """Classify a verification command's result as pass/fail. Exit code is the
+    primary signal (drydock reports non-zero); pytest-style tallies refine it.
+    Best-effort; never raises."""
+    cmd = command if isinstance(command, str) else ""
+    text = result_text if isinstance(result_text, str) else str(result_text or "")
+    m = _EXIT.search(text)
+    exit_code = int(m.group(1)) if m else 0
+    passed = failed = None
+    tally = {}
+    for n, k in _TALLY.findall(text):
+        tally[k.lower().rstrip("s")] = tally.get(k.lower().rstrip("s"), 0) + int(n)
+    if tally:
+        passed = tally.get("passed")
+        failed = tally.get("failed", 0) + tally.get("error", 0)
+    status = "fail" if ((failed and failed > 0) or exit_code != 0) else "pass"
+    parts = [f"exit {exit_code}"]
+    if passed is not None or failed:
+        parts.append(f"{passed or 0} passed, {failed or 0} failed")
+    return VerificationEvidence(cmd, status, passed, failed, exit_code, "; ".join(parts)[:200])

{drydock_cli-3.0.125 → drydock_cli-3.0.127/drydock_cli.egg-info}/PKG-INFO

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

{drydock_cli-3.0.125 → drydock_cli-3.0.127}/drydock_cli.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ drydock/cli.py
 drydock/compaction.py
 drydock/config.py
 drydock/detect.py
+drydock/events.py
 drydock/extract.py
 drydock/gittools.py
 drydock/graphrag.py
@@ -83,6 +84,7 @@ tests/test_dispatch.py
 tests/test_e2e_connected.py
 tests/test_edit_replace_all.py
 tests/test_empty_response.py
+tests/test_events.py
 tests/test_extract.py
 tests/test_failure_loop.py
 tests/test_first_run_setup.py

{drydock_cli-3.0.125 → drydock_cli-3.0.127}/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.0.125"
+version = "3.0.127"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

drydock_cli-3.0.127/tests/test_events.py

@@ -0,0 +1,58 @@
+"""Durable event log (Agent-Buildout PRD, Epic: events) — the run appends a JSONL
+execution trace that can be read back for inspection/replay."""
+from __future__ import annotations
+
+import os
+import tempfile
+
+from drydock import agent
+from drydock.events import EventLog
+from drydock.providers import AssistantTurn
+
+
+def test_emit_and_read_roundtrip():
+    p = os.path.join(tempfile.mkdtemp(), "e.jsonl")
+    log = EventLog(p)
+    log.emit("task_start", objective="do X", acceptance_criteria=["a", "b"])
+    log.emit("tool", name="Write", result_chars=10)
+    evs = EventLog.read(p)
+    assert [e["type"] for e in evs] == ["task_start", "tool"]
+    assert evs[0]["seq"] == 1 and evs[1]["seq"] == 2 and "ts" in evs[0]
+    assert evs[0]["acceptance_criteria"] == ["a", "b"]
+
+
+def test_read_missing_file_is_empty():
+    assert EventLog.read("/no/such/file.jsonl") == []
+
+
+def test_emit_never_raises_on_bad_path():
+    EventLog("/root/cannot/write/here.jsonl").emit("x", a=1)  # no exception
+
+
+def test_run_writes_full_trace():
+    p = os.path.join(tempfile.mkdtemp(), "run.jsonl")
+    st = agent.AgentState(); st.events = EventLog(p)
+    turns = [
+        AssistantTurn("", [{"id": "1", "name": "Write",
+                            "input": {"file_path": "/tmp/dd_e.txt", "content": "x"}}], 10, 5),
+        AssistantTurn("", [{"id": "2", "name": "Bash", "input": {"command": "python -c '1'"}}], 8, 4),
+        AssistantTurn("done, verified", [], 6, 3),
+    ]
+    i = {"n": 0}
+    def fake(model, system, messages, tool_schemas, config):
+        t = turns[min(i["n"], len(turns) - 1)]; i["n"] += 1; yield t
+    orig = agent.stream; agent.stream = fake
+    try:
+        list(agent.run("Do the task.\n1. write out.txt", st,
+                       {"model": "gemma4", "max_tokens": 8192, "context_limit": 65536}, "SYS"))
+    finally:
+        agent.stream = orig
+    evs = EventLog.read(p)
+    types = [e["type"] for e in evs]
+    assert types[0] == "task_start" and "turn" in types and "tool" in types and types[-1] == "done"
+    assert next(e for e in evs if e["type"] == "done")["phase"] == "complete"
+
+
+def test_disabled_no_events_attr():
+    st = agent.AgentState()
+    assert st.events is None  # off by default on a bare AgentState

{drydock_cli-3.0.125 → drydock_cli-3.0.127}/tests/test_verification_gate.py

@@ -69,3 +69,35 @@ def test_disabled():
     done = AssistantTurn("done", [], 5, 5)
     st, _ = _drive({**CFG, "verify_gate": False}, [write, done])
     assert not any("VERIFIED" in m.get("content", "") for m in st.messages if m.get("role") == "user")
+
+
+def test_evidence_pass_fail():
+    from drydock.verification import parse_evidence
+    assert parse_evidence("pytest", "5 passed in 0.1s").status == "pass"
+    assert parse_evidence("pytest", "2 failed, 3 passed\n\n[exit code: 1]").status == "fail"
+    assert parse_evidence("python x.py", "boom\n\n[exit code: 1]").status == "fail"
+    ev = parse_evidence("pytest", "2 failed, 3 passed\n\n[exit code: 1]")
+    assert ev.tests_passed == 3 and ev.tests_failed == 2 and ev.exit_code == 1
+
+
+def test_failed_check_triggers_repair_not_complete():
+    # write, then run a FAILING check, then claim done -> gate nudges to REPAIR
+    write = AssistantTurn("", [{"id": "1", "name": "Write",
+                                "input": {"file_path": "/tmp/dd_vg_f.txt", "content": "x"}}], 5, 5)
+    fail = AssistantTurn("", [{"id": "2", "name": "Bash",
+                              "input": {"command": "python -c 'import sys; sys.exit(1)'"}}], 5, 5)
+    done = AssistantTurn("all done", [], 5, 5)
+    st, n = _drive(CFG, [write, fail, done, done])
+    assert st.task.phase == "repair"
+    assert any("FAILED" in m.get("content", "") for m in st.messages if m.get("role") == "user")
+
+
+def test_passing_check_accepts_completion():
+    write = AssistantTurn("", [{"id": "1", "name": "Write",
+                                "input": {"file_path": "/tmp/dd_vg_p.txt", "content": "x"}}], 5, 5)
+    ok = AssistantTurn("", [{"id": "2", "name": "Bash",
+                            "input": {"command": "python -c 'print(1)'"}}], 5, 5)
+    done = AssistantTurn("done, verified", [], 5, 5)
+    st, _ = _drive(CFG, [write, ok, done])
+    assert st.task.phase == "complete"
+    assert not any("FAILED" in m.get("content", "") for m in st.messages if m.get("role") == "user")

drydock_cli-3.0.125/drydock/verification.py

@@ -1,34 +0,0 @@
-"""Verification gating (Agent-Buildout PRD, Epic B / verification):
-
-  "A text-only model response is not evidence that a task is complete."
-
-The agent loop uses this to decide, when the model claims "done", whether it
-actually VERIFIED — i.e. ran a test, a linter/type-check, a build, or executed the
-code it produced. If it changed files but ran nothing, the loop nudges it to verify
-instead of accepting completion. Deliberately small (a command classifier + the loop
-gate) so it drops into the current loop without a rewrite. Logic original to Drydock.
-"""
-from __future__ import annotations
-
-import re
-
-# Explicit test / lint / type-check / build commands.
-_VERIFY_KEYWORDS = re.compile(
-    r"\b(pytest|py\.test|unittest|nosetests?|tox|test\.sh|run_tests|"
-    r"make(\s+\w+)?|npm\s+(test|run)|yarn\s+(test|run)|pnpm\s+(test|run)|jest|mocha|vitest|"
-    r"cargo\s+(test|check|build|run|clippy)|go\s+(test|build|run|vet)|"
-    r"ruff|flake8|pylint|mypy|pyright|eslint|tsc|prettier|"
-    r"ctest|cmake|gradle|mvn|rspec|phpunit|dotnet\s+test|bats)\b",
-    re.I,
-)
-# Executing something — running the produced script/binary counts as checking it.
-_EXEC = re.compile(r"(?:^|[\s;&|(])(?:python3?|node|deno|bun|bash|sh|ruby|perl|"
-                   r"java|javac|gcc|g\+\+|clang|\./|\.\\)")
-
-
-def looks_like_verification(cmd) -> bool:
-    """True if a shell command constitutes verifying work — running tests/checks/
-    builds, or executing the produced code. Best-effort; never raises."""
-    if not cmd or not isinstance(cmd, str):
-        return False
-    return bool(_VERIFY_KEYWORDS.search(cmd) or _EXEC.search(cmd))