drydock-cli 3.0.89__tar.gz → 3.0.91__tar.gz

{drydock_cli-3.0.89/drydock_cli.egg-info → drydock_cli-3.0.91}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.89
+Version: 3.0.91
 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.89 → drydock_cli-3.0.91}/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,15 @@ 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
+            # waiting for input Textual has captured. The agent still feeds input
+            # explicitly via a pipe/redirect (echo x | cmd, cmd < file), which
+            # overrides this.
+            stdin=subprocess.DEVNULL,
             text=True, cwd=config.get("cwd"), start_new_session=True,
         )
         config.setdefault("_abort", {})["proc"] = proc

{drydock_cli-3.0.89 → drydock_cli-3.0.91/drydock_cli.egg-info}/PKG-INFO

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

@@ -53,6 +53,8 @@ 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
 tests/test_cli_agents.py

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

drydock_cli-3.0.91/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.91/tests/test_bash_stdin.py

@@ -0,0 +1,40 @@
+"""tool_bash must NOT inherit the caller's stdin (in the TUI that's Textual's
+terminal): a command that reads stdin should get immediate EOF, not hang waiting
+for input or steal the user's keystrokes. The agent still feeds input explicitly
+via a pipe/redirect, which overrides the DEVNULL stdin."""
+from __future__ import annotations
+
+import time
+
+from drydock.tools import tool_bash
+
+
+def _run(cmd, timeout=6):
+    t0 = time.monotonic()
+    out = tool_bash({"command": cmd, "timeout": timeout}, {"cwd": "/tmp"})
+    return time.monotonic() - t0, out
+
+
+def test_stdin_reader_gets_eof_not_hang():
+    dt, out = _run("read x; echo \"got:[$x]\"")
+    assert dt < 2.0 and "got:[]" in out, "reading stdin should EOF instantly, not hang"
+
+
+def test_cat_no_input_eofs():
+    dt, out = _run("cat && echo DONE")
+    assert dt < 2.0 and "DONE" in out
+
+
+def test_python_input_raises_eoferror_cleanly():
+    _, out = _run('python3 -c "input()" 2>&1 | tail -1')
+    assert "EOFError" in out
+
+
+def test_piped_input_still_works():
+    _, out = _run("echo hello | cat")
+    assert "hello" in out
+
+
+def test_redirect_from_file_still_works():
+    _, out = _run("printf 'a\\nb\\n' > /tmp/ddin.txt; wc -l < /tmp/ddin.txt")
+    assert "2" in out