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

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

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

@@ -601,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)"
@@ -668,6 +671,13 @@ def tool_write(params: dict, config: dict) -> str:
     if Path(fp).is_dir():
         return f"Error: {fp} is a directory, not a file. Pass a file path."
     content = params.get("content", "")
+    # Local models sometimes send content as a JSON array of lines (or a number),
+    # which f.write() can't take — coerce instead of crashing with a TypeError
+    # (tools must return errors, never raise). A list → newline-joined lines.
+    if isinstance(content, (list, tuple)):
+        content = "\n".join(str(x) for x in content)
+    elif not isinstance(content, str):
+        content = "" if content is None else str(content)
     if has_conflict_markers(content):
         return conflict_marker_refusal(fp)
     prev = _snapshot(fp)
@@ -1104,9 +1114,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.96 → drydock_cli-3.0.98/drydock_cli.egg-info}/PKG-INFO

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

@@ -76,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
@@ -105,4 +106,5 @@ tests/test_tuning.py
 tests/test_viewimage.py
 tests/test_vision_input.py
 tests/test_web_tools.py
+tests/test_write_content_coerce.py
 tests/test_xccdf.py

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

{drydock_cli-3.0.96 → drydock_cli-3.0.98}/tests/test_bash_timeout_param.py

@@ -3,7 +3,6 @@ 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
 

drydock_cli-3.0.98/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

drydock_cli-3.0.98/tests/test_write_content_coerce.py

@@ -0,0 +1,37 @@
+"""tool_write must not raise on non-string content. Local models sometimes send
+`content` as a JSON array of lines (or a number); f.write() would TypeError, and
+tools must return a result, never raise. A list → newline-joined lines."""
+from __future__ import annotations
+
+from drydock.tools import tool_write
+
+
+def _write(tmp_path, content):
+    fp = tmp_path / "out.txt"
+    out = tool_write({"file_path": str(fp), "content": content}, {"cwd": str(tmp_path)})
+    return out, fp.read_text()
+
+
+def test_list_content_joined(tmp_path):
+    out, text = _write(tmp_path, ["line1", "line2", "line3"])
+    assert "Error" not in out and text == "line1\nline2\nline3"
+
+
+def test_int_content_stringified(tmp_path):
+    out, text = _write(tmp_path, 42)
+    assert "Error" not in out and text == "42"
+
+
+def test_none_content_empty(tmp_path):
+    out, text = _write(tmp_path, None)
+    assert "Error" not in out and text == ""
+
+
+def test_normal_string_unchanged(tmp_path):
+    out, text = _write(tmp_path, "hello\nworld")
+    assert text == "hello\nworld"
+
+
+def test_list_of_numbers(tmp_path):
+    out, text = _write(tmp_path, [1, 2, 3])
+    assert text == "1\n2\n3"