@agent-native/core 0.188.0 → 0.189.0

package/corpus/templates/slides/actions/list-deck-versions.ts

@@ -1,6 +1,6 @@
 import { defineAction } from "@agent-native/core/action";
 import { assertAccess } from "@agent-native/core/sharing";
-import { and, desc, eq } from "drizzle-orm";
+import { and, asc, desc, eq, like } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
@@ -50,13 +50,18 @@ export default defineAction({
   schema: z.object({
     deckId: z.string().describe("Deck ID"),
     limit: z.coerce.number().int().min(1).max(100).default(50),
+    threadId: z.string().min(1).optional(),
   }),
   http: { method: "GET" },
-  run: async ({ deckId, limit }) => {
+  run: async ({ deckId, limit, threadId }) => {
     const access = await assertAccess("deck", deckId, "viewer");
     const ownerEmail = access.resource.ownerEmail as string;
     const db = getDb();
 
+    const where = and(
+      eq(schema.deckVersions.deckId, deckId),
+      eq(schema.deckVersions.ownerEmail, ownerEmail),
+    );
     const versions = await db
       .select({
         id: schema.deckVersions.id,
@@ -68,19 +73,66 @@ export default defineAction({
         createdAt: schema.deckVersions.createdAt,
       })
       .from(schema.deckVersions)
-      .where(
-        and(
-          eq(schema.deckVersions.deckId, deckId),
-          eq(schema.deckVersions.ownerEmail, ownerEmail),
-        ),
-      )
+      .where(where)
       .orderBy(desc(schema.deckVersions.createdAt))
       .limit(limit);
+    const beginningVersions = await db
+      .select({
+        id: schema.deckVersions.id,
+        deckId: schema.deckVersions.deckId,
+        title: schema.deckVersions.title,
+        data: schema.deckVersions.data,
+        changeLabel: schema.deckVersions.changeLabel,
+        chatContext: schema.deckVersions.chatContext,
+        createdAt: schema.deckVersions.createdAt,
+      })
+      .from(schema.deckVersions)
+      .where(
+        threadId
+          ? and(
+              where,
+              eq(schema.deckVersions.changeGroup, `start:thread:${threadId}`),
+            )
+          : and(
+              where,
+              like(schema.deckVersions.chatContext, '%"phase":"start"%'),
+            ),
+      )
+      .orderBy(
+        threadId
+          ? asc(schema.deckVersions.createdAt)
+          : desc(schema.deckVersions.createdAt),
+      )
+      .limit(threadId ? 1 : limit);
+    const versionsById = new Map(
+      [...beginningVersions, ...versions].map((version) => [
+        version.id,
+        version,
+      ]),
+    );
+    const allVersions = [...versionsById.values()];
+    allVersions.sort(
+      (left, right) =>
+        new Date(right.createdAt).getTime() -
+        new Date(left.createdAt).getTime(),
+    );
+    const limitedVersions = allVersions.slice(0, limit);
+    const activeStart = threadId
+      ? allVersions.find((version) => beginningVersions.includes(version))
+      : undefined;
+    if (activeStart && !limitedVersions.includes(activeStart)) {
+      limitedVersions[limitedVersions.length - 1] = activeStart;
+      limitedVersions.sort(
+        (left, right) =>
+          new Date(right.createdAt).getTime() -
+          new Date(left.createdAt).getTime(),
+      );
+    }
 
     return {
       deckId,
-      count: versions.length,
-      versions: versions.map((version) => {
+      count: limitedVersions.length,
+      versions: limitedVersions.map((version) => {
         let chatContext;
         try {
           chatContext = parseDeckVersionChatContext(version.chatContext);

package/corpus/templates/slides/app/components/layout/Layout.tsx

@@ -21,6 +21,7 @@ import { IconMenu2 } from "@tabler/icons-react";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useLocation, useNavigate } from "react-router";
 
+import { useDecks } from "@/context/DeckContext";
 import { useSidebarCollapsed } from "@/hooks/use-sidebar-collapsed";
 import {
   buildSlidesAgentContext,
@@ -67,6 +68,7 @@ export function Layout({ children }: LayoutProps) {
   const location = useLocation();
   const navigate = useNavigate();
   const t = useT();
+  const { flushDeckSave } = useDecks();
   const creativeContextEnabled = useCreativeContextLab();
   const isChatRoute =
     location.pathname === "/chat" || location.pathname.startsWith("/chat/");
@@ -155,9 +157,14 @@ export function Layout({ children }: LayoutProps) {
     if (!deckScope) return undefined;
     const deckId = deckScope.id;
     return {
+      beforeStart: () => flushDeckSave(deckId),
       list: {
         action: "list-deck-versions",
-        args: { deckId, limit: 100 },
+        args: (threadId) => ({
+          deckId,
+          limit: 100,
+          ...(threadId ? { threadId } : {}),
+        }),
         getVersions: (result: unknown) => {
           const versions =
             result && typeof result === "object"
@@ -174,9 +181,10 @@ export function Layout({ children }: LayoutProps) {
           deckId,
           versionId: version.id,
         }),
+        beforeRestore: () => flushDeckSave(deckId),
       },
     };
-  }, [deckScope]);
+  }, [deckScope, flushDeckSave]);
 
   useAgentChatHomeHandoffLinks({
     storageKey: "slides",

package/corpus/templates/slides/changelog/2026-09-25-chat-messages-can-be-reverted-to-their-autosaved-version-inc.md

@@ -0,0 +1,6 @@
+---
+type: added
+date: 2026-09-25
+---
+
+Chat messages can be reverted to their autosaved version, including a shortcut to restore the start of a chat.

package/corpus/templates/slides/server/lib/deck-versions.ts

@@ -13,12 +13,14 @@ export interface DeckVersionChatContext {
   threadId?: string;
   runId?: string;
   turnId?: string;
+  phase?: "start" | "end";
 }
 
 function contextFromFields(value: {
   threadId?: unknown;
   runId?: unknown;
   turnId?: unknown;
+  phase?: unknown;
 }): DeckVersionChatContext | undefined {
   const context: DeckVersionChatContext = {};
   for (const key of ["threadId", "runId", "turnId"] as const) {
@@ -26,6 +28,9 @@ function contextFromFields(value: {
       context[key] = value[key];
     }
   }
+  if (value.phase === "start" || value.phase === "end") {
+    context.phase = value.phase;
+  }
   return Object.keys(context).length > 0 ? context : undefined;
 }
 
@@ -139,6 +144,7 @@ export async function createDeckVersionSnapshot(
     .limit(1);
 
   if (
+    options.chatContext?.phase !== "start" &&
     latestVersion &&
     latestVersion.title === source.title &&
     deckContentSignature(latestVersion.data) ===
@@ -150,8 +156,12 @@ export async function createDeckVersionSnapshot(
   const requestedChatContext = serializeDeckVersionChatContext(
     options.chatContext,
   );
-  const changeGroup =
+  const turnGroup =
     options.chatContext?.turnId ?? options.chatContext?.runId ?? undefined;
+  const changeGroup =
+    options.chatContext?.phase === "start" && turnGroup
+      ? `start:thread:${options.chatContext.threadId ?? turnGroup}`
+      : turnGroup;
   if (
     requestedChatContext &&
     requestedChatContext === normalizedChatContext(latestVersion?.chatContext)
@@ -196,3 +206,28 @@ export async function createDeckVersionSnapshot(
 
   return { created: true, id };
 }
+
+export async function createDeckChatBeginningSnapshot(
+  source: DeckSnapshotSource,
+  run: { threadId: string; runId: string },
+): Promise<{ created: boolean; id?: string; reason?: string }> {
+  const rows = await getDb()
+    .select({ id: schema.deckVersions.id })
+    .from(schema.deckVersions)
+    .where(
+      and(
+        eq(schema.deckVersions.deckId, source.id),
+        eq(schema.deckVersions.ownerEmail, source.ownerEmail),
+        eq(schema.deckVersions.changeGroup, `start:thread:${run.threadId}`),
+      ),
+    )
+    .limit(1);
+  if (rows.length) {
+    return { created: false, reason: "beginning-exists" };
+  }
+  return createDeckVersionSnapshot(source, {
+    force: true,
+    label: "Before chat",
+    chatContext: { ...run, phase: "start" },
+  });
+}

package/corpus/templates/slides/server/plugins/agent-chat.ts

@@ -7,7 +7,10 @@ import { assertAccess } from "@agent-native/core/sharing";
 import actionsRegistry from "../../.generated/actions-registry.js";
 import { resolveSlidesRequestAuthContext } from "../handlers/request-auth-context.js";
 import { prepareSlidesChatAttachments } from "../lib/chat-attachments.js";
-import { deckVersionChatContextFromRun } from "../lib/deck-versions.js";
+import {
+  createDeckChatBeginningSnapshot,
+  deckVersionChatContextFromRun,
+} from "../lib/deck-versions.js";
 import "../register-secrets.js";
 
 const SLIDES_BACKGROUND_RUN_SOFT_TIMEOUT_MS = 13 * 60_000;
@@ -138,6 +141,7 @@ async function autosaveDeckAfterAgentTurn(
   },
 ): Promise<void> {
   if (scope.type !== "deck" || !hasDeckEdit(run, scope.id)) return;
+  if (!run.threadId || !run.runId) return;
 
   const access = await assertAccess("deck", scope.id, "editor");
   const deck = access.resource as {
@@ -147,15 +151,35 @@ async function autosaveDeckAfterAgentTurn(
     ownerEmail: string;
   };
   const { createDeckVersionSnapshot } = await import("../lib/deck-versions.js");
+  const chatContext = deckVersionChatContextFromRun(run);
   await createDeckVersionSnapshot(deck, {
     force: true,
     label: "Chat autosave",
-    chatContext: deckVersionChatContextFromRun(run),
+    chatContext: chatContext ? { ...chatContext, phase: "end" } : undefined,
+  });
+}
+
+async function autosaveDeckBeforeAgentTurn(
+  scope: { type: string; id: string },
+  run: { threadId?: string; runId?: string },
+): Promise<void> {
+  if (scope.type !== "deck" || !run.threadId || !run.runId) return;
+  const access = await assertAccess("deck", scope.id, "editor");
+  const deck = access.resource as {
+    id: string;
+    title: string;
+    data: string;
+    ownerEmail: string;
+  };
+  await createDeckChatBeginningSnapshot(deck, {
+    threadId: run.threadId,
+    runId: run.runId,
   });
 }
 
 export default createAgentChatPlugin({
   appId: "slides",
+  onAgentTurnStart: autosaveDeckBeforeAgentTurn,
   onAgentTurnComplete: autosaveDeckAfterAgentTurn,
   actions: loadActionsFromStaticRegistry(actionsRegistry),
   initialToolNames: INITIAL_TOOL_NAMES,

package/dist/automation/index.d.ts

@@ -186,8 +186,8 @@ export declare function createAutomationCallbackHandler(runtime: AutomationRunti
     duplicate?: undefined;
     eventId?: undefined;
 } | {
-    error?: undefined;
     accepted: boolean;
     duplicate: boolean;
     eventId: string;
+    error?: undefined;
 }>;

package/dist/cli/index.js

@@ -1233,8 +1233,7 @@ Options:
   --standalone                  Scaffold a single standalone app (no workspace)
   --emit [dir]                  With migrate, emit an own-agent dossier
   --describe <text>             With migrate, describe URL/prose-only sources
-  --preset <name>               Workspace deploy preset:
-                                cloudflare_pages (default), netlify, or vercel
+  --preset <name>               Workspace deploy preset: netlify (default) or vercel
   --build-only                  Build workspace deploy artifacts without publishing
   --eager                       With workspace dev, start every app immediately
   --prewarm                     With workspace dev, warm non-default apps in the background

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;