@scotthuang/agent-knock-knock 0.13.18 → 0.14.0

package/dist/src/semantic-tool-command-helpers.js

@@ -1,4 +1,7 @@
+import { formatDesktopCommandResult } from "./desktop-command-presentation.js";
+import { backendRecoveryTarget, backendRecoveryToolArgs, isBackendTaskWatchId } from "./backend-recovery-semantic.js";
 import path from "node:path";
+import { isCodexNativeConversationId, parseCodexNativeConversationId } from "./codex-native-identity.js";
 import { recordValue } from "./value-guards.js";
 import { isTerminalApprovalDecision } from "./terminal-agent-adapter.js";
 import { arrayValue, finiteNumber, nonEmptyString, stringArrayValue, truncateText } from "./semantic-tool-value-helpers.js";
@@ -151,9 +154,9 @@ function parseAkkLifecycleCommand(action, rest) {
         return { action: "doctor" };
     }
     if (action === "watch") {
-        const usage = "Usage: /akk watch <exact-terminal-id>";
+        const usage = "Usage: /akk watch <exact-terminal-id|codex-cli-conversation-id>";
         const { token: terminalId, rest: extra } = takeRequiredToken(rest, usage);
-        assertExactTerminalId(terminalId, usage);
+        assertExactTerminalOrNativeId(terminalId, usage);
         if (extra.trim()) {
             throw new Error(usage);
         }
@@ -179,7 +182,7 @@ function parseAkkLifecycleCommand(action, rest) {
     if (action === "permissions" || action === "permission-options") {
         const usage = "Usage: /akk permissions <exact-terminal-id>";
         const { token: terminalId, rest: extra } = takeRequiredToken(rest, usage);
-        assertExactTerminalId(terminalId, usage);
+        assertExactTerminalOrNativeId(terminalId, usage);
         if (extra.trim())
             throw new Error(usage);
         return { action: "permission-options", terminalId };
@@ -187,7 +190,7 @@ function parseAkkLifecycleCommand(action, rest) {
     if (action === "set-permissions") {
         const usage = "Usage: /akk set-permissions <exact-terminal-id> <advertised-mode-id>";
         const { token: terminalId, rest: modeInput } = takeRequiredToken(rest, usage);
-        assertExactTerminalId(terminalId, usage);
+        assertExactTerminalOrNativeId(terminalId, usage);
         const { token: mode, rest: extra } = takeRequiredToken(modeInput, usage);
         if (extra.trim() || !/^[a-z][a-z0-9_-]{0,63}$/u.test(mode))
             throw new Error(usage);
@@ -316,8 +319,20 @@ function parseAkkTurnCommand(action, rest) {
         return { action: "renew", turnId, minutes: minutes || undefined };
     }
     if (action === "retry-callback" || action === "retry") {
-        const { token: turnId } = takeRequiredToken(rest, "Usage: /akk retry-callback <turn-selector>");
-        return { action: "retry-callback", turnId };
+        const { token: turnId, rest: notificationInput } = takeRequiredToken(rest, "Usage: /akk retry-callback <turn-selector> [--notification-id <id>]");
+        const notification = notificationInput.trim();
+        const selection = /^--notification-id\s+(\S+)$/u.exec(notification);
+        if (notification && !selection)
+            throw new Error("Usage: /akk retry-callback <turn-selector> [--notification-id <id>]");
+        return { action: "retry-callback", turnId, ...(selection ? { notificationId: selection[1] } : {}) };
+    }
+    if (action === "recover") {
+        const usage = "Usage: /akk recover <backend-watch-id>";
+        const { token: turnId, rest: extra } = takeRequiredToken(rest, usage);
+        if (extra.trim())
+            throw new Error(usage);
+        backendRecoveryTarget({ turn_id: turnId }, "recover");
+        return { action: "recover", turnId };
     }
     if (action === "close" || action === "done") {
         return parseAkkCloseCommand(rest);
@@ -382,6 +397,7 @@ export function akkUsageText() {
         "/akk respond <turn-selector>: <answer>",
         "/akk approve <turn-selector> [approve_once|reject]",
         "/akk cancel <turn-selector>",
+        "/akk recover <backend-watch-id>",
         "Native interactions are answered through Status plus the typed respond_interaction tool; there is no raw-key or menu-index /akk command.",
         "Codex async_question stays parallel to a working task; delivery_mode defaults to advertised steer_current_turn, or explicitly choose advertised queue_next_turn. A blocking questionnaire omits delivery_mode.",
         "Model control targets one exact physical pane; Codex rollout attribution and identify-foreground are not prerequisites.",
@@ -389,76 +405,84 @@ export function akkUsageText() {
         "Models normally requires an idle, empty, prompt-free UI with no active Turn; for an exactly advertised profiled Codex 0.154.0/0.155.1 /model residue it may continue that residue into read-only catalog discovery. Successful discovery consumes any residual-entry authority, restores the exact empty UI, and issues a fresh ordinary one-shot set-model offer; set-model accepts only that offer. If the result is uncertain, inspect the pane and do not retry automatically."
     ].join("\n");
 }
+function formatAkkTerminalControlLines(terminal) {
+    const managed = recordValue(terminal.managed) ?? {};
+    const managementConflict = recordValue(terminal.management_conflict);
+    const currentTurn = recordValue(managed.current_turn);
+    const recentTurn = recordValue(managed.recent_turn);
+    const history = arrayValue(managed.history);
+    const sessionId = nonEmptyString(managed.session_id);
+    const sessionShortRef = nonEmptyString(managed.session_short_ref);
+    const hiddenTurnCount = finiteNumber(managed.hidden_turn_count) ?? 0;
+    const recovery = orphanedTerminalDispatchRecovery(terminal);
+    const terminalId = nonEmptyString(terminal.id);
+    const availableActions = recordValue(terminal.available_actions) ?? {};
+    const hasLifecycleAction = [
+        "list_resumable_threads",
+        "new_thread",
+        "resume_thread"
+    ].some((name) => Object.hasOwn(availableActions, name));
+    const hasWatchAction = Object.hasOwn(availableActions, "watch");
+    return [
+        `- ${formatTerminalLine(terminal)}`,
+        ...compatibilityWarningLines(terminal),
+        ...(hasLifecycleAction && terminalId
+            ? [`  lifecycle terminal_id: ${terminalId}`]
+            : []),
+        ...(hasWatchAction && terminalId
+            ? [`  AKK Watch available: /akk watch ${terminalId} — observe this exact terminal without input; exact task evidence is preferred and terminal-activity fallback is best-effort.`]
+            : []),
+        ...(sessionId || sessionShortRef
+            ? [`  AKK session: ${sessionShortRef ?? sessionId}`]
+            : []),
+        ...formatAvailableActions("terminal actions", terminal),
+        ...(currentTurn
+            ? [
+                `  current turn: ${formatManagedTurnLine(currentTurn)}`,
+                ...formatAvailableActions("current turn actions", currentTurn)
+            ]
+            : []),
+        ...(recentTurn
+            ? [
+                `  recent turn: ${formatManagedTurnLine(recentTurn)}`,
+                ...formatAvailableActions("recent turn actions", recentTurn)
+            ]
+            : []),
+        ...history.slice(0, 20).flatMap((turn) => [
+            `  history: ${formatManagedTurnLine(turn)}`,
+            ...formatAvailableActions("history actions", turn)
+        ]),
+        ...(hiddenTurnCount > 0 && history.length === 0
+            ? [`  older managed turns: ${hiddenTurnCount} (use all=true to include)`]
+            : []),
+        ...(managementConflict
+            ? [
+                `  management conflict: ${nonEmptyString(managementConflict.reason) ?? "current terminal ownership is unresolved"}`,
+                ...(nonEmptyString(managementConflict.recovery)
+                    ? [`  recovery: ${nonEmptyString(managementConflict.recovery)}`]
+                    : [])
+            ]
+            : []),
+        ...(recovery ? [`  recovery: ${recovery}`] : [])
+    ];
+}
 export function formatAkkListCommandResult(result) {
-    const terminals = arrayValue(result.terminals);
+    const conversations = Array.isArray(result.conversations) ? arrayValue(result.conversations) : undefined;
+    const nativeSessions = conversations?.filter(row => row.source === "codex_cli") ?? arrayValue(result.codex_cli_sessions);
+    const nativeWatches = arrayValue(result.codex_cli_watches);
+    const desktopSessions = conversations?.filter(row => row.source === "codex_desktop") ?? arrayValue(result.desktop_sessions);
+    const desktopWatches = arrayValue(result.desktop_watches);
+    const terminals = conversations?.filter(row => row.source !== "codex_cli" && row.source !== "codex_desktop") ?? arrayValue(result.terminals);
     const terminalWatches = arrayValue(result.terminal_watches);
     const unavailableManagedTurns = arrayValue(result.unavailable_managed_turns);
-    if (terminals.length === 0 &&
+    if (nativeSessions.length === 0 && nativeWatches.length === 0 &&
+        desktopSessions.length === 0 && desktopWatches.length === 0 &&
+        terminals.length === 0 &&
         terminalWatches.length === 0 &&
         unavailableManagedTurns.length === 0) {
         return "AKK found no live terminals or unavailable managed turns.";
     }
-    const terminalLines = terminals.slice(0, 20).flatMap((terminal) => {
-        const managed = recordValue(terminal.managed) ?? {};
-        const managementConflict = recordValue(terminal.management_conflict);
-        const currentTurn = recordValue(managed.current_turn);
-        const recentTurn = recordValue(managed.recent_turn);
-        const history = arrayValue(managed.history);
-        const sessionId = nonEmptyString(managed.session_id);
-        const sessionShortRef = nonEmptyString(managed.session_short_ref);
-        const hiddenTurnCount = finiteNumber(managed.hidden_turn_count) ?? 0;
-        const recovery = orphanedTerminalDispatchRecovery(terminal);
-        const terminalId = nonEmptyString(terminal.id);
-        const availableActions = recordValue(terminal.available_actions) ?? {};
-        const hasLifecycleAction = [
-            "list_resumable_threads",
-            "new_thread",
-            "resume_thread"
-        ].some((name) => Object.hasOwn(availableActions, name));
-        const hasWatchAction = Object.hasOwn(availableActions, "watch");
-        return [
-            `- ${formatTerminalLine(terminal)}`,
-            ...compatibilityWarningLines(terminal),
-            ...(hasLifecycleAction && terminalId
-                ? [`  lifecycle terminal_id: ${terminalId}`]
-                : []),
-            ...(hasWatchAction && terminalId
-                ? [`  AKK Watch available: /akk watch ${terminalId} — observe this exact terminal without input; exact task evidence is preferred and terminal-activity fallback is best-effort.`]
-                : []),
-            ...(sessionId || sessionShortRef
-                ? [`  AKK session: ${sessionShortRef ?? sessionId}`]
-                : []),
-            ...formatAvailableActions("terminal actions", terminal),
-            ...(currentTurn
-                ? [
-                    `  current turn: ${formatManagedTurnLine(currentTurn)}`,
-                    ...formatAvailableActions("current turn actions", currentTurn)
-                ]
-                : []),
-            ...(recentTurn
-                ? [
-                    `  recent turn: ${formatManagedTurnLine(recentTurn)}`,
-                    ...formatAvailableActions("recent turn actions", recentTurn)
-                ]
-                : []),
-            ...history.slice(0, 20).flatMap((turn) => [
-                `  history: ${formatManagedTurnLine(turn)}`,
-                ...formatAvailableActions("history actions", turn)
-            ]),
-            ...(hiddenTurnCount > 0 && history.length === 0
-                ? [`  older managed turns: ${hiddenTurnCount} (use all=true to include)`]
-                : []),
-            ...(managementConflict
-                ? [
-                    `  management conflict: ${nonEmptyString(managementConflict.reason) ?? "current terminal ownership is unresolved"}`,
-                    ...(nonEmptyString(managementConflict.recovery)
-                        ? [`  recovery: ${nonEmptyString(managementConflict.recovery)}`]
-                        : [])
-                ]
-                : []),
-            ...(recovery ? [`  recovery: ${recovery}`] : [])
-        ];
-    });
+    const terminalLines = terminals.slice(0, 20).flatMap(formatAkkTerminalControlLines);
     const watchLines = terminalWatches.slice(0, 20).flatMap((watch) => [
         `- ${formatTerminalWatchLine(watch)}`,
         ...compatibilityWarningLines(watch),
@@ -468,7 +492,17 @@ export function formatAkkListCommandResult(result) {
         ? `AKK terminals (${terminals.length} live, ${terminalWatches.length} terminal watches, ${unavailableManagedTurns.length} unavailable managed turns):`
         : `AKK terminals (${terminals.length} live, ${unavailableManagedTurns.length} unavailable managed turns):`;
     return [
-        heading,
+        conversations ? `AKK conversations (${conversations.length}); select a conversation_id and AKK chooses the transport:` : heading,
+        ...(nativeSessions.length ? ["Direct Codex CLI conversations:", ...nativeSessions.flatMap(row => [
+                `- ${row.title ?? row.native_thread_id} | ${row.cwd ?? "unknown directory"} | ${row.activity_state ?? "unknown"}`,
+                `  conversation_id: ${row.conversation_id}`, ...formatAvailableActions("  actions", row),
+                ...arrayValue(row.terminal_controls).flatMap(terminal => ["  associated terminal controls:",
+                    ...formatAkkTerminalControlLines(terminal).map(line => `  ${line}`)])
+            ])] : []),
+        ...(nativeWatches.length ? ["Direct Codex CLI watches:", ...nativeWatches.map(row => `- ${row.watch_id}: ${row.status}`)] : []),
+        ...(desktopSessions.length ? ["Desktop conversations:", ...desktopSessions.map(row => `- ${row.title} | ${row.cwd ?? "unknown directory"} | ${row.activity_state} | ${row.connection_state}\n  conversation_id: ${row.conversation_id}`)] : []),
+        ...(desktopWatches.length ? ["Desktop watches:", ...desktopWatches.map(row => `- ${row.watch_id}: ${row.status}`)] : []),
+        ...(recordValue(result.desktop_scan)?.next_cursor ? [`Desktop next_cursor: ${recordValue(result.desktop_scan)?.next_cursor}`] : []),
         ...(terminalLines.length > 0
             ? ["live terminals:", ...terminalLines]
             : []),
@@ -497,6 +531,8 @@ export function formatAkkListCommandResult(result) {
  */
 export { compactAkkListModelProjection } from "./semantic-tool-list-projection.js";
 export function formatAkkWatchCommandResult(result) {
+    if (result.source === "codex_cli")
+        return formatCodexNativeCommandResult(result, "Watch started");
     const watch = terminalWatchRecord(result);
     return [
         "AKK Terminal Watch started:",
@@ -514,6 +550,9 @@ export function formatAkkWatchCommandResult(result) {
     ].join("\n");
 }
 export function formatAkkUnwatchCommandResult(result) {
+    if (result.source === "codex_cli")
+        return formatCodexNativeCommandResult(result, "Watch stopped") +
+            "\nObservation stopped; the native task was not interrupted.";
     const watch = terminalWatchRecord(result);
     return [
         "AKK Terminal Watch stopped:",
@@ -523,6 +562,8 @@ export function formatAkkUnwatchCommandResult(result) {
     ].join("\n");
 }
 export function formatAkkWatchStatusCommandResult(result) {
+    if (result.source === "codex_cli")
+        return formatCodexNativeCommandResult(result, "Watch status");
     const watch = terminalWatchRecord(result);
     const userExplicitFallback = watch.source ===
         "terminal_user_explicit_fallback_watch";
@@ -570,6 +611,45 @@ export function formatAkkWatchStatusCommandResult(result) {
                 : "This is a user-selected read-only exact-task observation; Watch itself did not send, adopt, or mutate the task."
     ].join("\n");
 }
+/** Native thread/task identities are not managed Session/Turn or physical pane IDs. */
+export function formatCodexNativeCommandResult(result, operation) {
+    const latest = recordValue(result.latest_turn);
+    const finalText = nonEmptyString(result.final_text) ?? nonEmptyString(latest?.final_text);
+    const notifications = arrayValue(result.callback_notifications);
+    const interactions = arrayValue(result.interaction_state);
+    const state = nonEmptyString(result.state);
+    const sendState = nonEmptyString(result.send_state);
+    return [
+        `AKK Codex CLI ${operation}:`,
+        `conversation: ${nonEmptyString(result.conversation_id) ?? "unknown"}`,
+        ...(nonEmptyString(result.watch_id) ? [`watch: ${result.watch_id}`] : []),
+        ...(nonEmptyString(result.native_thread_id) ? [`native thread: ${result.native_thread_id}`] : []),
+        ...(nonEmptyString(result.native_turn_id) ? [`native task: ${result.native_turn_id}`] : []),
+        `status: ${nonEmptyString(result.status) ?? nonEmptyString(result.activity_state) ?? state ?? "unknown"}`,
+        ...(sendState ? [`send: ${sendState}; native acceptance: ${nonEmptyString(result.agent_acceptance) ?? "unproven"}`] : []),
+        ...formatNativeResponseState(state, result.evidence),
+        ...(typeof result.callback_expected === "boolean" ? [`callback expected: ${result.callback_expected}`] : []),
+        ...notifications.map(note => `callback: ${nonEmptyString(note.status) ?? "unknown"}`),
+        ...(nonEmptyString(result.observation_error) ? [`observation: ${result.observation_error}`] : []),
+        ...(finalText ? [`completion: ${truncateText(finalText, 2000)}`] : []),
+        ...interactions.flatMap(interaction => [
+            `pending ${nonEmptyString(interaction.kind) ?? "interaction"}: ${interaction.interaction_id}`,
+            ...(nonEmptyString(interaction.command) ? [`  command: ${truncateText(interaction.command, 500)}`] : []),
+            ...arrayValue(interaction.questions).map(question => `  ${question.question_id}: ${question.title}`)
+        ]),
+        ...(interactions.length ? ["Use the current typed Status actions to answer or approve this exact request."] : []),
+        ...(sendState && sendState !== "accepted" ? ["Acceptance is not proven. Keep this receipt and refresh Status; do not resend automatically."] : [])
+    ].join("\n");
+}
+function formatNativeResponseState(state, evidence) {
+    if (!state)
+        return [];
+    if (state === "confirmed")
+        return [`response: confirmed (${nonEmptyString(evidence) ?? "native evidence"})`];
+    if (state === "sent")
+        return ["response: dispatched; native effect is not yet confirmed."];
+    return [`response: ${state}; do not resend automatically.`];
+}
 export function formatAkkTerminalWatchHint(result) {
     const hint = recordValue(result.terminal_watch_hint);
     if (hint?.kind !== "terminal_watch_discovery" ||
@@ -732,6 +812,8 @@ export function formatAkkThreadsCommandResult(result) {
     ].join("\n");
 }
 export function formatAkkModelOptionsCommandResult(result) {
+    if (result.source === "codex_desktop")
+        return formatDesktopCommandResult(result, "model options");
     const terminalId = nonEmptyString(result.terminal_id) ?? "unknown";
     const scope = nonEmptyString(result.scope) ?? "unknown";
     const current = recordValue(result.current) ?? {};
@@ -760,6 +842,8 @@ export function formatAkkModelOptionsCommandResult(result) {
     ].join("\n");
 }
 export function formatAkkSetModelCommandResult(result) {
+    if (result.source === "codex_desktop")
+        return formatDesktopCommandResult(result, "set model");
     const outcome = nonEmptyString(result.outcome) ?? "uncertain";
     const requested = recordValue(result.requested) ?? {};
     const effective = recordValue(result.effective) ?? {};
@@ -895,23 +979,26 @@ export function buildAkkCommandCliArgs(command, config, context = {}) {
     const storeDir = resolvePluginStoreDir(config);
     const codexHome = nonEmptyString(config.codexHome);
     const idleTimeoutMinutes = finiteNumberString(config.idleTimeoutMinutes);
+    const backendRecovery = buildBackendRecoveryCommandArgs(command, config, context);
+    if (backendRecovery)
+        return backendRecovery;
     switch (command.action) {
         case "list":
             return withOptionalArgs(["list", "--reconcile"], ["--store-dir", storeDir], ["--idle-timeout-minutes", idleTimeoutMinutes]);
         case "watch": {
-            const openclawSession = nonEmptyString(context.sessionKey) ??
+            const openclawSession = (isCodexNativeConversationId(command.terminalId) ? requiredNativeController(context.sessionKey) : nonEmptyString(context.sessionKey)) ??
                 "agent:main:main";
             return withOptionalArgs([
                 "watch-terminal",
-                "--terminal",
+                isCodexNativeConversationId(command.terminalId) ? "--conversation" : "--terminal",
                 command.terminalId
             ], ["--store-dir", storeDir], [
                 "--hard-timeout-minutes",
                 finiteNumberString(config.agentHardTimeoutMinutes)
-            ], ["--openclaw-session", openclawSession], ["--openclaw-bin", nonEmptyString(config.openclawBin)]);
+            ], ["--openclaw-session", openclawSession], ["--openclaw-bin", nonEmptyString(config.openclawBin)], ["--codex-home", isCodexNativeConversationId(command.terminalId) ? codexHome : undefined]);
         }
         case "unwatch":
-            return withOptionalArgs(["unwatch-terminal", "--watch", command.watchId], ["--store-dir", storeDir]);
+            return withOptionalArgs(["unwatch-terminal", "--watch", command.watchId], ["--store-dir", storeDir], ["--openclaw-session", isBackendTaskWatchId(command.watchId) ? requiredNativeController(context.sessionKey) : undefined], ["--codex-home", isBackendTaskWatchId(command.watchId) ? codexHome : undefined]);
         case "list-resumable-threads":
             return withOptionalArgs([
                 "list-resumable-threads",
@@ -1009,15 +1096,15 @@ export function buildAkkCommandCliArgs(command, config, context = {}) {
             ], ["--store-dir", storeDir], ["--codex-home", codexHome]);
         case "status":
             if (command.watchId) {
-                return withOptionalArgs(["watch-status", "--watch", command.watchId], ["--store-dir", storeDir]);
+                return withOptionalArgs(["watch-status", "--watch", command.watchId], ["--store-dir", storeDir], ["--openclaw-session", isBackendTaskWatchId(command.watchId) ? requiredNativeController(context.sessionKey) : undefined], ["--codex-home", isBackendTaskWatchId(command.watchId) ? codexHome : undefined]);
             }
             return withOptionalArgs([
                 "status",
                 "--reconcile",
                 ...(command.turnId
-                    ? ["--turn", command.turnId]
+                    ? [isCodexNativeConversationId(command.turnId) ? "--conversation" : "--turn", command.turnId]
                     : [])
-            ], ["--store-dir", storeDir], ["--idle-timeout-minutes", idleTimeoutMinutes]);
+            ], ["--store-dir", storeDir], ["--idle-timeout-minutes", idleTimeoutMinutes], ["--openclaw-session", isCodexNativeConversationId(command.turnId) ? requiredNativeController(context.sessionKey) : undefined], ["--codex-home", isCodexNativeConversationId(command.turnId) ? codexHome : undefined]);
         case "send": {
             const openclawSession = nonEmptyString(context.sessionKey) ??
                 "agent:main:main";
@@ -1062,8 +1149,41 @@ export function buildAkkCommandCliArgs(command, config, context = {}) {
             ], ["--expected-message-id", command.expectedMessageId], ["--expected-transition-id", command.expectedTransitionId], ["--store-dir", storeDir]);
     }
 }
+function buildBackendRecoveryCommandArgs(command, config, context) {
+    if (command.action === "renew" || command.action === "recover" || command.action === "retry-callback" || command.action === "close") {
+        const params = { turn_id: command.turnId };
+        if (command.action === "renew" && command.minutes !== undefined)
+            params.minutes = Number(command.minutes);
+        if (command.action === "retry-callback" && command.notificationId !== undefined)
+            params.notification_id = command.notificationId;
+        if (command.action === "close") {
+            params.reason = command.reason;
+            if (command.expectedMessageId !== undefined)
+                params.expected_message_id = command.expectedMessageId;
+            if (command.expectedTransitionId !== undefined)
+                params.expected_transition_id = command.expectedTransitionId;
+        }
+        const backend = backendRecoveryToolArgs(command.action, params, context, {
+            storeDir: resolvePluginStoreDir(config), codexHome: nonEmptyString(config.codexHome), defaultMinutes: config.agentTimeoutMinutes
+        });
+        if (backend)
+            return backend;
+    }
+}
 function isTerminalWatchId(value) {
-    return /^terminal-watch-[A-Za-z0-9._:-]+$/u.test(value);
+    return /^terminal-watch-[A-Za-z0-9._:-]+$/u.test(value) || isBackendTaskWatchId(value);
+}
+function requiredNativeController(value) {
+    const key = nonEmptyString(value);
+    if (!key)
+        throw new Error("controller session is required for a direct Codex CLI action");
+    return key;
+}
+function assertExactTerminalOrNativeId(value, usage) {
+    if (isCodexNativeConversationId(value))
+        parseCodexNativeConversationId(value);
+    else
+        assertExactTerminalId(value, usage);
 }
 function parseSelectorMessage(input) {
     const match = /^((?:(?:codex|claude):latest|only|latest|codex|claude|@[0-9a-f]+))\s*:\s*([\s\S]*)$/iu.exec(input);
@@ -1261,6 +1381,7 @@ function formatAvailableActions(label, resource) {
         "approve",
         "cancel",
         "renew",
+        "recover",
         "retry_callback",
         "close",
         "list_resumable_threads",