plugin-scanner 2.0.880__tar.gz → 2.0.882__tar.gz

{plugin_scanner-2.0.880 → plugin_scanner-2.0.882}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plugin-scanner
-Version: 2.0.880
+Version: 2.0.882
 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.880 → plugin_scanner-2.0.882}/dashboard/src/approval-gate.test.ts

@@ -232,7 +232,7 @@ function testBulkApproveGateCredentialsPayload(): void {
   assert(!("approval_gate_use_cooldown" in withoutGate), "bulk payload should not include approval_gate_use_cooldown when no gate credentials");
 }
 
-function testApprovalProofTotpOverridesPassword(): void {
+function testApprovalProofTotpRequiresPassword(): void {
   const totpGate: GuardApprovalGatePublicConfig = {
     enabled: true,
     configured: true,
@@ -245,13 +245,23 @@ function testApprovalProofTotpOverridesPassword(): void {
     totp_enabled: true,
     totp_pending: false,
   };
+  // With TOTP enabled, the password is still the primary factor: a TOTP code
+  // alone does not enable submit.
   assert(
-    isApprovalProofSubmitDisabled(totpGate, { approvalPassword: "", approvalTotpCode: "123456" }, false) === false,
-    "totp approval proof should not require password",
+    isApprovalProofSubmitDisabled(totpGate, { approvalPassword: "", approvalTotpCode: "123456" }, false) === true,
+    "totp approval proof should still require password",
   );
-  const credentials = buildApprovalProofCredentials(totpGate, { approvalPassword: "ignored", approvalTotpCode: "123456" });
+  assert(
+    isApprovalProofSubmitDisabled(totpGate, { approvalPassword: "pw", approvalTotpCode: "" }, false) === true,
+    "totp approval proof should require the authenticator code",
+  );
+  assert(
+    isApprovalProofSubmitDisabled(totpGate, { approvalPassword: "pw", approvalTotpCode: "123456" }, false) === false,
+    "totp approval proof should accept both factors",
+  );
+  const credentials = buildApprovalProofCredentials(totpGate, { approvalPassword: "pw", approvalTotpCode: "123456" });
+  assert(credentials.approval_password === "pw", "totp approval proof should include password");
   assert(credentials.approval_totp_code === "123456", "totp approval proof should include authenticator code");
-  assert(!("approval_password" in credentials), "totp approval proof should omit password");
 }
 
 const tests: Array<[string, () => void]> = [
@@ -263,7 +273,7 @@ const tests: Array<[string, () => void]> = [
   ["testApprovalGateToggleReflectedInDraftApprovalGate", testApprovalGateToggleReflectedInDraftApprovalGate],
   ["testApprovalGateCooldownReflectedInDraftApprovalGate", testApprovalGateCooldownReflectedInDraftApprovalGate],
   ["testBulkApproveGateCredentialsPayload", testBulkApproveGateCredentialsPayload],
-  ["testApprovalProofTotpOverridesPassword", testApprovalProofTotpOverridesPassword],
+  ["testApprovalProofTotpRequiresPassword", testApprovalProofTotpRequiresPassword],
 ];
 
 let passed = 0;

{plugin_scanner-2.0.880 → plugin_scanner-2.0.882}/dashboard/src/approval-proof-inline.tsx

@@ -13,8 +13,11 @@ type ApprovalProofFieldInputsProps = {
   onApprovalTotpCodeChange: (event: ChangeEvent<HTMLInputElement>) => void;
 };
 
-export function approvalProofRequiresPassword(gate: GuardApprovalGatePublicConfig | null | undefined): boolean {
-  return gate?.totp_enabled !== true;
+export function approvalProofRequiresPassword(_gate: GuardApprovalGatePublicConfig | null | undefined): boolean {
+  // The approval password is always the primary factor. TOTP, when enabled,
+  // is an additional second factor rather than a replacement for it. The gate
+  // argument is retained so call sites keep passing the resolved gate config.
+  return true;
 }
 
 export function isApprovalProofSubmitDisabled(
@@ -25,39 +28,44 @@ export function isApprovalProofSubmitDisabled(
   if (busy) {
     return true;
   }
-  if (approvalProofRequiresPassword(gate)) {
-    return credentials.approvalPassword.trim() === "";
+  if (credentials.approvalPassword.trim() === "") {
+    return true;
+  }
+  if (gate?.totp_enabled === true && credentials.approvalTotpCode.trim() === "") {
+    return true;
   }
-  return credentials.approvalTotpCode.trim() === "";
+  return false;
 }
 
 export function buildApprovalProofCredentials(
   gate: GuardApprovalGatePublicConfig | null | undefined,
   credentials: { approvalPassword: string; approvalTotpCode: string },
-): { approval_password?: string; approval_totp_code?: string } {
-  if (approvalProofRequiresPassword(gate)) {
-    return { approval_password: credentials.approvalPassword };
+): { approval_password: string; approval_totp_code?: string } {
+  const payload: { approval_password: string; approval_totp_code?: string } = {
+    approval_password: credentials.approvalPassword,
+  };
+  if (gate?.totp_enabled === true) {
+    payload.approval_totp_code = credentials.approvalTotpCode;
   }
-  return { approval_totp_code: credentials.approvalTotpCode };
+  return payload;
 }
 
 export function ApprovalProofFieldInputs(props: ApprovalProofFieldInputsProps) {
-  const needsPassword = approvalProofRequiresPassword(props.approvalGate);
+  const needsTotp = props.approvalGate?.totp_enabled === true;
   return (
     <div className="space-y-3">
-      {needsPassword ? (
-        <label className="block">
-          <span className="text-sm font-semibold text-brand-dark">Approval password</span>
-          <input
-            ref={props.passwordRef}
-            type="password"
-            autoComplete="current-password"
-            value={props.approvalPassword}
-            onChange={props.onApprovalPasswordChange}
-            className="mt-1 min-h-11 w-full rounded-lg border border-slate-200 bg-white px-3 py-2 text-sm text-brand-dark focus:border-brand-blue focus:outline-none focus:ring-2 focus:ring-brand-blue/20"
-          />
-        </label>
-      ) : (
+      <label className="block">
+        <span className="text-sm font-semibold text-brand-dark">Approval password</span>
+        <input
+          ref={props.passwordRef}
+          type="password"
+          autoComplete="current-password"
+          value={props.approvalPassword}
+          onChange={props.onApprovalPasswordChange}
+          className="mt-1 min-h-11 w-full rounded-lg border border-slate-200 bg-white px-3 py-2 text-sm text-brand-dark focus:border-brand-blue focus:outline-none focus:ring-2 focus:ring-brand-blue/20"
+        />
+      </label>
+      {needsTotp ? (
         <label className="block">
           <span className="text-sm font-semibold text-brand-dark">Authenticator code</span>
           <input
@@ -70,7 +78,7 @@ export function ApprovalProofFieldInputs(props: ApprovalProofFieldInputsProps) {
             className="mt-1 min-h-11 w-full rounded-lg border border-slate-200 bg-white px-3 py-2 text-sm text-brand-dark focus:border-brand-blue focus:outline-none focus:ring-2 focus:ring-brand-blue/20"
           />
         </label>
-      )}
+      ) : null}
     </div>
   );
 }

{plugin_scanner-2.0.880 → plugin_scanner-2.0.882}/dashboard/src/settings-save-proof-modal.test.ts

@@ -77,16 +77,28 @@ assert(
 );
 
 assert(
-  isSettingsSaveProofSubmitDisabled("verify-save", { totpCode: "123456" }, true) === false,
-  "save-proof: verify accepts totp without password when enabled",
+  isSettingsSaveProofSubmitDisabled("verify-save", { totpCode: "123456" }, true) === true,
+  "save-proof: verify rejects totp without password when enabled",
+);
+assert(
+  isSettingsSaveProofSubmitDisabled("verify-save", { currentPassword: "secret", totpCode: "123456" }, true) === false,
+  "save-proof: verify accepts password and totp together when enabled",
 );
 assert(
   isSettingsSaveProofSubmitDisabled(
     "change-password",
     { newPassword: "next-secret", confirmPassword: "next-secret", totpCode: "123456" },
     true,
+  ) === true,
+  "save-proof: change-password rejects totp without current password when enabled",
+);
+assert(
+  isSettingsSaveProofSubmitDisabled(
+    "change-password",
+    { currentPassword: "secret", newPassword: "next-secret", confirmPassword: "next-secret", totpCode: "123456" },
+    true,
   ) === false,
-  "save-proof: change-password accepts totp without current password when enabled",
+  "save-proof: change-password accepts current password and totp together when enabled",
 );
 assert(
   isSettingsSaveProofSubmitDisabled("setup-gate", { newPassword: "alpha", confirmPassword: "beta" }, false) === true,

{plugin_scanner-2.0.880 → plugin_scanner-2.0.882}/dashboard/src/settings-save-proof-modal.tsx

@@ -161,14 +161,17 @@ export function isSettingsSaveProofSubmitDisabled(
     if (next.length === 0 || confirm.length === 0 || next !== confirm) {
       return true;
     }
-    return totpRequired ? totp.length === 0 : current.length === 0;
-  }
-  if (totpRequired) {
-    return totp.length === 0;
+    if (current.length === 0) {
+      return true;
+    }
+    return totpRequired ? totp.length === 0 : false;
   }
   if (current.length === 0) {
     return true;
   }
+  if (totpRequired) {
+    return totp.length === 0;
+  }
   return false;
 }
 
@@ -192,17 +195,10 @@ export function SettingsSaveProofModal(props: SettingsSaveProofModalProps) {
       return;
     }
     const timer = setTimeout(() => {
-      if (
-        props.gate?.totp_enabled === true
-        && (props.mode === "verify-save" || props.mode === "change-password" || props.mode === "maintenance")
-      ) {
-        totpRef.current?.focus();
-      } else {
-        passwordRef.current?.focus();
-      }
+      passwordRef.current?.focus();
     }, 50);
     return () => clearTimeout(timer);
-  }, [props.gate?.totp_enabled, props.open, props.mode]);
+  }, [props.open]);
 
   useEffect(() => {
     if (props.open) {
@@ -223,7 +219,9 @@ export function SettingsSaveProofModal(props: SettingsSaveProofModalProps) {
 
   const totpRequired = props.gate?.totp_enabled === true
     && (props.mode === "verify-save" || props.mode === "change-password" || props.mode === "maintenance");
-  const needsCurrentPassword = props.mode !== "setup-gate" && !totpRequired;
+  // The approval password is always the primary factor; TOTP adds a second
+  // factor rather than replacing the password prompt.
+  const needsCurrentPassword = props.mode !== "setup-gate";
 
   const handleCurrentPasswordChange = useCallback((event: ChangeEvent<HTMLInputElement>) => {
     setCurrentPassword(event.target.value);

{plugin_scanner-2.0.880 → plugin_scanner-2.0.882}/pyproject.toml

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hol-guard"
-version = "2.0.880"
+version = "2.0.882"
 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.880 → plugin_scanner-2.0.882}/src/codex_plugin_scanner/guard/adapters/pi_support.py

@@ -388,6 +388,23 @@ def managed_extension_source(*, guard_home: Path, home_dir: Path, settings_path:
         "  };\n"
         "}\n"
         "\n"
+        "function reviewedToolResult(content: unknown, details: unknown, isError?: boolean) {\n"
+        "  let body = '';\n"
+        "  if (Array.isArray(content)) {\n"
+        "    body = boundedOutputText(content).value as string;\n"
+        "  } else if (typeof content === 'string') {\n"
+        "    body = content;\n"
+        "  } else if (content !== undefined && content !== null) {\n"
+        "    try { body = JSON.stringify(content); } catch {}\n"
+        "  }\n"
+        "  const result = {\n"
+        '    content: body.length > 0 ? [{ type: "text", text: body }] : [],\n'
+        "    details,\n"
+        "  } as { content: unknown[]; details: unknown; isError?: boolean };\n"
+        "  if (isError) result.isError = true;\n"
+        "  return result;\n"
+        "}\n"
+        "\n"
         "export default function (pi: ExtensionAPI) {\n"
         "  const blockedToolResults = new Map<string, string>();\n"
         '  pi.on("input", async (event, ctx) => {\n'
@@ -447,10 +464,13 @@ def managed_extension_source(*, guard_home: Path, home_dir: Path, settings_path:
         "    );\n"
         "    const boundedContent = boundValue(event.content);\n"
         "    const boundedStdout = boundedOutputText(event.content);\n"
-        "    const oversizeNotice =\n"
-        "      boundedToolInput.truncated || boundedContent.truncated || boundedStdout.truncated\n"
+        "    // Only the reviewed *output* content determines whether the result is\n"
+        "    // replaced with the bounded excerpt. A truncated tool input alone does\n"
+        "    // not mean the output reached the model unreviewed.\n"
+        "    const outputTruncated = boundedContent.truncated || boundedStdout.truncated;\n"
+        "    const oversizeNotice = outputTruncated\n"
         '        ? "HOL Guard reviewed a size-bounded excerpt of a large Pi tool result; "\n'
-        '          + "the full output was truncated before review."\n'
+        '          + "the model receives the reviewed excerpt, not the full output."\n'
         "        : null;\n"
         '    if (oversizeNotice) ctx.ui.notify(oversizeNotice, "info");\n'
         "    const toolInput =\n"
@@ -477,7 +497,12 @@ def managed_extension_source(*, guard_home: Path, home_dir: Path, settings_path:
         '      ctx.ui.notify(reason, "warning");\n'
         "      return blockedToolResult(reason, event.details);\n"
         "    }\n"
-        "    return undefined;\n"
+        "    if (!outputTruncated) return undefined;\n"
+        "    // The full tool result was larger than the review window. Returning\n"
+        "    // undefined would leave Pi's original full event.content intact, so the\n"
+        "    // unreviewed tail would still reach the model. Instead, replace the\n"
+        "    // result with the bounded excerpt Guard actually reviewed.\n"
+        "    return reviewedToolResult(limitedContent, event.details, event.isError === true);\n"
         "  });\n"
         "}\n"
     )

{plugin_scanner-2.0.880 → plugin_scanner-2.0.882}/src/codex_plugin_scanner/guard/approval_gate.py

@@ -384,11 +384,22 @@ def disable_totp(
     state = _load_state(guard_home)
     if not _enabled(state):
         raise ApprovalGateError("approval_gate_required", "Approval password is required.")
+    if _verifier(state) is None:
+        raise ApprovalGateError(
+            "approval_gate_recovery_required",
+            "Approval gate is enabled but no verifier is configured.",
+            status=423,
+        )
     now_epoch = _epoch(now)
     locked_until = _optional_string(state.get("locked_until"))
     if _is_future(locked_until, now_epoch):
         raise ApprovalGateError("approval_gate_locked", "Approval gate is temporarily locked.", status=423)
     gate_input = approval_gate_input or ApprovalGateInput()
+    if gate_input.password is None:
+        raise ApprovalGateError("approval_gate_required", "Approval password is required.")
+    if not _verify_password(gate_input.password, _verifier(state)):
+        _record_failed_attempt(guard_home, state, now=now)
+        raise ApprovalGateError("approval_gate_invalid_password", "Approval password is invalid.")
     secret_id = _optional_string(state.get("totp_secret_id"))
     if secret_id is None:
         if _totp_enabled(state):
@@ -575,8 +586,6 @@ def validate_grant(
 ) -> None:
     state = _load_state(guard_home)
     if approval_gate_grant is None:
-        if _totp_enabled(state):
-            raise ApprovalGateError("approval_gate_totp_required", "TOTP code is required.")
         raise ApprovalGateError("approval_gate_required", "Approval password is required.")
     metadata = _ACTIVE_GRANTS.get(approval_gate_grant.grant_id)
     if metadata is None:
@@ -627,40 +636,19 @@ def _verify_or_raise(
     now: str | None,
 ) -> ApprovalGateGrant:
     now_epoch = _epoch(now)
-    locked_until = _optional_string(state.get("locked_until"))
-    if _is_future(locked_until, now_epoch):
-        raise ApprovalGateError("approval_gate_locked", "Approval gate is temporarily locked.", status=423)
-    gate_input = approval_gate_input or ApprovalGateInput()
-    if _totp_enabled(state):
-        if gate_input.totp_code is None:
-            raise ApprovalGateError("approval_gate_totp_required", "TOTP code is required.")
-        accepted_counter = _verify_totp_or_raise(
-            guard_home,
-            state,
-            code=gate_input.totp_code,
-            now_epoch=now_epoch,
-        )
-        state["totp_last_counter"] = accepted_counter
-        state["failed_attempts"] = 0
-        state.pop("locked_until", None)
-        state.pop("cooldown_expires_at", None)
-        _write_state(guard_home, state, now=now)
-        return _register_grant(
-            guard_home,
-            purpose=purpose,
-            strict=strict,
-            used_cooldown=False,
-            cooldown_expires_at=None,
-            totp_verified=True,
-            now=now,
-        )
     if _verifier(state) is None:
         raise ApprovalGateError(
             "approval_gate_recovery_required",
             "Approval gate is enabled but no verifier is configured.",
             status=423,
         )
-    if not strict and _cooldown_active(state, now_epoch):
+    locked_until = _optional_string(state.get("locked_until"))
+    if _is_future(locked_until, now_epoch):
+        raise ApprovalGateError("approval_gate_locked", "Approval gate is temporarily locked.", status=423)
+    # Cooldown can satisfy ordinary (non-strict) actions only when TOTP is not
+    # enabled. With TOTP enabled every protected action requires both the
+    # current password and a current authenticator code.
+    if not strict and _cooldown_active(state, now_epoch) and not _totp_enabled(state):
         return _register_grant(
             guard_home,
             purpose=purpose,
@@ -670,15 +658,33 @@ def _verify_or_raise(
             totp_verified=False,
             now=now,
         )
+    gate_input = approval_gate_input or ApprovalGateInput()
     if gate_input.password is None:
         raise ApprovalGateError("approval_gate_required", "Approval password is required.")
     if not _verify_password(gate_input.password, _verifier(state)):
         _record_failed_attempt(guard_home, state, now=now)
         raise ApprovalGateError("approval_gate_invalid_password", "Approval password is invalid.")
+    totp_verified = False
+    if _totp_enabled(state):
+        if gate_input.totp_code is None:
+            raise ApprovalGateError("approval_gate_totp_required", "TOTP code is required.")
+        accepted_counter = _verify_totp_or_raise(
+            guard_home,
+            state,
+            code=gate_input.totp_code,
+            now_epoch=now_epoch,
+        )
+        state["totp_last_counter"] = accepted_counter
+        totp_verified = True
     state["failed_attempts"] = 0
     state.pop("locked_until", None)
     cooldown_expires_at: str | None = None
-    if not strict and _cooldown_seconds(state) > 0 and gate_input.use_cooldown is not False:
+    if (
+        not strict
+        and not _totp_enabled(state)
+        and _cooldown_seconds(state) > 0
+        and gate_input.use_cooldown is not False
+    ):
         cooldown_expires_at = _iso_from_epoch(now_epoch + _cooldown_seconds(state))
         state["cooldown_expires_at"] = cooldown_expires_at
     _write_state(guard_home, state, now=now)
@@ -688,7 +694,7 @@ def _verify_or_raise(
         strict=strict,
         used_cooldown=False,
         cooldown_expires_at=cooldown_expires_at,
-        totp_verified=False,
+        totp_verified=totp_verified,
         now=now,
     )
 

{plugin_scanner-2.0.880 → plugin_scanner-2.0.882}/src/codex_plugin_scanner/guard/daemon/manager.py

@@ -806,7 +806,7 @@ def _running_ephemeral_guard_daemon_processes() -> list[tuple[int, Path, float]]
         pid = int(match.group(1))
         elapsed_seconds = _elapsed_seconds_from_ps(match.group(2))
         command = match.group(3).strip()
-        if "codex_plugin_scanner.cli guard daemon --serve" not in command:
+        if not _guard_daemon_command_matches(command):
             continue
         guard_home = _guard_home_from_command(command)
         if guard_home is None or not _guard_home_is_ephemeral(guard_home):
@@ -871,6 +871,43 @@ def _guard_daemon_port_from_command(command: str) -> int | None:
     return None
 
 
+def _guard_daemon_command_matches(command: str) -> bool:
+    try:
+        parts = shlex.split(command)
+    except ValueError:
+        return False
+    for index in range(len(parts) - 1):
+        prefix = parts[:index]
+        if parts[index : index + 2] == ["daemon", "--serve"]:
+            if any(part == "codex_plugin_scanner.cli" for part in prefix):
+                return True
+            if index > 0:
+                launcher_name = Path(parts[index - 1]).name.lower()
+                if launcher_name in {
+                    "hol-guard",
+                    "hol-guard.exe",
+                    "plugin-guard",
+                    "plugin-guard.exe",
+                }:
+                    return True
+            continue
+        if parts[index : index + 3] != ["guard", "daemon", "--serve"]:
+            continue
+        if any(part == "codex_plugin_scanner.cli" for part in prefix):
+            return True
+        if index == 0:
+            continue
+        launcher_name = Path(parts[index - 1]).name.lower()
+        if launcher_name in {
+            "hol-guard",
+            "hol-guard.exe",
+            "plugin-guard",
+            "plugin-guard.exe",
+        }:
+            return True
+    return False
+
+
 def _running_guard_daemon_processes_for_guard_home(guard_home: Path) -> list[tuple[int, int]]:
     if os.name == "nt":
         return []
@@ -891,7 +928,7 @@ def _running_guard_daemon_processes_for_guard_home(guard_home: Path) -> list[tup
             continue
         pid = int(match.group(1))
         command = match.group(2).strip()
-        if "codex_plugin_scanner.cli" not in command or "guard daemon --serve" not in command:
+        if not _guard_daemon_command_matches(command):
             continue
         command_guard_home = _guard_home_from_command(command)
         port = _guard_daemon_port_from_command(command)
@@ -972,7 +1009,7 @@ def _guard_daemon_pid_matches_command(pid: int, expected_guard_home: Path | None
     command = _guard_daemon_command_for_pid(pid)
     if command is None:
         return False
-    if "codex_plugin_scanner.cli" not in command or "guard daemon --serve" not in command:
+    if not _guard_daemon_command_matches(command):
         return False
     if expected_guard_home is None:
         return True

{plugin_scanner-2.0.880 → plugin_scanner-2.0.882}/src/codex_plugin_scanner/version.py

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