drydock-cli 3.0.30__tar.gz → 3.0.31__tar.gz

{drydock_cli-3.0.30/drydock_cli.egg-info → drydock_cli-3.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.30
+Version: 3.0.31
 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.30 → drydock_cli-3.0.31}/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.30"
+    __version__ = "3.0.31"

{drydock_cli-3.0.30 → drydock_cli-3.0.31}/drydock/agent.py

@@ -115,6 +115,13 @@ def run(
     leaked_call_retries = 0
     plan_continue_nudges = 0  # consecutive "you stopped mid-plan" nudges
     empty_response_nudges = 0  # consecutive "you returned nothing" nudges
+    # Safety valve for a degenerate loop: the SAME tool call FAILING over and
+    # over (a weak model that ignores the advisory loop-note — seen failing a
+    # Write 160× on a too-large file). Real iterative fixing changes the args,
+    # so the streak resets; only byte-identical repeated FAILURES trip it.
+    identical_fail_streak = 0
+    last_fail_sig = None
+    IDENTICAL_FAIL_CAP = 8
     run_iteration = 0  # stream calls within THIS run() (resets per user message)
     loop_tracker = LoopTracker()
 
@@ -288,6 +295,16 @@ def run(
                 )
             else:
                 result = execute(tc["name"], tc["input"], config)
+            # Track byte-identical repeated FAILURES (checked before annotate
+            # prepends its advisory note) for the safety valve below.
+            failed = result.lstrip().startswith(("Error", "REFUSED"))
+            sig = (tc["name"], str(tc["input"]))
+            if failed and sig == last_fail_sig:
+                identical_fail_streak += 1
+            elif failed:
+                identical_fail_streak, last_fail_sig = 1, sig
+            else:
+                identical_fail_streak, last_fail_sig = 0, None
             # Guide (never block) on exact-repeat tool calls: prepend an
             # advisory note when the same call is made again.
             result = loop_tracker.annotate(tc["name"], tc["input"], result)
@@ -302,6 +319,19 @@ def run(
                 "content": result,
             })
 
+        # Safety valve: the same call has FAILED identically too many times —
+        # repeating it won't help. End the turn and hand control back with a
+        # clear note rather than burning turns toward MAX_TOOL_TURNS.
+        if identical_fail_streak >= IDENTICAL_FAIL_CAP:
+            yield TextChunk(
+                f"\n[Stopped: the same {last_fail_sig[0]} call failed "
+                f"{identical_fail_streak}× in a row — repeating it won't change "
+                "the result. If it's a Write, the file is likely too large for "
+                "one response; write it in smaller pieces. Control is back to "
+                "you.]\n"
+            )
+            break
+
         # Safe point (all tool results appended): honor a STOP requested while
         # this turn's tools were running, before spending another LLM call.
         if _stopped():

{drydock_cli-3.0.30 → drydock_cli-3.0.31/drydock_cli.egg-info}/PKG-INFO

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

@@ -35,6 +35,7 @@ tests/test_compaction.py
 tests/test_config.py
 tests/test_detect.py
 tests/test_empty_response.py
+tests/test_failure_loop.py
 tests/test_first_run_setup.py
 tests/test_guards_and_tools.py
 tests/test_hallucinated_tools.py

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

drydock_cli-3.0.31/tests/test_failure_loop.py

@@ -0,0 +1,43 @@
+"""Safety valve: a byte-identical tool call that keeps FAILING must end the
+turn after a small cap, not spin toward MAX_TOOL_TURNS (a real session failed
+the same Write 160×)."""
+from __future__ import annotations
+
+import drydock.agent as agent_mod
+from drydock.agent import AgentState, run
+from drydock.providers import AssistantTurn
+
+
+def test_identical_failure_streak_ends_turn(monkeypatch):
+    calls = {"n": 0}
+
+    def counting(**kw):
+        calls["n"] += 1
+        # Same failing Write every time (empty file_path → Error). id varies but
+        # the input (the signature) is identical.
+        return iter([AssistantTurn(
+            "", [{"id": str(calls["n"]), "name": "Write",
+                  "input": {"file_path": "", "content": "x"}}], 1, 1)])
+
+    monkeypatch.setattr(agent_mod, "stream", counting)
+    st = AgentState()
+    list(run("build it", st, {"model": "m"}, "sys"))
+    assert calls["n"] <= 12  # stopped near the cap (8), nowhere near 200
+
+
+def test_changing_args_do_not_trip_valve(monkeypatch):
+    # Legit iterative fixing (different args each time) must NOT trip the valve;
+    # here each call succeeds (writes a different file), then the model finishes.
+    seq = [
+        AssistantTurn("", [{"id": "1", "name": "Write",
+                            "input": {"file_path": "a.txt", "content": "1"}}], 1, 1),
+        AssistantTurn("", [{"id": "2", "name": "Write",
+                            "input": {"file_path": "b.txt", "content": "2"}}], 1, 1),
+        AssistantTurn("done", [], 1, 1),
+    ]
+    monkeypatch.setattr(agent_mod, "stream", lambda **kw: iter([seq.pop(0)]))
+    st = AgentState()
+    import tempfile
+    list(run("go", st, {"model": "m", "cwd": tempfile.mkdtemp()}, "sys"))
+    assert any(m.get("role") == "assistant" and m.get("content") == "done"
+               for m in st.messages)