@scotthuang/agent-knock-knock 0.2.44 → 0.2.47

package/dist/src/codex-terminal-agent-adapter.js

@@ -0,0 +1,386 @@
+import { createHash } from "node:crypto";
+import { classifyCodexProcess } from "./codex-session-provider.js";
+import { redactString } from "./runtime-log.js";
+export function createCodexTerminalAgentAdapter(options = {}) {
+    return {
+        agent: "codex",
+        displayName: "Codex",
+        capabilities: {
+            processDiscovery: true,
+            screenStatus: true,
+            terminalApproval: true,
+            screenCompletion: true,
+            durableCompletion: true,
+            cancellation: true
+        },
+        cancelKeys: ["C-c"],
+        classifyProcess(snapshot) {
+            const process = classifyCodexProcess(snapshot);
+            return process?.kind === "codex_cli" ? process : undefined;
+        },
+        inspectScreen: inspectCodexScreen,
+        detectDurableCompletion: options.detectDurableCompletion ?? (async (request) => detectCodexDurableCompletion(request))
+    };
+}
+export const codexTerminalAgentAdapter = createCodexTerminalAgentAdapter();
+export function inspectCodexScreen(options) {
+    const detectedApproval = detectCodexApprovalPrompt(options.screen);
+    const blocked = isCodexApprovalPromptVisible(options.screen);
+    const approval = detectedApproval.approvable
+        ? {
+            blocked: true,
+            approvable: true,
+            promptKind: detectedApproval.promptKind,
+            command: detectedApproval.command,
+            action: {
+                keys: detectedApproval.keys,
+                label: detectedApproval.label
+            }
+        }
+        : {
+            blocked,
+            approvable: false,
+            reason: detectedApproval.reason,
+            promptKind: detectedApproval.promptKind,
+            command: detectedApproval.command
+        };
+    const activity = detectCodexActivityState(options.screen, detectedApproval);
+    const screenExcerpt = codexScreenExcerpt(options.screen, options.maxExcerptLength ?? 4000);
+    const completion = activity.state === "idle"
+        ? detectCodexScreenCompletion({
+            screen: screenExcerpt,
+            requestText: options.requestText,
+            screenChangedSinceSend: options.screenChangedSinceSend
+        })
+        : undefined;
+    return {
+        activity,
+        approval,
+        screenExcerpt,
+        completion
+    };
+}
+export 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,
+            keys: [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)
+    };
+}
+export function isCodexApprovalPromptVisible(screen) {
+    return codexApprovalPromptRegion(screen).visible;
+}
+export 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"
+    };
+}
+export function codexScreenExcerpt(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);
+}
+export function detectCodexScreenCompletion({ screen, requestText, screenChangedSinceSend }) {
+    const request = requestText?.trim() ?? "";
+    const promptEnd = request ? whitespaceInsensitiveMatchEnd(screen, request) : undefined;
+    const afterPrompt = promptEnd === undefined ? undefined : screen.slice(promptEnd);
+    const completionBoundary = afterPrompt === undefined
+        ? undefined
+        : codexCompletionBoundary(afterPrompt);
+    const completionText = afterPrompt === undefined
+        ? screenChangedSinceSend
+            ? latestCompletedCodexSegment(screen)
+            : undefined
+        : completionBoundary === undefined
+            ? afterPrompt
+            : afterPrompt.slice(0, completionBoundary);
+    if (completionText === undefined) {
+        return undefined;
+    }
+    const cleaned = cleanCodexTerminalScreenText(completionText);
+    const hasCompletionEvidence = promptEnd === undefined || completionBoundary !== undefined || /[•└]/u.test(cleaned ?? "");
+    if (!cleaned || cleaned.length < 40 || !hasCompletionEvidence) {
+        return undefined;
+    }
+    return {
+        source: "screen",
+        text: truncateText(redactString(cleaned), 4000),
+        confidence: "screen_only"
+    };
+}
+export function detectCodexDurableCompletion(request) {
+    const context = asForkContextPackage(request.context);
+    const threshold = validTimestampMs(request.startedAt);
+    const expectedRequestHash = request.requestHash ?? requestFingerprint(request.requestText);
+    if (!context || 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 {
+        source: "durable",
+        text: turn.lastAssistantMessage,
+        timestamp: turn.completedAt,
+        id: turn.turnId,
+        confidence: "high",
+        metadata: {
+            match: "rollout_task_complete",
+            userTimestamp: turn.userTimestamp,
+            session: context.source
+        }
+    };
+}
+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 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 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 latestCompletedCodexSegment(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 codexCompletionBoundary(text) {
+    const matches = [...text.matchAll(/^[ \t]*[─━-]+\s+Worked for\b.*$/gmu)];
+    return matches.at(-1)?.index;
+}
+function cleanCodexTerminalScreenText(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 asForkContextPackage(value) {
+    if (!value || typeof value !== "object") {
+        return undefined;
+    }
+    const context = value;
+    return context.source && Array.isArray(context.turns)
+        ? context
+        : undefined;
+}
+function validTimestampMs(value) {
+    const parsed = Date.parse(String(value ?? ""));
+    return Number.isFinite(parsed) ? parsed : undefined;
+}
+function requestFingerprint(value) {
+    const text = String(value ?? "").replace(/\s+/gu, " ").trim();
+    return text ? createHash("sha256").update(text).digest("hex") : undefined;
+}
+function truncateText(text, maxLength) {
+    if (text.length <= maxLength) {
+        return text;
+    }
+    return `${text.slice(0, Math.max(0, maxLength - 15)).trimEnd()}... [truncated]`;
+}
+//# sourceMappingURL=codex-terminal-agent-adapter.js.map

package/dist/src/codex-terminal-agent-adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-terminal-agent-adapter.js","sourceRoot":"","sources":["../../src/codex-terminal-agent-adapter.ts"],"names":[],"mappings":"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"}

package/dist/src/openclaw-plugin.js

@@ -144,6 +144,20 @@ const renewParameters = {
         }
     }
 };
+const retryCallbackParameters = {
+    type: "object",
+    additionalProperties: false,
+    required: ["conversation_id"],
+    properties: {
+        conversation_id: {
+            type: "string",
+            description: "AKK-managed conversation whose persisted callback delivery is pending or failed."
+        },
+        storeDir: {
+            type: "string"
+        }
+    }
+};
 const statusParameters = {
     type: "object",
     additionalProperties: false,
@@ -151,7 +165,7 @@ const statusParameters = {
     properties: {
         conversation_id: {
             type: "string",
-            description: "AKK-managed conversation id, or a terminal-controlled id from AKK list such as terminal:tmux:codex-work:0.1:33389."
+            description: "AKK-managed conversation id, or a terminal-controlled id from AKK list such as terminal:v2:tmux:codex:codex-work:0.1:33389."
         },
         storeDir: {
             type: "string"
@@ -201,7 +215,7 @@ const sendParameters = {
     properties: {
         conversation_id: {
             type: "string",
-            description: "AKK-managed conversation id, or a terminal-controlled id from AKK list such as terminal:tmux:codex-work:0.1:33389. When the user refers to a listed tmux target like my-work:0.1, resolve it to the terminal-controlled id from AKK list before sending."
+            description: "AKK-managed conversation id, or a terminal-controlled id from AKK list such as terminal:v2:tmux:codex:codex-work:0.1:33389. When the user refers to a listed tmux target like my-work:0.1, resolve it to the terminal-controlled id from AKK list before sending."
         },
         message: {
             type: "string"
@@ -240,7 +254,7 @@ const cancelParameters = {
     properties: {
         conversation_id: {
             type: "string",
-            description: "AKK-managed conversation id, or a terminal-controlled id from AKK list such as terminal:tmux:codex-work:0.1:33389."
+            description: "AKK-managed conversation id, or a terminal-controlled id from AKK list such as terminal:v2:tmux:codex:codex-work:0.1:33389."
         },
         allProxy: {
             type: "string"
@@ -374,11 +388,15 @@ const agentTakeoverParameters = {
 const approveParameters = {
     type: "object",
     additionalProperties: false,
-    required: ["conversation_id"],
+    required: ["conversation_id", "expected_approval_fingerprint"],
     properties: {
         conversation_id: {
             type: "string",
-            description: "AKK-managed conversation id, or a terminal-controlled id from AKK list such as terminal:tmux:codex-work:0.1:33389."
+            description: "AKK-managed conversation id, or a terminal-controlled id from AKK list such as terminal:v2:tmux:codex:codex-work:0.1:33389."
+        },
+        expected_approval_fingerprint: {
+            type: "string",
+            description: "Exact approval fingerprint returned by the latest status or approval-required callback. The prompt is captured again and must still match before keys are sent."
         },
         storeDir: {
             type: "string"
@@ -435,7 +453,7 @@ export default definePluginEntry({
         }), { name: "agent_knock_knock_delegate", optional: true });
         registerCliTool(api, {
             name: "agent_knock_knock_list",
-            description: "List Agent Knock Knock work and local active coding-agent sessions. Use this for AKK list, akk list, current AKK tasks, native Codex active work, terminal-controlled Codex work, or asking which Codex/Claude/Cursor sessions are open. The result separates delegated AKK tasks, native active processes, and terminal-controlled sessions; terminal-controlled entries include approval state when available.",
+            description: "List Agent Knock Knock work and local active coding-agent sessions. Use this for AKK list, current AKK tasks, native Codex work, terminal-controlled Codex or Claude Code work, or asking which coding-agent sessions are open. The result separates delegated tasks, native processes, and terminal-controlled sessions; terminal entries include approval state when available.",
             parameters: listParameters,
             buildArgs: (params) => {
                 const args = ["list"];
@@ -474,7 +492,7 @@ export default definePluginEntry({
         });
         registerCliTool(api, {
             name: "agent_knock_knock_describe",
-            description: "Describe what a listed Agent Knock Knock or local Codex session is about. Use this when the user asks what a session/task/drawing is doing, what the original work was, or wants a reminder of a session's content. It summarizes AKK history when available, otherwise Codex rollout history, cwd-based inferred history, or terminal screen fallback with confidence and limitations.",
+            description: "Describe what a listed Agent Knock Knock or local coding-agent session is about. It summarizes AKK history when available, otherwise uses supported durable agent context or a conservative terminal-screen fallback with confidence and limitations.",
             parameters: describeParameters,
             buildArgs: (params) => {
                 const args = ["describe", "--conversation", requiredString(params.conversation_id, "conversation_id")];
@@ -488,7 +506,7 @@ export default definePluginEntry({
         });
         registerCliTool(api, {
             name: "agent_knock_knock_send",
-            description: "Send a message, follow-up, or new task to an existing open Agent Knock Knock coding-agent session or terminal-controlled session from AKK list. Use this when the user says to send/tell/ask/forward/add/continue work in a listed session, a listed Codex terminal, a tmux target such as my-work:0.1, or the one from AKK list. Do not start a new delegate for those requests. This is an asynchronous handoff: after the message is accepted, end the OpenClaw turn and wait for an Agent Knock Knock callback or a later explicit status request. Do not poll terminal output or wait for the coding agent's final result in the same OpenClaw turn.",
+            description: "Send a message, follow-up, or new task to an existing open Agent Knock Knock or terminal-controlled coding-agent session from AKK list, including Codex or Claude Code in tmux. Do not start a new delegate for those requests. This is asynchronous: after acceptance, end the OpenClaw turn and wait for the AKK callback or a later explicit status request.",
             parameters: sendParameters,
             buildArgs: (params, toolContext) => {
                 const config = isRecord(api.pluginConfig) ? api.pluginConfig : {};
@@ -524,17 +542,18 @@ export default definePluginEntry({
         });
         registerCliTool(api, {
             name: "agent_knock_knock_approve",
-            description: "Approve the current visible terminal approval prompt for an AKK terminal-controlled session. Use only after showing the user the detected prompt and receiving explicit approval. This sends the primary approve shortcut to the controlled terminal pane.",
+            description: "Approve the current AKK terminal permission request after showing it to the user and receiving explicit approval. Claude Code uses a revalidated structured one-time Hook decision; supported screen fallbacks use the detected primary shortcut and are never eligible for Claude auto-approval.",
             parameters: approveParameters,
             buildArgs: (params) => {
                 const args = ["approve", "--conversation", requiredString(params.conversation_id, "conversation_id")];
+                pushOptional(args, "--expected-approval-fingerprint", requiredString(params.expected_approval_fingerprint, "expected_approval_fingerprint"));
                 pushOptional(args, "--store-dir", stringValue(params.storeDir) ?? stringValue(api.pluginConfig?.storeDir));
                 return args;
             }
         });
         registerCliTool(api, {
             name: "agent_knock_knock_renew",
-            description: "Renew monitoring for a stalled AKK-managed terminal bridge task without sending text or keys to Codex. Use this when the user wants a still-live long-running terminal task to keep monitoring after an inactivity stall.",
+            description: "Renew monitoring for a stalled AKK-managed terminal bridge task without sending text or keys to the coding agent. Use this when the user wants a still-live long-running terminal task to keep monitoring after an inactivity stall.",
             parameters: renewParameters,
             buildArgs: (params) => {
                 const config = isRecord(api.pluginConfig) ? api.pluginConfig : {};
@@ -544,9 +563,20 @@ export default definePluginEntry({
                 return args;
             }
         });
+        registerCliTool(api, {
+            name: "agent_knock_knock_retry_callback",
+            description: "Retry a persisted AKK callback that failed before reaching OpenClaw. The original callback message id is reused for idempotent delivery, and the task closes only after delivery succeeds.",
+            parameters: retryCallbackParameters,
+            buildArgs: (params) => {
+                const config = isRecord(api.pluginConfig) ? api.pluginConfig : {};
+                const args = ["retry-callback", "--conversation", requiredString(params.conversation_id, "conversation_id")];
+                pushOptional(args, "--store-dir", stringValue(params.storeDir) ?? stringValue(config.storeDir));
+                return args;
+            }
+        });
         registerCliTool(api, {
             name: "agent_knock_knock_cancel",
-            description: "Request cancellation for an existing Agent Knock Knock Codex, Claude, or Cursor session. Delegated sessions use cooperative ACPX cancellation. Terminal-controlled sessions send Control-C to the controlled terminal pane. This does not close the AKK session; use close when the session should no longer be reused.",
+            description: "Cancel an existing Agent Knock Knock Codex, Claude, or Cursor task. Delegated sessions use cooperative ACPX cancellation. Terminal-controlled Claude denies a pending structured permission or sends Escape; other adapters use their declared interrupt keys. The underlying tmux pane remains open.",
             parameters: cancelParameters,
             buildArgs: (params) => {
                 const args = ["cancel", "--conversation", requiredString(params.conversation_id, "conversation_id")];
@@ -682,6 +712,13 @@ async function handleAkkCommand(api, ctx) {
             const result = runCli(api, args);
             return { text: formatRenewCommandResult(result) };
         }
+        if (parsed.action === "retry-callback" || parsed.action === "retry") {
+            const config = isRecord(api.pluginConfig) ? api.pluginConfig : {};
+            const args = ["retry-callback", "--conversation", parsed.conversationId];
+            pushOptional(args, "--store-dir", stringValue(config.storeDir));
+            const result = runCli(api, args);
+            return { text: formatRetryCallbackCommandResult(result) };
+        }
         if (parsed.action === "cancel") {
             const args = [
                 "cancel",
@@ -766,6 +803,10 @@ function parseAkkCommand(args) {
         }
         return { action: "renew", conversationId, minutes: minutes || undefined };
     }
+    if (action === "retry-callback" || action === "retry") {
+        const { token: conversationId } = takeRequiredToken(rest, "Usage: /akk retry-callback <conversation-id>");
+        return { action: "retry-callback", conversationId };
+    }
     if (action === "recover") {
         const { token: conversationId } = takeRequiredToken(rest, "Usage: /akk recover <conversation-id>");
         return { action: "recover", conversationId };
@@ -814,6 +855,7 @@ function akkUsageText() {
         "/akk send <conversation-id> <message>",
         "/akk cancel <conversation-id>",
         "/akk renew <conversation-id> [minutes]",
+        "/akk retry-callback <conversation-id>",
         "/akk recover <conversation-id>",
         "/akk close <conversation-id> [reason]"
     ].join("\n");
@@ -867,6 +909,13 @@ function formatRenewCommandResult(result) {
         "No message or key was sent to the coding agent."
     ].join("\n");
 }
+function formatRetryCallbackCommandResult(result) {
+    return [
+        `AKK callback delivered: ${result.conversation?.conversation_id ?? "unknown"}`,
+        `status: ${result.conversation?.status ?? "unknown"}`,
+        `attempts: ${result.conversation?.callback_delivery?.attempts ?? "unknown"}`
+    ].join("\n");
+}
 function formatDescribeCommandResult(result) {
     const lines = [
         `AKK description: ${result.conversation_id ?? "unknown"}`,