@agent-native/core 0.149.1 → 0.149.2

package/dist/client/AgentPanel.js

@@ -24,6 +24,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 import { Tooltip as DesignSystemTooltip } from "@agent-native/toolkit/design-system";
 import { IconMessageCircle, IconMessageDots, IconTerminal2, IconSettings, IconLayoutSidebarRightCollapse, IconLayoutGrid, IconCheck, IconPlus, IconX, IconDotsVertical, IconHistory, IconArrowsHorizontal, IconArrowsMaximize, IconExternalLink, } from "@tabler/icons-react";
 import React, { useState, useEffect, useRef, useCallback, useMemo, lazy, Suspense, startTransition, } from "react";
+import { flushSync } from "react-dom";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuShortcut, DropdownMenuTrigger, } from "./components/ui/dropdown-menu.js";
 import { normalizeTooltipText } from "./components/ui/tooltip.js";
 import { ErrorReportActions } from "./ErrorReportActions.js";
@@ -1700,6 +1701,26 @@ export function AgentSidebar({ children, emptyStateText = "How can I help you?",
             return next;
         });
     }, []);
+    // `view-transition-name` is only legal to carry while a transition is
+    // actually capturing. Left on permanently it makes the panel its own
+    // stacking context and the containing block for every fixed/absolute
+    // descendant, and enlists it as a captured group in unrelated transitions
+    // (any React Router `viewTransition` navigation), which is how overlays end
+    // up painted at stale offsets. Apply it only around the drawer morph, and
+    // flush it into the DOM first: `startViewTransition` captures the old state
+    // before it invokes the callback, so a name applied in a normal React commit
+    // would land too late to be captured.
+    const [drawerMorphing, setDrawerMorphing] = useState(false);
+    const runDrawerMorph = useCallback((apply) => {
+        flushSync(() => setDrawerMorphing(true));
+        const settle = () => setDrawerMorphing(false);
+        const transition = startAgentChatViewTransition(apply);
+        if (!transition) {
+            settle();
+            return;
+        }
+        transition.finished.then(settle, settle);
+    }, []);
     const snapTo75Percent = useCallback(() => {
         if (drawerExitTimerRef.current !== null) {
             clearTimeout(drawerExitTimerRef.current);
@@ -1719,8 +1740,8 @@ export function AgentSidebar({ children, emptyStateText = "How can I help you?",
             }
             catch { }
         };
-        startAgentChatViewTransition(apply);
-    }, [drawerPlaceholderWidth, isWideDrawer, width]);
+        runDrawerMorph(apply);
+    }, [runDrawerMorph, drawerPlaceholderWidth, isWideDrawer, width]);
     const exitWideDrawer = useCallback(() => {
         if (!isWideDrawer || drawerExitTimerRef.current !== null)
             return;
@@ -1738,8 +1759,8 @@ export function AgentSidebar({ children, emptyStateText = "How can I help you?",
                 setIsWideDrawer(false);
             }, SIDEBAR_ANIMATION_MS + 32);
         };
-        startAgentChatViewTransition(apply);
-    }, [drawerPlaceholderWidth, isWideDrawer]);
+        runDrawerMorph(apply);
+    }, [runDrawerMorph, drawerPlaceholderWidth, isWideDrawer]);
     const handleResizeStart = useCallback(() => setIsResizing(true), []);
     const handleResizeEnd = useCallback(() => setIsResizing(false), []);
     const isLeft = position === "left";
@@ -1820,7 +1841,9 @@ export function AgentSidebar({ children, emptyStateText = "How can I help you?",
             borderLeft: isLeft ? "none" : "1px solid hsl(var(--border))",
             borderRight: isLeft ? "1px solid hsl(var(--border))" : "none",
             display: "flex",
-            viewTransitionName: SIDEBAR_DRAWER_VIEW_TRANSITION_NAME,
+            ...(drawerMorphing
+                ? { viewTransitionName: SIDEBAR_DRAWER_VIEW_TRANSITION_NAME }
+                : null),
         };
     }
     else {
@@ -1841,7 +1864,9 @@ export function AgentSidebar({ children, emptyStateText = "How can I help you?",
             display: desktopAnimationEnabled || panelOpen ? "flex" : "none",
             minWidth: desktopAnimationEnabled ? 0 : undefined,
             pointerEvents: desktopAnimationEnabled && !panelOpen ? "none" : undefined,
-            viewTransitionName: SIDEBAR_DRAWER_VIEW_TRANSITION_NAME,
+            ...(drawerMorphing
+                ? { viewTransitionName: SIDEBAR_DRAWER_VIEW_TRANSITION_NAME }
+                : null),
         };
     }
     // Mount the live chat surface only while visible or actively needed. Keeping

package/dist/client/AssistantChat.d.ts

@@ -136,6 +136,7 @@ type QueuedMessage = {
     recoveryAction?: AgentRecoveryAction;
     trackInRunsTray?: boolean;
     hideUserMessage?: boolean;
+    approvedToolCalls?: string[];
     /**
      * Model/engine/effort snapshotted at enqueue time, for the same reason
      * `requestMode` is: the picker is global and live, so a queue that flushes
@@ -306,7 +307,7 @@ export interface AssistantChatProps {
     defaultModel?: string;
     /** Selected engine override for this conversation */
     selectedEngine?: string;
-    /** Selected reasoning effort override for this conversation */
+    /** Selected effort override for this conversation */
     selectedEffort?: ReasoningEffort;
     /** Available engine/model list for the model picker */
     availableModels?: Array<{
@@ -319,7 +320,7 @@ export interface AssistantChatProps {
     modelListLoading?: boolean;
     /** Callback when user picks a model from the picker */
     onModelChange?: (model: string, engine: string) => void;
-    /** Callback when user picks a reasoning effort from the picker */
+    /** Callback when user picks an effort from the picker */
     onEffortChange?: (effort: ReasoningEffort) => void;
     /**
      * Optional secondary model menu (e.g. an image-generation model) shown inside

package/dist/client/AssistantChat.js

@@ -3102,7 +3102,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                         ...(messageAttachments.length > 0
                             ? { attachments: messageAttachments }
                             : {}),
-                        ...createUserMessageRunConfig(next.references, next.requestMode, next.recoveryAction, next.trackInRunsTray, undefined, next.id, next.hideUserMessage, {
+                        ...createUserMessageRunConfig(next.references, next.requestMode, next.recoveryAction, next.trackInRunsTray, next.approvedToolCalls, next.id, next.hideUserMessage, {
                             model: next.model,
                             engine: next.engine,
                             effort: next.effort,
@@ -3433,7 +3433,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         stopActiveRunRef.current({ preserveQueuedMessages: true });
     }, [applyLocalQueuedMessages]);
     const visibleQueuedMessages = useMemo(() => queuedMessages.filter((message) => !message.hideUserMessage), [queuedMessages]);
-    const addToQueue = useCallback(async (text, images, references, attachments, requestMode, intent = "queued", recoveryAction, includeComposerContext = false, trackInRunsTray = false, preserveReconnectAutoRecoveryBudget = false, hideUserMessage = false, submitMessageId) => {
+    const addToQueue = useCallback(async (text, images, references, attachments, requestMode, intent = "queued", recoveryAction, includeComposerContext = false, trackInRunsTray = false, preserveReconnectAutoRecoveryBudget = false, hideUserMessage = false, submitMessageId, approvedToolCalls) => {
         if (isAgentChatSubmitCancelled(submitMessageId))
             return;
         if (engineSetupRequired) {
@@ -3582,6 +3582,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     recoveryAction,
                     trackInRunsTray,
                     hideUserMessage,
+                    approvedToolCalls,
                     ...modelSnapshot,
                 },
             ]);
@@ -3602,6 +3603,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     recoveryAction,
                     trackInRunsTray,
                     hideUserMessage,
+                    approvedToolCalls,
                     ...modelSnapshot,
                 },
             ]);
@@ -3615,7 +3617,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     ...(messageAttachments.length > 0
                         ? { attachments: messageAttachments }
                         : {}),
-                    ...createUserMessageRunConfig(references, effectiveRequestMode, recoveryAction, trackInRunsTray, undefined, undefined, hideUserMessage),
+                    ...createUserMessageRunConfig(references, effectiveRequestMode, recoveryAction, trackInRunsTray, approvedToolCalls, undefined, hideUserMessage),
                 });
             }
             catch (error) {
@@ -4006,31 +4008,16 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         getApprovalResolution,
         onApprovalResolved: recordApprovalResolution,
         onApprove: (approvalKey) => {
-            markOptimisticRunning();
-            appendThreadMessage({
-                role: "user",
-                content: [
-                    {
-                        type: "text",
-                        text: "Approved. Go ahead and run the requested action.",
-                    },
-                ],
-                ...createUserMessageRunConfig(undefined, execMode === "plan"
-                    ? "plan"
-                    : execMode === "build"
-                        ? "act"
-                        : undefined, undefined, undefined, [approvalKey]),
-            });
+            void addToQueue("Approved. Go ahead and run the requested action.", undefined, undefined, undefined, undefined, "queued", undefined, false, false, false, false, undefined, [approvalKey]);
         },
         ...(approvalActions?.onDeny ? { onDeny: approvalActions.onDeny } : {}),
         ...(approvalActions?.onAlwaysAllow
             ? { onAlwaysAllow: approvalActions.onAlwaysAllow }
             : {}),
     }), [
-        appendThreadMessage,
+        addToQueue,
         execMode,
         getApprovalResolution,
-        markOptimisticRunning,
         approvalActions,
         recordApprovalResolution,
     ]);

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

@@ -39,4 +39,4 @@ export { AGENT_SIDEBAR_DEFAULT_MAX_WIDTH, AGENT_SIDEBAR_MIN_WIDTH, AGENT_SIDEBAR
 export { clearReservedToolRenderersForTests, clearToolRenderersForTests, registerActionChatRenderer, registerFallbackToolRenderer, registerReservedActionChatRenderer, registerReservedFallbackToolRenderer, registerReservedToolRenderer, registerToolRenderer, resolveToolRenderer, type ActionChatRendererRegistration, type ToolRendererComponent, type ToolRendererContext, type ToolRendererMatch, type ToolRendererProps, type ToolRendererRegistration, } from "../chat/tool-render-registry.js";
 export * from "../chat/connectors.js";
 export * from "../chat/runtime.js";
-export { CHAT_FIRST_APP_LAYOUT_STORAGE_KEY, CHAT_FIRST_DEFAULT_APP_IDS, CHAT_FIRST_SURFACE_TABS_STORAGE_KEY, CHAT_FIRST_SURFACE_PANEL_STORAGE_KEY, CHAT_FIRST_SURFACE_WIDTH_DEFAULT, CHAT_FIRST_SURFACE_WIDTH_MIN, clampChatFirstSurfaceWidth, CHAT_FIRST_MODE_STORAGE_KEY, CHAT_FIRST_MODE_CHANGED_EVENT, CHAT_FIRST_OPEN_APP_EVENT, CHAT_FIRST_OPEN_BROWSER_EVENT, CHAT_FIRST_WATCH_SESSION_EVENT, CHAT_FIRST_SURFACE_CATALOG, chatFirstSurfaceTabId, closeChatFirstSessionWatch, emitChatFirstOpenApp, emitChatFirstOpenBrowser, emitChatFirstSessionWatch, getChatFirstSessionWatchStore, getChatFirstSurfaceTabsStore, getChatFirstSurfacePanelStore, orderChatFirstAppIds, readChatFirstAppLayout, resolveChatFirstAppTarget, resolveChatFirstBrowserTarget, resolveChatFirstSessionId, normalizeChatFirstSessionReference, readChatFirstMode, readChatFirstModeState, readChatFirstSurfaceWidth, subscribeChatFirstOpenApp, subscribeChatFirstOpenBrowser, subscribeChatFirstSessionWatch, useChatFirstSessionWatch, useChatFirstSurfaceResize, useChatFirstSurfacePanel, useChatFirstSurfaceTabs, writeChatFirstAppLayout, writeChatFirstMode, writeChatFirstSurfaceWidth, type ChatFirstAppLayoutPreference, type ChatFirstModeReadResult, type ChatFirstAppRegistration, type ChatFirstAppResolution, type ChatFirstAppTarget, type ChatFirstAgentActivity, type ChatFirstAgentActivityStatus, type ChatFirstOpenAppDelivery, type ChatFirstOpenAppDetail, type ChatFirstOpenBrowserDetail, type ChatFirstBrowserResolution, type ChatFirstSessionKind, type ChatFirstSessionReference, type ChatFirstSessionWatchDelivery, type ChatFirstSessionWatchState, type ChatFirstSessionWatchStore, type ChatFirstSurfaceKind, type ChatFirstSurfaceTab, type ChatFirstSurfacePanelState, type ChatFirstSurfacePanelStore, type ChatFirstSurfaceTabsState, type ChatFirstSurfaceTabsStore, } from "../chat-first.js";
+export { CHAT_FIRST_APP_LAYOUT_STORAGE_KEY, CHAT_FIRST_DEFAULT_APP_IDS, CHAT_FIRST_SURFACE_TABS_STORAGE_KEY, CHAT_FIRST_SURFACE_PANEL_STORAGE_KEY, CHAT_FIRST_SURFACE_WIDTH_DEFAULT, CHAT_FIRST_SURFACE_WIDTH_MIN, clampChatFirstSurfaceWidth, CHAT_FIRST_MODE_STORAGE_KEY, CHAT_FIRST_MODE_CHANGED_EVENT, CHAT_FIRST_OPEN_APP_EVENT, CHAT_FIRST_OPEN_BROWSER_EVENT, CHAT_FIRST_WATCH_SESSION_EVENT, CHAT_FIRST_SURFACE_CATALOG, chatFirstSurfaceTabId, closeChatFirstSessionWatch, emitChatFirstOpenApp, emitChatFirstOpenBrowser, emitChatFirstSessionWatch, getChatFirstSessionWatchStore, getChatFirstSurfaceTabsStore, getChatFirstSurfacePanelStore, orderChatFirstAppIds, readChatFirstAppLayout, resolveChatFirstAppTarget, resolveChatFirstBrowserTarget, resolveChatFirstSessionId, normalizeChatFirstSessionReference, readChatFirstMode, readChatFirstModeState, readChatFirstSurfaceWidth, subscribeChatFirstOpenApp, subscribeChatFirstOpenBrowser, subscribeChatFirstSessionWatch, useChatFirstSessionWatch, useChatFirstSurfaceResize, useChatFirstSurfacePanel, useChatFirstSurfaceTabs, writeChatFirstAppLayout, writeChatFirstMode, writeChatFirstSurfaceWidth, type ChatFirstAppLayoutPreference, type ChatFirstModeReadResult, type ChatFirstAppRegistration, type ChatFirstAppResolution, type ChatFirstAppTarget, type ChatFirstAppSurfacePlacement, type ChatFirstAgentActivity, type ChatFirstAgentActivityStatus, type ChatFirstOpenAppDelivery, type ChatFirstOpenAppDetail, type ChatFirstOpenBrowserDetail, type ChatFirstBrowserResolution, type ChatFirstSessionKind, type ChatFirstSessionReference, type ChatFirstSessionWatchDelivery, type ChatFirstSessionWatchState, type ChatFirstSessionWatchStore, type ChatFirstSurfaceKind, type ChatFirstSurfaceTab, type ChatFirstSurfacePanelState, type ChatFirstSurfacePanelStore, type ChatFirstSurfaceTabsState, type ChatFirstSurfaceTabsStore, } from "../chat-first.js";

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

@@ -85,6 +85,16 @@ const LARGE_INPUT_TOOL_NAMES = new Set([
 ]);
 const MAX_HISTORY_LARGE_TOOL_ARGS_CHARS = 200_000;
 const STARTUP_RESPONSE_TIMEOUT_MS = 45_000;
+function dispatchTerminalChatUiCleanup(tabId) {
+    if (typeof window === "undefined")
+        return;
+    // Some terminal outcomes are synthesized by the adapter after recovery
+    // (for example, a completed tool whose final response timed out) and never
+    // pass through a terminal SSE frame. Clear both halves of the status UI so
+    // the wrap-up result cannot leave a preparation label or "Resuming" state.
+    window.dispatchEvent(new CustomEvent("agent-chat:activity-clear", { detail: { tabId } }));
+    window.dispatchEvent(new CustomEvent("agent-chat:stream-progress", { detail: { tabId } }));
+}
 // ── Background follow mode ──────────────────────────────────────────────────
 // For server-continued runs (dispatchMode starts with "background" or equals
 // "foreground-self-chain") the SERVER normally chains continuation chunks
@@ -3526,6 +3536,7 @@ export function createAgentChatAdapter(options) {
             }
             finally {
                 if (typeof window !== "undefined") {
+                    dispatchTerminalChatUiCleanup(tabId);
                     window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
                         detail: { isRunning: false, tabId },
                     }));

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

@@ -42,7 +42,7 @@ export interface AgentChatMessage {
     model?: string;
     /** Engine preference paired with model for cross-provider switches. */
     engine?: string;
-    /** Reasoning effort preference paired with model. */
+    /** Effort preference paired with model. */
     effort?: ReasoningEffort;
     /**
      * Execution mode for this submitted turn. When omitted, sendToAgentChat

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

@@ -264,6 +264,8 @@ function rememberStreamingText(resetKey, targetText, visibleText) {
     if (oldestKey !== undefined)
         smoothStreamingTextCache.delete(oldestKey);
 }
+/** Stable placeholder so the grapheme ref stays `string[]` before it is seeded. */
+const EMPTY_GRAPHEMES = [];
 export function useSmoothStreamingText(targetText, streaming, resetKey) {
     const prefersReducedMotion = usePrefersReducedMotion();
     const [visibleText, setVisibleText] = useState(() => {
@@ -276,9 +278,19 @@ export function useSmoothStreamingText(targetText, streaming, resetKey) {
         return sliceGraphemes(targetText, graphemes, initialSmoothStreamingGraphemeCount(graphemes));
     });
     const visibleTextRef = useRef(visibleText);
-    const visibleCountRef = useRef(splitStreamingTextGraphemes(visibleText).length);
     const targetTextRef = useRef(targetText);
-    const targetGraphemesRef = useRef(splitStreamingTextGraphemes(targetText));
+    // `useRef(expr)` evaluates `expr` on EVERY render and throws it away after
+    // mount. Segmenting here therefore ran a full Intl.Segmenter pass per commit
+    // — up to 60Hz per streaming message — and, because `visibleText` is a strict
+    // prefix of `targetText`, that pass could never hit the incremental path and
+    // evicted the shared segmenter cache for every other live stream too. Seed
+    // once; the streaming effect below keeps both refs authoritative after that.
+    const visibleCountRef = useRef(-1);
+    const targetGraphemesRef = useRef(EMPTY_GRAPHEMES);
+    if (visibleCountRef.current < 0) {
+        targetGraphemesRef.current = splitStreamingTextGraphemes(targetText);
+        visibleCountRef.current = splitStreamingTextGraphemes(visibleText).length;
+    }
     const frameRef = useRef(null);
     const lastCommitAtRef = useRef(0);
     const pauseUntilRef = useRef(0);

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

@@ -49,15 +49,19 @@ export declare function shouldOfferRestore(args: {
  * messages put it at `metadata.runId`.
  */
 export declare function assistantMessageRunId(message: unknown): string | undefined;
+export declare function resolveAssistantRequestId(message: unknown, activeRun: {
+    threadId: string;
+    runId: string;
+} | null, threadId: string): string | undefined;
 export declare function MessageBranchPicker(): React.JSX.Element;
-export declare function MessageActionsMenu({ showRevert, onRevert, }?: {
+export declare function MessageActionsMenu({ showRevert, onRevert, threadId, }?: {
     showRevert?: boolean;
     onRevert?: () => void;
+    threadId?: string;
 }): React.JSX.Element;
 export declare function UserMessage(): React.JSX.Element | null;
 export declare function messageTextFromContent(content: unknown): string;
 export declare function isMissingFinalResponseWarningText(text: string): boolean;
-export declare function completedAssistantToolNamesAfterLastText(content: readonly ContentPart[]): string[];
 export declare function latestUserMessageText(messages: readonly unknown[]): string;
 export declare function userMessageTextBeforeAssistant(messages: readonly unknown[], assistantMessageId: string): string;
 export declare function assistantMessageHasUnresolvedTool(content: unknown): boolean;

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

@@ -14,7 +14,7 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel,
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger, } from "../components/ui/tooltip.js";
 import { ThumbsFeedback } from "../observability/ThumbsFeedback.js";
 import { McpConnectionSuggestion } from "../resources/McpConnectionSuggestion.js";
-import { humanizeToolName, isCallAgentToolCallShadowed, shadowedCallAgentToolCallIds, } from "../tool-display.js";
+import { isCallAgentToolCallShadowed, shadowedCallAgentToolCallIds, } from "../tool-display.js";
 import { cn } from "../utils.js";
 import { MarkdownText, renderMarkdownToClipboardHtml, SmoothMarkdownText, } from "./markdown-renderer.js";
 import { getAssistantRunDurationMs } from "./repo-helpers.js";
@@ -172,6 +172,10 @@ export function assistantMessageRunId(message) {
             ? metadata.runId
             : undefined;
 }
+export function resolveAssistantRequestId(message, activeRun, threadId) {
+    return (assistantMessageRunId(message) ||
+        (activeRun?.threadId === threadId ? activeRun.runId : undefined));
+}
 // ─── MessageBranchPicker ──────────────────────────────────────────────────────
 export function MessageBranchPicker() {
     return (_jsxs(BranchPickerPrimitive.Root, { hideWhenSingleBranch: true, className: "flex items-center gap-0.5 text-[11px] text-muted-foreground", children: [_jsx(BranchPickerPrimitive.Previous, { asChild: true, children: _jsx("button", { type: "button", "aria-label": "Previous branch", className: "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 disabled:cursor-not-allowed disabled:opacity-40", children: _jsx(IconChevronLeft, { className: "h-3.5 w-3.5" }) }) }), _jsxs("span", { className: "tabular-nums select-none", children: [_jsx(BranchPickerPrimitive.Number, {}), "/", _jsx(BranchPickerPrimitive.Count, {})] }), _jsx(BranchPickerPrimitive.Next, { asChild: true, children: _jsx("button", { type: "button", "aria-label": "Next branch", className: "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 disabled:cursor-not-allowed disabled:opacity-40", children: _jsx(IconChevronRight, { className: "h-3.5 w-3.5" }) }) })] }));
@@ -284,7 +288,7 @@ function UserMessageEditComposer() {
     return (_jsxs(ComposerPrimitive.Root, { className: "flex flex-col gap-2 rounded-lg border border-border bg-background px-3 py-2 shadow-sm", children: [_jsx(ComposerPrimitive.Input, { className: "w-full resize-none bg-transparent text-sm leading-relaxed text-foreground placeholder:text-muted-foreground focus:outline-none", rows: 1, submitMode: "enter" }), _jsxs("div", { className: "flex justify-end gap-2", children: [_jsx(ComposerPrimitive.Cancel, { asChild: true, children: _jsx("button", { type: "button", className: "cursor-pointer rounded-md px-2 py-1 text-xs font-medium text-muted-foreground hover:bg-accent hover:text-foreground", children: "Cancel" }) }), _jsx(ComposerPrimitive.Send, { asChild: true, children: _jsx("button", { type: "submit", className: "cursor-pointer rounded-md bg-foreground px-2 py-1 text-xs font-medium text-background hover:opacity-90 disabled:opacity-50", children: "Save" }) })] })] }));
 }
 // ─── MessageActionsMenu ────────────────────────────────────────────────────────
-export function MessageActionsMenu({ showRevert, onRevert, } = {}) {
+export function MessageActionsMenu({ showRevert, onRevert, threadId = "", } = {}) {
     const [open, setOpen] = useState(false);
     const [copied, setCopied] = useState(null);
     const messageRuntime = useMessageRuntime();
@@ -311,24 +315,23 @@ export function MessageActionsMenu({ showRevert, onRevert, } = {}) {
     }, [messageRuntime]);
     const handleCopyRequestId = useCallback(() => {
         const m = messageRuntime.getState();
-        // If the message carries no run id (e.g. the run is still in flight and
-        // this is the first message), fall back to the active-run state so a hung /
-        // mid-stream chat still surfaces a usable trace ID. Last resort is the
-        // assistant-ui local message id.
-        const runId = assistantMessageRunId(m) ||
-            (typeof window !== "undefined" ? getActiveRun()?.runId : null) ||
-            m.id ||
-            "";
+        const runId = resolveAssistantRequestId(m, getActiveRun(), threadId);
+        if (!runId) {
+            setCopied("id-unavailable");
+            return;
+        }
         void writeClipboardText(runId).then((ok) => {
-            if (!ok)
+            if (!ok) {
+                setCopied("id-failed");
                 return;
+            }
             setCopied("id");
             setTimeout(() => {
                 setCopied(null);
                 setOpen(false);
             }, 1000);
         });
-    }, [messageRuntime]);
+    }, [messageRuntime, threadId]);
     const handleForkChat = useCallback(() => {
         setOpen(false);
         actionsCtx?.onForkChat?.();
@@ -343,7 +346,13 @@ export function MessageActionsMenu({ showRevert, onRevert, } = {}) {
                         }, children: [copied === "message" ? (_jsx(IconCheck, { className: "h-3.5 w-3.5" })) : (_jsx(IconCopy, { className: "h-3.5 w-3.5" })), copied === "message" ? "Copied!" : "Copy Message"] }), _jsxs(DropdownMenuItem, { onSelect: (e) => {
                             e.preventDefault();
                             handleCopyRequestId();
-                        }, children: [copied === "id" ? (_jsx(IconCheck, { className: "h-3.5 w-3.5" })) : (_jsx(IconId, { className: "h-3.5 w-3.5" })), copied === "id" ? "Copied!" : "Copy Request ID"] }), showRevert && (_jsxs(DropdownMenuItem, { onSelect: handleRevert, children: [_jsx(IconArrowBackUp, { className: "h-3.5 w-3.5" }), "Revert to here"] })), timestamp && (_jsxs(_Fragment, { children: [_jsx(DropdownMenuSeparator, {}), _jsxs(DropdownMenuLabel, { className: "px-2 py-1 text-[11px] font-normal text-muted-foreground", children: ["Sent ", timestamp.short] })] }))] })] }));
+                        }, children: [copied === "id" ? (_jsx(IconCheck, { className: "h-3.5 w-3.5" })) : (_jsx(IconId, { className: "h-3.5 w-3.5" })), copied === "id"
+                                ? "Copied!"
+                                : copied === "id-unavailable"
+                                    ? "Request ID unavailable"
+                                    : copied === "id-failed"
+                                        ? "Copy failed"
+                                        : "Copy Request ID"] }), showRevert && (_jsxs(DropdownMenuItem, { onSelect: handleRevert, children: [_jsx(IconArrowBackUp, { className: "h-3.5 w-3.5" }), "Revert to here"] })), timestamp && (_jsxs(_Fragment, { children: [_jsx(DropdownMenuSeparator, {}), _jsxs(DropdownMenuLabel, { className: "px-2 py-1 text-[11px] font-normal text-muted-foreground", children: ["Sent ", timestamp.short] })] }))] })] }));
 }
 // ─── UserMessage ──────────────────────────────────────────────────────────────
 export function UserMessage() {
@@ -481,29 +490,6 @@ function missingFinalResponseWarningText(content) {
     }
     return null;
 }
-export function completedAssistantToolNamesAfterLastText(content) {
-    let lastTextIndex = -1;
-    for (let index = content.length - 1; index >= 0; index -= 1) {
-        if (content[index]?.type === "text") {
-            lastTextIndex = index;
-            break;
-        }
-    }
-    const names = new Set();
-    for (let index = lastTextIndex + 1; index < content.length; index += 1) {
-        const part = content[index];
-        if (part?.type !== "tool-call" ||
-            part.activity === true ||
-            part.result === undefined ||
-            part.isError === true ||
-            part.outcome === "unknown" ||
-            isCallAgentToolCallShadowed(content, index)) {
-            continue;
-        }
-        names.add(humanizeToolName(part.toolName));
-    }
-    return [...names];
-}
 export function latestUserMessageText(messages) {
     for (let index = messages.length - 1; index >= 0; index -= 1) {
         const message = messages[index];
@@ -781,11 +767,6 @@ export function InlineRunErrorNotice({ info, durationMs, onRetry, }) {
         : headline;
     return (_jsxs("div", { className: "my-1 w-full", children: [_jsxs("button", { type: "button", onClick: () => setOpen((v) => !v), "aria-expanded": open, className: "flex cursor-pointer items-center gap-1.5 py-0.5 text-[13px] text-muted-foreground transition-colors hover:text-foreground", children: [_jsx(IconAlertTriangle, { className: "size-3.5 shrink-0 text-amber-500" }), _jsx("span", { className: "truncate", children: label }), _jsx(IconChevronRight, { className: cn("size-3.5 shrink-0 transition-transform", open && "rotate-90") })] }), open && (_jsxs("div", { className: "mt-1 rounded-md border border-border/60 bg-background/70 p-2 text-[11px] leading-relaxed text-muted-foreground", children: [_jsx("p", { className: "whitespace-pre-wrap break-words", children: info.message }), info.errorCode && (_jsxs("div", { className: "mt-1 font-mono", children: ["code: ", info.errorCode] })), info.runId && _jsxs("div", { className: "font-mono", children: ["run: ", info.runId] }), info.details && (_jsx("pre", { className: "mt-1 max-h-28 overflow-auto whitespace-pre-wrap break-words font-mono", children: info.details })), onRetry && (_jsxs("button", { type: "button", onClick: onRetry, className: "mt-2 inline-flex h-7 cursor-pointer items-center gap-1.5 rounded-md border border-border bg-background px-2.5 text-[11px] font-medium text-foreground hover:bg-accent", children: [_jsx(IconRefresh, { className: "size-3" }), "Retry"] }))] }))] }));
 }
-function AssistantCompletionProgress({ messageId, toolNames, }) {
-    if (toolNames.length === 0)
-        return null;
-    return (_jsx("div", { className: "my-1 w-full text-[13px] text-muted-foreground", role: "status", "aria-live": "polite", "data-testid": "assistant-completion-progress", children: _jsx(SmoothMarkdownText, { text: `The agent completed these actions: ${toolNames.join(", ")}`, streaming: true, resetKey: `assistant-completion-progress:${messageId}`, statusType: "running" }) }));
-}
 function MissingFinalResponseNotice({ messageId, text, animate, onRevealComplete, }) {
     return (_jsx("div", { className: "my-1 w-full text-muted-foreground", role: "status", "aria-live": "polite", "data-testid": "missing-final-response", children: _jsx(SmoothMarkdownText, { text: text, streaming: animate, resetKey: `missing-final-response:${messageId}`, statusType: animate ? "running" : "complete", onRevealComplete: animate ? onRevealComplete : undefined }) }));
 }
@@ -849,9 +830,6 @@ export function AssistantMessage() {
             return;
         setRevealedMissingFinalResponseKey(missingFinalResponseAnimationKey);
     }, [missingFinalResponseAnimationKey]);
-    const completedToolNames = isLast && chatRunning && !hasCompletedCustomUi && Array.isArray(msg.content)
-        ? completedAssistantToolNamesAfterLastText(msg.content)
-        : [];
     const shouldHoldCompletionFooter = isLast &&
         ((missingFinalResponseCandidate && !showMissingFinalResponse) ||
             (animateMissingFinalResponse && !missingFinalResponseRevealed));
@@ -1004,15 +982,15 @@ export function AssistantMessage() {
                                     case "tool-call":
                                         if (shadowedToolCallIds.has(part.toolCallId))
                                             return null;
-                                        return part.toolUI ? (_jsx(ToolActivityPresentation, { toolName: part.toolName, isRunning: part.status?.type === "running", isActiveTail: part.toolCallId === activeTailToolCallId, toolCallId: part.toolCallId, children: part.toolUI })) : (_jsx(ToolCallFallback, { ...part, isActiveTail: part.toolCallId === activeTailToolCallId }));
+                                        return part.toolUI ? (_jsx(ToolActivityPresentation, { toolName: part.toolName, isRunning: part.status?.type === "running", toolCallId: part.toolCallId, children: part.toolUI })) : (_jsx(ToolCallFallback, { ...part, isActiveTail: part.toolCallId === activeTailToolCallId }));
                                     default:
                                         return null;
                                 }
-                            } }) }), completedToolNames.length > 0 && !showInlineRunError && (_jsx(AssistantCompletionProgress, { messageId: msg.id, toolNames: completedToolNames })), showInlineRunError && messageRunError && (_jsx(InlineRunErrorNotice, { info: messageRunError, durationMs: capturedDurationMs ?? persistedDurationMs, onRetry: isLast && messageRunError.recoverable
+                            } }) }), showInlineRunError && messageRunError && (_jsx(InlineRunErrorNotice, { info: messageRunError, durationMs: capturedDurationMs ?? persistedDurationMs, onRetry: isLast && messageRunError.recoverable
                             ? messageActions?.onRetryRunError
                             : undefined })), missingWarningText == null &&
                         missingFinalResponseNoticeText != null &&
-                        !showInlineRunError && (_jsx(MissingFinalResponseNotice, { messageId: msg.id, text: missingFinalResponseNoticeText, animate: animateMissingFinalResponse, onRevealComplete: handleMissingFinalResponseReveal })), isComplete && hasCodeAgentTools && msgContent && (_jsx(FilesChangedSummary, { parts: msgContent })), isComplete && (_jsx(McpConnectionSuggestion, { text: responseConnectionText, contextText: responseConnectionContext, variant: "response" }))] }), isComplete && (_jsxs("div", { className: "mt-1 flex items-center justify-between", children: [_jsxs("div", { className: "flex min-w-0 items-center gap-1", children: [_jsx(MessageActionsMenu, { showRevert: showRestore && restoreState === "idle", onRevert: handleRestore }), isLast && (_jsx(TooltipProvider, { delayDuration: 400, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(ActionBarPrimitive.Reload, { asChild: true, children: _jsx("button", { type: "button", "aria-label": "Regenerate response", className: `flex h-6 w-6 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 hover:bg-accent hover:text-foreground ${messageFooterFadeClassName} disabled:cursor-not-allowed disabled:opacity-40`, children: _jsx(IconRefresh, { className: "h-3.5 w-3.5" }) }) }) }), _jsx(TooltipContent, { side: "top", className: "text-xs", children: "Regenerate response" })] }) })), _jsx(MessageBranchPicker, {}), timestamp && (_jsx(MessageTimestamp, { timestamp: timestamp, className: messageFooterFadeClassName }))] }), showRestore && restoreState === "confirming" ? (_jsxs("div", { className: "flex items-center gap-1 text-xs", children: [_jsx("button", { onClick: handleRestore, className: "rounded-md bg-destructive px-1.5 py-0.5 text-destructive-foreground hover:bg-destructive/90", children: "Restore to here?" }), _jsx("button", { onClick: cancelRestore, className: "rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: "Cancel" })] })) : showRestore && restoreState === "restoring" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-muted-foreground", children: [_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" }), "Restoring..."] })) : restoreState === "error" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-destructive", children: [_jsx(IconAlertTriangle, { className: "h-3 w-3 shrink-0" }), _jsx("span", { className: "truncate", children: restoreError }), _jsx("button", { onClick: cancelRestore, className: "cursor-pointer rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: "Dismiss" })] })) : (_jsx(ThumbsFeedback, { threadId: cpCtx?.threadId ?? "", runId: messageRunId ?? "", messageSeq: thread.messages.findIndex((m) => m.id === msg.id) }))] }))] }));
+                        !showInlineRunError && (_jsx(MissingFinalResponseNotice, { messageId: msg.id, text: missingFinalResponseNoticeText, animate: animateMissingFinalResponse, onRevealComplete: handleMissingFinalResponseReveal })), isComplete && hasCodeAgentTools && msgContent && (_jsx(FilesChangedSummary, { parts: msgContent })), isComplete && (_jsx(McpConnectionSuggestion, { text: responseConnectionText, contextText: responseConnectionContext, variant: "response" }))] }), isComplete && (_jsxs("div", { className: "mt-1 flex items-center justify-between", children: [_jsxs("div", { className: "flex min-w-0 items-center gap-1", children: [_jsx(MessageActionsMenu, { showRevert: showRestore && restoreState === "idle", onRevert: handleRestore, threadId: cpCtx?.threadId ?? "" }), isLast && (_jsx(TooltipProvider, { delayDuration: 400, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(ActionBarPrimitive.Reload, { asChild: true, children: _jsx("button", { type: "button", "aria-label": "Regenerate response", className: `flex h-6 w-6 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 hover:bg-accent hover:text-foreground ${messageFooterFadeClassName} disabled:cursor-not-allowed disabled:opacity-40`, children: _jsx(IconRefresh, { className: "h-3.5 w-3.5" }) }) }) }), _jsx(TooltipContent, { side: "top", className: "text-xs", children: "Regenerate response" })] }) })), _jsx(MessageBranchPicker, {}), timestamp && (_jsx(MessageTimestamp, { timestamp: timestamp, className: messageFooterFadeClassName }))] }), showRestore && restoreState === "confirming" ? (_jsxs("div", { className: "flex items-center gap-1 text-xs", children: [_jsx("button", { onClick: handleRestore, className: "rounded-md bg-destructive px-1.5 py-0.5 text-destructive-foreground hover:bg-destructive/90", children: "Restore to here?" }), _jsx("button", { onClick: cancelRestore, className: "rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: "Cancel" })] })) : showRestore && restoreState === "restoring" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-muted-foreground", children: [_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" }), "Restoring..."] })) : restoreState === "error" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-destructive", children: [_jsx(IconAlertTriangle, { className: "h-3 w-3 shrink-0" }), _jsx("span", { className: "truncate", children: restoreError }), _jsx("button", { onClick: cancelRestore, className: "cursor-pointer rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: "Dismiss" })] })) : (_jsx(ThumbsFeedback, { threadId: cpCtx?.threadId ?? "", runId: messageRunId ?? "", messageSeq: thread.messages.findIndex((m) => m.id === msg.id) }))] }))] }));
 }
 // ─── RunningActivityStatus / ThinkingIndicator ────────────────────────────────
 export function RunningActivityStatus({ label }) {

package/dist/client/chat/tool-call-display.d.ts

@@ -8,9 +8,8 @@ export declare const ChatRunningContext: React.Context<boolean>;
 export declare const ChatRunDurationContext: React.Context<number | null>;
 export declare const ASSISTANT_VISIBLE_TOOL_CALL_LIMIT = 3;
 /**
- * Keeps the visible tool stack spatially continuous as streaming calls change
- * which rows belong to the collapsed history bucket. The rendered data stays
- * untouched; this only animates the DOM's before/after positions.
+ * Keeps the tool-call stack layout-transparent. Tool-entry motion is disabled
+ * until it can stay stable while streaming calls are added and summarized.
  */
 export declare function ToolCallStackMotion({ children, className, }: {
     children: React.ReactNode;
@@ -55,10 +54,9 @@ export declare function toolCallHasPendingApproval(part: {
     } | null;
 }): boolean;
 export declare const TOOL_LONG_RUNNING_HINT_DELAY_MS = 45000;
-export declare function ToolActivityPresentation({ toolName, isRunning, isActiveTail, toolCallId, suppressLongRunningHint, children, }: {
+export declare function ToolActivityPresentation({ toolName, isRunning, toolCallId, suppressLongRunningHint, children, }: {
     toolName: string;
     isRunning: boolean;
-    isActiveTail: boolean;
     toolCallId?: string;
     suppressLongRunningHint?: boolean;
     children: React.ReactNode;