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

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

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

@@ -911,6 +911,13 @@ def tool_bash(params: dict, config: dict) -> str:
     try:
         proc = subprocess.Popen(
             cmd, shell=True, 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
@@ -936,6 +943,7 @@ def tool_bash(params: dict, config: dict) -> str:
         reader = threading.Thread(target=_drain, daemon=True)
         reader.start()
         start = time.monotonic()
+        backgrounded = False
         while reader.is_alive():
             reader.join(0.3)
             if capped.is_set():
@@ -945,6 +953,17 @@ def tool_bash(params: dict, config: dict) -> str:
                 kill_process_group(proc)
                 proc.wait()
                 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
+            # running) that inherited stdout. Don't wait for it (that would hang
+            # until the timeout) and DON'T kill it — return what we have so the
+            # background process survives. (Redirecting its output, `cmd >log &`,
+            # closes the pipe and never reaches here.)
+            if proc.poll() is not None:
+                reader.join(0.5)  # brief grace for any final buffered output
+                if reader.is_alive():
+                    backgrounded = True
+                    break
             if time.monotonic() - start > timeout:
                 kill_process_group(proc)
                 proc.wait()
@@ -958,11 +977,16 @@ def tool_bash(params: dict, config: dict) -> str:
                 if _is_network_command(cmd):
                     msg += _OFFLINE_HINT
                 return msg
-        proc.wait()
+        if not backgrounded:
+            proc.wait()
         # Collapse repetitive runs FIRST (turns 256 KB of "y\n" into ~2 lines),
         # then note if we hit the byte cap. Bounds both RAM (the cap) and context
-        # tokens (the collapse).
-        output = _collapse_repeated_lines("".join(chunks))
+        # tokens (the collapse). Snapshot chunks (list()) in case the reader
+        # daemon is still appending for a backgrounded child.
+        output = _collapse_repeated_lines("".join(list(chunks)))
+        if backgrounded:
+            return (output.rstrip() + "\n[a process was left running in the background; "
+                    "the command returned. Check it with a follow-up command.]").lstrip("\n")
         if capped.is_set():
             return (
                 output.rstrip()

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

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

@@ -49,9 +49,11 @@ drydock_cli.egg-info/top_level.txt
 tests/test_advisor.py
 tests/test_approval.py
 tests/test_back_command.py
+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_stdin.py
 tests/test_bash_timeout_network.py
 tests/test_cci.py
 tests/test_cli_agents.py

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

drydock_cli-3.0.90/tests/test_bash_background.py

@@ -0,0 +1,44 @@
+"""tool_bash must support backgrounded processes (`cmd &`) — a server/daemon the
+task wants to keep running — instead of hanging to the timeout then killing it.
+Found via the kv-store-grpc tbench task (needs a background gRPC server)."""
+from __future__ import annotations
+
+import subprocess
+import time
+
+from drydock.tools import tool_bash
+
+
+def _timed(cmd, timeout=8):
+    t0 = time.monotonic()
+    out = tool_bash({"command": cmd, "timeout": timeout}, {"cwd": "/tmp"})
+    return time.monotonic() - t0, out
+
+
+def test_backgrounded_command_returns_fast_and_survives():
+    try:
+        dt, out = _timed("sleep 12 & echo bg-started")
+        assert dt < 3.0, f"backgrounded cmd hung ({dt:.1f}s) — should return promptly"
+        assert "background" in out.lower()
+        time.sleep(0.5)
+        n = subprocess.run("pgrep -f 'sleep 12' | wc -l", shell=True,
+                           capture_output=True, text=True).stdout.strip()
+        assert int(n) >= 1, "backgrounded process was killed (should survive)"
+    finally:
+        subprocess.run("pkill -f 'sleep 12'", shell=True)
+
+
+def test_normal_command_unaffected():
+    dt, out = _timed("echo hello && echo world")
+    assert "hello" in out and "world" in out and dt < 2.0
+    assert "background" not in out.lower()
+
+
+def test_foreground_hang_still_times_out():
+    dt, out = _timed("sleep 30", timeout=3)
+    assert "timed out" in out and dt < 6.0
+
+
+def test_failing_command_still_reports_exit_code():
+    _, out = _timed("false")
+    assert "[exit code: 1]" in out

drydock_cli-3.0.90/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