plugin-scanner 2.0.1032__tar.gz → 2.0.1034__tar.gz

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plugin-scanner
-Version: 2.0.1032
+Version: 2.0.1034
 Summary: Protect local AI harnesses with HOL Guard and run scanner checks for Codex, Claude, Cursor, Gemini, OpenCode, and Pi.
 Project-URL: Homepage, https://github.com/hashgraph-online/hol-guard
 Project-URL: Repository, https://github.com/hashgraph-online/hol-guard

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/dashboard/src/approval-center-layout.tsx

@@ -250,6 +250,11 @@ export function ApprovalCenterLayout(props: LayoutProps) {
             ? props.runtime.snapshot.cloud_pairing_state.workspace_id ?? null
             : null
         }
+        planId={
+          props.runtime.kind === "ready"
+            ? props.runtime.snapshot.cloud_pairing_state.plan_id ?? null
+            : null
+        }
       />
       <div
         className={`flex flex-col transition-all duration-200 lg:min-h-screen ${sidebarCollapsed ? "lg:pl-20" : "lg:pl-64"}`}

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/dashboard/src/approval-center-primitives.tsx

@@ -179,6 +179,7 @@ export function ShellSidebar(props: {
   updatePhase?: GuardUpdatePhase;
   cloudUserProfile?: GuardCloudUserProfile | null;
   workspaceId?: string | null;
+  planId?: string | null;
 }) {
   const collapsed = props.collapsed ?? false;
   return (
@@ -256,6 +257,7 @@ export function ShellSidebar(props: {
               <CloudUserMenu
                 userProfile={props.cloudUserProfile}
                 workspaceId={props.workspaceId}
+                planId={props.planId}
                 collapsed={collapsed}
               />
             </div>

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/dashboard/src/cloud-user-menu.tsx

@@ -37,6 +37,7 @@ function resolveDisplayName(profile: GuardCloudUserProfile): string {
 export function CloudUserMenu(props: {
   userProfile: GuardCloudUserProfile | null | undefined;
   workspaceId: string | null | undefined;
+  planId?: string | null;
   collapsed?: boolean;
 }) {
   const [open, setOpen] = useState(false);
@@ -131,6 +132,11 @@ export function CloudUserMenu(props: {
                   {props.workspaceId.slice(0, 8)}…
                 </button>
               ) : null}
+              {props.planId ? (
+                <span className="mt-1 inline-flex items-center rounded-md bg-brand-blue/10 px-1.5 py-0.5 text-[10px] font-semibold capitalize text-brand-blue">
+                  {props.planId}
+                </span>
+              ) : null}
             </div>
           </div>
         )}
@@ -194,6 +200,16 @@ export function CloudUserMenu(props: {
                 <p className="mt-1 text-[10px] text-slate-400">Not available</p>
               )}
             </div>
+            {props.planId ? (
+              <div className="border-t border-slate-100 pt-2">
+                <p className="text-[10px] font-medium uppercase tracking-wider text-slate-400">Plan</p>
+                <div className="mt-1 flex items-center gap-1.5">
+                  <span className="inline-flex items-center rounded-md bg-brand-blue/10 px-1.5 py-0.5 text-[10px] font-semibold capitalize text-brand-blue">
+                    {props.planId}
+                  </span>
+                </div>
+              </div>
+            ) : null}
           </div>
         </div>
       )}

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/dashboard/src/guard-api.ts

@@ -1200,6 +1200,7 @@ export function buildDemoRuntimeSnapshot(): GuardRuntimeSnapshot {
         avatar_url: "",
       },
       workspace_id: "demo-workspace-282f6ff2",
+      plan_id: "team",
       dashboard_url: dashboardUrl,
       inbox_url: inboxUrl,
       fleet_url: fleetUrl,

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/dashboard/src/guard-types.ts

@@ -246,6 +246,7 @@ export type GuardCloudPairingState = {
   sync_configured: boolean;
   cloud_user_profile?: GuardCloudUserProfile | null;
   workspace_id?: string | null;
+  plan_id: string | null;
   dashboard_url: string;
   inbox_url: string;
   fleet_url: string;

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "plugin-scanner"
-version = "2.0.1032"
+version = "2.0.1034"
 description = "Protect local AI harnesses with HOL Guard and run scanner checks for Codex, Claude, Cursor, Gemini, OpenCode, and Pi."
 readme = "README.md"
 license = "Apache-2.0"

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/pyproject.toml.bak

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hol-guard"
-version = "2.0.1032"
+version = "2.0.1034"
 description = "Protect local AI harnesses with HOL Guard and run scanner checks for Codex, Claude, Cursor, Gemini, OpenCode, and Pi."
 readme = "README.md"
 license = "Apache-2.0"

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/src/codex_plugin_scanner/guard/adapters/codex.py

@@ -138,10 +138,6 @@ _MANAGED_HOOK_STATUS_MESSAGE = "HOL Guard checking tool action"
 _MANAGED_PROMPT_HOOK_STATUS_MESSAGE = "HOL Guard checking prompt"
 _MANAGED_PERMISSION_HOOK_STATUS_MESSAGE = "HOL Guard checking Codex approval request"
 _MANAGED_POST_TOOL_HOOK_STATUS_MESSAGE = "HOL Guard checking tool result"
-_MANAGED_HOOK_TIMEOUT_SECONDS = 30
-_MANAGED_HOOK_TIMEOUT_GRACE_SECONDS = 5
-_CODEX_GUARD_TOOL_MATCHER = "Bash|Read|Write|Edit|MultiEdit|^apply_patch$|mcp__.*"
-_CODEX_GUARD_PERMISSION_MATCHER = "Bash|Read|Write|Edit|MultiEdit|^apply_patch$|mcp__.*"
 _LEGACY_MANAGED_HOOK_STATUS_MESSAGES = {
     "HOL Guard checking Bash command",
     _MANAGED_HOOK_STATUS_MESSAGE,
@@ -149,8 +145,22 @@ _LEGACY_MANAGED_HOOK_STATUS_MESSAGES = {
     _MANAGED_PERMISSION_HOOK_STATUS_MESSAGE,
     _MANAGED_POST_TOOL_HOOK_STATUS_MESSAGE,
 }
+_MANAGED_HOOK_TIMEOUT_SECONDS = 30
+_MANAGED_HOOK_TIMEOUT_GRACE_SECONDS = 5
+_CODEX_GUARD_TOOL_MATCHER = "Bash|Read|Write|Edit|MultiEdit|^apply_patch$|mcp__.*"
+_CODEX_GUARD_PERMISSION_MATCHER = "Bash|Read|Write|Edit|MultiEdit|^apply_patch$|mcp__.*"
 _SHELL_GUARD_BEGIN = "# >>> HOL Guard Codex shell guard >>>"
 _SHELL_GUARD_END = "# <<< HOL Guard Codex shell guard <<<"
+_DAEMON_BRIDGE_PATH_SUFFIX = (
+    "codex_plugin_scanner",
+    "guard",
+    "adapters",
+    "codex_daemon_hook_bridge.py",
+)
+_GUARD_INSTALL_PATH_SEGMENTS = (
+    ("uv", "tools", "hol-guard"),
+    ("pipx", "venvs", "hol-guard"),
+)
 
 
 def _json_object(path: Path) -> dict[str, object]:
@@ -320,13 +330,17 @@ def _managed_hook_groups(context: HarnessContext) -> dict[str, dict[str, object]
     }
 
 
-def _is_managed_hook_command(command: object) -> bool:
+def _split_hook_command(command: object) -> list[str] | None:
     if not isinstance(command, str):
-        return False
+        return None
     try:
         tokens = shlex.split(command)
     except ValueError:
-        return False
+        return None
+    return tokens
+
+
+def _tokens_are_managed_hook_command(tokens: list[str]) -> bool:
     if tokens and Path(tokens[0]).name == "hol-guard-codex-hook.sh":
         return True
     if len(tokens) < 2:
@@ -334,30 +348,147 @@ def _is_managed_hook_command(command: object) -> bool:
     executable = Path(tokens[0]).name.lower()
     if not executable.startswith("python"):
         return False
-    managed_bridge_path = Path(__file__).with_name("codex_daemon_hook_bridge.py").resolve()
-    if Path(tokens[1]).resolve() == managed_bridge_path:
+    if _is_daemon_bridge_hook_command(tokens):
         return True
     if len(tokens) < 3:
         return False
-    if tokens[1] == "-m":
-        if len(tokens) < 5:
+    if _argv_is_direct_codex_hook(tokens):
+        return True
+    return bool(_argv_is_inline_codex_hook(tokens))
+
+
+def _is_managed_hook_command(command: object) -> bool:
+    tokens = _split_hook_command(command)
+    if tokens is None:
+        return False
+    return _tokens_are_managed_hook_command(tokens)
+
+
+def _python_script_and_args(tokens: list[str]) -> tuple[str, list[str]] | None:
+    """Return (script_path, remaining_args) after a python executable and its flags."""
+    if not tokens or not Path(tokens[0]).name.lower().startswith("python"):
+        return None
+    index = 1
+    while index < len(tokens):
+        token = tokens[index]
+        if token in {"-c", "-m"}:
+            return None
+        if token.startswith("-"):
+            # Flags that consume a following argument (e.g. -W error, -X faulthandler).
+            if token in {"-W", "-X", "-Q"} and index + 1 < len(tokens):
+                index += 2
+                continue
+            index += 1
+            continue
+        return token, tokens[index + 1 :]
+    return None
+
+
+def _is_daemon_bridge_hook_command(tokens: list[str]) -> bool:
+    script_and_args = _python_script_and_args(tokens)
+    if script_and_args is None:
+        return False
+    script_path, remaining = script_and_args
+    managed_bridge_path = Path(__file__).with_name("codex_daemon_hook_bridge.py").resolve()
+    try:
+        if Path(script_path).resolve() == managed_bridge_path:
+            return True
+    except OSError:
+        pass
+    bridge_path = Path(script_path)
+    return (
+        len(remaining) >= 1
+        and bridge_path.parts[-len(_DAEMON_BRIDGE_PATH_SUFFIX) :] == _DAEMON_BRIDGE_PATH_SUFFIX
+        and _bridge_config_targets_codex(remaining[0])
+    )
+
+
+def _tokens_are_unambiguously_managed_hook_command(tokens: list[str]) -> bool:
+    """Return True for hook commands that only Guard installs.
+
+    Direct ``python -m codex_plugin_scanner.cli guard hook`` entries are ambiguous:
+    a user can hand-author the same command. Bridge paths and the shell wrapper are
+    unique to Guard installs and can be reclaimed without a statusMessage marker.
+    """
+    if tokens and Path(tokens[0]).name == "hol-guard-codex-hook.sh":
+        return True
+    if len(tokens) < 2:
+        return False
+    executable = Path(tokens[0]).name.lower()
+    if not executable.startswith("python"):
+        return False
+    return _is_daemon_bridge_hook_command(tokens)
+
+
+def _is_unambiguously_managed_hook_command(command: object) -> bool:
+    tokens = _split_hook_command(command)
+    if tokens is None:
+        return False
+    return _tokens_are_unambiguously_managed_hook_command(tokens)
+
+
+def _bridge_config_targets_codex(config_text: str) -> bool:
+    try:
+        config_value: object = json.loads(config_text)
+    except json.JSONDecodeError:
+        return False
+    if not isinstance(config_value, dict):
+        return False
+    config = {key: value for key, value in config_value.items() if isinstance(key, str)}
+    fallback_value = config.get("fallback_command")
+    if not isinstance(fallback_value, list) or not all(isinstance(token, str) for token in fallback_value):
+        return False
+    fallback_command = [token for token in fallback_value if isinstance(token, str)]
+    return _argv_is_direct_codex_hook(fallback_command)
+
+
+def _argv_is_direct_codex_hook(tokens: list[str]) -> bool:
+    if not tokens or not Path(tokens[0]).name.lower().startswith("python"):
+        return False
+    for index, token in enumerate(tokens[1:], start=1):
+        if token == "-c":
+            return False
+        if token != "-m":
+            continue
+        if index + 3 >= len(tokens):
             return False
         return (
-            tokens[2] == "codex_plugin_scanner.cli"
-            and tokens[3] == "guard"
-            and tokens[4] == "hook"
-            and _argv_targets_codex(tokens[5:])
+            tokens[index + 1] == "codex_plugin_scanner.cli"
+            and tokens[index + 2] == "guard"
+            and tokens[index + 3] == "hook"
+            and _argv_targets_codex(tokens[index + 4 :])
         )
-    if tokens[1] != "-c":
+    return False
+
+
+def _argv_is_inline_codex_hook(tokens: list[str]) -> bool:
+    if not tokens or not Path(tokens[0]).name.lower().startswith("python"):
         return False
-    code = tokens[2]
-    has_guard_call = (
-        re.search(r"['\"]guard['\"]", code) is not None
-        and re.search(r"['\"]hook['\"]", code) is not None
-        and re.search(r"['\"]--harness['\"]", code) is not None
-        and re.search(r"['\"]codex['\"]", code) is not None
+    for index, token in enumerate(tokens[1:], start=1):
+        if token == "-m":
+            return False
+        if token != "-c":
+            continue
+        if index + 1 >= len(tokens):
+            return False
+        code = tokens[index + 1]
+        has_guard_call = (
+            re.search(r"['\"]guard['\"]", code) is not None
+            and re.search(r"['\"]hook['\"]", code) is not None
+            and re.search(r"['\"]--harness['\"]", code) is not None
+            and re.search(r"['\"]codex['\"]", code) is not None
+        )
+        return "codex_plugin_scanner.cli" in code and "main([" in code and has_guard_call
+    return False
+
+
+def _python_executable_is_guard_install(executable: str) -> bool:
+    """True when the interpreter path is a Guard pipx/uv install, not a substring lookalike."""
+    parts = tuple(part.lower() for part in Path(executable).parts)
+    return any(
+        any(parts[index : index + len(segment)] == segment for index in range(len(parts) - len(segment) + 1))
+        for segment in _GUARD_INSTALL_PATH_SEGMENTS
     )
-    return "codex_plugin_scanner.cli" in code and "main([" in code and has_guard_call
 
 
 def _argv_targets_codex(argv: list[str]) -> bool:
@@ -381,9 +512,23 @@ def _is_managed_hook_group(group: object) -> bool:
 def _is_managed_hook_entry(entry: object) -> bool:
     if not isinstance(entry, dict):
         return False
+    if entry.get("type") != "command":
+        return False
+    tokens = _split_hook_command(entry.get("command"))
+    if tokens is None or not _tokens_are_managed_hook_command(tokens):
+        return False
+    # Bridge/wrapper commands are uniquely Guard-owned.
+    if _tokens_are_unambiguously_managed_hook_command(tokens):
+        return True
     status_message = entry.get("statusMessage")
-    has_managed_status = isinstance(status_message, str) and status_message in _LEGACY_MANAGED_HOOK_STATUS_MESSAGES
-    return entry.get("type") == "command" and has_managed_status and _is_managed_hook_command(entry.get("command"))
+    if isinstance(status_message, str) and status_message in _LEGACY_MANAGED_HOOK_STATUS_MESSAGES:
+        return True
+    # Intentional: direct Guard CLI hooks under pipx/uv hol-guard installs are reclaimed even
+    # without statusMessage. Stale PostToolUse installs often drop the marker while keeping the
+    # same python -m codex_plugin_scanner.cli path; leaving them breaks Codex JSON parsing.
+    # Hand-authored hooks that intentionally use that same Guard interpreter are treated as
+    # managed so repair can replace them with the daemon bridge.
+    return _python_executable_is_guard_install(tokens[0])
 
 
 def _remove_managed_hook_entries(group: object) -> object | None:

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/src/codex_plugin_scanner/guard/approvals.py

@@ -1390,12 +1390,16 @@ def _build_runtime_cloud_context(
         connect_retry_required=connect_retry_required,
         connect_retry_refresh_race=connect_retry_refresh_race,
     )
-    oauth_credentials = store.get_oauth_local_credentials()
+    oauth_credentials = store.get_oauth_local_credentials(allow_primary=True)
     cloud_user_profile: dict[str, str] | None = None
+    cloud_plan_id: str | None = None
     if isinstance(oauth_credentials, dict):
         raw_profile = oauth_credentials.get("cloud_user_profile")
         if isinstance(raw_profile, dict):
             cloud_user_profile = {str(k): str(v) for k, v in raw_profile.items()}
+        raw_plan_id = oauth_credentials.get("supply_chain_plan_id")
+        if isinstance(raw_plan_id, str) and raw_plan_id:
+            cloud_plan_id = raw_plan_id
     cloud_workspace_id = store.get_cloud_workspace_id()
     return {
         "sync_configured": cloud_profile is not None,
@@ -1424,6 +1428,7 @@ def _build_runtime_cloud_context(
             "sync_configured": cloud_profile is not None,
             "cloud_user_profile": cloud_user_profile,
             "workspace_id": cloud_workspace_id,
+            "plan_id": cloud_plan_id,
             "dashboard_url": dashboard_url,
             "inbox_url": inbox_url,
             "fleet_url": fleet_url,

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/src/codex_plugin_scanner/guard/daemon/static/assets/guard-dashboard.js

@@ -15949,6 +15949,7 @@ function buildDemoRuntimeSnapshot() {
         avatar_url: ""
       },
       workspace_id: "demo-workspace-282f6ff2",
+      plan_id: "team",
       dashboard_url: dashboardUrl,
       inbox_url: inboxUrl,
       fleet_url: fleetUrl,
@@ -17626,7 +17627,8 @@ function CloudUserMenu(props) {
                   "…"
                 ]
               }
-            ) : null
+            ) : null,
+            props.planId ? /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "mt-1 inline-flex items-center rounded-md bg-brand-blue/10 px-1.5 py-0.5 text-[10px] font-semibold capitalize text-brand-blue", children: props.planId }) : null
           ] })
         }
       )
@@ -17682,7 +17684,11 @@ function CloudUserMenu(props) {
             ]
           }
         ) : /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "mt-1 text-[10px] text-slate-400", children: "Not available" })
-      ] })
+      ] }),
+      props.planId ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "border-t border-slate-100 pt-2", children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-[10px] font-medium uppercase tracking-wider text-slate-400", children: "Plan" }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "mt-1 flex items-center gap-1.5", children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "inline-flex items-center rounded-md bg-brand-blue/10 px-1.5 py-0.5 text-[10px] font-semibold capitalize text-brand-blue", children: props.planId }) })
+      ] }) : null
     ] }) })
   ] });
 }
@@ -17851,6 +17857,7 @@ function ShellSidebar(props) {
           {
             userProfile: props.cloudUserProfile,
             workspaceId: props.workspaceId,
+            planId: props.planId,
             collapsed
           }
         ) }) : null,
@@ -25827,7 +25834,8 @@ function ApprovalCenterLayout(props) {
         onUpdateGuard,
         onReinstallGuard,
         cloudUserProfile: props.runtime.kind === "ready" ? props.runtime.snapshot.cloud_user_profile : null,
-        workspaceId: props.runtime.kind === "ready" ? props.runtime.snapshot.cloud_pairing_state.workspace_id ?? null : null
+        workspaceId: props.runtime.kind === "ready" ? props.runtime.snapshot.cloud_pairing_state.workspace_id ?? null : null,
+        planId: props.runtime.kind === "ready" ? props.runtime.snapshot.cloud_pairing_state.plan_id ?? null : null
       }
     ),
     /* @__PURE__ */ jsxRuntimeExports.jsxs(

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/src/codex_plugin_scanner/version.py

@@ -1,3 +1,3 @@
 """Single source of truth for tool version."""
 
-__version__ = "2.0.1032"
+__version__ = "2.0.1034"

{plugin_scanner-2.0.1032 → plugin_scanner-2.0.1034}/tests/test_codex_daemon_hook_bridge.py

@@ -155,6 +155,31 @@ def test_malformed_daemon_and_fallback_outputs_fail_closed(
     assert output["hookSpecificOutput"]["permissionDecision"] == "deny"
 
 
+def test_post_tool_use_stdout_is_exactly_one_json_object_with_noisy_fallback(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    guard_home = tmp_path / "guard-home"
+    guard_home.mkdir()
+    config = _bridge_config(guard_home, 1)
+    config["fallback_command"] = [
+        sys.executable,
+        "-c",
+        "print('Guard integrity warning'); print('{\"continue\": true}')",
+    ]
+    monkeypatch.setattr("sys.stdin", io.StringIO(json.dumps({"hook_event_name": "PostToolUse"})))
+
+    exit_code = bridge.main(**config)
+
+    captured = capsys.readouterr()
+    output = json.loads(captured.out)
+    assert exit_code == 0
+    assert output["continue"] is False
+    assert captured.out == json.dumps(output, separators=(",", ":"))
+    assert captured.err == ""
+
+
 def test_unavailable_daemon_preserves_local_fallback_denial(
     tmp_path: Path,
     monkeypatch: pytest.MonkeyPatch,