code-context-control 2.40.0__py3-none-any.whl → 2.41.0__py3-none-any.whl

cli/c3.py

@@ -85,7 +85,7 @@ console = Console() if HAS_RICH else None
 # Config
 CONFIG_DIR = ".c3"
 CONFIG_FILE = ".c3/config.json"
-__version__ = "2.40.0"
+__version__ = "2.41.0"
 
 
 def _command_deps() -> CommandDeps:

cli/tools/shell.py

@@ -4,12 +4,21 @@ Wraps subprocess.Popen with the Windows-safe pattern from
 services/edit_ledger.py::_git_combined (Popen + taskkill /F /T + stdin=DEVNULL).
 Auto-filters long stdout via handle_filter, auto-logs git mutations
 to the edit ledger, and accounts stdout tokens against session budget.
+
+Shell selection: on Windows, commands are run through Git Bash (bash.exe) when
+it is available, so c3_shell speaks the same POSIX dialect as the native Bash
+tool (forward-slash paths, single quotes, `$VAR`, ls/grep/cat, heredocs). This
+avoids the cmd.exe/POSIX mismatch that forced callers to fall back to native
+Bash for bash-flavored commands. Set C3_SHELL_BASH=0 to force cmd.exe, or point
+C3_SHELL_BASH at a specific bash.exe to override discovery. POSIX platforms are
+unchanged (shell=True → /bin/sh).
 """
 from __future__ import annotations
 
 import asyncio
 import os
 import re
+import shutil
 import subprocess
 import sys
 import time
@@ -59,6 +68,58 @@ _MAX_TIMEOUT = 600
 _FILTER_THRESHOLD_LINES = 30
 
 
+# Cache for discovered Git Bash path: [] = uncomputed, [None]/[path] = computed.
+_bash_cache: list = []
+
+
+def _discover_git_bash() -> str | None:
+    """Locate a Git-for-Windows bash.exe, never WSL/System32 bash.
+
+    WSL's bash runs in a Linux subsystem with /mnt/c paths, which would break
+    the Windows `cwd` semantics every caller relies on — so it is rejected.
+    """
+    candidates: list[str] = []
+    for base_env in ("ProgramW6432", "ProgramFiles", "ProgramFiles(x86)"):
+        base = os.environ.get(base_env)
+        if base:
+            candidates.append(os.path.join(base, "Git", "bin", "bash.exe"))
+            candidates.append(os.path.join(base, "Git", "usr", "bin", "bash.exe"))
+    candidates.append(r"C:\Program Files\Git\bin\bash.exe")
+    candidates.append(r"C:\Program Files\Git\usr\bin\bash.exe")
+    for path in candidates:
+        if os.path.isfile(path):
+            return path
+    # Last resort: PATH lookup, but reject WSL/Store bash (System32/WindowsApps).
+    found = shutil.which("bash")
+    if found:
+        low = found.lower()
+        if "system32" not in low and "windowsapps" not in low:
+            return found
+    return None
+
+
+def _select_bash() -> str | None:
+    """Return the bash.exe to run commands through on Windows, else None.
+
+    None means "use the platform default shell" (cmd.exe on Windows via
+    shell=True, /bin/sh on POSIX). Honors the C3_SHELL_BASH override:
+    '0'/'cmd' forces the platform default; an existing file path forces that
+    bash. Discovery is cached after the first call.
+    """
+    if sys.platform != "win32":
+        return None
+    override = os.environ.get("C3_SHELL_BASH")
+    if override is not None:
+        if override.strip().lower() in ("0", "", "cmd", "false", "off"):
+            return None
+        if os.path.isfile(override):
+            return override
+        # Unrecognized override → fall through to discovery.
+    if not _bash_cache:
+        _bash_cache.append(_discover_git_bash())
+    return _bash_cache[0]
+
+
 def _popen_kwargs() -> dict:
     # Force UTF-8 in child processes so Unicode output (→, box-drawing, emoji)
     # doesn't crash on Windows' legacy cp1252 console encoding. setdefault so an
@@ -89,8 +150,17 @@ def _kill_tree(proc: subprocess.Popen) -> None:
 def _run_sync(cmd: str, cwd: str, timeout: int) -> dict:
     """Blocking subprocess run with hard kill on timeout. Returns structured dict."""
     start = time.time()
+    bash = _select_bash()
+    if bash:
+        # POSIX dialect via Git Bash — matches the native Bash tool.
+        popen_target: object = [bash, "-c", cmd]
+        use_shell = False
+    else:
+        # Platform default: cmd.exe on Windows, /bin/sh on POSIX.
+        popen_target = cmd
+        use_shell = True
     proc = subprocess.Popen(
-        cmd, shell=True, cwd=cwd,
+        popen_target, shell=use_shell, cwd=cwd,
         stdout=subprocess.PIPE, stderr=subprocess.PIPE,
         text=True, encoding="utf-8", errors="replace",
         **_popen_kwargs(),

{code_context_control-2.40.0.dist-info → code_context_control-2.41.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-context-control
-Version: 2.40.0
+Version: 2.41.0
 Summary: Local code-intelligence layer for AI coding tools (Claude Code, Codex, Gemini, Copilot). Retrieve less, read less, edit safer.
 Author-email: Dimitri Tselenchuk <dtselenc@gmail.com>
 License-Expression: Apache-2.0

{code_context_control-2.40.0.dist-info → code_context_control-2.41.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cli/__init__.py,sha256=ec66drCZGNMRU4V6ov0zVhYZph1us12Vn8OvG_LJyRY,22
 cli/_hook_utils.py,sha256=rzW3u3Yrlvh73s_UZrQojkwGnKnS4yrPlbt4xouqQFM,5139
-cli/c3.py,sha256=oxxD5XSw-Bw2GemcH4dIV-cF2Bc0ZI8j1W5ZKIoG2qE,300436
+cli/c3.py,sha256=Gbnou4BbpWrMR1TZdIlGcr3EeTpifBev2akFGFsgC8E,300436
 cli/docs.html,sha256=JgtBFUuUkvmYowPREYiGhhcRbB5e2UjkRc00MIF0hsU,143653
 cli/edits.html,sha256=UjAhoCmBmQ89cklGvJqzC6eyNP2tc8H6T-e01DVkLvE,43418
 cli/hook_auto_snapshot.py,sha256=amtliVDzKUQr6KBR0pdBA8vXghAV-gKr19jBaJVnP_w,5006
@@ -47,7 +47,7 @@ cli/tools/project.py,sha256=PKHLGRFZdwBBEgryyV440mybTeQMqnlLgHdfXDnPahw,11868
 cli/tools/read.py,sha256=sl-dXlfFd7zCMOz-foy5lWk0j2EF_GWfJp8YZ4GXvqo,11754
 cli/tools/search.py,sha256=qB8C3w8yuu59aepvnuJNlzbsirtSEZA8zz4neKlE7Xs,13246
 cli/tools/session.py,sha256=LIZbmEhNdh6rAsT6Dbpb21UY8xF9oubvpjGwfnXxQK4,4573
-cli/tools/shell.py,sha256=lTGMpT_YWnAyJzcT-WHMLjuenqq6m-p3v6uCHKCsHWM,9752
+cli/tools/shell.py,sha256=vGsvzQLISo-daKF40ZhRJXS5lDA6OV1t9RWoyqdlpt4,12617
 cli/tools/status.py,sha256=yCHXskXgKzaDhJT6vHYlp3ZU5j89vhVYzf5dQOAR9yQ,12625
 cli/tools/validate.py,sha256=3GaYP9Kntep2SqKiAChUQxySWp1B-X3EuawUtIUQR40,12891
 cli/ui/api.js,sha256=wI9-lxGitIgZ5R6lqi1PVc2edD0b3TsYwMUGgcNWgfU,1342
@@ -64,7 +64,7 @@ cli/ui/components/memory.js,sha256=v5IsHTxLHpXX4xCsUaZ_UPprZEabdgP4jiWc298iV2U,2
 cli/ui/components/sessions.js,sha256=FIKtil76B8tCkAmcFV7hlj6GQ_DCJK2jCzvEmdK7NBE,30837
 cli/ui/components/settings.js,sha256=8LVTV2TQl9tcRXhXbtBEJOCBdiyk-x2QASoVYZUAuEA,71442
 cli/ui/components/sidebar.js,sha256=cAY_jwYB-o1X_wWn__VXlG4IegVObuE3NmVsuFWqxtg,7417
-code_context_control-2.40.0.dist-info/licenses/LICENSE,sha256=l8Kh5QCNWNvR6kIt8L0BUZvc2LAFiHv2c-FnsGnUZf4,11301
+code_context_control-2.41.0.dist-info/licenses/LICENSE,sha256=l8Kh5QCNWNvR6kIt8L0BUZvc2LAFiHv2c-FnsGnUZf4,11301
 core/__init__.py,sha256=TSDCEcM4V7gcZVM3w2ykJaqEUch4Dkon-rivV17T73s,2501
 core/config.py,sha256=tF0BKg2O_77Q9y2guyqdSF3INxMrKGlqUeGbTxmHmhI,14245
 core/ide.py,sha256=9LzsDVK2LL8RVpL40l6oNGiasZ3D8OCU_9i9A0gJKBo,6876
@@ -165,8 +165,8 @@ tui/screens/search_view.py,sha256=MMHjVdlk3HZSuDBSvq8IGrqv_Mh5Us6YqXQ80bcWSMk,19
 tui/screens/session_view.py,sha256=eZ1eDwHTvPOck1wCCviixtOaCxIkBT_95ytNNNriGNA,5991
 tui/screens/stats.py,sha256=p81PjzdaIv7hllb8f45-rlVe4lJZwSdIMqu7e86_u5s,6223
 tui/screens/ui_view.py,sha256=1QJCgLh2YfgWIpvzRG1KOGXYEaOYX6ojN61Azjf2oX0,2125
-code_context_control-2.40.0.dist-info/METADATA,sha256=fz9LbnqjUs2XnkDTa9-niTcTDmm7g_E06ERHNbLaWhM,22274
-code_context_control-2.40.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-code_context_control-2.40.0.dist-info/entry_points.txt,sha256=7kX_WUsDCF2hbXzvbNyscyaBb9AeA-DJY5v_5hN0DlU,93
-code_context_control-2.40.0.dist-info/top_level.txt,sha256=wRt41zBybVF3qAiNXHz9BURbkKvUvfhmWWtKMhaw6eE,29
-code_context_control-2.40.0.dist-info/RECORD,,
+code_context_control-2.41.0.dist-info/METADATA,sha256=xYB3b_utLQa_yHV_8btp9ZJxKj4qS_9T0LtbImi4_Do,22274
+code_context_control-2.41.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+code_context_control-2.41.0.dist-info/entry_points.txt,sha256=7kX_WUsDCF2hbXzvbNyscyaBb9AeA-DJY5v_5hN0DlU,93
+code_context_control-2.41.0.dist-info/top_level.txt,sha256=wRt41zBybVF3qAiNXHz9BURbkKvUvfhmWWtKMhaw6eE,29
+code_context_control-2.41.0.dist-info/RECORD,,