plugin-scanner 2.0.941__tar.gz → 2.0.944__tar.gz

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plugin-scanner
-Version: 2.0.941
+Version: 2.0.944
 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.941 → plugin_scanner-2.0.944}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "plugin-scanner"
-version = "2.0.941"
+version = "2.0.944"
 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.941 → plugin_scanner-2.0.944}/pyproject.toml.bak

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hol-guard"
-version = "2.0.941"
+version = "2.0.944"
 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.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/approvals.py

@@ -559,6 +559,11 @@ def apply_approval_resolution(
             decision,
             expires_at=_approval_once_policy_expires_at(resolved_at),
         )
+        store.ensure_policy_integrity_ready_for_write(
+            harness=once_decision.harness if once_decision.harness != "*" else None,
+            approval_gate_grant=resolved_gate_grant,
+            now=resolved_at,
+        )
         store.upsert_policy(
             once_decision,
             resolved_at,

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/cli/commands_dispatch_cloud.py

@@ -408,7 +408,14 @@ def _run_guard_supply_chain_command(
         return exit_code
     if supply_chain_command == "sync":
         try:
-            payload = _validated_supply_chain_sync_payload(sync_supply_chain_bundle(store))
+            auth_context = _cloud_guard_sync_auth_context(store)
+            payload = _validated_supply_chain_sync_payload(
+                sync_supply_chain_cloud_state(
+                    store,
+                    auth_context=auth_context,
+                    workspace_dir=workspace_dir,
+                )
+            )
         except (GuardSyncAuthorizationExpiredError, GuardSyncNotConfiguredError) as error:
             message = _guard_sync_failure_message(error)
             if getattr(args, "json", False):
@@ -416,6 +423,12 @@ def _run_guard_supply_chain_command(
             else:
                 print(message, file=sys.stderr)
             return 1
+        except GuardSyncNotAvailableError as error:
+            if getattr(args, "json", False):
+                _emit("supply-chain-sync", {"synced": False, "error": str(error)}, True)
+            else:
+                print(str(error), file=sys.stderr)
+            return 1
         except RuntimeError as error:
             if getattr(args, "json", False):
                 _emit("supply-chain-sync", {"synced": False, "error": str(error)}, True)

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/cli/commands_dispatch_records.py

@@ -323,6 +323,7 @@ def _run_guard_policies_command(
     if policies_command == "clear":
         harness = getattr(args, "harness", None)
         clear_all = bool(getattr(args, "all", False))
+        decision_ids = [int(value) for value in (getattr(args, "decision_ids", None) or [])]
         if clear_all and harness is not None:
             _emit(
                 "policies",
@@ -335,11 +336,11 @@ def _run_guard_policies_command(
                 getattr(args, "json", False),
             )
             return 2
-        if not clear_all and harness is None:
+        if not decision_ids and not clear_all and harness is None:
             _emit(
                 "policies",
                 {
-                    "error": "Choose --harness <name> or --all when clearing Guard rules.",
+                    "error": "Choose --decision-id <id>, --harness <name>, or --all when clearing Guard rules.",
                     "cleared": 0,
                 },
                 getattr(args, "json", False),
@@ -363,6 +364,7 @@ def _run_guard_policies_command(
                 scope=scope,
                 artifact_id=artifact_id,
                 artifact_hash=policy_artifact_hash,
+                decision_ids=set(decision_ids) if decision_ids else None,
                 workspace=str(policy_workspace) if isinstance(policy_workspace, Path) else policy_workspace,
                 publisher=publisher,
                 approval_gate_grant=approval_gate_grant,
@@ -380,6 +382,7 @@ def _run_guard_policies_command(
                 "scope": scope,
                 "artifact_id": artifact_id,
                 "artifact_hash": policy_artifact_hash,
+                "decision_ids": decision_ids,
                 "workspace": policy_workspace,
                 "publisher": publisher,
             },

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/cli/commands_parser_policy.py

@@ -40,7 +40,10 @@ def _configure_guard_policy_parsers(
         dest="decision_ids",
         action="append",
         type=int,
-        help="Policy decision ID to preserve during migrate-local-integrity; repeat to keep multiple rows",
+        help=(
+            "Policy decision ID to clear or preserve during migrate-local-integrity; "
+            "repeat to target multiple rows"
+        ),
     )
     policies_parser.add_argument(
         "--preserve-all-local",

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/cli/protect_approvals.py

@@ -84,9 +84,11 @@ def _queue_local_protect_approvals(
 def _should_queue_local_protect_approval(response_payload: dict[str, object]) -> bool:
     if os.environ.get(SHIM_PROBE_ENV_VAR) == SHIM_PROBE_ENV_VALUE:
         return False
-    if os.environ.get("PYTEST_CURRENT_TEST") and os.environ.get("HOL_GUARD_TEST_SKIP_LOCAL_APPROVAL_QUEUE") == "1":
+    if _protect_has_reason_code(response_payload, "saved_package_block"):
         return False
-    return not _protect_has_reason_code(response_payload, "saved_package_block")
+    return not (
+        os.environ.get("PYTEST_CURRENT_TEST") and os.environ.get("HOL_GUARD_TEST_SKIP_LOCAL_APPROVAL_QUEUE") == "1"
+    )
 
 
 def _protect_request_artifact(response_payload: dict[str, object], *, workspace: Path) -> GuardArtifact | None:

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/local_supply_chain.py

@@ -1432,19 +1432,65 @@ def _apply_stored_package_policy_override(
             reason_message="HOL Guard reused your saved approval for this package request.",
         )
     if action == "block":
+        clear_command = _saved_package_policy_clear_command(
+            artifact=artifact,
+            artifact_hash=artifact_hash,
+            matched_policy=decision,
+            workspace_dir=workspace_dir,
+        )
         return _package_policy_override_evaluation(
             evaluation,
             decision="block",
             policy_action="block",
             title="Blocked by saved policy",
             summary="HOL Guard kept this package blocked because a saved package policy already exists.",
-            harness_message="HOL Guard kept this package blocked because a saved package policy already exists.",
+            harness_message=(
+                "HOL Guard kept this package blocked because a saved package policy already exists. "
+                f"To reconsider, run `{clear_command}`, then retry the install."
+            ),
+            next_step=clear_command,
             reason_code="saved_package_block",
             reason_message="HOL Guard kept this package blocked because a saved package policy already exists.",
         )
     return evaluation
 
 
+def _saved_package_policy_clear_command(
+    *,
+    artifact: GuardArtifact,
+    artifact_hash: str,
+    matched_policy: dict[str, object],
+    workspace_dir: Path,
+) -> str:
+    scope = _string_value(matched_policy.get("scope")) or "artifact"
+    command = [
+        "hol-guard",
+        "policies",
+        "clear",
+    ]
+    decision_id = matched_policy.get("decision_id")
+    if isinstance(decision_id, int):
+        command.extend(("--decision-id", str(decision_id)))
+    command.extend(("--harness", _string_value(matched_policy.get("harness")) or artifact.harness, "--scope", scope))
+    artifact_id = _string_value(matched_policy.get("artifact_id"))
+    if artifact_id is None and scope in {"artifact", "workspace", "harness", "global"}:
+        artifact_id = artifact.artifact_id
+    if artifact_id is not None:
+        command.extend(("--artifact-id", artifact_id))
+    matched_hash = _string_value(matched_policy.get("artifact_hash"))
+    if matched_hash is not None:
+        command.extend(("--artifact-hash", matched_hash))
+    policy_workspace = _string_value(matched_policy.get("workspace"))
+    if policy_workspace is None and scope in {"artifact", "workspace"}:
+        policy_workspace = str(workspace_dir)
+    if policy_workspace is not None:
+        command.extend(("--policy-workspace", policy_workspace))
+    publisher = _string_value(matched_policy.get("publisher"))
+    if publisher is not None:
+        command.extend(("--publisher", publisher))
+    return shlex.join(command)
+
+
 def recompute_package_protect_artifact_hash(
     command: Sequence[str],
     *,
@@ -1619,6 +1665,7 @@ def _package_policy_override_evaluation(
     title: str,
     summary: str,
     harness_message: str,
+    next_step: str | None = None,
     reason_code: str,
     reason_message: str,
 ) -> Any:
@@ -1639,7 +1686,7 @@ def _package_policy_override_evaluation(
         user_copy=_supply_chain_package_eval_module().SupplyChainUserCopy(
             title=title,
             summary=summary,
-            next_step=None,
+            next_step=next_step,
             dashboard_url=None,
             harness_message=harness_message,
         ),
@@ -2597,6 +2644,7 @@ def sync_managed_workspace_audits(
     workspaces_payload: list[dict[str, object]] = []
     completed_jobs = 0
     failed_jobs = 0
+    incomplete_jobs = 0
     queued_jobs = 0
     skipped_workspaces = 0
     for candidate in _managed_workspace_audit_candidates(store, workspace_dir=workspace_dir):
@@ -2641,22 +2689,40 @@ def sync_managed_workspace_audits(
             final_status = (
                 str(final_response.get("status") or enqueue_response.get("status") or "queued").strip().lower()
             )
-            if final_status == "completed":
-                completed_jobs += 1
-            elif final_status == "failed":
-                failed_jobs += 1
+            cloud_visible_count = _int_value(final_response.get("totalPackages"))
+            cloud_processed_count = _int_value(final_response.get("processedCount"))
+            incomplete_cloud_projection = (
+                final_status == "completed" and cloud_visible_count is not None and cloud_visible_count < len(inventory)
+            )
+            if incomplete_cloud_projection:
+                incomplete_jobs += 1
+                workspace_status = "partial"
             else:
-                queued_jobs += 1
+                workspace_status = final_status
+                if final_status == "completed":
+                    completed_jobs += 1
+                elif final_status == "failed":
+                    failed_jobs += 1
+                else:
+                    queued_jobs += 1
+            message = final_response.get("error")
+            if incomplete_cloud_projection:
+                message = (
+                    "Guard Cloud accepted fewer package rows than hol-guard discovered "
+                    f"({cloud_visible_count} of {len(inventory)} visible)."
+                )
             workspaces_payload.append(
                 {
                     "workspace": workspace_label,
                     "workspace_fingerprint": request_payload.get("workspaceFingerprint"),
                     "job_id": job_id,
-                    "status": final_status,
+                    "status": workspace_status,
                     "package_count": len(inventory),
+                    "cloud_processed_count": cloud_processed_count,
+                    "cloud_visible_count": cloud_visible_count,
                     "manifest_paths": list(manifest_paths),
                     "lockfile_paths": list(lockfile_paths),
-                    "message": final_response.get("error"),
+                    "message": message,
                 }
             )
         except (
@@ -2675,9 +2741,9 @@ def sync_managed_workspace_audits(
                     "package_count": 0,
                 }
             )
-    if failed_jobs > 0 and completed_jobs == 0 and queued_jobs == 0:
+    if failed_jobs > 0 and completed_jobs == 0 and queued_jobs == 0 and incomplete_jobs == 0:
         status = "failed"
-    elif failed_jobs > 0:
+    elif failed_jobs > 0 or incomplete_jobs > 0:
         status = "partial"
     elif completed_jobs > 0 or queued_jobs > 0:
         status = "synced"
@@ -2690,6 +2756,7 @@ def sync_managed_workspace_audits(
         "completed_jobs": completed_jobs,
         "queued_jobs": queued_jobs,
         "failed_jobs": failed_jobs,
+        "incomplete_jobs": incomplete_jobs,
         "skipped_workspaces": skipped_workspaces,
         "workspaces": workspaces_payload,
     }

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/runtime/command_executors.py

@@ -16,7 +16,7 @@ from ..cli.install_commands import (
     list_harness_setup_items,
     uninstall_confirmation_token,
 )
-from ..config import load_guard_config
+from ..config import VALID_RECEIPT_REDACTION_LEVELS, load_guard_config
 from ..local_supply_chain import (
     build_workspace_audit_payload,
     managed_install_audit_workspace_dirs,
@@ -25,6 +25,7 @@ from ..local_supply_chain import (
 )
 from ..models import DECISION_SCOPE_VALUES, GUARD_ACTION_VALUES, DecisionScope, GuardAction, PolicyDecision
 from ..package_shim_status import record_package_shim_audit_result
+from ..redaction import redact_text
 from ..review_contracts import (
     GuardReviewContractError,
     build_local_review_request_claim,
@@ -418,6 +419,7 @@ def _is_guard_action(value: object) -> TypeGuard[GuardAction]:
 
 def _local_request_snapshot_items(store: GuardStore) -> list[dict[str, object]]:
     items: list[dict[str, object]] = []
+    redaction_level = _resolve_cloud_receipt_redaction_level(store)
     try:
         oauth = guard_review_oauth_metadata(store)
     except GuardReviewContractError:
@@ -445,7 +447,10 @@ def _local_request_snapshot_items(store: GuardStore) -> list[dict[str, object]]:
                     "claim": claim,
                     "localRequestId": request_id,
                     "requestKind": str(item.get("harness") or "guard-review"),
-                    "requestPayload": dict(item),
+                    "requestPayload": _cloud_safe_local_request_payload(
+                        item,
+                        redaction_level=redaction_level,
+                    ),
                     "localStatus": str(item.get("status") or status),
                     "firstSeenAt": created_at,
                     "lastSeenAt": last_seen_at,
@@ -455,6 +460,127 @@ def _local_request_snapshot_items(store: GuardStore) -> list[dict[str, object]]:
     return items[:200]
 
 
+def _resolve_cloud_receipt_redaction_level(store: GuardStore) -> str:
+    payload = store.get_sync_payload("cloud_receipt_redaction_level")
+    if isinstance(payload, dict):
+        level = payload.get("level")
+        if isinstance(level, str) and level in VALID_RECEIPT_REDACTION_LEVELS:
+            return level
+    try:
+        config = load_guard_config(store.guard_home)
+        if config.receipt_redaction_level in VALID_RECEIPT_REDACTION_LEVELS:
+            return config.receipt_redaction_level
+    except Exception:
+        pass
+    return "full"
+
+
+def _optional_payload_mapping(value: object) -> dict[str, object] | None:
+    return dict(value) if isinstance(value, dict) else None
+
+
+def _cloud_safe_local_request_payload(
+    item: dict[str, object],
+    *,
+    redaction_level: str,
+) -> dict[str, object]:
+    payload: dict[str, object] = {}
+    for key in (
+        "request_id",
+        "status",
+        "harness",
+        "artifact_id",
+        "artifact_hash",
+        "policy_action",
+        "recommended_scope",
+        "created_at",
+        "last_seen_at",
+        "queue_group_id",
+        "review_kind",
+        "risk_category",
+        "capability_category",
+        "publisher",
+        "package_manager",
+        "package_name",
+    ):
+        value = item.get(key)
+        if isinstance(value, (str, int, float, bool)) or value is None:
+            payload[key] = value
+
+    envelope = _optional_payload_mapping(item.get("action_envelope_json"))
+    safe_envelope = _cloud_safe_action_envelope(envelope, redaction_level=redaction_level)
+    if safe_envelope is not None:
+        payload["action_envelope_json"] = safe_envelope
+
+    if redaction_level == "full":
+        payload["raw_command_text"] = None
+        payload["command_text"] = None
+        return payload
+
+    command_text = _local_request_command_text(item, envelope)
+    if command_text:
+        scrubbed = redact_text(command_text).text
+        payload["raw_command_text"] = scrubbed
+        payload["command_text"] = scrubbed
+        payload_envelope = payload.get("action_envelope_json")
+        if isinstance(payload_envelope, dict):
+            payload_envelope["command"] = scrubbed
+    return payload
+
+
+def _local_request_command_text(
+    payload: dict[str, object],
+    envelope: dict[str, object] | None,
+) -> str | None:
+    for key in ("raw_command_text", "rawCommandText", "command_text", "commandText"):
+        value = payload.get(key)
+        if isinstance(value, str) and value.strip():
+            return value.strip()
+    if envelope is None:
+        return None
+    command = envelope.get("command")
+    return command.strip() if isinstance(command, str) and command.strip() else None
+
+
+def _cloud_safe_action_envelope(
+    envelope: dict[str, object] | None,
+    *,
+    redaction_level: str,
+) -> dict[str, object] | None:
+    if envelope is None:
+        return None
+    safe: dict[str, object] = {}
+    for key in (
+        "schema_version",
+        "action_id",
+        "harness",
+        "event_name",
+        "action_type",
+        "workspace_hash",
+        "tool_name",
+        "mcp_server",
+        "mcp_tool",
+        "target_path_count",
+        "network_host_count",
+        "package_manager",
+    ):
+        value = envelope.get(key)
+        if isinstance(value, (str, int, float, bool)) or value is None:
+            safe[key] = value
+    if redaction_level != "full":
+        command = envelope.get("command")
+        if isinstance(command, str) and command.strip():
+            safe["command"] = redact_text(command).text
+    if redaction_level == "none":
+        for key in ("target_paths", "network_hosts", "package_name", "package_targets"):
+            value = envelope.get(key)
+            if isinstance(value, list):
+                safe[key] = [item for item in value if isinstance(item, str)]
+            elif isinstance(value, str):
+                safe[key] = value
+    return safe or None
+
+
 def _package_shim_context(
     payload: dict[str, object],
     *,

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/runtime/runner.py

@@ -1055,6 +1055,46 @@ def _policy_bundle_rule_matcher_families(rule: dict[str, object]) -> list[str]:
     return list(dict.fromkeys(family for family in derived if family in POLICY_BUNDLE_RULE_MATCHER_FAMILIES))
 
 
+def _policy_bundle_rule_saved_decision_families(rule: dict[str, object]) -> list[str]:
+    """Return rule families that can be represented without broadening scope.
+
+    Package-request bundle rules with no package-related scope cannot be
+    represented as local family decisions without becoming "all package
+    installs." Scoped package bundle rules retain the existing runtime
+    family-row behavior.
+    """
+    families = _policy_bundle_rule_matcher_families(rule)
+    if "package-request" not in families:
+        return families
+    if _policy_bundle_rule_has_package_scope(rule):
+        return families
+    return [family for family in families if family != "package-request"]
+
+
+def _policy_bundle_rule_has_package_scope(rule: dict[str, object]) -> bool:
+    artifact_type = non_empty_string(rule.get("artifactType"))
+    if artifact_type == "package_request":
+        return True
+    scope = rule.get("scope")
+    if not isinstance(scope, dict):
+        return False
+    package_scope_keys = (
+        "ecosystems",
+        "packages",
+        "packageNames",
+        "packageManagers",
+        "registries",
+        "sourceUrls",
+    )
+    for key in package_scope_keys:
+        value = scope.get(key)
+        if isinstance(value, list) and value:
+            return True
+        if non_empty_string(value) is not None:
+            return True
+    return False
+
+
 def _policy_bundle_rule_matches_local_scope(
     rule: dict[str, object],
     *,
@@ -1137,7 +1177,7 @@ def _build_policy_bundle_decisions(
             continue
         if _policy_bundle_rule_has_browser_scope(item):
             continue
-        matcher_families = _policy_bundle_rule_matcher_families(item)
+        matcher_families = _policy_bundle_rule_saved_decision_families(item)
         if not matcher_families:
             continue
         rule_id = non_empty_string(item.get("ruleId")) or "bundle-rule"

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/runtime/supply_chain_package_eval.py

@@ -86,6 +86,11 @@ _TARBALL_SCAN_MAX_BYTES = 6 * 1024 * 1024
 _TARBALL_SCAN_MAX_FILES = 500
 _TARBALL_SCAN_MAX_PACKAGE_JSON_BYTES = 256 * 1024
 _CLOUD_VALIDATION_ERROR_CACHE_TTL_SECONDS = 15 * 60
+_REGISTRY_DEFAULT_RANGES = {
+    "npm": "latest",
+    "pypi": ">=0",
+}
+_DIST_TAG_RANGE_ECOSYSTEMS = {"npm"}
 
 
 @dataclass(frozen=True, slots=True)
@@ -1484,13 +1489,19 @@ def _targets_from_artifact(artifact: GuardArtifact) -> tuple[dict[str, object],
             continue
         namespace, name = _split_namespace_name(package_name)
         requested = _optional_string(item.get("requested_specifier"))
-        exact_version = _exact_version(requested)
         raw_spec = _optional_string(item.get("raw_spec")) or package_name
         source_url = _optional_string(item.get("source_url"))
         if source_url is None:
             source_url = _source_url_from_specifier(requested)
         if source_url is None:
             source_url = _source_url_from_raw_spec(raw_spec)
+        if source_url is not None:
+            requested = None
+        if requested is None and source_url is None:
+            requested = _default_registry_range(ecosystem)
+        exact_version = (
+            None if _requested_specifier_is_range(requested, ecosystem=ecosystem) else _exact_version(requested)
+        )
         parsed.append(
             {
                 "ecosystem": ecosystem,
@@ -1570,6 +1581,7 @@ def _build_request_payload(
                 "ecosystem": str(target["ecosystem"]),
                 "name": str(target["name"]),
                 "namespace": target["namespace"],
+                **({"sourceUrl": str(target["source_url"])} if target.get("source_url") else {}),
                 **({"version": str(target["version"])} if target.get("version") else {}),
                 **({"range": str(target["range"])} if target.get("range") else {}),
             }
@@ -3792,6 +3804,21 @@ def _exact_version(value: str | None) -> str | None:
     return normalized
 
 
+def _default_registry_range(ecosystem: str) -> str | None:
+    return _REGISTRY_DEFAULT_RANGES.get(ecosystem)
+
+
+def _requested_specifier_is_range(value: str | None, *, ecosystem: str) -> bool:
+    normalized = _optional_string(value)
+    if normalized is None:
+        return False
+    if _exact_version(normalized) is None:
+        return True
+    if ecosystem not in _DIST_TAG_RANGE_ECOSYSTEMS:
+        return False
+    return re.fullmatch(r"[A-Za-z][A-Za-z0-9_.-]*", normalized) is not None
+
+
 def _optional_string(value: object) -> str | None:
     if isinstance(value, str) and value.strip():
         return value.strip()

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/store_base.py

@@ -665,8 +665,6 @@ class SystemKeyringSecretStore:
     def _supports_native_macos_security_reads(cls) -> bool:
         if sys.platform != "darwin":
             return False
-        if cls._test_keyring_module() is not None:
-            return True
         loader_ref = cls._load_keyring_module
         api_loader_ref = cls._load_macos_keyring_api_module
         cache_key = (id(loader_ref), id(api_loader_ref))
@@ -768,15 +766,22 @@ class SystemKeyringSecretStore:
 
     def get_secret_with_timeout(self, secret_id: str, *, timeout_seconds: float = 0.0) -> str | None:
         _ = timeout_seconds
+        if sys.platform != "darwin" and self._test_keyring_module() is not None:
+            return self.get_secret(secret_id)
         if sys.platform == "darwin":
+            if (
+                self._test_keyring_module() is not None
+                and getattr(type(self)._get_secret_without_macos_ui, "__name__", "") == "_get_secret_without_macos_ui"
+            ):
+                return self.get_secret(secret_id)
             if self._supports_native_macos_security_reads():
                 return self._get_secret_without_macos_ui(secret_id)
+            if self._test_keyring_module() is not None:
+                return self.get_secret(secret_id)
             if self.service_name == _POLICY_INTEGRITY_SERVICE_NAME:
                 # Passive policy-integrity reads must fail closed when native
                 # no-UI access is unavailable.
                 return None
-            if self._test_keyring_module() is not None:
-                return self.get_secret(secret_id)
             return None
         if self._supports_native_macos_security_reads():
             return self._get_secret_without_macos_ui(secret_id)
@@ -1121,6 +1126,8 @@ def _build_oauth_secret_store(guard_home: Path) -> SecretStore:
 
 def _build_policy_integrity_secret_store() -> SystemKeyringSecretStore | None:
     if sys.platform == "darwin":
+        if SystemKeyringSecretStore._test_keyring_module() is not None:
+            return SystemKeyringSecretStore(service_name=_POLICY_INTEGRITY_SERVICE_NAME)
         if not SystemKeyringSecretStore._backend_is_available():
             return None
         if not SystemKeyringSecretStore._supports_native_macos_security_reads():

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/store_policy_integrity_runtime.py

@@ -593,6 +593,7 @@ class StorePolicyIntegrityAdminMixin:
         scope: str | None = None,
         artifact_id: str | None = None,
         artifact_hash: str | None = None,
+        decision_ids: set[int] | None = None,
         artifact_id_is_null: bool = False,
         artifact_hash_is_null: bool = False,
         workspace: str | None = None,
@@ -603,6 +604,12 @@ class StorePolicyIntegrityAdminMixin:
         current_time = _now()
         conditions: list[str] = []
         params: list[object] = []
+        if decision_ids is not None:
+            if not decision_ids:
+                return 0
+            placeholders = ",".join("?" for _ in decision_ids)
+            conditions.append(f"decision_id in ({placeholders})")
+            params.extend(sorted(decision_ids))
         if harness is not None:
             conditions.append("harness = ?")
             params.append(harness)

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/guard/store_secret_policy_integrity.py

@@ -217,6 +217,7 @@ class StoreSecretPolicyIntegrityMixin:
         return (
             isinstance(secret_store, SystemKeyringSecretStore)
             and sys.platform == "darwin"
+            and secret_store._test_keyring_module() is None
             and not secret_store._supports_native_macos_security_reads()
         )
 

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/src/codex_plugin_scanner/version.py

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

{plugin_scanner-2.0.941 → plugin_scanner-2.0.944}/tests/test_guard_approvals.py

@@ -3156,7 +3156,7 @@ class TestGuardApprovals:
 
         assert rc == 2
         assert "Guard rules clear" in output
-        assert "Choose --harness <name> or --all" in output
+        assert "Choose --decision-id <id>, --harness <name>, or --all" in output
 
     def test_guard_policies_list_uses_remembered_rule_copy(self, tmp_path, capsys):
         home_dir = tmp_path / "home"