@agent-native/core 0.92.2 → 0.92.3

package/dist/client/AssistantChat.js

@@ -135,6 +135,36 @@ function cloneContentParts(content) {
             ...(part.chatUI ? { chatUI: { ...part.chatUI } } : {}),
         });
 }
+export function settleInterruptedAssistantToolCallsInRepo(repo) {
+    if (!Array.isArray(repo.messages))
+        return { repo, changed: false };
+    let changed = false;
+    const nextMessages = repo.messages.map((entry) => {
+        const wrapper = entry && typeof entry === "object" && "message" in entry
+            ? entry
+            : null;
+        const message = (wrapper?.message ?? entry);
+        if (message?.role !== "assistant" || !Array.isArray(message.content)) {
+            return entry;
+        }
+        const content = cloneContentParts(message.content);
+        if (!settleInterruptedToolCalls(content, undefined, { includeActivity: true })) {
+            return entry;
+        }
+        changed = true;
+        const nextMessage = {
+            ...message,
+            content,
+            status: { type: "incomplete", reason: "error" },
+        };
+        return wrapper
+            ? { ...entry, message: nextMessage }
+            : nextMessage;
+    });
+    return changed
+        ? { repo: { ...repo, messages: nextMessages }, changed }
+        : { repo, changed };
+}
 function clearPendingSelection() {
     fetch(agentNativePath(`/_agent-native/application-state/${PENDING_SELECTION_KEY}`), {
         method: "DELETE",
@@ -259,6 +289,26 @@ function toolCallPartHasResult(part) {
     const candidate = part;
     return candidate.type === "tool-call" && "result" in candidate;
 }
+/**
+ * Monotonic progress rank for a tool-call part. Higher means the UI should
+ * prefer this copy over a lower-ranked duplicate of the same logical call.
+ * Used so reconnect overlays that are ahead of lagging thread messages stay
+ * visible instead of flickering back to an older pending spinner.
+ */
+function toolCallProgressRank(part) {
+    if (!part || typeof part !== "object")
+        return 0;
+    const candidate = part;
+    if (candidate.type !== "tool-call")
+        return 0;
+    if ("result" in candidate)
+        return 4;
+    if (candidate.activity === true)
+        return 1;
+    return typeof candidate.argsText === "string" && candidate.argsText.length > 0
+        ? 2
+        : 1;
+}
 /**
  * Identity fingerprint for a tool-call part that survives across readers: two
  * readers of the same run assign unrelated synthetic toolCallIds until both
@@ -294,10 +344,10 @@ function collectRenderedToolCallStates(messages) {
             const id = toolCallIdFromContentPart(part);
             if (!id)
                 continue;
-            const hasResult = toolCallPartHasResult(part);
+            const rank = toolCallProgressRank(part);
             const existing = byId.get(id);
             byId.set(id, {
-                hasResult: Boolean(existing?.hasResult || hasResult),
+                rank: Math.max(existing?.rank ?? 0, rank),
             });
         }
     }
@@ -310,10 +360,10 @@ function collectRenderedToolCallStates(messages) {
             const fingerprint = toolCallFingerprintFromContentPart(part);
             if (!fingerprint)
                 continue;
-            const hasResult = toolCallPartHasResult(part);
+            const rank = toolCallProgressRank(part);
             const existing = latestAssistantByFingerprint.get(fingerprint);
             latestAssistantByFingerprint.set(fingerprint, {
-                hasResult: Boolean(existing?.hasResult || hasResult),
+                rank: Math.max(existing?.rank ?? 0, rank),
             });
         }
     }
@@ -402,24 +452,33 @@ export function dedupeReconnectContentAgainstMessages(content, messages) {
     }
     const filtered = byId.size > 0 || latestAssistantByFingerprint.size > 0
         ? snapshotDeduped.filter((part) => {
+            const reconnectRank = toolCallProgressRank(part);
             const id = toolCallIdFromContentPart(part);
             const existing = id ? byId.get(id) : undefined;
             if (existing) {
-                changed = true;
-                return false;
+                // Keep reconnect copies that are strictly ahead of the rendered
+                // message (e.g. completed overlay vs lagging pending thread data).
+                // Same-or-behind ranks are duplicates and should stay hidden.
+                if (reconnectRank <= existing.rank) {
+                    changed = true;
+                    return false;
+                }
+                return true;
             }
             // Fingerprint fallback for the id-convergence window: two readers of
             // the same active run can assign unrelated ids to the same logical tool
             // call before the server id converges. Suppress the reconnect overlay
-            // whenever it matches the latest rendered assistant tool call and either
-            // side is still pending; completed-vs-completed remains visible so a
-            // legitimately repeated identical call is not hidden.
+            // only when the rendered message is at least as far along; completed
+            // reconnect copies stay visible over pending message copies so the UI
+            // does not pop back to an older spinner.
             const fingerprint = toolCallFingerprintFromContentPart(part);
             const latestByFingerprint = fingerprint
                 ? latestAssistantByFingerprint.get(fingerprint)
                 : undefined;
+            const isCompletedRepeat = reconnectRank >= 4 && latestByFingerprint?.rank === 4;
             if (latestByFingerprint &&
-                (!toolCallPartHasResult(part) || !latestByFingerprint.hasResult)) {
+                !isCompletedRepeat &&
+                reconnectRank <= latestByFingerprint.rank) {
                 changed = true;
                 return false;
             }
@@ -834,6 +893,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     const queueDirtyRef = useRef(false);
     const queueMutationVersionRef = useRef(0);
     const dequeueInFlightRef = useRef(false);
+    const queueStopVersionRef = useRef(0);
     const [composerContextItems, setComposerContextItems] = useState([]);
     const composerContextItemsRef = useRef([]);
     const isActiveComposerRef = useRef(isActiveComposer);
@@ -975,6 +1035,9 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     const [reconnectContent, setReconnectContent] = useState([]);
     // When stop is clicked during reconnect, keep content visible (don't wipe it)
     const [reconnectFrozen, setReconnectFrozen] = useState(false);
+    // Adapter took over while reconnect still had visible tool cards — keep the
+    // overlay until the adapter message catches up so we don't flash an empty gap.
+    const [adapterHandoffPending, setAdapterHandoffPending] = useState(false);
     const reconnectRunIdRef = useRef(null);
     const reconnectTailOnlyRef = useRef(false);
     const reconnectCanMaterializeRef = useRef(false);
@@ -1026,9 +1089,14 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         isReconnecting,
         hasReconnectContent: reconnectContent.length > 0,
     });
-    const reconnectActivityContent = useMemo(() => isReconnecting || reconnectFrozen
+    const reconnectActivityContent = useMemo(() => isReconnecting || reconnectFrozen || adapterHandoffPending
         ? reconnectActivityFallbackContent(runningActivityTool)
-        : [], [isReconnecting, reconnectFrozen, runningActivityTool]);
+        : [], [
+        adapterHandoffPending,
+        isReconnecting,
+        reconnectFrozen,
+        runningActivityTool,
+    ]);
     const lastBroadcastRunningRef = useRef(isRunning);
     const tiptapRef = useRef(null);
     // Stable ref to the "stop active run" action so addToQueue can abort
@@ -1113,14 +1181,21 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         let settledRepo = repo;
         if (repo?.messages?.length > 0) {
             let shouldImport = true;
-            try {
-                shouldImport = shouldImportServerThreadData(normalizeThreadRepository(threadRuntime.export()), repo);
-            }
-            catch {
-                // If the runtime/export comparison itself fails, do not fail open by
-                // importing a server snapshot that may be stale relative to local UI.
+            // Adapter owns the live turn (including auto-continuation gaps). Do not
+            // let a lagging server thread snapshot clobber in-flight tool cards.
+            if (isRuntimeRunningRef.current || isAutoResumingRef.current) {
                 shouldImport = false;
             }
+            else {
+                try {
+                    shouldImport = shouldImportServerThreadData(normalizeThreadRepository(threadRuntime.export()), repo);
+                }
+                catch {
+                    // If the runtime/export comparison itself fails, do not fail open by
+                    // importing a server snapshot that may be stale relative to local UI.
+                    shouldImport = false;
+                }
+            }
             if (shouldImport) {
                 if (options?.markTitleGenerated) {
                     titleGeneratedRef.current = true;
@@ -1264,6 +1339,25 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         if (isRuntimeRunningRef.current || isAutoResumingRef.current) {
             return false;
         }
+        // SUPERSEDE THE PREVIOUS RECONNECT GENERATION. A turn that keeps failing
+        // (e.g. repeated stale_run at "Contacting model") produces a new runId
+        // every few seconds; each call here used to OVERWRITE the single-slot
+        // refs below without tearing down the prior closure, leaving its
+        // watchdog (1s) + idleCheck (1s) + thread poll (2s) + SSE retry loop all
+        // running. 4-5 stacked generations = a ~20 req/s request storm that
+        // hammers the same Neon pool the server needs for heartbeats, deepening
+        // the DB saturation that causes the failures in the first place. Abort
+        // the prior generation's AbortController so its stream loop exits and its
+        // `finally` clears every interval before we start a fresh one.
+        if (reconnectAbortRef.current) {
+            try {
+                reconnectAbortRef.current.abort();
+            }
+            catch {
+                // Already aborted / detached — nothing to unwind.
+            }
+            reconnectAbortRef.current = null;
+        }
         reconnectRunIdRef.current = runId;
         const afterSeq = resolveReconnectAfterSeq(threadId, runId);
         reconnectTailOnlyRef.current = afterSeq > 0;
@@ -1278,6 +1372,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         });
         setIsReconnecting(true);
         setReconnectFrozen(false);
+        setAdapterHandoffPending(false);
         setReconnectContent([]);
         window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
             detail: { isRunning: true, tabId: tabId || threadId },
@@ -1349,6 +1444,19 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             let noProgressDuringReconnect = false;
             let latestContent = [];
             const preparingActionState = {};
+            // Exponential backoff for the reattach retry loop. A run that is
+            // "active" server-side but producing no stream (the exact stuck state
+            // that triggers a reconnect) would otherwise re-fetch /runs/:id/events
+            // every ~250ms — several req/s per generation. Back off 250ms → 5s so a
+            // genuinely stuck run stops hammering the server; reset the moment real
+            // progress streams in (see the onSeq callback) so a recovering run
+            // re-tightens immediately.
+            let reconnectRetryCount = 0;
+            const backoffRetryDelay = () => {
+                const ms = Math.min(250 * 2 ** reconnectRetryCount, 5000);
+                reconnectRetryCount += 1;
+                return new Promise((resolve) => window.setTimeout(resolve, ms));
+            };
             const sameRunStillActive = async () => {
                 try {
                     const res = await fetch(`${apiUrl}/runs/active?threadId=${encodeURIComponent(threadId)}`, { signal: abortCtrl.signal });
@@ -1370,6 +1478,11 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                 ? window.setInterval(() => {
                     if (reconnectRunIdRef.current !== runId)
                         return;
+                    // Adapter took over mid-poll — skip imports that would race the
+                    // live stream and flicker tool cards back to older snapshots.
+                    if (isRuntimeRunningRef.current || isAutoResumingRef.current) {
+                        return;
+                    }
                     void refreshThreadFromServer();
                 }, 2000)
                 : undefined;
@@ -1385,7 +1498,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     if (!sseRes.ok || !sseRes.body) {
                         const activeState = await sameRunStillActive();
                         if (activeState !== "inactive") {
-                            await new Promise((resolve) => window.setTimeout(resolve, 250));
+                            await backoffRetryDelay();
                             continue;
                         }
                         break;
@@ -1405,6 +1518,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     try {
                         await readSSEStreamRaw(sseRes.body, content, toolCallCounter, tabId, scheduleUpdate, (seq) => {
                             markReconnectProgress();
+                            reconnectRetryCount = 0;
                             updateActiveRunSeq(seq);
                         }, { preparingActionState });
                         if (reconnectAfterSeq === 0) {
@@ -1420,7 +1534,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                             }
                             const activeState = await sameRunStillActive();
                             if (activeState !== "inactive") {
-                                await new Promise((resolve) => window.setTimeout(resolve, 250));
+                                await backoffRetryDelay();
                                 continue;
                             }
                         }
@@ -1768,7 +1882,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         if (!loadHistoryRepository ||
             !hasRestoredRef.current ||
             isRestoring ||
-            isRunning) {
+            isRunning ||
+            isAutoResuming) {
             return;
         }
         let cancelled = false;
@@ -1785,6 +1900,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     }, [
         historyReloadKey,
         importThreadData,
+        isAutoResuming,
         isRestoring,
         isRunning,
         loadHistoryRepository,
@@ -2187,6 +2303,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         const next = queuedMessages[0];
         if (!next)
             return;
+        const stopVersion = queueStopVersionRef.current;
         dequeueInFlightRef.current = true;
         let cancelled = false;
         let started = false;
@@ -2203,7 +2320,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     await waitForThreadRunToClear(apiUrl, threadId);
                     if (cancelled)
                         return;
-                    if (queuedMessagesRef.current[0]?.id !== next.id) {
+                    if (queueStopVersionRef.current !== stopVersion ||
+                        queuedMessagesRef.current[0]?.id !== next.id) {
                         return;
                     }
                     // Keep the placeholder visible while waiting. Remove it only when the
@@ -2227,6 +2345,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                 }
                 catch (err) {
                     if (removedForAppend &&
+                        queueStopVersionRef.current === stopVersion &&
                         !queuedMessagesRef.current.some((message) => message.id === next.id)) {
                         applyLocalQueuedMessages((prev) => [next, ...prev]);
                     }
@@ -2280,30 +2399,66 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         prevIsRuntimeRunningRef.current = isRuntimeRunning;
         if (isRuntimeRunning && !wasRunning) {
             // SINGLE-READER OWNERSHIP: the adapter runtime just took over (a new run
-            // started or an adopted run resumed). Any live reconnect reader is now a
-            // duplicate accumulator — abort it and DISCARD its content; the adapter's
-            // stream renders the canonical message. Null the run ref first so the
-            // reader's own cleanup paths (which all check reconnectRunIdRef) no-op.
+            // started or an adopted run resumed). Abort the reconnect reader, but keep
+            // its visible content until the adapter message has tool/text parts so the
+            // UI does not flash an empty gap between readers.
             if (reconnectRunIdRef.current !== null) {
+                const keepOverlay = reconnectContent.length > 0;
                 reconnectRunIdRef.current = null;
                 reconnectAbortRef.current?.abort();
                 reconnectAbortRef.current = null;
                 setIsReconnecting(false);
-                setReconnectContent([]);
                 setReconnectFrozen(false);
                 reconnectCanMaterializeRef.current = false;
                 reconnectTailOnlyRef.current = false;
+                if (keepOverlay) {
+                    setAdapterHandoffPending(true);
+                }
+                else {
+                    setReconnectContent([]);
+                    setAdapterHandoffPending(false);
+                }
             }
             else if (reconnectFrozen) {
                 setReconnectFrozen(false);
                 setReconnectContent([]);
+                setAdapterHandoffPending(false);
                 reconnectCanMaterializeRef.current = false;
             }
             if (forceStopped) {
                 setForceStopped(false);
             }
         }
-    }, [isRuntimeRunning, reconnectFrozen, forceStopped]);
+    }, [
+        isRuntimeRunning,
+        reconnectFrozen,
+        forceStopped,
+        reconnectContent.length,
+    ]);
+    // Release the deferred reconnect overlay once thread messages have caught
+    // up enough that dedupe would hide the overlay, or after a short timeout so
+    // a stuck handoff cannot leave duplicate tool cards forever.
+    useEffect(() => {
+        if (!adapterHandoffPending)
+            return;
+        if (!isRuntimeRunning) {
+            setReconnectContent([]);
+            setAdapterHandoffPending(false);
+            return;
+        }
+        const stillNeeded = dedupeReconnectContentAgainstMessages(reconnectContent, messages).length >
+            0;
+        if (!stillNeeded) {
+            setReconnectContent([]);
+            setAdapterHandoffPending(false);
+            return;
+        }
+        const timer = window.setTimeout(() => {
+            setReconnectContent([]);
+            setAdapterHandoffPending(false);
+        }, 2500);
+        return () => window.clearTimeout(timer);
+    }, [adapterHandoffPending, isRuntimeRunning, messages, reconnectContent]);
     // Same transition guard for isReconnecting: only clear forceStopped on
     // the false→true edge (a new reconnect starting on page load).
     const prevIsReconnectingRef = useRef(isReconnecting);
@@ -2320,6 +2475,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         if (!reconnectCanMaterializeRef.current) {
             setReconnectFrozen(false);
             setReconnectContent([]);
+            setAdapterHandoffPending(false);
             return;
         }
         try {
@@ -2359,6 +2515,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             threadRuntime.import(ensureMessageMetadata(repo));
             setReconnectFrozen(false);
             setReconnectContent([]);
+            setAdapterHandoffPending(false);
             reconnectCanMaterializeRef.current = false;
         }
         catch (err) {
@@ -2382,13 +2539,47 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         threadId,
         threadRuntime,
     ]);
+    const settleVisibleInterruptedTools = useCallback(() => {
+        try {
+            const repo = normalizeThreadRepository(threadRuntime.export());
+            const settled = settleInterruptedAssistantToolCallsInRepo(repo);
+            if (settled.changed) {
+                threadRuntime.import(ensureMessageMetadata(settled.repo));
+            }
+        }
+        catch (err) {
+            captureError(err, {
+                tags: {
+                    source: "agent-chat-client",
+                    phase: "settle-stopped-tool-calls",
+                },
+                extra: {
+                    threadId: threadId ?? null,
+                    tabId: tabId ?? null,
+                },
+            });
+        }
+    }, [tabId, threadId, threadRuntime]);
     // Abort the active server run (identical to what the Stop button does) so
     // an immediate-while-running send can proceed cleanly without a 409 race.
     // Captured in a stable ref so addToQueue can call it without listing
     // all the stop-related state in its own dep array.
-    const stopActiveRun = useCallback(() => {
+    const stopActiveRun = useCallback((options) => {
         setForceStopped(true);
         setOptimisticRunning(false);
+        setHasActiveServerRun(false);
+        setPendingReconnectRecovery(null);
+        setIsAutoResuming(false);
+        if (autoResumeTimerRef.current !== null) {
+            window.clearTimeout(autoResumeTimerRef.current);
+            autoResumeTimerRef.current = null;
+        }
+        resetRunningActivity();
+        if (!options?.preserveQueuedMessages) {
+            queueStopVersionRef.current += 1;
+            dequeueInFlightRef.current = false;
+            applyLocalQueuedMessages(() => []);
+        }
         const activeRun = getActiveRun();
         const runIdToAbort = reconnectRunIdRef.current ?? activeRun?.runId;
         userStoppedRunRef.current = {
@@ -2409,10 +2600,16 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             reconnectAbortRef.current = null;
             reconnectRunIdRef.current = null;
             setIsReconnecting(false);
+            setAdapterHandoffPending(false);
             const shouldFreezeReconnectContent = !reconnectTailOnlyRef.current &&
                 reconnectCanMaterializeRef.current &&
                 reconnectContent.length > 0;
             if (shouldFreezeReconnectContent) {
+                const frozenContent = cloneContentParts(reconnectContent);
+                settleInterruptedToolCalls(frozenContent, undefined, {
+                    includeActivity: true,
+                });
+                setReconnectContent(frozenContent);
                 setReconnectFrozen(true);
             }
             else {
@@ -2423,6 +2620,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             reconnectTailOnlyRef.current = false;
         }
         threadRuntime.cancelRun();
+        settleVisibleInterruptedTools();
         if (typeof window !== "undefined") {
             window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
                 detail: { isRunning: false, tabId: tabId || threadId },
@@ -2430,8 +2628,11 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         }
     }, [
         apiUrl,
+        applyLocalQueuedMessages,
         isReconnecting,
-        reconnectContent.length,
+        resetRunningActivity,
+        reconnectContent,
+        settleVisibleInterruptedTools,
         tabId,
         threadId,
         threadRuntime,
@@ -2439,7 +2640,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     // Keep the ref current so addToQueue can call it without a stale closure.
     stopActiveRunRef.current = stopActiveRun;
     const addToQueue = useCallback(async (text, images, references, attachments, requestMode, intent = "queued", recoveryAction, includeComposerContext = false, trackInRunsTray = false, preserveReconnectAutoRecoveryBudget = false, hideUserMessage = false) => {
-        if (!(await ensureAgentEngineReadyForSubmit())) {
+        if (agentEngineConfigured.state === "missing") {
+            void ensureAgentEngineReadyForSubmit();
             return;
         }
         if (!preserveReconnectAutoRecoveryBudget) {
@@ -2578,7 +2780,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     hideUserMessage,
                 },
             ]);
-            stopActiveRunRef.current();
+            stopActiveRunRef.current({ preserveQueuedMessages: true });
         }
         else if (isRunning && intent === "queued") {
             applyLocalQueuedMessages((prev) => [
@@ -2620,6 +2822,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         }
     }, [
         applyLocalQueuedMessages,
+        agentEngineConfigured.state,
         buildComposerContextSubmission,
         ensureAgentEngineReadyForSubmit,
         execMode,
@@ -2883,8 +3086,12 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                         setDismissedRunErrorKey(visibleRunErrorKey);
                                                                     }
                                                                     setRunErrorInfo(null);
-                                                                } }) })), (isReconnecting || reconnectFrozen) &&
-                                                            visibleReconnectContent.length > 0 && (_jsx(MessageScrollerItem, { children: _jsx(ReconnectStreamMessage, { content: visibleReconnectContent }) })), (isReconnecting || reconnectFrozen) &&
+                                                                } }) })), (isReconnecting ||
+                                                            reconnectFrozen ||
+                                                            adapterHandoffPending) &&
+                                                            visibleReconnectContent.length > 0 && (_jsx(MessageScrollerItem, { children: _jsx(ReconnectStreamMessage, { content: visibleReconnectContent }) })), (isReconnecting ||
+                                                            reconnectFrozen ||
+                                                            adapterHandoffPending) &&
                                                             visibleReconnectContent.length === 0 &&
                                                             reconnectContent.length === 0 &&
                                                             reconnectActivityContent.length > 0 && (_jsx(MessageScrollerItem, { children: _jsx(ReconnectStreamMessage, { content: reconnectActivityContent }) })), showRunningInUI && (_jsx(MessageScrollerItem, { children: _jsx(RunningActivityStatus, { label: runningStatusLabel }) })), queuedMessages
@@ -2920,9 +3127,9 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                             isRunning,
                                                             requestedIntent: options?.intent,
                                                         }), undefined, true)
-                                                        : undefined, onSlashCommand: onSlashCommand, onBeforeSubmit: ensureAgentEngineReadyForSubmit, execMode: execMode, onExecModeChange: onExecModeChange, planModeDisabled: planModeDisabled, planModeDisabledReason: planModeDisabledReason, selectedModel: selectedModel ?? defaultModel, selectedEffort: selectedEffort, availableModels: availableModels, onModelChange: onModelChange, onEffortChange: onEffortChange, imageModelMenu: imageModelMenu, onConnectProvider: onConnectProvider, toolbarSlot: composerToolbarSlot, contextItems: composerContextItems, onRemoveContextItem: removeComposerContextItem, plusMenuMode: plusMenuMode, layoutVariant: composerLayoutVariant, providerConnectStatusEnabled: providerStatusChecksEnabled, draftScope: threadId || tabId, interceptBuildRequestsForBuilder: true, onAttachmentError: setComposerError, extraActionButton: contextXRayEnabled ||
+                                                        : undefined, onSlashCommand: onSlashCommand, execMode: execMode, onExecModeChange: onExecModeChange, planModeDisabled: planModeDisabled, planModeDisabledReason: planModeDisabledReason, selectedModel: selectedModel ?? defaultModel, selectedEffort: selectedEffort, availableModels: availableModels, onModelChange: onModelChange, onEffortChange: onEffortChange, imageModelMenu: imageModelMenu, onConnectProvider: onConnectProvider, toolbarSlot: composerToolbarSlot, contextItems: composerContextItems, onRemoveContextItem: removeComposerContextItem, plusMenuMode: plusMenuMode, layoutVariant: composerLayoutVariant, providerConnectStatusEnabled: providerStatusChecksEnabled, draftScope: threadId || tabId, interceptBuildRequestsForBuilder: true, onAttachmentError: setComposerError, extraActionButton: contextXRayEnabled ||
                                                         composerExtraActionButton ||
-                                                        showRunningInUI ? (_jsxs(_Fragment, { children: [contextXRayEnabled && (_jsx(ContextMeter, { threadId: threadId })), composerExtraActionButton, showRunningInUI && (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", onClick: stopActiveRun, className: "shrink-0 flex h-7 w-7 items-center justify-center rounded-md bg-muted text-foreground hover:bg-muted/80", children: _jsx(IconPlayerStop, { className: "h-3.5 w-3.5" }) }) }), _jsx(TooltipContent, { children: "Stop generating" })] }))] })) : undefined })] }), missingApiKey &&
+                                                        showRunningInUI ? (_jsxs(_Fragment, { children: [contextXRayEnabled && (_jsx(ContextMeter, { threadId: threadId })), composerExtraActionButton, showRunningInUI && (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", onClick: () => stopActiveRun(), className: "shrink-0 flex h-7 w-7 items-center justify-center rounded-md bg-muted text-foreground hover:bg-muted/80", children: _jsx(IconPlayerStop, { className: "h-3.5 w-3.5" }) }) }), _jsx(TooltipContent, { children: "Stop generating" })] }))] })) : undefined })] }), missingApiKey &&
                                             !authError &&
                                             !missingApiKeySetupAboveComposer ? (_jsx("div", { className: "agent-composer-setup-card", "data-agent-composer-setup-position": "below", children: _jsx(BuilderSetupCard, { onConnected: handleBuilderConnected, bouncePulse: missingKeyBouncePulse, layout: missingApiKeySetupLayout }) })) : null] })] }) }) }) }) }) }));
 });