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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.98
+Version: 3.0.101
 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.98 → drydock_cli-3.0.101}/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
@@ -162,13 +192,16 @@ SCHEMAS = [
     },
     {
         "name": "Edit",
-        "description": "Replace exact text in a file. old_string must match exactly.",
+        "description": "Replace exact text in a file. old_string must match exactly. "
+                       "By default old_string must be unique; pass replace_all:true "
+                       "to replace every occurrence.",
         "input_schema": {
             "type": "object",
             "properties": {
                 "file_path": {"type": "string"},
                 "old_string": {"type": "string", "description": "Exact text to find"},
                 "new_string": {"type": "string", "description": "Replacement text"},
+                "replace_all": {"type": "boolean", "description": "Replace ALL occurrences (default false)"},
             },
             "required": ["file_path", "old_string", "new_string"],
         },
@@ -585,13 +618,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,14 +703,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 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)
+    # 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)
@@ -800,8 +829,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
@@ -847,9 +878,15 @@ def tool_edit(params: dict, config: dict) -> str:
                     f"to copy the exact text (including indentation)."
                 )
         count = content.count(old)
-        if count > 1:
-            return f"Error: old_string found {count} times in {fp}. Add more context to make it unique."
-        updated = content.replace(old, new, 1)
+        # replace_all (models expect it, like the standard Edit tool): replace
+        # EVERY occurrence. Without it, multiple matches are ambiguous → error.
+        replace_all = bool(params.get("replace_all", False))
+        if count > 1 and not replace_all:
+            return (
+                f"Error: old_string found {count} times in {fp}. Add more context "
+                f"to make it unique, or pass replace_all: true to replace all."
+            )
+        updated = content.replace(old, new) if replace_all else content.replace(old, new, 1)
         if updated == content:
             # No-op edit (old_string == new_string, or the replacement changes
             # nothing). Reporting "Edited" here is a false success that invites
@@ -865,6 +902,8 @@ def tool_edit(params: dict, config: dict) -> str:
         Path(fp).write_text(updated, encoding="utf-8")
         _record_undo(config, fp, content)
         result = f"Edited {fp}: replaced {len(old)} chars with {len(new)} chars"
+        if replace_all and count > 1:
+            result += f" ({count} occurrences)"
         # Advisory post-edit syntax check.
         warn = python_syntax_warning(fp, updated)
         if warn:
@@ -1023,6 +1062,14 @@ def tool_bash(params: dict, config: dict) -> str:
             if cancel is not None and cancel.is_set():
                 kill_process_group(proc)
                 proc.wait()
+                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
+                    return f"[stopped by user]\n\n--- output before stop ---\n{tail}"
                 return "[stopped by user]"
             # The SHELL has exited but the pipe is still open → the command
             # backgrounded a child (`cmd &`, a server the task wants to keep
@@ -1105,8 +1152,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.98 → drydock_cli-3.0.101/drydock_cli.egg-info}/PKG-INFO

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

@@ -57,6 +57,7 @@ tests/test_bash_safety.py
 tests/test_bash_sanitize.py
 tests/test_bash_shell.py
 tests/test_bash_stdin.py
+tests/test_bash_stop_partial.py
 tests/test_bash_timeout_network.py
 tests/test_bash_timeout_param.py
 tests/test_cci.py
@@ -69,6 +70,7 @@ tests/test_context_limit_config.py
 tests/test_detect.py
 tests/test_dispatch.py
 tests/test_e2e_connected.py
+tests/test_edit_replace_all.py
 tests/test_empty_response.py
 tests/test_extract.py
 tests/test_failure_loop.py
@@ -99,6 +101,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

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

drydock_cli-3.0.101/tests/test_bash_stop_partial.py

@@ -0,0 +1,50 @@
+"""tool_bash must preserve partial output when the user presses STOP.
+Without this fix, cancel.is_set() triggered a bare "[stopped by user]" return
+that discarded all chunks accumulated before the stop — losing useful diagnostics
+(test-run results, build output, etc.) that the model needs to continue.
+
+Mirrors the timeout-partial-output behaviour already in test_bash_background.py.
+"""
+from __future__ import annotations
+
+import threading
+import time
+
+from drydock.tools import tool_bash
+
+
+def test_stop_preserves_partial_output():
+    """Partial output printed before the cancel Event fires must appear in the
+    tool result alongside the '[stopped by user]' marker."""
+    cancel = threading.Event()
+
+    # Fire cancel after a short delay so the command has time to emit output.
+    def _fire():
+        time.sleep(0.5)
+        cancel.set()
+
+    threading.Thread(target=_fire, daemon=True).start()
+    out = tool_bash(
+        {"command": "echo PARTIAL_LINE; echo second_line; sleep 30", "timeout": 20},
+        {"cwd": "/tmp", "_cancel": cancel},
+    )
+    assert "stopped by user" in out
+    assert "PARTIAL_LINE" in out, f"partial output missing from stop result: {out!r}"
+    assert "output before stop" in out
+
+
+def test_stop_with_no_output_returns_plain_marker():
+    """If the command produces no output before the stop, the result is just
+    '[stopped by user]' without a spurious empty block."""
+    cancel = threading.Event()
+
+    def _fire():
+        time.sleep(0.05)
+        cancel.set()
+
+    threading.Thread(target=_fire, daemon=True).start()
+    out = tool_bash(
+        {"command": "sleep 30", "timeout": 20},
+        {"cwd": "/tmp", "_cancel": cancel},
+    )
+    assert out == "[stopped by user]"

drydock_cli-3.0.101/tests/test_edit_replace_all.py

@@ -0,0 +1,37 @@
+"""The Edit tool honors replace_all (models expect it, like the standard Edit
+tool). Without it, multiple matches are an error; with it, every occurrence is
+replaced. Found by probing Edit edge cases."""
+from __future__ import annotations
+
+from drydock.tools import tool_edit
+from drydock import tool_registry
+
+
+def _edit(tmp_path, setup, **kw):
+    f = tmp_path / "f.txt"; f.write_text(setup)
+    out = tool_edit({"file_path": str(f), **kw}, {"cwd": str(tmp_path)})
+    return out, f.read_text()
+
+
+def test_replace_all_replaces_every_occurrence(tmp_path):
+    out, text = _edit(tmp_path, "a a a\n", old_string="a", new_string="b", replace_all=True)
+    assert "Error" not in out and text == "b b b\n" and "3 occurrences" in out
+
+
+def test_default_still_errors_on_multiple(tmp_path):
+    out, text = _edit(tmp_path, "a a a\n", old_string="a", new_string="b")
+    assert "found 3 times" in out and text == "a a a\n"  # unchanged
+
+
+def test_replace_all_single_occurrence(tmp_path):
+    out, text = _edit(tmp_path, "just one\n", old_string="one", new_string="two", replace_all=True)
+    assert text == "just two\n"
+
+
+def test_replace_all_no_match_errors(tmp_path):
+    out, text = _edit(tmp_path, "hello\n", old_string="zzz", new_string="b", replace_all=True)
+    assert "not found" in out and text == "hello\n"
+
+
+def test_replace_all_in_schema():
+    assert "replace_all" in tool_registry.get("Edit").schema["input_schema"]["properties"]

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