drydock-cli 2.9.103__tar.gz → 2.9.105__tar.gz

{drydock_cli-2.9.103 → drydock_cli-2.9.105}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 2.9.103
+Version: 2.9.105
 Summary: Local-first CLI coding agent — tested with Gemma 4 26B via llama.cpp
 Project-URL: Homepage, https://github.com/fbobe321/drydock
 Project-URL: Repository, https://github.com/fbobe321/drydock

{drydock_cli-2.9.103 → drydock_cli-2.9.105}/drydock/core/agent_loop.py

@@ -3242,6 +3242,66 @@ class AgentLoop:
                     )
                 return
 
+        # 2026-06-07 Pre-flight: prune duplicate write_file history (v2.9.104).
+        # User session 2026-06-06 v2.9.95 batch `sam-cell-seg` trial:
+        # 22 identical writes to `/app/conversation_summary.smd` with the
+        # same sha8=d3bedbf3 content. The existing write_file dedup is
+        # advisory-only (per feedback_no_tool_errors_for_loop_detection.md)
+        # and Gemma 4 ignores the advisory. Same architectural fix as the
+        # consecutive-task preflight: drop the old duplicate calls from
+        # history so the model's next turn sees a cleaner context, with
+        # only the most recent attempt visible. Tool itself stays advisory.
+        if tool_call.tool_name == "write_file":
+            try:
+                cur_path = (
+                    tool_call.args_dict.get("path")
+                    or tool_call.args_dict.get("file_path")
+                    or ""
+                )
+                cur_content = tool_call.args_dict.get("content", "")
+                if cur_path and isinstance(cur_content, str):
+                    dup_count = 0
+                    dup_indices: list[int] = []
+                    for i, m in enumerate(self.messages):
+                        if m.role != Role.assistant or not m.tool_calls:
+                            continue
+                        for tc in m.tool_calls:
+                            if tc.function.name != "write_file":
+                                continue
+                            try:
+                                a = json.loads(tc.function.arguments or "{}")
+                            except Exception:
+                                continue
+                            ap = a.get("path") or a.get("file_path") or ""
+                            ac = a.get("content", "")
+                            if ap == cur_path and ac == cur_content:
+                                dup_count += 1
+                                dup_indices.append(i)
+                                break
+                    if dup_count >= 5 and len(dup_indices) > 1:
+                        # Drop all but the most recent prior duplicate.
+                        # Also drop the tool result that immediately follows.
+                        to_drop = set()
+                        for idx in dup_indices[:-1]:
+                            to_drop.add(idx)
+                            if idx + 1 < len(self.messages):
+                                next_m = self.messages[idx + 1]
+                                if next_m.role == Role.tool:
+                                    to_drop.add(idx + 1)
+                        kept = [
+                            m for i, m in enumerate(self.messages)
+                            if i not in to_drop
+                        ]
+                        self.messages.reset(kept)
+                        logger.warning(
+                            "[PREFLIGHT-WRITE-DUP] pruned %d duplicate "
+                            "write_file calls to %r (%d identical "
+                            "attempts in history)",
+                            len(to_drop), cur_path, dup_count,
+                        )
+            except Exception as _e:
+                logger.debug("[PREFLIGHT-WRITE-DUP] failed: %s", _e)
+
         # 2026-06-05 Pre-flight path validation. Operator: "why can't tool
         # calls check the right pathing BEFORE doing it?" Right answer.
         # For file tools that REQUIRE a path arg, validate before dispatch.

{drydock_cli-2.9.103 → drydock_cli-2.9.105}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "drydock-cli"
-version = "2.9.103"
+version = "2.9.105"
 description = "Local-first CLI coding agent — tested with Gemma 4 26B via llama.cpp"
 readme = "README.md"
 requires-python = ">=3.12"

{drydock_cli-2.9.103 → drydock_cli-2.9.105}/tests/test_loop_regressions_2026_06_06.py

@@ -113,6 +113,28 @@ class TestSubagentSkipsAdaptiveBudget:
 # task is now disabled for Gemma 4 in v2.9.97).
 # ===========================================================================
 
+class TestConsecutiveWriteDuplicatePreflight:
+    """v2.9.104: 5+ identical write_file calls to the same path get
+    pruned at preflight. User session 2026-06-06 v2.9.95 batch
+    `sam-cell-seg` trial: 22 identical writes to
+    /app/conversation_summary.smd, sha8=d3bedbf3. The tool-level dedup
+    is advisory-only by design (feedback_no_tool_errors_for_loop_...)
+    and Gemma 4 ignored the advisory. The preflight prunes the
+    duplicates from history so the model's next turn sees a clean
+    context. Pin the preflight marker so refactors surface here."""
+
+    def test_preflight_marker_present_in_agent_loop(self):
+        text = open(
+            "/data3/drydock/drydock/core/agent_loop.py"
+        ).read()
+        assert "PREFLIGHT-WRITE-DUP" in text, (
+            "consecutive-write preflight was removed from agent_loop.py"
+        )
+        assert "5 and len(dup_indices)" in text or "dup_count >= 5" in text, (
+            "duplicate-write threshold changed; update test"
+        )
+
+
 class TestConsecutiveTaskBlockPreflight:
     """When a model emits `task` two turns in a row, the second call must
     be blocked at preflight (drop from history + emit advisory). The

{drydock_cli-2.9.103 → drydock_cli-2.9.105}/uv.lock

@@ -326,7 +326,7 @@ wheels = [
 
 [[package]]
 name = "drydock-cli"
-version = "2.9.101"
+version = "2.9.103"
 source = { editable = "." }
 dependencies = [
     { name = "agent-client-protocol" },