@assistant-ui/react-ag-ui 0.1.1 → 0.1.3

package/README.md

@@ -37,6 +37,8 @@ export function Provider({ children }: { children: React.ReactNode }) {
 
 An AG-UI backend that runs subagents (the agents-as-tools pattern) emits `SUBAGENT_STARTED` / `SUBAGENT_FINISHED` / `SUBAGENT_ERROR` plus a `subagentRunId` on the events each subagent produces. This adapter groups that activity into one nested assistant message per subagent run and attaches it to the spawning tool call as `ToolCallMessagePart.messages`, joined on `SUBAGENT_STARTED.parentToolCallId`. `PartPrimitive.Messages` renders it without extra wiring, and the subagent's name, description, result, and error code ride on that message's `agui` metadata.
 
+A `MESSAGES_SNAPSHOT` whose messages carry `subagentRunId` adds to the same nested messages instead of rendering them a second time in the parent thread: a run's messages attach to the tool call its `SUBAGENT_STARTED.parentToolCallId` named in this session, merged with what streamed live. A run that was never announced this session, and its messages, stay in the parent thread. The live grouping only reaches spawning calls of the current run, so a subagent resumed in a later run still streams into the parent thread, and after that run's snapshot can show both nested and in the parent thread.
+
 A subagent that names no reachable spawning call (`parentToolCallId` is optional, may name a call this run never saw, or two runs may name each other) has nowhere to nest, so its output renders in the parent thread instead of being dropped. This matches the downgrade the protocol's own pre-subagent compatibility middleware performs.
 
 A subagent's frontend-executed tool calls work the same way the root agent's do: a call nested on `ToolCallMessagePart.messages` is reachable by `getPendingToolCalls()`, resolves through `addToolResult`, and its result rides the resume as a `tool` record on the spawning assistant record, the same flattened wire shape these calls had before subagent attribution.

package/dist/runtime/AgUiThreadController.d.ts

@@ -44,6 +44,7 @@ export declare class AgUiThreadController {
     private activeRunAgent;
     private history;
     private readonly assistantHistoryParents;
+    private readonly subagentParentToolCallIds;
     private readonly snapshotHistoryIds;
     private readonly persistedHistoryIds;
     private readonly historyWrites;
@@ -156,6 +157,15 @@ export declare class AgUiThreadController {
     private preserveToolInteractions;
     private mergeSnapshotAssistantContent;
     private reconcileSnapshotNestedContent;
+    /**
+     * Merges one tool call's nested transcripts message by message. The incoming
+     * copy is the base for tool calls and reasoning; resolved results and calls
+     * only the prior copy has carry over, and the prior text wins when it extends
+     * the incoming text. Importing a snapshot keeps prior messages it lacks, a
+     * prior status that is running or incomplete, and the prior status when the
+     * snapshot waits on calls the merged content has already resolved.
+     */
+    private mergeNestedTranscripts;
     private mergeAssistantMetadata;
     private handleEvent;
     private updateActiveAssistantState;
@@ -167,6 +177,7 @@ export declare class AgUiThreadController {
     private isPersistableStatus;
     private recordHistoryEntry;
     private markPendingAssistantHistory;
+    private persistSettledAssistant;
     private persistAssistantHistory;
     private appendHistoryItem;
 }

package/dist/runtime/AgUiThreadController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AgUiThreadController.d.ts","sourceRoot":"","sources":["../../src/runtime/AgUiThreadController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AgUiThreadController.d.ts","sourceRoot":"","sources":["../../src/runtime/AgUiThreadController.ts"],"names":[],"mappings":"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"}

package/dist/runtime/AgUiThreadController.js

@@ -3,14 +3,22 @@ import { createAgUiThreadState, reduceAgUiThreadState } from "./agUiThreadState.
 import { readMcpAppResourceUri, toolContentText } from "./mcp-tool-result.js";
 import { AG_UI_METADATA_NAMESPACE } from "./types.js";
 import { buildToolApprovalResume, preserveToolApprovalDecision, projectAgUiToolApprovals, withSettledToolApprovals, withToolApprovalDecision } from "./adapter/tool-approval.js";
+import { fromAgUiSnapshotMessages, toAgUiMessages, toAgUiTools, withAgUiPartMessageMetadata } from "./adapter/conversions.js";
 import { RunAggregator, isPlainObject, tryParseJSON } from "./adapter/run-aggregator.js";
-import { fromAgUiMessages, toAgUiMessages, toAgUiTools } from "./adapter/conversions.js";
 import { createAgUiSubscriber } from "./adapter/subscriber.js";
 import { createReplayContentMerger, groupReplayToolContent, indexReplayToolOwners, preserveToolResult } from "./adapter/replay-content.js";
 import { fromThreadMessageLike, generateId, isMcpAppUri } from "@assistant-ui/core";
 import { appendToolInteraction, createHistoryWriteChain, createMessageRepositorySession, invokeUserCallback, iterateToolCallParts, mapToolCallPartsDeep } from "@assistant-ui/core/internal";
 import jsonpatch from "fast-json-patch";
 // src/runtime/AgUiThreadController.ts
+const agentInitialStates = /* @__PURE__ */ new WeakMap();
+const getAgentInitialState = (agent) => {
+	if (!agentInitialStates.has(agent)) {
+		const state = agent.state;
+		agentInitialStates.set(agent, state === void 0 || isPlainObject(state) && Object.keys(state).length === 0 ? void 0 : structuredClone(state));
+	}
+	return agentInitialStates.get(agent);
+};
 const optimisticPrefix = "__optimistic__";
 const generateOptimisticId = () => `${optimisticPrefix}${generateId()}`;
 const isOptimisticId = (id) => id.startsWith(optimisticPrefix);
@@ -57,6 +65,42 @@ const FALLBACK_USER_STATUS = {
 	type: "complete",
 	reason: "unknown"
 };
+const textOf = (content) => content.flatMap((part) => part.type === "text" ? [part.text] : []).join("");
+/**
+* Swaps `content`'s text parts, in order, for `source`'s. A text part `source`
+* has beyond `content`'s text slots goes after the nearest earlier part of
+* `source` that `content` also has: a tool call by id, another part by its
+* type and position among parts of that type. With none, it goes first.
+*/
+const replaceTextParts = (content, source) => {
+	const texts = source.filter((part) => part.type === "text");
+	const result = [];
+	let used = 0;
+	for (const part of content) if (part.type !== "text") result.push(part);
+	else if (used < texts.length) result.push(texts[used++]);
+	const positionIn = (parts, part) => parts.filter((other) => other.type === part.type).indexOf(part);
+	for (const text of texts.slice(used)) {
+		let anchor = -1;
+		for (let index = source.indexOf(text) - 1; index >= 0 && anchor < 0; index--) {
+			const before = source[index];
+			if (before.type === "tool-call") anchor = result.findIndex((part) => part.type === "tool-call" && part.toolCallId === before.toolCallId);
+			else if (before.type === "text") anchor = result.indexOf(before);
+			else {
+				const match = result.filter((part) => part.type === before.type)[positionIn(source, before)];
+				anchor = match ? result.indexOf(match) : -1;
+			}
+		}
+		result.splice(anchor + 1, 0, text);
+	}
+	return result;
+};
+const settleNestedContent = (content, status) => mapToolCallPartsDeep(content, (part) => part.messages ? {
+	...part,
+	messages: part.messages.map((message) => message.role === "assistant" && message.status?.type === "running" ? {
+		...message,
+		status
+	} : message)
+} : part).content;
 const invokeRuntimeCallback = (name, callback, ...args) => {
 	invokeUserCallback("react-ag-ui", name, callback, ...args);
 };
@@ -107,6 +151,7 @@ var AgUiThreadController = class {
 	activeRunAgent = null;
 	history;
 	assistantHistoryParents = /* @__PURE__ */ new Map();
+	subagentParentToolCallIds = /* @__PURE__ */ new Map();
 	snapshotHistoryIds = /* @__PURE__ */ new Set();
 	persistedHistoryIds = /* @__PURE__ */ new Set();
 	historyWrites = createHistoryWriteChain();
@@ -114,6 +159,11 @@ var AgUiThreadController = class {
 	_loadPromise;
 	constructor(options) {
 		this.agent = options.agent;
+		const initialState = getAgentInitialState(this.agent);
+		if (initialState !== void 0) this.dispatch({
+			type: "stateSnapshot",
+			snapshot: initialState
+		});
 		this.logger = options.logger;
 		this.showThinking = options.showThinking;
 		this.joinStrategy = options.joinStrategy;
@@ -143,7 +193,18 @@ var AgUiThreadController = class {
 		for (const listener of this.listeners) listener();
 	}
 	updateOptions(options) {
+		const agentChanged = this.agent !== options.agent;
 		this.agent = options.agent;
+		if (agentChanged) {
+			const initialState = getAgentInitialState(this.agent);
+			if (this.state.stateSnapshot === void 0 && initialState !== void 0) {
+				this.dispatch({
+					type: "stateSnapshot",
+					snapshot: initialState
+				});
+				this.publishUpdate();
+			}
+		}
 		this.logger = options.logger;
 		this.showThinking = options.showThinking;
 		this.joinStrategy = options.joinStrategy;
@@ -188,6 +249,7 @@ var AgUiThreadController = class {
 			if (!repo) return;
 			this.session.applyExternalMessageRepository(repo);
 			this.assistantHistoryParents.clear();
+			this.subagentParentToolCallIds.clear();
 			this.snapshotHistoryIds.clear();
 			this.persistedHistoryIds.clear();
 			for (const { message } of repo.messages) this.persistedHistoryIds.add(message.id);
@@ -555,7 +617,10 @@ var AgUiThreadController = class {
 					custom: newCustom
 				}
 			};
-		})) this.publishUpdate();
+		})) {
+			this.publishUpdate();
+			this.persistSettledAssistant(messageId);
+		}
 	}
 	findMessageIdForToolCall(toolCallId) {
 		let fallbackMessageId;
@@ -609,9 +674,31 @@ var AgUiThreadController = class {
 				};
 			});
 			if (!matchedToolCall) return message;
+			const settled = mapToolCallPartsDeep(content, (part) => {
+				if (!part.messages) return part;
+				let changed = false;
+				const messages = part.messages.map((nested) => {
+					if (nested.role !== "assistant" || nested.status.type !== "requires-action" || nested.status.reason !== "tool-calls") return nested;
+					const listed = listedPendingToolCallIds(nested);
+					if (Array.from(iterateToolCallParts(nested.content)).some((call) => !isResolvedToolCall(call) && (!listed || listed.has(call.toolCallId)))) return nested;
+					changed = true;
+					return {
+						...nested,
+						status: {
+							type: "complete",
+							reason: "unknown"
+						},
+						metadata: withoutPendingToolCallIds(nested.metadata)
+					};
+				});
+				return changed ? {
+					...part,
+					messages
+				} : part;
+			}).content;
 			return {
 				...assistant,
-				content
+				content: settled
 			};
 		})) return;
 		this.publishUpdate();
@@ -724,7 +811,8 @@ var AgUiThreadController = class {
 			metadata: withoutPendingToolCallIds(current.metadata)
 		} : current)) return false;
 		this.publishUpdate();
-		this.persistAssistantHistory(messageId);
+		if (this.history?.update) this.persistSettledAssistant(messageId);
+		else this.persistAssistantHistory(messageId);
 		return true;
 	}
 	startResumeRun(messageId) {
@@ -827,6 +915,7 @@ var AgUiThreadController = class {
 		const controller = this.abortController;
 		const activeRunAgent = this.activeRunAgent;
 		this.dispatch({ type: "resetThread" });
+		this.subagentParentToolCallIds.clear();
 		if (controller) {
 			this.abortController = null;
 			this.activeRunAgent = null;
@@ -892,6 +981,8 @@ var AgUiThreadController = class {
 		let frameOwnerIds = /* @__PURE__ */ new Set();
 		let restrictedPendingToolCallIds;
 		let settlingRun = false;
+		let latestSnapshot;
+		let snapshotToolCallIds = /* @__PURE__ */ new Set();
 		const ensureAssistant = (allowRecreate = false) => {
 			const cached = assistantMessageId;
 			if (cached !== void 0 && this.session.tryGetMessage(cached)) return cached;
@@ -1097,7 +1188,45 @@ var AgUiThreadController = class {
 			showThinking: this.showThinking,
 			joinStrategy,
 			logger: this.logger,
-			emit: applyUpdate,
+			emit: (update) => {
+				const currentSnapshotAssistant = assistantMessageId === void 0 ? void 0 : this.session.tryGetMessage(assistantMessageId)?.message;
+				const listedSnapshotToolCallIds = currentSnapshotAssistant?.role === "assistant" ? listedPendingToolCallIds(currentSnapshotAssistant) : void 0;
+				const hasPendingSnapshotToolCall = latestSnapshot?.id === assistantMessageId && currentSnapshotAssistant?.role === "assistant" && Array.from(iterateToolCallParts(currentSnapshotAssistant.content)).some((part) => !isResolvedToolCall(part) && (!listedSnapshotToolCallIds || listedSnapshotToolCallIds.has(part.toolCallId)) && (!restrictedPendingToolCallIds || restrictedPendingToolCallIds.has(part.toolCallId)));
+				const reconciledUpdate = settlingRun && update.status?.type === "complete" && hasPendingSnapshotToolCall ? {
+					...update,
+					status: {
+						type: "requires-action",
+						reason: "tool-calls"
+					},
+					...restrictedPendingToolCallIds ? { metadata: {
+						...update.metadata,
+						custom: {
+							...update.metadata?.custom,
+							[AG_UI_METADATA_NAMESPACE]: {
+								...update.metadata?.custom?.[AG_UI_METADATA_NAMESPACE],
+								pendingToolCallIds: [...restrictedPendingToolCallIds]
+							}
+						}
+					} } : {}
+				} : update;
+				if (settlingRun && latestSnapshot && latestSnapshot.id === assistantMessageId && reconciledUpdate.status && reconciledUpdate.status.type !== "running" && reconciledUpdate.status.type !== "requires-action") {
+					const status = reconciledUpdate.status;
+					const current = this.session.tryGetMessage(assistantMessageId)?.message;
+					const content = settleNestedContent(current?.role === "assistant" ? current.content : latestSnapshot.content, status);
+					applyUpdate({
+						...reconciledUpdate,
+						content
+					});
+				} else if (latestSnapshot && latestSnapshot.id === assistantMessageId && reconciledUpdate.content !== void 0) {
+					const content = this.mergeSnapshotAssistantContent(latestSnapshot.content, reconciledUpdate.content, reconciledUpdate.content.some((part) => part.type === "reasoning"), reconciledUpdate.content.some(isActivityPart), snapshotToolCallIds);
+					applyUpdate({
+						...reconciledUpdate,
+						content
+					});
+				} else applyUpdate(reconciledUpdate);
+				const current = assistantMessageId ? this.session.tryGetMessage(assistantMessageId)?.message : void 0;
+				latestSnapshot = !settlingRun && current?.role === "assistant" && current.id === latestSnapshot?.id ? current : void 0;
+			},
 			onServerMessageId: (serverId) => {
 				adoptServerMessageId(serverId, false);
 			},
@@ -1147,6 +1276,10 @@ var AgUiThreadController = class {
 						}
 					}
 					assistantMessageId = nextAssistantMessageId;
+					const imported = assistantMessageId ? this.session.tryGetMessage(assistantMessageId)?.message : void 0;
+					const source = event.messages.find((message) => message?.role === "assistant" && message.id === imported?.id);
+					latestSnapshot = imported?.role === "assistant" && source ? imported : void 0;
+					snapshotToolCallIds = new Set(Array.isArray(source?.toolCalls) ? source.toolCalls.map((call) => call.id).filter((id) => typeof id === "string") : []);
 					if (!replayEnded && assistantMessageId === void 0) {
 						const tail = this.session.getMessages().at(-1);
 						snapshotAssistantId = tail?.role === "assistant" ? tail.id : void 0;
@@ -1194,7 +1327,6 @@ var AgUiThreadController = class {
 				const input = this.buildRunInput(runId, normalizedRunConfig, historicalMessages, resume);
 				const subscriber = createAgUiSubscriber({
 					dispatch,
-					runId,
 					logger: this.logger,
 					onRunFailed: (error) => {
 						if (abortSignal.aborted) return;
@@ -1205,7 +1337,7 @@ var AgUiThreadController = class {
 				try {
 					runAgentInstance.messages = input.messages;
 					runAgentInstance.threadId = input.threadId;
-					runAgentInstance.state = input.state ?? null;
+					runAgentInstance.state = input.state;
 				} catch {}
 				await runAgentInstance.runAgent.bind(runAgentInstance)(input, subscriber, { signal: abortSignal });
 			}
@@ -1220,6 +1352,19 @@ var AgUiThreadController = class {
 				pendingError = err;
 			}
 		} finally {
+			const current = assistantMessageId ? this.session.tryGetMessage(assistantMessageId)?.message : void 0;
+			if (this.abortController === abortController && current?.role === "assistant" && current.status?.type === "running") {
+				const status = {
+					type: "incomplete",
+					reason: "error",
+					error: "The connection ended before the answer finished."
+				};
+				settleHeldMessages(status);
+				applyUpdate({
+					status,
+					content: settleNestedContent(current.content, status)
+				});
+			}
 			this.finishRun(abortController);
 		}
 		if (pendingError) {
@@ -1342,7 +1487,7 @@ var AgUiThreadController = class {
 		return {
 			threadId,
 			runId,
-			state: this.state.stateSnapshot ?? null,
+			state: this.state.stateSnapshot === void 0 ? {} : this.state.stateSnapshot,
 			messages,
 			tools: toAgUiTools(context?.tools),
 			context: [...context?.system ? [{
@@ -1452,13 +1597,13 @@ var AgUiThreadController = class {
 			const mergedMetadata = update.metadata ? this.mergeAssistantMetadata(assistant.metadata, update.metadata) : assistant.metadata;
 			latestStatus = update.status ?? assistant.status;
 			let content = update.content !== void 0 ? replay ? replay.merge(assistant.content, update.content) : this.preserveToolResults(assistant.content, update.content) : assistant.content;
-			const calls = replay ? Array.from(iterateToolCallParts(content)) : [];
+			const calls = Array.from(iterateToolCallParts(content));
 			const pending = pendingToolCallIds ?? (replay ? /* @__PURE__ */ new Set([...replay.admittedToolCallIds, ...Array.from(iterateToolCallParts(update.content ?? [])).filter((part) => !isResolvedToolCall(part)).map((part) => part.toolCallId)]) : void 0);
 			if (replay && latestStatus?.type !== "running" && pending) replay.admittedToolCallIds = pending;
-			if (replay) {
+			if (replay || latestStatus?.type === "requires-action" && latestStatus.reason === "interrupt") {
 				const interrupts = latestStatus?.type === "requires-action" && latestStatus.reason === "interrupt" ? mergedMetadata.custom["agui"]?.interrupts : void 0;
 				const approvals = projectAgUiToolApprovals(interrupts, new Set(calls.map((part) => part.toolCallId)));
-				const originalCalls = new Map(Array.from(iterateToolCallParts(replay.originalContent), (part) => [part.toolCallId, part]));
+				const originalCalls = new Map(Array.from(iterateToolCallParts(replay?.originalContent ?? assistant.content), (part) => [part.toolCallId, part]));
 				content = mapToolCallPartsDeep(content, (part) => {
 					const approval = approvals.get(part.toolCallId);
 					if (approval) return {
@@ -1535,10 +1680,10 @@ var AgUiThreadController = class {
 		});
 		return changed ? content : next;
 	}
-	mergeSnapshotAssistantContent(previous, next, snapshotHasReasoning, snapshotHasActivity) {
-		const shouldKeep = (part) => part.type === "reasoning" ? this.showThinking && !snapshotHasReasoning : isActivityPart(part) && !snapshotHasActivity;
+	mergeSnapshotAssistantContent(previous, next, snapshotHasReasoning, snapshotHasActivity, keepMissingToolCalls = /* @__PURE__ */ new Set(), keepPriorTranscripts = false) {
+		const shouldKeep = (part) => part.type === "tool-call" ? keepMissingToolCalls.has(part.toolCallId) && !next.some((incoming) => incoming.type === "tool-call" && incoming.toolCallId === part.toolCallId) : part.type === "reasoning" ? this.showThinking && !snapshotHasReasoning : part.type === "data" && !isActivityPart(part) ? !next.some((incoming) => incoming.type === "data" && incoming.name === part.name) : isActivityPart(part) && !snapshotHasActivity;
 		const kept = previous.filter(shouldKeep);
-		const merged = this.reconcileSnapshotNestedContent(previous, this.preserveToolInteractions(previous, next));
+		const merged = this.reconcileSnapshotNestedContent(previous, this.preserveToolInteractions(previous, next), keepPriorTranscripts);
 		if (kept.length === 0) return merged;
 		const mergedByType = /* @__PURE__ */ new Map();
 		const mergedTools = /* @__PURE__ */ new Map();
@@ -1570,7 +1715,7 @@ var AgUiThreadController = class {
 		result.push(...insertions[merged.length]);
 		return result;
 	}
-	reconcileSnapshotNestedContent(previous, next) {
+	reconcileSnapshotNestedContent(previous, next, keepPriorTranscripts) {
 		const nestedIds = /* @__PURE__ */ new Set();
 		for (const part of previous) {
 			if (part.type !== "tool-call" || !part.messages) continue;
@@ -1600,11 +1745,49 @@ var AgUiThreadController = class {
 			if (part.type === "tool-call" && flattened.has(part.toolCallId)) return [];
 			if (part.type !== "tool-call") return [part];
 			const prior = previousCalls.get(part.toolCallId);
-			return prior?.messages === void 0 ? [part] : [{
+			if (prior?.messages === void 0) return [part];
+			if (part.messages === void 0) return [{
 				...part,
 				messages: prior.messages
 			}];
+			if (part.messages.length === 0) return [part];
+			return [{
+				...part,
+				messages: this.mergeNestedTranscripts(prior.messages, part.messages, keepPriorTranscripts)
+			}];
+		});
+	}
+	/**
+	* Merges one tool call's nested transcripts message by message. The incoming
+	* copy is the base for tool calls and reasoning; resolved results and calls
+	* only the prior copy has carry over, and the prior text wins when it extends
+	* the incoming text. Importing a snapshot keeps prior messages it lacks, a
+	* prior status that is running or incomplete, and the prior status when the
+	* snapshot waits on calls the merged content has already resolved.
+	*/
+	mergeNestedTranscripts(prior, next, importingSnapshot) {
+		const priorById = new Map(prior.map((message) => [message.id, message]));
+		const merged = next.map((message) => {
+			const previous = priorById.get(message.id);
+			if (previous?.role !== "assistant" || message.role !== "assistant") return message;
+			let content = this.mergeSnapshotAssistantContent(previous.content, this.preserveToolResults(previous.content, message.content), message.content.some((part) => part.type === "reasoning"), message.content.some(isActivityPart), new Set(Array.from(iterateToolCallParts(previous.content), (call) => call.toolCallId)), importingSnapshot);
+			const priorText = textOf(previous.content);
+			const incomingText = textOf(message.content);
+			if (priorText.length > incomingText.length && priorText.startsWith(incomingText)) content = replaceTextParts(content, previous.content);
+			const status = !importingSnapshot ? message.status : previous.status.type === "running" || previous.status.type === "incomplete" || message.status.type === "requires-action" && message.status.reason === "tool-calls" && !Array.from(iterateToolCallParts(content)).some((call) => !isResolvedToolCall(call)) ? previous.status : message.status;
+			return {
+				...message,
+				status,
+				content,
+				metadata: {
+					...message.metadata,
+					custom: mergeAgUiNamespace(previous.metadata.custom, message.metadata.custom)
+				}
+			};
 		});
+		if (!importingSnapshot) return merged;
+		const mergedById = new Map(merged.map((message) => [message.id, message]));
+		return [...prior.map((message) => mergedById.get(message.id) ?? message), ...merged.filter((message) => !priorById.has(message.id))];
 	}
 	mergeAssistantMetadata(current, incoming) {
 		const annotations = incoming.unstable_annotations ? [...current.unstable_annotations, ...incoming.unstable_annotations] : current.unstable_annotations;
@@ -1621,6 +1804,7 @@ var AgUiThreadController = class {
 		};
 	}
 	handleEvent(aggregator, event, activeAssistantId, joinStrategy, runStartMessageIds, hasRunUserBoundary, reconcileSnapshot) {
+		if (event.type === "SUBAGENT_STARTED" && !this.subagentParentToolCallIds.has(event.subagentRunId)) this.subagentParentToolCallIds.set(event.subagentRunId, event.parentToolCallId);
 		switch (event.type) {
 			case "STATE_SNAPSHOT":
 				this.dispatch({
@@ -1643,12 +1827,27 @@ var AgUiThreadController = class {
 				}
 				break;
 			case "MESSAGES_SNAPSHOT": {
+				aggregator.handle(event);
 				const previousHeadId = this.session.headId;
 				const activeAssistant = activeAssistantId === void 0 ? void 0 : this.session.tryGetMessage(activeAssistantId)?.message;
 				const hasActiveText = activeAssistant?.role === "assistant" && activeAssistant.content.some((part) => part.type === "text");
 				this.importMessagesSnapshot(event.messages, activeAssistantId, joinStrategy, runStartMessageIds, hasRunUserBoundary, reconcileSnapshot);
 				const headId = this.session.headId;
-				if (hasActiveText && headId !== previousHeadId) activeAssistantId = (headId === null ? void 0 : this.session.tryGetMessage(headId)?.message)?.role === "assistant" ? headId ?? void 0 : void 0;
+				const head = headId === null ? void 0 : this.session.tryGetMessage(headId)?.message;
+				const hasNewPendingToolCallAnswer = head?.role === "assistant" && !runStartMessageIds.has(head.id) && head.status?.type === "requires-action" && head.status.reason === "tool-calls";
+				if (headId !== previousHeadId && (hasActiveText || hasNewPendingToolCallAnswer)) {
+					const nextActiveAssistantId = head?.role === "assistant" ? headId ?? void 0 : void 0;
+					if (activeAssistantId !== nextActiveAssistantId && activeAssistantId) {
+						const previous = this.session.tryGetMessage(activeAssistantId)?.message;
+						if (previous?.role === "assistant" && previous.status?.type === "running") this.updateAssistantMessage(activeAssistantId, {
+							status: FALLBACK_USER_STATUS,
+							content: settleNestedContent(previous.content, FALLBACK_USER_STATUS)
+						});
+					}
+					activeAssistantId = nextActiveAssistantId;
+					if (activeAssistantId && joinStrategy !== "concat-content") aggregator.rebaseMessage(activeAssistantId);
+					if (hasNewPendingToolCallAnswer && head) this.updateAssistantMessage(head.id, { status: { type: "running" } });
+				}
 				this.updateActiveAssistantState(activeAssistantId);
 				break;
 			}
@@ -1710,7 +1909,8 @@ var AgUiThreadController = class {
 						text: modelText
 					}] } : {},
 					...part.isError === void 0 ? typeof event.mcpResult?.isError === "boolean" ? { isError: event.mcpResult.isError } : event.role === "tool" ? { isError: false } : {} : {},
-					...event.messageId ? { unstable_toolMessageId: event.messageId } : {}
+					...event.messageId ? { unstable_toolMessageId: event.messageId } : {},
+					...event.metadata !== void 0 ? { providerMetadata: withAgUiPartMessageMetadata(part.providerMetadata, event.metadata) } : {}
 				};
 				const { modelContent: _modelContent, ...partWithoutModelContent } = part;
 				return {
@@ -1722,7 +1922,8 @@ var AgUiThreadController = class {
 					}] } : {},
 					...typeof event.mcpResult?.isError === "boolean" ? { isError: event.mcpResult.isError } : event.role === "tool" ? { isError: false } : {},
 					...part.mcp === void 0 && mcpAppUri !== void 0 ? { mcp: { app: { resourceUri: mcpAppUri } } } : {},
-					...event.messageId ? { unstable_toolMessageId: event.messageId } : {}
+					...event.messageId ? { unstable_toolMessageId: event.messageId } : {},
+					...event.metadata !== void 0 ? { providerMetadata: withAgUiPartMessageMetadata(part.providerMetadata, event.metadata) } : {}
 				};
 			});
 			if (!matchedToolCall) return message;
@@ -1732,7 +1933,8 @@ var AgUiThreadController = class {
 			};
 		})) return;
 		this.publishUpdate();
-		this.maybeCompleteAfterToolResults(messageId);
+		if (this.maybeCompleteAfterToolResults(messageId)) return;
+		this.persistSettledAssistant(messageId);
 	}
 	applyCrossRunActivitySnapshot(messageId, toolCallId, event) {
 		const resourceUri = event.content["resourceUri"];
@@ -1771,7 +1973,8 @@ var AgUiThreadController = class {
 			};
 		})) return;
 		this.publishUpdate();
-		this.maybeCompleteAfterToolResults(messageId);
+		if (this.maybeCompleteAfterToolResults(messageId)) return;
+		this.persistSettledAssistant(messageId);
 	}
 	importMessagesSnapshot(rawMessages, activeAssistantId, joinStrategy, runStartMessageIds, hasRunUserBoundary, reconcileSnapshot) {
 		try {
@@ -1779,10 +1982,12 @@ var AgUiThreadController = class {
 			const activeMessage = activeAssistantItem?.message;
 			const activeAssistantParentId = activeAssistantItem?.parentId;
 			const activeAssistant = activeMessage?.role === "assistant" ? activeMessage : void 0;
-			const normalized = fromAgUiMessages(rawMessages, { showThinking: this.showThinking });
+			const normalized = fromAgUiSnapshotMessages(rawMessages, { showThinking: this.showThinking }, this.subagentParentToolCallIds);
 			const converted = [];
 			for (const message of normalized) try {
-				converted.push(fromThreadMessageLike(message, generateId(), FALLBACK_USER_STATUS));
+				const previous = message.id ? this.session.tryGetMessage(message.id)?.message : void 0;
+				const fallbackStatus = previous?.role === "assistant" && previous.status?.type === "running" ? previous.status : FALLBACK_USER_STATUS;
+				converted.push(fromThreadMessageLike(message, generateId(), fallbackStatus));
 			} catch (error) {
 				this.logger.error?.("[agui] failed to import message from snapshot", error);
 			}
@@ -1794,9 +1999,13 @@ var AgUiThreadController = class {
 				if (convertedMessage.role === "assistant") {
 					const previous = existing?.role === "assistant" ? existing : void 0;
 					const snapshot = reconcileSnapshot?.(convertedMessage, previous) ?? convertedMessage;
+					const preservesRunningStatus = convertedMessage.id === activeAssistantId && previous?.status?.type === "running" && snapshot.status?.type === "requires-action" && snapshot.status.reason === "tool-calls";
+					const previousToolCallIds = new Set(Array.from(iterateToolCallParts(previous?.content ?? []), (call) => call.toolCallId));
+					const preservesSettledStatus = convertedMessage.id !== activeAssistantId && this.isTerminalStatus(previous?.status) && snapshot.status?.type === "requires-action" && snapshot.status.reason === "tool-calls" && Array.from(iterateToolCallParts(snapshot.content)).every((call) => isResolvedToolCall(call) || previousToolCallIds.has(call.toolCallId));
 					converted[index] = previous ? {
 						...snapshot,
-						content: this.mergeSnapshotAssistantContent(previous.content, snapshot.content, snapshotHasReasoning, snapshotHasActivity)
+						...preservesRunningStatus || preservesSettledStatus ? { status: previous.status } : {},
+						content: this.mergeSnapshotAssistantContent(previous.content, snapshot.content, snapshotHasReasoning, snapshotHasActivity, /* @__PURE__ */ new Set(), true)
 					} : snapshot;
 				}
 			}
@@ -1881,6 +2090,14 @@ var AgUiThreadController = class {
 		if (!this.history) return;
 		this.assistantHistoryParents.set(messageId, parentId);
 	}
+	persistSettledAssistant(messageId) {
+		const item = this.session.tryGetMessage(messageId);
+		if (!this.history?.update || !item) return;
+		if (!this.isTerminalStatus(item.message.status)) return;
+		if (!this.persistedHistoryIds.has(messageId) && this.historyWrites.pending(messageId) === void 0) return;
+		this.markPendingAssistantHistory(messageId, item.parentId);
+		this.persistAssistantHistory(messageId);
+	}
 	persistAssistantHistory(messageId) {
 		const history = this.history;
 		if (!history) return;
@@ -1891,7 +2108,7 @@ var AgUiThreadController = class {
 		if (!this.isPersistableStatus(message.status)) return;
 		const wasPersisted = this.persistedHistoryIds.has(messageId);
 		const update = history.update;
-		if (update !== void 0 && (wasPersisted || this.snapshotHistoryIds.has(messageId))) {
+		if (update !== void 0 && (wasPersisted || this.snapshotHistoryIds.has(messageId) || this.historyWrites.pending(messageId) !== void 0)) {
 			const write = this.historyWrites.chain(messageId, () => update.call(history, {
 				parentId,
 				message