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

{drydock_cli-3.0.95/drydock_cli.egg-info → drydock_cli-3.0.97}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.95
+Version: 3.0.97
 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.97}/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:
@@ -585,7 +601,10 @@ def tool_read(params: dict, config: dict) -> str:
         eff_limit = 2000 if limit is None else limit
         selected = lines[offset:offset + eff_limit]
         numbered = [f"{i + offset + 1}\t{line.rstrip()}" for i, line in enumerate(selected)]
-        result = "\n".join(numbered)
+        # Drop NUL bytes (valid UTF-8, so errors='replace' keeps them) — raw NUL in
+        # a JSON tool result trips some LLM servers. ANSI is left as-is: unlike
+        # command output, a file's bytes are content the model may need verbatim.
+        result = "\n".join(numbered).replace("\x00", "")
         if len(lines) > offset + eff_limit:
             result += f"\n[... {len(lines) - offset - eff_limit} more lines]"
         return result or "(empty file)"
@@ -916,7 +935,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)
@@ -1088,9 +1107,16 @@ def tool_grep(params: dict, config: dict) -> str:
             cmd.extend(["--include", include])
         cmd.extend([pattern, path])
         result = subprocess.run(
-            cmd, capture_output=True, text=True, timeout=30,
+            cmd, capture_output=True, text=True, encoding="utf-8",
+            errors="replace", timeout=30,
         )
-        output = result.stdout.strip()
+        # grep exit codes: 0 = matched, 1 = no match, >=2 = ERROR (invalid regex,
+        # unreadable path). Don't report an error as "(no matches)" — the model
+        # would wrongly conclude the pattern is absent instead of fixing it.
+        if result.returncode >= 2:
+            err = (result.stderr or "").strip() or "grep failed"
+            return f"Error: {err.splitlines()[0]}"
+        output = _sanitize_bash_output(result.stdout).strip()
         if not output:
             return "(no matches)"
         lines = output.split("\n")

{drydock_cli-3.0.95 → drydock_cli-3.0.97/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.95
+Version: 3.0.97
 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.97}/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
@@ -75,6 +76,7 @@ tests/test_first_run_setup.py
 tests/test_gittools.py
 tests/test_graphify_example.py
 tests/test_graphrag.py
+tests/test_grep_and_read_robust.py
 tests/test_guards_and_tools.py
 tests/test_hallucinated_tools.py
 tests/test_leaked_tool_call.py

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

drydock_cli-3.0.97/tests/test_bash_timeout_param.py

@@ -0,0 +1,29 @@
+"""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 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

drydock_cli-3.0.97/tests/test_grep_and_read_robust.py

@@ -0,0 +1,43 @@
+"""tool_grep must not report a grep ERROR (invalid regex, unreadable path — grep
+exit >=2) as "(no matches)"; and both grep and Read must be binary-safe (no crash,
+no raw NUL). Found by probing the grep/read I/O paths."""
+from __future__ import annotations
+
+from drydock.tools import tool_grep, tool_read
+
+
+def _grep(pattern, path):
+    return tool_grep({"pattern": pattern, "path": path}, {"cwd": "/tmp"})
+
+
+def test_grep_valid_match(tmp_path):
+    f = tmp_path / "a.txt"; f.write_text("hello world\nfoo\n")
+    assert "hello world" in _grep("hello", str(f))
+
+
+def test_grep_genuine_no_match(tmp_path):
+    f = tmp_path / "a.txt"; f.write_text("hello\n")
+    assert _grep("zzznope", str(f)).strip() == "(no matches)"
+
+
+def test_grep_invalid_regex_is_error_not_no_matches(tmp_path):
+    f = tmp_path / "a.txt"; f.write_text("hello\n")
+    out = _grep("[unclosed", str(f))
+    assert out.startswith("Error:") and "no matches" not in out
+
+
+def test_grep_missing_path_is_error(tmp_path):
+    out = _grep("x", str(tmp_path / "nope_xyz"))
+    assert out.startswith("Error:")
+
+
+def test_grep_binary_does_not_crash(tmp_path):
+    f = tmp_path / "b.bin"; f.write_bytes(b"\xff\xfe match \x00\xc0\n")
+    out = _grep("match", str(f))
+    assert "Error:" not in out or "no matches" in out or "match" in out  # no exception
+
+
+def test_read_drops_nul_bytes(tmp_path):
+    f = tmp_path / "n.txt"; f.write_bytes(b"before\x00\x00after text\n")
+    out = tool_read({"file_path": str(f)}, {"cwd": str(tmp_path)})
+    assert "\x00" not in out and "after text" in out