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

{drydock_cli-3.0.95/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.95
+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.95 → drydock_cli-3.0.96}/drydock/tools/__init__.py

@@ -22,6 +22,22 @@ from pathlib import Path
 # 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:
@@ -916,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)

{drydock_cli-3.0.95 → 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.95
+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.95 → 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.95 → 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.95"
+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.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