@ictechgy/context-guard 0.4.16 → 0.6.0

package/plugins/context-guard/bin/context-guard-failed-nudge

@@ -23,6 +23,7 @@ import math
 import os
 import re
 import shlex
+import shutil
 import stat
 import sys
 import time
@@ -64,7 +65,7 @@ STATE_LOCK_TIMEOUT_SECONDS = 2.0
 STATE_LOCK_POLL_SECONDS = 0.01
 CGW1_SENTINEL = "--context-guard-wrapper-v1"
 CGW1_COMMAND_SEARCH_DIFF = "command_search_diff"
-CGW1_SHELL_ARGV = ("bash", "-lc")
+CGW1_SHELL_ARGV = ("bash", "-c")
 LEGACY_V0_MAX_LINES = "220"
 PROTOCOL_CGW1 = "cgw1"
 PROTOCOL_LEGACY_V0 = "legacy-v0"
@@ -236,6 +237,60 @@ def _wrapper_prefixes() -> dict[str, tuple[str, ...]]:
     }
 
 
+def _approved_python_runtime() -> str:
+    canonical = os.path.realpath(sys.executable)
+    if not canonical or not os.path.isabs(canonical) or not os.path.isfile(canonical) or not os.access(canonical, os.X_OK):
+        raise RuntimeError("approved Python runtime is unavailable")
+    return canonical
+
+
+def _approved_bash_runtime() -> str:
+    found = shutil.which("bash", path=os.defpath)
+    if not found:
+        raise RuntimeError("approved Bash runtime is unavailable")
+    canonical = os.path.realpath(found)
+    if not os.path.isfile(canonical) or not os.access(canonical, os.X_OK):
+        raise RuntimeError("approved Bash runtime is unavailable")
+    return canonical
+
+
+def _approved_env_runtime() -> str:
+    found = shutil.which("env", path=os.defpath)
+    if not found:
+        raise RuntimeError("approved env runtime is unavailable")
+    canonical = os.path.realpath(found)
+    if not os.path.isfile(canonical) or not os.access(canonical, os.X_OK):
+        raise RuntimeError("approved env runtime is unavailable")
+    return canonical
+
+
+def _runtime_shell_argv() -> tuple[str, ...]:
+    return (
+        _approved_env_runtime(),
+        "-u", "BASH_ENV",
+        "-u", "ENV",
+        "-u", "PYTHONHOME",
+        "-u", "PYTHONPATH",
+        "-u", "PYTHONSTARTUP",
+        "-u", "SHELLOPTS",
+        "-u", "BASHOPTS",
+        "-u", "PS4",
+        _approved_bash_runtime(),
+        "--noprofile",
+        "--norc",
+        "-p",
+        "-c",
+    )
+
+
+def _runtime_wrapper_prefixes() -> dict[str, tuple[str, ...]]:
+    adjacent = _wrapper_prefixes()
+    return {
+        kind: (_approved_python_runtime(), "-I", prefix[-1])
+        for kind, prefix in adjacent.items()
+    }
+
+
 def _argv(command: str) -> tuple[str, ...] | None:
     try:
         values = shlex.split(command, posix=True)
@@ -263,7 +318,14 @@ def _is_wrapper_shaped(argv: tuple[str, ...]) -> bool:
     return (
         re.fullmatch(r"python(?:\d+(?:\.\d+)?)?", first) is not None
         and len(argv) > 1
-        and os.path.basename(argv[1]) in known
+        and (
+            os.path.basename(argv[1]) in known
+            or (
+                len(argv) > 2
+                and argv[1] == "-I"
+                and os.path.basename(argv[2]) in known
+            )
+        )
     )
 
 
@@ -274,32 +336,42 @@ def command_identity(command: str) -> CommandIdentity:
         return CommandIdentity(PROTOCOL_FOREIGN, sha256_text(command))
 
     prefixes = _wrapper_prefixes()
-    sanitize_cgw1 = prefixes["sanitize"] + (
-        CGW1_SENTINEL,
-        CGW1_COMMAND_SEARCH_DIFF,
-        "--",
-        *CGW1_SHELL_ARGV,
-    )
-    if len(argv) == len(sanitize_cgw1) + 1 and argv[:-1] == sanitize_cgw1:
-        logical = argv[-1]
-        if logical and not _is_wrapper_shaped(_argv(logical) or ()):
-            return CommandIdentity(PROTOCOL_CGW1, sha256_text(logical))
+    runtime_prefixes = _runtime_wrapper_prefixes()
+    current_shell_argv = _runtime_shell_argv()
+    for prefix, shell_argv in (
+        (runtime_prefixes["sanitize"], current_shell_argv),
+        (prefixes["sanitize"], CGW1_SHELL_ARGV),
+    ):
+        sanitize_cgw1 = prefix + (
+            CGW1_SENTINEL,
+            CGW1_COMMAND_SEARCH_DIFF,
+            "--",
+            *shell_argv,
+        )
+        if len(argv) == len(sanitize_cgw1) + 1 and argv[:-1] == sanitize_cgw1:
+            logical = argv[-1]
+            if logical and not _is_wrapper_shaped(_argv(logical) or ()):
+                return CommandIdentity(PROTOCOL_CGW1, sha256_text(logical))
 
     # The frozen A1 producer still emits this exact v0 envelope for trim.
     # The historical producer emitted it for sanitize as well, so both known
     # adjacent wrapper identities remain allowlisted for one compatibility
     # window. No other --/bash/-lc spelling is unwrapped.
-    for prefix in prefixes.values():
-        legacy_v0 = prefix + (
-            "--max-lines",
-            LEGACY_V0_MAX_LINES,
-            "--",
-            *CGW1_SHELL_ARGV,
-        )
-        if len(argv) == len(legacy_v0) + 1 and argv[:-1] == legacy_v0:
-            logical = argv[-1]
-            if logical and not _is_wrapper_shaped(_argv(logical) or ()):
-                return CommandIdentity(PROTOCOL_LEGACY_V0, sha256_text(logical))
+    for prefix_set, shell_argv in (
+        (prefixes, CGW1_SHELL_ARGV),
+        (runtime_prefixes, current_shell_argv),
+    ):
+        for prefix in prefix_set.values():
+            legacy_v0 = prefix + (
+                "--max-lines",
+                LEGACY_V0_MAX_LINES,
+                "--",
+                *shell_argv,
+            )
+            if len(argv) == len(legacy_v0) + 1 and argv[:-1] == legacy_v0:
+                logical = argv[-1]
+                if logical and not _is_wrapper_shaped(_argv(logical) or ()):
+                    return CommandIdentity(PROTOCOL_LEGACY_V0, sha256_text(logical))
 
     protocol = PROTOCOL_FOREIGN if (
         _is_wrapper_shaped(argv) or CGW1_SENTINEL in argv

package/plugins/context-guard/bin/context-guard-guard-read

@@ -520,9 +520,13 @@ def raw_read_range_outcome(
 def find_read_symbol_command() -> str:
     script_dir = Path(__file__).resolve().parent
     if (script_dir / "context-guard-read-symbol").exists():
-        return "context-guard-read-symbol"
+        return shlex.join(
+            [os.path.realpath(sys.executable), "-I", str((script_dir / "context-guard-read-symbol").resolve())]
+        )
     if (script_dir / "read_symbol.py").exists():
-        return "python3 context-guard-kit/read_symbol.py"
+        return shlex.join(
+            [os.path.realpath(sys.executable), "-I", str((script_dir / "read_symbol.py").resolve())]
+        )
     return "context-guard-read-symbol"
 
 

package/plugins/context-guard/bin/context-guard-mcp

@@ -32,6 +32,7 @@ MAX_CALLS = 1000
 MAX_ARTIFACTS = 1000
 MAX_VISITED_ENTRIES = 4000
 HELPER_TIMEOUT = 10.0
+HELPER_TERMINATE_GRACE = 0.1
 MAX_HELPER_STDERR = 16 * 1024
 MAX_HELPER_OUTPUT = 5 * 1024 * 1024
 MAX_RESPONSE_BYTES = 128 * 1024
@@ -456,7 +457,7 @@ class Server:
             # process group and inherited pipes alive. Give the whole group a
             # bounded TERM grace period, then escalate the group independently
             # of the direct child's return code.
-            grace_deadline = time.monotonic() + 0.5
+            grace_deadline = time.monotonic() + HELPER_TERMINATE_GRACE
             group_exists = True
             while time.monotonic() < grace_deadline:
                 try: