drydock-cli 3.0.121__tar.gz → 3.0.123__tar.gz

{drydock_cli-3.0.121/drydock_cli.egg-info → drydock_cli-3.0.123}/PKG-INFO

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

@@ -47,6 +47,7 @@ from drydock.compaction import (
     maybe_compact, emergency_compact, is_context_length_error, is_image_load_error,
 )
 from drydock.loop_detect import LoopTracker
+from drydock.task_state import TaskState
 from drydock.tuning import (
     filter_tool_schemas,
     hallucinated_tool_message,
@@ -80,6 +81,7 @@ class AgentState:
     last_input_tokens: int = 0  # prompt tokens the SERVER counted on the last call
     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
 
 
 def drop_last_turn(messages: list) -> bool:
@@ -114,6 +116,18 @@ def run(
     """
     state.messages.append({"role": "user", "content": user_message})
 
+    # Capture the structured objective the FIRST time a task arrives, so it lives
+    # 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)
+    # 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.
+    if config.get("task_anchor", True) and state.task.is_set():
+        anchor = state.task.anchor_text()
+        if anchor:
+            system_prompt = system_prompt + "\n\n" + anchor
+
     # Recipe retrieval: give the model the TECHNIQUE this task needs (forensics,
     # git-history rewrite, numpy-2.0 fix, cert gen, …) by appending the relevant
     # bundled recipes to the system prompt. Keyword-matched, so only fitting ones

{drydock_cli-3.0.121 → drydock_cli-3.0.123}/drydock/config.py

@@ -44,6 +44,10 @@ DEFAULTS: dict[str, object] = {
     # instead of guessing. Retrieval is keyword-overlap; only relevant recipes are
     # added (none = nothing injected). Set false to disable.
     "recipes": True,
+    # Keep the structured objective + acceptance criteria (task_state.py) in the
+    # system prompt every turn so they survive context compaction — the model can't
+    # drift off the original goal on a long task. Set false to disable.
+    "task_anchor": 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.123/drydock/task_state.py

@@ -0,0 +1,84 @@
+"""Structured task state — the authoritative objective + acceptance criteria kept
+OUTSIDE the chat transcript, so they survive context compaction and the model never
+loses sight of the goal on a long task.
+
+First increment toward the Agent-Buildout PRD (Epic A: Structured Task State /
+Principle 4.2 "structured state is authoritative"). Deliberately small — a dataclass
+the agent loop populates once and re-injects as a compact anchor after compaction —
+so it drops into the current loop without a rewrite. All logic original to Drydock.
+"""
+from __future__ import annotations
+
+import re
+from dataclasses import dataclass, field
+
+# Requirement-like lines: numbered (1. / 1)) or bulleted (- * •).
+_LIST_ITEM = re.compile(r"^\s*(?:[-*•]|\d+[.)])\s+(.*\S)\s*$", re.M)
+# Imperative "must/should/exactly/required" sentences (fallback when there's no list).
+_IMPERATIVE = re.compile(r"\b(must|should|exactly|required|ensure|has to|needs? to)\b", re.I)
+
+
+def extract_acceptance_criteria(objective: str, limit: int = 10) -> list[str]:
+    """Pull discrete acceptance criteria out of the objective: numbered/bulleted
+    lines first, else imperative must/should sentences. Best-effort; never raises."""
+    if not objective or not isinstance(objective, str):
+        return []
+    items = [m.group(1).strip() for m in _LIST_ITEM.finditer(objective)]
+    if not items:
+        for s in re.split(r"(?<=[.!?])\s+", objective):
+            s = s.strip()
+            if s and len(s) < 240 and _IMPERATIVE.search(s):
+                items.append(s)
+    # de-dupe preserving order
+    seen: set[str] = set()
+    out = []
+    for it in items:
+        k = it.lower()
+        if k not in seen:
+            seen.add(k)
+            out.append(it)
+    return out[:limit]
+
+
+@dataclass
+class TaskState:
+    """Authoritative task facts, independent of the message transcript."""
+    objective: str = ""
+    acceptance_criteria: list[str] = field(default_factory=list)
+    phase: str = "understand"
+
+    @classmethod
+    def from_objective(cls, objective: str) -> TaskState:
+        obj = (objective or "").strip() if isinstance(objective, str) else str(objective or "").strip()
+        return cls(objective=obj, acceptance_criteria=extract_acceptance_criteria(obj))
+
+    def is_set(self) -> bool:
+        return bool(self.objective)
+
+    def to_dict(self) -> dict:
+        """Serializable WITHOUT the transcript — the task can be reconstructed from this."""
+        return {
+            "objective": self.objective,
+            "acceptance_criteria": list(self.acceptance_criteria),
+            "phase": self.phase,
+        }
+
+    @classmethod
+    def from_dict(cls, d: dict) -> TaskState:
+        return cls(
+            objective=d.get("objective", ""),
+            acceptance_criteria=list(d.get("acceptance_criteria", [])),
+            phase=d.get("phase", "understand"),
+        )
+
+    def anchor_text(self) -> str:
+        """A compact, durable reminder re-injected after compaction so a summarized
+        transcript can never lose the original objective + criteria. '' if unset."""
+        if not self.objective:
+            return ""
+        head = self.objective if len(self.objective) <= 700 else self.objective[:700] + " …"
+        lines = [f"[TASK — do not lose sight of the original objective]\n{head}"]
+        if self.acceptance_criteria:
+            lines.append("Acceptance criteria (all must be met):")
+            lines += [f"  - {c}" for c in self.acceptance_criteria]
+        return "\n".join(lines)

{drydock_cli-3.0.121 → drydock_cli-3.0.123}/drydock/tui/app.py

@@ -84,6 +84,17 @@ def _fmt_tokens(n: int) -> str:
     return f"{n / 1000:.1f}k" if n >= 1000 else str(n)
 
 
+def is_slash_command(text: str) -> bool:
+    """True only for a real ``/command``, NOT a message that merely starts with a
+    path — e.g. ``/app/env.py defines ...`` or ``/report.tex``. A command name is a
+    single leading token of word chars (no path separators, no dots); anything with
+    ``/``, ``\\`` or ``.`` in that first token is treated as a normal agent message."""
+    if not text.startswith("/"):
+        return False
+    head = text[1:].split(maxsplit=1)[0] if len(text) > 1 else ""
+    return bool(head) and not any(c in head for c in "/\\.")
+
+
 class DrydockApp(App):
     CSS = """
     Screen { background: #0b1f2a; }
@@ -425,7 +436,7 @@ class DrydockApp(App):
         prompt.clear()
         if not text:
             return
-        if text.startswith("/"):
+        if is_slash_command(text):
             self._handle_slash(text)  # meta commands stay out of history
             return
         prompt.cmd_history.add(text)

{drydock_cli-3.0.121 → drydock_cli-3.0.123/drydock_cli.egg-info}/PKG-INFO

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

@@ -26,6 +26,7 @@ drydock/rmf_graph.py
 drydock/skills.py
 drydock/stig.py
 drydock/suggest.py
+drydock/task_state.py
 drydock/tool_registry.py
 drydock/tuning.py
 drydock/web.py
@@ -117,6 +118,7 @@ tests/test_streaming_newlines.py
 tests/test_subagent.py
 tests/test_suggest.py
 tests/test_system_prompt_help.py
+tests/test_task_state.py
 tests/test_todo.py
 tests/test_tool_arg_coercion.py
 tests/test_tool_arg_coercion_more.py

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

{drydock_cli-3.0.121 → drydock_cli-3.0.123}/tests/test_screenshot.py

@@ -21,6 +21,7 @@ def test_registered_and_available_to_gemma():
 def test_graceful_when_no_grabber(monkeypatch):
     monkeypatch.setattr(tools, "_IS_WINDOWS", False)
     monkeypatch.setattr("sys.platform", "linux")
+    monkeypatch.setenv("DISPLAY", ":0")  # a display exists, but no grabber is installed
     monkeypatch.setattr("shutil.which", lambda _n: None)  # no grabbers installed
     out = tools.tool_screenshot({}, {"cwd": os.getcwd()})
     assert out.startswith("Error") and "screenshot tool" in out

{drydock_cli-3.0.121 → drydock_cli-3.0.123}/tests/test_suggest.py

@@ -18,3 +18,13 @@ def test_priority_and_cases():
 def test_error_beats_plan_and_writes():
     assert s(ctx_pct=10, wrote_files=True, ran_bash=True, had_error=True,
              in_git=True, plan_remaining=True) == "fix the error above"
+
+
+def test_is_slash_command_distinguishes_paths():
+    from drydock.tui.app import is_slash_command as c
+    assert c("/help") and c("/ml-train foo") and c("/ask!") and c("/compact")
+    # file paths / messages starting with a path are NOT commands
+    assert not c("/app/env.py defines a gridworld")
+    assert not c("/report.tex")
+    assert not c("/data/file.h5 holds predictions")
+    assert not c("Train a model") and not c("/")

drydock_cli-3.0.123/tests/test_task_state.py

@@ -0,0 +1,69 @@
+"""Structured task state (Agent-Buildout PRD Epic A): the objective + acceptance
+criteria live outside the transcript, are serializable, and survive compaction."""
+from __future__ import annotations
+
+from drydock import agent
+from drydock.providers import AssistantTurn
+from drydock.task_state import TaskState, extract_acceptance_criteria
+
+
+def test_extracts_numbered_and_bulleted_criteria():
+    obj = "Build a parser. Requirements:\n1. Read /app/in.txt\n2. Write /app/out.json\n- Exit 0"
+    c = extract_acceptance_criteria(obj)
+    assert c == ["Read /app/in.txt", "Write /app/out.json", "Exit 0"]
+
+
+def test_extracts_imperative_when_no_list():
+    c = extract_acceptance_criteria("The script must print the CN and it should exit 0.")
+    assert any("must print" in x for x in c)
+
+
+def test_from_objective_and_serializable_without_transcript():
+    ts = TaskState.from_objective("Do X.\n1. A\n2. B")
+    assert ts.is_set() and ts.acceptance_criteria == ["A", "B"] and ts.phase == "understand"
+    d = ts.to_dict()                      # A1.1: serializable without the transcript
+    assert d["objective"] and d["acceptance_criteria"] == ["A", "B"]
+    assert TaskState.from_dict(d).objective == ts.objective   # reconstructable
+
+
+def test_anchor_text_includes_objective_and_criteria():
+    a = TaskState.from_objective("Fix the bug.\n1. tests pass\n2. no regressions").anchor_text()
+    assert "Fix the bug" in a and "tests pass" in a and "no regressions" in a
+    assert TaskState().anchor_text() == ""   # empty when unset
+
+
+def _run_capture(cfg, msg, state=None):
+    seen = {}
+    def fake_stream(model, system, messages, tool_schemas, config):
+        seen["system"] = system
+        yield AssistantTurn("done", [], 5, 5)
+    orig = agent.stream; agent.stream = fake_stream
+    try:
+        st = state or agent.AgentState()
+        list(agent.run(msg, st, cfg, "BASE"))
+        return seen["system"], st
+    finally:
+        agent.stream = orig
+
+
+def test_objective_captured_and_anchored_in_system_prompt():
+    cfg = {"model": "gemma4", "max_tokens": 8192, "context_limit": 65536, "task_anchor": True}
+    sysp, st = _run_capture(cfg, "Recover the password.\n1. it is 23 chars\n2. write it to out.txt")
+    assert st.task.is_set() and st.task.acceptance_criteria == ["it is 23 chars", "write it to out.txt"]
+    assert "TASK" in sysp and "23 chars" in sysp   # anchor present in system prompt
+
+
+def test_anchor_survives_a_compacted_follow_up_turn():
+    # A2: after the transcript is replaced (compaction), the objective is still in the
+    # system prompt on the next turn because it lives in TaskState, not the messages.
+    cfg = {"model": "gemma4", "max_tokens": 8192, "context_limit": 65536, "task_anchor": True}
+    _, st = _run_capture(cfg, "Original objective X.\n1. criterion one")
+    st.messages = [{"role": "user", "content": "(transcript summarized away)"}]  # simulate compaction
+    sysp2, _ = _run_capture(cfg, "keep going", state=st)
+    assert "Original objective X" in sysp2 and "criterion one" in sysp2
+
+
+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