@scotthuang/agent-knock-knock 0.12.8 → 0.12.10

package/dist/src/cli-core.js

@@ -5853,7 +5853,7 @@ function managedListApprovalState(conversation) {
 }
 function listActionContracts() {
     return {
-        version: 15,
+        version: 16,
         instructions: [
             "Treat terminals[] as the primary resource and use only actions present in available_actions, except the snapshot-bound terminals[].handoff_decision.choices.take_over_current.action and an exact terminals[].blocking_turns[].recovery_action. Either nested action requires explicit user confirmation; after it succeeds, refresh list before any follow-current send.",
             "The session_exact scope uses session_id only when it is prefilled by the listed send action. A rollout-backed managed Codex pane instead uses the terminal_follow_current scope with its exact selector plus expected_terminal_token because even one materialized rollout does not prove the current TUI foreground thread. A turn id is never an ordinary send target.",
@@ -5864,6 +5864,7 @@ function listActionContracts() {
             "List resumable threads before resume; use only a complete native_thread_id and the action returned for that candidate.",
             "Use a terminal selector only when explicitly named by the user or prefilled by that terminal row's send action. A handoff action also carries expected_terminal_token; never infer, guess, or reuse either value.",
             "Use respond only for an in-flight turn that is explicitly waiting for OpenClaw.",
+            "Approval fingerprint v2 binds stable terminal, process, and action fields plus an unredacted exact prompt-region digest. Whole-screen digests and scrollback excerpts are diagnostic only and never authorize approval. A keys-mode prompt without exact prompt-region evidence is not approvable and exposes no approve action.",
             "Managed controls target turn_id. A raw terminal may be controlled only through its own list-prefilled conversation_id action. When a Codex managed prompt has no usable AKK Turn owner, list may expose one manual terminal-scoped approve carrying expected_terminal_token; copy the complete action after explicit human confirmation. It does not mutate the Turn or Session binding, has no durable dispatch receipt, and is never eligible for automatic approval. If its result is interrupted, refresh status and inspect the live prompt instead of retrying blindly. Never construct, guess, or reuse either selector or token.",
             "Start with the action's prefilled arguments, supply every missing_required field, and consult the top-level action's optional fields only when needed.",
             "Authoritative full IDs are prefilled; short_ref is for display and human input.",
@@ -6023,6 +6024,9 @@ function listActionContracts() {
                 required: ["turn_id", "expected_approval_fingerprint"],
                 optional: ["expected_terminal_token"],
                 terminal_scoped_scope: "Only the latest list-prefilled Codex conversation_id/token action may approve a managed current prompt without a usable Turn owner. It remains human-confirmed, revalidates exact terminal/process/Session/dispatch/prompt state before keys, never mutates managed state, has no durable dispatch receipt, cannot be auto-approved, and must not be blindly retried after an interrupted result.",
+                fingerprint_contract: "v2_prompt_region",
+                fingerprint_authority: "Stable terminal, process, and action fields plus the unredacted exact prompt-region digest; whole-screen digests and scrollback excerpts are diagnostic only.",
+                missing_prompt_region_evidence: "not_approvable",
                 requires_explicit_user_confirmation: true,
                 requires_fresh_status: true
             },
@@ -12427,6 +12431,10 @@ function terminalBridgeApprovalFingerprint({ terminalControl, terminalStatus })
     if (adapterFingerprint) {
         return adapterFingerprint;
     }
+    if (approval.approvable === true &&
+        (stringValue(approval.decision_mode) ?? "keys") === "keys") {
+        return undefined;
+    }
     const endpoint = terminalEndpointFromControlRef(terminalControl);
     const processAnchorPid = Number(endpoint.processAnchorPid);
     if (!Number.isSafeInteger(processAnchorPid) || processAnchorPid <= 1) {
@@ -13808,331 +13816,337 @@ async function runApprove(options) {
             release();
         }
     };
-    releaseStateLock = acquireFileLock(`${statePath}.lock`);
     const writerStoreDir = pathsForConversationDir(path.dirname(statePath)).storeDir;
-    try {
-        return await withStoreWriterLeaseAsync(writerStoreDir, async () => {
-            let approval;
-            let lockedConversation = conversation;
-            const currentConversation = loadState(statePath);
-            const currentTakeover = isRecord(currentConversation.native_session_takeover)
-                ? currentConversation.native_session_takeover
-                : undefined;
-            const currentControl = terminalControlFromTakeover(currentTakeover);
-            const currentApproval = isRecord(currentTakeover?.terminal_bridge_approval)
-                ? currentTakeover.terminal_bridge_approval
-                : undefined;
-            if (currentConversation.status !== conversation.status ||
-                currentTakeover?.terminal_bridge_message_id !== nativeTakeover?.terminal_bridge_message_id ||
-                !currentControl ||
-                !terminalControlsShareIncarnation(currentControl, terminalControl) ||
-                (claudeScreenApproval &&
-                    currentApproval?.fingerprint !== monitoredApproval?.fingerprint)) {
-                throw new Error("approval state changed while waiting for terminal control; refresh status and retry");
-            }
-            assertManagedTerminalDispatchOwner({
-                storeDir: writerStoreDir,
-                conversation: currentConversation,
-                terminalControl: currentControl,
-                action: "approve"
-            });
-            lockedConversation = currentConversation;
-            const currentRuntimeIdentity = terminalRuntimeIdentityForConversation(currentConversation, currentControl);
-            approval = await createTerminalAgentBridge(options).approve(executor.kind, currentControl, {
-                expectedFingerprint,
-                scrollbackLines: Number(options.scrollbackLines ?? 120),
-                runtime: currentRuntimeIdentity,
-                managedRequest: terminalDurableRequestForConversation(currentConversation, currentControl),
-                requiredDecisionMode: autoApproved && executor.kind === "claude" ? "keys" : undefined,
-                authorize: autoApproved
-                    ? ({ agent, terminalControl: currentTerminalControl, inspection, fingerprint }) => {
+    const runApprovalWithStateLock = async () => {
+        let approval;
+        let lockedConversation = conversation;
+        const currentConversation = loadState(statePath);
+        const currentTakeover = isRecord(currentConversation.native_session_takeover)
+            ? currentConversation.native_session_takeover
+            : undefined;
+        const currentControl = terminalControlFromTakeover(currentTakeover);
+        const currentApproval = isRecord(currentTakeover?.terminal_bridge_approval)
+            ? currentTakeover.terminal_bridge_approval
+            : undefined;
+        if (currentConversation.status !== conversation.status ||
+            currentTakeover?.terminal_bridge_message_id !== nativeTakeover?.terminal_bridge_message_id ||
+            !currentControl ||
+            !terminalControlsShareIncarnation(currentControl, terminalControl) ||
+            (claudeScreenApproval &&
+                currentApproval?.fingerprint !== monitoredApproval?.fingerprint)) {
+            throw new Error("approval state changed while waiting for terminal control; refresh status and retry");
+        }
+        assertManagedTerminalDispatchOwner({
+            storeDir: writerStoreDir,
+            conversation: currentConversation,
+            terminalControl: currentControl,
+            action: "approve"
+        });
+        lockedConversation = currentConversation;
+        const currentRuntimeIdentity = terminalRuntimeIdentityForConversation(currentConversation, currentControl);
+        approval = await createTerminalAgentBridge(options).approve(executor.kind, currentControl, {
+            expectedFingerprint,
+            scrollbackLines: Number(options.scrollbackLines ?? 120),
+            runtime: currentRuntimeIdentity,
+            managedRequest: terminalDurableRequestForConversation(currentConversation, currentControl),
+            requiredDecisionMode: autoApproved && executor.kind === "claude" ? "keys" : undefined,
+            authorize: autoApproved
+                ? ({ agent, terminalControl: currentTerminalControl, inspection, fingerprint }) => {
+                    if (!autoApprovalPolicy) {
+                        return {
+                            approved: false,
+                            reason: "automatic approval requires an executor-side policy"
+                        };
+                    }
+                    const candidate = policyCandidateForInspection({
+                        agent,
+                        currentTerminalControl,
+                        inspection,
+                        fingerprint
+                    });
+                    executorPolicyDecision = evaluateApprovalPolicy({
+                        policy: autoApprovalPolicy,
+                        candidate
+                    });
+                    if (executorPolicyDecision.action !== "approve") {
+                        return {
+                            approved: false,
+                            reason: `executor-side auto-approval policy rejected the current request: ${executorPolicyDecision.reason}`
+                        };
+                    }
+                    if (policyRuleId && executorPolicyDecision.ruleId !== policyRuleId) {
+                        return {
+                            approved: false,
+                            reason: "executor-side auto-approval rule changed before execution"
+                        };
+                    }
+                    if (policyFingerprint &&
+                        executorPolicyDecision.policyFingerprint !== policyFingerprint) {
+                        return {
+                            approved: false,
+                            reason: "executor-side auto-approval policy changed before execution"
+                        };
+                    }
+                    return { approved: true };
+                }
+                : undefined,
+            beforeKeyDispatch: claudeScreenApproval
+                ? ({ fingerprint, terminalControl: dispatchControl, inspection, keys }) => {
+                    if (autoApproved) {
                         if (!autoApprovalPolicy) {
-                            return {
-                                approved: false,
-                                reason: "automatic approval requires an executor-side policy"
-                            };
+                            throw new Error("automatic approval requires an executor-side policy before dispatch");
                         }
-                        const candidate = policyCandidateForInspection({
-                            agent,
-                            currentTerminalControl,
-                            inspection,
-                            fingerprint
-                        });
-                        executorPolicyDecision = evaluateApprovalPolicy({
+                        const freshPolicyDecision = evaluateApprovalPolicy({
                             policy: autoApprovalPolicy,
-                            candidate
+                            candidate: policyCandidateForInspection({
+                                agent: executor.kind,
+                                currentTerminalControl: dispatchControl,
+                                inspection,
+                                fingerprint
+                            })
                         });
-                        if (executorPolicyDecision.action !== "approve") {
-                            return {
-                                approved: false,
-                                reason: `executor-side auto-approval policy rejected the current request: ${executorPolicyDecision.reason}`
-                            };
+                        if (freshPolicyDecision.action !== "approve") {
+                            throw new Error(`executor-side auto-approval policy rejected the recaptured request: ${freshPolicyDecision.reason}`);
                         }
-                        if (policyRuleId && executorPolicyDecision.ruleId !== policyRuleId) {
-                            return {
-                                approved: false,
-                                reason: "executor-side auto-approval rule changed before execution"
-                            };
+                        if (executorPolicyDecision?.ruleId &&
+                            freshPolicyDecision.ruleId !== executorPolicyDecision.ruleId) {
+                            throw new Error("executor-side auto-approval rule changed after recapture");
+                        }
+                        if (policyRuleId && freshPolicyDecision.ruleId !== policyRuleId) {
+                            throw new Error("executor-side auto-approval rule changed before dispatch");
                         }
                         if (policyFingerprint &&
-                            executorPolicyDecision.policyFingerprint !== policyFingerprint) {
-                            return {
-                                approved: false,
-                                reason: "executor-side auto-approval policy changed before execution"
-                            };
+                            freshPolicyDecision.policyFingerprint !== policyFingerprint) {
+                            throw new Error("executor-side auto-approval policy changed before dispatch");
                         }
-                        return { approved: true };
+                        executorPolicyDecision = freshPolicyDecision;
                     }
-                    : undefined,
-                beforeKeyDispatch: claudeScreenApproval
-                    ? ({ fingerprint, terminalControl: dispatchControl, inspection, keys }) => {
-                        if (autoApproved) {
-                            if (!autoApprovalPolicy) {
-                                throw new Error("automatic approval requires an executor-side policy before dispatch");
-                            }
-                            const freshPolicyDecision = evaluateApprovalPolicy({
-                                policy: autoApprovalPolicy,
-                                candidate: policyCandidateForInspection({
-                                    agent: executor.kind,
-                                    currentTerminalControl: dispatchControl,
-                                    inspection,
-                                    fingerprint
-                                })
-                            });
-                            if (freshPolicyDecision.action !== "approve") {
-                                throw new Error(`executor-side auto-approval policy rejected the recaptured request: ${freshPolicyDecision.reason}`);
-                            }
-                            if (executorPolicyDecision?.ruleId &&
-                                freshPolicyDecision.ruleId !== executorPolicyDecision.ruleId) {
-                                throw new Error("executor-side auto-approval rule changed after recapture");
-                            }
-                            if (policyRuleId && freshPolicyDecision.ruleId !== policyRuleId) {
-                                throw new Error("executor-side auto-approval rule changed before dispatch");
-                            }
-                            if (policyFingerprint &&
-                                freshPolicyDecision.policyFingerprint !== policyFingerprint) {
-                                throw new Error("executor-side auto-approval policy changed before dispatch");
-                            }
-                            executorPolicyDecision = freshPolicyDecision;
-                        }
-                        if (approvalDispatchReserved) {
-                            throw new Error("Claude approval dispatch was already reserved");
-                        }
-                        approvalDispatchReserved = true;
-                        if (!releaseStateLock) {
-                            throw new Error("approval state lock was released before terminal dispatch");
-                        }
-                        const latestConversation = loadState(statePath);
-                        const latestTakeover = isRecord(latestConversation.native_session_takeover)
-                            ? latestConversation.native_session_takeover
-                            : undefined;
-                        const latestControl = terminalControlFromTakeover(latestTakeover);
-                        const latestApproval = isRecord(latestTakeover?.terminal_bridge_approval)
-                            ? latestTakeover.terminal_bridge_approval
-                            : undefined;
-                        const latestNotifiedAt = validTimestampMs(latestApproval?.notified_at);
-                        const latestApprovalState = isRecord(latestApproval?.approval_state)
-                            ? latestApproval.approval_state
-                            : undefined;
-                        const latestPolicyEvidence = isRecord(latestApprovalState?.policy_evidence)
-                            ? latestApprovalState.policy_evidence
-                            : undefined;
-                        const recapturedPolicyEvidence = inspection.approval.approvable
-                            ? inspection.approval.policyEvidence
-                            : undefined;
-                        const latestDispatch = isRecord(latestTakeover?.terminal_bridge_approval_dispatch)
-                            ? latestTakeover.terminal_bridge_approval_dispatch
-                            : undefined;
-                        if (!latestTakeover ||
-                            latestConversation.status !== "waiting_for_openclaw" ||
-                            latestTakeover.terminal_bridge_message_id !==
-                                nativeTakeover?.terminal_bridge_message_id ||
-                            latestApproval?.fingerprint !== fingerprint ||
-                            latestNotifiedAt === undefined ||
-                            cliNowMs() - latestNotifiedAt > CLAUDE_SCREEN_APPROVAL_TTL_MS ||
-                            expectedFingerprint !== fingerprint ||
-                            !terminalControlsShareIncarnation(latestControl, dispatchControl) ||
-                            (autoApproved &&
-                                (latestPolicyEvidence?.source !== "claude_transcript" ||
-                                    latestPolicyEvidence.evidence_fingerprint !==
-                                        recapturedPolicyEvidence?.evidenceFingerprint))) {
-                            throw new Error("approval state changed before terminal dispatch; refresh status and retry");
-                        }
-                        if (latestDispatch?.state === "reserved" &&
-                            latestDispatch.terminal_bridge_message_id ===
-                                latestTakeover.terminal_bridge_message_id) {
-                            throw new Error("a previous Claude approval dispatch has an uncertain outcome; inspect and resolve the terminal manually");
-                        }
-                        const reservedAt = cliNow().toISOString();
-                        const reservedConversation = {
-                            ...latestConversation,
-                            native_session_takeover: {
-                                ...latestTakeover,
-                                terminal_bridge_approval_dispatch: {
-                                    state: "reserved",
-                                    attempt_id: randomUUID(),
-                                    fingerprint,
-                                    keys,
-                                    terminal_target: dispatchControl.target,
-                                    terminal_bridge_message_id: latestTakeover.terminal_bridge_message_id,
-                                    reserved_at: reservedAt
-                                }
-                            },
-                            updated_at: reservedAt
-                        };
-                        saveState(statePath, reservedConversation);
-                        lockedConversation = reservedConversation;
+                    if (approvalDispatchReserved) {
+                        throw new Error("Claude approval dispatch was already reserved");
                     }
-                    : undefined
-            });
-            const actualFingerprint = approval.fingerprint;
-            const effectivePolicyRuleId = executorPolicyDecision?.ruleId ?? policyRuleId;
-            const effectivePolicyFingerprint = executorPolicyDecision?.policyFingerprint ?? policyFingerprint;
-            if (!approval.approved) {
-                releaseApprovalStateLock();
-                releaseApprovalTerminalLock();
-                if (autoApproved) {
-                    appendEvent(logPath, {
-                        ts: cliNow().toISOString(),
-                        conversation_id: conversation.conversation_id,
-                        event: "terminal_auto_approval_decision",
-                        action: "rejected",
-                        reason: approval.reason,
-                        terminal_control: terminalControl,
-                        expected_fingerprint: expectedFingerprint,
-                        actual_fingerprint: actualFingerprint,
-                        policy_rule_id: effectivePolicyRuleId,
-                        policy_fingerprint: effectivePolicyFingerprint
-                    });
+                    approvalDispatchReserved = true;
+                    if (!releaseStateLock) {
+                        throw new Error("approval state lock was released before terminal dispatch");
+                    }
+                    const latestConversation = loadState(statePath);
+                    const latestTakeover = isRecord(latestConversation.native_session_takeover)
+                        ? latestConversation.native_session_takeover
+                        : undefined;
+                    const latestControl = terminalControlFromTakeover(latestTakeover);
+                    const latestApproval = isRecord(latestTakeover?.terminal_bridge_approval)
+                        ? latestTakeover.terminal_bridge_approval
+                        : undefined;
+                    const latestNotifiedAt = validTimestampMs(latestApproval?.notified_at);
+                    const latestApprovalState = isRecord(latestApproval?.approval_state)
+                        ? latestApproval.approval_state
+                        : undefined;
+                    const latestPolicyEvidence = isRecord(latestApprovalState?.policy_evidence)
+                        ? latestApprovalState.policy_evidence
+                        : undefined;
+                    const recapturedPolicyEvidence = inspection.approval.approvable
+                        ? inspection.approval.policyEvidence
+                        : undefined;
+                    const latestDispatch = isRecord(latestTakeover?.terminal_bridge_approval_dispatch)
+                        ? latestTakeover.terminal_bridge_approval_dispatch
+                        : undefined;
+                    if (!latestTakeover ||
+                        latestConversation.status !== "waiting_for_openclaw" ||
+                        latestTakeover.terminal_bridge_message_id !==
+                            nativeTakeover?.terminal_bridge_message_id ||
+                        latestApproval?.fingerprint !== fingerprint ||
+                        latestNotifiedAt === undefined ||
+                        cliNowMs() - latestNotifiedAt > CLAUDE_SCREEN_APPROVAL_TTL_MS ||
+                        expectedFingerprint !== fingerprint ||
+                        !terminalControlsShareIncarnation(latestControl, dispatchControl) ||
+                        (autoApproved &&
+                            (latestPolicyEvidence?.source !== "claude_transcript" ||
+                                latestPolicyEvidence.evidence_fingerprint !==
+                                    recapturedPolicyEvidence?.evidenceFingerprint))) {
+                        throw new Error("approval state changed before terminal dispatch; refresh status and retry");
+                    }
+                    if (latestDispatch?.state === "reserved" &&
+                        latestDispatch.terminal_bridge_message_id ===
+                            latestTakeover.terminal_bridge_message_id) {
+                        throw new Error("a previous Claude approval dispatch has an uncertain outcome; inspect and resolve the terminal manually");
+                    }
+                    const reservedAt = cliNow().toISOString();
+                    const reservedConversation = {
+                        ...latestConversation,
+                        native_session_takeover: {
+                            ...latestTakeover,
+                            terminal_bridge_approval_dispatch: {
+                                state: "reserved",
+                                attempt_id: randomUUID(),
+                                fingerprint,
+                                keys,
+                                terminal_target: dispatchControl.target,
+                                terminal_bridge_message_id: latestTakeover.terminal_bridge_message_id,
+                                reserved_at: reservedAt
+                            }
+                        },
+                        updated_at: reservedAt
+                    };
+                    saveState(statePath, reservedConversation);
+                    lockedConversation = reservedConversation;
                 }
-                printJson({
-                    conversation,
-                    approved: false,
-                    blocked: approval.blocked,
-                    reason: approval.reason,
-                    terminal_control: terminalControl,
-                    expected_approval_fingerprint: expectedFingerprint,
-                    actual_approval_fingerprint: actualFingerprint,
-                    screen_excerpt: approval.screenExcerpt
-                });
-                return;
-            }
-            appendEvent(logPath, {
-                ts: cliNow().toISOString(),
-                conversation_id: conversation.conversation_id,
-                event: "terminal_approval_send",
-                terminal_control: terminalControl,
-                key: approval.key,
-                keys: approval.keys,
-                label: approval.label,
-                decision_mode: approval.decisionMode,
-                request_id: approval.requestId,
-                approval_fingerprint: actualFingerprint,
-                auto_approved: autoApproved,
-                policy_rule_id: effectivePolicyRuleId,
-                policy_fingerprint: effectivePolicyFingerprint
-            });
+                : undefined
+        });
+        const actualFingerprint = approval.fingerprint;
+        const effectivePolicyRuleId = executorPolicyDecision?.ruleId ?? policyRuleId;
+        const effectivePolicyFingerprint = executorPolicyDecision?.policyFingerprint ?? policyFingerprint;
+        if (!approval.approved) {
+            releaseApprovalStateLock();
             if (autoApproved) {
                 appendEvent(logPath, {
                     ts: cliNow().toISOString(),
                     conversation_id: conversation.conversation_id,
                     event: "terminal_auto_approval_decision",
-                    action: "approved",
+                    action: "rejected",
+                    reason: approval.reason,
                     terminal_control: terminalControl,
-                    approval_fingerprint: actualFingerprint,
+                    expected_fingerprint: expectedFingerprint,
+                    actual_fingerprint: actualFingerprint,
                     policy_rule_id: effectivePolicyRuleId,
                     policy_fingerprint: effectivePolicyFingerprint
                 });
             }
-            runtimeLog("info", "terminal_approval_send", {
-                conversation_id: conversation.conversation_id,
-                terminal_target: terminalControl.target,
-                key: approval.key,
-                keys: approval.keys,
-                label: approval.label,
-                decision_mode: approval.decisionMode,
-                request_id: approval.requestId,
-                approval_fingerprint: actualFingerprint,
-                auto_approved: autoApproved,
-                policy_rule_id: effectivePolicyRuleId,
-                policy_fingerprint: effectivePolicyFingerprint
-            });
-            const nativeTakeoverForUpdate = isRecord(lockedConversation.native_session_takeover)
-                ? { ...lockedConversation.native_session_takeover }
-                : {};
-            const resolvedApproval = isRecord(nativeTakeoverForUpdate.terminal_bridge_approval)
-                ? nativeTakeoverForUpdate.terminal_bridge_approval
-                : undefined;
-            const resolvedApprovalScreenDigest = stringValue(resolvedApproval?.screen_digest);
-            const resolvedApprovalState = isRecord(resolvedApproval?.approval_state)
-                ? resolvedApproval.approval_state
-                : undefined;
-            const resolvedTranscriptIdentity = claudeTranscriptApprovalIdentity(resolvedApprovalState);
-            const approvalResolvedAt = cliNow().toISOString();
-            const agentTimeoutMinutes = Number(options.agentTimeoutMinutes ??
-                nativeTakeoverForUpdate.terminal_bridge_inactivity_timeout_minutes ??
-                DEFAULT_AGENT_TIMEOUT_MINUTES);
-            const agentHardTimeoutMinutes = positiveMinutes(options.agentHardTimeoutMinutes ??
-                nativeTakeoverForUpdate.terminal_bridge_hard_timeout_minutes ??
-                DEFAULT_AGENT_HARD_TIMEOUT_MINUTES, "--agent-hard-timeout-minutes");
-            const nextNativeTakeover = {
-                ...nativeTakeoverForUpdate,
-                terminal_bridge_approval: undefined,
-                terminal_bridge_approval_dispatch: undefined,
-                terminal_bridge_approval_resolved_at: approvalResolvedAt,
-                terminal_bridge_last_approval_fingerprint: actualFingerprint,
-                terminal_bridge_last_approval_screen_digest: resolvedApprovalScreenDigest,
-                terminal_bridge_last_approval_request_id: resolvedTranscriptIdentity?.requestId,
-                terminal_bridge_last_approval_evidence_fingerprint: resolvedTranscriptIdentity?.evidenceFingerprint,
-                terminal_bridge_last_approval_prompt_cleared_at: undefined,
-                terminal_bridge_last_approval_at: approvalResolvedAt,
-                terminal_bridge_last_approval_message_id: nativeTakeoverForUpdate.terminal_bridge_message_id,
-                terminal_bridge_monitor_lock_version: TERMINAL_BRIDGE_MONITOR_LOCK_VERSION,
-                terminal_bridge_monitor_started_at: approvalResolvedAt,
-                terminal_bridge_last_activity_at: approvalResolvedAt,
-                terminal_bridge_last_activity_reason: "approval resolved",
-                terminal_bridge_inactivity_timeout_minutes: agentTimeoutMinutes,
-                terminal_bridge_hard_timeout_minutes: agentHardTimeoutMinutes,
-                terminal_bridge_inactivity_deadline_at: deadlineAt(approvalResolvedAt, agentTimeoutMinutes),
-                terminal_bridge_hard_deadline_at: deadlineAt(stringValue(nativeTakeoverForUpdate.terminal_bridge_started_at) ?? approvalResolvedAt, agentHardTimeoutMinutes)
-            };
-            delete nextNativeTakeover.terminal_bridge_approval;
-            delete nextNativeTakeover.terminal_bridge_approval_dispatch;
-            delete nextNativeTakeover.terminal_bridge_last_approval_prompt_cleared_at;
-            const nextConversation = {
-                ...lockedConversation,
-                status: terminalBridgeEnabled(lockedConversation)
-                    ? "waiting_for_agent"
-                    : lockedConversation.status,
-                native_session_takeover: nextNativeTakeover,
-                updated_at: approvalResolvedAt
-            };
-            saveState(statePath, nextConversation);
-            releaseApprovalStateLock();
-            releaseApprovalTerminalLock();
-            const bridgeMonitor = ensureTerminalBridgeMonitorAfterApproval({
-                conversation: nextConversation,
-                statePath,
-                logPath,
-                terminalControl,
-                options
-            });
             printJson({
-                conversation: nextConversation,
-                approved: true,
+                conversation,
+                approved: false,
+                blocked: approval.blocked,
+                reason: approval.reason,
+                terminal_control: terminalControl,
+                expected_approval_fingerprint: expectedFingerprint,
+                actual_approval_fingerprint: actualFingerprint,
+                screen_excerpt: approval.screenExcerpt
+            });
+            return;
+        }
+        appendEvent(logPath, {
+            ts: cliNow().toISOString(),
+            conversation_id: conversation.conversation_id,
+            event: "terminal_approval_send",
+            terminal_control: terminalControl,
+            key: approval.key,
+            keys: approval.keys,
+            label: approval.label,
+            decision_mode: approval.decisionMode,
+            request_id: approval.requestId,
+            approval_fingerprint: actualFingerprint,
+            auto_approved: autoApproved,
+            policy_rule_id: effectivePolicyRuleId,
+            policy_fingerprint: effectivePolicyFingerprint
+        });
+        if (autoApproved) {
+            appendEvent(logPath, {
+                ts: cliNow().toISOString(),
+                conversation_id: conversation.conversation_id,
+                event: "terminal_auto_approval_decision",
+                action: "approved",
                 terminal_control: terminalControl,
-                key: approval.key,
-                keys: approval.keys,
-                label: approval.label,
-                decision_mode: approval.decisionMode,
-                request_id: approval.requestId,
                 approval_fingerprint: actualFingerprint,
-                auto_approved: autoApproved,
                 policy_rule_id: effectivePolicyRuleId,
-                policy_fingerprint: effectivePolicyFingerprint,
-                monitor_pid: bridgeMonitor.monitorPid ?? null,
-                monitor_handoff_pid: bridgeMonitor.handoffWatchdog?.pid ?? null
+                policy_fingerprint: effectivePolicyFingerprint
             });
+        }
+        runtimeLog("info", "terminal_approval_send", {
+            conversation_id: conversation.conversation_id,
+            terminal_target: terminalControl.target,
+            key: approval.key,
+            keys: approval.keys,
+            label: approval.label,
+            decision_mode: approval.decisionMode,
+            request_id: approval.requestId,
+            approval_fingerprint: actualFingerprint,
+            auto_approved: autoApproved,
+            policy_rule_id: effectivePolicyRuleId,
+            policy_fingerprint: effectivePolicyFingerprint
+        });
+        const nativeTakeoverForUpdate = isRecord(lockedConversation.native_session_takeover)
+            ? { ...lockedConversation.native_session_takeover }
+            : {};
+        const resolvedApproval = isRecord(nativeTakeoverForUpdate.terminal_bridge_approval)
+            ? nativeTakeoverForUpdate.terminal_bridge_approval
+            : undefined;
+        const resolvedApprovalScreenDigest = stringValue(resolvedApproval?.screen_digest);
+        const resolvedApprovalState = isRecord(resolvedApproval?.approval_state)
+            ? resolvedApproval.approval_state
+            : undefined;
+        const resolvedTranscriptIdentity = claudeTranscriptApprovalIdentity(resolvedApprovalState);
+        const approvalResolvedAt = cliNow().toISOString();
+        const agentTimeoutMinutes = Number(options.agentTimeoutMinutes ??
+            nativeTakeoverForUpdate.terminal_bridge_inactivity_timeout_minutes ??
+            DEFAULT_AGENT_TIMEOUT_MINUTES);
+        const agentHardTimeoutMinutes = positiveMinutes(options.agentHardTimeoutMinutes ??
+            nativeTakeoverForUpdate.terminal_bridge_hard_timeout_minutes ??
+            DEFAULT_AGENT_HARD_TIMEOUT_MINUTES, "--agent-hard-timeout-minutes");
+        const nextNativeTakeover = {
+            ...nativeTakeoverForUpdate,
+            terminal_bridge_approval: undefined,
+            terminal_bridge_approval_dispatch: undefined,
+            terminal_bridge_approval_resolved_at: approvalResolvedAt,
+            terminal_bridge_last_approval_fingerprint: actualFingerprint,
+            terminal_bridge_last_approval_screen_digest: resolvedApprovalScreenDigest,
+            terminal_bridge_last_approval_request_id: resolvedTranscriptIdentity?.requestId,
+            terminal_bridge_last_approval_evidence_fingerprint: resolvedTranscriptIdentity?.evidenceFingerprint,
+            terminal_bridge_last_approval_prompt_cleared_at: undefined,
+            terminal_bridge_last_approval_at: approvalResolvedAt,
+            terminal_bridge_last_approval_message_id: nativeTakeoverForUpdate.terminal_bridge_message_id,
+            terminal_bridge_monitor_lock_version: TERMINAL_BRIDGE_MONITOR_LOCK_VERSION,
+            terminal_bridge_monitor_started_at: approvalResolvedAt,
+            terminal_bridge_last_activity_at: approvalResolvedAt,
+            terminal_bridge_last_activity_reason: "approval resolved",
+            terminal_bridge_inactivity_timeout_minutes: agentTimeoutMinutes,
+            terminal_bridge_hard_timeout_minutes: agentHardTimeoutMinutes,
+            terminal_bridge_inactivity_deadline_at: deadlineAt(approvalResolvedAt, agentTimeoutMinutes),
+            terminal_bridge_hard_deadline_at: deadlineAt(stringValue(nativeTakeoverForUpdate.terminal_bridge_started_at) ?? approvalResolvedAt, agentHardTimeoutMinutes)
+        };
+        delete nextNativeTakeover.terminal_bridge_approval;
+        delete nextNativeTakeover.terminal_bridge_approval_dispatch;
+        delete nextNativeTakeover.terminal_bridge_last_approval_prompt_cleared_at;
+        const nextConversation = {
+            ...lockedConversation,
+            status: terminalBridgeEnabled(lockedConversation)
+                ? "waiting_for_agent"
+                : lockedConversation.status,
+            native_session_takeover: nextNativeTakeover,
+            updated_at: approvalResolvedAt
+        };
+        saveState(statePath, nextConversation);
+        releaseApprovalStateLock();
+        const bridgeMonitor = ensureTerminalBridgeMonitorAfterApproval({
+            conversation: nextConversation,
+            statePath,
+            logPath,
+            terminalControl,
+            options
+        });
+        printJson({
+            conversation: nextConversation,
+            approved: true,
+            terminal_control: terminalControl,
+            key: approval.key,
+            keys: approval.keys,
+            label: approval.label,
+            decision_mode: approval.decisionMode,
+            request_id: approval.requestId,
+            approval_fingerprint: actualFingerprint,
+            auto_approved: autoApproved,
+            policy_rule_id: effectivePolicyRuleId,
+            policy_fingerprint: effectivePolicyFingerprint,
+            monitor_pid: bridgeMonitor.monitorPid ?? null,
+            monitor_handoff_pid: bridgeMonitor.handoffWatchdog?.pid ?? null
+        });
+    };
+    try {
+        return await withStoreWriterLeaseAsync(writerStoreDir, async () => {
+            releaseStateLock = acquireFileLock(`${statePath}.lock`);
+            try {
+                return await runApprovalWithStateLock();
+            }
+            finally {
+                releaseApprovalStateLock();
+            }
         });
     }
     finally {
@@ -20341,12 +20355,20 @@ async function runTerminalBridgeMonitorWithLock(options, lifecycle, expectedTerm
                 });
             }
         }
+        const approvalPromptEvidenceUnavailable = isRecord(approval) &&
+            approval.blocked === true &&
+            approval.approvable === true &&
+            (stringValue(approval.decision_mode) ?? "keys") === "keys" &&
+            !stringValue(approval.fingerprint);
         if (!suppressApprovalNotification &&
             isRecord(approval) &&
             approval.blocked === true &&
-            approval.approvable !== true) {
-            const approvalReason = stringValue(approval.reason) ??
-                "Claude Code permission state cannot be safely resolved through AKK";
+            (approval.approvable !== true ||
+                approvalPromptEvidenceUnavailable)) {
+            const approvalReason = approvalPromptEvidenceUnavailable
+                ? `${executor.display_name} approval prompt lacks exact prompt-region evidence`
+                : stringValue(approval.reason) ??
+                    "Claude Code permission state cannot be safely resolved through AKK";
             appendEvent(logPath, {
                 ts: cliNow().toISOString(),
                 conversation_id: conversation.conversation_id,