plugin-scanner 2.0.955__tar.gz → 2.0.957__tar.gz

{plugin_scanner-2.0.955 → plugin_scanner-2.0.957}/PKG-INFO

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

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

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

@@ -281,7 +281,10 @@ def _local_mcp_security_for_artifact(
 ) -> dict[str, object] | None:
     from .inventory_contract import _normalize_inventory_datetime
 
-    if item_kind != "mcp_server" or getattr(artifact, "artifact_type", None) != "mcp_server":
+    if item_kind not in {"mcp_server", "mcp_tool"} or getattr(artifact, "artifact_type", None) not in {
+        "mcp_server",
+        "mcp_tool",
+    }:
         return None
 
     trust_root = _trust_root_for_artifact(artifact, item_kind=item_kind, workspace_dir=workspace_dir)
@@ -342,7 +345,7 @@ def _local_mcp_security_for_artifact(
     metadata_payload["evidenceHash"] = guard_evidence_hash(
         {
             "capturedAt": normalized_captured_at,
-            "entityType": "mcp_server",
+            "entityType": item_kind,
             "findings": findings,
             "provider": "cisco-mcp-scanner",
             "safety": safety,
@@ -352,7 +355,7 @@ def _local_mcp_security_for_artifact(
     )
 
     return {
-        "entityType": "mcp_server",
+        "entityType": item_kind,
         "source": "local_indexed",
         "provider": "cisco-mcp-scanner",
         "status": status,

{plugin_scanner-2.0.955 → plugin_scanner-2.0.957}/src/codex_plugin_scanner/guard/inventory_contract.py

@@ -803,6 +803,12 @@ def _mcp_tool_items_from_artifact(
                 "annotations": safe_annotations,
             }
         )
+        tool_layers = metadata.get("trustLayers")
+        tool_layer_dicts = (
+            [layer for layer in tool_layers if isinstance(layer, dict)] if isinstance(tool_layers, list) else []
+        )
+        if tool_layer_dicts:
+            metadata["trustLayers"] = tool_layer_dicts
         metadata = _apply_tool_trust_attestation_metadata(
             metadata,
             harness=harness,
@@ -810,32 +816,13 @@ def _mcp_tool_items_from_artifact(
             content_hash=semantic_hash,
             trust_attestation_context=trust_attestation_context,
         )
-        tool_layers = metadata.get("trustLayers")
-        signed_tool_layers = list(tool_layers) if isinstance(tool_layers, list) else []
-        normalized_tool_layers: list[dict[str, object]] = []
-        for layer in signed_tool_layers:
-            if isinstance(layer, dict) and layer.get("layerType") == "cisco_mcp_scanner":
-                raw_layer_metadata = layer.get("metadata")
-                layer_metadata = dict(raw_layer_metadata) if isinstance(raw_layer_metadata, dict) else {}
-                normalized_tool_layers.append(
-                    {
-                        **layer,
-                        "metadata": {
-                            **{
-                                key: value
-                                for key, value in layer_metadata.items()
-                                if key not in {"attestation", "attestationBindings"}
-                            },
-                            "attestationStatus": "unsigned",
-                        },
-                    }
-                )
-            elif isinstance(layer, dict):
-                normalized_tool_layers.append(layer)
-        signed_tool_layers = normalized_tool_layers
-        if signed_tool_layers:
-            metadata["trustLayers"] = signed_tool_layers
-        has_tool_cisco_layer = any(layer.get("layerType") == "cisco_mcp_scanner" for layer in signed_tool_layers)
+        signed_tool_layers = metadata.get("trustLayers")
+        tool_layer_dicts = (
+            [layer for layer in signed_tool_layers if isinstance(layer, dict)]
+            if isinstance(signed_tool_layers, list)
+            else []
+        )
+        has_tool_cisco_layer = any(layer.get("layerType") == "cisco_mcp_scanner" for layer in tool_layer_dicts)
         if inherited_layers and not has_tool_cisco_layer:
             inherited_tool_layers: list[dict[str, object]] = []
             for layer in inherited_layers:
@@ -848,14 +835,21 @@ def _mcp_tool_items_from_artifact(
                             **{
                                 key: value
                                 for key, value in layer_metadata.items()
-                                if key not in {"attestation", "attestationBindings"}
+                                if key
+                                not in {
+                                    "attestation",
+                                    "attestationBindings",
+                                    "attestationRef",
+                                    "attestationStatus",
+                                    "attestationVerification",
+                                }
                             },
                             "attestationStatus": "unsigned",
                             "inheritedFromServerItemId": server_item.item_id,
                         },
                     }
                 )
-            metadata["trustLayers"] = [*signed_tool_layers, *inherited_tool_layers]
+            metadata["trustLayers"] = [*tool_layer_dicts, *inherited_tool_layers]
         tool_description = _inventory_item_description_module().resolve_inventory_item_description(
             harness=harness,
             item_kind="mcp_tool",

{plugin_scanner-2.0.955 → plugin_scanner-2.0.957}/src/codex_plugin_scanner/guard/runtime/runner.py

@@ -1309,6 +1309,9 @@ def sync_receipts(
 
     resolved_auth_context = auth_context if auth_context is not None else _resolve_guard_sync_auth_context(store)
     sync_url = _normalized_receipts_sync_url(_validate_guard_sync_url(_auth_context_sync_url(resolved_auth_context)))
+    local_guard_online_at = _now()
+    redaction_level = _resolve_cloud_receipt_redaction_level(store)
+    _ensure_relaxed_receipt_redaction_resync(store, level=redaction_level, synced_at=local_guard_online_at)
     prior_receipt_cursor = _receipt_sync_cursor_rowid(store)
     receipts = _receipt_sync_rows_for_upload(store, cursor_rowid=prior_receipt_cursor)
     inventory = store.list_inventory()
@@ -1324,8 +1327,6 @@ def sync_receipts(
     team_policy_pack_payload: dict[str, object] | None = None
     remote_decisions: set[PolicyDecision] = set()
     device_id, device_name = _guard_device_metadata(store)
-    redaction_level = _resolve_cloud_receipt_redaction_level(store)
-    local_guard_online_at = _now()
     sync_context = _receipt_sync_context(
         store=store,
         local_guard_online_at=local_guard_online_at,
@@ -1488,10 +1489,10 @@ def sync_receipts(
                 else None
             )
             if cloud_redaction_level and cloud_redaction_level in VALID_RECEIPT_REDACTION_LEVELS:
-                store.set_sync_payload(
-                    "cloud_receipt_redaction_level",
-                    {"level": cloud_redaction_level, "updated_at": now},
-                    now,
+                _persist_cloud_receipt_redaction_level(
+                    store,
+                    level=cloud_redaction_level,
+                    synced_at=now,
                 )
             remote_decisions.update(
                 _build_policy_bundle_decisions(
@@ -3933,17 +3934,29 @@ def _persist_receipt_sync_cursor(
     store.set_sync_payload("receipt_sync_cursor", payload, synced_at)
 
 
-def _resolve_cloud_receipt_redaction_level(store: GuardStore) -> str:
-    """Resolve the receipt redaction level for cloud sync.
+_RECEIPT_REDACTION_LEVEL_RANK: dict[str, int] = {
+    "full": 0,
+    "partial": 1,
+    "none": 2,
+}
+_RELAXED_RECEIPT_REDACTION_RESYNC_MARKER = "cloud_receipt_redaction_relaxed_resync_v1"
 
-    Priority: cloud-configured level (from policy bundle downlink) >
-    local GuardConfig.receipt_redaction_level > 'full' (safest).
-    """
+
+def _receipt_redaction_level_rank(level: str | None) -> int:
+    if level is None:
+        return _RECEIPT_REDACTION_LEVEL_RANK["full"]
+    return _RECEIPT_REDACTION_LEVEL_RANK.get(level, _RECEIPT_REDACTION_LEVEL_RANK["full"])
+
+
+def _stored_cloud_receipt_redaction_level(store: GuardStore) -> str | None:
     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
+    if not isinstance(payload, dict):
+        return None
+    level = payload.get("level")
+    return level if isinstance(level, str) and level in VALID_RECEIPT_REDACTION_LEVELS else None
+
+
+def _local_receipt_redaction_level(store: GuardStore) -> str:
     try:
         config = load_guard_config(store.guard_home)
         if config.receipt_redaction_level in VALID_RECEIPT_REDACTION_LEVELS:
@@ -3953,6 +3966,72 @@ def _resolve_cloud_receipt_redaction_level(store: GuardStore) -> str:
     return "full"
 
 
+def _persist_cloud_receipt_redaction_level(store: GuardStore, *, level: str, synced_at: str) -> None:
+    previous_level = _stored_cloud_receipt_redaction_level(store) or _local_receipt_redaction_level(store)
+    if _receipt_redaction_level_rank(level) > _receipt_redaction_level_rank(previous_level):
+        store.set_sync_payload(
+            "receipt_sync_cursor",
+            {
+                "last_rowid": 0,
+                "synced_at": synced_at,
+                "reason": "cloud_receipt_redaction_level_relaxed",
+                "receipt_redaction_level": level,
+            },
+            synced_at,
+        )
+    store.set_sync_payload(
+        "cloud_receipt_redaction_level",
+        {"level": level, "updated_at": synced_at},
+        synced_at,
+    )
+    if _receipt_redaction_level_rank(level) > _receipt_redaction_level_rank("full"):
+        store.set_sync_payload(
+            _RELAXED_RECEIPT_REDACTION_RESYNC_MARKER,
+            {"level": level, "updated_at": synced_at},
+            synced_at,
+        )
+
+
+def _ensure_relaxed_receipt_redaction_resync(
+    store: GuardStore,
+    *,
+    level: str,
+    synced_at: str,
+) -> None:
+    if _receipt_redaction_level_rank(level) <= _receipt_redaction_level_rank("full"):
+        return
+    marker = store.get_sync_payload(_RELAXED_RECEIPT_REDACTION_RESYNC_MARKER)
+    if isinstance(marker, dict) and marker.get("level") == level:
+        return
+    store.set_sync_payload(
+        "receipt_sync_cursor",
+        {
+            "last_rowid": 0,
+            "synced_at": synced_at,
+            "reason": "cloud_receipt_redaction_level_relaxed_existing",
+            "receipt_redaction_level": level,
+        },
+        synced_at,
+    )
+    store.set_sync_payload(
+        _RELAXED_RECEIPT_REDACTION_RESYNC_MARKER,
+        {"level": level, "updated_at": synced_at},
+        synced_at,
+    )
+
+
+def _resolve_cloud_receipt_redaction_level(store: GuardStore) -> str:
+    """Resolve the receipt redaction level for cloud sync.
+
+    Priority: cloud-configured level (from policy bundle downlink) >
+    local GuardConfig.receipt_redaction_level > 'full' (safest).
+    """
+    level = _stored_cloud_receipt_redaction_level(store)
+    if level is not None:
+        return level
+    return _local_receipt_redaction_level(store)
+
+
 def _cloud_sync_command_display_part(value: str) -> str:
     return " ".join(_cloud_sync_sanitize_text(value, fallback="").split())
 

{plugin_scanner-2.0.955 → plugin_scanner-2.0.957}/src/codex_plugin_scanner/integrations/cisco_mcp_scanner.py

@@ -18,7 +18,7 @@ from types import ModuleType
 from typing import Protocol, TypeGuard, TypeVar
 
 from ..models import Finding, Severity, severity_from_value
-from .cisco_skill_scanner import CiscoIntegrationStatus, cisco_runtime_unavailable_message
+from .cisco_skill_scanner import CiscoIntegrationStatus
 
 _EXCLUDED_DIRS = {
     ".codex-plugin",
@@ -67,6 +67,10 @@ class CiscoMcpScanSummary:
     scan_mode: str = "static"
 
 
+def cisco_runtime_unavailable_message() -> str | None:
+    return None
+
+
 @dataclass(frozen=True, slots=True)
 class _StaticScanTarget:
     read_path: Path

{plugin_scanner-2.0.955 → plugin_scanner-2.0.957}/src/codex_plugin_scanner/version.py

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

{plugin_scanner-2.0.955 → plugin_scanner-2.0.957}/tests/test_guard_aibom_trust_metadata.py

@@ -870,6 +870,14 @@ def test_inventory_snapshot_attaches_mcp_tool_trust_resolution(monkeypatch, tmp_
     search_tool = next(item for item in snapshot.items if item.item_id.endswith(":tool:search_docs"))
     delete_tool = next(item for item in snapshot.items if item.item_id.endswith(":tool:delete_docs"))
 
+    search_local_security = search_tool.metadata.get("localSecurity")
+    assert isinstance(search_local_security, dict)
+    assert search_local_security.get("entityType") == "mcp_tool"
+    assert search_local_security.get("provider") == "cisco-mcp-scanner"
+    search_safety = search_local_security.get("safety")
+    assert isinstance(search_safety, dict)
+    assert search_safety.get("score") == 90
+
     search_trust, search_metadata = _assert_local_trust(search_tool.metadata, trust_domain="mcp")
     _delete_trust, delete_metadata = _assert_local_trust(delete_tool.metadata, trust_domain="mcp")
     assert search_metadata.get("evidenceHash") != delete_metadata.get("evidenceHash")
@@ -909,8 +917,28 @@ def test_inventory_snapshot_attaches_mcp_tool_trust_resolution(monkeypatch, tmp_
     )
     cisco_layer_metadata = cisco_layer.get("metadata")
     assert isinstance(cisco_layer_metadata, dict)
-    assert cisco_layer_metadata.get("attestationStatus") == "unsigned"
-    assert cisco_layer_metadata.get("attestation") is None
+    assert cisco_layer_metadata.get("attestationStatus") == "signed"
+    cisco_attestation = cisco_layer_metadata.get("attestation")
+    assert isinstance(cisco_attestation, dict)
+    cisco_layer_id = cisco_layer.get("layerId")
+    assert isinstance(cisco_layer_id, str)
+    cisco_layer_type = cisco_layer.get("layerType")
+    assert isinstance(cisco_layer_type, str)
+    verify_trust_attestation(
+        payload=build_trust_attestation_payload(
+            agent_id=snapshot.agent_id,
+            item_id=search_tool.item_id,
+            item_kind=search_tool.item_kind,
+            content_hash=search_tool.content_hash,
+            captured_at=str(cisco_layer.get("capturedAt")),
+            evidence_hash=str(cisco_layer_metadata.get("evidenceHash")),
+            scope="trust_layer",
+            layer_id=cisco_layer_id,
+            layer_type=cisco_layer_type,
+        ),
+        envelope=cisco_attestation,
+        trusted_keys=(verification_key,),
+    )
     assert search_trust.get("trustScore") is not None
 
 

{plugin_scanner-2.0.955 → plugin_scanner-2.0.957}/tests/test_guard_cisco_evidence.py

@@ -149,6 +149,8 @@ def test_guard_store_invalidates_scanner_cache_when_hash_or_version_changes(tmp_
 
 
 def test_skill_scanner_reports_timeout_without_marking_scan_failed(monkeypatch, tmp_path: Path) -> None:
+    monkeypatch.setattr(cisco_skill_scanner.sys, "version_info", (3, 13, 0))
+
     class SlowScanner:
         def __init__(self, policy: object) -> None:
             self.policy = policy

{plugin_scanner-2.0.955 → plugin_scanner-2.0.957}/tests/test_guard_cisco_runtime_cli.py

@@ -166,7 +166,7 @@ def test_default_detector_registry_includes_cisco_sources() -> None:
     assert "cisco.mcp" in detector_ids
 
 
-def test_cisco_scanners_warn_and_skip_on_python_314(
+def test_skill_scanner_warns_on_python_314_but_mcp_scanner_checks_dependency(
     tmp_path: Path,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
@@ -180,7 +180,7 @@ def test_cisco_scanners_warn_and_skip_on_python_314(
     assert mcp_summary.status is CiscoIntegrationStatus.UNAVAILABLE
     assert "Python 3.14+" in skill_summary.message
     assert "Python 3.10 through 3.13" in skill_summary.message
-    assert "Python 3.14+" in mcp_summary.message
+    assert "Cisco MCP scanner is required but not installed" in mcp_summary.message
 
 
 def test_guard_scan_skills_deep_uses_cisco_skill_scanner(

plugin_scanner-2.0.957/tests/test_guard_receipt_redaction_cursor.py

@@ -0,0 +1,150 @@
+from __future__ import annotations
+
+from codex_plugin_scanner.guard.config import update_guard_settings
+from codex_plugin_scanner.guard.runtime.runner import (
+    _RELAXED_RECEIPT_REDACTION_RESYNC_MARKER,
+    _ensure_relaxed_receipt_redaction_resync,
+    _persist_cloud_receipt_redaction_level,
+)
+from codex_plugin_scanner.guard.store import GuardStore
+
+
+def test_cloud_receipt_redaction_relaxation_resets_receipt_cursor_before_storing_level(tmp_path) -> None:
+    store = GuardStore(tmp_path)
+    writes: list[tuple[str, dict[str, object], str]] = []
+    original_set_sync_payload = store.set_sync_payload
+
+    def record_set_sync_payload(state_key: str, payload: dict[str, object], now: str) -> None:
+        writes.append((state_key, payload, now))
+        original_set_sync_payload(state_key, payload, now)
+
+    store.set_sync_payload = record_set_sync_payload  # type: ignore[method-assign]
+    original_set_sync_payload(
+        "receipt_sync_cursor",
+        {"last_rowid": 17, "synced_at": "2026-04-15T00:00:00Z"},
+        "2026-04-15T00:00:00Z",
+    )
+
+    _persist_cloud_receipt_redaction_level(
+        store,
+        level="none",
+        synced_at="2026-04-15T00:01:00Z",
+    )
+
+    assert [write[0] for write in writes] == [
+        "receipt_sync_cursor",
+        "cloud_receipt_redaction_level",
+        _RELAXED_RECEIPT_REDACTION_RESYNC_MARKER,
+    ]
+    assert store.get_sync_payload("cloud_receipt_redaction_level") == {
+        "level": "none",
+        "updated_at": "2026-04-15T00:01:00Z",
+    }
+    assert store.get_sync_payload(_RELAXED_RECEIPT_REDACTION_RESYNC_MARKER) == {
+        "level": "none",
+        "updated_at": "2026-04-15T00:01:00Z",
+    }
+    assert store.get_sync_payload("receipt_sync_cursor") == {
+        "last_rowid": 0,
+        "synced_at": "2026-04-15T00:01:00Z",
+        "reason": "cloud_receipt_redaction_level_relaxed",
+        "receipt_redaction_level": "none",
+    }
+
+
+def test_cloud_receipt_redaction_tightening_keeps_receipt_cursor(tmp_path) -> None:
+    store = GuardStore(tmp_path)
+    store.set_sync_payload(
+        "cloud_receipt_redaction_level",
+        {"level": "none", "updated_at": "2026-04-15T00:00:00Z"},
+        "2026-04-15T00:00:00Z",
+    )
+    store.set_sync_payload(
+        "receipt_sync_cursor",
+        {"last_rowid": 17, "synced_at": "2026-04-15T00:00:00Z"},
+        "2026-04-15T00:00:00Z",
+    )
+
+    _persist_cloud_receipt_redaction_level(
+        store,
+        level="full",
+        synced_at="2026-04-15T00:01:00Z",
+    )
+
+    assert store.get_sync_payload("cloud_receipt_redaction_level") == {
+        "level": "full",
+        "updated_at": "2026-04-15T00:01:00Z",
+    }
+    assert store.get_sync_payload("receipt_sync_cursor") == {
+        "last_rowid": 17,
+        "synced_at": "2026-04-15T00:00:00Z",
+    }
+
+
+def test_existing_relaxed_receipt_redaction_resets_cursor_once(tmp_path) -> None:
+    store = GuardStore(tmp_path / "guard.db")
+    store.set_sync_payload(
+        "cloud_receipt_redaction_level",
+        {"level": "none", "updated_at": "2026-04-15T00:00:00Z"},
+        "2026-04-15T00:00:00Z",
+    )
+    store.set_sync_payload(
+        "receipt_sync_cursor",
+        {"last_rowid": 42, "synced_at": "2026-04-15T00:00:00Z"},
+        "2026-04-15T00:00:00Z",
+    )
+
+    _ensure_relaxed_receipt_redaction_resync(
+        store,
+        level="none",
+        synced_at="2026-04-15T00:01:00Z",
+    )
+
+    assert store.get_sync_payload("receipt_sync_cursor") == {
+        "last_rowid": 0,
+        "synced_at": "2026-04-15T00:01:00Z",
+        "reason": "cloud_receipt_redaction_level_relaxed_existing",
+        "receipt_redaction_level": "none",
+    }
+    assert store.get_sync_payload(_RELAXED_RECEIPT_REDACTION_RESYNC_MARKER) == {
+        "level": "none",
+        "updated_at": "2026-04-15T00:01:00Z",
+    }
+
+    _ensure_relaxed_receipt_redaction_resync(
+        store,
+        level="none",
+        synced_at="2026-04-15T00:02:00Z",
+    )
+
+    assert store.get_sync_payload("receipt_sync_cursor") == {
+        "last_rowid": 0,
+        "synced_at": "2026-04-15T00:01:00Z",
+        "reason": "cloud_receipt_redaction_level_relaxed_existing",
+        "receipt_redaction_level": "none",
+    }
+
+
+def test_first_cloud_redaction_level_matches_relaxed_local_config_without_cursor_reset(tmp_path) -> None:
+    store = GuardStore(tmp_path)
+    update_guard_settings(tmp_path, {"receipt_redaction_level": "none"})
+    store.set_sync_payload(
+        "receipt_sync_cursor",
+        {"last_rowid": 17, "synced_at": "2026-04-15T00:00:00Z"},
+        "2026-04-15T00:00:00Z",
+    )
+
+    _persist_cloud_receipt_redaction_level(
+        store,
+        level="none",
+        synced_at="2026-04-15T00:01:00Z",
+    )
+
+    assert store.get_sync_payload("cloud_receipt_redaction_level") == {
+        "level": "none",
+        "updated_at": "2026-04-15T00:01:00Z",
+    }
+    assert store.get_sync_payload("receipt_sync_cursor") == {
+        "last_rowid": 17,
+        "synced_at": "2026-04-15T00:00:00Z",
+    }

{plugin_scanner-2.0.955 → plugin_scanner-2.0.957}/uv.lock

@@ -1162,7 +1162,7 @@ wheels = [
 
 [[package]]
 name = "hol-guard"
-version = "2.0.955"
+version = "2.0.957"
 source = { editable = "." }
 dependencies = [
     { name = "cisco-ai-skill-scanner", marker = "python_full_version < '3.14'" },