@agent-native/core 0.188.0 → 0.189.0-nightly-20260925200527

package/dist/client/AssistantChat.js

@@ -23,7 +23,7 @@ import { AgentActivityTrace } from "./chat/agent-activity-trace.js";
 import { DownscalingImageAttachmentAdapter, BinaryDocumentAttachmentAdapter, MAX_PDF_BYTES, MAX_ESTIMATED_BODY_BYTES, AGGRESSIVE_MAX_IMAGE_DIMENSION, AGGRESSIVE_JPEG_QUALITY, transcodeImageToDataURL, createAgentImageAttachments, serializeQueuedAttachments, getSubmittedPromptBodyStrings, measureJsonStringBytes, getAttachmentBodyStrings, } from "./chat/attachment-adapters.js";
 import { readAssistantChatComposerDraft, writeAssistantChatComposerDraft, } from "./chat/composer-draft.js";
 import { AgentTextStreamingProvider, ExternalTextStreamingContext, } from "./chat/markdown-renderer.js";
-import { AssistantChatHistoryContext, assistantMessageHasCompletedSideEffect, findMatchingAssistantChatHistoryVersion, isAssistantChatHistoryVersion, CheckpointContext, MessageActionsContext, assistantMessageRunId, assistantMessageTurnId, UserMessage, AssistantMessage, ExternalUserStoppedRunContext, SelectionAttachedPill, displayableUserMessageText, isHiddenUserMessage, ServerRunActiveContext, UserStoppedRunContext, } from "./chat/message-components.js";
+import { AssistantChatHistoryContext, AssistantChatHistoryBeginningRevertButton, assistantMessageHasCompletedSideEffect, findAssistantChatHistoryBeginningVersion, findMatchingAssistantChatHistoryVersion, isAssistantChatHistoryVersion, CheckpointContext, MessageActionsContext, assistantMessageRunId, assistantMessageTurnId, UserMessage, AssistantMessage, ExternalUserStoppedRunContext, SelectionAttachedPill, displayableUserMessageText, isHiddenUserMessage, ServerRunActiveContext, UserStoppedRunContext, } from "./chat/message-components.js";
 import { repoHasAssistantMessage, getRepoMessages, getRepoMessage, shouldImportServerThreadData, dedupeRepoMessagesById, dropEmptyAssistantMessages, withLastAssistantRunDuration, } from "./chat/repo-helpers.js";
 import { BuilderSetupCard, LoopLimitContinueCard, RunErrorRecoveryCard, PlanModeCallout, getLoopLimitMetadata, getRunErrorMetadata, getRequestModeMetadata, isBuilderReconnectRunError, runErrorKey, } from "./chat/run-recovery.js";
 import { createAgentChatRuntimeAdapter, } from "./chat/runtime.js";
@@ -1321,6 +1321,7 @@ export function shouldShowAssistantChatSuggestions(visibility, hasAssistantMessa
     return visibility === "always" || hasAssistantMessage;
 }
 export async function restoreAssistantChatHistoryVersion(options) {
+    await options.history.restore.beforeRestore?.();
     const args = await options.history.restore.args(options.version);
     const restored = await options.restore(args);
     let applicationFailed = false;
@@ -1976,7 +1977,9 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     isRunningRef.current = isRunning;
     const submissionInFlightRef = useRef(0);
     const submissionTailRef = useRef(Promise.resolve());
-    const chatHistoryListQuery = useActionQuery((chatHistory?.list.action ?? "list-resource-versions"), chatHistory?.list.args, { enabled: chatHistory !== undefined });
+    const chatHistoryListQuery = useActionQuery((chatHistory?.list.action ?? "list-resource-versions"), (typeof chatHistory?.list.args === "function"
+        ? chatHistory.list.args(threadId)
+        : chatHistory?.list.args), { enabled: chatHistory !== undefined });
     const chatHistoryVersions = useMemo(() => {
         if (!chatHistory || chatHistoryListQuery.data == null)
             return [];
@@ -1990,24 +1993,59 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     const refetchChatHistory = chatHistoryListQuery.refetch;
     const restoreHistory = chatHistoryRestoreMutation.mutateAsync;
     const createHistoryVersion = chatHistoryCreateMutation.mutateAsync;
+    const [isChatHistoryRestoring, setIsChatHistoryRestoring] = useState(false);
+    const chatHistoryRestoreInFlightRef = useRef(false);
+    const chatHistoryRestoreWaitRef = useRef(null);
+    const waitForChatHistoryRestore = useCallback(async () => {
+        let restoreWait = chatHistoryRestoreWaitRef.current;
+        while (restoreWait) {
+            await restoreWait;
+            restoreWait = chatHistoryRestoreWaitRef.current;
+        }
+    }, []);
     const restoreChatHistoryVersion = useCallback(async (version) => {
         if (!chatHistory)
             return;
-        await restoreAssistantChatHistoryVersion({
-            history: chatHistory,
-            version,
-            restore: restoreHistory,
-            refetch: refetchChatHistory,
-            onRefetchError: (error) => captureError(error, {
-                tags: {
-                    source: "agent-chat-client",
-                    phase: "chat-history-refetch-after-restore",
-                },
-            }),
+        if (chatHistoryRestoreInFlightRef.current) {
+            throw new Error("A chat history restore is already in progress.");
+        }
+        if (submissionInFlightRef.current > 0) {
+            throw new Error("A chat submission is already in progress.");
+        }
+        let finishRestore;
+        const restoreWait = new Promise((resolve) => {
+            finishRestore = resolve;
         });
+        chatHistoryRestoreWaitRef.current = restoreWait;
+        chatHistoryRestoreInFlightRef.current = true;
+        setIsChatHistoryRestoring(true);
+        try {
+            await restoreAssistantChatHistoryVersion({
+                history: chatHistory,
+                version,
+                restore: restoreHistory,
+                refetch: refetchChatHistory,
+                onRefetchError: (error) => captureError(error, {
+                    tags: {
+                        source: "agent-chat-client",
+                        phase: "chat-history-refetch-after-restore",
+                    },
+                }),
+            });
+        }
+        finally {
+            chatHistoryRestoreInFlightRef.current = false;
+            setIsChatHistoryRestoring(false);
+            if (chatHistoryRestoreWaitRef.current === restoreWait) {
+                chatHistoryRestoreWaitRef.current = null;
+            }
+            finishRestore();
+        }
     }, [chatHistory, refetchChatHistory, restoreHistory]);
     const chatHistoryContext = useMemo(() => chatHistory
         ? {
+            beginningVersion: findAssistantChatHistoryBeginningVersion(chatHistoryVersions, threadId, chatHistory.isEditable),
+            isRestoring: isChatHistoryRestoring,
             findVersion: (message) => findMatchingAssistantChatHistoryVersion(chatHistoryVersions, message, {
                 isEditable: chatHistory.isEditable,
                 scope: chatHistory.scope ?? contextScope ?? undefined,
@@ -2015,7 +2053,13 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             }),
             restoreVersion: restoreChatHistoryVersion,
         }
-        : null, [chatHistory, chatHistoryVersions, restoreChatHistoryVersion]);
+        : null, [
+        chatHistory,
+        chatHistoryVersions,
+        isChatHistoryRestoring,
+        restoreChatHistoryVersion,
+        threadId,
+    ]);
     const chatHistoryRunObservedRef = useRef(false);
     const chatHistoryCreateKeyRef = useRef(null);
     useEffect(() => {
@@ -2035,6 +2079,12 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             .find((message) => message.role === "assistant");
         if (!latestAssistantMessage ||
             !assistantMessageHasCompletedSideEffect(latestAssistantMessage)) {
+            void refetchChatHistory().catch((error) => captureError(error, {
+                tags: {
+                    source: "agent-chat-client",
+                    phase: "chat-history-refetch-after-run",
+                },
+            }));
             return;
         }
         const historyMessage = {
@@ -3736,6 +3786,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         // Keep prompts visible while setup is missing. Dequeuing them would remove
         // the only user-visible copy and immediately re-enter the provider failure.
         if (isRestoring ||
+            isChatHistoryRestoring ||
             engineSetupRequired ||
             isRunning ||
             queuedMessages.length === 0) {
@@ -3762,7 +3813,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     // complete. Starting the queued turn during that window can reconnect
                     // to the old run and replay the old answer under the new prompt.
                     const runCleared = await waitForThreadRunToClear(apiUrl, threadId);
-                    if (cancelled)
+                    if (cancelled || chatHistoryRestoreInFlightRef.current)
                         return;
                     if (!runCleared) {
                         // The server still owns this turn (including a deferred durable
@@ -3869,6 +3920,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         apiUrl,
         appendThreadMessage,
         applyLocalQueuedMessages,
+        isChatHistoryRestoring,
         isRestoring,
         isRunning,
         engineSetupRequired,
@@ -4201,7 +4253,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     }, [onStop, stopActiveRun]);
     // The composer stop button uses the handler above; queued send-now keeps the
     // active run alive and only promotes the selected message for later dequeue.
-    const sendQueuedMessageNow = useCallback((id) => {
+    const sendQueuedMessageNow = useCallback(async (id) => {
+        await waitForChatHistoryRestore();
         const message = queuedMessagesRef.current.find((candidate) => candidate.id === id);
         if (!message || message.promoted)
             return;
@@ -4235,9 +4288,18 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             return;
         }
         applyLocalQueuedMessages((prev) => promoteQueuedMessage(prev, id));
-    }, [appendThreadMessage, applyLocalQueuedMessages, threadId, threadRuntime]);
+    }, [
+        appendThreadMessage,
+        applyLocalQueuedMessages,
+        threadId,
+        threadRuntime,
+        waitForChatHistoryRestore,
+    ]);
     const visibleQueuedMessages = useMemo(() => queuedMessages.filter((message) => !message.hideUserMessage && !message.promoted), [queuedMessages]);
     const addToQueue = useCallback(async (text, images, references, attachments, requestMode, intent = "queued", recoveryAction, includeComposerContext = false, trackInRunsTray = false, preserveReconnectAutoRecoveryBudget = false, hideUserMessage = false, submitMessageId, approvedToolCalls, continuationTurnId, usageLabel, actionScope) => {
+        if (isAgentChatSubmitCancelled(submitMessageId))
+            return false;
+        await waitForChatHistoryRestore();
         if (isAgentChatSubmitCancelled(submitMessageId))
             return false;
         const wasSubmissionInFlight = submissionInFlightRef.current > 0;
@@ -4448,6 +4510,16 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                 ]);
             }
             else {
+                try {
+                    await chatHistory?.beforeStart?.();
+                }
+                catch (error) {
+                    setComposerError(String(error));
+                    reportAgentChatSubmitResult(submitMessageId, false, "editor-save-failed");
+                    return false;
+                }
+                if (isAgentChatSubmitCancelled(submitMessageId))
+                    return false;
                 markOptimisticRunning();
                 try {
                     appendThreadMessage({
@@ -4506,6 +4578,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         t,
         threadId,
         updateComposerContextItems,
+        waitForChatHistoryRestore,
+        chatHistory,
     ]);
     const mcpResumeTimerRef = useRef(null);
     const scheduleMcpConnectionResume = useCallback((request) => {
@@ -4974,19 +5048,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                             if (engineSetupRequired)
                                                                                                 return;
                                                                                             void addToQueue(suggestion);
-                                                                                        }, className: "agent-empty-suggestion w-full rounded-xl border border-border/70 bg-card/60 px-3 py-2.5 text-left text-[13px] text-muted-foreground shadow-sm transition-[border-color,background-color,color,transform] hover:-translate-y-px hover:border-border hover:bg-card hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2", children: suggestion }, suggestion))) })) : null, showInlineEmptyThreadFooterSlot ? (_jsx("div", { className: "agent-thread-footer-slot agent-thread-footer-slot--empty", children: resolvedThreadFooterSlot })) : null, emptyStateFooter ? (_jsx("div", { className: "agent-empty-state-footer", children: emptyStateFooter })) : null] })) : (_jsxs(MessageScrollerContent, { className: "agent-thread-content gap-4 px-4 py-4", children: [resolvedThreadContentSlot ? (_jsx(MessageScrollerItem, { children: _jsx("div", { className: "agent-thread-content-slot", children: resolvedThreadContentSlot }) })) : null, threadRestoreErrorSurface ? (_jsx(MessageScrollerItem, { children: threadRestoreErrorSurface })) : null, _jsx(AssistantMessageListErrorBoundary, { resetKey: messageListResetKey, children: _jsx(UserStoppedRunContext.Provider, { value: wasUserStoppedRun, children: _jsx(ExternalUserStoppedRunContext.Provider, { value: externalUserStopped, children: _jsx(ExternalTextStreamingContext.Provider, { value: externalStreaming, children: _jsx(AssistantChatHistoryContext.Provider, { value: chatHistoryContext, children: _jsx(ThreadPrimitive.Messages
-                                                                                                    // Deliberately NOT keyed on part structure. Doing that
-                                                                                                    // remounted the whole transcript every time a tool call
-                                                                                                    // started or a placeholder id was rewritten — a flash and a
-                                                                                                    // lost scroll position in the middle of an answer. The
-                                                                                                    // error boundary above is the mechanism for assistant-ui's
-                                                                                                    // stale tap-resource errors: it catches them, clears, and
-                                                                                                    // retries, and its retry signature includes the reset key so
-                                                                                                    // a genuinely new structure always gets a fresh budget.
-                                                                                                    // `assistant-ui-part-churn.spec.tsx` drives append, mutate,
-                                                                                                    // rename and splice through both the import and streaming
-                                                                                                    // paths and records that no such error occurs.
-                                                                                                    , { 
+                                                                                        }, className: "agent-empty-suggestion w-full rounded-xl border border-border/70 bg-card/60 px-3 py-2.5 text-left text-[13px] text-muted-foreground shadow-sm transition-[border-color,background-color,color,transform] hover:-translate-y-px hover:border-border hover:bg-card hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2", children: suggestion }, suggestion))) })) : null, showInlineEmptyThreadFooterSlot ? (_jsx("div", { className: "agent-thread-footer-slot agent-thread-footer-slot--empty", children: resolvedThreadFooterSlot })) : null, emptyStateFooter ? (_jsx("div", { className: "agent-empty-state-footer", children: emptyStateFooter })) : null] })) : (_jsxs(MessageScrollerContent, { className: "agent-thread-content gap-4 px-4 py-4", children: [resolvedThreadContentSlot ? (_jsx(MessageScrollerItem, { children: _jsx("div", { className: "agent-thread-content-slot", children: resolvedThreadContentSlot }) })) : null, threadRestoreErrorSurface ? (_jsx(MessageScrollerItem, { children: threadRestoreErrorSurface })) : null, _jsx(AssistantMessageListErrorBoundary, { resetKey: messageListResetKey, children: _jsx(UserStoppedRunContext.Provider, { value: wasUserStoppedRun, children: _jsx(ExternalUserStoppedRunContext.Provider, { value: externalUserStopped, children: _jsx(ExternalTextStreamingContext.Provider, { value: externalStreaming, children: _jsxs(AssistantChatHistoryContext.Provider, { value: chatHistoryContext, children: [chatHistoryContext?.beginningVersion ? (_jsx(MessageScrollerItem, { children: _jsx(AssistantChatHistoryBeginningRevertButton, {}) })) : null, _jsx(ThreadPrimitive.Messages
                                                                                                         // Deliberately NOT keyed on part structure. Doing that
                                                                                                         // remounted the whole transcript every time a tool call
                                                                                                         // started or a placeholder id was rewritten — a flash and a
@@ -4998,10 +5060,22 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                                         // `assistant-ui-part-churn.spec.tsx` drives append, mutate,
                                                                                                         // rename and splice through both the import and streaming
                                                                                                         // paths and records that no such error occurs.
-                                                                                                        components: {
-                                                                                                            UserMessage: AssistantChatUserMessageItem,
-                                                                                                            AssistantMessage: AssistantChatAssistantMessageItem,
-                                                                                                        } }) }) }) }) }) }), visibleLoopLimit && !showRunningInUI && (_jsx(MessageScrollerItem, { children: _jsx(LoopLimitContinueCard, { info: visibleLoopLimit, onContinue: () => {
+                                                                                                        , { 
+                                                                                                            // Deliberately NOT keyed on part structure. Doing that
+                                                                                                            // remounted the whole transcript every time a tool call
+                                                                                                            // started or a placeholder id was rewritten — a flash and a
+                                                                                                            // lost scroll position in the middle of an answer. The
+                                                                                                            // error boundary above is the mechanism for assistant-ui's
+                                                                                                            // stale tap-resource errors: it catches them, clears, and
+                                                                                                            // retries, and its retry signature includes the reset key so
+                                                                                                            // a genuinely new structure always gets a fresh budget.
+                                                                                                            // `assistant-ui-part-churn.spec.tsx` drives append, mutate,
+                                                                                                            // rename and splice through both the import and streaming
+                                                                                                            // paths and records that no such error occurs.
+                                                                                                            components: {
+                                                                                                                UserMessage: AssistantChatUserMessageItem,
+                                                                                                                AssistantMessage: AssistantChatAssistantMessageItem,
+                                                                                                            } })] }) }) }) }) }), visibleLoopLimit && !showRunningInUI && (_jsx(MessageScrollerItem, { children: _jsx(LoopLimitContinueCard, { info: visibleLoopLimit, onContinue: () => {
                                                                                             setShowContinue(false);
                                                                                             setLoopLimitInfo(null);
                                                                                             const continuation = latestProtocolContinuationContext(messagesRef.current);
@@ -5089,7 +5163,9 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                         ? bounceMissingKeySetup
                                                                         : undefined, children: _jsxs(_Fragment, { children: [_jsx(ComposerAttachmentPreviewStrip, {}), _jsx(TiptapComposer, { focusRef: tiptapRef, maxDocumentAttachmentBytes: MAX_PDF_BYTES, initialText: initialComposerText ?? undefined, initialTextKey: composerDraftScope, onTextChange: isActiveComposer
                                                                                     ? handleComposerTextChange
-                                                                                    : undefined, disabled: isComposerDisabled || showMissingKeySetup, placeholder: showMissingKeySetup
+                                                                                    : undefined, disabled: isComposerDisabled ||
+                                                                                    showMissingKeySetup ||
+                                                                                    isChatHistoryRestoring, placeholder: showMissingKeySetup
                                                                                     ? t("agentChat.setup.connectPlaceholder")
                                                                                     : engineSetupRequired
                                                                                         ? t("agentChat.setup.connectPlaceholder")
@@ -5119,6 +5195,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                     }
                                                                                 }, willQueue: engineSetupRequired ||
                                                                                     isRunning ||
+                                                                                    isChatHistoryRestoring ||
                                                                                     submissionInFlightRef.current > 0, onSlashCommand: onSlashCommand, execMode: execMode, onExecModeChange: onExecModeChange, planModeDisabled: planModeDisabled, planModeDisabledReason: planModeDisabledReason, selectedModel: selectedModel ?? defaultModel, selectedEffort: selectedEffort, availableModels: availableModels, availableAgents: availableAgents, selectedAgent: selectedAgent, hostedHarness: hostedHarness, modelListLoading: modelListLoading, onModelChange: shouldShowAssistantChatModelSelector(showModelSelector)
                                                                                     ? onModelChange
                                                                                     : undefined, onEffortChange: onEffortChange, onAgentChange: onAgentChange, imageModelMenu: imageModelMenu, onConnectProvider: onConnectProvider, onConnectLocalRuntime: onConnectLocalRuntime, toolbarSlot: composerToolbarSlot, contextItems: visibleComposerContextItems, onRemoveContextItem: removeComposerContextItem, plusMenuMode: plusMenuMode, layoutVariant: composerLayoutVariant, providerConnectStatusEnabled: providerStatusChecksEnabled, voiceEnabled: true, draftScope: composerDraftScope, interceptBuildRequestsForBuilder: true, onAttachmentError: setComposerError, extraActionButton: composerExtraActionButton, stopButton: showRunningInUI ? (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", onClick: handleComposerStop, "aria-label": t("agentChat.composer.stopResponse"), "data-agent-composer-slot": "stop-button", className: "shrink-0 flex h-7 w-7 cursor-pointer items-center justify-center rounded-full bg-primary text-primary-foreground shadow-sm transition-opacity hover:opacity-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2", children: _jsx(IconPlayerStopFilled, { className: "h-3 w-3" }) }) }), _jsx(TooltipContent, { children: t("agentChat.composer.stopResponse") })] })) : undefined })] }) }) })] })] }) }) }) }) }) }) }) }) }) }) }));

package/dist/client/chat/assistant-chat-history-version.d.ts

@@ -7,6 +7,7 @@ export interface AssistantChatHistoryVersion {
         threadId?: string;
         runId?: string;
         turnId?: string;
+        phase?: "start" | "end";
     };
 }
 export declare function coerceAssistantChatHistoryDate(value: unknown): Date | null;

package/dist/client/chat/message-components.d.ts

@@ -57,14 +57,17 @@ export interface AssistantChatHistoryMessage {
     hasCompletedSideEffect: boolean;
 }
 export interface AssistantChatHistoryConfig<TListResult = unknown, TVersion extends AssistantChatHistoryVersion = AssistantChatHistoryVersion, TRestoreResult = unknown> {
+    /** Flush host editor writes before an agent turn starts. */
+    beforeStart?: () => void | Promise<void>;
     list: {
         action: string;
-        args?: Record<string, unknown>;
+        args?: Record<string, unknown> | ((threadId?: string) => Record<string, unknown>);
         getVersions: (result: TListResult) => readonly TVersion[];
     };
     restore: {
         action: string;
         args: (version: TVersion) => Record<string, unknown> | Promise<Record<string, unknown>>;
+        beforeRestore?: () => void | Promise<void>;
         onRestored?: (result: TRestoreResult, version: TVersion) => void | Promise<void>;
     };
     createVersion?: {
@@ -76,6 +79,8 @@ export interface AssistantChatHistoryConfig<TListResult = unknown, TVersion exte
     matchVersion?: (version: TVersion, message: AssistantChatHistoryMessage) => boolean;
 }
 export interface AssistantChatHistoryContextValue {
+    beginningVersion: AssistantChatHistoryVersion | null;
+    isRestoring: boolean;
     findVersion: (message: AssistantChatHistoryMessage) => AssistantChatHistoryVersion | null;
     restoreVersion: (version: AssistantChatHistoryVersion) => Promise<void>;
 }
@@ -93,6 +98,7 @@ export declare const MessageActionsContext: React.Context<{
 export declare function isLocalDevelopmentHost(hostname: string): boolean;
 export declare function assistantMessageHasCompletedSideEffect(message: unknown): boolean;
 export declare function findMatchingAssistantChatHistoryVersion<TVersion extends AssistantChatHistoryVersion>(versions: readonly TVersion[], message: AssistantChatHistoryMessage, options?: Pick<AssistantChatHistoryConfig<unknown, TVersion>, "isEditable" | "matchVersion" | "scope">): TVersion | null;
+export declare function findAssistantChatHistoryBeginningVersion<TVersion extends AssistantChatHistoryVersion>(versions: readonly TVersion[], threadId?: string, isEditable?: (version: TVersion) => boolean): TVersion | null;
 /**
  * Restore rewrites the working tree, so only offer it when the server actually
  * has a checkpoint for this turn. Auto-checkpointing skips turns that started
@@ -129,6 +135,7 @@ export declare function MessageActionsMenu({ showRevert, onRevert, threadId, }?:
     onRevert?: () => void;
     threadId?: string;
 }): React.JSX.Element;
+export declare function AssistantChatHistoryBeginningRevertButton(): React.JSX.Element | null;
 export declare function UserMessage(): React.JSX.Element | null;
 export declare function messageTextFromContent(content: unknown): string;
 export declare function isMissingFinalResponseWarningText(text: string): boolean;

package/dist/client/chat/message-components.js

@@ -221,7 +221,7 @@ export function findMatchingAssistantChatHistoryVersion(versions, message, optio
         return null;
     }
     let match = null;
-    let matchTime = Number.POSITIVE_INFINITY;
+    let matchTime = Number.NEGATIVE_INFINITY;
     for (const version of versions) {
         if (!isAssistantChatHistoryVersion(version))
             continue;
@@ -229,6 +229,8 @@ export function findMatchingAssistantChatHistoryVersion(versions, message, optio
             continue;
         }
         const chatContext = version.chatContext;
+        if (chatContext?.phase === "start")
+            continue;
         const matchesChatTurn = Boolean(chatContext &&
             ((message.turnId && chatContext.turnId
                 ? chatContext.turnId === message.turnId
@@ -244,13 +246,34 @@ export function findMatchingAssistantChatHistoryVersion(versions, message, optio
         const matches = options.matchVersion
             ? options.matchVersion(version, message)
             : true;
-        if (!matches || versionTime >= matchTime)
+        if (!matches || versionTime <= matchTime)
             continue;
         match = version;
         matchTime = versionTime;
     }
     return match;
 }
+export function findAssistantChatHistoryBeginningVersion(versions, threadId, isEditable) {
+    if (!threadId)
+        return null;
+    let beginning = null;
+    let beginningTime = Number.POSITIVE_INFINITY;
+    for (const version of versions) {
+        if (!isAssistantChatHistoryVersion(version) ||
+            version.editable === false ||
+            isEditable?.(version) === false ||
+            version.chatContext?.threadId !== threadId ||
+            version.chatContext.phase !== "start") {
+            continue;
+        }
+        const versionTime = coerceMessageDate(version.createdAt)?.getTime();
+        if (versionTime == null || versionTime >= beginningTime)
+            continue;
+        beginning = version;
+        beginningTime = versionTime;
+    }
+    return beginning;
+}
 /**
  * Restore rewrites the working tree, so only offer it when the server actually
  * has a checkpoint for this turn. Auto-checkpointing skips turns that started
@@ -486,13 +509,16 @@ export function MessageActionsMenu({ showRevert, onRevert, threadId = "", } = {}
                                         ? t("agentChat.recovery.copyFailed")
                                         : t("agentChat.message.copyRequestId")] }), showRevert && (_jsxs(DropdownMenuItem, { onSelect: handleRevert, children: [_jsx(IconArrowBackUp, { className: "h-3.5 w-3.5" }), t("agentChat.message.revertHere")] })), timestamp && (_jsxs(_Fragment, { children: [_jsx(DropdownMenuSeparator, {}), _jsx(DropdownMenuLabel, { className: "px-2 py-1 text-[11px] font-normal text-muted-foreground", children: t("agentChat.message.sentAt", { time: timestamp.short }) })] }))] })] }));
 }
-function AssistantChatHistoryRevertButton({ onRestore, onRestored, }) {
+function AssistantChatHistoryRevertButton({ onRestore, onRestored, label, persistent = false, }) {
     const t = useT();
+    const chatRunning = React.useContext(ChatRunningContext);
+    const history = React.useContext(AssistantChatHistoryContext);
+    const restoreInProgress = chatRunning || Boolean(history?.isRestoring);
     const [open, setOpen] = useState(false);
     const [state, setState] = useState("confirming");
     const [error, setError] = useState(null);
     const handleOpenChange = useCallback((nextOpen) => {
-        if (!nextOpen && state === "restoring")
+        if (nextOpen && restoreInProgress)
             return;
         setOpen(nextOpen);
         if (nextOpen) {
@@ -502,14 +528,20 @@ function AssistantChatHistoryRevertButton({ onRestore, onRestored, }) {
         else {
             setError(null);
         }
-    }, [state]);
+    }, [restoreInProgress]);
+    useEffect(() => {
+        if (restoreInProgress)
+            setOpen(false);
+    }, [restoreInProgress]);
     const handleRestore = useCallback(async () => {
+        if (restoreInProgress)
+            return;
         setState("restoring");
         setError(null);
         try {
             await onRestore();
             setOpen(false);
-            onRestored();
+            onRestored?.();
         }
         catch (restoreError) {
             const status = restoreError?.status;
@@ -520,8 +552,17 @@ function AssistantChatHistoryRevertButton({ onRestore, onRestored, }) {
                     : t("agentChat.message.restoreRequestFailed")));
             setState("error");
         }
-    }, [onRestore, onRestored, t]);
-    return (_jsxs(Popover, { open: open, onOpenChange: handleOpenChange, children: [_jsx(TooltipProvider, { delayDuration: 400, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(PopoverTrigger, { asChild: true, children: _jsx("button", { type: "button", "aria-label": t("agentChat.message.revertHere"), className: cn("flex h-6 w-6 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 transition-colors duration-150 hover:bg-accent hover:text-foreground", messageFooterFadeClassName, open && "bg-accent text-foreground"), children: _jsx(IconArrowBackUp, { className: "h-3.5 w-3.5" }) }) }) }), _jsx(TooltipContent, { side: "top", className: "text-xs", children: t("agentChat.message.revertHere") })] }) }), _jsx(PopoverContent, { side: "top", align: "start", sideOffset: 6, className: "w-56 rounded-lg border-border p-3 shadow-xl", children: state === "confirming" ? (_jsxs("div", { className: "grid gap-2", children: [_jsx("p", { className: "text-xs font-medium text-foreground", children: t("agentChat.message.restoreQuestion") }), _jsxs("div", { className: "flex justify-end gap-1.5", children: [_jsx("button", { type: "button", onClick: () => setOpen(false), className: "rounded-md px-2 py-1 text-xs font-medium text-muted-foreground hover:bg-accent hover:text-foreground", children: t("agentChat.common.cancel") }), _jsx("button", { type: "button", onClick: () => void handleRestore(), className: "rounded-md bg-destructive px-2 py-1 text-xs font-medium text-destructive-foreground hover:bg-destructive/90", children: t("agentChat.message.revertHere") })] })] })) : state === "restoring" ? (_jsxs("span", { className: "flex items-center gap-1.5 text-xs text-muted-foreground", children: [_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" }), t("agentChat.message.restoring")] })) : (_jsxs("div", { className: "grid gap-2", children: [_jsx("p", { className: "text-xs text-destructive", children: error ?? t("agentChat.message.restoreRequestFailed") }), _jsx("button", { type: "button", onClick: () => setOpen(false), className: "justify-self-end rounded-md px-2 py-1 text-xs font-medium text-muted-foreground hover:bg-accent hover:text-foreground", children: t("agentChat.common.dismiss") })] })) })] }));
+    }, [onRestore, onRestored, restoreInProgress, t]);
+    return (_jsxs(Popover, { open: open, onOpenChange: handleOpenChange, children: [_jsx(TooltipProvider, { delayDuration: 400, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(PopoverTrigger, { asChild: true, children: _jsx("button", { type: "button", "aria-label": label ?? t("agentChat.message.revertHere"), disabled: restoreInProgress, className: cn("flex h-6 w-6 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 transition-colors duration-150 hover:bg-accent hover:text-foreground", !persistent && messageFooterFadeClassName, open && "bg-accent text-foreground"), children: _jsx(IconArrowBackUp, { className: "h-3.5 w-3.5" }) }) }) }), _jsx(TooltipContent, { side: "top", className: "text-xs", children: label ?? t("agentChat.message.revertHere") })] }) }), _jsx(PopoverContent, { side: "top", align: "start", sideOffset: 6, className: "w-56 rounded-lg border-border p-3 shadow-xl", children: state === "confirming" ? (_jsxs("div", { className: "grid gap-2", children: [_jsx("p", { className: "text-xs font-medium text-foreground", children: t("agentChat.message.revertQuestion") }), _jsxs("div", { className: "flex justify-end gap-1.5", children: [_jsx("button", { type: "button", onClick: () => setOpen(false), className: "rounded-md px-2 py-1 text-xs font-medium text-muted-foreground hover:bg-accent hover:text-foreground", children: t("agentChat.common.cancel") }), _jsx("button", { type: "button", disabled: restoreInProgress, onClick: () => void handleRestore(), className: "rounded-md bg-destructive px-2 py-1 text-xs font-medium text-destructive-foreground hover:bg-destructive/90", children: label ?? t("agentChat.message.revertHere") })] })] })) : state === "restoring" ? (_jsxs("span", { className: "flex items-center gap-1.5 text-xs text-muted-foreground", children: [_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" }), t("agentChat.message.restoring")] })) : (_jsxs("div", { className: "grid gap-2", children: [_jsx("p", { className: "text-xs text-destructive", children: error ?? t("agentChat.message.restoreRequestFailed") }), _jsx("button", { type: "button", onClick: () => setOpen(false), className: "justify-self-end rounded-md px-2 py-1 text-xs font-medium text-muted-foreground hover:bg-accent hover:text-foreground", children: t("agentChat.common.dismiss") })] })) })] }));
+}
+export function AssistantChatHistoryBeginningRevertButton() {
+    const t = useT();
+    const history = React.useContext(AssistantChatHistoryContext);
+    const chatRunning = React.useContext(ChatRunningContext);
+    const version = history?.beginningVersion;
+    if (!history || !version || chatRunning)
+        return null;
+    return (_jsx("div", { className: "flex justify-end", children: _jsx(AssistantChatHistoryRevertButton, { label: t("agentChat.message.revertToBeginning"), onRestore: () => history.restoreVersion(version), persistent: true }) }));
 }
 // ─── UserMessage ──────────────────────────────────────────────────────────────
 export function UserMessage() {
@@ -1213,12 +1254,12 @@ export function AssistantMessage() {
         });
     const historyContext = React.useContext(AssistantChatHistoryContext);
     const historyVersion = React.useMemo(() => historyContext?.findVersion(historyMessage) ?? null, [historyContext, historyMessage]);
-    const showHistoryRevert = isComplete && !historyReverted && historyVersion !== null;
+    const showHistoryRevert = !chatRunning && isComplete && !historyReverted && historyVersion !== null;
     const handleHistoryRestore = useCallback(async () => {
-        if (!historyContext || !historyVersion)
+        if (chatRunning || !historyContext || !historyVersion)
             return;
         await historyContext.restoreVersion(historyVersion);
-    }, [historyContext, historyVersion]);
+    }, [chatRunning, historyContext, historyVersion]);
     const cpCtx = React.useContext(CheckpointContext);
     useEffect(() => {
         if (isLast && chatRunning) {

package/dist/client/resources/mcp-integration-catalog.js

@@ -322,7 +322,7 @@ export const DEFAULT_MCP_INTEGRATIONS = [
         connectionMode: "oauth",
         availability: "provider-setup",
         verification: "restricted",
-        logoUrl: mcpIntegrationLogo("atlassian"),
+        logoUrl: mcpIntegrationLogo("jira"),
         docsUrl: "https://developer.atlassian.com/cloud/rovo-mcp/guides/getting-started/",
         setupNoteKey: "mcpIntegrations.catalog.atlassian.setupNote",
         brandAliases: ["Jira", "Confluence", "Rovo"],