code-context-control 2.76.2__py3-none-any.whl → 2.77.0__py3-none-any.whl

cli/c3.py

@@ -92,7 +92,7 @@ console = Console() if HAS_RICH else None
 # Config
 CONFIG_DIR = ".c3"
 CONFIG_FILE = ".c3/config.json"
-__version__ = "2.76.2"
+__version__ = "2.77.0"
 
 
 def _compress_file_cli(compressor, path, mode="smart", **kw):

cli/hook_access_guard.py

@@ -10,6 +10,7 @@ Bash coverage is a best-effort, existence-gated token scan — advisory by
 design (docs/access-guard.md §3/§6); it catches an agent naming a denied
 path, not an adversary hiding one.
 """
+import os
 import re
 import sys
 from pathlib import Path
@@ -84,6 +85,23 @@ _DOUBLE_COLON_RE = re.compile(r"::(?!\$)")
 _GIT_REVSPEC_RE = re.compile(r"^(?P<rev>[^:\s]+):(?P<path>[^:\s]+)$")
 _GIT_CMD_RE = re.compile(r"^\s*(?:[\w.\-]*[/\\])?git(?:\.exe)?\b", re.IGNORECASE)
 
+# Where one command ends and the next begins. Anchoring "is this git?" to the
+# start of the whole string was wrong in the most ordinary way possible:
+# `cd /repo && git show origin/main:pyproject.toml` starts with `cd`, so the
+# revspec rewrite never fired for the shape people actually type. Caught by a
+# live probe after release, not by the unit tests — which passed the command as
+# `git show …` because that is how the test author writes it, not how a shell
+# call arrives.
+_SEGMENT_SPLIT = re.compile(r"&&|\|\||[;|\n]")
+
+# `cd <dir>` — the segment that moves the ground under every later one. Handles
+# a quoted target, since project paths on this platform contain spaces, and the
+# Windows `/d` flag.
+_CD_RE = re.compile(
+    r"""^\s*cd\s+(?:/d\s+)?(?P<dir>"[^"]+"|'[^']+'|\S+)\s*$""",
+    re.IGNORECASE,
+)
+
 
 def _is_network_token(tok: str) -> bool:
     """True for URLs and IPv6 literals/CIDRs — never for an ADS spelling."""
@@ -190,6 +208,20 @@ def _target(tool_input: dict) -> str:
     )
 
 
+def _cd_target(segment: str, cwd: str) -> str | None:
+    """The directory a `cd` segment moves to, resolved against ``cwd``."""
+    m = _CD_RE.match(segment or "")
+    if not m:
+        return None
+    target = m.group("dir").strip("\"'")
+    if not target or target.startswith("-"):
+        return None
+    try:
+        return os.path.abspath(os.path.join(cwd, os.path.expanduser(target)))
+    except (OSError, ValueError):
+        return None
+
+
 def _scan_shell(cmd: str, base: str):
     """(denial, token) for the first confident deny-rule hit, else (None, '').
 
@@ -201,44 +233,78 @@ def _scan_shell(cmd: str, base: str):
     outright, as are URLs and IPv6 literals: all of them trip the ADS spelling
     check, which is exempt from existence-gating, so a token naming nothing on
     disk would otherwise hard-deny (#50).
+
+    Scanning is per **command segment**, not per whole string. A segment is what
+    sits between `&&`, `||`, `;`, `|` or a newline, and each one answers "am I a
+    git command?" for itself — so the revspec rewrite applies to the tokens of
+    the git segment and to no others. `cat notes.txt:hidden && git status` must
+    not have its first token reinterpreted just because a later segment is git.
     """
-    for raw in _TOKEN_SPLIT.split(cmd)[:_MAX_TOKENS]:
-        tok = raw.strip("\"'`;,()")
-        if not tok or tok.startswith("-"):
-            continue
-        if "/" not in tok and "\\" not in tok and not tok.startswith("."):
-            continue
-        # Order matters only for readability: a URL is also syntax-free, so
-        # either check alone would skip 'https://x'. Both are kept because they
-        # answer different questions — "is this a network literal" and "is this
-        # a path at all" — and the second is the one that generalizes.
-        if not _looks_like_a_path(tok) or _is_network_token(tok):
-            continue
-        # `tests/x.py::TestThing` is a node id, not a stream spelling.
-        if _is_scope_token(tok):
-            continue
-        # `git show <rev>:<path>` — judge the PATH, not the whole token. This
-        # is the one place the scan rewrites what it checks rather than skipping
-        # it, because skipping would let `git show HEAD:.env` through.
-        revspec_path = _git_revspec_path(cmd, tok)
-        from_revspec = revspec_path is not None
-        if from_revspec:
-            tok = revspec_path
-        if re.match(r"^/[a-z]/", tok):  # MSYS /c/foo → C:/foo
-            tok = f"{tok[1]}:{tok[2:]}"
-        denial = ag.check(tok, "read", base)
-        if denial and denial.kind == "deny":
-            try:
-                p = Path(tok)
-                exists = (p if p.is_absolute() else Path(base) / p).exists()
-            except OSError:
-                exists = False
-            # A revspec names a path in HISTORY, so the working tree is the
-            # wrong place to ask whether it is real. `git show HEAD~5:.env`
-            # reads a denied file whether or not that file exists today, and
-            # existence-gating it would be a hole this rewrite opened.
-            if exists or from_revspec or denial.rule.startswith("<"):
-                return denial, tok
+    budget = _MAX_TOKENS
+    cwd = base
+    for segment in _SEGMENT_SPLIT.split(cmd or ""):
+        if budget <= 0:
+            break
+        is_git = bool(_GIT_CMD_RE.match(segment))
+        for raw in _TOKEN_SPLIT.split(segment)[:budget]:
+            budget -= 1
+            tok = raw.strip("\"'`;,()")
+            if not tok or tok.startswith("-"):
+                continue
+            # A revspec's path half need not contain a separator — `HEAD:.env`
+            # has none, so it used to be dropped here before any rule saw it.
+            if ("/" not in tok and "\\" not in tok and not tok.startswith(".")
+                    and not (is_git and _GIT_REVSPEC_RE.match(tok))):
+                continue
+            # Order matters only for readability: a URL is also syntax-free, so
+            # either check alone would skip 'https://x'. Both are kept because
+            # they answer different questions — "is this a network literal" and
+            # "is this a path at all" — and the second is the one that
+            # generalizes.
+            if not _looks_like_a_path(tok) or _is_network_token(tok):
+                continue
+            # `tests/x.py::TestThing` is a node id, not a stream spelling.
+            if _is_scope_token(tok):
+                continue
+            # `git show <rev>:<path>` — judge the PATH, not the whole token.
+            # This is the one place the scan rewrites what it checks rather than
+            # skipping it, because skipping would let `git show HEAD:.env`
+            # through.
+            revspec_path = _git_revspec_path(segment, tok) if is_git else None
+            from_revspec = revspec_path is not None
+            if from_revspec:
+                tok = revspec_path
+            if re.match(r"^/[a-z]/", tok):  # MSYS /c/foo → C:/foo
+                tok = f"{tok[1]}:{tok[2:]}"
+            # Resolve against the cwd the command will actually run in, not the
+            # session root. `cd /elsewhere && cat .env` used to compute the
+            # denial correctly and then throw it away, because the existence
+            # gate looked for `.env` under the project root where it does not
+            # live (#82). The rule base stays `base` — policy is the project's;
+            # only the path being judged follows the shell.
+            probe = tok
+            if not os.path.isabs(probe):
+                try:
+                    probe = os.path.join(cwd, probe)
+                except (OSError, ValueError):
+                    probe = tok
+            denial = ag.check(probe, "read", base)
+            if denial and denial.kind == "deny":
+                try:
+                    exists = Path(probe).exists()
+                except OSError:
+                    exists = False
+                # A revspec names a path in HISTORY, so the working tree is the
+                # wrong place to ask whether it is real. `git show HEAD~5:.env`
+                # reads a denied file whether or not that file exists today, and
+                # existence-gating it would be a hole this rewrite opened.
+                if exists or from_revspec or denial.rule.startswith("<"):
+                    return denial, tok
+        # AFTER the segment's own tokens: `cd x` moves the ground for what
+        # follows, not for its own argument.
+        moved = _cd_target(segment, cwd)
+        if moved is not None:
+            cwd = moved
     return None, ""
 
 

{code_context_control-2.76.2.dist-info → code_context_control-2.77.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-context-control
-Version: 2.76.2
+Version: 2.77.0
 Summary: Local MCP code-intelligence for AI coding tools: surgical search/read/edit, agent-config version history, path-level access + masking guards, and a multi-project hub.
 Author-email: Dimitri Tselenchuk <dtselenc@gmail.com>
 License-Expression: Apache-2.0

{code_context_control-2.76.2.dist-info → code_context_control-2.77.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
 cli/__init__.py,sha256=ec66drCZGNMRU4V6ov0zVhYZph1us12Vn8OvG_LJyRY,22
 cli/_hook_utils.py,sha256=03fDyLvfzF832M7L5B2DgR8KMWXIObpbYxSC3LbhQ04,17229
-cli/c3.py,sha256=H7frUbcXyG6sIUrnKfVVpvFhH6t5SRi7J0EKwZVAErU,368519
+cli/c3.py,sha256=vepPfESCu5S1EizKddSybSgWYC0zOrQ7r73dVLB2xNQ,368519
 cli/docs.html,sha256=bNymSz7LatnWHjxSXL92QSUtGvB3jBzNHbOV-bRpAOo,142507
 cli/edits.html,sha256=UjAhoCmBmQ89cklGvJqzC6eyNP2tc8H6T-e01DVkLvE,43418
-cli/hook_access_guard.py,sha256=f7LywupKKDkCNdyZd5s4C8inGvOc0qp68HyLNLo301w,12800
+cli/hook_access_guard.py,sha256=UGXZ6-3gVNxjVasAuCV9eUOBwqDHl3YnuDc3XVTpvL0,15942
 cli/hook_artifact.py,sha256=Se1CNBfoBFyvJQlRmYdNtdRXIkQp9zaF0O6ndRMo7ts,2198
 cli/hook_auto_snapshot.py,sha256=yGFqRANtw8qNqRNr-oCgpuyaUyTkSzIOFxXt5kauq4I,5271
 cli/hook_c3_signal.py,sha256=FPvs-9nD9ZiKA8r2tmusgj79yT9w9F173cRDKn-PYeI,2149
@@ -112,7 +112,7 @@ cli/ui/components/sessions.js,sha256=FIKtil76B8tCkAmcFV7hlj6GQ_DCJK2jCzvEmdK7NBE
 cli/ui/components/settings.js,sha256=ATbAjBlVIwCNpxq7s191b49a_INQV38iwmySqtJLYwY,79066
 cli/ui/components/sidebar.js,sha256=K2ym2kUgpbyG-EBA_wBIIiqQY8qTatsiBZwzseMWuIQ,9939
 cli/ui/components/tasks.js,sha256=vyKQ3uwoppMwvdEaHlhWXW4oWcAisx4NveqzMhsYqHo,38438
-code_context_control-2.76.2.dist-info/licenses/LICENSE,sha256=l8Kh5QCNWNvR6kIt8L0BUZvc2LAFiHv2c-FnsGnUZf4,11301
+code_context_control-2.77.0.dist-info/licenses/LICENSE,sha256=l8Kh5QCNWNvR6kIt8L0BUZvc2LAFiHv2c-FnsGnUZf4,11301
 core/__init__.py,sha256=TSDCEcM4V7gcZVM3w2ykJaqEUch4Dkon-rivV17T73s,2501
 core/config.py,sha256=YmkcZwedz_lfDM0ZuI_f4xpe98ixPLcSQFcTCHgRiRg,19206
 core/ide.py,sha256=V6VVMVsFdmmcsMyxikjQp7z9xa42CWiHKS-ya-MAcG4,6172
@@ -265,8 +265,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.76.2.dist-info/METADATA,sha256=XL1W9TMmDxlqeZvl4NFBBtejLyZ_IJDNGIIPtRv5B94,25648
-code_context_control-2.76.2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-code_context_control-2.76.2.dist-info/entry_points.txt,sha256=7kX_WUsDCF2hbXzvbNyscyaBb9AeA-DJY5v_5hN0DlU,93
-code_context_control-2.76.2.dist-info/top_level.txt,sha256=wRt41zBybVF3qAiNXHz9BURbkKvUvfhmWWtKMhaw6eE,29
-code_context_control-2.76.2.dist-info/RECORD,,
+code_context_control-2.77.0.dist-info/METADATA,sha256=XFIYGme_wszePZIjWKSWokSb3m4RqUwDXfF4k3Rqwk8,25648
+code_context_control-2.77.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+code_context_control-2.77.0.dist-info/entry_points.txt,sha256=7kX_WUsDCF2hbXzvbNyscyaBb9AeA-DJY5v_5hN0DlU,93
+code_context_control-2.77.0.dist-info/top_level.txt,sha256=wRt41zBybVF3qAiNXHz9BURbkKvUvfhmWWtKMhaw6eE,29
+code_context_control-2.77.0.dist-info/RECORD,,