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

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

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

@@ -833,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
@@ -1138,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:
@@ -1154,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:
@@ -1249,7 +1256,7 @@ def tool_consult(params: dict, config: dict) -> str:
     """Ask the configured second/advisor model (e.g. Gemini) for a second opinion."""
     from drydock import advisor
 
-    question = (params.get("question") or params.get("prompt") or "").strip()
+    question = _as_str_arg(params.get("question") or params.get("prompt")).strip()
     if not question:
         return "Error: Consult needs a `question`."
     return advisor.consult(question, config, context=params.get("context", "") or "")
@@ -1391,7 +1398,7 @@ def tool_gitcommit(params: dict, config: dict) -> str:
     try:
         return gittools.commit(
             _git_cwd(config),
-            params.get("message") or "",
+            _as_text(params.get("message")),
             add_all=params.get("add_all", True) is not False,
         )
     except gittools.GitError as e:
@@ -1571,7 +1578,7 @@ def tool_websearch(params: dict, config: dict) -> str:
     """Search the internet (DuckDuckGo). Read-only; clean message when offline."""
     from drydock import web
 
-    query = (params.get("query") or "").strip()
+    query = _as_str_arg(params.get("query")).strip()
     if not query:
         return "Error: `WebSearch` needs a `query`."
     try:
@@ -1589,7 +1596,7 @@ def tool_webfetch(params: dict, config: dict) -> str:
     """Fetch a URL and return readable text. Read-only; clean message offline."""
     from drydock import web
 
-    url = (params.get("url") or "").strip()
+    url = _as_str_arg(params.get("url")).strip()
     if not url:
         return "Error: `WebFetch` needs a `url`."
     try:
@@ -1609,7 +1616,7 @@ def tool_knowledge(params: dict, config: dict) -> str:
     If no index exists, says so cleanly rather than erroring."""
     from drydock import graphrag
 
-    query = (params.get("query") or "").strip()
+    query = _as_str_arg(params.get("query")).strip()
     if not query:
         return "Error: `Knowledge` needs a `query` describing what to look up."
     cwd = config.get("cwd") or os.getcwd()

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

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

@@ -76,6 +76,7 @@ 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
@@ -102,6 +103,7 @@ tests/test_subagent.py
 tests/test_system_prompt_help.py
 tests/test_todo.py
 tests/test_tool_arg_coercion.py
+tests/test_tool_arg_coercion_more.py
 tests/test_tool_arg_parsing.py
 tests/test_tools_undo.py
 tests/test_tui.py

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

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

drydock_cli-3.0.103/tests/test_tool_arg_coercion_more.py

@@ -0,0 +1,37 @@
+"""Wrong-type args crashed more tools with AttributeError ('.strip()' on a
+list/int): GitCommit message, Knowledge query, Consult question, WebFetch url,
+WebSearch query. All coerced now — no tool should raise on a wrong-type arg."""
+from __future__ import annotations
+
+import drydock.tools as T
+
+
+def _no_crash(fn, **kw):
+    out = fn(kw, {"cwd": "/tmp"})   # must return a string, not raise
+    assert isinstance(out, str)
+    return out
+
+
+def test_gitcommit_message_list():
+    _no_crash(T.tool_gitcommit, message=["line1", "line2"])
+
+
+def test_gitcommit_message_int():
+    _no_crash(T.tool_gitcommit, message=42)
+
+
+def test_knowledge_query_list():
+    _no_crash(T.tool_knowledge, query=["find x"])
+
+
+def test_consult_question_list():
+    _no_crash(T.tool_consult, question=["help me"])
+
+
+def test_webfetch_url_list():
+    _no_crash(T.tool_webfetch, url=["http://example.invalid"])
+
+
+def test_websearch_query_int():
+    out = _no_crash(T.tool_websearch, query=42)
+    assert "42" in out