drydock-cli 3.0.128__tar.gz → 3.0.130__tar.gz

{drydock_cli-3.0.128/drydock_cli.egg-info → drydock_cli-3.0.130}/PKG-INFO

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

@@ -389,6 +389,8 @@ def run(
         for tc in assistant_turn.tool_calls:
             tool_call_count += 1
             if tc["name"] in ("Edit", "Write"):
+                if not session_has_edited and state.task.phase in ("understand", "discover", "plan"):
+                    state.task.phase = "implement"  # first change → building
                 session_has_edited = True
 
             # STOP pressed: don't run the remaining tools, but still record a
@@ -450,6 +452,13 @@ def run(
                     _emit(state, "verification", status=last_verification.status,
                           exit_code=last_verification.exit_code)
 
+            # Sync the rolling plan when the model updates its checklist, keeping
+            # stable step ids + capping pending steps; record each revision.
+            if tc["name"] == "todo" and isinstance(config.get("_todo"), list):
+                if state.task.plan.update_from_items(config["_todo"]):
+                    _emit(state, "plan", version=state.task.plan.version,
+                          steps=[(s["id"], s["status"]) for s in state.task.plan.steps])
+
             _emit(state, "tool", name=tc["name"],
                   input=str(tc.get("input"))[:200],
                   result_chars=len(str(result)),

{drydock_cli-3.0.128 → drydock_cli-3.0.130}/drydock/task_state.py

@@ -40,12 +40,64 @@ def extract_acceptance_criteria(objective: str, limit: int = 10) -> list[str]:
     return out[:limit]
 
 
+def _step_id(text: str) -> str:
+    """Stable short id for a plan step, derived from its text (so the SAME step
+    keeps its id across plan revisions). Deterministic — no randomness/time."""
+    h = 0
+    for ch in text.strip().lower():
+        h = (h * 131 + ord(ch)) & 0xFFFFFFFF
+    return f"s{h:08x}"
+
+
+@dataclass
+class RollingPlan:
+    """A short, updateable plan (PRD Epic C): one ACTIVE step + a few pending ones,
+    each with a stable id. Rebuilt from the checklist the model maintains; ids are
+    text-derived so an unchanged step keeps its id across revisions."""
+    steps: list[dict] = field(default_factory=list)  # {id, text, status}
+    version: int = 0
+    max_pending: int = 4
+
+    def update_from_items(self, items: list[tuple[str, str]]) -> bool:
+        """Sync from (text, status) checklist pairs. Caps pending steps (keeps the
+        active + first max_pending pending). Returns True if the plan CHANGED."""
+        steps = [{"id": _step_id(t), "text": t, "status": s} for t, s in items if t]
+        # active = first in_progress, else first pending
+        active = next((s for s in steps if s["status"] == "in_progress"), None)
+        if active is None:
+            active = next((s for s in steps if s["status"] == "pending"), None)
+        kept, pending_kept = [], 0
+        for s in steps:
+            if s["status"] == "done" or s is active:
+                kept.append(s)
+            elif s["status"] == "pending" and pending_kept < self.max_pending:
+                kept.append(s); pending_kept += 1
+            elif s["status"] == "in_progress":
+                kept.append(s)
+        changed = [(s["id"], s["status"]) for s in kept] != [(s["id"], s["status"]) for s in self.steps]
+        if changed:
+            self.steps = kept
+            self.version += 1
+        return changed
+
+    def active_step(self) -> dict | None:
+        return next((s for s in self.steps if s["status"] == "in_progress"), None) \
+            or next((s for s in self.steps if s["status"] == "pending"), None)
+
+    def remaining(self) -> int:
+        return sum(1 for s in self.steps if s["status"] != "done")
+
+    def to_dict(self) -> dict:
+        return {"steps": list(self.steps), "version": self.version}
+
+
 @dataclass
 class TaskState:
     """Authoritative task facts, independent of the message transcript."""
     objective: str = ""
     acceptance_criteria: list[str] = field(default_factory=list)
     phase: str = "understand"
+    plan: RollingPlan = field(default_factory=RollingPlan)
 
     @classmethod
     def from_objective(cls, objective: str) -> TaskState:
@@ -61,14 +113,20 @@ class TaskState:
             "objective": self.objective,
             "acceptance_criteria": list(self.acceptance_criteria),
             "phase": self.phase,
+            "plan": self.plan.to_dict(),
         }
 
     @classmethod
     def from_dict(cls, d: dict) -> TaskState:
+        plan = RollingPlan()
+        pd = d.get("plan") or {}
+        plan.steps = list(pd.get("steps", []))
+        plan.version = pd.get("version", 0)
         return cls(
             objective=d.get("objective", ""),
             acceptance_criteria=list(d.get("acceptance_criteria", [])),
             phase=d.get("phase", "understand"),
+            plan=plan,
         )
 
     def anchor_text(self) -> str:

{drydock_cli-3.0.128 → drydock_cli-3.0.130}/drydock/tui/app.py

@@ -362,8 +362,11 @@ class DrydockApp(App):
         flag = "⚓ working" if self._busy else "⚓ ready"
         # Busy → show the interrupt keys; idle → the quit hint.
         keys = "Esc/Ctrl+C stop" if self._busy else "Ctrl+C×2 quit"
+        # Show the task phase once it's past the default (understand).
+        ph = getattr(self.state, "task", None)
+        phase = f"  ·  {ph.phase}" if (ph and ph.is_set() and ph.phase != "understand") else ""
         return (
-            f"{flag}  ·  {model}  ·  {keys} · PgUp/PgDn scroll · "
+            f"{flag}  ·  {model}{phase}  ·  {keys} · PgUp/PgDn scroll · "
             f"Ctrl+O details  ·  {ctx}"
         )
 

{drydock_cli-3.0.128 → drydock_cli-3.0.130/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.128
+Version: 3.0.130
 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.128 → drydock_cli-3.0.130}/drydock_cli.egg-info/SOURCES.txt

@@ -110,6 +110,7 @@ tests/test_repetition_interrupt.py
 tests/test_rmf.py
 tests/test_rmf_graph.py
 tests/test_rmf_stig_graph.py
+tests/test_rolling_plan.py
 tests/test_runaway_repetition.py
 tests/test_screenshot.py
 tests/test_server_probe.py

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

drydock_cli-3.0.130/tests/test_rolling_plan.py

@@ -0,0 +1,49 @@
+"""Rolling plan (Agent-Buildout PRD Epic C): 1 active + <=4 pending steps with
+stable ids; revisions bump the version; unchanged steps keep their id."""
+from __future__ import annotations
+
+from drydock.task_state import RollingPlan, TaskState, _step_id
+
+
+def test_stable_ids_survive_revision():
+    p = RollingPlan()
+    p.update_from_items([("read file", "done"), ("fix bug", "in_progress"), ("test", "pending")])
+    ids1 = {s["text"]: s["id"] for s in p.steps}
+    # revise: fix bug now done, test now active
+    p.update_from_items([("read file", "done"), ("fix bug", "done"), ("test", "in_progress")])
+    ids2 = {s["text"]: s["id"] for s in p.steps}
+    assert ids1["fix bug"] == ids2["fix bug"]        # same step, same id
+    assert ids1["test"] == ids2["test"]
+
+
+def test_caps_pending_to_four_plus_active():
+    p = RollingPlan()
+    items = [("active", "in_progress")] + [(f"p{i}", "pending") for i in range(8)]
+    p.update_from_items(items)
+    pend = [s for s in p.steps if s["status"] == "pending"]
+    assert len(pend) == 4 and any(s["status"] == "in_progress" for s in p.steps)
+
+
+def test_version_bumps_only_on_change():
+    p = RollingPlan()
+    assert p.update_from_items([("a", "pending")]) and p.version == 1
+    assert not p.update_from_items([("a", "pending")]) and p.version == 1   # no change
+    assert p.update_from_items([("a", "done")]) and p.version == 2
+
+
+def test_active_and_remaining():
+    p = RollingPlan()
+    p.update_from_items([("a", "done"), ("b", "in_progress"), ("c", "pending")])
+    assert p.active_step()["text"] == "b" and p.remaining() == 2
+
+
+def test_serialization_roundtrip():
+    ts = TaskState.from_objective("Do it.\n1. a\n2. b")
+    ts.plan.update_from_items([("a", "done"), ("b", "in_progress")])
+    d = ts.to_dict()
+    assert d["plan"]["version"] == 1 and len(d["plan"]["steps"]) == 2
+    assert TaskState.from_dict(d).plan.active_step()["text"] == "b"
+
+
+def test_step_id_deterministic():
+    assert _step_id("fix the bug") == _step_id("Fix The Bug ")   # case/space-insensitive

{drydock_cli-3.0.128 → drydock_cli-3.0.130}/tests/test_task_state.py

@@ -67,3 +67,25 @@ def test_disabled_when_task_anchor_false():
     cfg = {"model": "gemma4", "max_tokens": 8192, "context_limit": 65536, "task_anchor": False}
     sysp, _ = _run_capture(cfg, "Do the thing.\n1. a criterion")
     assert "TASK" not in sysp
+
+
+def test_phase_transitions_understand_implement_complete():
+    from drydock.providers import AssistantTurn
+    cfg = {"model": "gemma4", "max_tokens": 8192, "context_limit": 65536}
+    turns = [
+        AssistantTurn("", [{"id": "1", "name": "Write",
+                            "input": {"file_path": "/tmp/dd_ph.txt", "content": "x"}}], 5, 5),
+        AssistantTurn("", [{"id": "2", "name": "Bash", "input": {"command": "python -c 'print(1)'"}}], 5, 5),
+        AssistantTurn("done, verified", [], 5, 5),
+    ]
+    i = {"n": 0}
+    def fake(model, system, messages, tool_schemas, config):
+        t = turns[min(i["n"], len(turns) - 1)]; i["n"] += 1; yield t
+    st = agent.AgentState()
+    assert st.task.phase == "understand"
+    orig = agent.stream; agent.stream = fake
+    try:
+        list(agent.run("Fix it and verify.\n1. tests pass", st, cfg, "SYS"))
+    finally:
+        agent.stream = orig
+    assert st.task.phase == "complete"   # understand -> implement -> verify -> complete