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

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

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

@@ -130,7 +130,8 @@ def run_oneshot(prompt: str, config: dict) -> None:
                 # under -p) shows WHAT each tool did, not just its name. Without
                 # this, a timed-out run is an opaque wall of "[Bash]" with no way
                 # to tell a genuine 100-command exploration from a tight loop.
-                print(f"  [{event.name}] {_summarize(event.inputs)}",
+                from drydock.tools import tool_display_name
+                print(f"  [{tool_display_name(event.name)}] {_summarize(event.inputs)}",
                       file=sys.stderr, flush=True)
             elif isinstance(event, ToolEnd):
                 # One-line outcome so failures/repeats are visible in the trace.

{drydock_cli-3.0.109 → drydock_cli-3.0.111}/drydock/tools/__init__.py

@@ -93,9 +93,19 @@ def _detect_bash() -> str | None:
     return None
 
 
-# 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 _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]:
@@ -135,6 +145,20 @@ _SHELL_KIND, _SHELL_PATH = _detect_shell()
 _BASH_SHELL = _detect_bash()
 
 
+def shell_display_name() -> str:
+    """Human label for the shell the Bash tool actually runs commands in — so the
+    TUI can show 'PowerShell'/'cmd' on Windows instead of the schema name 'Bash'."""
+    return {"powershell": "PowerShell", "cmd": "cmd",
+            "bash": "Bash", "sh": "sh"}.get(_SHELL_KIND, "Bash")
+
+
+def tool_display_name(name: str) -> str:
+    """Map a tool's schema name to its display label. The `Bash` tool (the name
+    the model calls) is shown as the actual shell — so on Windows a user sees
+    'PowerShell', not 'Bash'."""
+    return shell_display_name() if name == "Bash" else name
+
+
 # ANSI escape sequences (CSI colour/cursor, OSC title, and lone two-char escapes).
 # Some tools emit these even to a pipe (--color=always, forced-colour test runners),
 # and they're pure display control — noise that wastes the model's tokens.

{drydock_cli-3.0.109 → drydock_cli-3.0.111}/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
@@ -1188,7 +1214,8 @@ class DrydockApp(App):
             self._render_todo(m.inputs.get("tasks", ""))
             self._last_card = None  # tool_end is a no-op for the checklist
             return
-        card = ToolCard(m.name, summarize_inputs(m.inputs))
+        from drydock.tools import tool_display_name
+        card = ToolCard(tool_display_name(m.name), summarize_inputs(m.inputs))
         self._last_card = card
         self._mount(card)
 

{drydock_cli-3.0.109 → drydock_cli-3.0.111}/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.109 → drydock_cli-3.0.111/drydock_cli.egg-info}/PKG-INFO

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

{drydock_cli-3.0.109 → drydock_cli-3.0.111}/tests/test_windows_shell.py

@@ -77,3 +77,26 @@ def test_env_override_forces_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"})
+
+
+def test_tool_display_name_maps_bash_to_shell():
+    from unittest import mock
+    for kind, expect in [("powershell", "PowerShell"), ("cmd", "cmd"), ("bash", "Bash"), ("sh", "sh")]:
+        with mock.patch.object(T, "_SHELL_KIND", kind):
+            assert T.tool_display_name("Bash") == expect
+            assert T.tool_display_name("Read") == "Read"  # other tools unchanged