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

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

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

@@ -192,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"],
         },
@@ -830,6 +833,11 @@ def tool_edit(params: dict, config: dict) -> str:
     # crashing with a TypeError in the substring search / replace.
     old = _as_text(params.get("old_string", ""))
     new = _as_text(params.get("new_string", ""))
+    if old == "":
+        # An empty old_string matches between every char (count = len+1) → the
+        # generic "found N times" is baffling. Say what's actually wrong.
+        return ("Error: old_string is empty. Edit replaces existing text — give the "
+                "exact text to find. To create a file or add to the end, use Write.")
     if has_conflict_markers(new):
         return conflict_marker_refusal(fp)
     # If a directory was passed, try to infer the intended file (avoids a
@@ -875,9 +883,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
@@ -893,6 +907,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:
@@ -1051,6 +1067,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
@@ -1119,8 +1143,10 @@ def tool_bash(params: dict, config: dict) -> str:
 
 
 def tool_glob(params: dict, config: dict) -> str:
-    pattern = params["pattern"]
-    base = params.get("path") or config.get("cwd") or "."
+    pattern = _as_str_arg(params.get("pattern"))
+    if not pattern:
+        return "Error: Glob needs a 'pattern' (e.g. '**/*.py')."
+    base = _as_str_arg(params.get("path")) or config.get("cwd") or "."
     try:
         matches = sorted(_glob.glob(os.path.join(base, pattern), recursive=True))
         if not matches:
@@ -1135,7 +1161,7 @@ def tool_glob(params: dict, config: dict) -> str:
 def tool_grep(params: dict, config: dict) -> str:
     pattern = _as_str_arg(params.get("pattern"))
     path = _as_str_arg(params.get("path")) or config.get("cwd") or "."
-    include = params.get("include", "")
+    include = _as_str_arg(params.get("include", ""))
     try:
         cmd = ["grep", "-rn", "--color=never"]
         if include:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.99
+Version: 3.0.102
 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.99 → drydock_cli-3.0.102}/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,11 +70,13 @@ 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
 tests/test_first_run_setup.py
 tests/test_gittools.py
+tests/test_glob_edit_edges.py
 tests/test_graphify_example.py
 tests/test_graphrag.py
 tests/test_grep_and_read_robust.py

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

drydock_cli-3.0.102/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.102/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.102/tests/test_glob_edit_edges.py

@@ -0,0 +1,28 @@
+"""More edge cases from probing: Glob must not crash on a missing/list pattern,
+and an empty Edit old_string should say what's wrong (not the baffling generic
+'found N times')."""
+from __future__ import annotations
+
+from drydock.tools import tool_glob, tool_edit
+
+
+def test_glob_missing_pattern_is_error_not_crash():
+    out = tool_glob({}, {"cwd": "/tmp"})
+    assert out.startswith("Error:") and "pattern" in out
+
+
+def test_glob_list_pattern_unwrapped(tmp_path):
+    (tmp_path / "a.py").write_text("x")
+    out = tool_glob({"pattern": ["*.py"], "path": str(tmp_path)}, {"cwd": str(tmp_path)})
+    assert "a.py" in out
+
+
+def test_glob_no_matches(tmp_path):
+    out = tool_glob({"pattern": "*.nope", "path": str(tmp_path)}, {"cwd": str(tmp_path)})
+    assert out.strip() == "(no matches)"
+
+
+def test_edit_empty_old_string_clear_error(tmp_path):
+    f = tmp_path / "e.txt"; f.write_text("hello\n")
+    out = tool_edit({"file_path": str(f), "old_string": "", "new_string": "X"}, {"cwd": str(tmp_path)})
+    assert "empty" in out.lower() and f.read_text() == "hello\n"