@scotthuang/agent-knock-knock 0.2.40 → 0.2.41

package/dist/src/cli.js

@@ -633,18 +633,21 @@ function detectCodexApprovalPrompt(screen) {
         if (key !== "y") {
             return {
                 approvable: false,
-                reason: `primary approval shortcut is ${key}, not y`
+                reason: `primary approval shortcut is ${key}, not y`,
+                ...approvalCandidateFromPrompt(prompt.marker, prompt.region)
             };
         }
         return {
             approvable: true,
             key,
-            label: match[1].trim()
+            label: match[1].trim(),
+            ...approvalCandidateFromPrompt(prompt.marker, prompt.region)
         };
     }
     return {
         approvable: false,
-        reason: "no primary approve option with a shortcut was detected"
+        reason: "no primary approve option with a shortcut was detected",
+        ...approvalCandidateFromPrompt(prompt.marker, prompt.region)
     };
 }
 function isCodexApprovalPromptVisible(screen) {
@@ -659,9 +662,12 @@ function codexApprovalPromptRegion(screen) {
     ];
     const lines = screen.split(/\r?\n/);
     let markerIndex = -1;
+    let matchedMarker = "";
     for (let index = lines.length - 1; index >= 0; index -= 1) {
-        if (approvalMarkers.some((marker) => lines[index].includes(marker))) {
+        const marker = approvalMarkers.find((candidate) => lines[index].includes(candidate));
+        if (marker) {
             markerIndex = index;
+            matchedMarker = marker;
             break;
         }
     }
@@ -681,9 +687,40 @@ function codexApprovalPromptRegion(screen) {
     }
     return {
         visible: true,
-        region: regionLines.join("\n")
+        region: regionLines.join("\n"),
+        marker: matchedMarker
     };
 }
+function approvalCandidateFromPrompt(marker, region) {
+    const promptKind = marker === "Would you like to run the following command?"
+        ? "run_command"
+        : marker === "Would you like to make the following edits?"
+            ? "file_edit"
+            : marker === "Would you like to grant these permissions?"
+                ? "grant_permissions"
+                : "unknown";
+    return {
+        promptKind,
+        command: promptKind === "run_command" ? commandFromApprovalRegion(region) : undefined
+    };
+}
+function commandFromApprovalRegion(region) {
+    const lines = region.split(/\r?\n/);
+    const commandStart = lines.findIndex((line) => /^\s*\$\s+/u.test(line));
+    if (commandStart < 0) {
+        return undefined;
+    }
+    const parts = [];
+    for (let index = commandStart; index < lines.length; index += 1) {
+        const line = lines[index];
+        if (index > commandStart && (!line.trim() || /^[\s›]*\d+\.\s+/u.test(line) || /Press enter to confirm/u.test(line))) {
+            break;
+        }
+        parts.push(index === commandStart ? line.replace(/^\s*\$\s+/u, "").trim() : line.trim());
+    }
+    const command = parts.filter(Boolean).join(" ").trim();
+    return command ? redactString(command) : undefined;
+}
 function isPostApprovalActivityLine(line) {
     const trimmed = line.trim();
     if (!trimmed) {
@@ -1636,6 +1673,8 @@ async function listStateForTerminal(terminalControl, options) {
                 approvable: approval.approvable,
                 key: approval.approvable ? approval.key : undefined,
                 label: approval.approvable ? approval.label : undefined,
+                prompt_kind: approval.promptKind,
+                command: approval.command,
                 reason: approval.approvable ? undefined : approval.reason,
                 screen_excerpt: blocked ? screenExcerpt(screen, 1000) : undefined
             },
@@ -1852,6 +1891,8 @@ async function terminalStatusForControl(terminalControl, options) {
                 approvable: approval.approvable,
                 key: approval.approvable ? approval.key : undefined,
                 label: approval.approvable ? approval.label : undefined,
+                prompt_kind: approval.promptKind,
+                command: approval.command,
                 reason: approval.approvable ? undefined : approval.reason
             },
             screen: {
@@ -1886,11 +1927,29 @@ function terminalBridgeApprovalFingerprint({ terminalControl, terminalStatus })
         target: terminalControl.target,
         key: approval.key,
         label: approval.label,
+        prompt_kind: approval.prompt_kind,
+        command: approval.command,
         excerpt: screen.excerpt
     }))
         .digest("hex")
         .slice(0, 16);
 }
+function terminalBridgeApprovalFingerprintForScreen({ terminalControl, screen, approval }) {
+    return terminalBridgeApprovalFingerprint({
+        terminalControl,
+        terminalStatus: {
+            approval_state: {
+                key: approval.key,
+                label: approval.label,
+                prompt_kind: approval.promptKind,
+                command: approval.command
+            },
+            screen: {
+                excerpt: screenExcerpt(screen)
+            }
+        }
+    });
+}
 function terminalBridgeApprovalInstructions({ conversation, terminalControl, terminalStatus }) {
     const approval = isRecord(terminalStatus?.approval_state) ? terminalStatus.approval_state : {};
     const screen = isRecord(terminalStatus?.screen) ? terminalStatus.screen : {};
@@ -2392,6 +2451,38 @@ async function runApprove(options) {
         });
         return;
     }
+    const expectedFingerprint = stringValue(options.expectedApprovalFingerprint);
+    const actualFingerprint = terminalBridgeApprovalFingerprintForScreen({ terminalControl, screen, approval });
+    const autoApproved = options.autoApproved === true;
+    const policyRuleId = stringValue(options.policyRuleId);
+    const policyFingerprint = stringValue(options.policyFingerprint);
+    if (expectedFingerprint && actualFingerprint !== expectedFingerprint) {
+        if (autoApproved) {
+            appendEvent(logPath, {
+                ts: new Date().toISOString(),
+                conversation_id: conversation.conversation_id,
+                event: "terminal_auto_approval_decision",
+                action: "rejected",
+                reason: "approval fingerprint changed before execution",
+                terminal_control: terminalControl,
+                expected_fingerprint: expectedFingerprint,
+                actual_fingerprint: actualFingerprint,
+                policy_rule_id: policyRuleId,
+                policy_fingerprint: policyFingerprint
+            });
+        }
+        printJson({
+            conversation,
+            approved: false,
+            blocked: true,
+            reason: "approval fingerprint changed before execution",
+            terminal_control: terminalControl,
+            expected_approval_fingerprint: expectedFingerprint,
+            actual_approval_fingerprint: actualFingerprint,
+            screen_excerpt: screenExcerpt(screen)
+        });
+        return;
+    }
     await provider.sendKeys(terminalControl.target, [approval.key], {
         socketPath: terminalControl.socketPath
     });
@@ -2401,13 +2492,33 @@ async function runApprove(options) {
         event: "terminal_approval_send",
         terminal_control: terminalControl,
         key: approval.key,
-        label: approval.label
+        label: approval.label,
+        approval_fingerprint: actualFingerprint,
+        auto_approved: autoApproved,
+        policy_rule_id: policyRuleId,
+        policy_fingerprint: policyFingerprint
     });
+    if (autoApproved) {
+        appendEvent(logPath, {
+            ts: new Date().toISOString(),
+            conversation_id: conversation.conversation_id,
+            event: "terminal_auto_approval_decision",
+            action: "approved",
+            terminal_control: terminalControl,
+            approval_fingerprint: actualFingerprint,
+            policy_rule_id: policyRuleId,
+            policy_fingerprint: policyFingerprint
+        });
+    }
     runtimeLog("info", "terminal_approval_send", {
         conversation_id: conversation.conversation_id,
         terminal_target: terminalControl.target,
         key: approval.key,
-        label: approval.label
+        label: approval.label,
+        approval_fingerprint: actualFingerprint,
+        auto_approved: autoApproved,
+        policy_rule_id: policyRuleId,
+        policy_fingerprint: policyFingerprint
     });
     const nativeTakeoverForUpdate = isRecord(conversation.native_session_takeover)
         ? { ...conversation.native_session_takeover }
@@ -2454,6 +2565,9 @@ async function runApprove(options) {
         terminal_control: terminalControl,
         key: approval.key,
         label: approval.label,
+        approval_fingerprint: actualFingerprint,
+        auto_approved: autoApproved,
+        policy_rule_id: policyRuleId,
         monitor_pid: bridgeMonitor?.pid ?? null
     });
 }
@@ -3687,6 +3801,12 @@ async function runTerminalBridgeMonitor(options) {
                     terminal_control: terminalControl,
                     terminal_status: terminalStatus,
                     approval_fingerprint: fingerprint,
+                    approval_candidate: terminalBridgeApprovalCandidate({
+                        executor,
+                        terminalControl,
+                        terminalStatus,
+                        fingerprint
+                    }),
                     approve_command: `AKK approve ${notification.conversation.conversation_id}`,
                     deny_command: `AKK cancel ${notification.conversation.conversation_id}`,
                     approve_tool: "agent_knock_knock_approve",
@@ -3814,6 +3934,20 @@ async function runTerminalBridgeMonitor(options) {
         sleepSync(pollIntervalMs);
     }
 }
+function terminalBridgeApprovalCandidate({ executor, terminalControl, terminalStatus, fingerprint }) {
+    const approval = isRecord(terminalStatus?.approval_state) ? terminalStatus.approval_state : {};
+    if (approval.approvable !== true) {
+        return undefined;
+    }
+    return {
+        agent: executor.kind,
+        kind: stringValue(approval.prompt_kind) ?? "unknown",
+        command: stringValue(approval.command),
+        cwd: terminalControl.currentPath,
+        fingerprint,
+        terminal_target: terminalControl.target
+    };
+}
 async function terminalBridgeCodexContext({ conversation, nativeTakeover, options }) {
     const provider = createAgentSessionProvider("codex", options);
     const nativeSessionId = stringValue(nativeTakeover?.["native_session_id"]);