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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.30
+Version: 3.0.32
 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.32}/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.32"

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

@@ -115,6 +115,15 @@ 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 run over and over
+    # with the SAME result — success OR failure (seen failing a Write 160×, and
+    # re-running an identical passing `pytest` 92× for 25 min). The advisory
+    # loop-note is ignored by weak models, so after a cap we end the turn. Real
+    # iterative fixing changes the args, and polling yields a changing result —
+    # both reset the streak, so only a truly pointless loop trips it.
+    identical_repeat_streak = 0
+    last_call_sig = None
+    IDENTICAL_REPEAT_CAP = 8
     run_iteration = 0  # stream calls within THIS run() (resets per user message)
     loop_tracker = LoopTracker()
 
@@ -288,6 +297,15 @@ def run(
                 )
             else:
                 result = execute(tc["name"], tc["input"], config)
+            # Track consecutive byte-identical calls — same name, args AND raw
+            # result (captured before annotate prepends its note, which changes
+            # each call) — for the safety valve below. A differing result
+            # (polling) or differing args (real iteration) resets the streak.
+            sig = (tc["name"], str(tc["input"]), result)
+            if sig == last_call_sig:
+                identical_repeat_streak += 1
+            else:
+                identical_repeat_streak, last_call_sig = 1, sig
             # 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 +320,18 @@ def run(
                 "content": result,
             })
 
+        # Safety valve: the same call has run identically (same args AND result)
+        # too many times in a row — repeating it changes nothing. End the turn
+        # and hand control back rather than burning turns toward MAX_TOOL_TURNS.
+        if identical_repeat_streak >= IDENTICAL_REPEAT_CAP:
+            yield TextChunk(
+                f"\n[Stopped: the same {last_call_sig[0]} call ran "
+                f"{identical_repeat_streak}× in a row with the same result — "
+                "repeating it changes nothing. Control is back to you; tell me "
+                "how you'd like to proceed.]\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.32/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.30
+Version: 3.0.32
 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.32}/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.32}/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.32"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.12"

drydock_cli-3.0.32/tests/test_failure_loop.py

@@ -0,0 +1,77 @@
+"""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)
+
+
+def test_identical_SUCCESS_streak_ends_turn(monkeypatch):
+    # The code-red case: a SUCCESSFUL command re-run identically (same args AND
+    # same output) — a passing `pytest` 92×. Must also stop, not just failures.
+    import tempfile
+    calls = {"n": 0}
+
+    def counting(**kw):
+        calls["n"] += 1
+        return iter([AssistantTurn(
+            "", [{"id": str(calls["n"]), "name": "Bash",
+                  "input": {"command": "echo hi"}}], 1, 1)])
+
+    monkeypatch.setattr(agent_mod, "stream", counting)
+    st = AgentState()
+    list(run("go", st, {"model": "m", "cwd": tempfile.mkdtemp()}, "sys"))
+    assert calls["n"] <= 12  # identical success → stopped at the cap, not 200
+
+
+def test_polling_with_changing_result_not_tripped(monkeypatch):
+    # Same command, DIFFERENT result each time (a poll) must NOT be stopped —
+    # the result changes, so the streak resets. Model finishes on its own.
+    import tempfile
+    seq = []
+    for i in range(3):
+        seq.append(AssistantTurn(
+            "", [{"id": str(i), "name": "Bash",
+                  "input": {"command": f"echo {i}"}}], 1, 1))  # different output
+    seq.append(AssistantTurn("done", [], 1, 1))
+    monkeypatch.setattr(agent_mod, "stream", lambda **kw: iter([seq.pop(0)]))
+    st = AgentState()
+    list(run("go", st, {"model": "m", "cwd": tempfile.mkdtemp()}, "sys"))
+    assert any(m.get("content") == "done" for m in st.messages)