claude-code-rust 0.14.2 → 0.14.4

package/agent-sdk/dist/bridge/user_interaction.js

@@ -54,21 +54,29 @@ export async function requestExitPlanModeApproval(session, toolUseId, inputData,
     return { behavior: "allow", updatedInput: inputData, toolUseID: toolUseId };
 }
 export function parseAskUserQuestionPrompts(inputData) {
-    const rawQuestions = Array.isArray(inputData.questions) ? inputData.questions : [];
+    const rawQuestions = Array.isArray(inputData.questions)
+        ? inputData.questions
+        : [];
     const prompts = [];
     for (const rawQuestion of rawQuestions) {
         const questionRecord = asRecordOrNull(rawQuestion);
         if (!questionRecord) {
             continue;
         }
-        const question = typeof questionRecord.question === "string" ? questionRecord.question.trim() : "";
+        const question = typeof questionRecord.question === "string"
+            ? questionRecord.question.trim()
+            : "";
         if (!question) {
             continue;
         }
-        const headerRaw = typeof questionRecord.header === "string" ? questionRecord.header.trim() : "";
+        const headerRaw = typeof questionRecord.header === "string"
+            ? questionRecord.header.trim()
+            : "";
         const header = headerRaw || `Q${prompts.length + 1}`;
         const multiSelect = Boolean(questionRecord.multiSelect);
-        const rawOptions = Array.isArray(questionRecord.options) ? questionRecord.options : [];
+        const rawOptions = Array.isArray(questionRecord.options)
+            ? questionRecord.options
+            : [];
         const options = [];
         for (const rawOption of rawOptions) {
             const optionRecord = asRecordOrNull(rawOption);
@@ -76,8 +84,12 @@ export function parseAskUserQuestionPrompts(inputData) {
                 continue;
             }
             const label = typeof optionRecord.label === "string" ? optionRecord.label.trim() : "";
-            const description = typeof optionRecord.description === "string" ? optionRecord.description.trim() : "";
-            const preview = typeof optionRecord.preview === "string" ? optionRecord.preview.trim() : "";
+            const description = typeof optionRecord.description === "string"
+                ? optionRecord.description.trim()
+                : "";
+            const preview = typeof optionRecord.preview === "string"
+                ? optionRecord.preview.trim()
+                : "";
             if (!label) {
                 continue;
             }
@@ -140,7 +152,9 @@ function buildQuestionRequest(promptToolCall, prompt, index, total) {
     };
 }
 function askUserQuestionTranscript(answers) {
-    return answers.map((entry) => `${entry.header}: ${entry.answer}\n  ${entry.question}`).join("\n");
+    return answers
+        .map((entry) => `${entry.header}: ${entry.answer}\n  ${entry.question}`)
+        .join("\n");
 }
 function askUserQuestionCompletedRawInput(prompts, answers, annotations, questionResults) {
     return {
@@ -155,7 +169,9 @@ function askUserQuestionCompletedRawInput(prompts, answers, annotations, questio
             })),
         })),
         answers,
-        ...(Object.keys(annotations).length > 0 ? { annotations: questionAnnotationsJson(annotations) } : {}),
+        ...(Object.keys(annotations).length > 0
+            ? { annotations: questionAnnotationsJson(annotations) }
+            : {}),
         question_results: questionResults,
     };
 }
@@ -175,7 +191,9 @@ function deriveAnnotation(selectedOptions, annotation) {
             .map((option) => option.preview?.trim() ?? "")
             .filter((previewText) => previewText.length > 0)
             .join("\n\n");
-    const notes = annotation?.notes?.trim().length ? annotation.notes.trim() : undefined;
+    const notes = annotation?.notes?.trim().length
+        ? annotation.notes.trim()
+        : undefined;
     if (!preview && !notes) {
         return undefined;
     }
@@ -226,13 +244,21 @@ export async function requestAskUserQuestionAnswers(session, toolUseId, inputDat
         });
         if (outcome.outcome !== "answered") {
             setToolCallStatus(session, toolUseId, "failed", "Question cancelled");
-            return { behavior: "deny", message: "Question cancelled", toolUseID: toolUseId };
+            return {
+                behavior: "deny",
+                message: "Question cancelled",
+                toolUseID: toolUseId,
+            };
         }
         const selectedOptions = request.prompt.options.filter((option) => outcome.selected_option_ids.includes(option.option_id));
         if (selectedOptions.length === 0 ||
             (!prompt.multiSelect && selectedOptions.length !== 1)) {
             setToolCallStatus(session, toolUseId, "failed", "Question answer was invalid");
-            return { behavior: "deny", message: "Question answer was invalid", toolUseID: toolUseId };
+            return {
+                behavior: "deny",
+                message: "Question answer was invalid",
+                toolUseID: toolUseId,
+            };
         }
         const answer = selectedOptions.map((option) => option.label).join(", ");
         answers[prompt.question] = answer;
@@ -240,7 +266,11 @@ export async function requestAskUserQuestionAnswers(session, toolUseId, inputDat
         if (annotation) {
             annotations[prompt.question] = annotation;
         }
-        transcript.push({ header: prompt.header, question: prompt.question, answer });
+        transcript.push({
+            header: prompt.header,
+            question: prompt.question,
+            answer,
+        });
         questionResults.push({
             question: prompt.question,
             header: prompt.header,
@@ -268,7 +298,9 @@ export async function requestAskUserQuestionAnswers(session, toolUseId, inputDat
             raw_output: summary,
             content: [{ type: "content", content: { type: "text", text: summary } }],
             ...(completed
-                ? { raw_input: askUserQuestionCompletedRawInput(prompts, answers, annotations, questionResults) }
+                ? {
+                    raw_input: askUserQuestionCompletedRawInput(prompts, answers, annotations, questionResults),
+                }
                 : {}),
         };
         emitToolCallUpdate(session, toolUseId, progressFields, "summary");

package/agent-sdk/dist/bridge.js

@@ -8,12 +8,12 @@ import { parseCommandEnvelope } from "./bridge/commands.js";
 import { parseFastModeDisabledReason, parseFastModeState, } from "./bridge/state_parsing.js";
 import { writeEvent, failConnection, slashError, emitRuntimeReloadCompleted, emitRuntimeReloadFailed, emitSessionUpdate, setSessionListingDir, } from "./bridge/events.js";
 import { contentFromPrompt } from "./bridge/message_handlers.js";
-import { sessions, sessionById, createSession, closeAllSessions, } from "./bridge/session_lifecycle.js";
+import { sessions, sessionById, createSession, closeAllSessions, closeSessionWithLogging, detachSessionForClose, awaitSessionInitialization, commitDeferredSession, } from "./bridge/session_lifecycle.js";
 import { mapSessionMessagesToUpdates } from "./bridge/history.js";
-import { emitAvailableAgentsIfChanged, mapAvailableAgents } from "./bridge/agents.js";
-import { mapSdkSlashCommands, updateAvailableCommands } from "./bridge/available_commands.js";
+import { emitAvailableAgentsIfChanged, mapAvailableAgents, } from "./bridge/agents.js";
+import { mapSdkSlashCommands, updateAvailableCommands, } from "./bridge/available_commands.js";
 import { MCP_STALE_STATUS_REVALIDATION_COOLDOWN_MS, emitReconciledMcpSnapshotFromStatuses, staleMcpAuthCandidates, } from "./bridge/mcp.js";
-import { bridgeLogger, LOG_TARGETS, logBridgeCommandReceived } from "./bridge/logger.js";
+import { bridgeLogger, LOG_TARGETS, logBridgeCommandReceived, } from "./bridge/logger.js";
 import { BridgeCommandScheduler } from "./bridge/command_scheduler.js";
 import { handleLifecycleCommand } from "./bridge/command_lifecycle.js";
 import { handleInteractionCommand } from "./bridge/command_interactions.js";
@@ -23,7 +23,7 @@ import { handleSessionDataCommand } from "./bridge/command_session_data.js";
 // Re-exports: all symbols that tests and external consumers import from bridge.js.
 export { AsyncQueue } from "./bridge/shared.js";
 export { asRecordOrNull } from "./bridge/shared.js";
-export { CACHE_SPLIT_POLICY, previewKilobyteLabel } from "./bridge/cache_policy.js";
+export { CACHE_SPLIT_POLICY, previewKilobyteLabel, } from "./bridge/cache_policy.js";
 export { buildToolResultFields, createToolCall, isShellToolName, normalizeToolKind, normalizeToolResultText, unwrapToolUseResult, } from "./bridge/tooling.js";
 export { looksLikeAuthRequired } from "./bridge/auth.js";
 export { parseCommandEnvelope } from "./bridge/commands.js";
@@ -31,7 +31,7 @@ export { buildSessionListOptions } from "./bridge/events.js";
 export { mapInitSlashCommands, mapSdkSlashCommands, updateAvailableCommands, } from "./bridge/available_commands.js";
 export { permissionOptionsFromSuggestions, permissionResultFromOutcome, } from "./bridge/permissions.js";
 export { mapSessionMessagesToUpdates, mapSdkSessions, } from "./bridge/history.js";
-export { handleSdkMessage, handleTaskSystemMessage } from "./bridge/message_handlers.js";
+export { handleSdkMessage, handleTaskSystemMessage, } from "./bridge/message_handlers.js";
 export { mapAvailableAgents } from "./bridge/agents.js";
 export { buildQueryOptions, resolveClaudeCodeSpawnCommand, } from "./bridge/session_lifecycle.js";
 export { mapAvailableModels } from "./bridge/model_metadata.js";
@@ -72,8 +72,12 @@ function userTextPartsFromSessionMessage(message) {
             textBlocks.push(blockRecord.text);
         }
     }
-    const firstText = textBlocks.map(normalizeRewindTargetText).find((text) => text.length > 0);
-    return firstText ? { firstText, inputText: textBlocks.join("\n").trim() } : undefined;
+    const firstText = textBlocks
+        .map(normalizeRewindTargetText)
+        .find((text) => text.length > 0);
+    return firstText
+        ? { firstText, inputText: textBlocks.join("\n").trim() }
+        : undefined;
 }
 export function rewindTargetsFromSessionMessages(messages) {
     const targets = [];
@@ -89,24 +93,36 @@ export function rewindTargetsFromSessionMessages(messages) {
         if (!uuid || !textParts) {
             return;
         }
+        const plan = buildRewindConversationPlan(messages, uuid);
+        if (!plan) {
+            return;
+        }
         targets.push({
             uuid,
             first_text: textParts.firstText,
             input_text: textParts.inputText,
             index,
-            ...(previousAssistantUuid ? { previous_assistant_uuid: previousAssistantUuid } : {}),
+            ...(previousAssistantUuid
+                ? { previous_assistant_uuid: previousAssistantUuid }
+                : {}),
+            ...(plan.resumeSessionAtUuid
+                ? { resume_anchor_uuid: plan.resumeSessionAtUuid }
+                : {}),
         });
     });
     return targets.reverse();
 }
 export function canGenerateSessionTitle(query) {
-    return typeof query.generateSessionTitle === "function";
+    return (typeof query
+        .generateSessionTitle === "function");
 }
 export async function generatePersistedSessionTitle(query, description) {
     if (!canGenerateSessionTitle(query)) {
         throw new Error("SDK query does not support generateSessionTitle");
     }
-    const title = await query.generateSessionTitle(description, { persist: true });
+    const title = await query.generateSessionTitle(description, {
+        persist: true,
+    });
     if (typeof title !== "string" || title.trim().length === 0) {
         throw new Error("SDK did not return a generated session title");
     }
@@ -178,7 +194,7 @@ export function emitAgentConfigOptionUpdate(sessionId, agent) {
         value: agent,
     });
 }
-const EXPECTED_AGENT_SDK_VERSION = "0.3.220";
+const EXPECTED_AGENT_SDK_VERSION = "0.3.227";
 const require = createRequire(import.meta.url);
 export function resolveInstalledAgentSdkVersion() {
     try {
@@ -226,8 +242,18 @@ export async function handleReloadPluginsCommand(session, requestId) {
     }
 }
 function resolveRewindTarget(messages, targetUserMessageId) {
+    const seenUuids = new Set();
+    for (const message of messages) {
+        const uuid = message.uuid;
+        if (typeof uuid !== "string" ||
+            uuid.trim().length === 0 ||
+            seenUuids.has(uuid.trim())) {
+            return null;
+        }
+        seenUuids.add(uuid.trim());
+    }
     let previousAssistantUuid;
-    let textUserCountBeforeTarget = 0;
+    let previousTextUserIndex;
     for (let index = 0; index < messages.length; index += 1) {
         const message = messages[index];
         const record = message;
@@ -241,22 +267,22 @@ function resolveRewindTarget(messages, targetUserMessageId) {
             continue;
         }
         if (uuid === targetUserMessageId) {
-            if (!previousAssistantUuid && textUserCountBeforeTarget > 0) {
-                return null;
-            }
-            if (previousAssistantUuid) {
-                const anchorIndex = messages.findIndex((candidate) => {
-                    const candidateRecord = candidate;
-                    return candidateRecord.uuid === previousAssistantUuid;
-                });
-                if (anchorIndex < 0) {
+            const isLatestTextUser = !messages
+                .slice(index + 1)
+                .some((candidate) => userTextPartsFromSessionMessage(candidate) !== undefined);
+            if (previousTextUserIndex !== undefined) {
+                const anchorRecord = messages[index - 1];
+                const resumeSessionAtUuid = typeof anchorRecord.uuid === "string" ? anchorRecord.uuid.trim() : "";
+                if (!resumeSessionAtUuid || index - 1 < previousTextUserIndex) {
                     return null;
                 }
                 return {
                     inputText: textParts.inputText,
                     previousAssistantUuid,
+                    resumeSessionAtUuid,
+                    ...(isLatestTextUser ? { resumeDropsTurnId: uuid } : {}),
                     targetIndex: index,
-                    retainedMessages: messages.slice(0, anchorIndex + 1),
+                    retainedMessages: messages.slice(0, index),
                 };
             }
             return {
@@ -266,7 +292,7 @@ function resolveRewindTarget(messages, targetUserMessageId) {
             };
         }
         if (uuid) {
-            textUserCountBeforeTarget += 1;
+            previousTextUserIndex = index;
         }
     }
     return null;
@@ -291,7 +317,9 @@ export function mapRewindFilesResult(result) {
         can_rewind: result.canRewind,
         ...(result.error ? { error: result.error } : {}),
         files_changed: result.filesChanged ?? [],
-        ...(result.insertions !== undefined ? { insertions: result.insertions } : {}),
+        ...(result.insertions !== undefined
+            ? { insertions: result.insertions }
+            : {}),
         ...(result.deletions !== undefined ? { deletions: result.deletions } : {}),
         ...(skippedLinks !== undefined ? { skipped_links: skippedLinks } : {}),
     };
@@ -329,7 +357,7 @@ function requestIdFromCommandLine(line) {
         return undefined;
     }
 }
-async function replaceConversationForRewind(command, session, targetUserMessageId, requestId, pendingRewindResult) {
+async function prepareConversationRewindCandidate(command, session, targetUserMessageId, requestId) {
     const historyMessages = await getSessionMessages(command.session_id, {
         dir: session.cwd,
         includeSystemMessages: true,
@@ -371,74 +399,83 @@ async function replaceConversationForRewind(command, session, targetUserMessageI
             stale_session_count: staleSessions.length,
         },
     });
-    if (!resolved.previousAssistantUuid) {
-        bridgeLogger.info({
-            target: LOG_TARGETS.APP_SESSION,
-            eventName: "rewind_first_message_branch",
-            message: "conversation rewind target is first user message; creating fresh replacement",
-            outcome: "start",
-            ...(requestId ? { requestId } : {}),
-            sessionId: session.sessionId,
-            fields: {
-                target_user_message_id: targetUserMessageId,
-                history_message_count: historyMessages.length,
-                stale_session_count: staleSessions.length,
-            },
-        });
-        await createSession({
-            cwd: session.cwd,
-            launchSettings: command.launch_settings,
-            connectEvent: "session_replaced",
-            requestId,
-            restoredInput: resolved.inputText,
-            ...(pendingRewindResult ? { pendingRewindResult } : {}),
-            ...(staleSessions.length > 0 ? { sessionsToCloseAfterConnect: staleSessions } : {}),
-        });
+    let candidate;
+    try {
+        if (!resolved.resumeSessionAtUuid) {
+            bridgeLogger.info({
+                target: LOG_TARGETS.APP_SESSION,
+                eventName: "rewind_first_message_branch",
+                message: "conversation rewind target is first user message; creating fresh replacement",
+                outcome: "start",
+                ...(requestId ? { requestId } : {}),
+                sessionId: session.sessionId,
+                fields: {
+                    target_user_message_id: targetUserMessageId,
+                    history_message_count: historyMessages.length,
+                    stale_session_count: staleSessions.length,
+                },
+            });
+            candidate = await createSession({
+                cwd: session.cwd,
+                launchSettings: command.launch_settings,
+                connectEvent: "session_replaced",
+                requestId,
+                deferConnect: true,
+                restoredInput: resolved.inputText,
+                ...(staleSessions.length > 0
+                    ? { sessionsToCloseAfterConnect: staleSessions }
+                    : {}),
+            });
+        }
+        else {
+            candidate = await createSession({
+                cwd: session.cwd,
+                resume: command.session_id,
+                resumeSessionAt: resolved.resumeSessionAtUuid,
+                resumeDropsTurn: resolved.resumeDropsTurnId,
+                forkSession: true,
+                launchSettings: command.launch_settings,
+                connectEvent: "session_replaced",
+                requestId,
+                deferConnect: true,
+                ...(resumeUpdates.length > 0 ? { resumeUpdates } : {}),
+                restoredInput: resolved.inputText,
+                ...(staleSessions.length > 0
+                    ? { sessionsToCloseAfterConnect: staleSessions }
+                    : {}),
+            });
+        }
+        await awaitSessionInitialization(candidate);
         bridgeLogger.info({
             target: LOG_TARGETS.APP_SESSION,
-            eventName: "rewind_replacement_created",
-            message: "conversation rewind replacement session created",
+            eventName: "rewind_candidate_validated",
+            message: "conversation rewind candidate passed initialization and truncation validation",
             outcome: "success",
             ...(requestId ? { requestId } : {}),
+            sessionId: candidate.sessionId,
             fields: {
                 target_user_message_id: targetUserMessageId,
-                resume_session_at: "<none>",
-                retained_message_count: 0,
-                retained_update_count: 0,
+                resume_session_at: resolved.resumeSessionAtUuid ?? "<none>",
+                resume_drops_turn: resolved.resumeSessionAtUuid
+                    ? (resolved.resumeDropsTurnId ?? "<none>")
+                    : "<none>",
+                retained_message_count: resolved.retainedMessages.length,
+                retained_update_count: resumeUpdates.length,
                 stale_session_count: staleSessions.length,
             },
         });
-        return;
+        return candidate;
+    }
+    catch (error) {
+        if (candidate) {
+            detachSessionForClose(candidate);
+            await closeSessionWithLogging(candidate, {
+                reason: "rewind_candidate_rejected",
+                requestId,
+            });
+        }
+        throw error;
     }
-    const sessionsToCloseAfterConnect = staleSessions.filter((stale) => stale !== session);
-    await createSession({
-        cwd: session.cwd,
-        resume: command.session_id,
-        resumeSessionAt: resolved.previousAssistantUuid,
-        launchSettings: command.launch_settings,
-        connectEvent: "session_replaced",
-        requestId,
-        sessionsToCloseBeforeRegister: [session],
-        ...(resumeUpdates.length > 0 ? { resumeUpdates } : {}),
-        restoredInput: resolved.inputText,
-        ...(pendingRewindResult ? { pendingRewindResult } : {}),
-        ...(sessionsToCloseAfterConnect.length > 0 ? { sessionsToCloseAfterConnect } : {}),
-    });
-    bridgeLogger.info({
-        target: LOG_TARGETS.APP_SESSION,
-        eventName: "rewind_replacement_created",
-        message: "conversation rewind replacement session created",
-        outcome: "success",
-        ...(requestId ? { requestId } : {}),
-        sessionId: command.session_id,
-        fields: {
-            target_user_message_id: targetUserMessageId,
-            resume_session_at: resolved.previousAssistantUuid,
-            retained_message_count: resolved.retainedMessages.length,
-            retained_update_count: resumeUpdates.length,
-            stale_session_count: staleSessions.length,
-        },
-    });
 }
 async function handleRewind(command, requestId) {
     const session = sessionById(command.session_id);
@@ -465,7 +502,8 @@ async function handleRewind(command, requestId) {
     });
     if (command.restore_mode === "conversation") {
         try {
-            await replaceConversationForRewind(command, session, targetUserMessageId, requestId);
+            const candidate = await prepareConversationRewindCandidate(command, session, targetUserMessageId, requestId);
+            commitDeferredSession(candidate);
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -486,18 +524,13 @@ async function handleRewind(command, requestId) {
         }
         return;
     }
-    let appliedFileResult;
+    let dryRunResult;
     try {
-        const dryRunResult = await rewindFiles(session, targetUserMessageId, true);
+        dryRunResult = await rewindFiles(session, targetUserMessageId, true);
         if (!dryRunResult.can_rewind) {
             slashError(command.session_id, dryRunResult.error ?? "failed to dry-run file rewind", requestId);
             return;
         }
-        appliedFileResult = await rewindFiles(session, targetUserMessageId, false);
-        if (!appliedFileResult.can_rewind) {
-            slashError(command.session_id, appliedFileResult.error ?? "failed to restore code", requestId);
-            return;
-        }
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -518,24 +551,61 @@ async function handleRewind(command, requestId) {
         return;
     }
     if (command.restore_mode === "code") {
-        emitRewindResult(session.sessionId, command.restore_mode, "success", requestId, appliedFileResult);
+        try {
+            const appliedFileResult = await rewindFiles(session, targetUserMessageId, false);
+            if (!appliedFileResult.can_rewind) {
+                slashError(command.session_id, appliedFileResult.error ?? "failed to restore code", requestId);
+                return;
+            }
+            emitRewindResult(session.sessionId, command.restore_mode, "success", requestId, appliedFileResult);
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            slashError(command.session_id, `failed to restore code: ${message}`, requestId);
+        }
         return;
     }
+    let candidate;
     try {
-        await replaceConversationForRewind(command, session, targetUserMessageId, requestId, {
-            event: "rewind_result",
-            restore_mode: command.restore_mode,
-            status: "success",
-            file_result: appliedFileResult,
+        candidate = await prepareConversationRewindCandidate(command, session, targetUserMessageId, requestId);
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        bridgeLogger.error({
+            target: LOG_TARGETS.APP_SESSION,
+            eventName: "rewind_failed",
+            message: "conversation candidate failed before file restore",
+            outcome: "failure",
+            ...(requestId ? { requestId } : {}),
+            sessionId: session.sessionId,
+            fields: {
+                target_user_message_id: targetUserMessageId,
+                restore_mode: command.restore_mode,
+                error_message: message,
+            },
         });
+        slashError(command.session_id, `failed to validate conversation rewind: ${message}`, requestId);
+        return;
+    }
+    let appliedFileResult;
+    try {
+        appliedFileResult = await rewindFiles(session, targetUserMessageId, false);
+        if (!appliedFileResult.can_rewind) {
+            throw new Error(appliedFileResult.error ?? "failed to restore code");
+        }
     }
     catch (error) {
+        detachSessionForClose(candidate);
+        await closeSessionWithLogging(candidate, {
+            reason: "rewind_file_apply_failed",
+            requestId,
+        });
         const message = error instanceof Error ? error.message : String(error);
         bridgeLogger.error({
             target: LOG_TARGETS.APP_SESSION,
             eventName: "rewind_failed",
-            message: "conversation rewind failed after file restore",
-            outcome: "partial_failure",
+            message: "file rewind failed after conversation candidate validation",
+            outcome: "failure",
             ...(requestId ? { requestId } : {}),
             sessionId: session.sessionId,
             fields: {
@@ -544,13 +614,34 @@ async function handleRewind(command, requestId) {
                 error_message: message,
             },
         });
-        emitRewindResult(session.sessionId, command.restore_mode, "partial_failure", requestId, appliedFileResult, `Code was restored, but the conversation could not be rewound: ${message}`);
+        slashError(command.session_id, `failed to restore code: ${message}`, requestId);
+        return;
+    }
+    candidate.pendingRewindResult = {
+        event: "rewind_result",
+        restore_mode: command.restore_mode,
+        status: "success",
+        file_result: appliedFileResult,
+    };
+    try {
+        commitDeferredSession(candidate);
+    }
+    catch (error) {
+        detachSessionForClose(candidate);
+        await closeSessionWithLogging(candidate, {
+            reason: "rewind_candidate_failed_after_file_apply",
+            requestId,
+        });
+        const message = error instanceof Error ? error.message : String(error);
+        emitRewindResult(session.sessionId, command.restore_mode, "partial_failure", requestId, appliedFileResult, `Code was restored, but the conversation candidate could not be committed: ${message}`);
     }
 }
 async function handleCommand(command, requestId) {
     logBridgeCommandReceived(command, requestId);
     const sdkVersionError = agentSdkVersionCompatibilityError();
-    if (sdkVersionError && command.command !== "initialize" && command.command !== "shutdown") {
+    if (sdkVersionError &&
+        command.command !== "initialize" &&
+        command.command !== "shutdown") {
         bridgeLogger.error({
             target: LOG_TARGETS.BRIDGE_LIFECYCLE,
             eventName: "bridge_command_rejected",
@@ -569,9 +660,12 @@ async function handleCommand(command, requestId) {
         case "initialize":
         case "create_session":
         case "resume_session":
+        case "resume_session_at":
         case "new_session":
         case "shutdown":
-            await handleLifecycleCommand(command, requestId, sdkVersionError);
+            await handleLifecycleCommand(command, requestId, sdkVersionError, {
+                buildRewindConversationPlan,
+            });
             return;
         case "prompt":
         case "cancel_turn":
@@ -595,6 +689,7 @@ async function handleCommand(command, requestId) {
         case "rename_session":
         case "get_status_snapshot":
         case "get_context_usage":
+        case "get_usage":
         case "get_rewind_targets":
         case "rewind":
             await handleSessionDataCommand(command, requestId, {
@@ -720,6 +815,7 @@ function main() {
         });
     });
 }
-if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+if (process.argv[1] &&
+    import.meta.url === pathToFileURL(process.argv[1]).href) {
     main();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-rust",
-  "version": "0.14.2",
+  "version": "0.14.4",
   "description": "Claude Code Rust - native Rust terminal interface for Claude Code",
   "keywords": [
     "cli",
@@ -33,15 +33,15 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.220"
+    "@anthropic-ai/claude-agent-sdk": "0.3.227"
   },
   "optionalDependencies": {
-    "@srothgan/claude-code-rust-darwin-arm64": "0.14.2",
-    "@srothgan/claude-code-rust-darwin-x64": "0.14.2",
-    "@srothgan/claude-code-rust-linux-x64-gnu": "0.14.2",
-    "@srothgan/claude-code-rust-linux-arm64-gnu": "0.14.2",
-    "@srothgan/claude-code-rust-win32-x64-msvc": "0.14.2",
-    "@srothgan/claude-code-rust-win32-arm64-msvc": "0.14.2"
+    "@srothgan/claude-code-rust-darwin-arm64": "0.14.4",
+    "@srothgan/claude-code-rust-darwin-x64": "0.14.4",
+    "@srothgan/claude-code-rust-linux-x64-gnu": "0.14.4",
+    "@srothgan/claude-code-rust-linux-arm64-gnu": "0.14.4",
+    "@srothgan/claude-code-rust-win32-x64-msvc": "0.14.4",
+    "@srothgan/claude-code-rust-win32-arm64-msvc": "0.14.4"
   },
   "engines": {
     "node": ">=24"