@scotthuang/agent-knock-knock 0.2.43 → 0.2.46

package/dist/src/cli.js

@@ -5,20 +5,26 @@ import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
+import { createCodexTerminalAgentAdapter, detectCodexDurableCompletion } from "./codex-terminal-agent-adapter.js";
 import { CodexLocalSessionProvider } from "./codex-local-session-provider.js";
 import { CodexStoreAdapter } from "./codex-store-adapter.js";
 import { applyMessageToConversation, budgetAction, createConversation, createMessage, executorForConversation, extractStructuredMessage, parseMessageJson, resolveExecutor } from "./protocol.js";
 import { EXECUTOR_KINDS, acpxCommandForExecutor, executorDefinitionForKind, modelEnvForExecutor, normalizeModelForExecutor, proxyEnvForExecutor } from "./executors.js";
 import { executorBootstrapPrompt } from "./bootstrap.js";
-import { redactString, writeRuntimeLog } from "./runtime-log.js";
+import { writeRuntimeLog } from "./runtime-log.js";
 import { formatTranscript, readNdjsonLog } from "./transcript.js";
 import { appendEvent, defaultStoreDir, listConversations, logPathForStatePath, loadConversationById, loadState, messageEvent, pathsForConversation, pathsForConversationDir, saveState, statePathForConversationId } from "./store.js";
 import { planFork, planTakeover } from "./session-takeover-planner.js";
-import { StaticTerminalControlProvider, TmuxTerminalControlProvider, enrichActiveProcessesWithTerminalControl, terminalRefFromPane } from "./terminal-control-provider.js";
+import { StaticTerminalControlProvider, TmuxTerminalControlProvider } from "./terminal-control-provider.js";
+import { parseTerminalConversationId } from "./terminal-agent-adapter.js";
+import { createProductionTerminalAgentRegistry } from "./terminal-agent-registry.js";
+import { StaticTerminalProcessSource, SystemTerminalProcessSource } from "./terminal-process-source.js";
+import { TerminalAgentBridge } from "./terminal-agent-bridge.js";
 const DEFAULT_IDLE_TIMEOUT_MINUTES = 10080;
 const DEFAULT_AGENT_TIMEOUT_MINUTES = 60;
 const DEFAULT_AGENT_HARD_TIMEOUT_MINUTES = 720;
 const DEFAULT_MONITOR_POLL_INTERVAL_MS = 5000;
+const CALLBACK_RETRY_DELAYS_MS = [5000, 15000, 60000, 60000];
 const DEFAULT_CODEX_ACPX_AGENT_COMMAND = "npx -y @agentclientprotocol/codex-acp@^1.1.0";
 class InlineCodexSessionAdapter {
     threads;
@@ -127,6 +133,9 @@ async function runCommand(commandName, options) {
     else if (commandName === "callback") {
         runCallback(options);
     }
+    else if (commandName === "retry-callback") {
+        runRetryCallback(options);
+    }
     else if (commandName === "monitor") {
         await runMonitor(options);
     }
@@ -201,7 +210,9 @@ function installOpenClawPlugin(openclawBin, root) {
     }
     const failure = cleanProcessText(linked.stderr || linked.stdout)
         ?? `openclaw plugins install exited with status ${linked.status}`;
-    if (!/plugin already exists:/i.test(failure)) {
+    const canRetryWithForce = /plugin already exists:/i.test(failure) ||
+        /install cancelled;\s*rerun with --force\b/i.test(failure);
+    if (!canRetryWithForce) {
         throw new Error(failure);
     }
     runCheckedCommand(openclawBin, ["plugins", "install", "--force", root], {
@@ -547,7 +558,7 @@ function selectTerminateTarget({ plan, session, activeSessions, expectedPid, all
 }
 async function listActiveSessionsWithTerminalControl(provider, options, terminalProvider = createTerminalControlProvider(options)) {
     const activeSessions = await provider.listActiveSessions();
-    return enrichActiveProcessesWithTerminalControl(activeSessions, terminalProvider);
+    return createTerminalAgentBridge(options, terminalProvider).attachProcesses(provider.agent, activeSessions);
 }
 function createTerminalControlProvider(options) {
     if (options.terminalsJson || options.terminalScreensJson || options.processesJson) {
@@ -558,6 +569,57 @@ function createTerminalControlProvider(options) {
     }
     return new TmuxTerminalControlProvider();
 }
+function createTerminalProcessSource(options) {
+    if (options.processesJson) {
+        return new StaticTerminalProcessSource(parseJsonOption(options.processesJson, "--processes-json"));
+    }
+    return new SystemTerminalProcessSource();
+}
+function createRuntimeTerminalAgentRegistry(options) {
+    return createProductionTerminalAgentRegistry({
+        overrides: [createCodexTerminalAgentAdapter({
+                async detectDurableCompletion(request) {
+                    const runtime = isRecord(request.context) ? request.context : undefined;
+                    const conversation = runtime?.conversation;
+                    const nativeTakeover = isRecord(runtime?.nativeTakeover)
+                        ? runtime?.nativeTakeover
+                        : undefined;
+                    if (!isRecord(conversation)) {
+                        return undefined;
+                    }
+                    const contextMatch = await loadCodexTerminalContext({
+                        conversation,
+                        nativeTakeover,
+                        options
+                    });
+                    if (!contextMatch?.context) {
+                        return undefined;
+                    }
+                    const evidence = detectCodexDurableCompletion({
+                        ...request,
+                        context: contextMatch.context
+                    });
+                    return evidence
+                        ? {
+                            ...evidence,
+                            confidence: contextMatch.confidence,
+                            metadata: {
+                                ...evidence.metadata,
+                                context_match: contextMatch.match,
+                                session: contextMatch.context.source
+                            }
+                        }
+                        : undefined;
+                }
+            })]
+    });
+}
+function createTerminalAgentBridge(options, terminalProvider = createTerminalControlProvider(options)) {
+    return new TerminalAgentBridge({
+        registry: createRuntimeTerminalAgentRegistry(options),
+        terminalProvider
+    });
+}
 function planTerminalControlTakeover(session, activeSessions) {
     const matched = activeSessions
         .filter((process) => process.kind === "codex_cli" &&
@@ -607,6 +669,9 @@ function terminalControlFromTakeover(nativeTakeover) {
     if (!target || !session || !Number.isInteger(window) || !Number.isInteger(pane) || !Number.isInteger(panePid)) {
         return undefined;
     }
+    const storedCapabilities = Array.isArray(terminalControl.capabilities)
+        ? terminalControl.capabilities.filter(isTerminalControlCapability)
+        : [];
     return {
         kind: "tmux",
         target,
@@ -617,181 +682,28 @@ function terminalControlFromTakeover(nativeTakeover) {
         currentCommand: stringValue(terminalControl.currentCommand),
         currentPath: stringValue(terminalControl.currentPath),
         socketPath: stringValue(terminalControl.socketPath),
-        capabilities: ["screen_status", "send_keys", "terminal_approval"]
-    };
-}
-function detectCodexApprovalPrompt(screen) {
-    const prompt = codexApprovalPromptRegion(screen);
-    if (!prompt.visible) {
-        return {
-            approvable: false,
-            reason: prompt.reason
-        };
-    }
-    for (const line of prompt.region.split(/\r?\n/)) {
-        const match = /^[\s›]*1\.\s+(Yes,[^(]+)\(([^)]+)\)/u.exec(line.trim());
-        if (!match) {
-            continue;
-        }
-        const key = match[2].trim();
-        if (key !== "y") {
-            return {
-                approvable: false,
-                reason: `primary approval shortcut is ${key}, not y`,
-                ...approvalCandidateFromPrompt(prompt.marker, prompt.region)
-            };
-        }
-        return {
-            approvable: true,
-            key,
-            label: match[1].trim(),
-            ...approvalCandidateFromPrompt(prompt.marker, prompt.region)
-        };
-    }
-    return {
-        approvable: false,
-        reason: "no primary approve option with a shortcut was detected",
-        ...approvalCandidateFromPrompt(prompt.marker, prompt.region)
-    };
-}
-function isCodexApprovalPromptVisible(screen) {
-    return codexApprovalPromptRegion(screen).visible;
-}
-function codexApprovalPromptRegion(screen) {
-    const approvalMarkers = [
-        "Would you like to run the following command?",
-        "Would you like to make the following edits?",
-        "Would you like to grant these permissions?",
-        "needs your approval."
-    ];
-    const lines = screen.split(/\r?\n/);
-    let markerIndex = -1;
-    let matchedMarker = "";
-    for (let index = lines.length - 1; index >= 0; index -= 1) {
-        const marker = approvalMarkers.find((candidate) => lines[index].includes(candidate));
-        if (marker) {
-            markerIndex = index;
-            matchedMarker = marker;
-            break;
-        }
-    }
-    if (markerIndex < 0) {
-        return {
-            visible: false,
-            reason: "no Codex approval prompt was detected in the terminal screen"
-        };
-    }
-    const regionLines = lines.slice(markerIndex);
-    const staleLine = regionLines.slice(1).find((line) => isPostApprovalActivityLine(line));
-    if (staleLine) {
-        return {
-            visible: false,
-            reason: `Codex approval prompt appears stale after later terminal activity: ${staleLine.trim()}`
-        };
-    }
-    return {
-        visible: true,
-        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) {
-        return false;
-    }
-    if (/^✔\s+You approved\b/u.test(trimmed)) {
-        return true;
-    }
-    if (/^›\s+(?!1\.)\S/u.test(trimmed)) {
-        return true;
-    }
-    if (/^•\s+(Working|Ran|Explored|Edited|Read|Called|Searching|Planning|Updated|Added|Deleted|Modified|Running|Thinking)\b/u.test(trimmed)) {
-        return true;
-    }
-    return /^─\s*Worked for\b/u.test(trimmed);
-}
-function detectCodexActivityState(screen, approval = detectCodexApprovalPrompt(screen)) {
-    if (approval.approvable || isCodexApprovalPromptVisible(screen)) {
-        return {
-            state: "awaiting_approval",
-            reason: "current Codex approval prompt is visible"
-        };
-    }
-    const tailLines = screen.trimEnd().split(/\r?\n/).slice(-30);
-    const workingLine = tailLines.find((line) => isCodexWorkingLine(line));
-    if (workingLine) {
-        return {
-            state: "working",
-            reason: `Codex working marker detected: ${workingLine.trim()}`
-        };
-    }
-    const idleLine = tailLines
-        .slice(-6)
-        .map((line) => line.trim())
-        .find((line) => isCodexIdlePromptLine(line));
-    if (idleLine) {
-        return {
-            state: "idle",
-            reason: `Codex input prompt detected: ${idleLine}`
-        };
-    }
-    return {
-        state: "unknown",
-        reason: "no current Codex working, idle, or approval marker was detected in the terminal screen"
+        // State written before adapter capabilities were persisted always represented Codex.
+        capabilities: storedCapabilities.length > 0
+            ? storedCapabilities
+            : [
+                "screen_status",
+                "send_keys",
+                "terminal_approval",
+                "screen_completion",
+                "durable_completion",
+                "terminal_cancel"
+            ]
     };
 }
-function isCodexWorkingLine(line) {
-    const trimmed = line.trim();
-    if (!trimmed) {
-        return false;
-    }
-    if (/^•\s+Working\b/u.test(trimmed) && (/\besc to interrupt\b/u.test(trimmed) || trimmed === "• Working")) {
-        return true;
-    }
-    if (/^•\s+Waiting for background terminals?\b(?:\s*·|$)/u.test(trimmed)) {
-        return true;
-    }
-    return /^\d+\s+background terminals? running\b/u.test(trimmed) && /\/(?:ps|stop)\b/u.test(trimmed);
-}
-function isCodexIdlePromptLine(line) {
-    const trimmed = line.trim();
-    return /^›(?:\s|$)/u.test(trimmed) && !/^›\s*1\./u.test(trimmed);
-}
-function screenExcerpt(screen, maxLength = 4000) {
-    const lines = screen.trimEnd().split(/\r?\n/);
-    const excerpt = lines.slice(Math.max(0, lines.length - 80)).join("\n");
-    return redactString(excerpt).slice(-maxLength);
+function isTerminalControlCapability(value) {
+    return typeof value === "string" && [
+        "screen_status",
+        "send_keys",
+        "terminal_approval",
+        "screen_completion",
+        "durable_completion",
+        "terminal_cancel"
+    ].includes(value);
 }
 function createForkConversation({ agent, strategy, session, contextPackage, forkSummary, modelInfo, options }) {
     const workspace = session.cwd;
@@ -1533,57 +1445,59 @@ async function buildNativeListGroups({ options, agentFilter, statusFilter }) {
             }
         };
     }
-    if (agentFilter && agentFilter !== "codex") {
+    const registry = createRuntimeTerminalAgentRegistry(options);
+    const adapters = agentFilter
+        ? [registry.get(agentFilter)].filter((adapter) => adapter !== undefined)
+        : registry.list();
+    if (agentFilter && adapters.length === 0) {
         return {
             ...empty,
             summary: {
                 enabled: true,
                 agents: [],
-                skipped: `native active discovery is not implemented for ${agentFilter}`
+                skipped: `terminal agent adapter is not registered for ${agentFilter}`
             }
         };
     }
+    const terminalProvider = createTerminalControlProvider(options);
+    const bridge = new TerminalAgentBridge({ registry, terminalProvider });
+    const terminalScan = options.terminalDebug ? await terminalControlDiagnostics(terminalProvider) : undefined;
+    const terminalControlled = [];
+    const native = [];
+    let activeCount = 0;
+    const errors = [];
     try {
-        const provider = createAgentSessionProvider("codex", options);
-        const terminalProvider = createTerminalControlProvider(options);
-        const terminalScan = options.terminalDebug ? await terminalControlDiagnostics(terminalProvider) : undefined;
-        const activeSessions = await listActiveSessionsWithTerminalControl(provider, options, terminalProvider);
+        const processSource = createTerminalProcessSource(options);
+        const snapshots = await processSource.listProcessSnapshots((snapshot) => adapters.some((adapter) => adapter.capabilities.processDiscovery && adapter.classifyProcess(snapshot) !== undefined));
+        const activeSessions = await bridge.listProcesses(snapshots, adapters.map((adapter) => adapter.agent));
+        activeCount = activeSessions.length;
         const rootSessions = rootActiveProcesses(activeSessions);
-        const terminalControlled = [];
-        const native = [];
         for (const session of rootSessions) {
             if (session.terminalControl) {
-                terminalControlled.push(await terminalControlledListEntry(session, activeSessions, options));
+                terminalControlled.push(await terminalControlledListEntry(session, activeSessions, options, bridge));
             }
             else {
                 native.push(nativeListEntry(session, activeSessions));
             }
         }
-        return {
-            native,
-            terminalControlled,
-            summary: {
-                enabled: true,
-                agents: ["codex"],
-                active_count: activeSessions.length,
-                native_count: native.length,
-                terminal_controlled_count: terminalControlled.length,
-                approval_scan: options.noApprovalScan ? "disabled" : "enabled",
-                terminal_scan: terminalScan
-            }
-        };
     }
     catch (error) {
-        return {
-            native: [],
-            terminalControlled: [],
-            summary: {
-                enabled: true,
-                agents: ["codex"],
-                error: error instanceof Error ? error.message : String(error)
-            }
-        };
+        errors.push(error instanceof Error ? error.message : String(error));
     }
+    return {
+        native,
+        terminalControlled,
+        summary: {
+            enabled: true,
+            agents: adapters.map((adapter) => adapter.agent),
+            active_count: activeCount,
+            native_count: native.length,
+            terminal_controlled_count: terminalControlled.length,
+            approval_scan: options.noApprovalScan ? "disabled" : "enabled",
+            terminal_scan: terminalScan,
+            error: errors.length > 0 ? errors.join("; ") : undefined
+        }
+    };
 }
 async function terminalControlDiagnostics(provider) {
     if (provider instanceof TmuxTerminalControlProvider) {
@@ -1610,9 +1524,9 @@ function delegatedListEntry(task) {
 }
 function nativeListEntry(session, activeSessions) {
     return {
-        id: `native:codex:${session.pid}`,
+        id: `native:${session.agent}:${session.pid}`,
         source: "native_active",
-        agent: "codex",
+        agent: session.agent,
         status: "active",
         pid: session.pid,
         child_pids: childPidsForRoot(session, activeSessions),
@@ -1635,16 +1549,16 @@ function nativeListEntry(session, activeSessions) {
         }
     };
 }
-async function terminalControlledListEntry(session, activeSessions, options) {
+async function terminalControlledListEntry(session, activeSessions, options, bridge = createTerminalAgentBridge(options)) {
     const terminalControl = session.terminalControl;
     if (!terminalControl) {
         throw new Error(`process ${session.pid} is not terminal-controlled`);
     }
-    const terminalState = await listStateForTerminal(terminalControl, options);
+    const terminalState = await listStateForTerminal(session.agent, terminalControl, options, bridge);
     return {
-        id: `terminal:${terminalControl.kind}:${terminalControl.target}:${session.pid}`,
+        id: bridge.terminalConversationId(session),
         source: "terminal_control",
-        agent: "codex",
+        agent: session.agent,
         status: "active",
         pid: session.pid,
         child_pids: childPidsForRoot(session, activeSessions),
@@ -1661,14 +1575,15 @@ async function terminalControlledListEntry(session, activeSessions, options) {
         activity_reason: terminalState.activity_reason,
         commands: {
             send: true,
-            approve: terminalState.approval_state.approvable === true,
+            approve: terminalControl.capabilities.includes("terminal_approval") &&
+                terminalState.approval_state.approvable === true,
             status: true,
-            cancel: true,
+            cancel: terminalControl.capabilities.includes("terminal_cancel"),
             close: false
         }
     };
 }
-async function listStateForTerminal(terminalControl, options) {
+async function listStateForTerminal(agent, terminalControl, options, bridge = createTerminalAgentBridge(options)) {
     if (options.noApprovalScan) {
         return {
             approval_state: {
@@ -1682,27 +1597,17 @@ async function listStateForTerminal(terminalControl, options) {
         };
     }
     try {
-        const screen = await createTerminalControlProvider(options).capture(terminalControl.target, {
-            scrollbackLines: Number(options.scrollbackLines ?? 120),
-            socketPath: terminalControl.socketPath
+        const status = await bridge.status(agent, terminalControl, {
+            scrollbackLines: Number(options.scrollbackLines ?? 120)
         });
-        const approval = detectCodexApprovalPrompt(screen);
-        const blocked = isCodexApprovalPromptVisible(screen);
-        const activity = detectCodexActivityState(screen, approval);
         return {
             approval_state: {
-                scanned: true,
-                blocked,
-                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
+                ...status.approval_state,
+                screen_excerpt: status.approval_state.blocked ? status.screen.excerpt?.slice(-1000) : undefined
             },
-            activity_state: activity.state,
-            activity_reason: activity.reason
+            activity_state: status.activity_state,
+            activity_reason: status.activity_reason,
+            capability_limitation: status.capability_limitation
         };
     }
     catch (error) {
@@ -1719,11 +1624,13 @@ async function listStateForTerminal(terminalControl, options) {
     }
 }
 function rootActiveProcesses(processes) {
-    const pids = new Set(processes.map((process) => process.pid));
-    const roots = processes.filter((process) => !process.ppid || !pids.has(process.ppid));
+    const pids = new Set(processes.map((process) => `${process.agent}:${process.pid}`));
+    const roots = processes.filter((process) => !process.ppid || !pids.has(`${process.agent}:${process.ppid}`));
     const seenTerminalTargets = new Set();
     return roots.filter((process) => {
-        const terminalTarget = process.terminalControl?.target;
+        const terminalTarget = process.terminalControl?.target
+            ? `${process.agent}:${process.terminalControl.target}`
+            : undefined;
         if (!terminalTarget) {
             return true;
         }
@@ -1736,50 +1643,14 @@ function rootActiveProcesses(processes) {
 }
 function childPidsForRoot(root, processes) {
     return processes
-        .filter((process) => process.ppid === root.pid)
+        .filter((process) => process.agent === root.agent && process.ppid === root.pid)
         .map((process) => process.pid);
 }
 function canSendDelegated(status) {
     return !["failed", "closed", "cancelled"].includes(status);
 }
 async function resolveTerminalConversationFromOptions(options) {
-    const parsed = parseTerminalConversationId(stringValue(options.conversation));
-    if (!parsed) {
-        return undefined;
-    }
-    const provider = createTerminalControlProvider(options);
-    const panes = await provider.listPanes();
-    const pane = panes.find((candidate) => candidate.kind === parsed.kind &&
-        candidate.target === parsed.target);
-    if (!pane) {
-        throw new Error(`terminal-controlled session ${parsed.conversationId} is no longer available`);
-    }
-    return {
-        conversationId: parsed.conversationId,
-        terminalControl: terminalRefFromPane(pane)
-    };
-}
-function parseTerminalConversationId(conversationId) {
-    const prefix = "terminal:tmux:";
-    if (!conversationId?.startsWith(prefix)) {
-        return undefined;
-    }
-    const rest = conversationId.slice(prefix.length);
-    const pidSeparator = rest.lastIndexOf(":");
-    if (pidSeparator <= 0 || pidSeparator === rest.length - 1) {
-        throw new Error(`invalid terminal-controlled conversation id: ${conversationId}`);
-    }
-    const target = rest.slice(0, pidSeparator);
-    const pid = Number(rest.slice(pidSeparator + 1));
-    if (!target || !Number.isInteger(pid)) {
-        throw new Error(`invalid terminal-controlled conversation id: ${conversationId}`);
-    }
-    return {
-        conversationId,
-        kind: "tmux",
-        target,
-        pid
-    };
+    return createTerminalAgentBridge(options).resolveConversationId(stringValue(options.conversation ?? options.conversationId));
 }
 function parseNativeConversationId(conversationId) {
     const prefix = "native:codex:";
@@ -1800,7 +1671,7 @@ async function runStatus(options) {
     cleanupIdleConversations(storeDirFromOptions(options), options);
     const terminalConversation = await resolveTerminalConversationFromOptions(options);
     if (terminalConversation) {
-        const terminalStatus = await terminalStatusForControl(terminalConversation.terminalControl, options);
+        const terminalStatus = await terminalStatusForControl(terminalConversation.agent, terminalConversation.terminalControl, options);
         printJson({
             conversation_id: terminalConversation.conversationId,
             source: "terminal_control",
@@ -1830,8 +1701,9 @@ async function runStatus(options) {
     }
     const terminalControl = terminalControlFromTakeover(isRecord(conversation.native_session_takeover) ? conversation.native_session_takeover : undefined);
     if (terminalControl) {
+        const executor = executorForConversation(conversation);
         result.terminal_control = terminalControl;
-        result.terminal_status = await terminalStatusForControl(terminalControl, options);
+        result.terminal_status = await terminalStatusForControl(executor.kind, terminalControl, options);
         result.terminal_screen = result.terminal_status.screen;
     }
     printJson(result);
@@ -1849,8 +1721,27 @@ async function runDescribe(options) {
     const conversationId = required(options.conversation ?? options.conversationId, "--conversation is required");
     const terminalConversation = await resolveTerminalConversationFromOptions(options);
     if (terminalConversation) {
-        const terminalStatus = await terminalStatusForControl(terminalConversation.terminalControl, options);
-        const process = await activeCodexProcessForPid(options, parseTerminalConversationId(conversationId)?.pid);
+        const terminalStatus = await terminalStatusForControl(terminalConversation.agent, terminalConversation.terminalControl, options);
+        if (terminalConversation.agent !== "codex") {
+            const adapter = createRuntimeTerminalAgentRegistry(options).require(terminalConversation.agent);
+            printJson({
+                conversation_id: conversationId,
+                source: "terminal_control",
+                agent: terminalConversation.agent,
+                confidence: terminalStatus.reachable ? "medium" : "low",
+                about: terminalStatus.reachable
+                    ? `${adapter.displayName} is attached through ${terminalConversation.terminalControl.kind}:${terminalConversation.terminalControl.target}.`
+                    : `${adapter.displayName} terminal status is unavailable.`,
+                evidence: {
+                    terminal_status: terminalStatus,
+                    terminal_screen: terminalStatus.screen
+                },
+                limitations: ["Historical session context is not available for this terminal adapter."],
+                terminal_control: terminalConversation.terminalControl
+            });
+            return;
+        }
+        const process = await activeCodexProcessForPid(options, terminalConversation.pid);
         printJson(await describeNativeCodexSession({
             id: conversationId,
             source: "terminal_control",
@@ -1875,7 +1766,9 @@ async function runDescribe(options) {
     const { conversation, statePath, logPath } = loadConversationFromOptions(options);
     const events = readExistingEvents(logPath);
     const terminalControl = terminalControlFromTakeover(isRecord(conversation.native_session_takeover) ? conversation.native_session_takeover : undefined);
-    const terminalStatus = terminalControl ? await terminalStatusForControl(terminalControl, options) : undefined;
+    const terminalStatus = terminalControl
+        ? await terminalStatusForControl(executorForConversation(conversation).kind, terminalControl, options)
+        : undefined;
     printJson({
         conversation_id: conversation.conversation_id,
         source: "akk_managed",
@@ -1893,110 +1786,63 @@ async function runDescribe(options) {
         event_log_path: logPath
     });
 }
-async function terminalStatusForControl(terminalControl, options) {
-    try {
-        const screen = await createTerminalControlProvider(options).capture(terminalControl.target, {
-            scrollbackLines: Number(options.scrollbackLines ?? 120),
-            socketPath: terminalControl.socketPath
-        });
-        const approval = detectCodexApprovalPrompt(screen);
-        const blocked = isCodexApprovalPromptVisible(screen);
-        const activity = detectCodexActivityState(screen, approval);
-        return {
-            provider: terminalControl.kind,
-            target: terminalControl.target,
-            reachable: true,
-            activity_state: activity.state,
-            activity_reason: activity.reason,
-            approval_state: {
-                scanned: true,
-                blocked,
-                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: screenExcerpt(screen),
-                approval
-            }
-        };
-    }
-    catch (error) {
-        return {
-            provider: terminalControl.kind,
-            target: terminalControl.target,
-            reachable: false,
-            activity_state: "unknown",
-            activity_reason: error instanceof Error ? error.message : String(error),
-            approval_state: {
-                scanned: false,
-                blocked: false,
-                approvable: false
-            },
-            screen: {
-                error: error instanceof Error ? error.message : String(error)
-            }
-        };
-    }
+async function terminalStatusForControl(agent, terminalControl, options) {
+    return createTerminalAgentBridge(options).status(agent, terminalControl, {
+        scrollbackLines: Number(options.scrollbackLines ?? 120)
+    });
 }
 function terminalBridgeApprovalFingerprint({ terminalControl, terminalStatus }) {
     const approval = isRecord(terminalStatus?.approval_state) ? terminalStatus.approval_state : {};
+    const adapterFingerprint = stringValue(approval.fingerprint);
+    if (adapterFingerprint) {
+        return adapterFingerprint;
+    }
     const screen = isRecord(terminalStatus?.screen) ? terminalStatus.screen : {};
     return createHash("sha256")
         .update(JSON.stringify({
         target: terminalControl.target,
-        key: approval.key,
+        keys: approval.keys ?? (approval.key ? [approval.key] : undefined),
         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)
-            }
-        }
-    });
+        .digest("hex");
 }
 function terminalBridgeApprovalInstructions({ conversation, terminalControl, terminalStatus }) {
     const approval = isRecord(terminalStatus?.approval_state) ? terminalStatus.approval_state : {};
     const screen = isRecord(terminalStatus?.screen) ? terminalStatus.screen : {};
-    const label = stringValue(approval.label) || "the current Codex approval prompt";
-    const key = stringValue(approval.key) || "the detected approve key";
+    const executor = executorForConversation(conversation);
+    const agentName = executorDefinitionForKind(executor.kind).displayName;
+    const label = stringValue(approval.label) || `the current ${agentName} approval prompt`;
+    const keys = Array.isArray(approval.keys)
+        ? approval.keys.filter((value) => typeof value === "string")
+        : [];
+    const keyDescription = keys.length > 0
+        ? keys.join(" then ")
+        : stringValue(approval.key) || "the detected approve key sequence";
+    const fingerprint = stringValue(approval.fingerprint);
     const excerpt = stringValue(screen.excerpt) || "(No terminal excerpt was available.)";
     return [
-        "Codex is waiting for approval in a terminal-controlled AKK session.",
+        `${agentName} is waiting for approval in a terminal-controlled AKK session.`,
         "",
         `Conversation: ${conversation.conversation_id}`,
         `Terminal: ${terminalControl.kind}:${terminalControl.target}`,
-        `Approval option: ${label} (${key})`,
+        `Approval option: ${label} (${keyDescription})`,
         "",
         "Safe terminal excerpt:",
         "```text",
         excerpt,
         "```",
         "",
-        "Ask the user whether to approve or deny this Codex request.",
+        `Ask the user whether to approve or deny this ${agentName} request.`,
         "",
         "If the user approves, call `agent_knock_knock_approve` with:",
         `- conversation_id: ${conversation.conversation_id}`,
+        `- expected_approval_fingerprint: ${fingerprint ?? "(missing; refresh status before approval)"}`,
         "",
-        "Equivalent user command: `AKK approve " + conversation.conversation_id + "`",
+        "Equivalent user command: `AKK approve " + conversation.conversation_id +
+            (fingerprint ? ` --expected-approval-fingerprint ${fingerprint}` : "") + "`",
         "",
         "If the user denies or wants to stop this request, call `agent_knock_knock_cancel` with:",
         `- conversation_id: ${conversation.conversation_id}`,
@@ -2066,6 +1912,7 @@ async function runSend(options) {
             const managed = createManagedTerminalConversationFromRawId({
                 options,
                 conversationId: terminalConversation.conversationId,
+                agent: terminalConversation.agent,
                 messageBody,
                 terminalControl: terminalConversation.terminalControl
             });
@@ -2085,6 +1932,7 @@ async function runSend(options) {
         await runTerminalConversationSend({
             options,
             conversationId: terminalConversation.conversationId,
+            agent: terminalConversation.agent,
             messageBody,
             terminalControl: terminalConversation.terminalControl
         });
@@ -2448,6 +2296,7 @@ async function runApprove(options) {
         await runTerminalConversationApprove({
             options,
             conversationId: terminalConversation.conversationId,
+            agent: terminalConversation.agent,
             terminalControl: terminalConversation.terminalControl
         });
         return;
@@ -2460,36 +2309,28 @@ async function runApprove(options) {
     if (!terminalControl) {
         throw new Error(`conversation ${conversation.conversation_id} is not controlled through a terminal`);
     }
-    const provider = createTerminalControlProvider(options);
-    const screen = await provider.capture(terminalControl.target, {
-        scrollbackLines: Number(options.scrollbackLines ?? 120),
-        socketPath: terminalControl.socketPath
-    });
-    const approval = detectCodexApprovalPrompt(screen);
-    if (!approval.approvable) {
-        printJson({
-            conversation,
-            approved: false,
-            blocked: true,
-            reason: approval.reason,
-            terminal_control: terminalControl,
-            screen_excerpt: screenExcerpt(screen)
-        });
-        return;
-    }
-    const expectedFingerprint = stringValue(options.expectedApprovalFingerprint);
-    const actualFingerprint = terminalBridgeApprovalFingerprintForScreen({ terminalControl, screen, approval });
+    const executor = executorForConversation(conversation);
+    const monitoredApproval = isRecord(nativeTakeover?.["terminal_bridge_approval"])
+        ? nativeTakeover.terminal_bridge_approval
+        : undefined;
+    const expectedFingerprint = stringValue(options.expectedApprovalFingerprint) ??
+        stringValue(monitoredApproval?.fingerprint);
     const autoApproved = options.autoApproved === true;
     const policyRuleId = stringValue(options.policyRuleId);
     const policyFingerprint = stringValue(options.policyFingerprint);
-    if (expectedFingerprint && actualFingerprint !== expectedFingerprint) {
+    const approval = await createTerminalAgentBridge(options).approve(executor.kind, terminalControl, {
+        expectedFingerprint,
+        scrollbackLines: Number(options.scrollbackLines ?? 120)
+    });
+    const actualFingerprint = approval.fingerprint;
+    if (!approval.approved) {
         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",
+                reason: approval.reason,
                 terminal_control: terminalControl,
                 expected_fingerprint: expectedFingerprint,
                 actual_fingerprint: actualFingerprint,
@@ -2500,24 +2341,22 @@ async function runApprove(options) {
         printJson({
             conversation,
             approved: false,
-            blocked: true,
-            reason: "approval fingerprint changed before execution",
+            blocked: approval.blocked,
+            reason: approval.reason,
             terminal_control: terminalControl,
             expected_approval_fingerprint: expectedFingerprint,
             actual_approval_fingerprint: actualFingerprint,
-            screen_excerpt: screenExcerpt(screen)
+            screen_excerpt: approval.screenExcerpt
         });
         return;
     }
-    await provider.sendKeys(terminalControl.target, [approval.key], {
-        socketPath: terminalControl.socketPath
-    });
     appendEvent(logPath, {
         ts: new Date().toISOString(),
         conversation_id: conversation.conversation_id,
         event: "terminal_approval_send",
         terminal_control: terminalControl,
         key: approval.key,
+        keys: approval.keys,
         label: approval.label,
         approval_fingerprint: actualFingerprint,
         auto_approved: autoApproved,
@@ -2540,6 +2379,7 @@ async function runApprove(options) {
         conversation_id: conversation.conversation_id,
         terminal_target: terminalControl.target,
         key: approval.key,
+        keys: approval.keys,
         label: approval.label,
         approval_fingerprint: actualFingerprint,
         auto_approved: autoApproved,
@@ -2605,6 +2445,7 @@ async function runApprove(options) {
         approved: true,
         terminal_control: terminalControl,
         key: approval.key,
+        keys: approval.keys,
         label: approval.label,
         approval_fingerprint: actualFingerprint,
         auto_approved: autoApproved,
@@ -2612,32 +2453,29 @@ async function runApprove(options) {
         monitor_pid: bridgeMonitor?.pid ?? null
     });
 }
-async function runTerminalConversationApprove({ options, conversationId, terminalControl }) {
-    const provider = createTerminalControlProvider(options);
-    const screen = await provider.capture(terminalControl.target, {
-        scrollbackLines: Number(options.scrollbackLines ?? 120),
-        socketPath: terminalControl.socketPath
+async function runTerminalConversationApprove({ options, conversationId, agent, terminalControl }) {
+    const approval = await createTerminalAgentBridge(options).approve(agent, terminalControl, {
+        expectedFingerprint: stringValue(options.expectedApprovalFingerprint),
+        scrollbackLines: Number(options.scrollbackLines ?? 120)
     });
-    const approval = detectCodexApprovalPrompt(screen);
-    if (!approval.approvable) {
+    if (!approval.approved) {
         printJson({
             conversation_id: conversationId,
             source: "terminal_control",
             approved: false,
-            blocked: true,
+            blocked: approval.blocked,
             reason: approval.reason,
             terminal_control: terminalControl,
-            screen_excerpt: screenExcerpt(screen)
+            screen_excerpt: approval.screenExcerpt
         });
         return;
     }
-    await provider.sendKeys(terminalControl.target, [approval.key], {
-        socketPath: terminalControl.socketPath
-    });
     runtimeLog("info", "terminal_approval_send", {
         conversation_id: conversationId,
+        agent,
         terminal_target: terminalControl.target,
         key: approval.key,
+        keys: approval.keys,
         label: approval.label
     });
     printJson({
@@ -2646,20 +2484,17 @@ async function runTerminalConversationApprove({ options, conversationId, termina
         approved: true,
         terminal_control: terminalControl,
         key: approval.key,
-        label: approval.label
+        keys: approval.keys,
+        label: approval.label,
+        approval_fingerprint: approval.fingerprint
     });
 }
-async function runTerminalConversationSend({ options, conversationId, messageBody, terminalControl }) {
-    const provider = createTerminalControlProvider(options);
+async function runTerminalConversationSend({ options, conversationId, agent, messageBody, terminalControl }) {
     const terminalPayload = terminalSubmissionPayload(String(messageBody));
-    await provider.sendText(terminalControl.target, terminalPayload, {
-        socketPath: terminalControl.socketPath
-    });
-    await provider.sendKeys(terminalControl.target, ["C-m"], {
-        socketPath: terminalControl.socketPath
-    });
+    await createTerminalAgentBridge(options).send(agent, terminalControl, terminalPayload);
     runtimeLog("info", "terminal_message_send", {
         conversation_id: conversationId,
+        agent,
         terminal_target: terminalControl.target,
         message: textSummary(messageBody)
     });
@@ -2703,7 +2538,7 @@ async function runTerminalControlSend({ options, conversation, nextConversation,
             releaseTerminalLock();
         }
     }
-    const provider = createTerminalControlProvider(options);
+    const terminalBridge = createTerminalAgentBridge(options);
     const bridgeStartedAt = new Date().toISOString();
     const agentTimeoutMinutes = Number(options.agentTimeoutMinutes ?? DEFAULT_AGENT_TIMEOUT_MINUTES);
     const agentHardTimeoutMinutes = positiveMinutes(options.agentHardTimeoutMinutes ?? DEFAULT_AGENT_HARD_TIMEOUT_MINUTES, "--agent-hard-timeout-minutes");
@@ -2720,22 +2555,16 @@ async function runTerminalControlSend({ options, conversation, nextConversation,
     let preSendScreenFingerprint;
     if (bridge) {
         try {
-            const screen = await provider.capture(terminalControl.target, {
-                scrollbackLines: Number(options.scrollbackLines ?? 120),
-                socketPath: terminalControl.socketPath
+            const status = await terminalBridge.status(executor.kind, terminalControl, {
+                scrollbackLines: Number(options.scrollbackLines ?? 120)
             });
-            preSendScreenFingerprint = terminalBridgeScreenFingerprint(screenExcerpt(screen));
+            preSendScreenFingerprint = terminalBridgeScreenFingerprint(status.screen.excerpt);
         }
         catch {
             // Delivery can still succeed when capture is unavailable; prompt matching remains the fallback boundary.
         }
     }
-    await provider.sendText(terminalControl.target, terminalPayload, {
-        socketPath: terminalControl.socketPath
-    });
-    await provider.sendKeys(terminalControl.target, ["C-m"], {
-        socketPath: terminalControl.socketPath
-    });
+    await terminalBridge.send(executor.kind, terminalControl, terminalPayload);
     const supersededConversationIds = bridge
         ? supersedeTerminalBridgeConversations({
             storeDir: storeDirFromOptions(options),
@@ -2825,12 +2654,12 @@ async function runTerminalControlSend({ options, conversation, nextConversation,
 function terminalSubmissionPayload(payload) {
     return payload.replace(/[\r\n]+$/u, "");
 }
-function createManagedTerminalConversationFromRawId({ options, conversationId, messageBody, terminalControl }) {
+function createManagedTerminalConversationFromRawId({ options, conversationId, agent, messageBody, terminalControl }) {
     const workspace = terminalControl.currentPath ?? process.cwd();
     const storeDir = expandHome(options.storeDir ?? options.logDir ?? defaultStoreDir(workspace));
     cleanupIdleConversations(storeDir, options);
     const executor = resolveExecutor({
-        kind: "codex",
+        kind: agent,
         session: conversationId
     });
     const now = new Date();
@@ -2868,12 +2697,12 @@ function createManagedTerminalConversationFromRawId({ options, conversationId, m
         gateway_session: options.gatewaySession ?? options.openclawSession ?? "agent:main:main",
         openclaw_bin: options.openclawBin ?? resolveOptionalExecutable("openclaw"),
         executor_all_proxy: proxyForExecutor(executor, options),
-        executor_model: options.model ?? options.codexModel,
+        executor_model: options.model ?? (agent === "codex" ? options.codexModel : undefined),
         native_session_takeover: {
-            agent: "codex",
+            agent,
             native_session_id: conversationId,
             source_cwd: workspace,
-            source_title: `Terminal-controlled Codex ${terminalControl.target}`,
+            source_title: `Terminal-controlled ${executor.display_name} ${terminalControl.target}`,
             strategy: "terminal_control",
             attached_at: now.toISOString(),
             takeover_match_kind: "raw_terminal_send",
@@ -2888,7 +2717,7 @@ function createManagedTerminalConversationFromRawId({ options, conversationId, m
         conversation_id: attachedConversation.conversation_id,
         event: "raw_terminal_session_attached",
         source_conversation_id: conversationId,
-        agent: "codex",
+        agent,
         terminal_control: terminalControl,
         executor
     });
@@ -3494,6 +3323,7 @@ async function runCancel(options) {
         await runTerminalConversationCancel({
             options,
             conversationId: terminalConversation.conversationId,
+            agent: terminalConversation.agent,
             terminalControl: terminalConversation.terminalControl
         });
         return;
@@ -3512,6 +3342,7 @@ async function runCancel(options) {
             conversation,
             statePath,
             logPath,
+            agent: executorForConversation(conversation).kind,
             terminalControl
         });
         return;
@@ -3574,41 +3405,54 @@ async function runCancel(options) {
         budget: budgetAction(nextConversation)
     });
 }
-async function runTerminalConversationCancel({ options, conversationId, terminalControl }) {
-    const provider = createTerminalControlProvider(options);
-    await provider.sendKeys(terminalControl.target, ["C-c"], {
-        socketPath: terminalControl.socketPath
-    });
+async function runTerminalConversationCancel({ options, conversationId, agent, terminalControl }) {
+    const cancellation = await createTerminalAgentBridge(options).cancel(agent, terminalControl);
     runtimeLog("info", "terminal_cancel_requested", {
         conversation_id: conversationId,
+        agent,
         terminal_target: terminalControl.target,
-        key: "C-c"
+        key: cancellation.key,
+        keys: cancellation.keys,
+        cancel_requested: cancellation.cancelRequested,
+        reason: cancellation.reason
     });
     printJson({
         conversation_id: conversationId,
         source: "terminal_control",
-        cancel_requested: true,
+        cancel_requested: cancellation.cancelRequested,
+        reason: cancellation.reason,
         terminal_control: terminalControl,
-        key: "C-c"
+        key: cancellation.key,
+        keys: cancellation.keys
     });
 }
-async function runTerminalControlCancel({ options, conversation, statePath, logPath, terminalControl }) {
-    const provider = createTerminalControlProvider(options);
-    await provider.sendKeys(terminalControl.target, ["C-c"], {
-        socketPath: terminalControl.socketPath
-    });
+async function runTerminalControlCancel({ options, conversation, statePath, logPath, agent, terminalControl }) {
+    const cancellation = await createTerminalAgentBridge(options).cancel(agent, terminalControl);
+    if (!cancellation.cancelRequested) {
+        printJson({
+            conversation,
+            cancel_requested: false,
+            reason: cancellation.reason,
+            terminal_control: terminalControl,
+            budget: budgetAction(conversation)
+        });
+        return;
+    }
     const now = new Date().toISOString();
     appendEvent(logPath, {
         ts: now,
         conversation_id: conversation.conversation_id,
         event: "terminal_cancel_requested",
         terminal_control: terminalControl,
-        key: "C-c"
+        key: cancellation.key,
+        keys: cancellation.keys
     });
     runtimeLog("info", "terminal_cancel_requested", {
         conversation_id: conversation.conversation_id,
+        agent,
         terminal_target: terminalControl.target,
-        key: "C-c"
+        key: cancellation.key,
+        keys: cancellation.keys
     });
     const nextConversation = {
         ...conversation,
@@ -3620,7 +3464,8 @@ async function runTerminalControlCancel({ options, conversation, statePath, logP
         conversation: nextConversation,
         cancel_requested: true,
         terminal_control: terminalControl,
-        key: "C-c",
+        key: cancellation.key,
+        keys: cancellation.keys,
         budget: budgetAction(nextConversation)
     });
 }
@@ -3822,6 +3667,9 @@ function runClose(options) {
     });
 }
 async function runMonitor(options) {
+    if (options.callbackRetry) {
+        return runCallbackRetryMonitor(options);
+    }
     if (options.terminalBridge) {
         return await runTerminalBridgeMonitor(options);
     }
@@ -3953,6 +3801,72 @@ async function runMonitor(options) {
         sleepSync(pollIntervalMs);
     }
 }
+function startCallbackRetryMonitor({ statePath }) {
+    const child = spawn(process.execPath, [
+        new URL(import.meta.url).pathname,
+        "monitor",
+        "--callback-retry",
+        "--state",
+        statePath
+    ], {
+        detached: true,
+        stdio: "ignore",
+        cwd: process.cwd(),
+        env: process.env
+    });
+    child.unref();
+    return child;
+}
+function runCallbackRetryMonitor(options) {
+    const statePath = expandHome(required(options.state, "--state is required"));
+    while (true) {
+        const conversation = loadState(statePath);
+        const callbackDelivery = isRecord(conversation.callback_delivery)
+            ? conversation.callback_delivery
+            : undefined;
+        const attempts = Number(callbackDelivery?.attempts ?? 0);
+        if (conversation.status !== "callback_failed" || !isRecord(callbackDelivery?.message)) {
+            return;
+        }
+        if (attempts > CALLBACK_RETRY_DELAYS_MS.length) {
+            return;
+        }
+        const delayMs = CALLBACK_RETRY_DELAYS_MS[Math.max(0, attempts - 1)];
+        sleepSync(delayMs);
+        const releaseLock = acquireFileLock(`${statePath}.lock`);
+        try {
+            const current = loadState(statePath);
+            const currentDelivery = isRecord(current.callback_delivery)
+                ? current.callback_delivery
+                : undefined;
+            if (current.status !== "callback_failed" || !isRecord(currentDelivery?.message)) {
+                return;
+            }
+            try {
+                runLockedCallback({
+                    statePath,
+                    messageJson: JSON.stringify(currentDelivery.message),
+                    gatewayMethod: stringValue(currentDelivery.gateway_method) ?? current.gateway_method,
+                    gatewaySession: stringValue(currentDelivery.gateway_session) ?? current.gateway_session,
+                    openclawSession: current.openclaw_session,
+                    openclawBin: stringValue(currentDelivery.openclaw_bin) ?? current.openclaw_bin,
+                    gatewayUrl: stringValue(currentDelivery.gateway_url) ?? current.gateway_url,
+                    token: current.gateway_token,
+                    closeTerminalBridgeOnDone: currentDelivery.close_terminal_bridge_on_done === true,
+                    retryPending: true,
+                    disableCallbackRetry: true
+                });
+                return;
+            }
+            catch {
+                // The failed attempt is persisted by runLockedCallback; continue with bounded backoff.
+            }
+        }
+        finally {
+            releaseLock();
+        }
+    }
+}
 async function runTerminalBridgeMonitor(options) {
     const statePath = expandHome(required(options.state, "--state is required"));
     const logPath = expandHome(options.log ?? logPathForStatePath(statePath));
@@ -3975,9 +3889,10 @@ async function runTerminalBridgeMonitor(options) {
     const activityPersistIntervalMs = terminalBridgeActivityPersistIntervalMs(timeoutMinutes, pollIntervalMs);
     const preSendScreenFingerprint = stringValue(initialNativeTakeover?.["terminal_bridge_pre_send_screen_fingerprint"]);
     let previousScreenFingerprint = preSendScreenFingerprint;
-    let previousRolloutFingerprint;
+    let previousDurableFingerprint;
     let persistedActivityReason = stringValue(initialNativeTakeover?.["terminal_bridge_last_activity_reason"]);
     const executor = executorForConversation(conversation);
+    const terminalBridge = createTerminalAgentBridge(options);
     appendEvent(logPath, {
         ts: new Date().toISOString(),
         conversation_id: conversation.conversation_id,
@@ -4060,7 +3975,29 @@ async function runTerminalBridgeMonitor(options) {
             });
             return;
         }
-        const terminalStatus = await terminalStatusForControl(terminalControl, options);
+        const requestText = String(nativeTakeover?.["terminal_bridge_request_text"] ?? conversation.user_request ?? "");
+        const startedAt = stringValue(nativeTakeover?.["terminal_bridge_started_at"]);
+        const screenChangedSinceSend = preSendScreenFingerprint !== undefined &&
+            previousScreenFingerprint !== undefined &&
+            previousScreenFingerprint !== preSendScreenFingerprint;
+        const poll = await terminalBridge.monitorPoll({
+            agent: executor.kind,
+            terminalControl,
+            screenOptions: {
+                scrollbackLines: Number(options.scrollbackLines ?? 120),
+                requestText,
+                screenChangedSinceSend
+            },
+            durableRequest: {
+                sessionId: stringValue(nativeTakeover?.["native_session_id"]),
+                cwd: stringValue(nativeTakeover?.["source_cwd"]),
+                requestText,
+                requestHash: stringValue(nativeTakeover?.["terminal_bridge_request_hash"]),
+                startedAt,
+                context: { conversation, nativeTakeover }
+            }
+        });
+        const terminalStatus = poll.status;
         const approval = terminalStatus.approval_state;
         if (isRecord(approval) && approval.blocked === true) {
             const fingerprint = terminalBridgeApprovalFingerprint({ terminalControl, terminalStatus });
@@ -4115,7 +4052,7 @@ async function runTerminalBridgeMonitor(options) {
                         terminalStatus,
                         fingerprint
                     }),
-                    approve_command: `AKK approve ${notification.conversation.conversation_id}`,
+                    approve_command: `AKK approve ${notification.conversation.conversation_id} --expected-approval-fingerprint ${fingerprint}`,
                     deny_command: `AKK cancel ${notification.conversation.conversation_id}`,
                     approve_tool: "agent_knock_knock_approve",
                     deny_tool: "agent_knock_knock_cancel"
@@ -4153,40 +4090,22 @@ async function runTerminalBridgeMonitor(options) {
         const screenChanged = previousScreenFingerprint !== undefined &&
             screenFingerprint !== undefined &&
             screenFingerprint !== previousScreenFingerprint;
-        const screenChangedSinceSend = preSendScreenFingerprint !== undefined &&
-            screenFingerprint !== undefined &&
-            screenFingerprint !== preSendScreenFingerprint;
         previousScreenFingerprint = screenFingerprint;
-        const contextMatch = await terminalBridgeCodexContext({
-            conversation,
-            nativeTakeover,
-            options
-        });
-        const startedAt = stringValue(nativeTakeover?.["terminal_bridge_started_at"]);
-        const rolloutCompletion = contextMatch?.context
-            ? latestCompletedRolloutTurn({
-                context: contextMatch.context,
-                conversation,
-                nativeTakeover,
-                startedAt
-            })
-            : undefined;
-        const assistantMessage = contextMatch?.context
-            ? latestAssistantAfter(contextMatch.context, startedAt)
-            : undefined;
-        const rolloutFingerprint = rolloutCompletion || assistantMessage
+        const durableCompletion = poll.durableCompletion;
+        const durableFingerprint = durableCompletion
             ? terminalBridgeActivityFingerprint(JSON.stringify({
-                text: rolloutCompletion?.text ?? assistantMessage?.text,
-                timestamp: rolloutCompletion?.timestamp ?? assistantMessage?.timestamp,
-                turn_id: rolloutCompletion?.turnId
+                text: durableCompletion.text,
+                timestamp: durableCompletion.timestamp,
+                id: durableCompletion.id,
+                metadata: durableCompletion.metadata
             }))
             : undefined;
-        const rolloutChanged = rolloutFingerprint !== undefined && rolloutFingerprint !== previousRolloutFingerprint;
-        previousRolloutFingerprint = rolloutFingerprint;
+        const durableChanged = durableFingerprint !== undefined && durableFingerprint !== previousDurableFingerprint;
+        previousDurableFingerprint = durableFingerprint;
         const activityReasons = [
             terminalStatus.activity_state === "working" ? terminalStatus.activity_reason : undefined,
             screenChanged ? "terminal screen changed" : undefined,
-            rolloutChanged ? "Codex rollout assistant output changed" : undefined
+            durableChanged ? "durable completion evidence changed" : undefined
         ].filter((value) => Boolean(value));
         if (activityReasons.length > 0) {
             const observedAtMs = Date.now();
@@ -4211,28 +4130,20 @@ async function runTerminalBridgeMonitor(options) {
                 }
             }
         }
-        const terminalIdle = terminalStatus.activity_state === "idle";
-        const screenMessage = !rolloutCompletion && !assistantMessage && terminalIdle
-            ? terminalBridgeScreenMessage({
-                conversation,
-                nativeTakeover,
-                terminalStatus,
-                screenChangedSinceSend
-            })
+        const completion = poll.completion;
+        const completionMetadata = isRecord(completion?.metadata) ? completion.metadata : {};
+        const completionMatch = completion
+            ? stringValue(completionMetadata.match) ??
+                (completion.source === "screen" ? "terminal_screen" : "durable_completion")
             : undefined;
-        const completion = rolloutCompletion ?? (terminalIdle ? assistantMessage ?? screenMessage : undefined);
-        const completionMatch = rolloutCompletion
-            ? "rollout_task_complete"
-            : assistantMessage
-                ? contextMatch?.match
-                : "terminal_screen";
         const completionFingerprint = completion
             ? createHash("sha256")
                 .update(JSON.stringify({
                 text: completion.text,
                 timestamp: completion.timestamp,
                 match: completionMatch,
-                turn_id: rolloutCompletion?.turnId,
+                source: completion.source,
+                id: completion.id,
                 message_id: currentMessageId
             }))
                 .digest("hex")
@@ -4246,9 +4157,12 @@ async function runTerminalBridgeMonitor(options) {
                 event: "terminal_bridge_completion_detected",
                 terminal_control: terminalControl,
                 match: completionMatch,
-                codex_session: contextMatch?.context.source,
+                completion_source: completion.source,
+                completion_id: completion.id,
+                terminal_session: completionMetadata.session,
+                context_match: completionMetadata.context_match,
                 assistant_timestamp: completion?.timestamp,
-                rollout_turn_id: rolloutCompletion?.turnId,
+                rollout_turn_id: completion.source === "durable" ? completion.id : undefined,
                 terminal_bridge_message_id: currentMessageId
             });
             const callbackMessage = createMessage({
@@ -4261,11 +4175,14 @@ async function runTerminalBridgeMonitor(options) {
                 metadata: {
                     source: "terminal_bridge",
                     terminal_control: terminalControl,
-                    codex_session: contextMatch?.context.source,
-                    confidence: rolloutCompletion || assistantMessage ? contextMatch?.confidence : "screen_only",
+                    ...completionMetadata,
+                    completion_source: completion.source,
+                    completion_id: completion.id,
+                    terminal_session: completionMetadata.session,
+                    confidence: completion.confidence,
                     match: completionMatch,
                     assistant_timestamp: completion?.timestamp,
-                    rollout_turn_id: rolloutCompletion?.turnId,
+                    rollout_turn_id: completion.source === "durable" ? completion.id : undefined,
                     terminal_bridge_message_id: currentMessageId
                 }
             });
@@ -4332,7 +4249,7 @@ async function runTerminalBridgeMonitor(options) {
                     detail: {
                         terminal_bridge: true,
                         terminal_control: terminalControl,
-                        match: contextMatch?.match,
+                        match: completionMetadata.context_match,
                         terminal_activity_state: terminalStatus.activity_state,
                         last_activity_at: new Date(lastActivityAtMs).toISOString(),
                         inactivity_deadline_at: new Date(lastActivityAtMs + timeoutMinutes * 60 * 1000).toISOString(),
@@ -4468,7 +4385,7 @@ function terminalBridgeApprovalCandidate({ executor, terminalControl, terminalSt
         terminal_target: terminalControl.target
     };
 }
-async function terminalBridgeCodexContext({ conversation, nativeTakeover, options }) {
+async function loadCodexTerminalContext({ conversation, nativeTakeover, options }) {
     const provider = createAgentSessionProvider("codex", options);
     const nativeSessionId = stringValue(nativeTakeover?.["native_session_id"]);
     const startedAtMs = Date.parse(String(nativeTakeover?.["terminal_bridge_started_at"] ?? ""));
@@ -4524,146 +4441,6 @@ async function terminalBridgeCodexContext({ conversation, nativeTakeover, option
         confidence: sessions.length === 1 ? "medium" : "low"
     };
 }
-function latestAssistantAfter(context, startedAt) {
-    const threshold = startedAt ? Date.parse(startedAt) : undefined;
-    return [...visibleRolloutMessages(context)]
-        .reverse()
-        .find((message) => {
-        if (message.role !== "assistant") {
-            return false;
-        }
-        if (!Number.isFinite(threshold)) {
-            return true;
-        }
-        const messageTime = message.timestamp ? Date.parse(message.timestamp) : NaN;
-        return Number.isFinite(messageTime) && messageTime >= Number(threshold);
-    });
-}
-function latestCompletedRolloutTurn({ context, conversation, nativeTakeover, startedAt }) {
-    const threshold = validTimestampMs(startedAt);
-    const expectedRequestHash = stringValue(nativeTakeover?.["terminal_bridge_request_hash"]) ??
-        terminalBridgeRequestFingerprint(nativeTakeover?.["terminal_bridge_request_text"] ?? conversation.user_request);
-    if (threshold === undefined || !expectedRequestHash) {
-        return undefined;
-    }
-    const turn = [...(context.turns ?? [])]
-        .reverse()
-        .find((candidate) => {
-        const userTimestamp = validTimestampMs(candidate.userTimestamp);
-        const completedAt = validTimestampMs(candidate.completedAt);
-        return candidate.userTextHash === expectedRequestHash &&
-            userTimestamp !== undefined &&
-            completedAt !== undefined &&
-            userTimestamp >= threshold &&
-            completedAt >= userTimestamp &&
-            Boolean(candidate.lastAssistantMessage);
-    });
-    if (!turn?.lastAssistantMessage) {
-        return undefined;
-    }
-    return {
-        role: "assistant",
-        text: turn.lastAssistantMessage,
-        timestamp: turn.completedAt,
-        turnId: turn.turnId,
-        userTimestamp: turn.userTimestamp
-    };
-}
-function terminalBridgeScreenMessage({ conversation, nativeTakeover, terminalStatus, screenChangedSinceSend }) {
-    const excerpt = stringValue(terminalStatus?.screen?.excerpt);
-    if (!excerpt) {
-        return undefined;
-    }
-    const request = String(nativeTakeover?.["terminal_bridge_request_text"] ?? conversation.user_request ?? "").trim();
-    const promptEnd = request ? whitespaceInsensitiveMatchEnd(excerpt, request) : undefined;
-    const afterPrompt = promptEnd === undefined ? undefined : excerpt.slice(promptEnd);
-    const completionBoundary = afterPrompt === undefined
-        ? undefined
-        : terminalBridgeCompletionBoundary(afterPrompt);
-    const completionText = afterPrompt === undefined
-        ? screenChangedSinceSend
-            ? terminalBridgeLatestCompletedSegment(excerpt)
-            : undefined
-        : completionBoundary === undefined
-            ? afterPrompt
-            : afterPrompt.slice(0, completionBoundary);
-    if (completionText === undefined) {
-        return undefined;
-    }
-    const cleaned = cleanTerminalBridgeScreenText(completionText);
-    const hasCompletionEvidence = promptEnd === undefined || completionBoundary !== undefined || /[•└]/u.test(cleaned ?? "");
-    if (!cleaned || cleaned.length < 40 || !hasCompletionEvidence) {
-        return undefined;
-    }
-    return {
-        role: "assistant",
-        text: truncateText(cleaned, 4000),
-        timestamp: undefined
-    };
-}
-function whitespaceInsensitiveMatchEnd(text, expected) {
-    const normalizedExpected = expected.replace(/\s/gu, "");
-    if (!normalizedExpected) {
-        return undefined;
-    }
-    let normalizedText = "";
-    const sourceEnds = [];
-    for (let index = 0; index < text.length;) {
-        const codePoint = text.codePointAt(index);
-        if (codePoint === undefined) {
-            break;
-        }
-        const character = String.fromCodePoint(codePoint);
-        if (!/\s/u.test(character)) {
-            normalizedText += character;
-            for (let codeUnit = 0; codeUnit < character.length; codeUnit += 1) {
-                sourceEnds.push(index + character.length);
-            }
-        }
-        index += character.length;
-    }
-    const matchIndex = normalizedText.lastIndexOf(normalizedExpected);
-    if (matchIndex < 0) {
-        return undefined;
-    }
-    return sourceEnds[matchIndex + normalizedExpected.length - 1];
-}
-function terminalBridgeLatestCompletedSegment(text) {
-    const matches = [...text.matchAll(/^[ \t]*[─━-]+\s+Worked for\b.*$/gmu)];
-    const completion = matches.at(-1);
-    if (completion?.index === undefined) {
-        return undefined;
-    }
-    const previousCompletion = matches.at(-2);
-    let start = previousCompletion?.index === undefined
-        ? 0
-        : previousCompletion.index + previousCompletion[0].length;
-    const beforeCompletion = text.slice(0, completion.index);
-    const prompts = [...beforeCompletion.matchAll(/^[ \t]*›(?:\s|$).*$/gmu)];
-    const latestPrompt = prompts.at(-1);
-    if (latestPrompt?.index !== undefined && latestPrompt.index >= start) {
-        start = latestPrompt.index + latestPrompt[0].length;
-    }
-    return text.slice(start, completion.index);
-}
-function terminalBridgeCompletionBoundary(text) {
-    const matches = [...text.matchAll(/^[ \t]*[─━-]+\s+Worked for\b.*$/gmu)];
-    return matches.at(-1)?.index;
-}
-function cleanTerminalBridgeScreenText(text) {
-    const lines = text
-        .split(/\r?\n/)
-        .map((line) => line.replace(/\s+$/u, ""))
-        .filter((line) => {
-        const trimmed = line.trim();
-        return trimmed &&
-            !trimmed.startsWith("› Use /skills") &&
-            !/^gpt-[\w.-]+/u.test(trimmed) &&
-            !/^[-\w.]+ default ·/u.test(trimmed);
-    });
-    const cleaned = lines.join("\n").trim();
-    return cleaned || undefined;
-}
 function resolveExecutable(command) {
     if (command.includes(path.sep)) {
         return command;
@@ -4782,19 +4559,62 @@ function runCallback(options) {
         releaseLock();
     }
 }
+function runRetryCallback(options) {
+    const { conversation, statePath } = loadConversationFromOptions(options);
+    const callbackDelivery = isRecord(conversation.callback_delivery)
+        ? conversation.callback_delivery
+        : undefined;
+    if (!["callback_pending", "callback_failed"].includes(conversation.status)) {
+        throw new Error(`cannot retry callback for ${conversation.conversation_id}; conversation is ${conversation.status}`);
+    }
+    if (!callbackDelivery || !isRecord(callbackDelivery.message)) {
+        throw new Error(`cannot retry callback for ${conversation.conversation_id}; pending callback is missing`);
+    }
+    const releaseLock = acquireFileLock(`${statePath}.lock`);
+    try {
+        runLockedCallback({
+            ...options,
+            statePath,
+            messageJson: JSON.stringify(callbackDelivery.message),
+            gatewayMethod: stringValue(callbackDelivery.gateway_method) ?? conversation.gateway_method,
+            gatewaySession: stringValue(callbackDelivery.gateway_session) ?? conversation.gateway_session,
+            openclawSession: conversation.openclaw_session,
+            openclawBin: stringValue(callbackDelivery.openclaw_bin) ?? conversation.openclaw_bin,
+            gatewayUrl: stringValue(callbackDelivery.gateway_url) ?? conversation.gateway_url,
+            token: stringValue(callbackDelivery.gateway_token) ?? conversation.gateway_token,
+            closeTerminalBridgeOnDone: callbackDelivery.close_terminal_bridge_on_done === true,
+            retryPending: true
+        });
+    }
+    finally {
+        releaseLock();
+    }
+}
 function runLockedCallback(options) {
     const messageInput = required(options.messageJson, "--message-json is required");
     const logPath = expandHome(options.log ?? logPathForStatePath(options.statePath));
     const conversation = loadState(options.statePath);
     const executor = executorForConversation(conversation);
-    const message = extractStructuredMessage({
-        conversation,
-        input: messageInput,
-        defaultFrom: executor.actor,
-        defaultTo: "openclaw"
-    });
+    const message = options.retryPending === true
+        ? parseMessageJson(messageInput)
+        : extractStructuredMessage({
+            conversation,
+            input: messageInput,
+            defaultFrom: executor.actor,
+            defaultTo: "openclaw"
+        });
+    if (message.conversation_id !== conversation.conversation_id) {
+        throw new Error(`message.conversation_id ${message.conversation_id} does not match conversation ${conversation.conversation_id}`);
+    }
     const existingEvents = readExistingEvents(logPath);
-    if (isDuplicateMessage(existingEvents, message)) {
+    const callbackDelivery = isRecord(conversation.callback_delivery)
+        ? conversation.callback_delivery
+        : undefined;
+    const retryingPending = options.retryPending === true &&
+        isRecord(callbackDelivery?.message) &&
+        callbackDelivery.message.id === message.id &&
+        ["pending", "failed"].includes(String(callbackDelivery.status ?? ""));
+    if (isDuplicateMessage(existingEvents, message) && !retryingPending) {
         runtimeLog("info", "callback_duplicate", {
             conversation_id: conversation.conversation_id,
             agent: executor.kind,
@@ -4814,19 +4634,46 @@ function runLockedCallback(options) {
         });
         return;
     }
-    let nextConversation = applyMessageToConversation(conversation, message);
-    if (message.type === "done" && options.closeTerminalBridgeOnDone === true) {
+    const closeTerminalBridgeOnDone = message.type === "done" &&
+        options.closeTerminalBridgeOnDone === true;
+    const requiresDelivery = Boolean(options.gatewayMethod) || options.recordOnly !== true;
+    const deliveryAttempt = Number(callbackDelivery?.attempts ?? 0) + 1;
+    let nextConversation = retryingPending
+        ? conversation
+        : applyMessageToConversation(conversation, message);
+    if (!retryingPending) {
+        appendEvent(logPath, messageEvent(message));
+    }
+    if (closeTerminalBridgeOnDone && requiresDelivery) {
         const now = new Date().toISOString();
         nextConversation = {
             ...nextConversation,
-            status: "closed",
-            closed_at: now,
-            close_reason: "terminal bridge task completed",
+            status: "callback_pending",
+            callback_delivery: {
+                status: "pending",
+                message,
+                attempts: deliveryAttempt,
+                created_at: stringValue(callbackDelivery?.created_at) ?? now,
+                last_attempt_at: now,
+                gateway_method: options.gatewayMethod,
+                gateway_session: options.gatewaySession ?? options.openclawSession ?? conversation.openclaw_session,
+                gateway_url: options.gatewayUrl ?? conversation.gateway_url,
+                openclaw_bin: options.openclawBin ?? conversation.openclaw_bin,
+                close_terminal_bridge_on_done: true
+            },
             updated_at: now
         };
         delete nextConversation.idle_since;
+        delete nextConversation.closed_at;
+        delete nextConversation.close_reason;
+        appendEvent(logPath, {
+            ts: now,
+            conversation_id: conversation.conversation_id,
+            event: retryingPending ? "callback_delivery_retry_started" : "callback_delivery_pending",
+            message_id: message.id,
+            attempt: deliveryAttempt
+        });
     }
-    appendEvent(logPath, messageEvent(message));
     saveState(options.statePath, nextConversation);
     runtimeLog("info", "callback_received", {
         conversation_id: conversation.conversation_id,
@@ -4841,13 +4688,115 @@ function runLockedCallback(options) {
         event_log_path: logPath,
         message: textSummary(message.body)
     });
-    const result = {
-        conversation: nextConversation,
-        message,
-        budget: budgetAction(nextConversation),
-        delivered: false,
-        duplicate: false
-    };
+    if (options.recordOnly) {
+        runtimeLog("info", "callback_recorded_only", {
+            conversation_id: conversation.conversation_id,
+            status: nextConversation.status
+        });
+        printJson({
+            conversation: nextConversation,
+            message,
+            budget: budgetAction(nextConversation),
+            delivered: false,
+            duplicate: false
+        });
+        return;
+    }
+    try {
+        const deliveryKind = deliverCallbackToOpenClaw({
+            options,
+            statePath: options.statePath,
+            logPath,
+            conversation: nextConversation,
+            message
+        });
+        const deliveredAt = new Date().toISOString();
+        let deliveredConversation = nextConversation;
+        if (closeTerminalBridgeOnDone) {
+            deliveredConversation = {
+                ...nextConversation,
+                status: "closed",
+                closed_at: deliveredAt,
+                close_reason: "terminal bridge task completed",
+                callback_delivery: {
+                    ...(isRecord(nextConversation.callback_delivery) ? nextConversation.callback_delivery : {}),
+                    status: "delivered",
+                    delivered_at: deliveredAt,
+                    last_error: undefined
+                },
+                updated_at: deliveredAt
+            };
+            delete deliveredConversation.idle_since;
+            saveState(options.statePath, deliveredConversation);
+            appendEvent(logPath, {
+                ts: deliveredAt,
+                conversation_id: conversation.conversation_id,
+                event: "callback_delivery_succeeded",
+                message_id: message.id,
+                attempt: deliveryAttempt,
+                status: "closed"
+            });
+        }
+        printJson({
+            conversation: deliveredConversation,
+            message,
+            budget: budgetAction(deliveredConversation),
+            delivered: true,
+            duplicate: false,
+            delivery: deliveryKind
+        });
+    }
+    catch (error) {
+        if (closeTerminalBridgeOnDone) {
+            const failedAt = new Date().toISOString();
+            const failedConversation = {
+                ...nextConversation,
+                status: "callback_failed",
+                callback_delivery: {
+                    ...(isRecord(nextConversation.callback_delivery) ? nextConversation.callback_delivery : {}),
+                    status: "failed",
+                    failed_at: failedAt,
+                    last_error: error instanceof Error ? error.message : String(error)
+                },
+                updated_at: failedAt
+            };
+            saveState(options.statePath, failedConversation);
+            appendEvent(logPath, {
+                ts: failedAt,
+                conversation_id: conversation.conversation_id,
+                event: "callback_delivery_failed",
+                message_id: message.id,
+                attempt: deliveryAttempt,
+                error: failedConversation.callback_delivery.last_error
+            });
+            if (options.retryPending !== true &&
+                options.disableCallbackRetry !== true &&
+                deliveryAttempt <= CALLBACK_RETRY_DELAYS_MS.length) {
+                const retryMonitor = startCallbackRetryMonitor({ statePath: options.statePath });
+                const retryDelayMs = CALLBACK_RETRY_DELAYS_MS[Math.max(0, deliveryAttempt - 1)];
+                const retryState = {
+                    ...failedConversation,
+                    callback_delivery: {
+                        ...failedConversation.callback_delivery,
+                        retry_monitor_pid: retryMonitor.pid ?? null,
+                        next_attempt_at: new Date(Date.now() + retryDelayMs).toISOString()
+                    }
+                };
+                saveState(options.statePath, retryState);
+                appendEvent(logPath, {
+                    ts: new Date().toISOString(),
+                    conversation_id: conversation.conversation_id,
+                    event: "callback_retry_monitor_launched",
+                    message_id: message.id,
+                    pid: retryMonitor.pid ?? null,
+                    next_attempt_at: retryState.callback_delivery.next_attempt_at
+                });
+            }
+        }
+        throw error;
+    }
+}
+function deliverCallbackToOpenClaw({ options, statePath, logPath, conversation, message }) {
     if (options.gatewayMethod) {
         const delivery = deliverToGatewayMethod({
             method: options.gatewayMethod,
@@ -4855,30 +4804,19 @@ function runLockedCallback(options) {
             gatewayUrl: options.gatewayUrl,
             token: options.token,
             sessionKey: options.gatewaySession ?? options.openclawSession ?? conversation.openclaw_session,
-            statePath: options.statePath,
+            statePath,
             logPath,
-            conversation: nextConversation,
+            conversation,
             message
         });
-        appendEvent(logPath, {
-            ts: new Date().toISOString(),
-            conversation_id: conversation.conversation_id,
+        recordCallbackProcessDelivery({
+            logPath,
+            conversation,
+            message,
             event: "callback_gateway_method_delivery",
-            from: message.from,
-            to: "openclaw",
-            round: message.round,
-            method: options.gatewayMethod,
-            status: delivery.status,
-            stdout: delivery.stdout,
-            stderr: delivery.stderr
-        });
-        runtimeLog("info", "callback_gateway_method_delivery", {
-            conversation_id: conversation.conversation_id,
-            method: options.gatewayMethod,
-            status: delivery.status,
-            failure_kind: classifyProcessFailure(delivery),
-            stdout: textSummary(delivery.stdout),
-            stderr: textSummary(delivery.stderr)
+            runtimeEvent: "callback_gateway_method_delivery",
+            delivery,
+            detail: { method: options.gatewayMethod }
         });
         if (delivery.status !== 0) {
             throw new Error(delivery.stderr || delivery.stdout || `gateway method delivery failed with status ${delivery.status}`);
@@ -4886,84 +4824,47 @@ function runLockedCallback(options) {
         const gatewayPayload = parseOptionalJson(delivery.stdout);
         const chatSendParams = isRecord(gatewayPayload?.chat_send) ? gatewayPayload.chat_send : undefined;
         const sessionSendParams = isRecord(gatewayPayload?.session_send) ? gatewayPayload.session_send : undefined;
-        let chatSendDelivery;
-        let sessionSendDelivery;
         if (chatSendParams) {
-            chatSendDelivery = deliverToChatSend({
+            const chatSendDelivery = deliverToChatSend({
                 openclawBin: options.openclawBin,
                 gatewayUrl: options.gatewayUrl,
                 token: options.token,
                 params: chatSendParams
             });
-            appendEvent(logPath, {
-                ts: new Date().toISOString(),
-                conversation_id: conversation.conversation_id,
+            recordCallbackProcessDelivery({
+                logPath,
+                conversation,
+                message,
                 event: "callback_chat_send_delivery",
-                from: message.from,
-                to: "openclaw",
-                round: message.round,
-                status: chatSendDelivery.status,
-                stdout: chatSendDelivery.stdout,
-                stderr: chatSendDelivery.stderr
-            });
-            runtimeLog("info", "callback_chat_send_delivery", {
-                conversation_id: conversation.conversation_id,
-                status: chatSendDelivery.status,
-                failure_kind: classifyProcessFailure(chatSendDelivery),
-                stdout: textSummary(chatSendDelivery.stdout),
-                stderr: textSummary(chatSendDelivery.stderr)
+                runtimeEvent: "callback_chat_send_delivery",
+                delivery: chatSendDelivery
             });
             if (chatSendDelivery.status !== 0) {
                 throw new Error(chatSendDelivery.stderr || chatSendDelivery.stdout || `chat callback delivery failed with status ${chatSendDelivery.status}`);
             }
+            return "gateway_method+chat_send";
         }
-        else if (sessionSendParams) {
-            sessionSendDelivery = deliverToSessionSend({
+        if (sessionSendParams) {
+            const sessionSendDelivery = deliverToSessionSend({
                 openclawBin: options.openclawBin,
                 gatewayUrl: options.gatewayUrl,
                 token: options.token,
                 params: sessionSendParams
             });
-            appendEvent(logPath, {
-                ts: new Date().toISOString(),
-                conversation_id: conversation.conversation_id,
+            recordCallbackProcessDelivery({
+                logPath,
+                conversation,
+                message,
                 event: "callback_session_send_delivery",
-                from: message.from,
-                to: "openclaw",
-                round: message.round,
-                status: sessionSendDelivery.status,
-                stdout: sessionSendDelivery.stdout,
-                stderr: sessionSendDelivery.stderr
-            });
-            runtimeLog("info", "callback_session_send_delivery", {
-                conversation_id: conversation.conversation_id,
-                status: sessionSendDelivery.status,
-                failure_kind: classifyProcessFailure(sessionSendDelivery),
-                stdout: textSummary(sessionSendDelivery.stdout),
-                stderr: textSummary(sessionSendDelivery.stderr)
+                runtimeEvent: "callback_session_send_delivery",
+                delivery: sessionSendDelivery
             });
             if (sessionSendDelivery.status !== 0) {
                 throw new Error(sessionSendDelivery.stderr || sessionSendDelivery.stdout || `session callback delivery failed with status ${sessionSendDelivery.status}`);
             }
+            return "gateway_method+sessions_send";
         }
-        printJson({
-            ...result,
-            delivered: true,
-            delivery: chatSendDelivery
-                ? "gateway_method+chat_send"
-                : sessionSendDelivery
-                    ? "gateway_method+sessions_send"
-                    : "gateway_method"
-        });
-        return;
-    }
-    if (options.recordOnly) {
-        runtimeLog("info", "callback_recorded_only", {
-            conversation_id: conversation.conversation_id,
-            status: nextConversation.status
-        });
-        printJson(result);
-        return;
+        return "gateway_method";
     }
     const gatewayUrl = options.gatewayUrl ?? conversation.gateway_url;
     const token = options.token ?? conversation.gateway_token;
@@ -4978,31 +4879,40 @@ function runLockedCallback(options) {
         throw new Error("--openclaw-session is required unless state has openclaw_session");
     }
     const delivery = deliverToOpenClaw({ gatewayUrl, token, openclawSession, message });
+    recordCallbackProcessDelivery({
+        logPath,
+        conversation,
+        message,
+        event: "callback_delivery",
+        runtimeEvent: "callback_delivery",
+        delivery
+    });
+    if (delivery.status !== 0) {
+        throw new Error(delivery.stderr || delivery.stdout || `callback delivery failed with status ${delivery.status}`);
+    }
+    return "acpx";
+}
+function recordCallbackProcessDelivery({ logPath, conversation, message, event, runtimeEvent, delivery, detail = {} }) {
     appendEvent(logPath, {
         ts: new Date().toISOString(),
         conversation_id: conversation.conversation_id,
-        event: "callback_delivery",
+        event,
         from: message.from,
         to: "openclaw",
         round: message.round,
+        ...detail,
         status: delivery.status,
         stdout: delivery.stdout,
         stderr: delivery.stderr
     });
-    runtimeLog("info", "callback_delivery", {
+    runtimeLog("info", runtimeEvent, {
         conversation_id: conversation.conversation_id,
+        ...detail,
         status: delivery.status,
         failure_kind: classifyProcessFailure(delivery),
         stdout: textSummary(delivery.stdout),
         stderr: textSummary(delivery.stderr)
     });
-    if (delivery.status !== 0) {
-        throw new Error(delivery.stderr || delivery.stdout || `callback delivery failed with status ${delivery.status}`);
-    }
-    printJson({
-        ...result,
-        delivered: true
-    });
 }
 function acquireFileLock(lockPath, { timeoutMs = 5000, retryMs = 50 } = {}) {
     const started = Date.now();
@@ -6295,6 +6205,7 @@ function usage() {
   agent-knock-knock approve --conversation <id>
   agent-knock-knock cancel --conversation <id> [--all-proxy <url>]
   agent-knock-knock renew --conversation <id> [--minutes <inactivity-minutes>]
+  agent-knock-knock retry-callback --conversation <id> [--store-dir <dir>]
   agent-knock-knock recover --conversation <id> [--session <name>] [--all-proxy <url>]
   agent-knock-knock close --conversation <id> [--reason <text>]
   agent-knock-knock install-openclaw [--openclaw-bin <path>] [--skill-path <path>] [--skill-only] [--no-restart]