drydock-cli 2.10.4__tar.gz → 2.10.5__tar.gz

{drydock_cli-2.10.4 → drydock_cli-2.10.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 2.10.4
+Version: 2.10.5
 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.10.4 → drydock_cli-2.10.5}/drydock/core/classifier/rules.py

@@ -53,7 +53,11 @@ RULES: tuple[ClassificationRule, ...] = (
     ),
     ClassificationRule(
         pattern_id="harness:bash:heredoc_loop",
-        regex=_r(r"loop[:\s]*bash.*(cat\s*<<|here[-\s]*doc)"),
+        # Negative lookbehind prevents matching pattern-ID references like
+        # "harness:loop:bash_generic" that appear in status summaries and
+        # trip-log lines — those caused a dispatch feedback loop (23 false
+        # positives per 24h sourced from autonomous_review.log).
+        regex=_r(r"(?<!harness:)loop[:\s]*bash.*(cat\s*<<|here[-\s]*doc)"),
         bucket=Bucket.HARNESS,
         suggested_action="Detect cat-heredoc write pattern in bash loop-breaker; redirect to write_file.",
     ),
@@ -134,7 +138,7 @@ RULES: tuple[ClassificationRule, ...] = (
     ),
     ClassificationRule(
         pattern_id="harness:loop:bash_generic",
-        regex=_r(r"loop[:\s]*bash\b"),
+        regex=_r(r"(?<!harness:)loop[:\s]*bash\b"),
         bucket=Bucket.HARNESS,
         suggested_action="Investigate the bash subcommand pattern; admiral nudge already firing.",
         confidence=0.6,

{drydock_cli-2.10.4 → drydock_cli-2.10.5}/drydock/core/tools/builtins/mechanical_rename.py

@@ -33,6 +33,7 @@ from pydantic import BaseModel, Field
 from drydock.core.tools.base import (
     BaseTool, BaseToolConfig, BaseToolState, InvokeContext, ToolError, ToolPermission,
 )
+from drydock.core.types import ToolStreamEvent
 from drydock.core.tools.ui import ToolCallDisplay, ToolResultDisplay, ToolUIData
 
 if TYPE_CHECKING:
@@ -102,6 +103,10 @@ class MechanicalRename(
         "Use for 'rename X to Y everywhere' / 'change schema field' style tasks."
     )
 
+    @classmethod
+    def get_status_text(cls) -> str:
+        return "Renaming identifier"
+
     @classmethod
     def format_call_display(cls, args: MechanicalRenameArgs) -> ToolCallDisplay:
         return ToolCallDisplay(
@@ -124,9 +129,9 @@ class MechanicalRename(
             return ToolResultDisplay(success=True, message=msg)
         return ToolResultDisplay(success=False, message="rename failed")
 
-    async def invoke(
-        self, args: MechanicalRenameArgs, ctx: InvokeContext,
-    ) -> AsyncGenerator:
+    async def run(
+        self, args: MechanicalRenameArgs, ctx: InvokeContext | None = None,
+    ) -> AsyncGenerator[ToolStreamEvent | MechanicalRenameResult, None]:
         # Validate inputs.
         old, new = args.old_name.strip(), args.new_name.strip()
         if not old or not new:

{drydock_cli-2.10.4 → drydock_cli-2.10.5}/pyproject.toml

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

{drydock_cli-2.10.4 → drydock_cli-2.10.5}/tests/test_classifier.py

@@ -233,6 +233,43 @@ def test_classify_real_admiral_fire_codes():
     assert len({s.pattern_id for s in harness}) >= 3
 
 
+def test_no_false_positives_from_autonomous_review_status_lines():
+    """Status summaries in autonomous_review.log mention pattern IDs by name.
+    The classifier must NOT re-fire those as new signals — that creates a
+    feedback loop where the dispatch queue inflates indefinitely.
+
+    Confirmed real false-positive text that was producing 23 spurious
+    harness:bash:heredoc_loop + harness:loop:bash_generic entries per 24h
+    before classify_pulse.sh stopped scanning autonomous_review.log.
+    """
+    # Trip-log status line that mentions pattern IDs
+    trip_log_line = (
+        "- Dispatch queue top patterns (`harness:loop:bash_generic`, "
+        "`harness:bash:heredoc_loop`) already covered by prior commits"
+    )
+    signals = classify_text(trip_log_line)
+    harness_ids = {s.pattern_id for s in signals if s.bucket == Bucket.HARNESS}
+    assert "harness:bash:heredoc_loop" not in harness_ids, (
+        "harness:bash:heredoc_loop must not fire on status-summary text "
+        "that merely names the pattern — this causes a dispatch feedback loop"
+    )
+    assert "harness:loop:bash_generic" not in harness_ids, (
+        "harness:loop:bash_generic must not fire on pattern-ID references in status summaries"
+    )
+
+    # autonomous_review.log summary line (another real false-positive source)
+    review_log_line = (
+        "Detect cat-heredoc write pattern in bash loop-breaker; redirect to write_file. "
+        "Already addressed by fix in v2.9.x."
+    )
+    signals2 = classify_text(review_log_line)
+    harness_ids2 = {s.pattern_id for s in signals2 if s.bucket == Bucket.HARNESS}
+    assert "harness:bash:heredoc_loop" not in harness_ids2, (
+        "harness:bash:heredoc_loop must not fire on suggested_action text "
+        "from the dispatch queue (feedback loop via autonomous_review.log)"
+    )
+
+
 if __name__ == "__main__":
     import pytest
     raise SystemExit(pytest.main([__file__, "-v"]))

drydock_cli-2.10.5/tests/test_mechanical_rename_tool.py

@@ -0,0 +1,32 @@
+"""Regression test: MechanicalRename must implement BaseTool.run (not invoke).
+
+Prior to the fix, MechanicalRename overrode BaseTool.invoke instead of the
+abstract BaseTool.run, making inspect.isabstract(MechanicalRename) return True
+and causing the tool manager to silently drop it from active_tools.
+"""
+import inspect
+import pytest
+from drydock.core.tools.builtins.mechanical_rename import MechanicalRename
+from drydock.core.tools.base import BaseTool
+
+
+def test_mechanical_rename_is_not_abstract():
+    """Tool manager uses inspect.isabstract to filter — must be False."""
+    assert not inspect.isabstract(MechanicalRename), (
+        "MechanicalRename is abstract; it must implement BaseTool.run"
+    )
+
+
+def test_mechanical_rename_implements_run():
+    """run() must be defined directly on MechanicalRename, not inherited as abstract."""
+    assert "run" in MechanicalRename.__dict__, (
+        "MechanicalRename does not define run(); only invoke() was defined before fix"
+    )
+
+
+def test_mechanical_rename_instantiates():
+    """Should be instantiable with default config and state."""
+    from drydock.core.tools.base import BaseToolState
+    from drydock.core.tools.builtins.mechanical_rename import MechanicalRenameConfig
+    tool = MechanicalRename(config=MechanicalRenameConfig(), state=BaseToolState())
+    assert isinstance(tool, BaseTool)

drydock_cli-2.10.5/tests/test_mechanical_rename_type_extraction.py

@@ -0,0 +1,60 @@
+"""Pin the mechanical_rename return-annotation contract.
+
+Bug: 2026-06-08 — the user's work-box TUI hit
+  "MechanicalRename.run must yield a Pydantic model as result;
+   got <class 'collections.abc.AsyncGenerator'>"
+on every session save (every user turn). Root cause: `mechanical_rename.py`
+declared `async def run(...) -> AsyncGenerator:` (bare, no type
+parameters). BaseTool._extract_result_type can't parse a bare
+AsyncGenerator and falls through line 283 (isinstance(t, type) check),
+returning AsyncGenerator itself as the result type. The Pydantic
+check at line 270-274 then rejects it.
+
+Reproduce in TUI: open drydock in a folder, type any message — drydock
+attempts to save the session, validates all tool annotations, blows
+up on this one, and the loop pattern emerges because the model retries
+its previous tool call (often nothing in particular) on the next turn.
+"""
+from drydock.core.tools.builtins.mechanical_rename import (
+    MechanicalRename, MechanicalRenameResult, MechanicalRenameArgs,
+)
+
+
+def test_run_return_annotation_resolves_to_result_type():
+    """BaseTool._extract_result_type must return the Pydantic result class."""
+    args_t, result_t = MechanicalRename._get_tool_args_results()
+    assert args_t is MechanicalRenameArgs
+    assert result_t is MechanicalRenameResult, (
+        f"expected MechanicalRenameResult, got {result_t!r} — "
+        "the run() annotation is probably a bare AsyncGenerator again"
+    )
+
+
+def test_all_builtin_tools_extract_clean_result_types():
+    """Every builtin tool's run() annotation must be parameterized correctly.
+
+    Catches the same class of bug for any other tool that drops to a
+    bare AsyncGenerator annotation in the future.
+    """
+    from pydantic import BaseModel
+    from drydock.core.tools.builtins import (
+        bash, write_file, read_file, search_replace, mechanical_rename,
+    )
+
+    for mod in (bash, write_file, read_file, search_replace, mechanical_rename):
+        # Find the BaseTool subclass in the module
+        from drydock.core.tools.base import BaseTool
+        for attr in dir(mod):
+            obj = getattr(mod, attr)
+            if isinstance(obj, type) and issubclass(obj, BaseTool) and obj is not BaseTool:
+                try:
+                    _, result_t = obj._get_tool_args_results()
+                except Exception as e:
+                    raise AssertionError(
+                        f"{mod.__name__}.{attr} failed type extraction: {e}"
+                    )
+                assert issubclass(result_t, BaseModel), (
+                    f"{mod.__name__}.{attr} resolved result_t={result_t!r}, "
+                    f"not a Pydantic BaseModel — bare AsyncGenerator annotation?"
+                )
+                break

{drydock_cli-2.10.4 → drydock_cli-2.10.5}/uv.lock

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