drydock-cli 3.0.94__tar.gz → 3.0.96__tar.gz

{drydock_cli-3.0.94/drydock_cli.egg-info → drydock_cli-3.0.96}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.94
+Version: 3.0.96
 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.94 → drydock_cli-3.0.96}/drydock/tools/__init__.py

@@ -21,6 +21,23 @@ from pathlib import Path
 # to gigabytes within the timeout. We stream with a byte cap and kill the command
 # once it's hit — bounding RAM regardless of how much it tries to produce.
 _MAX_BASH_OUTPUT_BYTES = 256 * 1024  # 256 KB — plenty of context, safe for RAM
+_PARTIAL_TAIL = 4000  # chars of pre-timeout output to keep (tail) in the timeout msg
+_DEFAULT_TIMEOUT = 120
+_MAX_TIMEOUT = 1800  # 30 min hard ceiling — a single command shouldn't hang longer
+
+
+def _coerce_timeout(value) -> int:
+    """Make the model-supplied timeout robust: local models often send it as a
+    string ("10"), and a 0/negative/absurd value would make EVERY command time
+    out instantly (or hang for hours). Coerce to int, fall back to the default on
+    junk, and clamp to (0, _MAX_TIMEOUT]."""
+    try:
+        t = int(float(value))
+    except (TypeError, ValueError):
+        return _DEFAULT_TIMEOUT
+    if t <= 0:
+        return _DEFAULT_TIMEOUT
+    return min(t, _MAX_TIMEOUT)
 
 
 def _detect_bash() -> str | None:
@@ -915,7 +932,7 @@ def tool_bash(params: dict, config: dict) -> str:
     # and crack hashes — a 30s wall killed legitimate long work before it could
     # finish (terminal-bench: 16 tasks died at 30s on builds/training). Bounded,
     # and the model can pass a larger `timeout` for genuinely heavy commands.
-    timeout = params.get("timeout", 120)
+    timeout = _coerce_timeout(params.get("timeout", 120))
     reason = bash_safety.dangerous_command(cmd)
     if reason is not None:
         return bash_safety.refusal_message(cmd, reason)
@@ -1020,6 +1037,18 @@ def tool_bash(params: dict, config: dict) -> str:
                 )
                 if _is_network_command(cmd):
                     msg += _OFFLINE_HINT
+                # Preserve any output produced BEFORE the hang — a test run or
+                # build that prints results/diagnostics then stalls would
+                # otherwise lose exactly what the agent needs. Tail-bounded so a
+                # big partial can't bloat context.
+                partial = _sanitize_bash_output(
+                    _collapse_repeated_lines("".join(list(chunks)))
+                ).rstrip()
+                if partial:
+                    tail = partial[-_PARTIAL_TAIL:]
+                    if len(partial) > _PARTIAL_TAIL:
+                        tail = "[... earlier output truncated ...]\n" + tail
+                    msg += f"\n\n--- output before timeout ---\n{tail}"
                 return msg
         if not backgrounded:
             proc.wait()

{drydock_cli-3.0.94 → drydock_cli-3.0.96/drydock_cli.egg-info}/PKG-INFO

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

@@ -58,6 +58,7 @@ tests/test_bash_sanitize.py
 tests/test_bash_shell.py
 tests/test_bash_stdin.py
 tests/test_bash_timeout_network.py
+tests/test_bash_timeout_param.py
 tests/test_cci.py
 tests/test_cli_agents.py
 tests/test_compact_command.py

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

{drydock_cli-3.0.94 → drydock_cli-3.0.96}/tests/test_bash_background.py

@@ -42,3 +42,23 @@ def test_foreground_hang_still_times_out():
 def test_failing_command_still_reports_exit_code():
     _, out = _timed("false")
     assert "[exit code: 1]" in out
+
+
+def test_timeout_preserves_partial_output():
+    """A command that prints useful output then hangs must return that output
+    alongside the timeout message — not discard it (test runs/builds that stall
+    after printing results/diagnostics)."""
+    from drydock.tools import tool_bash
+    out = tool_bash(
+        {"command": "echo IMPORTANT_RESULT; echo line2; sleep 30", "timeout": 3},
+        {"cwd": "/tmp"},
+    )
+    assert "timed out" in out
+    assert "IMPORTANT_RESULT" in out and "line2" in out
+    assert "output before timeout" in out
+
+
+def test_timeout_no_output_stays_clean():
+    from drydock.tools import tool_bash
+    out = tool_bash({"command": "sleep 30", "timeout": 2}, {"cwd": "/tmp"})
+    assert "timed out" in out and "output before timeout" not in out

drydock_cli-3.0.96/tests/test_bash_timeout_param.py

@@ -0,0 +1,30 @@
+"""The model-supplied `timeout` must be robust. Local models often send it as a
+string ("10"); a 0/negative value made EVERY command time out instantly; an
+absurd value could hang for hours. _coerce_timeout normalizes all of these."""
+from __future__ import annotations
+
+import time
+
+import pytest
+
+from drydock.tools import _coerce_timeout, tool_bash
+
+
+@pytest.mark.parametrize("raw,expected", [
+    ("10", 10), (30, 30), (15.7, 15),      # numbers / stringified / float
+    (0, 120), (-5, 120), ("abc", 120), (None, 120),  # invalid → default
+    (99999, 1800), (100000, 1800),         # clamp to the 30-min ceiling
+])
+def test_coerce_timeout(raw, expected):
+    assert _coerce_timeout(raw) == expected
+
+
+def test_string_timeout_runs_instead_of_crashing():
+    # previously raised TypeError in the '>' comparison
+    out = tool_bash({"command": "echo hi", "timeout": "10"}, {"cwd": "/tmp"})
+    assert "hi" in out
+
+
+def test_zero_timeout_does_not_instant_timeout():
+    out = tool_bash({"command": "echo hi", "timeout": 0}, {"cwd": "/tmp"})
+    assert "hi" in out and "timed out" not in out