drydock-cli 3.0.124__tar.gz → 3.0.126__tar.gz

{drydock_cli-3.0.124/drydock_cli.egg-info → drydock_cli-3.0.126}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.124
+Version: 3.0.126
 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.124 → drydock_cli-3.0.126}/drydock/agent.py

@@ -49,6 +49,7 @@ 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.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.
@@ -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
@@ -341,12 +349,14 @@ def run(
             # wedge; once it runs any check (ran_verification) the gate is satisfied.
             if (
                 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
             ):
                 verify_gate_nudges += 1
                 state.task.phase = "verify"
+                _emit(state, "verify_gate", nudge=verify_gate_nudges)
                 state.messages.append({
                     "role": "user",
                     "content": (
@@ -361,6 +371,8 @@ def run(
                 continue
             if session_has_edited and ran_verification:
                 state.task.phase = "complete"
+            _emit(state, "done", phase=state.task.phase, edited=session_has_edited,
+                  verified=ran_verification)
             break
 
         # Execute each tool call
@@ -423,6 +435,10 @@ def run(
             # advisory note when the same call is made again.
             result = loop_tracker.annotate(tc["name"], tc["input"], result)
 
+            _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.124 → drydock_cli-3.0.126}/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.126/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.124 → drydock_cli-3.0.126}/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.124 → drydock_cli-3.0.126/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.124
+Version: 3.0.126
 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.124 → drydock_cli-3.0.126}/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.124 → drydock_cli-3.0.126}/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.124"
+version = "3.0.126"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

drydock_cli-3.0.126/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.124 → drydock_cli-3.0.126}/tests/test_failure_loop.py

@@ -38,7 +38,7 @@ def test_changing_args_do_not_trip_valve(monkeypatch):
     monkeypatch.setattr(agent_mod, "stream", lambda **kw: iter([seq.pop(0)]))
     st = AgentState()
     import tempfile
-    list(run("go", st, {"model": "m", "cwd": tempfile.mkdtemp()}, "sys"))
+    list(run("go", st, {"model": "m", "cwd": tempfile.mkdtemp(), "verify_gate": False}, "sys"))
     assert any(m.get("role") == "assistant" and m.get("content") == "done"
                for m in st.messages)
 
@@ -57,7 +57,7 @@ def test_identical_SUCCESS_streak_ends_turn(monkeypatch):
 
     monkeypatch.setattr(agent_mod, "stream", counting)
     st = AgentState()
-    list(run("go", st, {"model": "m", "cwd": tempfile.mkdtemp()}, "sys"))
+    list(run("go", st, {"model": "m", "cwd": tempfile.mkdtemp(), "verify_gate": False}, "sys"))
     assert calls["n"] <= 12  # identical success → stopped at the cap, not 200
 
 
@@ -73,7 +73,7 @@ def test_polling_with_changing_result_not_tripped(monkeypatch):
     seq.append(AssistantTurn("done", [], 1, 1))
     monkeypatch.setattr(agent_mod, "stream", lambda **kw: iter([seq.pop(0)]))
     st = AgentState()
-    list(run("go", st, {"model": "m", "cwd": tempfile.mkdtemp()}, "sys"))
+    list(run("go", st, {"model": "m", "cwd": tempfile.mkdtemp(), "verify_gate": False}, "sys"))
     assert any(m.get("content") == "done" for m in st.messages)