plugin-scanner 2.0.606__tar.gz → 2.0.608__tar.gz

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plugin-scanner
-Version: 2.0.606
+Version: 2.0.608
 Summary: Lint, verify, and gate plugin ecosystems for maintainers, CI, and publish workflows.
 Project-URL: Homepage, https://github.com/hashgraph-online/hol-guard
 Project-URL: Repository, https://github.com/hashgraph-online/hol-guard

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "plugin-scanner"
-version = "2.0.606"
+version = "2.0.608"
 description = "Lint, verify, and gate plugin ecosystems for maintainers, CI, and publish workflows."
 readme = "README.md"
 license = "Apache-2.0"

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/pyproject.toml.bak

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

plugin_scanner-2.0.608/src/codex_plugin_scanner/guard/adapters/kimi_hooks.py

@@ -0,0 +1,25 @@
+"""Helpers for Kimi Code CLI hook payloads."""
+
+from __future__ import annotations
+
+
+def normalize_kimi_prompt(value: object | None) -> object | None:
+    """Flatten Kimi Code's ContentPart[] prompt into a single string.
+
+    Returns the original value unchanged if it is not a string or a list of
+    text-bearing content parts, so image-only or non-standard payloads are not
+    silently replaced with ``None``.
+    """
+    if value is None:
+        return None
+    if isinstance(value, str):
+        return value
+    if not isinstance(value, list):
+        return value
+    parts: list[str] = []
+    for item in value:
+        if isinstance(item, dict):
+            text = item.get("text")
+            if isinstance(text, str):
+                parts.append(text)
+    return "\n".join(parts) if parts else value

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/guard/approvals.py

@@ -255,6 +255,7 @@ def apply_approval_resolution(
     return_queue_result: bool = False,
     resolve_scope_matches: bool = True,
     approval_gate_input: ApprovalGateInput | None = None,
+    persist_policy: bool = True,
 ) -> dict[str, object]:
     request = store.get_approval_request(request_id)
     if request is None:
@@ -289,7 +290,8 @@ def apply_approval_resolution(
         approval_gate_input=approval_gate_input,
         now=resolved_at,
     )
-    store.upsert_policy(decision, resolved_at, approval_gate_grant=approval_gate_grant)
+    if persist_policy:
+        store.upsert_policy(decision, resolved_at, approval_gate_grant=approval_gate_grant)
     resolution_harness = None if scope == "global" else str(request["harness"])
     if return_queue_result:
         result = store.resolve_request_with_queue_result(

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/guard/cli/commands_hook.py

@@ -38,11 +38,15 @@ def _run_guard_hook_command(
         args.harness = runtime_harness.strip()
     else:
         args.harness = resolve_runtime_hook_harness(args.harness)
-    payload = _load_hook_payload(getattr(args, "event_file", None), input_text=input_text)
+    payload = _load_hook_payload(
+        getattr(args, "event_file", None),
+        input_text=input_text,
+        harness=args.harness,
+    )
     if _canonical_harness_name(args.harness) == "cursor":
         from ..adapters.cursor_hooks import prepare_cursor_hook_payload
 
-        payload = _normalize_hook_payload(prepare_cursor_hook_payload(payload))
+        payload = _normalize_hook_payload(prepare_cursor_hook_payload(payload), harness=args.harness)
     managed_install = _managed_install_for(store, args.harness)
     workspace_was_explicit = workspace is not None
     runtime_workspace = workspace

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/guard/cli/commands_hook_generic.py

@@ -136,13 +136,21 @@ def _run_hook_generic_payload(
     )
     approval_context = _native_approval_center_context(payload, harness=args.harness)
     if _should_emit_native_hook_exit_block(args, event_name=hook_event_name, policy_action=policy_action):
-        _emit_native_hook_block_stderr(
-            _native_hook_reason_for_harness(
-                args.harness,
-                incoming_reason,
-                approval_context,
-            )
+        block_reason = _native_hook_reason_for_harness(
+            args.harness,
+            incoming_reason,
+            approval_context,
         )
+        if _canonical_harness_name(args.harness) == "kimi":
+            _emit_native_hook_response(
+                harness=args.harness,
+                policy_action=policy_action,
+                event_name=hook_event_name,
+                reason=block_reason,
+                output_stream=output_stream,
+            )
+        else:
+            _emit_native_hook_block_stderr(block_reason)
         return 2
     if _canonical_harness_name(args.harness) == "codex" and (
         hook_event_name == "UserPromptSubmit" or approval_context is not None

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/guard/cli/commands_hook_runtime_finish.py

@@ -79,7 +79,16 @@ def _finalize_runtime_artifact_hook(
                 raw_runtime_reason,
                 approval_context,
             )
-        _emit_native_hook_block_stderr(native_block_reason)
+        if _canonical_harness_name(args.harness) == "kimi":
+            _emit_native_hook_response(
+                harness=args.harness,
+                policy_action=policy_action,
+                event_name=event_name,
+                reason=native_block_reason,
+                output_stream=output_stream,
+            )
+        else:
+            _emit_native_hook_block_stderr(native_block_reason)
         _record_harness_usage_for_hook(
             store=store,
             action_envelope=action_envelope,

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/guard/cli/commands_support_connect.py

@@ -164,7 +164,8 @@ def _finalize_guard_connect_payload(
     payload: dict[str, object],
     now: str,
 ) -> dict[str, object]:
-    payload.pop(CONNECT_SYNC_AUTH_CONTEXT_KEY, None)
+    sync_auth_context = payload.pop(CONNECT_SYNC_AUTH_CONTEXT_KEY, None)
+    resolved_sync_auth_context = sync_auth_context if isinstance(sync_auth_context, dict) else None
     urls = _guard_cloud_urls_for_connect(connect_url)
     for key in ("connect_url", "sync_url", "dashboard_url", "inbox_url", "fleet_url"):
         payload.setdefault(key, urls[key])
@@ -213,7 +214,10 @@ def _finalize_guard_connect_payload(
         return payload
     payload["sync_attempted"] = True
     try:
-        sync_payload = sync_local_guard_cloud_proof(store)
+        sync_payload = sync_local_guard_cloud_proof(
+            store,
+            auth_context=resolved_sync_auth_context,
+        )
     except GuardSyncNotAvailableError as error:
         store.record_latest_guard_connect_sync_result(
             status="connected",
@@ -249,7 +253,7 @@ def _finalize_guard_connect_payload(
             }
         )
         return payload
-    except RuntimeError as error:
+    except (RuntimeError, TimeoutError) as error:
         repair_message = (
             "Guard Cloud pairing finished, but the first proof sync is still pending. "
             "Local Guard will retry automatically while the daemon is running, or run hol-guard sync now."

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/guard/cli/commands_support_hook_payload.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 from ._commands_shared import *
 from .commands_parser_helpers import *
+from ..adapters.kimi_hooks import normalize_kimi_prompt
 
 def _emit_native_hook_response(
     *,
@@ -112,13 +113,14 @@ def _emit_native_hook_notification_stderr(reason: str) -> None:
     print(reason, file=sys.stderr)
 
 def _native_hook_permission_decision(policy_action: str, *, harness: str) -> str | None:
+    canonical = _canonical_harness_name(harness)
     if policy_action in {"block", "sandbox-required"}:
         return "deny"
     if policy_action == "require-reapproval":
-        if harness == "codex":
+        if canonical in {"codex", "kimi"}:
             return "deny"
         return "ask"
-    if harness == "codex":
+    if canonical == "codex":
         return None
     return "allow"
 
@@ -352,15 +354,20 @@ def _approval_surface_policy_for_flow(config_policy: str, approval_flow: dict[st
         return "never-auto-open"
     return config_policy
 
-def _load_hook_payload(event_file: str | None, *, input_text: str | None = None) -> dict[str, object]:
+def _load_hook_payload(
+    event_file: str | None,
+    *,
+    input_text: str | None = None,
+    harness: str | None = None,
+) -> dict[str, object]:
     if event_file:
         payload = json.loads(Path(event_file).read_text(encoding="utf-8"))
-        return _normalize_hook_payload(payload) if isinstance(payload, dict) else {}
+        return _normalize_hook_payload(payload, harness=harness) if isinstance(payload, dict) else {}
     raw = input_text.strip() if isinstance(input_text, str) else sys.stdin.read().strip()
     if not raw:
         return {}
     payload = json.loads(raw)
-    return _normalize_hook_payload(payload) if isinstance(payload, dict) else {}
+    return _normalize_hook_payload(payload, harness=harness) if isinstance(payload, dict) else {}
 
 _ACTION_ENVELOPE_HARNESSES = frozenset(
     {"codex", "claude-code", "opencode", "copilot", "gemini", "hermes", "openclaw", "cursor"}
@@ -387,7 +394,11 @@ def _hook_action_envelope(
 def _action_envelope_json(envelope: GuardActionEnvelope | None) -> dict[str, object] | None:
     return envelope.to_dict() if envelope is not None else None
 
-def _normalize_hook_payload(payload: dict[str, object]) -> dict[str, object]:
+def _normalize_hook_payload(
+    payload: dict[str, object],
+    *,
+    harness: str | None = None,
+) -> dict[str, object]:
     normalized = dict(payload)
     for source_key, target_key in (
         ("artifactId", "artifact_id"),
@@ -421,6 +432,8 @@ def _normalize_hook_payload(payload: dict[str, object]) -> dict[str, object]:
     if arguments is not None:
         normalized["tool_input"] = arguments
         normalized["arguments"] = arguments
+    if harness is not None and _canonical_harness_name(harness) == "kimi":
+        normalized["prompt"] = normalize_kimi_prompt(normalized.get("prompt"))
     return normalized
 
 def _normalize_hook_arguments(*values: object | None) -> object | None:

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/guard/cli/commands_support_interaction.py

@@ -247,7 +247,10 @@ def _should_emit_copilot_hook_response(args: argparse.Namespace) -> bool:
     return args.harness == "copilot" and not getattr(args, "json", False)
 
 def _should_emit_native_hook_response(args: argparse.Namespace) -> bool:
-    return _canonical_harness_name(args.harness) in {"claude-code", "codex"} and not getattr(args, "json", False)
+    return (
+        _canonical_harness_name(args.harness) in {"claude-code", "codex", "kimi"}
+        and not getattr(args, "json", False)
+    )
 
 def _should_emit_claude_native_pretooluse_notice(
     args: argparse.Namespace,
@@ -282,9 +285,11 @@ def _should_emit_native_hook_json_response(
     )
 
 def _should_emit_native_hook_exit_block(args: argparse.Namespace, *, event_name: str, policy_action: str) -> bool:
-    del args, event_name, policy_action
     # Codex v0.133 logs non-zero PreToolUse hooks as failed but still executes
     # the tool. Blocking must be communicated through the JSON hook response.
+    canonical = _canonical_harness_name(args.harness)
+    if canonical == "kimi" and event_name in {"PreToolUse", "UserPromptSubmit"}:
+        return policy_action in {"block", "sandbox-required", "require-reapproval"}
     return False
 
 def _codex_browser_approval_decision(

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/guard/cli/connect_flow.py

@@ -1187,9 +1187,9 @@ def build_connect_status_payload(
     if action in {"repair", "re-pair"}:
         payload["repair_action"] = "rerun_connect"
         payload["repair_message"] = "Run hol-guard connect to start OAuth Device Code approval."
-    elif oauth_repair_required and cloud_profile is None:
-        payload["repair_message"] = "Run hol-guard connect again to repair local Guard Cloud authorization."
-    elif not bool(oauth_storage_health.get("configured")) and payload["status"] == "retry_required":
+    elif (oauth_repair_required and cloud_profile is None) or (
+        not bool(oauth_storage_health.get("configured")) and payload["status"] == "retry_required"
+    ):
         payload["repair_message"] = "Run hol-guard connect again to repair local Guard Cloud authorization."
     return payload
 

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/guard/daemon/server.py

@@ -56,6 +56,7 @@ from ..approvals import (
     build_runtime_snapshot,
 )
 from ..cli.connect_flow import (
+    CONNECT_SYNC_AUTH_CONTEXT_KEY,
     _build_sync_auth_context,
     exchange_guard_authorization_code,
     resolve_connect_url,
@@ -478,6 +479,13 @@ def _queue_headless_cloud_sync(
                 "status": "in_progress",
                 "message": "Guard Cloud sync already running.",
             }
+        # This probe only short-circuits obviously overlapping cross-process work.
+        # sync_local_guard_cloud_proof() still acquires the real cloud sync lock.
+        if store.cloud_sync_in_progress():
+            return {
+                "status": "in_progress",
+                "message": "Guard Cloud sync already running.",
+            }
         _HEADLESS_CLOUD_SYNC_IN_FLIGHT.add(store_key)
 
     def _run_and_finalize() -> None:
@@ -677,7 +685,8 @@ def _finalize_daemon_guard_connect_payload(
     payload: dict[str, object],
     now: str,
 ) -> dict[str, object]:
-    payload.pop("_guard_sync_auth_context", None)
+    sync_auth_context = payload.pop(CONNECT_SYNC_AUTH_CONTEXT_KEY, None)
+    resolved_sync_auth_context = sync_auth_context if isinstance(sync_auth_context, dict) else None
     normalized_connect_url, allowed_origin = resolve_connect_url(connect_url)
     sync_url = f"{allowed_origin}/api/guard/receipts/sync"
     dashboard_url = f"{allowed_origin}/guard"
@@ -730,7 +739,10 @@ def _finalize_daemon_guard_connect_payload(
         return payload
     payload["sync_attempted"] = True
     try:
-        sync_payload = sync_local_guard_cloud_proof(store)
+        sync_payload = sync_local_guard_cloud_proof(
+            store,
+            auth_context=resolved_sync_auth_context,
+        )
     except GuardSyncNotAvailableError as error:
         store.record_latest_guard_connect_sync_result(
             status="connected",
@@ -766,7 +778,7 @@ def _finalize_daemon_guard_connect_payload(
             }
         )
         return payload
-    except RuntimeError as error:
+    except (RuntimeError, TimeoutError) as error:
         repair_message = (
             "Guard Cloud pairing finished, but the first proof sync is still pending. Local Guard will retry while "
             "the daemon is running."
@@ -1875,6 +1887,7 @@ class _GuardDaemonHandler(BaseHTTPRequestHandler):
                 return_queue_result=True,
                 resolve_scope_matches=False,
                 approval_gate_input=approval_gate_input_from_mapping(payload),
+                persist_policy=False,
             )
         except ApprovalRequestNotFoundError:
             self.server.store.release_remote_once_receipt(receipt_id)  # type: ignore[attr-defined]

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/guard/runtime/runner.py

@@ -1899,39 +1899,39 @@ def sync_local_guard_cloud_proof(
     auth_context: dict[str, object] | None = None,
 ) -> dict[str, object]:
     """Publish the local Guard runtime session before syncing receipts."""
-
-    resolved_auth_context = auth_context if auth_context is not None else _resolve_guard_sync_auth_context(store)
-    runtime_summary = sync_runtime_session(
-        store,
-        session=_local_guard_runtime_session(),
-        auth_context=resolved_auth_context,
-    )
-    receipts_summary = sync_receipts(
-        store,
-        persist_sync_summary=False,
-        persist_connect_state=False,
-        auth_context=resolved_auth_context,
-    )
-    summary = dict(receipts_summary)
-    summary.update(
-        {
-            "runtime_session_id": runtime_summary.get("runtime_session_id"),
-            "runtime_session_synced_at": runtime_summary.get("runtime_session_synced_at"),
-            "runtime_sessions_visible": runtime_summary.get("runtime_sessions_visible"),
-            "local_guard_online_at": runtime_summary.get("local_guard_online_at")
-            or receipts_summary.get("local_guard_online_at"),
-            "runtime_harness": runtime_summary.get("runtime_harness"),
-            "runtime_surface": runtime_summary.get("runtime_surface"),
-            "runtime_workspace": runtime_summary.get("runtime_workspace"),
-            "runtime_device_id": runtime_summary.get("runtime_device_id"),
-            "runtime": runtime_summary,
-            "receipts": dict(receipts_summary),
-        }
-    )
-    recorded_at = str(summary.get("synced_at") or summary.get("runtime_session_synced_at") or _now())
-    store.set_sync_payload("sync_summary", summary, recorded_at)
-    store.record_latest_guard_connect_sync_success(sync_payload=summary, now=recorded_at)
-    return summary
+    with store.hold_cloud_sync_lock():
+        resolved_auth_context = auth_context if auth_context is not None else _resolve_guard_sync_auth_context(store)
+        runtime_summary = sync_runtime_session(
+            store,
+            session=_local_guard_runtime_session(),
+            auth_context=resolved_auth_context,
+        )
+        receipts_summary = sync_receipts(
+            store,
+            persist_sync_summary=False,
+            persist_connect_state=False,
+            auth_context=resolved_auth_context,
+        )
+        summary = dict(receipts_summary)
+        summary.update(
+            {
+                "runtime_session_id": runtime_summary.get("runtime_session_id"),
+                "runtime_session_synced_at": runtime_summary.get("runtime_session_synced_at"),
+                "runtime_sessions_visible": runtime_summary.get("runtime_sessions_visible"),
+                "local_guard_online_at": runtime_summary.get("local_guard_online_at")
+                or receipts_summary.get("local_guard_online_at"),
+                "runtime_harness": runtime_summary.get("runtime_harness"),
+                "runtime_surface": runtime_summary.get("runtime_surface"),
+                "runtime_workspace": runtime_summary.get("runtime_workspace"),
+                "runtime_device_id": runtime_summary.get("runtime_device_id"),
+                "runtime": runtime_summary,
+                "receipts": dict(receipts_summary),
+            }
+        )
+        recorded_at = str(summary.get("synced_at") or summary.get("runtime_session_synced_at") or _now())
+        store.set_sync_payload("sync_summary", summary, recorded_at)
+        store.record_latest_guard_connect_sync_success(sync_payload=summary, now=recorded_at)
+        return summary
 
 
 def sync_pain_signals(

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/guard/store.py

@@ -181,6 +181,8 @@ _SECRET_FINGERPRINT_PREFIX = "pbkdf2-sha256$"
 _SECRET_FINGERPRINT_SALT = b"hol-guard-secret-fingerprint:v1"
 _OAUTH_REFRESH_LOCK_TIMEOUT_SECONDS = 30.0
 _OAUTH_REFRESH_LOCK_POLL_SECONDS = 0.05
+_CLOUD_SYNC_LOCK_TIMEOUT_SECONDS = 30.0
+_CLOUD_SYNC_LOCK_POLL_SECONDS = 0.05
 _GUARD_STORE_PRIVATE_DIR_MODE = 0o700
 _GUARD_STORE_PRIVATE_FILE_MODE = 0o600
 
@@ -951,6 +953,44 @@ class GuardStore:
                 with suppress(OSError):
                     _release_advisory_file_lock(handle)
 
+    @contextmanager
+    def hold_cloud_sync_lock(
+        self,
+        *,
+        timeout_seconds: float = _CLOUD_SYNC_LOCK_TIMEOUT_SECONDS,
+    ) -> Iterator[None]:
+        lock_path = self.guard_home / "cloud-sync.lock"
+        deadline = time.monotonic() + max(timeout_seconds, 0.0)
+        with lock_path.open("a+b") as handle:
+            while True:
+                try:
+                    _acquire_advisory_file_lock(handle)
+                    break
+                except BlockingIOError:
+                    if time.monotonic() >= deadline:
+                        raise TimeoutError("Timed out waiting for Guard Cloud sync lock.") from None
+                    time.sleep(_CLOUD_SYNC_LOCK_POLL_SECONDS)
+            try:
+                yield
+            finally:
+                with suppress(OSError):
+                    _release_advisory_file_lock(handle)
+
+    def cloud_sync_in_progress(self) -> bool:
+        lock_path = self.guard_home / "cloud-sync.lock"
+        with lock_path.open("a+b") as handle:
+            try:
+                # This is an advisory probe, not a reservation: callers must still
+                # acquire hold_cloud_sync_lock() for the actual sync critical section.
+                _acquire_advisory_file_lock(handle)
+            except BlockingIOError:
+                return True
+            try:
+                return False
+            finally:
+                with suppress(OSError):
+                    _release_advisory_file_lock(handle)
+
     def _initialize(self) -> None:
         statements = (
             """

{plugin_scanner-2.0.606 → plugin_scanner-2.0.608}/src/codex_plugin_scanner/version.py

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