@agent-native/core 0.149.1 → 0.149.3

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

@@ -2,7 +2,13 @@ export declare const ACTIVE_RUN_STATE_EVENT = "agent-chat:active-run-state-chang
 export interface ActiveRunState {
     threadId: string;
     runId: string;
+    /** Stable logical-turn identity shared by continuation run IDs. */
+    turnId?: string;
     lastSeq: number;
+    /** Last SSE sequence classified as real work progress, not keepalive. */
+    lastProgressSeq?: number;
+    /** Browser time when the last real work-progress event was received. */
+    lastProgressObservedAt?: number;
     activityTool?: string | null;
 }
 export interface PendingTurnState {
@@ -11,7 +17,9 @@ export interface PendingTurnState {
 }
 export declare function setActiveRun(state: ActiveRunState): void;
 export declare function getActiveRun(): ActiveRunState | null;
-export declare function updateActiveRunSeq(seq: number): void;
+export declare function updateActiveRunSeq(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;
 export declare function clearActiveRun(): void;

package/dist/client/active-run-state.js

@@ -16,11 +16,24 @@ function normalizeActivityTool(toolName) {
     return tool || null;
 }
 export function setActiveRun(state) {
+    const previous = getActiveRun();
+    const sameRun = previous?.threadId === state.threadId && previous.runId === state.runId;
+    const nextState = sameRun
+        ? {
+            ...state,
+            turnId: state.turnId ?? previous.turnId,
+            // Reconnect/continuation writers replace the cursor object. Preserve
+            // the browser's real-progress proof across those writes so a healthy
+            // stream cannot be reclassified as stale by its own reconnect path.
+            lastProgressSeq: state.lastProgressSeq ?? previous.lastProgressSeq,
+            lastProgressObservedAt: state.lastProgressObservedAt ?? previous.lastProgressObservedAt,
+        }
+        : state;
     try {
-        sessionStorage.setItem(STORAGE_KEY, JSON.stringify(state));
+        sessionStorage.setItem(STORAGE_KEY, JSON.stringify(nextState));
     }
     catch { }
-    notifyActiveRunStateChanged(state);
+    notifyActiveRunStateChanged(nextState);
 }
 export function getActiveRun() {
     try {
@@ -33,13 +46,31 @@ export function getActiveRun() {
         return null;
     }
 }
-export function updateActiveRunSeq(seq) {
+export function updateActiveRunSeq(seq, isProgress = false) {
     const state = getActiveRun();
     if (state) {
         state.lastSeq = seq;
+        if (isProgress &&
+            seq >=
+                (Number.isFinite(state.lastProgressSeq) ? state.lastProgressSeq : -1)) {
+            state.lastProgressSeq = seq;
+            state.lastProgressObservedAt = Date.now();
+        }
         setActiveRun(state);
     }
 }
+/** Whether this browser has received real progress for the matching run recently. */
+export function hasRecentActiveRunProgress(threadId, runId, thresholdMs, now = Date.now()) {
+    const state = getActiveRun();
+    if (!state ||
+        !runId ||
+        state.runId !== runId ||
+        (threadId != null && state.threadId !== threadId) ||
+        typeof state.lastProgressObservedAt !== "number") {
+        return false;
+    }
+    return now - state.lastProgressObservedAt <= thresholdMs;
+}
 export function updateActiveRunActivity(toolName) {
     const state = getActiveRun();
     if (!state)

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.d.ts

@@ -17,6 +17,14 @@ export declare const BACKGROUND_FOLLOW_ATTACH_WATCHDOG_MS = 90000;
 export declare const BACKGROUND_FOLLOW_IDLE_TIMEOUT_MS = 210000;
 export declare const MAX_FOLLOWED_BACKGROUND_RUNS = 24;
 export declare const MAX_BACKGROUND_FOLLOW_WALL_TIME_MS: number;
+/**
+ * True when an action was streamed but never returned a result yet — i.e. a
+ * `tool_start` with no matching `tool_done`. The server is still executing it,
+ * so a run_timeout that fires in this window is NOT a stall: the agent was
+ * actively working and `foldAssistantTurn` persisted the in-flight call. We
+ * must not count this against the stalled/empty continuation budgets.
+ */
+export declare function hasInFlightToolCall(content: ContentPart[]): boolean;
 /**
  * Server truth for "does this run still look alive?", used to keep the client
  * from aborting a run the server believes is healthy — the destructive half of

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

@@ -1,7 +1,7 @@
 import { unwrapAttachmentEnvelope } from "@agent-native/toolkit/composer/pasted-text";
 import { actionPreparationContinuationNote } from "../agent/action-continuation-guidance.js";
 import { LLM_MISSING_CREDENTIALS_ERROR_CODE, LLM_MISSING_CREDENTIALS_MESSAGE, } from "../agent/engine/credential-errors.js";
-import { clearPendingTurnIfMatches, setActiveRun, updateActiveRunSeq, clearActiveRun, setPendingTurn, } from "./active-run-state.js";
+import { clearPendingTurnIfMatches, getActiveRun, setActiveRun, updateActiveRunSeq, clearActiveRun, clearActiveRunIfMatches, setPendingTurn, } from "./active-run-state.js";
 import { getOrCreateAnalyticsSessionId } from "./analytics-session.js";
 import { captureError } from "./analytics.js";
 import { agentNativePath } from "./api-path.js";
@@ -85,6 +85,19 @@ 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 } }));
+}
+function isTerminalChatModelRunResult(result) {
+    return (result.status?.type === "complete" || result.status?.type === "incomplete");
+}
 // ── Background follow mode ──────────────────────────────────────────────────
 // For server-continued runs (dispatchMode starts with "background" or equals
 // "foreground-self-chain") the SERVER normally chains continuation chunks
@@ -772,7 +785,7 @@ function continuationRepeatSignature(content) {
  * actively working and `foldAssistantTurn` persisted the in-flight call. We
  * must not count this against the stalled/empty continuation budgets.
  */
-function hasInFlightToolCall(content) {
+export function hasInFlightToolCall(content) {
     return content.some((part) => part.type === "tool-call" &&
         part.result === undefined &&
         part.activity !== true);
@@ -798,7 +811,10 @@ export async function activeRunLooksAlive(args) {
         if (data?.active !== true || String(data.runId ?? "") !== args.runId) {
             return false;
         }
-        return data.hasInFlightWork === true || data.status === "running";
+        // `running` only says the server row has not terminalized. It is not proof
+        // that a tool is executing, and treating it as proof skips the client
+        // rescue precisely when a stalled run has no in-flight work.
+        return data.hasInFlightWork === true;
     }
     catch {
         return true;
@@ -1402,9 +1418,14 @@ export function createAgentChatAdapter(options) {
             const engine = runConfigSelection("engine") ?? engineRef?.current;
             const effort = runConfigSelection("effort") ??
                 effortRef?.current;
+            const requestedTurnId = (() => {
+                const raw = runConfig?.custom && typeof runConfig.custom === "object"
+                    ? runConfig.custom.turnId
+                    : undefined;
+                return typeof raw === "string" && raw.trim() ? raw.trim() : undefined;
+            })();
+            const turnId = requestedTurnId ?? generateTurnId();
             const withRequestModeMetadata = (result) => {
-                if (!requestMode)
-                    return result;
                 const metadata = (result.metadata ?? {});
                 const custom = metadata.custom && typeof metadata.custom === "object"
                     ? metadata.custom
@@ -1413,7 +1434,11 @@ export function createAgentChatAdapter(options) {
                     ...result,
                     metadata: {
                         ...metadata,
-                        custom: { ...custom, requestMode },
+                        custom: {
+                            ...custom,
+                            turnId,
+                            ...(requestMode ? { requestMode } : {}),
+                        },
                     },
                 };
             };
@@ -1445,11 +1470,34 @@ export function createAgentChatAdapter(options) {
             }
             const content = [];
             const toolCallCounter = { value: 0 };
-            const turnId = generateTurnId();
             if (threadId)
                 setPendingTurn({ threadId, turnId });
             let runId = null;
             let lastSeq = -1;
+            const ownsActiveRunState = () => {
+                const activeRun = getActiveRun();
+                return (!activeRun ||
+                    (!!threadId &&
+                        !!runId &&
+                        activeRun.threadId === threadId &&
+                        activeRun.runId === runId));
+            };
+            const settleTerminalChatRun = () => {
+                if (!ownsActiveRunState())
+                    return;
+                if (threadId && runId) {
+                    clearActiveRunIfMatches(threadId, runId);
+                }
+                else {
+                    clearActiveRun();
+                }
+                if (typeof window === "undefined")
+                    return;
+                dispatchTerminalChatUiCleanup(tabId);
+                window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
+                    detail: { isRunning: false, tabId },
+                }));
+            };
             const seenRunSeqs = new Map();
             const preparingActionStatesByRun = new Map();
             let currentRunDispatchMode = null;
@@ -1696,6 +1744,7 @@ export function createAgentChatAdapter(options) {
                 return state;
             };
             const currentSSEOptions = (overrides = {}) => ({
+                markTerminalResults: true,
                 durableBackgroundRun: currentRunDispatchMode?.startsWith("background") === true,
                 ...(runId
                     ? { preparingActionState: preparingActionStateForRun(runId) }
@@ -1806,14 +1855,20 @@ export function createAgentChatAdapter(options) {
                                 break;
                             }
                             updateCurrentRunDispatchMode(reconnectRes.headers.get("X-Dispatch-Mode"));
-                            for await (const result of readSSEStream(reconnectRes.body, content, toolCallCounter, tabId, (seq) => {
+                            for await (const result of readSSEStream(reconnectRes.body, content, toolCallCounter, tabId, (seq, isProgress) => {
                                 rememberRunSeq(seq);
                                 if (threadId)
-                                    updateActiveRunSeq(seq);
+                                    updateActiveRunSeq(seq, isProgress);
                             }, runId, currentSSEOptions())) {
-                                yield withRequestModeMetadata(result);
+                                const nextResult = withRequestModeMetadata(result);
+                                if (isTerminalChatModelRunResult(nextResult)) {
+                                    settleTerminalChatRun();
+                                }
+                                yield nextResult;
+                            }
+                            if (ownsActiveRunState()) {
+                                clearActiveRun();
                             }
-                            clearActiveRun();
                             return true;
                         }
                         catch (reconnectErr) {
@@ -1834,7 +1889,7 @@ export function createAgentChatAdapter(options) {
                     }
                     return false;
                 };
-                const reconnectActiveRunForThread = async function* () {
+                const reconnectActiveRunForThread = async function* (options) {
                     if (!threadId)
                         return false;
                     let lastActiveRunError = null;
@@ -1855,6 +1910,9 @@ export function createAgentChatAdapter(options) {
                             if (active?.active && active.runId) {
                                 const activeRunId = String(active.runId);
                                 const activeTurnId = typeof active.turnId === "string" ? active.turnId : "";
+                                if (options?.requireCurrentTurn && activeTurnId !== turnId) {
+                                    return false;
+                                }
                                 if (!canAttachRun(activeRunId, activeTurnId)) {
                                     return false;
                                 }
@@ -1865,7 +1923,12 @@ export function createAgentChatAdapter(options) {
                                     attemptedRunIds.push(activeRunId);
                                 }
                                 reconnectCursorForRun(activeRunId, previousRunId);
-                                setActiveRun({ threadId, runId: activeRunId, lastSeq });
+                                setActiveRun({
+                                    threadId,
+                                    runId: activeRunId,
+                                    turnId,
+                                    lastSeq,
+                                });
                                 const reconnected = yield* reconnectCurrentRun();
                                 if (reconnected)
                                     return true;
@@ -1935,7 +1998,12 @@ export function createAgentChatAdapter(options) {
                                 attemptedRunIds.push(activeRunId);
                             }
                             reconnectCursorForRun(activeRunId, previousRunId);
-                            setActiveRun({ threadId, runId: activeRunId, lastSeq });
+                            setActiveRun({
+                                threadId,
+                                runId: activeRunId,
+                                turnId,
+                                lastSeq,
+                            });
                             const reconnected = yield* reconnectCurrentRun();
                             if (reconnected)
                                 return true;
@@ -1985,6 +2053,7 @@ export function createAgentChatAdapter(options) {
                         type: "text",
                         text: formatChatErrorText(args.message, undefined, args.errorCode),
                     });
+                    settleTerminalChatRun();
                     yield {
                         content: [...content],
                         status: { type: "incomplete", reason: "error" },
@@ -2048,6 +2117,7 @@ export function createAgentChatAdapter(options) {
                             includeActivity: true,
                         });
                         const runWarning = appendMissingFinalResponseWarning(content);
+                        settleTerminalChatRun();
                         yield {
                             content: [...content],
                             status: { type: "complete", reason: "stop" },
@@ -2103,15 +2173,19 @@ export function createAgentChatAdapter(options) {
                         }
                         attached = true;
                         updateCurrentRunDispatchMode(eventsRes.headers.get("X-Dispatch-Mode"));
-                        for await (const result of readSSEStream(eventsRes.body, content, toolCallCounter, tabId, (seq) => {
+                        for await (const result of readSSEStream(eventsRes.body, content, toolCallCounter, tabId, (seq, isProgress) => {
                             rememberRunSeq(seq);
                             if (threadId)
-                                updateActiveRunSeq(seq);
+                                updateActiveRunSeq(seq, isProgress);
                         }, runId, currentSSEOptions({
                             noProgressTimeoutMs: BACKGROUND_FOLLOW_ATTACH_WATCHDOG_MS,
                             actionPreparationStallTimeoutMs: BACKGROUND_FOLLOW_ATTACH_WATCHDOG_MS,
                         }))) {
-                            yield withRequestModeMetadata(result);
+                            const nextResult = withRequestModeMetadata(result);
+                            if (isTerminalChatModelRunResult(nextResult)) {
+                                settleTerminalChatRun();
+                            }
+                            yield nextResult;
                         }
                         // readSSEStream returned normally: a terminal done/error was
                         // consumed and rendered — the turn is over.
@@ -2414,7 +2488,12 @@ export function createAgentChatAdapter(options) {
                             }
                             reconnectCursorForRun(activeRunId, previousRunId);
                             if (threadId) {
-                                setActiveRun({ threadId, runId: activeRunId, lastSeq });
+                                setActiveRun({
+                                    threadId,
+                                    runId: activeRunId,
+                                    turnId,
+                                    lastSeq,
+                                });
                             }
                             const seqBeforeAttach = lastSeq;
                             const attach = yield* followAttachOnce();
@@ -2928,10 +3007,10 @@ export function createAgentChatAdapter(options) {
                                 // internal continuation is only adoptable after /runs/active
                                 // proves it carries this turnId; a bare 409 run id is not
                                 // enough ownership evidence.
-                                if (activeRunId !== null &&
-                                    internalContinuationRequest &&
-                                    !attemptedRunIds.includes(activeRunId)) {
-                                    const reconnected = yield* reconnectActiveRunForThread();
+                                if (activeRunId !== null && internalContinuationRequest) {
+                                    const reconnected = yield* reconnectActiveRunForThread({
+                                        requireCurrentTurn: true,
+                                    });
                                     if (reconnected)
                                         return;
                                 }
@@ -2972,6 +3051,7 @@ export function createAgentChatAdapter(options) {
                                         type: "text",
                                         text: `Something went wrong: ${message}`,
                                     });
+                                    settleTerminalChatRun();
                                     yield {
                                         content: [...content],
                                         status: {
@@ -2980,7 +3060,6 @@ export function createAgentChatAdapter(options) {
                                         },
                                         metadata: { custom: { runError } },
                                     };
-                                    clearActiveRun();
                                     return;
                                 }
                             }
@@ -2993,6 +3072,7 @@ export function createAgentChatAdapter(options) {
                                     type: "text",
                                     text: authErrorText("auth-required"),
                                 });
+                                settleTerminalChatRun();
                                 yield {
                                     content: [...content],
                                     status: {
@@ -3013,6 +3093,7 @@ export function createAgentChatAdapter(options) {
                                     type: "text",
                                     text: authErrorText("session-expired"),
                                 });
+                                settleTerminalChatRun();
                                 yield {
                                     content: [...content],
                                     status: {
@@ -3036,6 +3117,7 @@ export function createAgentChatAdapter(options) {
                                         type: "text",
                                         text: authErrorText(reason, body),
                                     });
+                                    settleTerminalChatRun();
                                     yield {
                                         content: [...content],
                                         status: {
@@ -3054,6 +3136,7 @@ export function createAgentChatAdapter(options) {
                                         }));
                                     }
                                     content.push({ type: "text", text: failure.text });
+                                    settleTerminalChatRun();
                                     yield {
                                         content: [...content],
                                         status: {
@@ -3101,15 +3184,19 @@ export function createAgentChatAdapter(options) {
                         }
                         if (runId && threadId) {
                             clearPendingTurnIfMatches(threadId, turnId);
-                            setActiveRun({ threadId, runId, lastSeq: -1 });
+                            setActiveRun({ threadId, runId, turnId, lastSeq: -1 });
                         }
-                        for await (const result of readSSEStream(res.body, content, toolCallCounter, tabId, (seq) => {
+                        for await (const result of readSSEStream(res.body, content, toolCallCounter, tabId, (seq, isProgress) => {
                             rememberRunSeq(seq);
                             if (runId && threadId) {
-                                updateActiveRunSeq(seq);
+                                updateActiveRunSeq(seq, isProgress);
                             }
                         }, runId, currentSSEOptions())) {
-                            yield withRequestModeMetadata(result);
+                            const nextResult = withRequestModeMetadata(result);
+                            if (isTerminalChatModelRunResult(nextResult)) {
+                                settleTerminalChatRun();
+                            }
+                            yield nextResult;
                         }
                         // Run completed normally — clear active run state
                         clearActiveRun();
@@ -3160,6 +3247,7 @@ export function createAgentChatAdapter(options) {
                                 if (continuation.completedToolName) {
                                     const message = completedToolTimeoutMessage(continuation.completedToolName);
                                     content.push({ type: "text", text: message });
+                                    settleTerminalChatRun();
                                     yield {
                                         content: [...content],
                                         status: {
@@ -3220,6 +3308,7 @@ export function createAgentChatAdapter(options) {
                                     // with the generic interruption copy.
                                     preservedError ? errorCode : undefined),
                                 });
+                                settleTerminalChatRun();
                                 yield {
                                     content: [...content],
                                     status: {
@@ -3290,6 +3379,7 @@ export function createAgentChatAdapter(options) {
                                 type: "text",
                                 text: `Something went wrong: ${normalized.message}`,
                             });
+                            settleTerminalChatRun();
                             yield {
                                 content: [...content],
                                 status: {
@@ -3316,6 +3406,7 @@ export function createAgentChatAdapter(options) {
                                 type: "text",
                                 text: authErrorText(reason, errMsg),
                             });
+                            settleTerminalChatRun();
                             yield {
                                 content: [...content],
                                 status: {
@@ -3335,6 +3426,7 @@ export function createAgentChatAdapter(options) {
                                 }));
                             }
                             content.push({ type: "text", text: failure.text });
+                            settleTerminalChatRun();
                             yield {
                                 content: [...content],
                                 status: {
@@ -3393,6 +3485,7 @@ export function createAgentChatAdapter(options) {
                                 type: "text",
                                 text: `Something went wrong: ${message}`,
                             });
+                            settleTerminalChatRun();
                             yield {
                                 content: [...content],
                                 status: {
@@ -3412,6 +3505,7 @@ export function createAgentChatAdapter(options) {
                                 if (continuation.completedToolName) {
                                     const message = completedToolTimeoutMessage(continuation.completedToolName);
                                     content.push({ type: "text", text: message });
+                                    settleTerminalChatRun();
                                     yield {
                                         content: [...content],
                                         status: {
@@ -3453,6 +3547,7 @@ export function createAgentChatAdapter(options) {
                                     type: "text",
                                     text: `Something went wrong: ${message}`,
                                 });
+                                settleTerminalChatRun();
                                 yield {
                                     content: [...content],
                                     status: {
@@ -3512,6 +3607,7 @@ export function createAgentChatAdapter(options) {
                                 ? errMsg
                                 : `Something went wrong: ${normalized.message}`,
                         });
+                        settleTerminalChatRun();
                         yield {
                             content: [...content],
                             status: {
@@ -3525,7 +3621,8 @@ export function createAgentChatAdapter(options) {
                 }
             }
             finally {
-                if (typeof window !== "undefined") {
+                if (typeof window !== "undefined" && ownsActiveRunState()) {
+                    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,21 @@ export declare function shouldOfferRestore(args: {
  * messages put it at `metadata.runId`.
  */
 export declare function assistantMessageRunId(message: unknown): string | undefined;
+/** Stable logical-turn identity shared by chained continuation run IDs. */
+export declare function assistantMessageTurnId(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;
@@ -67,9 +73,13 @@ export declare function computeActiveTailToolCallId(content: ContentPart[] | und
     chatRunning: boolean;
     isLast: boolean;
 }): string | null;
-export declare function shouldShowAssistantMessageFooter({ isLast, chatRunning, hasRenderableContent, statusIsTerminal, hasUnresolvedTool, }: {
+export declare function shouldShowAssistantMessageFooter({ isLast, chatRunning, activeRunId, messageRunId, activeTurnId, messageTurnId, hasRenderableContent, statusIsTerminal, hasUnresolvedTool, }: {
     isLast: boolean;
     chatRunning: boolean;
+    activeRunId?: string | null;
+    messageRunId?: string;
+    activeTurnId?: string | null;
+    messageTurnId?: string;
     hasRenderableContent: boolean;
     statusIsTerminal: boolean;
     hasUnresolvedTool?: boolean;