@scotthuang/agent-knock-knock 0.12.28 → 0.12.30

package/dist/src/terminal-command-cli-adapter.js

@@ -14,6 +14,7 @@ import { readNdjsonLog } from "./transcript.js";
 import { appendEvent, appendExplicitUserCloseEvent, defaultStoreDir, ensureDir, ensureStoreWritable, listConversations, loadState, messageEvent, pathsForConversation, pathsForConversationDir, saveExplicitUserCloseState, saveState, withStoreWriterLeaseAsync } from "./store.js";
 import { createManagedSessionId, managedSessionBindingToken, managedSessionRevision, unmanagedTerminalBindingToken } from "./managed-session.js";
 import { listManagedSessions, loadManagedSession, saveManagedSession, tryLoadManagedSession } from "./session-store.js";
+import { isTerminalApprovalDecision } from "./terminal-agent-adapter.js";
 import { terminalControlEvidenceMatches } from "./terminal-control-ref.js";
 import { isExactClaudeNativeInspectionIdleComposer, TerminalEnterDispatchNotAttemptedError, TerminalInputNotStartedError } from "./terminal-agent-bridge.js";
 import { decideTerminalSubmissionRetry, loadTerminalSubmissionRetry, projectTerminalSubmissionRetryPending, saveTerminalSubmissionRetry, terminalSubmissionRetryLedgerFields, TERMINAL_SUBMISSION_RETRY_SCHEMA, TERMINAL_SUBMISSION_RETRY_VERSION } from "./terminal-submission-retry-service.js";
@@ -4572,6 +4573,7 @@ async function runTurnResponse({ options, messageBody }) {
     });
 }
 async function runApprove(options) {
+    const decision = terminalApprovalDecisionFromOptions(options);
     const terminalConversation = await resolveTerminalConversationFromOptions(options);
     if (terminalConversation) {
         assertExpectedHandoffTokenUsesExactTerminalSelector({
@@ -4581,6 +4583,9 @@ async function runApprove(options) {
         if (options.autoApproved === true) {
             throw new Error("automatic approval requires an exact managed Turn and cannot use a raw terminal selector");
         }
+        if (decision !== "approve_once") {
+            throw new Error("terminal-scoped approval supports approve_once only; use an exact managed Turn to reject");
+        }
         await runTerminalConversationApprove({
             options,
             terminal: terminalConversation
@@ -4606,6 +4611,9 @@ async function runApprove(options) {
         throw new Error(`conversation ${conversation.conversation_id} is not controlled through a terminal`);
     }
     const autoApproved = options.autoApproved === true;
+    if (autoApproved && decision !== "approve_once") {
+        throw new Error("automatic approval can only dispatch approve_once");
+    }
     const callbackAuthority = autoApprovalCallbackAuthorityFromOptions(options);
     if (!["waiting_for_agent", "waiting_for_openclaw"].includes(conversation.status) &&
         !(autoApproved && callbackAuthority)) {
@@ -4617,7 +4625,7 @@ async function runApprove(options) {
         : undefined;
     const suppliedExpectedFingerprint = stringValue(options.expectedApprovalFingerprint);
     const expectedFingerprint = suppliedExpectedFingerprint ??
-        stringValue(monitoredApproval?.fingerprint);
+        monitoredApprovalFingerprint(monitoredApproval, decision);
     const claudeScreenApproval = executor.kind === "claude";
     if (claudeScreenApproval) {
         const monitoredState = isRecord(monitoredApproval?.approval_state)
@@ -4689,7 +4697,7 @@ async function runApprove(options) {
                 return;
             }
             if (!suppliedExpectedFingerprint ||
-                expectedFingerprint !== monitoredApproval?.fingerprint) {
+                expectedFingerprint !== monitoredApprovalFingerprint(monitoredApproval, decision)) {
                 printJson({
                     conversation,
                     approved: false,
@@ -4728,9 +4736,27 @@ async function runApprove(options) {
         options, conversation, statePath, logPath,
         nativeTakeover: nativeTakeover,
         terminalControl, executor, monitoredApproval, expectedFingerprint,
-        autoApproved, claudeScreenApproval
+        autoApproved, claudeScreenApproval, decision
     });
 }
+function terminalApprovalDecisionFromOptions(options) {
+    const value = options.decision ?? "approve_once";
+    if (!isTerminalApprovalDecision(value)) {
+        throw new Error("--decision must be one of: approve_once, reject");
+    }
+    return value;
+}
+function monitoredApprovalFingerprint(approval, decision) {
+    if (decision === "approve_once") {
+        return stringValue(approval?.fingerprint);
+    }
+    const state = isRecord(approval?.approval_state)
+        ? approval.approval_state
+        : undefined;
+    const choices = Array.isArray(state?.choices) ? state.choices : [];
+    const choice = choices.find((candidate) => isRecord(candidate) && candidate.decision === decision);
+    return isRecord(choice) ? stringValue(choice.fingerprint) : undefined;
+}
 function approvalPolicyCandidateForInspection({ agent, currentTerminalControl, inspection, fingerprint }) {
     const evidence = inspection.approval.approvable
         ? inspection.approval.policyEvidence
@@ -4753,7 +4779,7 @@ function approvalPolicyCandidateForInspection({ agent, currentTerminalControl, i
             : {})
     };
 }
-async function runManagedApprovalDispatch({ options, conversation, statePath, logPath, nativeTakeover, terminalControl, executor, monitoredApproval, expectedFingerprint, autoApproved, claudeScreenApproval }) {
+async function runManagedApprovalDispatch({ options, conversation, statePath, logPath, nativeTakeover, terminalControl, executor, monitoredApproval, expectedFingerprint, autoApproved, claudeScreenApproval, decision }) {
     const policyRuleId = stringValue(options.policyRuleId);
     const policyFingerprint = stringValue(options.policyFingerprint);
     const autoApprovalPolicy = autoApproved
@@ -4804,7 +4830,8 @@ async function runManagedApprovalDispatch({ options, conversation, statePath, lo
                     currentTakeover?.terminal_bridge_message_id !==
                         nativeTakeover?.terminal_bridge_message_id ||
                     (claudeScreenApproval &&
-                        currentApproval?.fingerprint !== monitoredApproval?.fingerprint)))) {
+                        monitoredApprovalFingerprint(currentApproval, decision) !==
+                            monitoredApprovalFingerprint(monitoredApproval, decision))))) {
             throw new Error("approval state changed while waiting for terminal control; refresh status and retry");
         }
         lockedConversation = currentConversation;
@@ -4828,6 +4855,7 @@ async function runManagedApprovalDispatch({ options, conversation, statePath, lo
         });
         const currentRuntimeIdentity = terminalRuntimeIdentityForConversation(currentConversation, currentControl);
         approval = await createTerminalAgentBridge(options).approve(executor.kind, currentControl, {
+            decision,
             expectedFingerprint,
             scrollbackLines: Number(options.scrollbackLines ?? 120),
             runtime: currentRuntimeIdentity,
@@ -4936,7 +4964,8 @@ async function runManagedApprovalDispatch({ options, conversation, statePath, lo
                         latestConversation.status !== "waiting_for_openclaw" ||
                         latestTakeover.terminal_bridge_message_id !==
                             nativeTakeover?.terminal_bridge_message_id ||
-                        latestApproval?.fingerprint !== fingerprint ||
+                        monitoredApprovalFingerprint(latestApproval, decision) !==
+                            fingerprint ||
                         latestNotifiedAt === undefined ||
                         cliNowMs() - latestNotifiedAt > CLAUDE_SCREEN_APPROVAL_TTL_MS ||
                         expectedFingerprint !== fingerprint ||
@@ -4960,6 +4989,7 @@ async function runManagedApprovalDispatch({ options, conversation, statePath, lo
                             terminal_bridge_approval_dispatch: {
                                 state: "reserved",
                                 attempt_id: randomUUID(),
+                                decision,
                                 fingerprint,
                                 keys,
                                 terminal_target: dispatchControl.target,
@@ -4977,7 +5007,7 @@ async function runManagedApprovalDispatch({ options, conversation, statePath, lo
         const actualFingerprint = approval.fingerprint;
         const effectivePolicyRuleId = executorPolicyDecision?.ruleId ?? policyRuleId;
         const effectivePolicyFingerprint = executorPolicyDecision?.policyFingerprint ?? policyFingerprint;
-        if (!approval.approved) {
+        if (approval.decisionDispatched !== true) {
             releaseApprovalStateLock();
             if (autoApproved) {
                 appendEvent(logPath, {
@@ -4996,6 +5026,8 @@ async function runManagedApprovalDispatch({ options, conversation, statePath, lo
             printJson({
                 conversation,
                 approved: false,
+                decision,
+                decision_dispatched: false,
                 blocked: approval.blocked,
                 reason: approval.reason,
                 terminal_control: terminalControl,
@@ -5009,6 +5041,7 @@ async function runManagedApprovalDispatch({ options, conversation, statePath, lo
             ts: cliNow().toISOString(),
             conversation_id: conversation.conversation_id,
             event: "terminal_approval_send",
+            decision,
             terminal_control: terminalControl,
             key: approval.key,
             keys: approval.keys,
@@ -5035,6 +5068,7 @@ async function runManagedApprovalDispatch({ options, conversation, statePath, lo
         runtimeLog("info", "terminal_approval_send", {
             conversation_id: conversation.conversation_id,
             terminal_target: terminalControl.target,
+            decision,
             key: approval.key,
             keys: approval.keys,
             label: approval.label,
@@ -5069,6 +5103,7 @@ async function runManagedApprovalDispatch({ options, conversation, statePath, lo
             terminal_bridge_approval_dispatch: undefined,
             terminal_bridge_approval_resolved_at: approvalResolvedAt,
             terminal_bridge_last_approval_fingerprint: actualFingerprint,
+            terminal_bridge_last_approval_decision: decision,
             terminal_bridge_last_approval_screen_digest: resolvedApprovalScreenDigest,
             terminal_bridge_last_approval_request_id: resolvedTranscriptIdentity?.requestId,
             terminal_bridge_last_approval_evidence_fingerprint: resolvedTranscriptIdentity?.evidenceFingerprint,
@@ -5106,7 +5141,10 @@ async function runManagedApprovalDispatch({ options, conversation, statePath, lo
         });
         printJson({
             conversation: nextConversation,
-            approved: true,
+            approved: decision === "approve_once",
+            rejected: decision === "reject",
+            decision,
+            decision_dispatched: true,
             terminal_control: terminalControl,
             key: approval.key,
             keys: approval.keys,