plugin-scanner 2.0.746__tar.gz → 2.0.747__tar.gz

{plugin_scanner-2.0.746 → plugin_scanner-2.0.747}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plugin-scanner
-Version: 2.0.746
+Version: 2.0.747
 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.746 → plugin_scanner-2.0.747}/dashboard/src/guard-api.ts

@@ -308,13 +308,16 @@ export async function discoverGuardDaemonOrigin(preferredPort = preferredGuardDa
   return probeGuardDaemonCandidatePortsInBatches(ports, async (_port, origin) => probeGuardDaemonHealth(origin));
 }
 
-function updateReconnectSucceeded(
+export function updateReconnectSucceeded(
   status: GuardUpdateStatus,
   options: GuardUpdateReconnectOptions,
 ): boolean {
   if (!options.expectedPreviousVersion) {
     return true;
   }
+  if (status.update_in_progress === true) {
+    return false;
+  }
   if (status.update_available !== true) {
     return true;
   }
@@ -324,7 +327,10 @@ function updateReconnectSucceeded(
   ) {
     return true;
   }
-  return status.current_version !== options.expectedPreviousVersion;
+  if (status.current_version !== options.expectedPreviousVersion) {
+    return true;
+  }
+  return options.sawUpdateInProgress === true;
 }
 
 async function initializeGuardDashboardSessionAtOrigin(
@@ -384,11 +390,12 @@ export function redirectToGuardDaemonOrigin(
 
 export async function reconnectGuardDaemonAfterUpdate(
   options?: GuardUpdateReconnectOptions,
-): Promise<string | null> {
+): Promise<{ origin: string | null; status: GuardUpdateStatus | null; sawUpdateInProgress: boolean } | null> {
   const guardToken = readGuardToken();
   const reconnectOptions = options ?? {};
   const awaitingVersionChange = Boolean(reconnectOptions.expectedPreviousVersion);
   const ports = buildGuardDaemonCandidatePorts(preferredGuardDaemonPort());
+  let sawUpdateInProgress = reconnectOptions.sawUpdateInProgress === true;
 
   for (let index = 0; index < ports.length; index += GUARD_DAEMON_DISCOVERY_PROBE_BATCH_SIZE) {
     const batch = ports.slice(index, index + GUARD_DAEMON_DISCOVERY_PROBE_BATCH_SIZE);
@@ -400,29 +407,38 @@ export async function reconnectGuardDaemonAfterUpdate(
         }
         try {
           const status = await fetchGuardUpdateStatusAtOrigin(origin, guardToken);
-          if (awaitingVersionChange && !updateReconnectSucceeded(status, reconnectOptions)) {
-            return null;
+          if (status.update_in_progress === true) {
+            return { origin: null, status: null, sawUpdateInProgress: true };
           }
-          return { origin, status };
+          if (awaitingVersionChange && !updateReconnectSucceeded(status, { ...reconnectOptions, sawUpdateInProgress })) {
+            return { origin: null, status: null, sawUpdateInProgress };
+          }
+          return { origin, status, sawUpdateInProgress };
         } catch {
           return null;
         }
       }),
     );
 
-    const active = results.find((result) => result !== null);
-    if (!active) {
-      continue;
+    const active = results.find((result) => result !== null && result.origin !== null && result.status !== null);
+    if (active?.origin && active.status) {
+      saveGuardDaemonOrigin(active.origin);
+      const refreshedToken = await initializeGuardDashboardSessionAtOrigin(active.origin, guardToken);
+      if (refreshedToken) {
+        saveGuardToken(refreshedToken);
+      }
+      return {
+        origin: active.origin,
+        status: active.status,
+        sawUpdateInProgress: active.sawUpdateInProgress,
+      };
     }
 
-    const { origin } = active;
-    saveGuardDaemonOrigin(origin);
-    const refreshedToken = await initializeGuardDashboardSessionAtOrigin(origin, guardToken);
-    if (refreshedToken) {
-      saveGuardToken(refreshedToken);
+    const partial = results.find((result) => result !== null);
+    if (partial) {
+      sawUpdateInProgress = partial.sawUpdateInProgress;
+      return { origin: null, status: null, sawUpdateInProgress };
     }
-
-    return origin;
   }
 
   return null;
@@ -2069,6 +2085,10 @@ export function normalizeGuardUpdateStatus(raw: unknown): GuardUpdateStatus {
         : undefined,
     update_in_progress:
       typeof value.update_in_progress === "boolean" ? value.update_in_progress : undefined,
+    update_suppressed: value.update_suppressed === true ? true : undefined,
+    retry_command: typeof value.retry_command === "string" ? value.retry_command : undefined,
+    update_attempt_message:
+      typeof value.update_attempt_message === "string" ? value.update_attempt_message : undefined,
   };
 }
 

{plugin_scanner-2.0.746 → plugin_scanner-2.0.747}/dashboard/src/guard-types.ts

@@ -838,11 +838,15 @@ export type GuardUpdateStatus = {
   recovery_reinstall_available?: boolean;
   recovery_reinstall_command?: string;
   update_in_progress?: boolean;
+  update_suppressed?: boolean;
+  retry_command?: string;
+  update_attempt_message?: string;
 };
 
 export type GuardUpdateReconnectOptions = {
   expectedPreviousVersion?: string | null;
   expectedLatestVersion?: string | null;
+  sawUpdateInProgress?: boolean;
 };
 
 export type GuardUpdateScheduleResult = {

{plugin_scanner-2.0.746 → plugin_scanner-2.0.747}/dashboard/src/guard-update-panel.tsx

@@ -43,6 +43,15 @@ function updateHelpCopy(status: GuardUpdateStatus | null | undefined, phase: Gua
   if (phase === "error") {
     return "The update did not finish. Try again or run hol-guard update from your terminal.";
   }
+  if (status?.update_suppressed) {
+    if (status.retry_command) {
+      return `Automatic update already ran but this install is still behind. Run ${status.retry_command} in your terminal.`;
+    }
+    if (status.update_attempt_message) {
+      return status.update_attempt_message;
+    }
+    return "Automatic update already ran but this install is still behind the latest release.";
+  }
   if (status?.update_available) {
     return "This restarts Guard for a moment. Open approvals will stay saved.";
   }
@@ -63,6 +72,7 @@ export function GuardUpdatePanel(props: GuardUpdatePanelProps) {
   const showUpdateButton =
     props.updateStatus?.update_available === true &&
     props.updateStatus.auto_updatable &&
+    props.updateStatus.update_suppressed !== true &&
     phase !== "updating" &&
     phase !== "reconnecting";
   const showReinstallButton =
@@ -168,15 +178,22 @@ export function useGuardUpdate(options?: { onReconnected?: () => void }) {
   const waitForReconnect = useCallback(
     async (expectedPreviousVersion: string, expectedLatestVersion: string | null): Promise<boolean> => {
       reconnectStartedAt.current = Date.now();
+      let sawUpdateInProgress = false;
       while (Date.now() - (reconnectStartedAt.current ?? Date.now()) < RECONNECT_TIMEOUT_MS) {
         try {
-          const origin = await reconnectGuardDaemonAfterUpdate({
+          const reconnectResult = await reconnectGuardDaemonAfterUpdate({
             expectedPreviousVersion,
             expectedLatestVersion,
+            sawUpdateInProgress,
           });
-          if (!origin) {
+          if (!reconnectResult) {
             throw new Error("Guard daemon not found");
           }
+          sawUpdateInProgress = reconnectResult.sawUpdateInProgress;
+          if (!reconnectResult.origin) {
+            throw new Error("Guard daemon not ready");
+          }
+          const { origin } = reconnectResult;
           if (origin !== window.location.origin) {
             redirectToGuardDaemonOrigin(origin, readGuardToken());
             return true;

{plugin_scanner-2.0.746 → plugin_scanner-2.0.747}/dashboard/src/guard-update.test.ts

@@ -1,4 +1,4 @@
-import { buildGuardDaemonCandidatePorts, normalizeGuardUpdateStatus } from "./guard-api";
+import { buildGuardDaemonCandidatePorts, normalizeGuardUpdateStatus, updateReconnectSucceeded } from "./guard-api";
 
 function assert(condition: boolean, message: string): void {
   if (!condition) {
@@ -74,4 +74,50 @@ const candidatePorts = buildGuardDaemonCandidatePorts(5474);
 assert(candidatePorts.length === 25, "candidate port scan should probe 25 ports");
 assert(candidatePorts[0] === 5474, "candidate ports should start from the preferred port");
 
+const staleReconnectStatus = normalizeGuardUpdateStatus({
+  current_version: "2.0.741",
+  latest_version: "2.0.743",
+  installer: "pipx",
+  version_check: {
+    source: "pypi",
+    status: "stale",
+    current_version: "2.0.741",
+    latest_version: "2.0.743",
+    update_available: true,
+  },
+  auto_updatable: true,
+  update_available: true,
+  update_in_progress: false,
+});
+
+assert(
+  updateReconnectSucceeded(staleReconnectStatus, {
+    expectedPreviousVersion: "2.0.741",
+    expectedLatestVersion: "2.0.743",
+    sawUpdateInProgress: true,
+  }) === true,
+  "reconnect should succeed after update cycle when install remains stale",
+);
+assert(
+  updateReconnectSucceeded(staleReconnectStatus, {
+    expectedPreviousVersion: "2.0.741",
+    expectedLatestVersion: "2.0.743",
+    sawUpdateInProgress: false,
+  }) === false,
+  "reconnect should wait until update cycle starts",
+);
+
+const suppressed = normalizeGuardUpdateStatus({
+  current_version: "2.0.741",
+  latest_version: "2.0.743",
+  auto_updatable: true,
+  update_available: true,
+  update_suppressed: true,
+  retry_command: "pipx install --force hol-guard",
+  update_attempt_message: "HOL Guard 2.0.741 is behind PyPI 2.0.743 after the update attempt.",
+});
+
+assert(suppressed.update_suppressed === true, "update_suppressed should normalize");
+assert(suppressed.retry_command === "pipx install --force hol-guard", "retry_command should normalize");
+
 console.log("guard-update.test.ts: all tests passed");

{plugin_scanner-2.0.746 → plugin_scanner-2.0.747}/pyproject.toml

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

{plugin_scanner-2.0.746 → plugin_scanner-2.0.747}/pyproject.toml.bak

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hol-guard"
-version = "2.0.746"
+version = "2.0.747"
 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.746 → plugin_scanner-2.0.747}/src/codex_plugin_scanner/guard/cli/update_commands.py

@@ -120,48 +120,60 @@ def run_guard_update(
         payload["changed"] = False
         payload["message"] = _planned_update_message(version_check=version_check, use_pypi=use_pypi)
         return payload, 0
-    try:
-        result = subprocess.run(
-            command,
-            capture_output=True,
-            check=False,
-            text=True,
-        )
-    except OSError as error:
-        payload["status"] = "failed"
-        payload["changed"] = False
-        payload["error"] = redact_sensitive_text(str(error))
-        payload["message"] = "HOL Guard update failed before the installer started."
-        return payload, 1
-    payload["stdout"] = _normalize_output_text(result.stdout)
-    payload["stderr"] = _normalize_output_text(result.stderr)
-    payload["return_code"] = result.returncode
-    importlib.invalidate_caches()
-    payload["resulting_version"] = _current_version_from_subprocess()
-    initial_version_check = payload.get("version_check")
-    resulting_version = str(payload.get("resulting_version") or current_version)
-    post_version_check = _version_check_payload(resulting_version)
-    payload["post_version_check"] = post_version_check
-    payload["version_check"] = _merge_version_checks(
-        initial_version_check,
-        post_version_check,
-        resulting_version,
-    )
+    active_command = command
+    attempted_force_retry = False
     nonzero_success_note: str | None = None
-    if result.returncode != 0:
-        if _version_changed(current_version, resulting_version):
-            nonzero_success_note = (
-                "Installer exited with code "
-                f"{result.returncode} after version changed. "
-                "Review stderr for any follow-up action."
+    while True:
+        try:
+            result = subprocess.run(
+                active_command,
+                capture_output=True,
+                check=False,
+                text=True,
             )
-        payload["status"] = "failed"
-        payload["changed"] = False
-        payload["message"] = "HOL Guard update failed."
-        if nonzero_success_note is None:
+        except OSError as error:
+            payload["status"] = "failed"
+            payload["changed"] = False
+            payload["error"] = redact_sensitive_text(str(error))
+            payload["message"] = "HOL Guard update failed before the installer started."
             return payload, 1
-    payload["status"] = _success_status(payload)
-    payload["changed"] = _version_changed(current_version, resulting_version) or payload["status"] == "updated"
+        payload["command"] = active_command
+        payload["stdout"] = _normalize_output_text(result.stdout)
+        payload["stderr"] = _normalize_output_text(result.stderr)
+        payload["return_code"] = result.returncode
+        importlib.invalidate_caches()
+        payload["resulting_version"] = _current_version_from_subprocess()
+        initial_version_check = payload.get("version_check")
+        resulting_version = str(payload.get("resulting_version") or current_version)
+        post_version_check = _version_check_payload(resulting_version)
+        payload["post_version_check"] = post_version_check
+        payload["version_check"] = _merge_version_checks(
+            initial_version_check,
+            post_version_check,
+            resulting_version,
+        )
+        if result.returncode != 0:
+            if _version_changed(current_version, resulting_version):
+                nonzero_success_note = (
+                    "Installer exited with code "
+                    f"{result.returncode} after version changed. "
+                    "Review stderr for any follow-up action."
+                )
+            payload["status"] = "failed"
+            payload["changed"] = False
+            payload["message"] = "HOL Guard update failed."
+            if nonzero_success_note is None:
+                return payload, 1
+        payload["status"] = _success_status(payload)
+        payload["changed"] = _version_changed(current_version, resulting_version) or payload["status"] == "updated"
+        if not attempted_force_retry and not force_pypi_reinstall and payload.get("status") == "stale":
+            retry_command = _update_command(installer, use_pypi=True)
+            if retry_command != active_command:
+                attempted_force_retry = True
+                active_command = retry_command
+                payload["upgrade_source"] = "pypi"
+                continue
+        break
     stale_retry_command = _stale_retry_command(payload)
     if stale_retry_command:
         payload["retry_command"] = stale_retry_command

{plugin_scanner-2.0.746 → plugin_scanner-2.0.747}/src/codex_plugin_scanner/guard/daemon/dashboard_update.py

@@ -12,6 +12,7 @@ from pathlib import Path
 from ..cli.update_commands import build_guard_update_status_payload
 
 _DASHBOARD_UPDATE_LOCK = "dashboard-update.lock"
+_DASHBOARD_UPDATE_OUTCOME = "dashboard-update-outcome.json"
 _DASHBOARD_UPDATE_STALE_SECONDS = 15 * 60
 
 
@@ -53,11 +54,85 @@ def dashboard_update_in_progress(guard_home: Path) -> bool:
     return True
 
 
-def merge_dashboard_update_progress(
+def dashboard_update_outcome_path(guard_home: Path) -> Path:
+    return guard_home.expanduser().resolve() / _DASHBOARD_UPDATE_OUTCOME
+
+
+def read_dashboard_update_outcome(guard_home: Path) -> dict[str, object] | None:
+    outcome_path = dashboard_update_outcome_path(guard_home)
+    if not outcome_path.is_file():
+        return None
+    try:
+        payload = json.loads(outcome_path.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return None
+    return payload if isinstance(payload, dict) else None
+
+
+def write_dashboard_update_outcome(guard_home: Path, update_payload: dict[str, object]) -> None:
+    status = str(update_payload.get("status") or "")
+    if status not in {"stale", "failed"}:
+        clear_dashboard_update_outcome(guard_home)
+        return
+    version_check = update_payload.get("version_check")
+    latest_version = update_payload.get("latest_version")
+    if not isinstance(latest_version, str) and isinstance(version_check, dict):
+        candidate = version_check.get("latest_version")
+        latest_version = candidate if isinstance(candidate, str) else None
+    current_version = update_payload.get("resulting_version") or update_payload.get("current_version")
+    retry_command = update_payload.get("retry_command")
+    outcome = {
+        "status": status,
+        "attempted_at": datetime.now(timezone.utc).isoformat(),
+        "current_version": current_version,
+        "target_version": latest_version,
+        "retry_command": retry_command if isinstance(retry_command, str) else None,
+        "message": update_payload.get("message"),
+    }
+    outcome_path = dashboard_update_outcome_path(guard_home)
+    outcome_path.parent.mkdir(parents=True, exist_ok=True)
+    outcome_path.write_text(json.dumps(outcome, indent=2), encoding="utf-8")
+
+
+def clear_dashboard_update_outcome(guard_home: Path) -> None:
+    dashboard_update_outcome_path(guard_home).unlink(missing_ok=True)
+
+
+def merge_dashboard_update_outcome(
     guard_home: Path,
     status_payload: dict[str, object],
 ) -> dict[str, object]:
     payload = dict(status_payload)
+    if payload.get("update_available") is not True:
+        clear_dashboard_update_outcome(guard_home)
+        return payload
+    outcome = read_dashboard_update_outcome(guard_home)
+    if outcome is None:
+        return payload
+    current_version = payload.get("current_version")
+    latest_version = payload.get("latest_version")
+    if (
+        outcome.get("status") not in {"stale", "failed"}
+        or outcome.get("current_version") != current_version
+        or outcome.get("target_version") != latest_version
+    ):
+        clear_dashboard_update_outcome(guard_home)
+        return payload
+    payload["update_suppressed"] = True
+    retry_command = outcome.get("retry_command")
+    if isinstance(retry_command, str) and retry_command.strip():
+        payload["retry_command"] = retry_command.strip()
+    message = outcome.get("message")
+    if isinstance(message, str) and message.strip():
+        payload["update_attempt_message"] = message.strip()
+    return payload
+
+
+def merge_dashboard_update_progress(
+    guard_home: Path,
+    status_payload: dict[str, object],
+) -> dict[str, object]:
+    payload = merge_dashboard_update_outcome(guard_home, status_payload)
     if not dashboard_update_in_progress(guard_home):
         payload["update_in_progress"] = False
         return payload

{plugin_scanner-2.0.746 → plugin_scanner-2.0.747}/src/codex_plugin_scanner/guard/daemon/dashboard_update_runner.py

@@ -8,7 +8,10 @@ import time
 from pathlib import Path
 
 from codex_plugin_scanner.guard.cli.update_commands import run_guard_update
-from codex_plugin_scanner.guard.daemon.dashboard_update import clear_dashboard_update_lock
+from codex_plugin_scanner.guard.daemon.dashboard_update import (
+    clear_dashboard_update_lock,
+    write_dashboard_update_outcome,
+)
 from codex_plugin_scanner.guard.daemon.manager import (
     _retire_guard_daemon_pid,
     clear_guard_daemon_state,
@@ -34,6 +37,7 @@ def main(argv: list[str] | None = None) -> int:
             dry_run=False,
             force_pypi_reinstall=args.force_pypi_reinstall,
         )
+        write_dashboard_update_outcome(guard_home, update_payload)
         if exit_code != 0:
             message = update_payload.get("message") or update_payload.get("error") or "Guard update failed."
             print(str(message), file=sys.stderr)

{plugin_scanner-2.0.746 → plugin_scanner-2.0.747}/src/codex_plugin_scanner/guard/daemon/static/assets/chunks/policy-workspace-page.js

@@ -1,4 +1,4 @@
-import { j as jsxRuntimeExports, S as SectionLabel, o as HiMiniXMark, B as Badge, ac as Tag, aA as HiMiniCommandLine, w as HiMiniExclamationTriangle, b0 as scopeLabel, h as harnessDisplayName, A as ActionButton, b1 as guardAwareHref, m as formatRelativeTime, b2 as HiMiniDocumentText, d as HiMiniCheckCircle, b3 as HiMiniCloudArrowUp, b4 as HiMiniCheck, b5 as HiMiniCodeBracket, b6 as HiMiniClipboardDocument, b7 as HiMiniUsers, aG as HiMiniBeaker, b8 as HiMiniFolder, b9 as HiMiniInformationCircle, O as HiMiniLockClosed, l as HiMiniShieldCheck, r as reactExports, ba as createCloudExceptionRequest, b as EmptyState, ad as HiMiniMagnifyingGlass, p as HiMiniChevronUp, q as HiMiniChevronDown, y as HiMiniChevronRight, bb as HiMiniPuzzlePiece, bc as HiMiniGlobeAlt, aE as HiMiniClock, bd as policyActionLabel, be as fetchCloudExceptions, bf as fetchCloudExceptionRequests, bg as downloadBlob, bh as PaginationControls, bi as HiMiniNoSymbol, aM as HiMiniArrowTopRightOnSquare, bj as HiMiniCube, aw as HiMiniArrowPath, t as HiMiniCloud, T as HiMiniAdjustmentsHorizontal, bk as HiMiniArrowDownTray, Y as fetchSettings, _ as updateSettings, x as HiMiniBolt, bl as HiMiniQueueList, bm as HiMiniArrowRight, bn as HiMiniPlay, a_ as WorkspacePageHeader, a$ as __vitePreload } from "../guard-dashboard.js";
+import { j as jsxRuntimeExports, S as SectionLabel, o as HiMiniXMark, B as Badge, ac as Tag, aA as HiMiniCommandLine, w as HiMiniExclamationTriangle, b0 as scopeLabel, h as harnessDisplayName, A as ActionButton, b1 as guardAwareHref, m as formatRelativeTime, b2 as HiMiniDocumentText, d as HiMiniCheckCircle, b3 as HiMiniCloudArrowUp, b4 as HiMiniCheck, b5 as HiMiniCodeBracket, b6 as HiMiniClipboardDocument, b7 as HiMiniUsers, aG as HiMiniBeaker, b8 as HiMiniFolder, b9 as HiMiniInformationCircle, Q as HiMiniLockClosed, l as HiMiniShieldCheck, r as reactExports, ba as createCloudExceptionRequest, b as EmptyState, ad as HiMiniMagnifyingGlass, p as HiMiniChevronUp, q as HiMiniChevronDown, y as HiMiniChevronRight, bb as HiMiniPuzzlePiece, bc as HiMiniGlobeAlt, aE as HiMiniClock, bd as policyActionLabel, be as fetchCloudExceptions, bf as fetchCloudExceptionRequests, bg as downloadBlob, bh as PaginationControls, bi as HiMiniNoSymbol, aM as HiMiniArrowTopRightOnSquare, bj as HiMiniCube, aw as HiMiniArrowPath, t as HiMiniCloud, T as HiMiniAdjustmentsHorizontal, bk as HiMiniArrowDownTray, Y as fetchSettings, _ as updateSettings, x as HiMiniBolt, bl as HiMiniQueueList, bm as HiMiniArrowRight, bn as HiMiniPlay, a_ as WorkspacePageHeader, a$ as __vitePreload } from "../guard-dashboard.js";
 const CLOUD_EXCEPTION_EXPIRING_SOON_DAYS = 7;
 function parseCloudExceptionTimestamp(value) {
   if (!value || !value.trim()) {