drydock-cli 3.0.85__tar.gz → 3.0.86__tar.gz

{drydock_cli-3.0.85/drydock_cli.egg-info → drydock_cli-3.0.86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.85
+Version: 3.0.86
 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.85 → drydock_cli-3.0.86}/drydock/tui/app.py

@@ -59,6 +59,12 @@ BANNER = (
 # Animated "working" line: a turning-helm arc spinner + a nautical gerund +
 # elapsed time + streamed-token count. Rendered in-line above the status bar.
 _SPINNER = "◜◠◝◞◡◟"
+# No agent event for this long → the activity line warns the model may be stalled
+# (the gemma llama.cpp server can hang mid-generation on hard prompts). Advisory
+# only. Set above the longest LEGIT silent stretch seen (a ~135s high-effort
+# think before the first tool call) so normal slow turns don't nag; observed
+# stalls ran 3–5 min+, so 180s still flags them well before the 30-min timeout.
+_STALL_HINT_SECS = 180
 _WORKING_WORDS = [
     "Battening", "Splicing", "Hoisting", "Heaving", "Trimming", "Tacking",
     "Mooring", "Charting", "Navigating", "Sounding", "Caulking", "Rigging",
@@ -262,6 +268,7 @@ class DrydockApp(App):
         self._work_start = 0.0
         self._work_word = ""
         self._work_chars = 0   # streamed output chars this turn (→ ~tokens)
+        self._last_progress = 0.0  # monotonic time of the last agent event (stall watchdog)
         self._spinner_i = 0
 
         # The agent (worker thread) calls this to gate a sensitive command on
@@ -349,7 +356,13 @@ class DrydockApp(App):
         effort = self.state.current_effort
         eff = f" · thinking with {effort} effort" if effort else ""
         queued = f" · {len(self._queue)} queued" if self._queue else ""
-        return f"{spin} {self._work_word}…  ({elapsed} · ↓ {toks} tokens{eff}{queued})"
+        # Stall watchdog (advisory): if no agent event has arrived for a while,
+        # the model server may be hung. Flag it so the user isn't left guessing
+        # whether it's thinking or stalled — but never act (Esc is theirs).
+        silent = time.monotonic() - self._last_progress if self._last_progress else 0.0
+        stall = (f"  ⚠ no output for {int(silent)}s — the model may be slow or stalled; "
+                 "Esc to stop") if silent > _STALL_HINT_SECS else ""
+        return f"{spin} {self._work_word}…  ({elapsed} · ↓ {toks} tokens{eff}{queued}){stall}"
 
     def _refresh_status(self) -> None:
         # The 0.18s _tick_work timer can fire one last time DURING app teardown,
@@ -435,6 +448,7 @@ class DrydockApp(App):
         self.query_one("#todo", Static).update("")
         self._busy = True
         self._work_start = time.monotonic()
+        self._last_progress = self._work_start
         self._work_word = random.choice(_WORKING_WORDS)
         self._work_chars = 0
         self._spinner_i = 0
@@ -1133,6 +1147,11 @@ class DrydockApp(App):
     def _run_agent(self, text: str) -> None:
         try:
             for ev in run(text, self.state, self.config, self.system):
+                # Any event = the model/server is making progress → reset the
+                # stall watchdog. During a real stall the provider stream blocks
+                # and NO event arrives, so this timestamp freezes and
+                # _working_text surfaces a hint.
+                self._last_progress = time.monotonic()
                 if isinstance(ev, ReasoningChunk):
                     self.post_message(AgentReasoning(ev.text))
                 elif isinstance(ev, TextChunk):

{drydock_cli-3.0.85 → drydock_cli-3.0.86/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.85
+Version: 3.0.86
 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.85 → drydock_cli-3.0.86}/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.85"
+version = "3.0.86"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

{drydock_cli-3.0.85 → drydock_cli-3.0.86}/tests/test_tui.py

@@ -457,3 +457,29 @@ def test_ask_bang_injects_advice_but_plain_ask_does_not():
             assert started == []
 
     asyncio.run(main())
+
+
+def test_stall_watchdog_hint_appears_after_silence():
+    """The activity line warns when no agent event has arrived for a while
+    (a hung model server) — advisory, and it clears once progress resumes."""
+    import time as _time
+    from drydock.tui.app import _STALL_HINT_SECS
+
+    async def main():
+        app = DrydockApp({"model": "gemma4", "provider": "vllm", "cwd": "/tmp"})
+        async with app.run_test() as pilot:
+            await pilot.pause()
+            app._busy = True
+            app._work_start = _time.monotonic()
+            app._work_word = "Working"
+            # fresh progress → no hint
+            app._last_progress = _time.monotonic()
+            assert "stalled" not in app._working_text()
+            # simulate silence beyond the threshold → hint appears
+            app._last_progress = _time.monotonic() - (_STALL_HINT_SECS + 5)
+            assert "stalled" in app._working_text() and "Esc to stop" in app._working_text()
+            # progress resumes → hint clears
+            app._last_progress = _time.monotonic()
+            assert "stalled" not in app._working_text()
+
+    asyncio.run(main())