drydock-cli 3.0.22__tar.gz → 3.0.24__tar.gz

{drydock_cli-3.0.22/drydock_cli.egg-info → drydock_cli-3.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.22
+Version: 3.0.24
 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.22 → drydock_cli-3.0.24}/drydock/__init__.py

@@ -7,4 +7,4 @@ try:
     __version__ = _version("drydock-cli")
 except PackageNotFoundError:
     # Running from source before install (e.g. PYTHONPATH dev runs).
-    __version__ = "3.0.22"
+    __version__ = "3.0.24"

{drydock_cli-3.0.22 → drydock_cli-3.0.24}/drydock/agent.py

@@ -114,6 +114,7 @@ def run(
     session_has_edited = False
     leaked_call_retries = 0
     plan_continue_nudges = 0  # consecutive "you stopped mid-plan" nudges
+    empty_response_nudges = 0  # consecutive "you returned nothing" nudges
     run_iteration = 0  # stream calls within THIS run() (resets per user message)
     loop_tracker = LoopTracker()
 
@@ -226,6 +227,22 @@ def run(
                     ),
                 })
                 continue
+            # A completely EMPTY response (no text, no tool call, no leaked call)
+            # is a non-answer, not a deliberate "done" — a weak model sometimes
+            # returns nothing on a hard task and the turn dead-ends silently.
+            # Nudge ONCE to produce output. Narrow (only empty text) and capped,
+            # so unlike a blanket auto-continue it can't loop on real answers.
+            if not (assistant_turn.text or "").strip() and empty_response_nudges < 1:
+                empty_response_nudges += 1
+                state.messages.append({
+                    "role": "user",
+                    "content": (
+                        "[SYSTEM] Your last response was empty. Produce your "
+                        "result now: either call a tool to do the work, or reply "
+                        "with text. Do not return an empty message."
+                    ),
+                })
+                continue
             break
 
         # Execute each tool call
@@ -282,6 +299,7 @@ def run(
         # a long, productive plan can run as far as it needs (the cap only
         # bounds back-to-back stalls).
         plan_continue_nudges = 0
+        empty_response_nudges = 0
 
         # Nudge: if past 15 tool calls without any edits, inject gentle guidance
         if tool_call_count == 15 and not session_has_edited and config.get("force_first_tool"):

{drydock_cli-3.0.22 → drydock_cli-3.0.24}/drydock/tools/__init__.py

@@ -460,7 +460,12 @@ def tool_bash(params: dict, config: dict) -> str:
             output += f"\n[exit code: {result.returncode}]"
         return output.strip() or "(no output)"
     except subprocess.TimeoutExpired:
-        return f"Error: command timed out after {timeout}s"
+        bigger = min(timeout * 4, 600)
+        return (
+            f"Error: command timed out after {timeout}s. If it is legitimately "
+            f"slow (a big query, build, download, or test run), retry with a "
+            f"larger timeout — pass timeout: {bigger}. Otherwise it may be hung."
+        )
     except Exception as e:
         return f"Error: {e}"
 

{drydock_cli-3.0.22 → drydock_cli-3.0.24/drydock_cli.egg-info}/PKG-INFO

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

@@ -34,6 +34,7 @@ tests/test_cli_agents.py
 tests/test_compaction.py
 tests/test_config.py
 tests/test_detect.py
+tests/test_empty_response.py
 tests/test_guards_and_tools.py
 tests/test_hallucinated_tools.py
 tests/test_leaked_tool_call.py

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

drydock_cli-3.0.24/tests/test_empty_response.py

@@ -0,0 +1,42 @@
+"""A completely empty assistant response (no text, no tool call, no leaked
+call) should be nudged ONCE to produce output rather than dead-ending the user
+with a silent stop — but it must not loop on real (non-empty) answers."""
+from __future__ import annotations
+
+import drydock.agent as agent_mod
+from drydock.agent import AgentState, run
+from drydock.providers import AssistantTurn
+
+
+def test_empty_response_gets_one_nudge(monkeypatch):
+    seq = [
+        AssistantTurn("", [], 1, 1),          # empty → nudge
+        AssistantTurn("here is the answer", [], 1, 1),  # then a real reply
+    ]
+    monkeypatch.setattr(agent_mod, "stream", lambda **kw: iter([seq.pop(0)]))
+    st = AgentState()
+    list(run("do it", st, {"model": "m"}, "sys"))
+    nudges = [m for m in st.messages
+              if m["role"] == "user" and "response was empty" in m["content"]]
+    assert len(nudges) == 1
+    assert not seq  # both turns consumed
+
+
+def test_empty_nudge_capped_at_one(monkeypatch):
+    # Persistently empty → nudged once, then the loop gives control back.
+    seq = [AssistantTurn("", [], 1, 1) for _ in range(6)]
+    monkeypatch.setattr(agent_mod, "stream", lambda **kw: iter([seq.pop(0)]))
+    st = AgentState()
+    list(run("do it", st, {"model": "m"}, "sys"))
+    nudges = [m for m in st.messages
+              if m["role"] == "user" and "response was empty" in m["content"]]
+    assert len(nudges) == 1  # not a spin
+
+
+def test_nonempty_text_is_not_nudged(monkeypatch):
+    seq = [AssistantTurn("all done", [], 1, 1)]
+    monkeypatch.setattr(agent_mod, "stream", lambda **kw: iter([seq.pop(0)]))
+    st = AgentState()
+    list(run("hi", st, {"model": "m"}, "sys"))
+    assert not [m for m in st.messages
+                if m["role"] == "user" and "response was empty" in m["content"]]

{drydock_cli-3.0.22 → drydock_cli-3.0.24}/tests/test_guards_and_tools.py

@@ -313,6 +313,15 @@ def test_file_tools_honor_config_cwd(tmp_path):
     assert "x.py" in tool_bash({"command": "ls sub"}, cfg)
 
 
+def test_tool_bash_timeout_suggests_larger_timeout():
+    from drydock.tools import tool_bash
+    out = tool_bash({"command": "sleep 2", "timeout": 1}, {})
+    assert "timed out after 1s" in out
+    # Must tell the model it can retry with a bigger timeout (so a legitimately
+    # slow query/build doesn't dead-end — what derailed query-optimize).
+    assert "timeout: 4" in out
+
+
 def test_absolute_paths_pass_through(tmp_path):
     fp = str(tmp_path / "abs.py")
     tool_write({"file_path": fp, "content": "a=1\n"}, {"cwd": "/nonexistent"})