@agent-native/core 0.149.2 → 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-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";
@@ -95,6 +95,9 @@ function dispatchTerminalChatUiCleanup(tabId) {
     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
@@ -782,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);
@@ -808,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;
@@ -1412,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
@@ -1423,7 +1434,11 @@ export function createAgentChatAdapter(options) {
                     ...result,
                     metadata: {
                         ...metadata,
-                        custom: { ...custom, requestMode },
+                        custom: {
+                            ...custom,
+                            turnId,
+                            ...(requestMode ? { requestMode } : {}),
+                        },
                     },
                 };
             };
@@ -1455,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;
@@ -1706,6 +1744,7 @@ export function createAgentChatAdapter(options) {
                 return state;
             };
             const currentSSEOptions = (overrides = {}) => ({
+                markTerminalResults: true,
                 durableBackgroundRun: currentRunDispatchMode?.startsWith("background") === true,
                 ...(runId
                     ? { preparingActionState: preparingActionStateForRun(runId) }
@@ -1816,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) {
@@ -1844,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;
@@ -1865,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;
                                 }
@@ -1875,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;
@@ -1945,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;
@@ -1995,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" },
@@ -2058,6 +2117,7 @@ export function createAgentChatAdapter(options) {
                             includeActivity: true,
                         });
                         const runWarning = appendMissingFinalResponseWarning(content);
+                        settleTerminalChatRun();
                         yield {
                             content: [...content],
                             status: { type: "complete", reason: "stop" },
@@ -2113,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.
@@ -2424,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();
@@ -2938,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;
                                 }
@@ -2982,6 +3051,7 @@ export function createAgentChatAdapter(options) {
                                         type: "text",
                                         text: `Something went wrong: ${message}`,
                                     });
+                                    settleTerminalChatRun();
                                     yield {
                                         content: [...content],
                                         status: {
@@ -2990,7 +3060,6 @@ export function createAgentChatAdapter(options) {
                                         },
                                         metadata: { custom: { runError } },
                                     };
-                                    clearActiveRun();
                                     return;
                                 }
                             }
@@ -3003,6 +3072,7 @@ export function createAgentChatAdapter(options) {
                                     type: "text",
                                     text: authErrorText("auth-required"),
                                 });
+                                settleTerminalChatRun();
                                 yield {
                                     content: [...content],
                                     status: {
@@ -3023,6 +3093,7 @@ export function createAgentChatAdapter(options) {
                                     type: "text",
                                     text: authErrorText("session-expired"),
                                 });
+                                settleTerminalChatRun();
                                 yield {
                                     content: [...content],
                                     status: {
@@ -3046,6 +3117,7 @@ export function createAgentChatAdapter(options) {
                                         type: "text",
                                         text: authErrorText(reason, body),
                                     });
+                                    settleTerminalChatRun();
                                     yield {
                                         content: [...content],
                                         status: {
@@ -3064,6 +3136,7 @@ export function createAgentChatAdapter(options) {
                                         }));
                                     }
                                     content.push({ type: "text", text: failure.text });
+                                    settleTerminalChatRun();
                                     yield {
                                         content: [...content],
                                         status: {
@@ -3111,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();
@@ -3170,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: {
@@ -3230,6 +3308,7 @@ export function createAgentChatAdapter(options) {
                                     // with the generic interruption copy.
                                     preservedError ? errorCode : undefined),
                                 });
+                                settleTerminalChatRun();
                                 yield {
                                     content: [...content],
                                     status: {
@@ -3300,6 +3379,7 @@ export function createAgentChatAdapter(options) {
                                 type: "text",
                                 text: `Something went wrong: ${normalized.message}`,
                             });
+                            settleTerminalChatRun();
                             yield {
                                 content: [...content],
                                 status: {
@@ -3326,6 +3406,7 @@ export function createAgentChatAdapter(options) {
                                 type: "text",
                                 text: authErrorText(reason, errMsg),
                             });
+                            settleTerminalChatRun();
                             yield {
                                 content: [...content],
                                 status: {
@@ -3345,6 +3426,7 @@ export function createAgentChatAdapter(options) {
                                 }));
                             }
                             content.push({ type: "text", text: failure.text });
+                            settleTerminalChatRun();
                             yield {
                                 content: [...content],
                                 status: {
@@ -3403,6 +3485,7 @@ export function createAgentChatAdapter(options) {
                                 type: "text",
                                 text: `Something went wrong: ${message}`,
                             });
+                            settleTerminalChatRun();
                             yield {
                                 content: [...content],
                                 status: {
@@ -3422,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: {
@@ -3463,6 +3547,7 @@ export function createAgentChatAdapter(options) {
                                     type: "text",
                                     text: `Something went wrong: ${message}`,
                                 });
+                                settleTerminalChatRun();
                                 yield {
                                     content: [...content],
                                     status: {
@@ -3522,6 +3607,7 @@ export function createAgentChatAdapter(options) {
                                 ? errMsg
                                 : `Something went wrong: ${normalized.message}`,
                         });
+                        settleTerminalChatRun();
                         yield {
                             content: [...content],
                             status: {
@@ -3535,7 +3621,7 @@ 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/chat/message-components.d.ts

@@ -49,6 +49,8 @@ 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;
@@ -71,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;

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

@@ -19,7 +19,7 @@ import { cn } from "../utils.js";
 import { MarkdownText, renderMarkdownToClipboardHtml, SmoothMarkdownText, } from "./markdown-renderer.js";
 import { getAssistantRunDurationMs } from "./repo-helpers.js";
 import { getRunErrorMetadata, runErrorHeadline, runErrorKey, } from "./run-recovery.js";
-import { ToolCallFallback, ToolActivityPresentation, ToolCallStackMotion, FilesChangedSummary, ASSISTANT_VISIBLE_TOOL_CALL_LIMIT, ChatRunningContext, ChatRunDurationContext, formatWorkedDuration, RanToolsSummary, ReasoningCell, WorkedForSummary, toolCallHasPendingApproval, } from "./tool-call-display.js";
+import { ToolCallFallback, ToolActivityPresentation, ToolCallStackMotion, FilesChangedSummary, ASSISTANT_VISIBLE_TOOL_CALL_LIMIT, ChatRunningContext, ChatRunningRunIdContext, ChatRunningTurnIdContext, ChatRunDurationContext, formatWorkedDuration, RanToolsSummary, ReasoningCell, WorkedForSummary, toolCallHasPendingApproval, } from "./tool-call-display.js";
 export { toolCallHasPendingApproval };
 // ─── Pending selection context key ───────────────────────────────────────────
 // Mirrored from AssistantChat to avoid a cross-import on a private constant.
@@ -172,6 +172,15 @@ export function assistantMessageRunId(message) {
             ? metadata.runId
             : undefined;
 }
+/** Stable logical-turn identity shared by chained continuation run IDs. */
+export function assistantMessageTurnId(message) {
+    const metadata = message?.metadata;
+    return typeof metadata?.custom?.turnId === "string"
+        ? metadata.custom.turnId
+        : typeof metadata?.turnId === "string"
+            ? metadata.turnId
+            : undefined;
+}
 export function resolveAssistantRequestId(message, activeRun, threadId) {
     return (assistantMessageRunId(message) ||
         (activeRun?.threadId === threadId ? activeRun.runId : undefined));
@@ -592,13 +601,24 @@ export function computeActiveTailToolCallId(content, { chatRunning, isLast }) {
         ? part.toolCallId
         : latestToolCallId, null) ?? null);
 }
-export function shouldShowAssistantMessageFooter({ isLast, chatRunning, hasRenderableContent, statusIsTerminal, hasUnresolvedTool, }) {
+export function shouldShowAssistantMessageFooter({ isLast, chatRunning, activeRunId, messageRunId, activeTurnId, messageTurnId, hasRenderableContent, statusIsTerminal, hasUnresolvedTool, }) {
     if (!hasRenderableContent)
         return false;
+    const ownsActiveTurn = activeTurnId != null &&
+        (messageTurnId == null || activeTurnId === messageTurnId);
+    // Keep the run-id comparison only for legacy messages that predate the
+    // turn-id metadata. Once either side has a logical-turn identity, absent
+    // turn evidence must not be treated as proof of a different run.
+    const ownsLegacyRun = activeTurnId == null &&
+        messageTurnId == null &&
+        activeRunId != null &&
+        messageRunId != null &&
+        activeRunId === messageRunId;
+    const ownsActiveRun = isLast || ownsActiveTurn || ownsLegacyRun;
+    if (chatRunning && ownsActiveRun)
+        return false;
     if (!isLast)
         return true;
-    if (chatRunning)
-        return false;
     if (hasUnresolvedTool)
         return false;
     return statusIsTerminal;
@@ -776,6 +796,8 @@ export function AssistantMessage() {
     const messageRuntime = useMessageRuntime();
     const thread = useThread();
     const chatRunning = React.useContext(ChatRunningContext);
+    const activeRunId = React.useContext(ChatRunningRunIdContext);
+    const activeTurnId = React.useContext(ChatRunningTurnIdContext);
     const lastRunDurationMs = React.useContext(ChatRunDurationContext);
     const msg = messageRuntime.getState();
     const persistedDurationMs = getAssistantRunDurationMs(msg);
@@ -790,6 +812,8 @@ export function AssistantMessage() {
     const statusIsTerminal = assistantMessageStatusIsTerminal(msg);
     const hasCompletedCustomUi = assistantMessageHasCompletedCustomUi(msg.content);
     const hasCustomUi = assistantMessageHasCustomUi(msg.content);
+    const messageRunId = assistantMessageRunId(msg);
+    const messageTurnId = assistantMessageTurnId(msg);
     const serverRunActive = React.useContext(ServerRunActiveContext);
     const messageRunError = getRunErrorMetadata(msg);
     const messageActions = React.useContext(MessageActionsContext);
@@ -838,6 +862,10 @@ export function AssistantMessage() {
         shouldShowAssistantMessageFooter({
             isLast,
             chatRunning,
+            activeRunId,
+            messageRunId,
+            activeTurnId,
+            messageTurnId,
             hasRenderableContent,
             statusIsTerminal,
             hasUnresolvedTool,
@@ -881,7 +909,6 @@ export function AssistantMessage() {
         }
         wasRunningRef.current = chatRunning && isLast;
     }, [chatRunning, isComplete, isLast]);
-    const messageRunId = assistantMessageRunId(msg);
     const handleRestore = useCallback(async () => {
         if (restoreState === "idle" || restoreState === "error") {
             setRestoreError(null);

package/dist/client/chat/run-recovery.d.ts

@@ -6,6 +6,7 @@ export type RunErrorInfo = {
     details?: string;
     errorCode?: string;
     runId?: string;
+    turnId?: string;
     recoverable?: boolean;
 };
 export declare function getLoopLimitMetadata(message: unknown): LoopLimitInfo | null;

package/dist/client/chat/run-recovery.js

@@ -39,6 +39,13 @@ export function getRunErrorMetadata(message) {
             : typeof meta?.runId === "string"
                 ? meta.runId
                 : undefined;
+    const turnId = typeof runError.turnId === "string"
+        ? runError.turnId
+        : typeof meta?.custom?.turnId === "string"
+            ? meta.custom.turnId
+            : typeof meta?.turnId === "string"
+                ? meta.turnId
+                : undefined;
     return {
         message: messageText,
         ...(typeof runError.details === "string"
@@ -48,6 +55,7 @@ export function getRunErrorMetadata(message) {
             ? { errorCode: runError.errorCode }
             : {}),
         ...(runId ? { runId } : {}),
+        ...(turnId ? { turnId } : {}),
         ...(runError.recoverable ? { recoverable: true } : {}),
     };
 }

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

@@ -5,6 +5,8 @@ import type { AgentMcpAppPayload } from "../../mcp-client/app-result.js";
 import type { ContentPart } from "../sse-event-processor.js";
 import { FilesChangedSummary } from "../tool-cells/index.js";
 export declare const ChatRunningContext: React.Context<boolean>;
+export declare const ChatRunningRunIdContext: React.Context<string | null>;
+export declare const ChatRunningTurnIdContext: React.Context<string | null>;
 export declare const ChatRunDurationContext: React.Context<number | null>;
 export declare const ASSISTANT_VISIBLE_TOOL_CALL_LIMIT = 3;
 /**

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

@@ -18,6 +18,8 @@ import { resolveToolRenderer } from "./tool-render-registry.js";
 import { isBuiltinDataWidgetActionRenderer, resolveBuiltinActionChatRenderer, resolveBuiltinFallbackToolRenderer, } from "./widgets/builtin-tool-renderers.js";
 // Exported so AssistantChatInner can provide a context value.
 export const ChatRunningContext = React.createContext(false);
+export const ChatRunningRunIdContext = React.createContext(null);
+export const ChatRunningTurnIdContext = React.createContext(null);
 export const ChatRunDurationContext = React.createContext(null);
 export const ASSISTANT_VISIBLE_TOOL_CALL_LIMIT = 3;
 /**