drydock-cli 2.9.32__tar.gz → 2.9.34__tar.gz

{drydock_cli-2.9.32 → drydock_cli-2.9.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 2.9.32
+Version: 2.9.34
 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.32 → drydock_cli-2.9.34}/drydock/core/agent_loop.py

@@ -3234,6 +3234,7 @@ class AgentLoop:
                     "REFUSED: bash inplace file edit" in (text or "")
                     or "REFUSED: bash redirect-to-source-file" in (text or "")
                     or "[bash: empty or placeholder command" in (text or "")
+                    or "[bash: LOOP-BREAKER" in (text or "")
                     or "[bash: comment-only command" in (text or "")
                 ):
                     # Refused/no-op bash — counts as a failed/no-progress turn.
@@ -3266,9 +3267,10 @@ class AgentLoop:
                 >= THRESHOLD):
             note = (
                 f"[REFLECTION: you've made {self._readonly_streak} "
-                f"consecutive read-only tool calls (read_file/grep/"
-                f"glob/retrieve/web_search) without producing any code "
-                f"change. You likely have enough context now. Either: "
+                f"consecutive read-only or no-progress tool calls "
+                f"(read_file/grep/glob/retrieve/web_search/empty-bash) "
+                f"without producing any code change. You likely have "
+                f"enough context now. Either: "
                 f"(1) call write_file / search_replace / "
                 f"mechanical_rename / apply_patch with your best attempt "
                 f"at the fix right now, OR (2) emit a plain-text "
@@ -3277,7 +3279,7 @@ class AgentLoop:
                 f"piece). Continued pure exploration past this point "
                 f"will not progress the task. The deadline is finite — "
                 f"a partial-but-real attempt is more useful than "
-                f"another grep.]"
+                f"another grep or empty bash call.]"
             )
             self._inject_system_note(note)
             self._last_reflection_streak = self._readonly_streak

{drydock_cli-2.9.32 → drydock_cli-2.9.34}/drydock/core/tools/builtins/bash.py

@@ -496,6 +496,21 @@ class Bash(
                     f"Do NOT re-run this command — the write already completed.]"
                 )
 
+        # When `echo -e` is used with \n or \t and the shell did not expand them,
+        # the output contains literal backslash-n/t. The model then loops retrying
+        # the same command. Detect this and redirect to printf or write_file.
+        # addresses pattern harness:bash:escape_loop
+        if returncode == 0:
+            import re as _re1
+            if _re1.search(r'\becho\s+-e\b', command) and _re1.search(r'\\[nt]', command):
+                if stdout and ('\\n' in stdout or '\\t' in stdout):
+                    stdout = stdout + (
+                        "\n[Hint: echo -e did not expand \\n/\\t — output contains "
+                        "literal backslash sequences. Use `printf 'line1\\nline2\\n'` "
+                        "or write_file for multi-line content. "
+                        "Do NOT repeat echo -e with the same arguments.]"
+                    )
+
         return BashResult(
             command=command, stdout=stdout, stderr=stderr, returncode=returncode
         )
@@ -832,12 +847,31 @@ class Bash(
         # loop). Returning a BashResult with returncode=1 gives the model
         # parseable feedback so it can recover. See feedback_no_tool_errors_for_loop_detection.md.
         if not args.command:
+            # Use the same sentinel text that _update_readonly_streak and
+            # _scrub_validation_error_call both check for so the streak
+            # counter fires and loop-scrub kicks in on repeated bash({}).
+            # Escalate message after 3+ consecutive empty calls so the model
+            # gets an increasingly hard directive to switch tools.
+            _ebc = self.state.__dict__.setdefault("_empty_bash_count", {"n": 0})
+            _ebc["n"] += 1
+            _n = _ebc["n"]
+            if _n >= 3:
+                _empty_msg = (
+                    f"[bash: LOOP-BREAKER — empty command called {_n} times this session] "
+                    "Bash cannot run without a 'command' field. You are stuck. "
+                    "STOP calling bash. Switch tools immediately: "
+                    "call search_replace or write_file to make file changes, "
+                    "or output a plain-text response to the user describing what you intended."
+                )
+            else:
+                _empty_msg = (
+                    "[bash: empty or placeholder command] "
+                    "'command' field is required. "
+                    'Provide a shell command: bash({"command": "<shell command>"})'
+                )
             yield BashResult(
                 command="",
-                stdout=(
-                    "Error: 'command' field is required.\n"
-                    'Usage: bash({"command": "<shell command>"})'
-                ),
+                stdout=_empty_msg,
                 stderr="",
                 returncode=1,
             )
@@ -884,13 +918,25 @@ class Bash(
         # placeholder) instead of a real shell command. Running it does nothing
         # useful and the model loops waiting for output. Catch it early.
         if args.command.strip() in ("{}", "{", "}", "{ }", ""):
-            yield BashResult(
-                command=args.command,
-                stdout=(
+            _ebc2 = self.state.__dict__.setdefault("_empty_bash_count", {"n": 0})
+            _ebc2["n"] += 1
+            _n2 = _ebc2["n"]
+            if _n2 >= 3:
+                _placeholder_msg = (
+                    f"[bash: LOOP-BREAKER — empty/placeholder command called {_n2} times this session] "
+                    "You are stuck in a loop. STOP calling bash with '{}'. "
+                    "Switch tools immediately: use search_replace or write_file for file edits, "
+                    "or output a plain-text response to the user."
+                )
+            else:
+                _placeholder_msg = (
                     "[bash: empty or placeholder command — nothing was executed. "
                     "Supply a real shell command such as `ls`, `python3 script.py`, "
                     "or `cat file.py`. Do NOT resend '{}' or an empty string.]"
-                ),
+                )
+            yield BashResult(
+                command=args.command,
+                stdout=_placeholder_msg,
                 stderr="",
                 returncode=1,
             )

{drydock_cli-2.9.32 → drydock_cli-2.9.34}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "drydock-cli"
-version = "2.9.32"
+version = "2.9.34"
 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.32 → drydock_cli-2.9.34}/tests/test_loop_detection.py

@@ -646,6 +646,23 @@ class TestBashEmptyCommand:
         args = BashArgs(command=None)
         assert args.command is None
 
+    @pytest.mark.asyncio
+    async def test_bash_empty_command_result_has_streak_sentinel(self):
+        """bash({}) result must contain the readonly-streak sentinel so that
+        _update_readonly_streak classifies it as a no-progress turn and fires
+        escalating nudges. Without the sentinel the streak stays at 0 and the
+        loop runs unchecked (dispatch queue: 195 fires in 24h, 2026-06-01)."""
+        from drydock.core.tools.builtins.bash import Bash, BashArgs, BashToolConfig
+        from drydock.core.tools.base import BaseToolState
+        tool = Bash(config=BashToolConfig(), state=BaseToolState())
+        args = BashArgs(command=None)
+        results = [r async for r in tool.run(args)]
+        assert results, "tool.run() yielded nothing"
+        result = results[0]
+        assert "[bash: empty or placeholder command]" in result.stdout, (
+            f"sentinel missing from stdout: {result.stdout!r}"
+        )
+
 
 # ============================================================================
 # Mid-turn user injection (Claude Code "type while busy" feature)

{drydock_cli-2.9.32 → drydock_cli-2.9.34}/uv.lock

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