@agent-native/core 0.157.0 → 0.157.1

package/corpus/templates/slides/app/context/DeckContext.tsx

@@ -217,7 +217,10 @@ interface DeckContextType {
   ) => void;
   reloadDecks: () => Promise<void>;
   reloadDecksWithStatus: () => Promise<DeckReloadStatus>;
-  refreshOpenDeck: (deckId: string) => Promise<Deck | null>;
+  refreshOpenDeck: (
+    deckId: string,
+    options?: { clearPendingWrites?: boolean },
+  ) => Promise<Deck | null>;
   getDeck: (id: string) => Deck | undefined;
   addSlide: (
     deckId: string,
@@ -312,6 +315,8 @@ function normalizeActionDeck(value: unknown): Deck | null {
 const pendingSaves = new Map<string, ReturnType<typeof setTimeout>>();
 const inFlightSaves = new Set<string>();
 const inFlightSaveChains = new Map<string, Promise<void>>();
+const inFlightSaveControllers = new Map<string, AbortController>();
+const deckSaveGenerations = new Map<string, number>();
 const immediateFlushRequests = new Set<string>();
 const deckSaveRetryAttempts = new Map<string, number>();
 const failedSaveDecks = new Set<string>();
@@ -403,7 +408,11 @@ function deckPayload(deck: Deck): Record<string, unknown> {
  * the `save-deck` action is called first, then any trailing granular ops are
  * sent through `patch-deck`.
  */
-async function persistDeckOps(deckId: string, ops: GranularOp[]) {
+async function persistDeckOps(
+  deckId: string,
+  ops: GranularOp[],
+  signal?: AbortSignal,
+) {
   if (ops[0].op === "full-replace") {
     // Legacy full-deck write — used by undo/redo and setDeckSlides.
     // `callAction` bounds it so a stalled save can't wedge `inFlightSaves`
@@ -413,20 +422,28 @@ async function persistDeckOps(deckId: string, ops: GranularOp[]) {
     await callAction(
       "save-deck",
       { deckId, deck: deckPayload(deck) },
-      { method: "PUT" },
+      { method: "PUT", signal },
     );
     const trailingOps = ops.slice(1) as PatchDeckOp[];
     if (trailingOps.length > 0) {
-      await callAction("patch-deck", {
-        deckId,
-        operations: trailingOps,
-      });
+      await callAction(
+        "patch-deck",
+        {
+          deckId,
+          operations: trailingOps,
+        },
+        { signal },
+      );
     }
   } else {
-    await callAction("patch-deck", {
-      deckId,
-      operations: ops as PatchDeckOp[],
-    });
+    await callAction(
+      "patch-deck",
+      {
+        deckId,
+        operations: ops as PatchDeckOp[],
+      },
+      { signal },
+    );
   }
 }
 
@@ -455,15 +472,23 @@ function drainPendingDeckOps(deckId: string): Promise<void> {
     return Promise.resolve();
   }
 
+  const generation = deckSaveGenerations.get(deckId) ?? 0;
+  const controller =
+    typeof AbortController === "undefined" ? null : new AbortController();
+  if (controller) inFlightSaveControllers.set(deckId, controller);
   inFlightSaves.add(deckId);
-  let succeeded = false;
-  const next = persistDeckOps(deckId, ops)
+  const isCurrentGeneration = () =>
+    (deckSaveGenerations.get(deckId) ?? 0) === generation;
+  const next = persistDeckOps(deckId, ops, controller?.signal)
     .then(() => {
-      succeeded = true;
+      if (!isCurrentGeneration()) return;
       deckSaveRetryAttempts.delete(deckId);
       failedSaveDecks.delete(deckId);
     })
     .catch((err) => {
+      // A restore or delete invalidated this request. Its result must not
+      // resurrect the old queue or schedule a retry after the boundary.
+      if (!isCurrentGeneration()) return;
       console.error(`Failed to save deck ${deckId}:`, err);
       const pending = pendingOpsQueue.get(deckId) ?? [];
       pendingOpsQueue.set(deckId, [...ops, ...pending]);
@@ -488,10 +513,13 @@ function drainPendingDeckOps(deckId: string): Promise<void> {
     .finally(() => {
       if (inFlightSaveChains.get(deckId) === next) {
         inFlightSaveChains.delete(deckId);
+        if (controller && inFlightSaveControllers.get(deckId) === controller) {
+          inFlightSaveControllers.delete(deckId);
+        }
         inFlightSaves.delete(deckId);
         const flushImmediately = immediateFlushRequests.delete(deckId);
         notifySaveListeners();
-        if (succeeded && flushImmediately) {
+        if (flushImmediately) {
           void drainPendingDeckOps(deckId);
         }
       }
@@ -506,13 +534,14 @@ function drainPendingDeckOps(deckId: string): Promise<void> {
  * follow-up drain chained by immediateFlushRequests for ops queued while a
  * save was already running, and any requeued retry after a failed attempt.
  * Used when a caller must not proceed (e.g. firing an agent request against
- * a slide) until an "immediate" persistence op has actually reached the
- * server. Throws if the save ultimately fails after retries exhaust, since
- * `drainPendingDeckOps` swallows save errors internally to drive its own
- * retry loop and its promise always resolves regardless of outcome.
+ * a slide or restoring a saved version) until every write issued before that
+ * boundary has reached the server. Throws if the save ultimately fails after
+ * retries exhaust, since `drainPendingDeckOps` swallows save errors internally
+ * to drive its own retry loop and its promise always resolves regardless of
+ * outcome.
  */
 async function flushDeckSave(deckId: string): Promise<void> {
-  for (let i = 0; i < 40; i++) {
+  while (true) {
     const active = inFlightSaveChains.get(deckId);
     if (active) {
       await active;
@@ -647,6 +676,8 @@ function flushPendingSaves() {
 }
 
 function discardPendingDeckOps(deckId: string) {
+  deckSaveGenerations.set(deckId, (deckSaveGenerations.get(deckId) ?? 0) + 1);
+  inFlightSaveControllers.get(deckId)?.abort();
   const timer = pendingSaves.get(deckId);
   if (timer) clearTimeout(timer);
   pendingSaves.delete(deckId);
@@ -1354,7 +1385,15 @@ export function DeckProvider({ children }: { children: ReactNode }) {
    * this, chat-driven edits land in the editor with Undo disabled.
    */
   const applyRemoteDeckUpdate = useCallback(
-    (updated: Deck, label = "Agent edit") => {
+    (
+      updated: Deck,
+      label = "Agent edit",
+      options?: { clearPendingWrites?: boolean },
+    ) => {
+      if (options?.clearPendingWrites) {
+        discardPendingDeckOps(updated.id);
+        dirtyDeckIdsRef.current.delete(updated.id);
+      }
       const before = decksRef.current.find((d) => d.id === updated.id);
       if (
         before &&
@@ -1447,7 +1486,10 @@ export function DeckProvider({ children }: { children: ReactNode }) {
   //   - Dirty deck / unsaved local create → additive merge only: surface
   //     agent-added slides without ever overwriting or dropping local slides.
   const refetchOpenDeckIfChanged = useCallback(
-    async (currentOpenId: string): Promise<Deck | null> => {
+    async (
+      currentOpenId: string,
+      options?: { clearPendingWrites?: boolean },
+    ): Promise<Deck | null> => {
       const requestId =
         (openDeckRequestIdByDeckRef.current.get(currentOpenId) ?? 0) + 1;
       openDeckRequestIdByDeckRef.current.set(currentOpenId, requestId);
@@ -1459,6 +1501,13 @@ export function DeckProvider({ children }: { children: ReactNode }) {
       // still-pending create — nothing authoritative to reconcile.
       if (!serverDeck) return null;
       const clientDeck = decksRef.current.find((d) => d.id === currentOpenId);
+      if (options?.clearPendingWrites) {
+        lastExternalUpdateRef.current = Date.now();
+        applyRemoteDeckUpdate(serverDeck, "Deck restored", {
+          clearPendingWrites: true,
+        });
+        return serverDeck;
+      }
 
       const hasLocalEdits =
         pendingCreateIdsRef.current.has(currentOpenId) ||

package/corpus/templates/slides/app/lib/editor-shortcuts.ts

@@ -0,0 +1,46 @@
+interface EditorShortcutEvent {
+  key: string;
+  altKey: boolean;
+  ctrlKey: boolean;
+  metaKey: boolean;
+  shiftKey: boolean;
+  repeat: boolean;
+  isComposing: boolean;
+  target: EventTarget | null;
+}
+
+function isEditableSurface(target: EventTarget | null): boolean {
+  return (
+    target instanceof HTMLElement &&
+    (target.closest(
+      "input, textarea, select, [contenteditable='true'], [role='textbox']",
+    ) !== null ||
+      target.isContentEditable)
+  );
+}
+
+export function shouldStopSlidesItalicShortcut(event: EditorShortcutEvent) {
+  if (
+    event.repeat ||
+    event.isComposing ||
+    event.key.toLowerCase() !== "i" ||
+    event.altKey ||
+    event.shiftKey ||
+    !(event.ctrlKey || event.metaKey)
+  ) {
+    return false;
+  }
+
+  return true;
+}
+
+export function isSlidesItalicEditableTarget(event: EditorShortcutEvent) {
+  return isEditableSurface(event.target);
+}
+
+export function shouldSuppressSlidesItalicShortcut(event: EditorShortcutEvent) {
+  return (
+    shouldStopSlidesItalicShortcut(event) &&
+    !isSlidesItalicEditableTarget(event)
+  );
+}

package/corpus/templates/slides/app/pages/DeckEditor.tsx

@@ -76,6 +76,7 @@ import {
   shouldShowDeckEditorSkeleton,
 } from "@/lib/deck-editor-loading";
 import { getPreset } from "@/lib/design-systems";
+import { shouldSuppressSlidesItalicShortcut } from "@/lib/editor-shortcuts";
 import { exportDeckToGoogleSlides } from "@/lib/export-google-slides-client";
 import { exportDeckAsPdf } from "@/lib/export-pdf-client";
 import { exportDeckAsPptx } from "@/lib/export-pptx-client";
@@ -784,6 +785,18 @@ export default function DeckEditor() {
       document.removeEventListener("keydown", handleTextToolShortcut);
   }, [canEdit]);
 
+  useEffect(() => {
+    const handleItalicShortcut = (event: KeyboardEvent) => {
+      if (!shouldSuppressSlidesItalicShortcut(event)) return;
+      event.preventDefault();
+      event.stopImmediatePropagation();
+    };
+
+    document.addEventListener("keydown", handleItalicShortcut, true);
+    return () =>
+      document.removeEventListener("keydown", handleItalicShortcut, true);
+  }, []);
+
   // Delete key deletes the current slide
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {

package/dist/client/AgentPanel.d.ts

@@ -201,6 +201,18 @@ export interface AgentSidebarProps {
     chatViewTransitionHandoff?: boolean;
     /** Namespace for persisted chat state. Use the same key as AgentChatHome. */
     storageKey?: string;
+    /** Namespace for the persisted open/closed preference. Defaults to storageKey. */
+    openStorageKey?: string;
+    /** API base URL used by the chat surface. */
+    apiUrl?: string;
+    /** Runtime surface identity used for server-side chat capabilities. */
+    agentChatSurface?: AgentChatSurfaceKind;
+    /** Show the chat thread tab row. Default: true. */
+    showTabBar?: MultiTabAssistantChatProps["showTabBar"];
+    /** Keep inline app-opening results inside the current app chat. */
+    suppressInlineOpenApp?: AssistantChatProps["suppressInlineOpenApp"];
+    /** Placeholder shown in the chat composer. */
+    composerPlaceholder?: AssistantChatProps["composerPlaceholder"];
     /** Open the sidebar when a chat run is active or reconnects. */
     openOnChatRunning?: boolean;
     /** Called when the user selects the full-view action from the chat sidebar. */
@@ -222,7 +234,7 @@ export interface AgentSidebarProps {
  * Wraps app content with a toggleable agent sidebar.
  * Use AgentToggleButton in your header to open/close it.
  */
-export declare function AgentSidebar({ children, emptyStateText, suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position, defaultOpen, animateMobile, animateDesktop, chatViewTransition, chatViewTransitionHandoff, storageKey, openOnChatRunning, onFullscreenRequest, scope, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, suppressFirstRunOnboarding, }: AgentSidebarProps): React.JSX.Element;
+export declare function AgentSidebar({ children, emptyStateText, suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position, defaultOpen, animateMobile, animateDesktop, chatViewTransition, chatViewTransitionHandoff, storageKey, openStorageKey, apiUrl, agentChatSurface, showTabBar, suppressInlineOpenApp, composerPlaceholder, openOnChatRunning, onFullscreenRequest, scope, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, suppressFirstRunOnboarding, }: AgentSidebarProps): React.JSX.Element;
 /**
  * Focus the agent chat composer input.
  * Opens the sidebar if closed, then focuses the text input.

package/dist/client/AgentPanel.js

@@ -722,7 +722,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                         (activeTabMessageCount <= 0 && activeTab.status === "idle")) {
                         return null;
                     }
-                    return (_jsx(ShareButton, { resourceType: "chat_thread", resourceId: activeTab.id, allowedRoles: ["viewer", "editor", "admin"], resourceTitle: activeTab.label || t("agentPanel.chat"), shareUrl: getChatThreadShareUrl(activeTab.id), trigger: "icon", triggerClassName: "h-7 w-7", defaultOpen: onCollapse && shareFromMenuOpen, onOpenChange: onCollapse ? setShareFromMenuOpen : undefined }));
+                    return (_jsx(ShareButton, { resourceType: "chat_thread", resourceId: activeTab.id, allowedRoles: ["viewer", "editor", "admin"], resourceTitle: activeTab.label || t("agentPanel.chat"), shareUrl: getChatThreadShareUrl(activeTab.id), triggerClassName: "h-7 px-2", defaultOpen: onCollapse && shareFromMenuOpen, onOpenChange: onCollapse ? setShareFromMenuOpen : undefined }));
                 })(), feedbackEnabled ? (_jsx(FeedbackButton, { variant: "icon", side: "bottom", align: "end", chatSessionId: activeChatSessionId, chatStorageKey: storageKey, open: feedbackOpen, onOpenChange: setFeedbackOpen, trigger: _jsx("button", { type: "button", tabIndex: -1, "aria-hidden": "true", className: "pointer-events-none absolute end-0 top-full h-px w-px opacity-0" }) })) : null, mode === "chat" && (_jsx(IconTooltip, { content: t("agentPanel.newChat"), children: _jsx("button", { onClick: addTab, "aria-label": t("agentPanel.newChat"), className: "flex h-6 w-6 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-accent/50", children: _jsx(IconPlus, { size: 14 }) }) })), !onCollapse && mode === "cli" && canUseCodeTools && (_jsx(IconTooltip, { content: t("agentPanel.newTerminal"), children: _jsx("button", { onClick: addCliTab, "aria-label": t("agentPanel.newTerminal"), className: "flex h-6 w-6 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-accent/50", children: _jsx(IconPlus, { size: 14 }) }) })), _jsxs(DropdownMenu, { open: headerMenuOpen, onOpenChange: setHeaderMenuOpen, children: [_jsx(DropdownMenuTrigger, { asChild: true, children: _jsx("button", { className: cn("flex h-6 w-6 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-accent/50", (headerMenuOpen || mode === "settings") &&
                                 "bg-accent text-foreground"), "aria-label": t("agentPanel.panelOptions"), children: _jsx(IconDotsVertical, { size: 14 }) }) }), _jsxs(DropdownMenuContent, { align: "end", sideOffset: 6, className: "w-48", onCloseAutoFocus: (event) => {
                             // A sibling overlay owns focus next; restoring it to the menu
@@ -786,7 +786,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
             ? tabs.find((tab) => tab.id === activeTabId)
             : undefined;
         const canShareActiveTab = activeTab && (activeTabMessageCount > 0 || activeTab.status !== "idle");
-        return (_jsxs(_Fragment, { children: [_jsx("div", { "aria-hidden": "true", "data-agent-page-chat-fade": "", className: "pointer-events-none absolute inset-x-0 top-0 z-50 h-16 bg-gradient-to-b from-background via-background/90 to-transparent opacity-0 transition-opacity duration-150" }), _jsx("div", { className: "pointer-events-none absolute inset-x-0 top-3 z-[60] flex justify-end px-3 sm:top-4 sm:px-4", children: _jsxs("div", { className: "pointer-events-auto flex items-center gap-1", children: [canShareActiveTab ? (_jsx(ShareButton, { resourceType: "chat_thread", resourceId: activeTab.id, allowedRoles: ["viewer", "editor", "admin"], resourceTitle: activeTab.label || t("agentPanel.chat"), shareUrl: getChatThreadShareUrl(activeTab.id), trigger: "icon", triggerClassName: "h-8 w-8 border border-border bg-background/95 shadow-sm backdrop-blur hover:bg-accent" })) : null, _jsxs("button", { type: "button", "data-agent-page-new-chat": "", "aria-label": t("agentPanel.newChat"), onClick: () => {
+        return (_jsxs(_Fragment, { children: [_jsx("div", { "aria-hidden": "true", "data-agent-page-chat-fade": "", className: "pointer-events-none absolute inset-x-0 top-0 z-50 h-16 bg-gradient-to-b from-background via-background/90 to-transparent opacity-0 transition-opacity duration-150" }), _jsx("div", { className: "pointer-events-none absolute inset-x-0 top-3 z-[60] flex justify-end px-3 sm:top-4 sm:px-4", children: _jsxs("div", { className: "pointer-events-auto flex items-center gap-1", children: [canShareActiveTab ? (_jsx(ShareButton, { resourceType: "chat_thread", resourceId: activeTab.id, allowedRoles: ["viewer", "editor", "admin"], resourceTitle: activeTab.label || t("agentPanel.chat"), shareUrl: getChatThreadShareUrl(activeTab.id), triggerClassName: "h-8 px-2 border border-border bg-background/95 shadow-sm backdrop-blur hover:bg-accent" })) : null, _jsxs("button", { type: "button", "data-agent-page-new-chat": "", "aria-label": t("agentPanel.newChat"), onClick: () => {
                                     addTab();
                                 }, className: "inline-flex h-8 items-center gap-1.5 rounded-md border border-border bg-background/95 px-2.5 text-xs font-medium text-foreground shadow-sm backdrop-blur transition-colors hover:bg-accent focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring", children: [_jsx(IconPlus, { size: 14 }), _jsx("span", { children: t("agentPanel.newChat") })] })] }) })] }));
     }, [getChatThreadShareUrl, t]);
@@ -1407,14 +1407,16 @@ export function AgentChatSurface({ mode = "panel", className, defaultMode = "cha
  * Wraps app content with a toggleable agent sidebar.
  * Use AgentToggleButton in your header to open/close it.
  */
-export function AgentSidebar({ children, emptyStateText = "How can I help you?", suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position = "right", defaultOpen = false, animateMobile = true, animateDesktop = true, chatViewTransition = false, chatViewTransitionHandoff = false, storageKey, openOnChatRunning = false, onFullscreenRequest, scope, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, suppressFirstRunOnboarding = false, }) {
+export function AgentSidebar({ children, emptyStateText = "How can I help you?", suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position = "right", defaultOpen = false, animateMobile = true, animateDesktop = true, chatViewTransition = false, chatViewTransitionHandoff = false, storageKey, openStorageKey, apiUrl, agentChatSurface, showTabBar = true, suppressInlineOpenApp, composerPlaceholder, openOnChatRunning = false, onFullscreenRequest, scope, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, suppressFirstRunOnboarding = false, }) {
+    const sidebarOpenStorageKey = openStorageKey ?? storageKey;
     const onboardingPreviewMode = useOnboardingPreviewMode();
     const firstRunOnboardingGateOwnsSurface = useFirstRunOnboardingGateOwnsSurface();
     const showFirstRunOnboarding = !firstRunOnboardingGateOwnsSurface &&
         !suppressFirstRunOnboarding &&
         (SHOW_FIRST_RUN_ONBOARDING || onboardingPreviewMode);
     const initialWidth = defaultSidebarWidth ?? sidebarWidth ?? 380;
-    const [open, setOpen] = useState(() => openOnChatRunning || getInitialAgentSidebarOpen(defaultOpen, storageKey));
+    const [open, setOpen] = useState(() => openOnChatRunning ||
+        getInitialAgentSidebarOpen(defaultOpen, sidebarOpenStorageKey));
     const [presentationMode, setPresentationMode] = useState(false);
     const [width, setWidth] = useState(initialWidth);
     const [isWideDrawer, setIsWideDrawer] = useState(() => {
@@ -1471,15 +1473,15 @@ export function AgentSidebar({ children, emptyStateText = "How can I help you?",
     const setOpenPersisted = useCallback((next) => {
         setOpen((prev) => {
             const value = typeof next === "function" ? next(prev) : next;
-            setAgentSidebarOpenPreference(value, storageKey);
+            setAgentSidebarOpenPreference(value, sidebarOpenStorageKey);
             return value;
         });
-    }, [storageKey]);
+    }, [sidebarOpenStorageKey]);
     const applyUrlOpenOverride = useCallback(() => {
-        const override = consumeAgentSidebarUrlOpenOverride(storageKey);
+        const override = consumeAgentSidebarUrlOpenOverride(sidebarOpenStorageKey);
         if (override !== null)
             setOpenPersisted(override);
-    }, [setOpenPersisted, storageKey]);
+    }, [setOpenPersisted, sidebarOpenStorageKey]);
     useEffect(() => {
         applyUrlOpenOverride();
         return subscribeAgentSidebarUrlChanges(applyUrlOpenOverride);
@@ -1924,11 +1926,11 @@ export function AgentSidebar({ children, emptyStateText = "How can I help you?",
                             ? "desktop"
                             : undefined, "data-agent-sidebar-layout": panelLayout, "data-agent-sidebar-position": position, "data-agent-sidebar-state": panelOpen ? "open" : "closed", "data-agent-sidebar-resizing": isResizing ? "true" : undefined, "data-agent-sidebar-chat-handoff": chatViewTransitionHandoff ? "true" : undefined, style: chatViewTransition
                     ? getAgentChatViewTransitionStyle(panelStyle)
-                    : panelStyle, inert: sidebarAnimationEnabled && !panelOpen ? true : undefined, "aria-hidden": sidebarAnimationEnabled && !panelOpen ? true : undefined, children: _jsx("div", { className: "agent-sidebar-panel-inner flex min-h-0 flex-1 flex-col", children: _jsx(AgentPanel, { emptyStateText: emptyStateText, suggestions: suggestions, dynamicSuggestions: dynamicSuggestions, composerToolbarSlot: composerToolbarSlot, composerSlot: composerSlot, onComposerTextChange: onComposerTextChange, imageModelMenu: imageModelMenu, threadFooterSlot: threadFooterSlot, missingApiKeySetupLayout: "sidebar", onCollapse: () => setOpenPersisted(false), onSnapTo75Percent: isMobile ? undefined : snapTo75Percent, isWideDrawer: isMobile ? false : isWideDrawer, onExitWideDrawer: isMobile ? undefined : exitWideDrawer, onFullViewRequest: onFullscreenRequest, storageKey: storageKey, scope: scope, showScopeBadge: showScopeBadge, browserTabId: browserTabId, threadUrlSync: threadUrlSync, agentPageHref: agentPageHref, allowSettingsMode: false, chatOnly: true }) }) }), showResizeHandle && isLeft && (_jsx(ResizeHandle, { position: position, onDrag: handleDrag, onResizeStart: handleResizeStart, onResizeEnd: handleResizeEnd }))] })) : null;
+                    : panelStyle, inert: sidebarAnimationEnabled && !panelOpen ? true : undefined, "aria-hidden": sidebarAnimationEnabled && !panelOpen ? true : undefined, children: _jsx("div", { className: "agent-sidebar-panel-inner flex min-h-0 flex-1 flex-col", children: _jsx(AgentPanel, { emptyStateText: emptyStateText, suggestions: suggestions, dynamicSuggestions: dynamicSuggestions, composerToolbarSlot: composerToolbarSlot, composerSlot: composerSlot, onComposerTextChange: onComposerTextChange, imageModelMenu: imageModelMenu, threadFooterSlot: threadFooterSlot, apiUrl: apiUrl, agentChatSurface: agentChatSurface, showTabBar: showTabBar, suppressInlineOpenApp: suppressInlineOpenApp, composerPlaceholder: composerPlaceholder, missingApiKeySetupLayout: "sidebar", onCollapse: () => setOpenPersisted(false), onSnapTo75Percent: isMobile ? undefined : snapTo75Percent, isWideDrawer: isMobile ? false : isWideDrawer, onExitWideDrawer: isMobile ? undefined : exitWideDrawer, onFullViewRequest: onFullscreenRequest, storageKey: storageKey, scope: scope, showScopeBadge: showScopeBadge, browserTabId: browserTabId, threadUrlSync: threadUrlSync, agentPageHref: agentPageHref, allowSettingsMode: false, chatOnly: true }) }) }), showResizeHandle && isLeft && (_jsx(ResizeHandle, { position: position, onDrag: handleDrag, onResizeStart: handleResizeStart, onResizeEnd: handleResizeEnd }))] })) : null;
     const drawerPlaceholder = wideDrawerEnabled && !presentationMode && panelOpen ? (_jsx("div", { "aria-hidden": "true", className: "agent-sidebar-drawer-placeholder shrink-0", "data-agent-sidebar-placeholder": "true", style: { width: drawerPlaceholderWidth + 1 } })) : null;
     return (_jsx(AgentSidebarOnboardingContext.Provider, { value: true, children: _jsxs(RealtimeVoiceModeProvider, { browserTabId: browserTabId, children: [showFirstRunOnboarding && (_jsx(Suspense, { fallback: null, children: _jsx(FirstRunOnboarding, {}) })), _jsxs("div", { className: "agent-sidebar-shell flex min-w-0 flex-1 h-screen overflow-hidden", "data-agent-sidebar-position": position, "data-agent-sidebar-resizing": isResizing ? "true" : undefined, children: [isMobile &&
                             !presentationMode &&
-                            (mobileAnimationEnabled ? shouldRenderPanel : open) && (_jsx("div", { className: cn("agent-sidebar-backdrop fixed inset-0 bg-foreground/40", mobileAnimationEnabled && !panelOpen && "pointer-events-none"), "data-agent-sidebar-animation": mobileAnimationEnabled ? "mobile" : undefined, "data-agent-sidebar-state": panelOpen ? "open" : "closed", style: { zIndex: SIDEBAR_OVERLAY_Z_INDEX - 1 }, onClick: () => setOpenPersisted(false) })), shouldMountPanel ? _jsx(URLSync, { browserTabId: browserTabId }) : null, isLeft && !presentationMode ? sidebar : null, isLeft && !presentationMode ? drawerPlaceholder : null, _jsx("div", { className: "agent-sidebar-main-surface flex flex-1 flex-col overflow-auto min-w-0", "data-agent-sidebar-main-position": position, "data-agent-sidebar-main-state": !isMobile && !presentationMode && panelOpen ? "open" : "closed", "data-agent-sidebar-resizing": isResizing ? "true" : undefined, children: _jsx(ScreenRefreshBoundary, { children: children }) }), !isLeft && !presentationMode ? drawerPlaceholder : null, !isLeft && !presentationMode ? sidebar : null] })] }) }));
+                            (mobileAnimationEnabled ? shouldRenderPanel : open) && (_jsx("div", { className: cn("agent-sidebar-backdrop fixed inset-0 bg-foreground/40", mobileAnimationEnabled && !panelOpen && "pointer-events-none"), "data-agent-sidebar-animation": mobileAnimationEnabled ? "mobile" : undefined, "data-agent-sidebar-state": panelOpen ? "open" : "closed", style: { zIndex: SIDEBAR_OVERLAY_Z_INDEX - 1 }, onClick: () => setOpenPersisted(false) })), shouldMountPanel ? _jsx(URLSync, { browserTabId: browserTabId }) : null, isResizing ? (_jsx("div", { "aria-hidden": "true", className: "agent-sidebar-resize-overlay" })) : null, isLeft && !presentationMode ? sidebar : null, isLeft && !presentationMode ? drawerPlaceholder : null, _jsx("div", { className: "agent-sidebar-main-surface flex flex-1 flex-col overflow-auto min-w-0", "data-agent-sidebar-main-position": position, "data-agent-sidebar-main-state": !isMobile && !presentationMode && panelOpen ? "open" : "closed", "data-agent-sidebar-resizing": isResizing ? "true" : undefined, children: _jsx(ScreenRefreshBoundary, { children: children }) }), !isLeft && !presentationMode ? drawerPlaceholder : null, !isLeft && !presentationMode ? sidebar : null] })] }) }));
 }
 /**
  * Focus the agent chat composer input.

package/dist/client/AssistantChat.js

@@ -4171,13 +4171,33 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                             }
                                                                                             void addToQueue(suggestion);
                                                                                         }, className: "w-full px-2 py-1 text-center text-[13px] text-muted-foreground transition-colors 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] })) : (_jsxs(MessageScrollerContent, { className: "agent-thread-content gap-4 px-4 py-4", children: [_jsx(AssistantMessageListErrorBoundary, { resetKey: messageListResetKey, children: _jsx(UserStoppedRunContext.Provider, { value: wasRecentlyStoppedRun, children: _jsx(ThreadPrimitive.Messages
-                                                                                        // assistant-ui indexes message parts through tap resources.
-                                                                                        // Keep this key tied to that shape so clear/add transitions remount stale
-                                                                                        // lookups without remounting on every streamed text update.
-                                                                                        , { components: {
+                                                                                        // 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.
+                                                                                        , { 
+                                                                                            // 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,
-                                                                                            } }, messageListResetKey) }) }), visibleLoopLimit && !showRunningInUI && (_jsx(MessageScrollerItem, { children: _jsx(LoopLimitContinueCard, { info: visibleLoopLimit, onContinue: () => {
+                                                                                            } }) }) }), visibleLoopLimit && !showRunningInUI && (_jsx(MessageScrollerItem, { children: _jsx(LoopLimitContinueCard, { info: visibleLoopLimit, onContinue: () => {
                                                                                             setShowContinue(false);
                                                                                             setLoopLimitInfo(null);
                                                                                             addToQueue("Continue from where you left off.", undefined, undefined, undefined, undefined, "queued", "continue");

package/dist/client/HighlightedCodeBlock.js

@@ -44,6 +44,13 @@ export function HighlightedCodeBlock({ code, lang, containerClass, streaming = f
     const renderedHashRef = useRef(null);
     const debounceTimerRef = useRef(null);
     const cancelledRef = useRef(false);
+    // Whether this block has already put code on screen. Reserving space
+    // invisibly is right on FIRST paint — it avoids an unhighlighted→highlighted
+    // flash — but once code is visible, hiding it again to wait for Shiki blanks
+    // a code box the user was reading. That is what happened whenever the block
+    // lost its html (a re-highlight after the content changed): readable code
+    // went blank mid-answer.
+    const hasPaintedRef = useRef(false);
     useEffect(() => {
         cancelledRef.current = false;
         return () => {
@@ -108,11 +115,14 @@ export function HighlightedCodeBlock({ code, lang, containerClass, streaming = f
         }
     }, [code, lang, streaming, loadHighlighter]);
     if (html) {
+        hasPaintedRef.current = true;
         return (_jsx("div", { className: containerClass, dangerouslySetInnerHTML: { __html: html } }));
     }
     // Streaming: show plain growing text (previous html already kept above when
     // available). Non-streaming first paint: reserve space invisibly so we never
-    // flash unhighlighted → highlighted.
-    const showPlain = streaming || failed;
+    // flash unhighlighted → highlighted. Once painted, never hide again.
+    const showPlain = streaming || failed || hasPaintedRef.current;
+    if (showPlain)
+        hasPaintedRef.current = true;
     return (_jsx("div", { className: containerClass, "aria-busy": !showPlain && !failed, children: _jsx("pre", { children: _jsx("code", { className: lang ? `language-${lang}` : undefined, style: showPlain ? undefined : { visibility: "hidden" }, children: code }) }) }));
 }

package/dist/client/agent-chat/index.d.ts

@@ -1,3 +1,4 @@
+export { MemoryRouter as AgentChatMemoryRouter } from "react-router";
 export { AgentAskPopover, type AgentAskPopoverProps, } from "../AgentAskPopover.js";
 export { addContextToAgentChat, appendAgentChatContextToMessage, clearAgentChatContext, formatAgentChatContextItemsForPrompt, insertAgentComposerReference, listAgentChatContext, normalizeAgentComposerReference, refreshAgentChatContext, removeAgentChatContextItem, requestAgentChatThreadOpen, requestAgentTaskOpen, sendToAgentChat, sendToAgentChatAndConfirm, reportAgentChatSubmitResult, AGENT_CHAT_SUBMIT_RESULT_EVENT, parseSubmitChatMessage, setAgentChatContextItem, setContextToAgentChat, generateTabId, type ParsedSubmitChat, type AgentChatOpenTaskRequest, type AgentChatOpenThreadRequest, type AgentChatContextItem, type AgentChatContextMessage, type AgentChatContextMutationOptions, type AgentChatContextRemoveOptions, type AgentChatContextSetOptions, type AgentChatContextState, type AgentChatMessage, type AgentChatSubmitResult, type SendToAgentChatAndConfirmResult, type AgentComposerReference, type AgentComposerReferenceInsertOptions, type AgentComposerReferenceInsertPayload, } from "../agent-chat.js";
 export { saveAgentEngineApiKey, saveAgentEngineProviderSettings, type AgentEngineProvider, type SaveAgentEngineApiKeyOptions, type SaveAgentEngineProviderSettingsOptions, } from "../agent-engine-key.js";

package/dist/client/agent-chat/index.js

@@ -1,3 +1,4 @@
+export { MemoryRouter as AgentChatMemoryRouter } from "react-router";
 export { AgentAskPopover, } from "../AgentAskPopover.js";
 export { addContextToAgentChat, appendAgentChatContextToMessage, clearAgentChatContext, formatAgentChatContextItemsForPrompt, insertAgentComposerReference, listAgentChatContext, normalizeAgentComposerReference, refreshAgentChatContext, removeAgentChatContextItem, requestAgentChatThreadOpen, requestAgentTaskOpen, sendToAgentChat, sendToAgentChatAndConfirm, reportAgentChatSubmitResult, AGENT_CHAT_SUBMIT_RESULT_EVENT, parseSubmitChatMessage, setAgentChatContextItem, setContextToAgentChat, generateTabId, } from "../agent-chat.js";
 export { saveAgentEngineApiKey, saveAgentEngineProviderSettings, } from "../agent-engine-key.js";

package/dist/client/chat/markdown-renderer.js

@@ -1,4 +1,4 @@
-import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // Owns: lazy react-markdown/shiki loaders, SmoothMarkdownText, MarkdownText,
 // HighlightedCodeBlock wrapper, and the markdownComponents/markdownUrlTransform
 // used by every markdown render path in AssistantChat.
@@ -476,13 +476,26 @@ export function SmoothMarkdownText({ text, streaming, resetKey, statusType = "co
     const visibleText = useSmoothStreamingText(text, shouldAnimate, resetKey);
     const ReactMarkdown = markdownModule?.default;
     const gfm = remarkGfmFn;
-    const markdownBlocks = useMemo(() => (streaming ? splitMarkdownBlocks(visibleText) : null), [streaming, visibleText]);
+    // Split whether or not the turn is still streaming. Rendering the finished
+    // message as one whole-document ReactMarkdown instead swapped the element
+    // tree the instant `streaming` went false, so React unmounted every block and
+    // rebuilt it: code blocks re-highlighted, heights collapsed for a frame, and
+    // the scroll jumped — the "flash at the end" report. The split is faithful to
+    // a whole-document parse (see markdown-block-split.ts), so one tree serves
+    // both phases and nothing is rebuilt when streaming stops.
+    const markdownBlocks = useMemo(() => splitMarkdownBlocks(visibleText), [visibleText]);
+    // The tail renders through the same component as completed blocks, so when it
+    // is promoted to a completed block React matches the same type at the same
+    // key and keeps its DOM instead of remounting that paragraph.
+    const renderedBlocks = useMemo(() => markdownBlocks.tail
+        ? [...markdownBlocks.completedBlocks, markdownBlocks.tail]
+        : markdownBlocks.completedBlocks, [markdownBlocks]);
     useEffect(() => {
         if (!onRevealComplete || !shouldAnimate || visibleText !== text)
             return;
         onRevealComplete();
     }, [onRevealComplete, shouldAnimate, text, visibleText]);
-    return (_jsx("div", { className: "agent-markdown break-words", "data-status": statusType, "data-streaming": streaming ? "true" : undefined, children: mdReady && ReactMarkdown && gfm ? (markdownBlocks ? (_jsxs(_Fragment, { children: [markdownBlocks.completedBlocks.map((blockText, index) => (_jsx(MemoizedMarkdownBlock, { blockText: blockText }, index))), markdownBlocks.tail ? (_jsx(ReactMarkdown, { remarkPlugins: [gfm], components: markdownComponents, urlTransform: markdownUrlTransform, children: wrapLegacyChartShorthandLines(markdownBlocks.tail) })) : null] })) : (_jsx(ReactMarkdown, { remarkPlugins: [gfm], components: markdownComponents, urlTransform: markdownUrlTransform, children: wrapLegacyChartShorthandLines(visibleText) }))) : (_jsx("span", { style: { whiteSpace: "pre-wrap" }, children: visibleText })) }));
+    return (_jsx("div", { className: "agent-markdown break-words", "data-status": statusType, "data-streaming": streaming ? "true" : undefined, children: mdReady && ReactMarkdown && gfm ? (renderedBlocks.map((blockText, index) => (_jsx(MemoizedMarkdownBlock, { blockText: blockText }, index)))) : (_jsx("span", { style: { whiteSpace: "pre-wrap" }, children: visibleText })) }));
 }
 // ─── MarkdownText ──────────────────────────────────────────────────────────────
 export function MarkdownText() {

package/dist/client/chat-first/apps-rail.js

@@ -98,7 +98,7 @@ export const ChatFirstAppsRail = memo(function ChatFirstAppsRail({ apps, activeA
         persistLayout({ ...layout, orderedIds: nextOrder });
     }
     if (collapsed) {
-        return (_jsxs("section", { "data-chat-first-apps-rail": true, className: "flex flex-col items-center gap-1 px-1.5 pt-2", "aria-label": copy("workspaceApps"), children: [createTrigger, loading && apps.length === 0
+        return (_jsxs("section", { "data-chat-first-apps-rail": true, className: "flex flex-col items-center gap-1 px-1.5 pt-2", "aria-label": copy("workspaceApps"), children: [loading && apps.length === 0
                     ? [0, 1, 2].map((index) => (_jsx(Skeleton, { className: "size-9 rounded-md" }, index)))
                     : visibleApps.map((app) => (_jsx("button", { type: "button", "data-chat-first-app": true, "data-app-id": app.id, className: cn("flex size-9 items-center justify-center rounded-md", activeAppId === app.id
                             ? "text-sidebar-foreground"

package/dist/client/components/ui/message-scroller.js

@@ -27,6 +27,6 @@ function MessageScrollerItem(props) {
 function MessageScrollerButton({ className, children, render, ...props }) {
     const t = useT();
     return (_jsx(ShadcnMessageScroller.Button, { render: render ??
-            ((buttonProps) => (_jsx("div", { className: "shrink-0 flex justify-center -mb-1", children: _jsx("button", { ...buttonProps, className: cn("flex h-7 w-7 items-center justify-center rounded-full border border-border bg-background shadow-sm hover:bg-accent", "data-[active=false]:hidden", className, buttonProps.className), "aria-label": t("agentChat.composer.scrollToBottom"), children: children ?? (_jsx(IconChevronDown, { className: "h-3.5 w-3.5 text-muted-foreground" })) }) }))), ...props }));
+            ((buttonProps) => (_jsx("div", { className: "pointer-events-none absolute inset-x-0 bottom-2 z-10 flex justify-center", children: _jsx("button", { ...buttonProps, className: cn("pointer-events-auto flex h-7 w-7 items-center justify-center rounded-full border border-border bg-background shadow-sm hover:bg-accent", "data-[active=false]:hidden", className, buttonProps.className), "aria-label": t("agentChat.composer.scrollToBottom"), children: children ?? (_jsx(IconChevronDown, { className: "h-3.5 w-3.5 text-muted-foreground" })) }) }))), ...props }));
 }
 export { MessageScroller, MessageScrollerButton, MessageScrollerContent, MessageScrollerItem, MessageScrollerProvider, MessageScrollerViewport, useMessageScroller, useMessageScrollerScrollable, useMessageScrollerVisibility, };