@agent-native/core 0.154.4 → 0.155.0

package/dist/client/AssistantChat.js

@@ -35,6 +35,7 @@ import { GuidedQuestionFlow, useGuidedQuestionFlow, } from "./guided-questions.j
 import { buildSignInReturnHref } from "./require-session.js";
 import { addMcpConnectionCompleteListener, consumeMcpConnectionResume, } from "./resources/mcp-connection-resume.js";
 import { McpConnectionSuggestion } from "./resources/McpConnectionSuggestion.js";
+import { claimRunStream, createRunStreamToken, ownsRunStream, releaseRunStream, } from "./run-stream-ownership.js";
 import { AgentAutoContinueSignal, readSSEStreamRaw, settleInterruptedToolCalls, } from "./sse-event-processor.js";
 import { useAgentEngineConfigured } from "./use-agent-engine-configured.js";
 import { useDevMode } from "./use-dev-mode.js";
@@ -786,6 +787,27 @@ function trimReconnectTextAlreadyRendered(content, renderedAssistantText, option
     }
     return changed ? next : content;
 }
+/**
+ * Whether the reconnect overlay — a SECOND fold of a run, rendered as a sibling
+ * of the message list — may appear.
+ *
+ * The adapter runtime and the reconnect reader both fold the same SSE events
+ * into their own accumulator. Whenever both are on screen the user sees the
+ * turn twice: duplicate tool cards (one spinning, one static) and the final
+ * message streaming in two places. Content-similarity dedupe cannot reliably
+ * hide the second copy, because the two readers disagree on tool-call identity
+ * (id-less activity cards get reader-local ids) and on how a turn is split
+ * across assistant messages.
+ *
+ * So ownership decides visibility, not similarity: if a runtime owns the turn,
+ * the overlay does not render. Keep this a pure function — it is the invariant
+ * the duplicate-render bug kept violating, and it must stay falsifiable.
+ */
+export function shouldShowReconnectOverlay(state) {
+    if (state.isRuntimeRunning)
+        return false;
+    return state.isReconnecting || state.reconnectFrozen;
+}
 export function dedupeReconnectContentAgainstMessages(content, messages, options) {
     if (content.length === 0)
         return content;
@@ -1605,7 +1627,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     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 reconnectTurnIdRef = useRef(null);
     const reconnectTailOnlyRef = useRef(false);
@@ -1624,7 +1645,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         setIsReconnecting(false);
         setReconnectFrozen(false);
         setReconnectContent([]);
-        setAdapterHandoffPending(false);
         setPendingReconnectRecovery(null);
         resetRunningActivity();
     }, [resetRunningActivity]);
@@ -1702,14 +1722,9 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         isReconnecting,
         hasReconnectContent: reconnectContent.length > 0,
     });
-    const reconnectActivityContent = useMemo(() => isReconnecting || reconnectFrozen || adapterHandoffPending
+    const reconnectActivityContent = useMemo(() => isReconnecting || reconnectFrozen
         ? reconnectActivityFallbackContent(runningActivityTool)
-        : [], [
-        adapterHandoffPending,
-        isReconnecting,
-        reconnectFrozen,
-        runningActivityTool,
-    ]);
+        : [], [isReconnecting, reconnectFrozen, runningActivityTool]);
     const lastBroadcastRunningRef = useRef(isRunning);
     const tiptapRef = useRef(null);
     const focusComposerAfterConnectRef = useRef(false);
@@ -2010,6 +2025,13 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         if (isRuntimeRunningRef.current || isAutoResumingRef.current) {
             return false;
         }
+        // The refs above lag a render and are per-component-instance, while
+        // MultiTabAssistantChat mounts several instances against one run. The
+        // claim is the actual mutual exclusion: module-scoped, synchronous, and
+        // re-checked on every state write below.
+        const ownershipToken = createRunStreamToken(`reconnect:${runId}`);
+        if (!claimRunStream(threadId, runId, ownershipToken))
+            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
@@ -2050,7 +2072,6 @@ 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 },
@@ -2197,7 +2218,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                         requestAnimationFrame(() => {
                             rafPending = false;
                             if (!reconnectOwnerMountedRef.current ||
-                                reconnectRunIdRef.current !== runId) {
+                                reconnectRunIdRef.current !== runId ||
+                                !ownsRunStream(threadId, runId, ownershipToken)) {
                                 return;
                             }
                             setReconnectContent(latestSnapshot);
@@ -2205,9 +2227,14 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     };
                     try {
                         await readSSEStreamRaw(sseRes.body, content, toolCallCounter, tabId, scheduleUpdate, (seq, isProgress) => {
+                            // The adapter can preempt this reader mid-stream. Advancing
+                            // the cursor after that would move a run this reader no
+                            // longer represents.
+                            if (!ownsRunStream(threadId, runId, ownershipToken))
+                                return;
                             markReconnectProgress();
                             reconnectRetryCount = 0;
-                            updateActiveRunSeq(seq, isProgress);
+                            updateActiveRunSeq(threadId, runId, seq, isProgress);
                         }, { preparingActionState });
                         if (reconnectAfterSeq === 0) {
                             setReconnectContent([...content]);
@@ -2255,6 +2282,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                 threadPollEngine?.stop();
                 watchdog.stop();
                 clearInterval(idleCheck);
+                releaseRunStream(threadId, runId, ownershipToken);
             }
             // A newer reader, live adapter, stop action, or component unmount took
             // ownership while this async loop was unwinding. Do not let the stale
@@ -3192,11 +3220,14 @@ 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). 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.
+            // started or an adopted run resumed), so it is now the only owner of this
+            // turn's rendering. The overlay used to be kept alive here for up to
+            // 2500ms so the UI would not flash a gap — but that deliberately put two
+            // independent folds of the same run on screen at once, and the only thing
+            // hiding the second was content-similarity guessing that fails whenever
+            // the two readers disagree (id-less activity cards, a turn split across
+            // several assistant messages). One owner, one surface: drop the overlay.
             if (reconnectRunIdRef.current !== null) {
-                const keepOverlay = reconnectContent.length > 0;
                 reconnectRunIdRef.current = null;
                 reconnectAbortRef.current?.abort();
                 reconnectAbortRef.current = null;
@@ -3204,56 +3235,18 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                 setReconnectFrozen(false);
                 reconnectCanMaterializeRef.current = false;
                 reconnectTailOnlyRef.current = false;
-                if (keepOverlay) {
-                    setAdapterHandoffPending(true);
-                }
-                else {
-                    setReconnectContent([]);
-                    setAdapterHandoffPending(false);
-                }
+                setReconnectContent([]);
             }
             else if (reconnectFrozen) {
                 setReconnectFrozen(false);
                 setReconnectContent([]);
-                setAdapterHandoffPending(false);
                 reconnectCanMaterializeRef.current = false;
             }
             if (forceStopped) {
                 setForceStopped(false);
             }
         }
-    }, [
-        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, {
-            suppressToolRepeats: true,
-            trimTailTextOverlap: true,
-        }).length > 0;
-        if (!stillNeeded) {
-            setReconnectContent([]);
-            setAdapterHandoffPending(false);
-            return;
-        }
-        const timer = window.setTimeout(() => {
-            setReconnectContent([]);
-            setAdapterHandoffPending(false);
-        }, 2500);
-        return () => window.clearTimeout(timer);
-    }, [adapterHandoffPending, isRuntimeRunning, messages, reconnectContent]);
+    }, [isRuntimeRunning, reconnectFrozen, forceStopped]);
     // Same transition guard for isReconnecting: only clear forceStopped on
     // the false→true edge (a new reconnect starting on page load).
     const prevIsReconnectingRef = useRef(isReconnecting);
@@ -3270,7 +3263,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         if (!reconnectCanMaterializeRef.current) {
             setReconnectFrozen(false);
             setReconnectContent([]);
-            setAdapterHandoffPending(false);
             return;
         }
         try {
@@ -3316,7 +3308,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             threadRuntime.import(ensureMessageMetadata(repo));
             setReconnectFrozen(false);
             setReconnectContent([]);
-            setAdapterHandoffPending(false);
             reconnectCanMaterializeRef.current = false;
             reconnectTurnIdRef.current = null;
         }
@@ -3453,7 +3444,6 @@ 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;
@@ -3844,8 +3834,19 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         // an ahead-of-the-thread reconnect copy visible creates the familiar
         // two-card stack while the adapter catches up, so prefer one row and
         // let the live message advance in place.
-        suppressToolRepeats: adapterHandoffPending || isReconnecting || reconnectFrozen,
-        trimTailTextOverlap: adapterHandoffPending || reconnectTailOnlyRef.current,
+        suppressToolRepeats: isReconnecting || reconnectFrozen,
+        trimTailTextOverlap: reconnectTailOnlyRef.current,
+    });
+    // The reconnect overlay is a SECOND fold of the same run, rendered as a
+    // sibling of the message list. It may only appear while no adapter runtime
+    // owns the turn. Deriving it from `isRuntimeRunning` at render time — rather
+    // than relying on an effect to clear the overlay's own flags afterwards —
+    // is what makes two streaming copies structurally impossible instead of
+    // merely unlikely; the effect below runs a frame too late to prevent it.
+    const showReconnectOverlay = shouldShowReconnectOverlay({
+        isRuntimeRunning,
+        isReconnecting,
+        reconnectFrozen,
     });
     const latestMessage = messages[messages.length - 1];
     const reconnectStatusContent = visibleReconnectContent.length > 0
@@ -4039,7 +4040,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         getApprovalResolution,
         onApprovalResolved: recordApprovalResolution,
         onApprove: (approvalKey) => {
-            void addToQueue("Approved. Go ahead and run the requested action.", undefined, undefined, undefined, undefined, "queued", undefined, false, false, false, false, undefined, [approvalKey]);
+            void addToQueue("Approved. Go ahead and run the requested action.", undefined, undefined, undefined, undefined, "queued", undefined, false, false, false, true, // hideUserMessage: this is a protocol continuation, not a new prompt
+            undefined, [approvalKey]);
         },
         ...(approvalActions?.onDeny ? { onDeny: approvalActions.onDeny } : {}),
         ...(approvalActions?.onAlwaysAllow
@@ -4126,12 +4128,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                                 setDismissedRunErrorKey(visibleRunErrorKey);
                                                                                             }
                                                                                             setRunErrorInfo(null);
-                                                                                        } }) })), (isReconnecting ||
-                                                                                    reconnectFrozen ||
-                                                                                    adapterHandoffPending) &&
-                                                                                    visibleReconnectContent.length > 0 && (_jsx(MessageScrollerItem, { children: _jsx(ReconnectStreamMessage, { content: visibleReconnectContent, allowActivitySpinner: !reconnectFrozen }) })), (isReconnecting ||
-                                                                                    reconnectFrozen ||
-                                                                                    adapterHandoffPending) &&
+                                                                                        } }) })), showReconnectOverlay &&
+                                                                                    visibleReconnectContent.length > 0 && (_jsx(MessageScrollerItem, { children: _jsx(ReconnectStreamMessage, { content: visibleReconnectContent, allowActivitySpinner: !reconnectFrozen }) })), showReconnectOverlay &&
                                                                                     visibleReconnectContent.length === 0 &&
                                                                                     reconnectContent.length === 0 &&
                                                                                     reconnectActivityContent.length > 0 && (_jsx(MessageScrollerItem, { children: _jsx(ReconnectStreamMessage, { content: reconnectActivityContent, allowActivitySpinner: !reconnectFrozen }) })), showGlobalRunningStatus && (_jsx(MessageScrollerItem, { children: _jsx(RunningActivityStatus, { label: runningStatusLabel }) })), visibleQueuedMessages.length > 0 && (_jsx(MessageScrollerItem, { children: _jsxs("div", { className: "flex items-center justify-end gap-1.5 pr-0.5 text-xs text-muted-foreground", children: [_jsx(IconClock, { className: "h-3 w-3" }), _jsxs("span", { children: [visibleQueuedMessages.length, " ", "queued"] })] }) })), visibleQueuedMessages.map((msg) => {

package/dist/client/active-run-state.d.ts

@@ -17,11 +17,24 @@ export interface PendingTurnState {
 }
 export declare function setActiveRun(state: ActiveRunState): void;
 export declare function getActiveRun(): ActiveRunState | null;
-export declare function updateActiveRunSeq(seq: number, isProgress?: boolean): void;
+/**
+ * Advance one run's resume cursor. Identity is required: the previous
+ * signature took only `seq` and wrote into whichever run happened to occupy
+ * the shared slot, so a second concurrent run silently corrupted the first
+ * run's cursor. An unknown run is ignored rather than created — a cursor with
+ * no matching stream is indistinguishable from a real one at replay time.
+ */
+export declare function updateActiveRunSeq(threadId: string, runId: string, seq: number, isProgress?: boolean): void;
 /** Whether this browser has received real progress for the matching run recently. */
 export declare function hasRecentActiveRunProgress(threadId: string | null | undefined, runId: string | null | undefined, thresholdMs: number, now?: number): boolean;
 export declare function updateActiveRunActivity(toolName: string | null | undefined): void;
 export declare function getActiveRunActivityTool(threadId: string, runId: string): string | null;
+/**
+ * Drop the focused-run pointer. The run's resume cursor is intentionally kept:
+ * callers fire this from many unrelated teardown paths, and deleting the
+ * cursor here is what previously made a later reconnect replay the run from
+ * its first event.
+ */
 export declare function clearActiveRun(): void;
 export declare function clearActiveRunIfMatches(threadId: string, runId: string): void;
 export declare function setPendingTurn(state: PendingTurnState): void;

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

@@ -6,6 +6,7 @@ import { getOrCreateAnalyticsSessionId } from "./analytics-session.js";
 import { captureError } from "./analytics.js";
 import { agentNativePath } from "./api-path.js";
 import { formatChatErrorText, normalizeChatError } from "./error-format.js";
+import { createRunStreamToken, preemptRunStream, releaseRunStream, } from "./run-stream-ownership.js";
 import { AgentAutoContinueSignal, INTERRUPTED_TOOL_RESULT, appendMissingFinalResponseWarning, readSSEStream, settleInterruptedToolCalls, } from "./sse-event-processor.js";
 import { isDelegatedAgentToolCall, isToolCallInFlight, } from "./tool-display.js";
 const TEXT_ATTACHMENT_CONTENT_TYPES = new Set([
@@ -1006,6 +1007,26 @@ function snapshotContent(content) {
         ? { ...part }
         : { ...part, args: { ...part.args } });
 }
+function hasMissingFinalResponseAfterTool(content) {
+    const warning = appendMissingFinalResponseWarning(snapshotContent(content));
+    return warning?.errorCode === "final_response_missing_after_tool";
+}
+function missingFinalResponseWarningFromResult(result) {
+    const metadata = result.metadata;
+    const custom = metadata?.custom;
+    if (!custom || typeof custom !== "object")
+        return null;
+    const warning = custom.runWarning;
+    if (!warning || typeof warning !== "object")
+        return null;
+    const warningRecord = warning;
+    if (warningRecord.errorCode !== "final_response_missing_after_tool") {
+        return null;
+    }
+    return {
+        message: typeof warningRecord.message === "string" ? warningRecord.message : "",
+    };
+}
 function stableJson(value) {
     try {
         return JSON.stringify(value);
@@ -1618,7 +1639,19 @@ export function createAgentChatAdapter(options) {
                         activeRun.threadId === threadId &&
                         activeRun.runId === runId));
             };
+            // The adapter's own stream outranks AssistantChat's reconnect fallback:
+            // when it attaches to a run, any reconnect reader folding the same run
+            // must stop writing UI state or both folds render at once.
+            const streamOwnershipToken = createRunStreamToken(`adapter:${turnId}`);
+            const takeRunStreamOwnership = () => {
+                if (threadId && runId) {
+                    preemptRunStream(threadId, runId, streamOwnershipToken);
+                }
+            };
             const settleTerminalChatRun = () => {
+                if (threadId && runId) {
+                    releaseRunStream(threadId, runId, streamOwnershipToken);
+                }
                 if (!ownsActiveRunState())
                     return;
                 if (threadId && runId) {
@@ -1972,10 +2005,12 @@ export function createAgentChatAdapter(options) {
                                 break;
                             }
                             updateCurrentRunDispatchMode(reconnectRes.headers.get("X-Dispatch-Mode"));
+                            takeRunStreamOwnership();
                             for await (const result of readSSEStream(reconnectRes.body, content, toolCallCounter, tabId, (seq, isProgress) => {
                                 rememberRunSeq(seq);
-                                if (threadId)
-                                    updateActiveRunSeq(seq, isProgress);
+                                if (threadId && runId) {
+                                    updateActiveRunSeq(threadId, runId, seq, isProgress);
+                                }
                             }, runId, currentSSEOptions())) {
                                 const nextResult = withRequestModeMetadata(result);
                                 if (isTerminalChatModelRunResult(nextResult)) {
@@ -2311,20 +2346,45 @@ export function createAgentChatAdapter(options) {
                         }
                         attached = true;
                         updateCurrentRunDispatchMode(eventsRes.headers.get("X-Dispatch-Mode"));
+                        takeRunStreamOwnership();
+                        let missingFinalResponseResult = null;
                         for await (const result of readSSEStream(eventsRes.body, content, toolCallCounter, tabId, (seq, isProgress) => {
                             rememberRunSeq(seq);
-                            if (threadId)
-                                updateActiveRunSeq(seq, isProgress);
+                            if (threadId && runId) {
+                                updateActiveRunSeq(threadId, runId, seq, isProgress);
+                            }
                         }, runId, currentSSEOptions({
                             noProgressTimeoutMs: BACKGROUND_FOLLOW_ATTACH_WATCHDOG_MS,
                             actionPreparationStallTimeoutMs: BACKGROUND_FOLLOW_ATTACH_WATCHDOG_MS,
                         }))) {
                             const nextResult = withRequestModeMetadata(result);
+                            if (isDurableBackgroundDispatch() &&
+                                missingFinalResponseWarningFromResult(nextResult)) {
+                                missingFinalResponseResult = nextResult;
+                                continue;
+                            }
                             if (isTerminalChatModelRunResult(nextResult)) {
                                 settleTerminalChatRun();
                             }
                             yield nextResult;
                         }
+                        if (missingFinalResponseResult) {
+                            const warning = missingFinalResponseWarningFromResult(missingFinalResponseResult);
+                            const lastContentPart = content.at(-1);
+                            if (warning?.message &&
+                                lastContentPart?.type === "text" &&
+                                lastContentPart.text === warning.message) {
+                                content.pop();
+                            }
+                            if (continueAfterMissingFinalResponse()) {
+                                await delay(250, abortSignal);
+                                return "client_continue";
+                            }
+                            settleTerminalChatRun();
+                            yield missingFinalResponseResult;
+                            clearActiveRun();
+                            return "completed";
+                        }
                         // readSSEStream returned normally: a terminal done/error was
                         // consumed and rendered — the turn is over.
                         clearActiveRun();
@@ -2614,6 +2674,11 @@ export function createAgentChatAdapter(options) {
                                         continue;
                                     }
                                 }
+                                if (hasMissingFinalResponseAfterTool(content) &&
+                                    continueAfterMissingFinalResponse()) {
+                                    await delay(250, abortSignal);
+                                    return "client_continue";
+                                }
                                 yield* emitBackgroundTerminalOutcome(active);
                                 return "completed";
                             }
@@ -2642,6 +2707,9 @@ export function createAgentChatAdapter(options) {
                             }
                             const seqBeforeAttach = lastSeq;
                             const attach = yield* followAttachOnce();
+                            if (attach === "client_continue") {
+                                return "client_continue";
+                            }
                             if (attach === "completed" || attach === "aborted") {
                                 return "completed";
                             }
@@ -2964,6 +3032,17 @@ export function createAgentChatAdapter(options) {
                         nonAdvancing: !advanced,
                     };
                 };
+                const continueAfterMissingFinalResponse = () => {
+                    const continuation = prepareAutoContinuation(new AgentAutoContinueSignal({ reason: "stream_ended" }));
+                    if (!continuation.ok)
+                        return false;
+                    if (typeof window !== "undefined") {
+                        window.dispatchEvent(new CustomEvent("agent-chat:auto-continue", {
+                            detail: { tabId },
+                        }));
+                    }
+                    return true;
+                };
                 while (true) {
                     try {
                         runId = null;
@@ -3221,18 +3300,41 @@ export function createAgentChatAdapter(options) {
                             clearPendingTurnIfMatches(threadId, turnId);
                             setActiveRun({ threadId, runId, turnId, lastSeq: -1 });
                         }
+                        takeRunStreamOwnership();
+                        let missingFinalResponseResult = null;
                         for await (const result of readSSEStream(res.body, content, toolCallCounter, tabId, (seq, isProgress) => {
                             rememberRunSeq(seq);
                             if (runId && threadId) {
-                                updateActiveRunSeq(seq, isProgress);
+                                updateActiveRunSeq(threadId, runId, seq, isProgress);
                             }
                         }, runId, currentSSEOptions())) {
                             const nextResult = withRequestModeMetadata(result);
+                            if (isDurableBackgroundDispatch() &&
+                                missingFinalResponseWarningFromResult(nextResult)) {
+                                missingFinalResponseResult = nextResult;
+                                continue;
+                            }
                             if (isTerminalChatModelRunResult(nextResult)) {
                                 settleTerminalChatRun();
                             }
                             yield nextResult;
                         }
+                        if (isDurableBackgroundDispatch() && missingFinalResponseResult) {
+                            const warning = missingFinalResponseWarningFromResult(missingFinalResponseResult);
+                            const lastContentPart = content.at(-1);
+                            if (warning?.message &&
+                                lastContentPart?.type === "text" &&
+                                lastContentPart.text === warning.message) {
+                                content.pop();
+                            }
+                            if (continueAfterMissingFinalResponse()) {
+                                continue;
+                            }
+                            settleTerminalChatRun();
+                            yield missingFinalResponseResult;
+                            clearActiveRun();
+                            return;
+                        }
                         // Run completed normally — clear active run state
                         clearActiveRun();
                         return;

package/dist/client/analytics.js

@@ -1030,6 +1030,12 @@ function exceptionEventProperties(event) {
         ...(event.extra ? { exceptionExtra: event.extra } : {}),
     };
 }
+function amplitudeEventProperties(name, properties) {
+    if (name !== AGENT_NATIVE_EXCEPTION_EVENT_NAME)
+        return properties;
+    const { exceptionTags: _exceptionTags, exceptionExtra: _exceptionExtra, ...stableProperties } = properties;
+    return stableProperties;
+}
 /**
  * Resolve browser PostHog config, or `undefined` when error capture should not
  * reach PostHog. Reads the SSR-injected shell config first, then Vite env for
@@ -1557,13 +1563,14 @@ export function trackEvent(name, params) {
         return;
     ensureSentry();
     const props = resolveProps(name, params);
+    const amplitudeProps = amplitudeEventProperties(name, props);
     window.gtag?.("event", name.replace(/\s+/g, "_"), props);
     if (ensureAmplitude()) {
-        _amplitudeModule?.track(name, props);
+        _amplitudeModule?.track(name, amplitudeProps);
     }
     else if (_amplitudeApiKey) {
         if (_pendingAmplitudeEvents.length < 100) {
-            _pendingAmplitudeEvents.push([name, props]);
+            _pendingAmplitudeEvents.push([name, amplitudeProps]);
         }
     }
     sendAgentNativeAnalytics(name, props);

package/dist/client/chat/tool-call-display.js

@@ -258,19 +258,19 @@ function ApprovalAffordance({ toolName, toolCallId, approval, }) {
     if (resolution === "denied") {
         return (_jsxs("div", { className: "mt-1.5 text-xs text-muted-foreground", children: ["Denied. ", toolName, " did not run."] }));
     }
-    return (_jsxs("div", { className: "mt-1.5 flex items-center gap-2 rounded-md border border-border bg-muted/40 px-2.5 py-1.5", children: [_jsx(IconShieldCheck, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" }), _jsxs("span", { className: "mr-auto text-xs text-muted-foreground", children: ["Approve to run ", toolName, "?"] }), ctx && (_jsxs("button", { type: "button", onClick: () => {
+    return (_jsxs("div", { className: "mt-1.5 flex min-w-0 flex-wrap items-center gap-2 rounded-md border border-border bg-muted/40 px-2.5 py-1.5", children: [_jsx(IconShieldCheck, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" }), _jsxs("span", { className: "min-w-0 flex-1 text-xs text-muted-foreground", children: ["Approve to run ", toolName, "?"] }), ctx && (_jsxs("button", { type: "button", onClick: () => {
                     setLocalResolution("approved");
                     ctx.onApprovalResolved?.(approval.approvalKey, "approved", toolCallId);
                     ctx.onApprove(approval.approvalKey);
-                }, className: cn("inline-flex items-center gap-1 rounded-md px-2.5 py-1 text-xs font-medium transition-colors", "bg-foreground text-background hover:bg-foreground/90"), children: [_jsx(IconCheck, { className: "h-3.5 w-3.5" }), "Approve"] })), ctx?.onAlwaysAllow && (_jsxs("button", { type: "button", onClick: () => {
+                }, className: cn("inline-flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1 text-xs font-medium transition-colors", "bg-foreground text-background hover:bg-foreground/90"), children: [_jsx(IconCheck, { className: "h-3.5 w-3.5" }), "Approve"] })), ctx?.onAlwaysAllow && (_jsxs("button", { type: "button", onClick: () => {
                     setLocalResolution("approved");
                     ctx.onApprovalResolved?.(approval.approvalKey, "approved", toolCallId);
                     ctx.onAlwaysAllow?.(approval.approvalKey);
-                }, title: "Approve and always allow this exact command", className: cn("inline-flex items-center gap-1 rounded-md border border-border px-2.5 py-1 text-xs font-medium transition-colors", "text-foreground hover:bg-muted"), children: [_jsx(IconShieldCheck, { className: "h-3.5 w-3.5" }), "Always allow"] })), _jsxs("button", { type: "button", onClick: () => {
+                }, title: "Approve and always allow this exact command", className: cn("inline-flex shrink-0 items-center gap-1 rounded-md border border-border px-2.5 py-1 text-xs font-medium transition-colors", "text-foreground hover:bg-muted"), children: [_jsx(IconShieldCheck, { className: "h-3.5 w-3.5" }), "Always allow"] })), _jsxs("button", { type: "button", onClick: () => {
                     setLocalResolution("denied");
                     ctx?.onApprovalResolved?.(approval.approvalKey, "denied", toolCallId);
                     ctx?.onDeny?.(approval.approvalKey);
-                }, className: cn("inline-flex items-center gap-1 rounded-md border border-border px-2.5 py-1 text-xs font-medium transition-colors", "text-foreground hover:bg-muted"), children: [_jsx(IconX, { className: "h-3.5 w-3.5" }), "Deny"] })] }));
+                }, className: cn("inline-flex shrink-0 items-center gap-1 rounded-md border border-border px-2.5 py-1 text-xs font-medium transition-colors", "text-foreground hover:bg-muted"), children: [_jsx(IconX, { className: "h-3.5 w-3.5" }), "Deny"] })] }));
 }
 // ─── ToolCallDisplay ──────────────────────────────────────────────────────────
 export function ToolCallDisplay({ toolName, toolCallId, argsText, args, result, mcpApp, chatUI, isRunning, outcome, structuredMeta, activity, approval, repeatCount, isLatestRunning = isRunning, isActiveTail, }) {

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

@@ -5,6 +5,11 @@ import { memo, useMemo, useState } from "react";
 import { orderChatFirstAppIds, readChatFirstAppLayout, writeChatFirstAppLayout, } from "../chat-first.js";
 import { cn } from "../utils.js";
 import { defaultChatFirstCopy } from "./copy.js";
+function ChatFirstRailAppIcon({ app, activeAppId, renderIcon, }) {
+    const isActive = activeAppId !== undefined && activeAppId === app.id;
+    const isInactive = activeAppId !== undefined && !isActive;
+    return (_jsx("span", { "data-chat-first-app-icon": true, className: cn("transition-[filter]", isInactive && "grayscale"), children: renderIcon(app, { isActive, isInactive }) }));
+}
 function AppRows({ apps, activeAppId, layout, onDragStart, onDrop, onDragEnd, onOpenApp, onRemoveApp, onTogglePinned, onMove, renderIcon, copy, }) {
     const orderedIds = orderChatFirstAppIds(apps.map((app) => app.id), layout);
     const appsById = new Map(apps.map((app) => [app.id, app]));
@@ -16,7 +21,7 @@ function AppRows({ apps, activeAppId, layout, onDragStart, onDrop, onDragEnd, on
             const pinned = layout.pinnedIds.includes(app.id);
             const index = orderedApps.indexOf(app);
             return (_jsxs(ContextMenu, { children: [_jsx(ContextMenuTrigger, { asChild: true, children: _jsxs("li", { draggable: true, "data-chat-first-app": true, "data-app-id": app.id, className: cn("group flex h-8 w-full min-w-0 items-center gap-1 rounded-md px-0 text-sm", active
-                                ? "bg-sidebar-accent font-medium text-sidebar-accent-foreground"
+                                ? "font-medium text-sidebar-foreground"
                                 : "text-sidebar-foreground/75 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"), onDragStart: (event) => {
                                 event.dataTransfer.effectAllowed = "move";
                                 onDragStart(app.id);
@@ -31,7 +36,7 @@ function AppRows({ apps, activeAppId, layout, onDragStart, onDrop, onDragEnd, on
                                             event.preventDefault();
                                             onMove(app.id, 1);
                                         }
-                                    }, "aria-keyshortcuts": "Alt+ArrowUp Alt+ArrowDown", "aria-label": copy("openApp", { name: app.name }), children: [renderIcon(app), _jsx("span", { className: "truncate", children: app.name })] }), _jsx("button", { type: "button", className: cn("flex size-6 shrink-0 items-center justify-center rounded text-sidebar-foreground/45 opacity-0 hover:bg-sidebar-accent hover:text-sidebar-foreground group-hover:opacity-100 focus-visible:opacity-100", pinned && "text-sidebar-foreground/70 opacity-100"), "aria-label": copy(pinned ? "unpinApp" : "pinApp", {
+                                    }, "aria-keyshortcuts": "Alt+ArrowUp Alt+ArrowDown", "aria-label": copy("openApp", { name: app.name }), children: [_jsx(ChatFirstRailAppIcon, { app: app, activeAppId: activeAppId, renderIcon: renderIcon }), _jsx("span", { className: "truncate", children: app.name })] }), _jsx("button", { type: "button", className: cn("flex size-6 shrink-0 items-center justify-center rounded text-sidebar-foreground/45 opacity-0 hover:bg-sidebar-accent hover:text-sidebar-foreground group-hover:opacity-100 focus-visible:opacity-100", pinned && "text-sidebar-foreground/70 opacity-100"), "aria-label": copy(pinned ? "unpinApp" : "pinApp", {
                                         name: app.name,
                                     }), "aria-pressed": pinned, onClick: () => onTogglePinned(app.id), children: _jsx(IconPin, { size: 13, strokeWidth: pinned ? 2.2 : 1.6, "aria-hidden": "true" }) }), _jsx("span", { className: "sr-only", children: `${index + 1} of ${orderedApps.length}` })] }) }), _jsxs(ContextMenuContent, { children: [_jsxs(ContextMenuItem, { onSelect: () => onTogglePinned(app.id), children: [_jsx(IconPin, { size: 14, "aria-hidden": "true" }), pinned ? copy("removePinned") : copy("pinTop")] }), _jsx(ContextMenuSeparator, {}), _jsxs(ContextMenuItem, { disabled: index === 0, onSelect: () => onMove(app.id, -1), children: [_jsx(IconChevronUp, { size: 14, "aria-hidden": "true" }), copy("moveUp")] }), _jsxs(ContextMenuItem, { disabled: index === orderedApps.length - 1, onSelect: () => onMove(app.id, 1), children: [_jsx(IconChevronDown, { size: 14, "aria-hidden": "true" }), copy("moveDown")] }), onRemoveApp ? (_jsxs(_Fragment, { children: [_jsx(ContextMenuSeparator, {}), _jsxs(ContextMenuItem, { onSelect: () => onRemoveApp(app), className: "text-destructive focus:text-destructive", children: [_jsx(IconTrash, { size: 14, "aria-hidden": "true" }), copy("removeApp")] })] })) : null] })] }, app.id));
         }) }));
@@ -96,8 +101,8 @@ export const ChatFirstAppsRail = memo(function ChatFirstAppsRail({ apps, activeA
         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
                     ? [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
-                            ? "bg-sidebar-accent text-sidebar-accent-foreground"
-                            : "text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"), onClick: () => onOpenApp(app), "aria-label": copy("openApp", { name: app.name }), title: app.name, children: renderIcon(app) }, app.id))), onOpenAllApps ? (_jsx("button", { type: "button", "data-chat-first-all-apps": true, className: "flex size-9 items-center justify-center rounded-md text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground", onClick: onOpenAllApps, "aria-label": copy("allApps"), title: copy("allApps"), children: _jsx(IconApps, { size: 16, "aria-hidden": "true" }) })) : null, error ? (_jsx("span", { className: "size-1.5 rounded-full bg-destructive", title: error, "aria-label": error })) : null] }));
+                            ? "text-sidebar-foreground"
+                            : "text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"), onClick: () => onOpenApp(app), "aria-label": copy("openApp", { name: app.name }), title: app.name, children: _jsx(ChatFirstRailAppIcon, { app: app, activeAppId: activeAppId, renderIcon: renderIcon }) }, app.id))), onOpenAllApps ? (_jsx("button", { type: "button", "data-chat-first-all-apps": true, className: "flex size-9 items-center justify-center rounded-md text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground", onClick: onOpenAllApps, "aria-label": copy("allApps"), title: copy("allApps"), children: _jsx(IconApps, { size: 16, "aria-hidden": "true" }) })) : null, error ? (_jsx("span", { className: "size-1.5 rounded-full bg-destructive", title: error, "aria-label": error })) : null] }));
     }
     return (_jsxs("section", { "data-chat-first-apps-rail": true, className: "mt-3 px-2 pb-2 pt-2", "aria-label": copy("workspaceApps"), children: [_jsxs("div", { className: "mb-1 flex items-center gap-1.5 px-2 text-[11px] font-medium text-sidebar-foreground/50", children: [_jsx("span", { children: copy("workspaceApps") }), _jsx("span", { className: "ml-auto", children: createTrigger })] }), loading && apps.length === 0 ? (_jsx("div", { className: "space-y-0.5 px-2", children: [0, 1, 2].map((index) => (_jsx(Skeleton, { className: "h-8 w-full rounded-md" }, index))) })) : apps.length === 0 ? (_jsxs("div", { className: "px-2", children: [_jsx("p", { className: "text-xs text-sidebar-foreground/55", children: copy("noWorkspaceApps") }), createAppTrigger ? (createTrigger) : onCreateApp ? (_jsxs("button", { type: "button", className: "mt-1 inline-flex h-6 items-center gap-1.5 rounded-md border border-sidebar-border px-2 text-xs text-sidebar-foreground/75 hover:bg-sidebar-accent hover:text-sidebar-foreground", onClick: onCreateApp, children: [_jsx(IconPlus, { size: 13, "aria-hidden": "true" }), copy("createApp")] })) : (createTrigger)] })) : (_jsx(AppRows, { apps: visibleApps, activeAppId: activeAppId, layout: layout, onDragStart: setDraggedAppId, onDrop: reorderApps, onDragEnd: () => setDraggedAppId(null), onOpenApp: onOpenApp, onRemoveApp: onRemoveApp, onTogglePinned: togglePinned, onMove: moveApp, renderIcon: renderIcon, copy: copy })), hasMoreApps || showAllApps ? (_jsxs("button", { type: "button", className: "mt-0.5 flex h-8 w-full items-center gap-2 rounded-md px-2 text-xs text-sidebar-foreground/50 hover:bg-sidebar-accent hover:text-sidebar-foreground", onClick: () => setShowAllApps((value) => !value), children: [showAllApps ? (_jsx(IconChevronUp, { size: 14, "aria-hidden": "true" })) : (_jsx(IconChevronDown, { size: 14, "aria-hidden": "true" })), showAllApps ? copy("showLess") : copy("showMore")] })) : null, onOpenAllApps ? (_jsx("div", { className: "mt-1 border-t border-sidebar-border/60 pt-1", children: _jsxs("button", { type: "button", "data-chat-first-all-apps": true, className: "flex h-8 w-full items-center gap-2 rounded-md px-2 text-xs text-sidebar-foreground/55 hover:bg-sidebar-accent hover:text-sidebar-foreground", onClick: onOpenAllApps, children: [_jsx(IconApps, { size: 14, "aria-hidden": "true" }), _jsx("span", { children: copy("allApps") })] }) })) : null, error ? (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("button", { type: "button", className: "mt-1 flex items-center gap-1 px-2 text-[10px] text-destructive/80", onClick: onRetry, "aria-label": error, children: [_jsx("span", { className: "size-1.5 rounded-full bg-destructive" }), onRetry ? copy("retry") : copy("appsLoadError")] }) }), _jsx(TooltipContent, { side: "right", children: error })] })) : null] }));
 });

package/dist/client/chat-first/primary-nav.d.ts

@@ -1,11 +1,12 @@
 import type { ChatFirstCopy } from "./types.js";
 export type ChatFirstPrimaryTab = "new-chat" | "integrations" | "scheduled";
-export declare function ChatFirstPrimaryNavigation({ onNewChat, onOpenIntegrations, onOpenScheduled, onSearch, activeTab, stickyNewChat, copy, }: {
+export declare function ChatFirstPrimaryNavigation({ onNewChat, onOpenIntegrations, onOpenScheduled, onSearch, activeTab, collapsed, stickyNewChat, copy, }: {
     onNewChat?: () => void;
     onOpenIntegrations: () => void;
     onOpenScheduled: () => void;
     onSearch?: () => void;
     activeTab?: ChatFirstPrimaryTab;
+    collapsed?: boolean;
     stickyNewChat?: boolean;
     copy?: ChatFirstCopy;
 }): import("react").JSX.Element;