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

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

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

@@ -26,6 +26,36 @@ _DEFAULT_TIMEOUT = 120
 _MAX_TIMEOUT = 1800  # 30 min hard ceiling — a single command shouldn't hang longer
 
 
+def _as_text(v, default: str = "") -> str:
+    """Coerce a text-body arg (file content, replacement text) to a string. Local
+    models sometimes send it as a JSON array of lines → newline-join; None →
+    default; other scalars → str()."""
+    if isinstance(v, (list, tuple)):
+        return "\n".join(str(x) for x in v)
+    if v is None:
+        return default
+    return v if isinstance(v, str) else str(v)
+
+
+def _as_str_arg(v, default: str = "") -> str:
+    """Coerce a scalar string arg (a path, a pattern) to a string. A single-value
+    list is unwrapped (models sometimes wrap a lone path/pattern in an array)."""
+    if isinstance(v, (list, tuple)):
+        return str(v[0]) if v else default
+    if v is None:
+        return default
+    return v if isinstance(v, str) else str(v)
+
+
+def _coerce_int(value, default: int):
+    """Coerce a model-supplied int arg (offset/limit) that may arrive as a string
+    ("5") or junk. Falls back to default on anything non-numeric."""
+    try:
+        return int(float(value))
+    except (TypeError, ValueError):
+        return default
+
+
 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
@@ -585,13 +615,13 @@ def tool_viewimage(params: dict, config: dict) -> str:
 
 
 def tool_read(params: dict, config: dict) -> str:
-    fp = _resolve_path(params["file_path"], config)
+    fp = _resolve_path(_as_str_arg(params.get("file_path")), config)
     # Reading an image as text yields binary garbage — point at the vision tool.
     if os.path.splitext(fp)[1].lower() in _IMAGE_EXTS and os.path.isfile(fp):
         return (f"{params['file_path']} is an image — Read would return binary "
                 "garbage. Use the ViewImage tool to actually SEE it.")
-    limit = params.get("limit")  # None = caller didn't specify a window
-    offset = params.get("offset", 0)
+    limit = None if params.get("limit") is None else _coerce_int(params.get("limit"), 2000)
+    offset = _coerce_int(params.get("offset", 0), 0)
     try:
         with open(fp, "r", encoding="utf-8", errors="replace") as f:
             lines = f.readlines()
@@ -670,7 +700,10 @@ def tool_write(params: dict, config: dict) -> str:
     fp = _resolve_path(str(fp).strip(), config)
     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 (tools must return
+    # errors, never raise). A list → newline-joined lines.
+    content = _as_text(params.get("content", ""))
     if has_conflict_markers(content):
         return conflict_marker_refusal(fp)
     prev = _snapshot(fp)
@@ -793,8 +826,10 @@ def tool_edit(params: dict, config: dict) -> str:
     if not fp or not str(fp).strip():
         return "Error: Edit needs a real file_path (the path was empty or blank)."
     fp = _resolve_path(str(fp).strip(), config)
-    old = params.get("old_string", "")
-    new = params.get("new_string", "")
+    # Coerce non-string old/new (a JSON array of lines, a number) instead of
+    # crashing with a TypeError in the substring search / replace.
+    old = _as_text(params.get("old_string", ""))
+    new = _as_text(params.get("new_string", ""))
     if has_conflict_markers(new):
         return conflict_marker_refusal(fp)
     # If a directory was passed, try to infer the intended file (avoids a
@@ -1098,8 +1133,8 @@ def tool_glob(params: dict, config: dict) -> str:
 
 
 def tool_grep(params: dict, config: dict) -> str:
-    pattern = params["pattern"]
-    path = params.get("path") or config.get("cwd") or "."
+    pattern = _as_str_arg(params.get("pattern"))
+    path = _as_str_arg(params.get("path")) or config.get("cwd") or "."
     include = params.get("include", "")
     try:
         cmd = ["grep", "-rn", "--color=never"]

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

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

@@ -99,6 +99,7 @@ tests/test_streaming_newlines.py
 tests/test_subagent.py
 tests/test_system_prompt_help.py
 tests/test_todo.py
+tests/test_tool_arg_coercion.py
 tests/test_tool_arg_parsing.py
 tests/test_tools_undo.py
 tests/test_tui.py
@@ -106,4 +107,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.97 → drydock_cli-3.0.99}/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.97"
+version = "3.0.99"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

drydock_cli-3.0.99/tests/test_tool_arg_coercion.py

@@ -0,0 +1,49 @@
+"""Model-supplied tool args that arrive as the wrong type (a JSON array of lines,
+a number, a stringified int, a single-element-list-wrapped path) must be coerced,
+never crash — tools return results, never raise. Systematic across the file tools."""
+from __future__ import annotations
+
+from drydock.tools import (
+    _as_text, _as_str_arg, _coerce_int,
+    tool_edit, tool_read, tool_grep, tool_write,
+)
+
+
+def test_helpers():
+    assert _as_text(["a", "b"]) == "a\nb"
+    assert _as_text(None) == "" and _as_text(42) == "42" and _as_text("x") == "x"
+    assert _as_str_arg(["/p"]) == "/p" and _as_str_arg(None) == "" and _as_str_arg(5) == "5"
+    assert _coerce_int("5", 0) == 5 and _coerce_int("junk", 7) == 7 and _coerce_int(None, 3) == 3
+
+
+def _cfg(tmp): return {"cwd": str(tmp)}
+
+
+def test_edit_non_string_new(tmp_path):
+    f = tmp_path / "e.txt"; f.write_text("alpha beta\n")
+    out = tool_edit({"file_path": str(f), "old_string": "alpha", "new_string": ["x", "y"]}, _cfg(tmp_path))
+    assert "Error" not in out and f.read_text().startswith("x\ny")
+
+
+def test_edit_int_new(tmp_path):
+    f = tmp_path / "e.txt"; f.write_text("beta\n")
+    out = tool_edit({"file_path": str(f), "old_string": "beta", "new_string": 99}, _cfg(tmp_path))
+    assert "99" in f.read_text() and "Error" not in out
+
+
+def test_read_list_path_and_str_offsets(tmp_path):
+    f = tmp_path / "r.txt"; f.write_text("line1\nline2\n")
+    out = tool_read({"file_path": [str(f)], "offset": "0", "limit": "5"}, _cfg(tmp_path))
+    assert "line1" in out
+
+
+def test_grep_list_pattern(tmp_path):
+    f = tmp_path / "g.txt"; f.write_text("needle here\n")
+    out = tool_grep({"pattern": ["needle"], "path": str(f)}, _cfg(tmp_path))
+    assert "needle" in out
+
+
+def test_write_list_content(tmp_path):
+    f = tmp_path / "w.txt"
+    tool_write({"file_path": str(f), "content": ["a", "b"]}, _cfg(tmp_path))
+    assert f.read_text() == "a\nb"

drydock_cli-3.0.99/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"