drydock-cli 3.0.104__tar.gz → 3.0.105__tar.gz

{drydock_cli-3.0.104/drydock_cli.egg-info → drydock_cli-3.0.105}/PKG-INFO

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

@@ -82,14 +82,20 @@ def _detect_bash() -> str | None:
     found = shutil.which("bash")
     if found:
         return found
-    for p in ("/bin/bash", "/usr/bin/bash", "/usr/local/bin/bash"):
+    # Common absolute locations, incl. Git-for-Windows and WSL bash on Windows.
+    for p in ("/bin/bash", "/usr/bin/bash", "/usr/local/bin/bash",
+              r"C:\Program Files\Git\bin\bash.exe",
+              r"C:\Program Files (x86)\Git\bin\bash.exe",
+              r"C:\Windows\System32\bash.exe"):
         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.
+_IS_WINDOWS = os.name == "nt"
+# Resolved once at import (in whatever environment drydock runs — host, the task
+# container, Linux, or Windows). None → bash unavailable, fall back to the
+# platform's default shell (cmd.exe on Windows, /bin/sh on POSIX).
 _BASH_SHELL = _detect_bash()
 
 
@@ -928,6 +934,18 @@ def kill_process_group(proc) -> None:
     if the group can't be resolved (e.g. process already gone)."""
     if proc is None:
         return
+    if _IS_WINDOWS:
+        # No process groups / SIGKILL on Windows — taskkill /T kills the whole
+        # child tree (the shell + everything it spawned).
+        try:
+            subprocess.run(["taskkill", "/F", "/T", "/PID", str(proc.pid)],
+                           capture_output=True, timeout=10)
+        except Exception:  # noqa: BLE001
+            try:
+                proc.kill()
+            except Exception:  # noqa: BLE001
+                pass
+        return
     try:
         os.killpg(os.getpgid(proc.pid), signal.SIGKILL)
     except (ProcessLookupError, PermissionError, OSError):
@@ -1016,9 +1034,19 @@ def tool_bash(params: dict, config: dict) -> str:
     # overall timeout between slices.
     cancel = config.get("_cancel")
     proc = None
+    # Invoke bash explicitly as [bash, "-c", cmd] rather than shell=True +
+    # executable — cross-platform correctness: on Windows shell=True builds
+    # `{executable} /c {cmd}` (cmd.exe syntax), so a real bash.exe (Git Bash/WSL)
+    # would be called as `bash /c ...` and fail. `[bash, "-c", cmd]` runs the same
+    # on Linux and Windows. Without bash, fall back to the platform default shell
+    # (cmd.exe on Windows, /bin/sh on POSIX) via shell=True.
+    if _BASH_SHELL:
+        popen_cmd, use_shell = [_BASH_SHELL, "-c", cmd], False
+    else:
+        popen_cmd, use_shell = cmd, True
     try:
         proc = subprocess.Popen(
-            cmd, shell=True, executable=_BASH_SHELL,
+            popen_cmd, shell=use_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
@@ -1033,7 +1061,12 @@ def tool_bash(params: dict, config: dict) -> str:
             # which killed the thread and handed the agent "(no output)", losing
             # even the text parts of mixed output.
             text=True, encoding="utf-8", errors="replace",
-            cwd=config.get("cwd"), start_new_session=True,
+            cwd=config.get("cwd"),
+            # Own process group / job so kill_process_group takes down the whole
+            # tree: setsid on POSIX; a new process group on Windows (getattr keeps
+            # the Windows-only flag out of the POSIX code path — it resolves to 0).
+            start_new_session=not _IS_WINDOWS,
+            creationflags=getattr(subprocess, "CREATE_NEW_PROCESS_GROUP", 0),
         )
         config.setdefault("_abort", {})["proc"] = proc
         # Read output in a daemon thread with a HARD byte cap, so memory can't

{drydock_cli-3.0.104 → drydock_cli-3.0.105/drydock_cli.egg-info}/PKG-INFO

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

@@ -51,6 +51,7 @@ tests/test_approval.py
 tests/test_back_command.py
 tests/test_bash_background.py
 tests/test_bash_binary_output.py
+tests/test_bash_crossplatform.py
 tests/test_bash_output_bounding.py
 tests/test_bash_process_group.py
 tests/test_bash_safety.py

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

drydock_cli-3.0.105/tests/test_bash_crossplatform.py

@@ -0,0 +1,49 @@
+"""tool_bash must run on Linux AND Windows. The Windows blocker was shell=True +
+executable=bash → Popen builds `bash /c cmd` (cmd.exe syntax) which a real
+bash.exe rejects. Fix: invoke `[bash, "-c", cmd]` explicitly; use taskkill on
+Windows for the process-tree kill; setsid only on POSIX."""
+from __future__ import annotations
+
+import os
+import subprocess
+
+from drydock import tools
+from drydock.tools import _detect_bash, _IS_WINDOWS, kill_process_group, tool_bash
+
+
+def test_platform_flag_matches_os():
+    assert _IS_WINDOWS == (os.name == "nt")
+
+
+def test_detect_bash_returns_path_or_none():
+    r = _detect_bash()
+    assert r is None or (isinstance(r, str) and "bash" in r.lower())
+
+
+def test_bash_invoked_as_argv_not_shell_c(monkeypatch):
+    """When bash is available, Popen is called with [bash, '-c', cmd] and
+    shell=False — never shell=True+executable (which breaks on Windows)."""
+    if not tools._BASH_SHELL:
+        return
+    seen = {}
+    real = subprocess.Popen
+
+    def spy(popen_cmd, *a, **kw):
+        seen["cmd"] = popen_cmd
+        seen["shell"] = kw.get("shell")
+        return real(popen_cmd, *a, **kw)
+
+    monkeypatch.setattr(subprocess, "Popen", spy)
+    tool_bash({"command": "echo hi", "timeout": 5}, {"cwd": "/tmp"})
+    assert seen["shell"] is False
+    assert isinstance(seen["cmd"], list) and seen["cmd"][1] == "-c"
+    assert seen["cmd"][0].lower().endswith(("bash", "bash.exe"))
+
+
+def test_kill_process_group_none_is_safe():
+    kill_process_group(None)  # must not raise
+
+
+def test_command_still_runs_here():
+    out = tool_bash({"command": "echo cross_platform_ok", "timeout": 5}, {"cwd": "/tmp"})
+    assert "cross_platform_ok" in out