drydock-cli 3.0.120__tar.gz → 3.0.122__tar.gz

{drydock_cli-3.0.120/drydock_cli.egg-info → drydock_cli-3.0.122}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.120
+Version: 3.0.122
 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.120 → drydock_cli-3.0.122}/drydock/recipes.py

@@ -274,6 +274,8 @@ def retrieve_recipes(task_text: str, k: int = 2) -> list[tuple[str, str]]:
     overlap. Empty if nothing scores — never inject irrelevant noise."""
     if not task_text:
         return []
+    if not isinstance(task_text, str):  # defensive: never crash the agent loop
+        task_text = str(task_text)
     words = set(_WORD.findall(task_text.lower()))
     scored = []
     for title, keywords, body in RECIPES:

{drydock_cli-3.0.120 → drydock_cli-3.0.122}/drydock/tools/__init__.py

@@ -750,6 +750,10 @@ def _capture_screen(out: str) -> str | None:
         elif sys.platform == "darwin":
             subprocess.run(["screencapture", "-x", out], capture_output=True, timeout=30)
         else:  # Linux/BSD — try grabbers in order of ubiquity (X11 + wayland)
+            if not (os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY")):
+                # Fail fast — a grabber on a headless box blocks until timeout.
+                return ("no display ($DISPLAY/$WAYLAND_DISPLAY unset) — cannot capture "
+                        "the screen on a headless server.")
             grabbers = (["scrot", "-o", out], ["import", "-window", "root", out],
                         ["gnome-screenshot", "-f", out], ["grim", out],
                         ["spectacle", "-b", "-n", "-o", out], ["maim", out])

{drydock_cli-3.0.120 → drydock_cli-3.0.122}/drydock/tui/app.py

@@ -84,6 +84,17 @@ def _fmt_tokens(n: int) -> str:
     return f"{n / 1000:.1f}k" if n >= 1000 else str(n)
 
 
+def is_slash_command(text: str) -> bool:
+    """True only for a real ``/command``, NOT a message that merely starts with a
+    path — e.g. ``/app/env.py defines ...`` or ``/report.tex``. A command name is a
+    single leading token of word chars (no path separators, no dots); anything with
+    ``/``, ``\\`` or ``.`` in that first token is treated as a normal agent message."""
+    if not text.startswith("/"):
+        return False
+    head = text[1:].split(maxsplit=1)[0] if len(text) > 1 else ""
+    return bool(head) and not any(c in head for c in "/\\.")
+
+
 class DrydockApp(App):
     CSS = """
     Screen { background: #0b1f2a; }
@@ -425,7 +436,7 @@ class DrydockApp(App):
         prompt.clear()
         if not text:
             return
-        if text.startswith("/"):
+        if is_slash_command(text):
             self._handle_slash(text)  # meta commands stay out of history
             return
         prompt.cmd_history.add(text)

{drydock_cli-3.0.120 → drydock_cli-3.0.122/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.120
+Version: 3.0.122
 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.120 → drydock_cli-3.0.122}/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.120"
+version = "3.0.122"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

{drydock_cli-3.0.120 → drydock_cli-3.0.122}/tests/test_recipes.py

@@ -61,3 +61,10 @@ def test_ml_skills_bundled():
     for name in ("ml-train", "ml-metrics", "ml-finetune", "ml-debug", "ml-rl", "ml-data"):
         assert name in sk, f"bundled ML skill /{name} missing"
     assert "MCC" in sk["ml-metrics"].body or "mcc" in sk["ml-metrics"].body.lower()
+
+
+def test_retrieve_handles_non_string():
+    from drydock.recipes import retrieve_recipes, recipe_context
+    for v in (b"train a cnn", ["train", "cnn"], 5, None):
+        assert isinstance(retrieve_recipes(v), list)   # never raises
+    assert isinstance(recipe_context(123), str)

{drydock_cli-3.0.120 → drydock_cli-3.0.122}/tests/test_screenshot.py

@@ -21,6 +21,7 @@ def test_registered_and_available_to_gemma():
 def test_graceful_when_no_grabber(monkeypatch):
     monkeypatch.setattr(tools, "_IS_WINDOWS", False)
     monkeypatch.setattr("sys.platform", "linux")
+    monkeypatch.setenv("DISPLAY", ":0")  # a display exists, but no grabber is installed
     monkeypatch.setattr("shutil.which", lambda _n: None)  # no grabbers installed
     out = tools.tool_screenshot({}, {"cwd": os.getcwd()})
     assert out.startswith("Error") and "screenshot tool" in out
@@ -57,3 +58,15 @@ def test_macos_uses_screencapture(monkeypatch):
     monkeypatch.setattr("subprocess.run", lambda a, **k: calls.setdefault("argv", a))
     tools._capture_screen("/tmp/x.png")
     assert calls["argv"][0] == "screencapture"
+
+
+def test_headless_linux_fails_fast(monkeypatch):
+    import time
+    monkeypatch.setattr(tools, "_IS_WINDOWS", False)
+    monkeypatch.setattr("sys.platform", "linux")
+    monkeypatch.delenv("DISPLAY", raising=False)
+    monkeypatch.delenv("WAYLAND_DISPLAY", raising=False)
+    t = time.time()
+    err = tools._capture_screen("/tmp/x.png")
+    assert time.time() - t < 1.0            # no 30s grabber hang
+    assert err and "display" in err.lower()

{drydock_cli-3.0.120 → drydock_cli-3.0.122}/tests/test_skills.py

@@ -55,7 +55,11 @@ def test_empty_body_skipped(tmp_path):
 def test_no_user_or_project_skills_yields_only_builtins(tmp_path):
     # With no user/project skills, only the bundled built-ins (RMF) are present.
     loaded = skills.load_skills(str(tmp_path))
-    assert set(loaded) == {"rmf-control", "rmf-categorize", "rmf-review", "rmf-poam", "stig-assess", "stig-remediate"}
+    assert set(loaded) == {
+        "rmf-control", "rmf-categorize", "rmf-review", "rmf-poam",
+        "stig-assess", "stig-remediate",
+        "ml-train", "ml-metrics", "ml-finetune", "ml-debug", "ml-rl", "ml-data",
+    }
 
 
 def test_create_skill_user_scope(tmp_path, monkeypatch):

{drydock_cli-3.0.120 → drydock_cli-3.0.122}/tests/test_suggest.py

@@ -18,3 +18,13 @@ def test_priority_and_cases():
 def test_error_beats_plan_and_writes():
     assert s(ctx_pct=10, wrote_files=True, ran_bash=True, had_error=True,
              in_git=True, plan_remaining=True) == "fix the error above"
+
+
+def test_is_slash_command_distinguishes_paths():
+    from drydock.tui.app import is_slash_command as c
+    assert c("/help") and c("/ml-train foo") and c("/ask!") and c("/compact")
+    # file paths / messages starting with a path are NOT commands
+    assert not c("/app/env.py defines a gridworld")
+    assert not c("/report.tex")
+    assert not c("/data/file.h5 holds predictions")
+    assert not c("Train a model") and not c("/")