drydock-cli 3.0.107__tar.gz → 3.0.109__tar.gz

{drydock_cli-3.0.107/drydock_cli.egg-info → drydock_cli-3.0.109}/PKG-INFO

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

@@ -6,6 +6,7 @@ Each tool is a function (params, config) -> str.
 from __future__ import annotations
 
 import os
+import sys
 import re
 import difflib
 import glob as _glob
@@ -92,10 +93,45 @@ def _detect_bash() -> str | None:
     return None
 
 
-_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).
+# Windows even if a non-native Python (rare) reports a posix os.name — sys.platform
+# is the reliable signal on CPython.
+_IS_WINDOWS = os.name == "nt" or sys.platform.startswith("win")
+
+
+def _detect_shell() -> tuple[str, str]:
+    """Pick the shell tool_bash runs commands in — returns (kind, path).
+
+    Override with env DRYDOCK_SHELL=powershell|cmd|bash to force one. Otherwise:
+    POSIX → bash (so the model's bash-isms work), else /bin/sh.
+    Windows → PowerShell (what users actually launch drydock in — pwsh, else
+    Windows PowerShell), else cmd.exe. WSL / Git-Bash is NEVER required on Windows.
+    """
+    import shutil
+
+    def _powershell():
+        p = shutil.which("pwsh") or shutil.which("powershell")
+        return ("powershell", p) if p else None
+
+    def _bash():
+        b = _detect_bash()
+        return ("bash", b) if b else ("sh", shutil.which("sh") or "/bin/sh")
+
+    forced = os.environ.get("DRYDOCK_SHELL", "").strip().lower()
+    if forced in ("powershell", "pwsh"):
+        return _powershell() or ("cmd", shutil.which("cmd") or "cmd.exe")
+    if forced == "cmd":
+        return ("cmd", shutil.which("cmd") or "cmd.exe")
+    if forced in ("bash", "sh"):
+        return _bash()
+
+    if _IS_WINDOWS:
+        return _powershell() or ("cmd", shutil.which("cmd") or "cmd.exe")
+    return _bash()
+
+
+# Resolved once at import (in whatever environment drydock runs — Linux/macOS,
+# the task container, or native Windows). _BASH_SHELL kept for back-compat.
+_SHELL_KIND, _SHELL_PATH = _detect_shell()
 _BASH_SHELL = _detect_bash()
 
 
@@ -1040,9 +1076,15 @@ def tool_bash(params: dict, config: dict) -> str:
     # 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:
+    # Build the invocation for the detected shell. Explicit argv (shell=False)
+    # for bash/PowerShell so it's correct on every OS; shell=True lets the
+    # platform default (/bin/sh on POSIX, cmd.exe on Windows) handle the rest.
+    if _SHELL_KIND == "bash":
+        popen_cmd, use_shell = [_SHELL_PATH, "-c", cmd], False
+    elif _SHELL_KIND == "powershell":
+        popen_cmd, use_shell = [_SHELL_PATH, "-NoProfile", "-NonInteractive",
+                                "-Command", cmd], False
+    else:  # "sh" (POSIX) or "cmd" (Windows) → platform default shell
         popen_cmd, use_shell = cmd, True
     try:
         proc = subprocess.Popen(

{drydock_cli-3.0.107 → drydock_cli-3.0.109}/drydock/tuning.py

@@ -272,10 +272,36 @@ _DRYDOCK_COMMANDS_HELP = (
 )
 
 
+def _shell_env_note() -> str:
+    """On Windows, tell the model its shell is PowerShell/cmd so it stops
+    emitting bash it can't run. Empty on POSIX (bash is the default assumption)."""
+    import os
+    import shutil
+    if os.name != "nt":
+        return ""
+    if shutil.which("pwsh") or shutil.which("powershell"):
+        return (
+            "\nENVIRONMENT: You are on WINDOWS and the Bash tool runs your commands "
+            "through POWERSHELL, not bash. Use PowerShell / Windows commands: "
+            "Get-ChildItem (ls), Get-Content (cat), Select-String (grep), Copy-Item, "
+            "Move-Item, Remove-Item, New-Item, Test-Path, Where-Object. Many Unix "
+            "aliases (ls, cat, cp, rm, pwd, echo) also work. Do NOT use bash-only "
+            "syntax ([[ ]], <<<, $(...) subshells, grep/sed/awk pipelines) — it "
+            "fails. Use Windows paths (backslashes) and $env:VAR for environment "
+            "variables. Chain commands with ';' (not '&&')."
+        )
+    return (
+        "\nENVIRONMENT: You are on WINDOWS and the Bash tool runs your commands "
+        "through cmd.exe, not bash. Use Windows/cmd commands (dir, type, findstr, "
+        "copy, del, move, mkdir); do NOT use bash syntax. Use backslash paths, "
+        "%VAR% for environment variables, and '&' or '&&' to chain commands."
+    )
+
+
 def system_prompt_for_model(model: str | None) -> str:
     """Return the system prompt best suited to the model."""
     base = _GEMMA_SYSTEM_PROMPT if is_gemma(model) else _DEFAULT_SYSTEM_PROMPT
-    return base + _DRYDOCK_COMMANDS_HELP
+    return base + _DRYDOCK_COMMANDS_HELP + _shell_env_note()
 
 
 def thinking_level_for_turn(turn_count: int, is_user_turn: bool) -> str:

{drydock_cli-3.0.107 → drydock_cli-3.0.109/drydock_cli.egg-info}/PKG-INFO

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

@@ -114,5 +114,6 @@ tests/test_tuning.py
 tests/test_viewimage.py
 tests/test_vision_input.py
 tests/test_web_tools.py
+tests/test_windows_shell.py
 tests/test_write_content_coerce.py
 tests/test_xccdf.py

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

drydock_cli-3.0.109/tests/test_windows_shell.py

@@ -0,0 +1,79 @@
+"""drydock runs natively on Windows via PowerShell/cmd — no WSL/bash required.
+tool_bash picks the shell (POSIX→bash, Windows→PowerShell else cmd) and builds
+the right invocation; the system prompt tells the model which shell it's on."""
+from __future__ import annotations
+
+import subprocess
+from unittest import mock
+
+import drydock.tools as T
+from drydock import tuning
+
+
+def test_posix_uses_bash():
+    assert T._SHELL_KIND in ("bash", "sh")
+
+
+def test_windows_prefers_powershell():
+    with mock.patch.object(T, "_IS_WINDOWS", True), \
+         mock.patch("shutil.which", side_effect=lambda n: r"C:\ps\pwsh.exe" if n == "pwsh" else None):
+        kind, path = T._detect_shell()
+    assert kind == "powershell" and path.endswith("pwsh.exe")
+
+
+def test_windows_falls_back_to_cmd():
+    with mock.patch.object(T, "_IS_WINDOWS", True), \
+         mock.patch("shutil.which", side_effect=lambda n: r"C:\Windows\System32\cmd.exe" if n == "cmd" else None):
+        kind, _ = T._detect_shell()
+    assert kind == "cmd"
+
+
+def test_powershell_invocation_argv(monkeypatch):
+    """When the shell is PowerShell, Popen is called [pwsh -NoProfile
+    -NonInteractive -Command <cmd>] with shell=False — not shell=True."""
+    seen = {}
+
+    def spy(popen_cmd, *a, **kw):
+        seen["cmd"] = popen_cmd
+        seen["shell"] = kw.get("shell")
+        raise RuntimeError("stop-after-capture")  # don't actually run pwsh on Linux
+
+    monkeypatch.setattr(T, "_SHELL_KIND", "powershell")
+    monkeypatch.setattr(T, "_SHELL_PATH", r"C:\ps\pwsh.exe")
+    monkeypatch.setattr(subprocess, "Popen", spy)
+    T.tool_bash({"command": "Get-ChildItem", "timeout": 5}, {"cwd": "."})
+    assert seen["shell"] is False
+    assert seen["cmd"][:4] == [r"C:\ps\pwsh.exe", "-NoProfile", "-NonInteractive", "-Command"]
+    assert seen["cmd"][4] == "Get-ChildItem"
+
+
+def test_prompt_note_windows_powershell():
+    with mock.patch("os.name", "nt"), \
+         mock.patch("shutil.which", side_effect=lambda n: "x" if n in ("pwsh", "powershell") else None):
+        assert "POWERSHELL" in tuning._shell_env_note()
+
+
+def test_prompt_note_windows_cmd():
+    with mock.patch("os.name", "nt"), mock.patch("shutil.which", return_value=None):
+        assert "cmd.exe" in tuning._shell_env_note()
+
+
+def test_prompt_note_empty_on_posix():
+    assert tuning._shell_env_note() == ""
+
+
+def test_env_override_forces_powershell():
+    with mock.patch.dict("os.environ", {"DRYDOCK_SHELL": "powershell"}), \
+         mock.patch("shutil.which", side_effect=lambda n: r"C:\pwsh.exe" if n in ("pwsh", "powershell") else None):
+        assert T._detect_shell()[0] == "powershell"
+
+
+def test_env_override_forces_cmd():
+    with mock.patch.dict("os.environ", {"DRYDOCK_SHELL": "cmd"}), \
+         mock.patch("shutil.which", return_value=r"C:\cmd.exe"):
+        assert T._detect_shell()[0] == "cmd"
+
+
+def test_env_override_forces_bash():
+    with mock.patch.dict("os.environ", {"DRYDOCK_SHELL": "bash"}):
+        assert T._detect_shell()[0] in ("bash", "sh")