drydock-cli 2.10.9__tar.gz → 2.10.10__tar.gz

{drydock_cli-2.10.9 → drydock_cli-2.10.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 2.10.9
+Version: 2.10.10
 Summary: Local-first TUI coding agent for Gemma 4 + llama.cpp, with GraphRAG retrieval and a curated cookbook of domain recipes.
 Project-URL: Homepage, https://github.com/fbobe321/drydock
 Project-URL: Repository, https://github.com/fbobe321/drydock

{drydock_cli-2.10.9 → drydock_cli-2.10.10}/drydock/core/agent_loop.py

@@ -7314,6 +7314,13 @@ class AgentLoop:
         # matches scaffolding (CLAUDE.md learnings, etc.) instead of the
         # actual content. Also strip "FINAL ANSWER:" trailing instructions.
         raw = (user_msg or "")
+        # Strip harbor/tbench harness wrapper (same logic as the bypass probe).
+        # The probe correctly anchored on "----- Task: -----" to avoid matching
+        # the generic boilerplate; apply the same strip here so the actual
+        # retrieve query uses the task-specific text, not the wrapper noise.
+        _task_marker_q = raw.find("----- Task: -----")
+        if _task_marker_q >= 0:
+            raw = raw[_task_marker_q + len("----- Task: -----"):]
         q_marker = raw.find("QUESTION:")
         if q_marker >= 0:
             raw = raw[q_marker + len("QUESTION:"):]

{drydock_cli-2.10.9 → drydock_cli-2.10.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "drydock-cli"
-version = "2.10.9"
+version = "2.10.10"
 description = "Local-first TUI coding agent for Gemma 4 + llama.cpp, with GraphRAG retrieval and a curated cookbook of domain recipes."
 readme = "README.md"
 requires-python = ">=3.12"

{drydock_cli-2.10.9 → drydock_cli-2.10.10}/tests/test_auto_retrieve_wrapper_strip.py

@@ -1,19 +1,14 @@
-"""Verify the AUTO-RETRIEVE bypass probe strips the harness wrapper
-before computing the cookbook score.
-
-Bug observed 2026-06-09: a FEAL trial in the v2.10.7 batch exited
-at 43s with reward=0 because:
-  1. AUTO-RETRIEVE bypass probed the raw user prompt
-  2. Raw prompt is ~600 chars of harness wrapper ("WRITE-FIRST
-     RULE", "Process to follow", etc.) BEFORE the actual task
-  3. Wrapper boilerplate dominated TF-IDF — global_rename.md
-     scored 51.4 on "tool call" / "rename" / "process" matches
-  4. Synthetic injection delivered global_rename.md content (pure
-     noise for FEAL), model returned empty response, session ended
-
-Fix: strip everything up to and including "----- Task: -----" before
-the probe. The actual task text (where FEAL appears) now drives the
-TF-IDF score.
+"""Verify the AUTO-RETRIEVE bypass probe AND inject query strip the
+harness wrapper before computing the cookbook score.
+
+Bug 1 (fixed 2026-06-09 in 9f54bbff): bypass probe used raw user prompt.
+Bug 2 (fixed same session): inject query also used raw prompt — so the
+  probe correctly picked FEAL cookbook, bypass fired, but the actual
+  retrieve call used the wrapper as query and got global_rename.md
+  (score=52.1), injecting irrelevant content that caused empty response.
+
+Both paths now anchor on "----- Task: -----" and probe/retrieve only
+the task-specific text that follows.
 """
 from __future__ import annotations
 
@@ -28,6 +23,37 @@ def test_strip_finds_task_marker():
     assert "Real task content" in stripped
 
 
+def test_inject_query_strips_wrapper():
+    """The inject query path must strip the harness wrapper before querying.
+
+    Simulates the fix at agent_loop.py:7316 — the same anchor used by
+    the probe must also be used when building the actual retrieve query so
+    that the injected result is task-relevant, not wrapper-relevant.
+    """
+    wrapper = (
+        "This task has multiple steps. Process to follow:\n"
+        "  • Start with a tool call NOW (read_file, ls, or bash).\n"
+        "  • WRITE-FIRST RULE: within your first 5 tool calls you MUST\n"
+        "    have at least one write_file call.\n"
+        "----- Task: -----\n"
+        "Implement a metacircular evaluator for a Scheme-like language."
+    )
+
+    # Simulate the inject query extraction with the fix applied
+    raw = wrapper
+    task_marker = raw.find("----- Task: -----")
+    if task_marker >= 0:
+        raw = raw[task_marker + len("----- Task: -----"):]
+    query = raw.strip()[:400]
+
+    # Wrapper boilerplate must not appear in the query
+    assert "WRITE-FIRST RULE" not in query
+    assert "Process to follow" not in query
+    # Task-specific content must be the query
+    assert "metacircular evaluator" in query
+    assert "Scheme-like language" in query
+
+
 def test_probe_score_lifts_with_strip_for_feal_prompt():
     """End-to-end: stripping the wrapper makes FEAL-cookbook win on a
     FEAL prompt where the raw wrapper made random cookbook win."""

{drydock_cli-2.10.9 → drydock_cli-2.10.10}/uv.lock

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