drydock-cli 3.0.90__tar.gz → 3.0.92__tar.gz

{drydock_cli-3.0.90/drydock_cli.egg-info → drydock_cli-3.0.92}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.90
+Version: 3.0.92
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -77,7 +77,10 @@ A full agentic CLI harness — every tool below is clean-room and dependency-fre
   calls the `Consult` tool for a second opinion when stuck, and you can `/ask
   <question>` directly. Opt-in, user-configured — no extra dependency.
 - **MCP** — connect to Model Context Protocol servers (`~/.drydock/mcp.json`);
-  their tools appear as `mcp__<server>__<tool>`. List them with `/mcp`.
+  their tools appear as `mcp__<server>__<tool>`. List them with `/mcp`. Works with
+  third-party servers out of the box — e.g. [Graphify](https://github.com/safishamsi/graphify)
+  for a queryable code knowledge graph: see [docs/graphify.md](docs/graphify.md)
+  and the copy-paste [example config](examples/mcp/graphify.json).
 - **Skills** — reusable `/<name>` commands authored as markdown in
   `~/.drydock/skills/` (or `<project>/.drydock/skills/`); `$ARGS` substitution.
 - **Loops** — `/loop <count> <prompt>` runs a prompt iteratively (Esc stops).

{drydock_cli-3.0.90 → drydock_cli-3.0.92}/README.md

@@ -53,7 +53,10 @@ A full agentic CLI harness — every tool below is clean-room and dependency-fre
   calls the `Consult` tool for a second opinion when stuck, and you can `/ask
   <question>` directly. Opt-in, user-configured — no extra dependency.
 - **MCP** — connect to Model Context Protocol servers (`~/.drydock/mcp.json`);
-  their tools appear as `mcp__<server>__<tool>`. List them with `/mcp`.
+  their tools appear as `mcp__<server>__<tool>`. List them with `/mcp`. Works with
+  third-party servers out of the box — e.g. [Graphify](https://github.com/safishamsi/graphify)
+  for a queryable code knowledge graph: see [docs/graphify.md](docs/graphify.md)
+  and the copy-paste [example config](examples/mcp/graphify.json).
 - **Skills** — reusable `/<name>` commands authored as markdown in
   `~/.drydock/skills/` (or `<project>/.drydock/skills/`); `$ARGS` substitution.
 - **Loops** — `/loop <count> <prompt>` runs a prompt iteratively (Esc stops).

{drydock_cli-3.0.90 → drydock_cli-3.0.92}/drydock/tools/__init__.py

@@ -23,6 +23,29 @@ from pathlib import Path
 _MAX_BASH_OUTPUT_BYTES = 256 * 1024  # 256 KB — plenty of context, safe for RAM
 
 
+def _detect_bash() -> str | None:
+    """Absolute path to bash, or None to fall back to Popen's default /bin/sh.
+
+    tool_bash runs commands under bash so the bash syntax the model naturally
+    writes — [[ ]], <<< herestrings, arrays, {1..n} brace expansion, process
+    substitution <(...), $'...' — actually works. On Debian/Ubuntu /bin/sh is
+    dash, which silently rejects all of those ("Syntax error: ... unexpected"),
+    a confusing failure the model then loops on."""
+    import shutil
+    found = shutil.which("bash")
+    if found:
+        return found
+    for p in ("/bin/bash", "/usr/bin/bash", "/usr/local/bin/bash"):
+        if os.path.exists(p):
+            return p
+    return None
+
+
+# Resolved once at import (in whatever environment drydock runs — host or the
+# task container). None → bash unavailable, fall back to the default shell.
+_BASH_SHELL = _detect_bash()
+
+
 def _collapse_repeated_lines(text: str, run: int = 20) -> str:
     """Collapse a run of >= `run` IDENTICAL consecutive lines into one line + a
     count. Repetitive output (`yes`, a spinning progress log) tokenizes densely —
@@ -910,7 +933,8 @@ def tool_bash(params: dict, config: dict) -> str:
     proc = None
     try:
         proc = subprocess.Popen(
-            cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+            cmd, shell=True, executable=_BASH_SHELL,
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
             # stdin=DEVNULL so a command that reads stdin gets immediate EOF
             # (correct for a non-interactive tool) instead of inheriting the
             # TUI's terminal — where it would steal the user's keystrokes or hang

{drydock_cli-3.0.90 → drydock_cli-3.0.92/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.90
+Version: 3.0.92
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -77,7 +77,10 @@ A full agentic CLI harness — every tool below is clean-room and dependency-fre
   calls the `Consult` tool for a second opinion when stuck, and you can `/ask
   <question>` directly. Opt-in, user-configured — no extra dependency.
 - **MCP** — connect to Model Context Protocol servers (`~/.drydock/mcp.json`);
-  their tools appear as `mcp__<server>__<tool>`. List them with `/mcp`.
+  their tools appear as `mcp__<server>__<tool>`. List them with `/mcp`. Works with
+  third-party servers out of the box — e.g. [Graphify](https://github.com/safishamsi/graphify)
+  for a queryable code knowledge graph: see [docs/graphify.md](docs/graphify.md)
+  and the copy-paste [example config](examples/mcp/graphify.json).
 - **Skills** — reusable `/<name>` commands authored as markdown in
   `~/.drydock/skills/` (or `<project>/.drydock/skills/`); `$ARGS` substitution.
 - **Loops** — `/loop <count> <prompt>` runs a prompt iteratively (Esc stops).

{drydock_cli-3.0.90 → drydock_cli-3.0.92}/drydock_cli.egg-info/SOURCES.txt

@@ -53,6 +53,7 @@ tests/test_bash_background.py
 tests/test_bash_output_bounding.py
 tests/test_bash_process_group.py
 tests/test_bash_safety.py
+tests/test_bash_shell.py
 tests/test_bash_stdin.py
 tests/test_bash_timeout_network.py
 tests/test_cci.py
@@ -70,6 +71,7 @@ tests/test_extract.py
 tests/test_failure_loop.py
 tests/test_first_run_setup.py
 tests/test_gittools.py
+tests/test_graphify_example.py
 tests/test_graphrag.py
 tests/test_guards_and_tools.py
 tests/test_hallucinated_tools.py

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

drydock_cli-3.0.92/tests/test_bash_shell.py

@@ -0,0 +1,40 @@
+"""tool_bash runs commands under bash (executable=_BASH_SHELL) so the bash syntax
+the model naturally writes works — on Debian/Ubuntu /bin/sh is dash, which rejects
+[[ ]], <<<, arrays, {1..n}, and process substitution with confusing syntax errors
+the model then loops on. Found while investigating the /bin/sh limitation."""
+from __future__ import annotations
+
+import pytest
+
+from drydock.tools import tool_bash, _BASH_SHELL, _detect_bash
+
+
+def _run(cmd):
+    return tool_bash({"command": cmd, "timeout": 6}, {"cwd": "/tmp"}).strip()
+
+
+def test_bash_is_detected():
+    assert _BASH_SHELL and _BASH_SHELL.endswith("bash")
+
+
+@pytest.mark.skipif(not _BASH_SHELL, reason="bash not installed")
+@pytest.mark.parametrize("cmd,expected", [
+    ('cat <<< "hello world"', "hello world"),
+    ('[[ 5 -gt 3 ]] && echo yes', "yes"),
+    ('echo {1..5}', "1 2 3 4 5"),
+    ('a=(x y z); echo ${a[1]}', "y"),
+    ('diff <(echo a) <(echo a) && echo same', "same"),
+])
+def test_bashisms_work(cmd, expected):
+    assert expected in _run(cmd)
+
+
+def test_plain_commands_and_exit_codes_unaffected():
+    assert "hello" in _run("echo hello")
+    assert "[exit code: 1]" in _run("false")
+    assert "hi" in _run("echo hi | cat")
+
+
+def test_detect_bash_returns_path_or_none():
+    r = _detect_bash()
+    assert r is None or (isinstance(r, str) and "bash" in r)

drydock_cli-3.0.92/tests/test_graphify_example.py

@@ -0,0 +1,36 @@
+"""The bundled Graphify MCP example (docs/graphify.md + examples/mcp/graphify.json)
+must stay valid + in the shape drydock's MCP loader expects, so the copy-paste
+recipe never rots."""
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+_ROOT = Path(__file__).resolve().parent.parent
+_EXAMPLE = _ROOT / "examples" / "mcp" / "graphify.json"
+_DOC = _ROOT / "docs" / "graphify.md"
+
+
+def test_example_is_valid_json_with_mcpservers_shape():
+    cfg = json.loads(_EXAMPLE.read_text())
+    assert "mcpServers" in cfg and "graphify" in cfg["mcpServers"]
+    srv = cfg["mcpServers"]["graphify"]
+    assert srv["command"] == "graphify-mcp"
+    assert "--transport" in srv["args"] and "stdio" in srv["args"]
+    # the same shape drydock/mcp.py consumes: command + args list
+    assert isinstance(srv["args"], list)
+
+
+def test_example_matches_drydock_mcp_loader_shape():
+    """Instantiating an MCPServer from the example must not raise (parses the
+    command/args the way connect_all does), without starting it."""
+    from drydock.mcp import MCPServer
+    cfg = json.loads(_EXAMPLE.read_text())["mcpServers"]["graphify"]
+    srv = MCPServer("graphify", cfg["command"], cfg["args"], cfg.get("env"))
+    assert srv.command == "graphify-mcp" and srv.args[0] == "--transport"
+
+
+def test_doc_exists_and_links_example():
+    text = _DOC.read_text()
+    assert "graphify-mcp" in text and "OPENAI_BASE_URL" in text
+    assert "examples/mcp/graphify.json" in text