drydock-cli 3.0.108__tar.gz → 3.0.110__tar.gz

{drydock_cli-3.0.108/drydock_cli.egg-info → drydock_cli-3.0.110}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.108
+Version: 3.0.110
 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.108 → drydock_cli-3.0.110}/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,28 +93,50 @@ def _detect_bash() -> str | None:
     return None
 
 
-_IS_WINDOWS = os.name == "nt"
+def _is_windows_env(os_name: str, platform: str, environ) -> bool:
+    """Treat as Windows if ANY signal says so — native CPython (os.name 'nt' /
+    sys.platform 'win32') AND odd Pythons run from Git-Bash/MSYS/Cygwin (which
+    report posix but where Windows always exports WINDIR/SystemRoot). WSL (real
+    Linux) does not set WINDIR, so it correctly stays POSIX/bash."""
+    return (
+        os_name == "nt"
+        or platform in ("win32", "cygwin", "msys")
+        or bool(environ.get("WINDIR") or environ.get("SystemRoot"))
+    )
+
+
+_IS_WINDOWS = _is_windows_env(os.name, sys.platform, os.environ)
 
 
 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 NOT required on Windows;
-    if you'd rather use them, install bash and it's picked up on POSIX-like paths.
+    Windows PowerShell), else cmd.exe. WSL / Git-Bash is NEVER required on Windows.
     """
     import shutil
-    if _IS_WINDOWS:
-        for name in ("pwsh", "powershell"):
-            p = shutil.which(name)
-            if p:
-                return ("powershell", p)
+
+    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")
-    b = _detect_bash()
-    if b:
-        return ("bash", b)
-    return ("sh", shutil.which("sh") or "/bin/sh")
+    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,

{drydock_cli-3.0.108 → drydock_cli-3.0.110}/drydock/tui/app.py

@@ -501,6 +501,8 @@ class DrydockApp(App):
             self._cmd_compact()
         elif cmd == "/context":
             self._cmd_context(arg)
+        elif cmd == "/shell":
+            self._cmd_shell()
         elif cmd == "/advisor":
             self._cmd_advisor(arg)
         elif cmd == "/ask":
@@ -807,6 +809,30 @@ class DrydockApp(App):
         else:
             self._begin(prompt)
 
+    def _cmd_shell(self) -> None:
+        """Show exactly which shell the Bash tool runs commands through, plus the
+        platform signals — so a 'still using bash on Windows' report is instantly
+        diagnosable. (The tool is NAMED 'Bash' on every OS; on Windows it actually
+        invokes PowerShell/cmd underneath.)"""
+        import os as _os
+        import sys as _sys
+
+        from drydock import tools
+        kind, path = tools._detect_shell()
+        lines = [
+            f"The Bash tool runs your commands through: {kind.upper()}",
+            f"  shell path : {path}",
+            f"  os.name={_os.name}  sys.platform={_sys.platform}  detected_windows={tools._IS_WINDOWS}",
+            f"  DRYDOCK_SHELL env = {_os.environ.get('DRYDOCK_SHELL') or '(unset)'}",
+            f"  bash on system    = {tools._detect_bash() or '(none)'}",
+        ]
+        if kind == "bash" and tools._IS_WINDOWS:
+            lines.append("  ⚠ on Windows but using bash — set  $env:DRYDOCK_SHELL=\"powershell\"  and restart.")
+        elif kind == "powershell":
+            lines.append("  ✓ using PowerShell (the 'Bash' label is just the tool's name).")
+        lines.append("  Force a shell any time: set env DRYDOCK_SHELL to powershell / cmd / bash.")
+        self._info("\n".join(lines))
+
     def _cmd_context(self, arg: str) -> None:
         """View or change the context-window budget (tokens) — the cap that drives
         the ctx gauge + auto-compaction. `/context` shows it + its source; `/context

{drydock_cli-3.0.108 → drydock_cli-3.0.110}/drydock/tui/widgets.py

@@ -153,7 +153,7 @@ class PromptHistory:
 # completes the prefix.
 SLASH_COMMANDS = [
     "/help", "/model", "/cwd", "/undo", "/back", "/stop", "/status",
-    "/compact", "/context", "/advisor", "/ask", "/ask!", "/graphrag", "/skills",
+    "/compact", "/context", "/shell", "/advisor", "/ask", "/ask!", "/graphrag", "/skills",
     "/loop", "/mcp", "/rmf", "/stig",
     "/clear", "/quit",
 ]

{drydock_cli-3.0.108 → drydock_cli-3.0.110/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.108
+Version: 3.0.110
 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.108 → drydock_cli-3.0.110}/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.108"
+version = "3.0.110"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

{drydock_cli-3.0.108 → drydock_cli-3.0.110}/tests/test_windows_shell.py

@@ -32,21 +32,16 @@ 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 = {}
-    real = subprocess.Popen
 
-    class FakeProc:
-        stdout = None
-        pid = 1
-        def wait(self): return 0
-        def poll(self): return 0
     def spy(popen_cmd, *a, **kw):
-        seen["cmd"] = popen_cmd; seen["shell"] = kw.get("shell")
+        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)
-    out = T.tool_bash({"command": "Get-ChildItem", "timeout": 5}, {"cwd": "."})
+    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"
@@ -65,3 +60,35 @@ def test_prompt_note_windows_cmd():
 
 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")
+
+
+def test_is_windows_detection_signals():
+    from drydock.tools import _is_windows_env
+    # native Windows
+    assert _is_windows_env("nt", "win32", {})
+    # MSYS/Git-Bash Python: posix os.name but WINDIR set
+    assert _is_windows_env("posix", "msys", {"WINDIR": r"C:\Windows"})
+    # Cygwin
+    assert _is_windows_env("posix", "cygwin", {})
+    # SystemRoot fallback
+    assert _is_windows_env("posix", "linux", {"SystemRoot": r"C:\Windows"})
+    # real Linux / WSL (no Windows env)
+    assert not _is_windows_env("posix", "linux", {})
+    assert not _is_windows_env("posix", "linux", {"HOME": "/home/x"})