@scotthuang/agent-knock-knock 0.12.18 → 0.12.20

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

@@ -33,6 +33,7 @@ import { cleanupDeferredForegroundUserClose } from "./deferred-foreground-user-c
 import { deferredForegroundBoundaryProjection } from "./deferred-foreground-preparation-cli-adapter.js";
 import { terminalSubmissionPayload } from "./terminal-dispatch-execution.js";
 import { createTerminalUserSendIntentRepository, TerminalUserSendIntentBoundaryConflictError, TerminalUserSendIntentUncertainError } from "./terminal-user-send-intent.js";
+import { terminalUserExplicitFallbackWatchId } from "./terminal-watch-store.js";
 import { presentTerminalCompleted, presentTerminalDispatchReplay, presentTerminalIdentityFailure, presentTerminalUncertain, presentTerminalZeroInputAbort as renderTerminalZeroInputAbort } from "./terminal-dispatch-presenter.js";
 import * as dispatchReceipt from "./terminal-dispatch-receipt.js";
 import { expandHome, positiveMilliseconds, writeCliJson as printJson } from "./cli-command-runtime.js";
@@ -96,8 +97,10 @@ const observeCurrentNativeAgentSessionIdentity = rawPort("observeCurrentNativeAg
 const parseJsonOption = rawPort("parseJsonOption");
 const persistManagedSessionNativeIdentity = rawPort("persistManagedSessionNativeIdentity");
 const positiveMinutes = rawPort("positiveMinutes");
+const prepareUserExplicitFallbackWatch = rawPort("prepareUserExplicitFallbackWatch");
 const processIncarnationForPid = rawPort("processIncarnationForPid");
 const prepareDeferredCodexForegroundBinding = rawPort("prepareDeferredCodexForegroundBinding");
+const attachUserExplicitFallbackWatch = rawPort("attachUserExplicitFallbackWatch");
 const quarantineManagedSessionBinding = rawPort("quarantineManagedSessionBinding");
 const reattachManagedSessionForNativeIdentity = rawPort("reattachManagedSessionForNativeIdentity");
 const reconcilePreparedTerminalDispatchLedger = rawPort("reconcilePreparedTerminalDispatchLedger");
@@ -128,6 +131,7 @@ const textSummary = rawPort("textSummary");
 const verifyCodexPendingManagedSendStatus = rawPort("verifyCodexPendingManagedSendStatus");
 const withTerminalBridgeSubmission = rawPort("withTerminalBridgeSubmission");
 const withTerminalDispatchStateScope = rawPort("withTerminalDispatchStateScope");
+const userExplicitFallbackWatchReceipt = rawPort("userExplicitFallbackWatchReceipt");
 const mutationDispatchLedger = new Proxy({}, {
     get: (_target, property) => terminalCommandRuntime().ports.mutationDispatchLedger[property]
 });
@@ -3420,7 +3424,7 @@ function acquireUserExplicitTerminalSendLock(options, terminal, warnings) {
         }
     };
 }
-function printReplayedUserExplicitSend(terminal, intent, deliveryMode) {
+function printReplayedUserExplicitSend(options, terminal, intent, deliveryMode) {
     if (deliveryMode === "managed") {
         printJson({
             delivered: false,
@@ -3436,10 +3440,19 @@ function printReplayedUserExplicitSend(terminal, intent, deliveryMode) {
         });
         return;
     }
+    const watchId = terminalUserExplicitFallbackWatchId({
+        messageId: intent.messageId,
+        physicalToken: intent.boundary.physicalToken,
+        requestHash: intent.boundary.requestHash
+    });
+    const callbackReceipt = userExplicitFallbackWatchReceipt({
+        options,
+        watchId
+    });
     printJson({
         delivered: true,
         delivered_unmanaged: true,
-        callback_expected: false,
+        ...(callbackReceipt ?? { callback_expected: false }),
         management_mode: "unmanaged_fallback",
         replayed: true,
         terminal_id: terminal.conversationId,
@@ -3472,7 +3485,7 @@ function reserveUserExplicitSendIntent(options, messageBody, terminal) {
     // remains a replay even when stdout fails (for example EPIPE); it must never
     // degrade into a fresh physical Send.
     if (reservation.outcome === "replay") {
-        printReplayedUserExplicitSend(terminal, intent, required(reservation.intent.delivery_mode, "completed explicit Send delivery mode is unavailable"));
+        printReplayedUserExplicitSend(options, terminal, intent, required(reservation.intent.delivery_mode, "completed explicit Send delivery mode is unavailable"));
         return { outcome: "replayed" };
     }
     if (reservation.outcome === "uncertain") {
@@ -3606,6 +3619,26 @@ async function runUserExplicitTerminalFallback(options, terminal, managedFailure
             });
             throw error;
         }
+        let preparedCallbackWatch;
+        const callbackWarnings = [];
+        try {
+            preparedCallbackWatch = await prepareUserExplicitFallbackWatch({
+                options,
+                terminal: fresh,
+                requestHash: intentLease.intent.boundary.requestHash,
+                messageId,
+                physicalToken: intentLease.intent.boundary.physicalToken
+            });
+        }
+        catch (error) {
+            const warning = `automatic callback Watch preparation failed: ${error instanceof Error ? error.message : String(error)}`;
+            callbackWarnings.push(warning);
+            runtimeLog("warn", "terminal_user_explicit_fallback_watch_prepare_failed", {
+                terminal_id: fresh.conversationId,
+                message_id: messageId,
+                warning
+            });
+        }
         let composerDisposition = "replaced_current_composer";
         try {
             const revalidatePhysicalMutation = async (terminalControl) => {
@@ -3667,6 +3700,26 @@ async function runUserExplicitTerminalFallback(options, terminal, managedFailure
             });
             throw error;
         }
+        let callbackReceipt;
+        if (preparedCallbackWatch) {
+            try {
+                callbackReceipt = await attachUserExplicitFallbackWatch({
+                    options,
+                    prepared: preparedCallbackWatch
+                });
+            }
+            catch (error) {
+                const warning = `automatic callback Watch attachment failed: ${error instanceof Error ? error.message : String(error)}`;
+                callbackWarnings.push(warning);
+                runtimeLog("warn", "terminal_user_explicit_fallback_watch_attach_failed", {
+                    terminal_id: fresh.conversationId,
+                    message_id: messageId,
+                    watch_id: preparedCallbackWatch.watchId,
+                    warning,
+                    delivered: true
+                });
+            }
+        }
         let cleanupWarnings;
         try {
             cleanupWarnings = await bestEffortReleaseTerminalManagementForExplicitSend({
@@ -3695,7 +3748,8 @@ async function runUserExplicitTerminalFallback(options, terminal, managedFailure
             delivered_unmanaged: true,
             cleanup_warnings: cleanupWarnings,
             intent_warnings: intentWarnings,
-            callback_expected: false,
+            callback_warnings: callbackWarnings,
+            ...(callbackReceipt ?? { callback_expected: false }),
             terminal_id: fresh.conversationId,
             message_id: messageId,
             scope: "terminal_user_explicit",
@@ -3708,8 +3762,15 @@ async function runUserExplicitTerminalFallback(options, terminal, managedFailure
             replaced_existing_draft: true,
             previous_management_release_attempted: true,
             warning: textSummary(`AKK delivered the user's message after managed-state preparation ` +
-                `failed (${fallbackReason}). No callback Turn was claimed.`),
-            next_action: "refresh AKK list; the live coding agent continues independently of AKK callback state"
+                `failed (${fallbackReason}). ` +
+                (callbackReceipt
+                    ? `Terminal Watch ${callbackReceipt.watch_id} now provides the ` +
+                        `completion callback; no managed Turn was claimed.`
+                    : "No callback Watch could be attached.")),
+            next_action: callbackReceipt
+                ? `wait for Terminal Watch ${callbackReceipt.watch_id} callback; ` +
+                    "watch-status remains available for recovery"
+                : "refresh AKK list; the live coding agent continues independently of AKK callback state"
         });
     }
     finally {