@assistant-ui/react-ag-ui 0.0.56 → 0.0.58

package/dist/runtime/adapter/run-aggregator.js

@@ -5,6 +5,8 @@ import { isMcpAppUri } from "@assistant-ui/core";
 import { applyA2uiOperations, convertSurfaceToUISpec } from "@assistant-ui/react-generative-ui/a2ui";
 //#region src/runtime/adapter/run-aggregator.ts
 const AG_UI_METADATA_NAMESPACE = "agui";
+const ROOT_SCOPE = "";
+const MAX_SUBAGENT_DEPTH = 16;
 const MCP_APPS_ACTIVITY_TYPE = "mcp-apps";
 const A2UI_SURFACE_ACTIVITY_TYPE = "a2ui-surface";
 const isPlainObject = (value) => !!value && typeof value === "object" && !Array.isArray(value);
@@ -23,23 +25,37 @@ var RunAggregator = class {
 	showThinking;
 	logger;
 	onServerMessageId;
+	onTextMessageStart;
 	status;
 	interrupts;
 	textParts = /* @__PURE__ */ new Map();
-	activeTextMessageId;
+	activeTextMessageIdByScope = /* @__PURE__ */ new Map();
 	reasoningParts = /* @__PURE__ */ new Map();
 	reasoningSignatures = /* @__PURE__ */ new Map();
+	reasoningSignatureIds = /* @__PURE__ */ new Map();
+	hiddenSignatures = /* @__PURE__ */ new Map();
+	hiddenSignatureAnchors = /* @__PURE__ */ new Map();
+	hiddenBlockAnchors = /* @__PURE__ */ new Map();
+	hiddenAnonymousAnchor;
+	hiddenReasoningIds = /* @__PURE__ */ new Set();
+	hiddenActiveReasoning = "none";
+	hasEmittedOpaqueReasoning = false;
+	loggedDroppedOpaqueIds = /* @__PURE__ */ new Set();
 	reasoningMessageIds = /* @__PURE__ */ new Map();
 	anonymousReasoningKeys = /* @__PURE__ */ new Set();
-	activeReasoningKey;
+	activeReasoningKeyByScope = /* @__PURE__ */ new Map();
+	subagentRuns = /* @__PURE__ */ new Map();
+	nestingMemo;
 	reasoningPartCounter = 0;
 	toolCalls = /* @__PURE__ */ new Map();
 	a2uiBuckets = /* @__PURE__ */ new Map();
 	a2uiToolCallIds = /* @__PURE__ */ new Set();
-	lastResolvedToolCallId;
+	lastResolvedToolCallIdByScope = /* @__PURE__ */ new Map();
 	partOrder = [];
 	textPartCounter = 0;
 	serverMessageIdReported = false;
+	reportedServerMessageId;
+	lastTextMessageId;
 	streamStartTime;
 	firstTokenTime;
 	totalChunks = 0;
@@ -48,6 +64,7 @@ var RunAggregator = class {
 		this.showThinking = options.showThinking;
 		this.logger = options.logger;
 		this.onServerMessageId = options.onServerMessageId;
+		this.onTextMessageStart = options.onTextMessageStart;
 	}
 	hasToolCall(toolCallId) {
 		return this.toolCalls.has(toolCallId);
@@ -55,22 +72,11 @@ var RunAggregator = class {
 	handle(event) {
 		switch (event.type) {
 			case "RUN_STARTED":
-				this.clearTextParts();
-				this.reasoningParts.clear();
-				this.reasoningSignatures.clear();
-				this.reasoningMessageIds.clear();
-				this.anonymousReasoningKeys.clear();
-				this.activeReasoningKey = void 0;
-				this.reasoningPartCounter = 0;
-				this.toolCalls.clear();
-				this.a2uiBuckets.clear();
-				this.a2uiToolCallIds.clear();
-				this.lastResolvedToolCallId = void 0;
-				this.partOrder.length = 0;
-				this.textPartCounter = 0;
-				this.activeTextMessageId = void 0;
+				this.resetMessageParts();
 				this.interrupts = void 0;
 				this.serverMessageIdReported = false;
+				this.lastTextMessageId = void 0;
+				this.reportedServerMessageId = void 0;
 				this.streamStartTime = Date.now();
 				this.firstTokenTime = void 0;
 				this.totalChunks = 0;
@@ -89,13 +95,14 @@ var RunAggregator = class {
 				}
 				this.interrupts = void 0;
 				const hasUnresolvedToolCalls = Array.from(this.toolCalls.values()).some((tc) => tc.result === void 0);
-				this.status = event.outcome?.type === "success" || !hasUnresolvedToolCalls ? {
-					type: "complete",
-					reason: "unknown"
-				} : {
+				this.status = hasUnresolvedToolCalls ? {
 					type: "requires-action",
 					reason: "tool-calls"
+				} : {
+					type: "complete",
+					reason: "unknown"
 				};
+				this.closeOpenSubagentRuns(this.status);
 				this.emit();
 				break;
 			}
@@ -105,6 +112,7 @@ var RunAggregator = class {
 					reason: "error",
 					...event.message !== void 0 ? { error: event.message } : {}
 				};
+				this.closeOpenSubagentRuns(this.status);
 				this.emit();
 				break;
 			case "RUN_CANCELLED":
@@ -112,34 +120,46 @@ var RunAggregator = class {
 					type: "incomplete",
 					reason: "cancelled"
 				};
+				this.closeOpenSubagentRuns(this.status);
 				this.emit();
 				break;
 			case "TEXT_MESSAGE_START": {
-				this.reportServerMessageId(event.messageId);
-				const id = this.startTextMessage(event.messageId);
-				if (id) this.markTextPartTouched(id);
+				const scope = this.scopeOf(event);
+				if (scope === ROOT_SCOPE) {
+					this.beginDistinctTextMessage(event.messageId);
+					this.reportServerMessageId(event.messageId);
+					if (event.messageId) this.lastTextMessageId = event.messageId;
+				}
+				this.startTextMessage(scope, event.messageId);
 				this.emit();
 				break;
 			}
 			case "TEXT_MESSAGE_CONTENT":
 			case "TEXT_MESSAGE_CHUNK": {
 				const incomingId = "messageId" in event ? event.messageId : void 0;
-				this.reportServerMessageId(incomingId);
+				const scope = this.scopeOf(event);
+				if (scope === ROOT_SCOPE) {
+					this.beginDistinctTextMessage(incomingId);
+					this.reportServerMessageId(incomingId);
+					if (incomingId) this.lastTextMessageId = incomingId;
+				}
 				if (!event.delta) break;
 				this.recordFirstToken();
-				const id = this.resolveTextMessageId(incomingId);
+				const id = this.resolveTextMessageId(scope, incomingId);
 				this.appendText(id, event.delta);
 				this.totalChunks++;
 				this.emit();
 				break;
 			}
-			case "TEXT_MESSAGE_END":
-				this.reportServerMessageId(event.messageId);
-				if (event.messageId && this.activeTextMessageId === event.messageId) this.activeTextMessageId = void 0;
+			case "TEXT_MESSAGE_END": {
+				const scope = this.scopeOf(event);
+				if (scope === ROOT_SCOPE) this.reportServerMessageId(event.messageId);
+				if (event.messageId && this.activeTextMessageIdByScope.get(scope) === this.partKey(scope, event.messageId)) this.activeTextMessageIdByScope.delete(scope);
 				this.emit();
 				break;
+			}
 			case "CUSTOM":
-				this.activeTextMessageId = void 0;
+				this.activeTextMessageIdByScope.delete(ROOT_SCOPE);
 				this.partOrder.push({
 					kind: "data",
 					name: event.name,
@@ -151,42 +171,53 @@ var RunAggregator = class {
 			case "THINKING_TEXT_MESSAGE_START":
 			case "REASONING_START":
 			case "REASONING_MESSAGE_START":
-				this.handleReasoningStart("messageId" in event ? event.messageId : void 0, event.type === "REASONING_MESSAGE_START");
+				this.handleReasoningStart(this.scopeOf("subagentRunId" in event ? event : {}), "messageId" in event ? event.messageId : void 0, event.type === "REASONING_MESSAGE_START");
 				break;
 			case "REASONING_ENCRYPTED_VALUE":
 				if (event.subtype === "message") {
-					const active = this.activeReasoningKey;
-					const key = this.reasoningParts.has(event.entityId) ? event.entityId : active !== void 0 && this.anonymousReasoningKeys.has(active) ? active : void 0;
+					const scope = this.scopeOf(event);
+					const active = this.activeReasoningKeyByScope.get(scope);
+					const entityKey = this.partKey(scope, event.entityId);
+					const key = this.showThinking ? this.reasoningParts.has(entityKey) ? entityKey : active !== void 0 && this.anonymousReasoningKeys.has(active) ? active : void 0 : void 0;
 					if (key !== void 0) {
 						this.reasoningSignatures.set(key, event.encryptedValue);
+						this.reasoningSignatureIds.set(key, event.entityId);
+						this.emit();
+					} else if (!this.showThinking && scope === ROOT_SCOPE && event.entityId.trim().length > 0 && event.encryptedValue.trim().length > 0 && (this.hiddenReasoningIds.has(event.entityId) || this.hiddenActiveReasoning === "anonymous")) {
+						this.hiddenSignatures.set(event.entityId, event.encryptedValue);
+						this.hiddenSignatureAnchors.set(event.entityId, this.hiddenBlockAnchors.get(event.entityId) ?? this.hiddenAnonymousAnchor ?? this.partOrder.length);
 						this.emit();
 					}
 				}
 				break;
 			case "THINKING_TEXT_MESSAGE_CONTENT":
-				this.handleReasoningContent(event.delta);
+				this.handleReasoningContent(ROOT_SCOPE, event.delta);
 				this.totalChunks++;
 				this.recordFirstToken();
 				break;
 			case "REASONING_MESSAGE_CONTENT":
-				this.handleReasoningContent(event.delta, "messageId" in event ? event.messageId : void 0, true);
+				this.handleReasoningContent(this.scopeOf(event), event.delta, "messageId" in event ? event.messageId : void 0, true);
 				this.totalChunks++;
 				this.recordFirstToken();
 				break;
 			case "THINKING_TEXT_MESSAGE_END":
 			case "THINKING_END":
+				this.handleReasoningEnd(ROOT_SCOPE);
+				break;
 			case "REASONING_MESSAGE_END":
 			case "REASONING_END":
-				this.handleReasoningEnd();
+				this.handleReasoningEnd(this.scopeOf(event));
 				break;
-			case "TOOL_CALL_START":
-				this.reportServerMessageId(event.parentMessageId);
-				this.startToolCall(event.toolCallId, event.toolCallName, event.parentMessageId);
+			case "TOOL_CALL_START": {
+				const scope = this.scopeOf(event);
+				if (scope === ROOT_SCOPE) this.reportServerMessageId(event.parentMessageId);
+				this.startToolCall(scope, event.toolCallId, event.toolCallName, event.parentMessageId);
 				this.emit();
 				break;
+			}
 			case "TOOL_CALL_ARGS":
 			case "TOOL_CALL_CHUNK":
-				if (event.type === "TOOL_CALL_CHUNK") this.reportServerMessageId(event.parentMessageId);
+				if (event.type === "TOOL_CALL_CHUNK" && this.scopeOf(event) === ROOT_SCOPE) this.reportServerMessageId(event.parentMessageId);
 				if (!event.delta) break;
 				this.appendToolArgs(event.toolCallId, event.delta);
 				this.emit();
@@ -195,7 +226,7 @@ var RunAggregator = class {
 				this.emit();
 				break;
 			case "TOOL_CALL_RESULT":
-				this.finishToolCall(event.toolCallId, event.content ?? "", typeof event.mcpResult?.isError === "boolean" ? event.mcpResult.isError : event.role === "tool" ? false : void 0, event.messageId, event.mcpResult);
+				this.finishToolCall(this.scopeOf(event), event.toolCallId, event.content ?? "", typeof event.mcpResult?.isError === "boolean" ? event.mcpResult.isError : event.role === "tool" ? false : void 0, event.messageId, event.mcpResult);
 				this.emit();
 				break;
 			case "ACTIVITY_SNAPSHOT": {
@@ -204,8 +235,10 @@ var RunAggregator = class {
 					break;
 				}
 				if (event.activityType !== "mcp-apps") break;
+				const activityScope = this.scopeOf(event);
 				const toolCallId = event.content.toolCallId;
-				const entry = typeof toolCallId === "string" ? this.toolCalls.get(toolCallId) : this.lastResolvedToolCallId ? this.toolCalls.get(this.lastResolvedToolCallId) : void 0;
+				const fallbackId = this.lastResolvedToolCallIdByScope.get(activityScope);
+				const entry = typeof toolCallId === "string" ? this.toolCalls.get(toolCallId) : fallbackId ? this.toolCalls.get(fallbackId) : void 0;
 				const resourceUri = event.content.resourceUri;
 				if (entry && typeof resourceUri === "string" && isMcpAppUri(resourceUri)) {
 					entry.mcpAppResourceUri = resourceUri;
@@ -227,6 +260,58 @@ var RunAggregator = class {
 				}
 				break;
 			}
+			case "SUBAGENT_STARTED": {
+				const existing = this.subagentRuns.get(event.subagentRunId);
+				if (existing) {
+					existing.name = event.name;
+					if (event.description !== void 0) existing.description = event.description;
+					existing.status = { type: "running" };
+					this.emit();
+					break;
+				}
+				this.nestingMemo = void 0;
+				this.subagentRuns.set(event.subagentRunId, {
+					subagentRunId: event.subagentRunId,
+					name: event.name,
+					...event.description !== void 0 ? { description: event.description } : {},
+					...event.parentSubagentRunId !== void 0 ? { parentSubagentRunId: event.parentSubagentRunId } : {},
+					...event.parentToolCallId !== void 0 ? { parentToolCallId: event.parentToolCallId } : {},
+					...event.parentMessageId !== void 0 ? { parentMessageId: event.parentMessageId } : {},
+					createdAt: /* @__PURE__ */ new Date(),
+					status: { type: "running" }
+				});
+				this.emit();
+				break;
+			}
+			case "SUBAGENT_FINISHED": {
+				const run = this.subagentRuns.get(event.subagentRunId);
+				if (run) {
+					run.status = event.outcome?.type === "suspended" ? {
+						type: "requires-action",
+						reason: "interrupt"
+					} : {
+						type: "complete",
+						reason: "unknown"
+					};
+					if (event.result !== void 0) run.result = event.result;
+					if (event.outcome?.type === "suspended" && event.outcome.interruptIds) run.interruptIds = event.outcome.interruptIds;
+				}
+				this.emit();
+				break;
+			}
+			case "SUBAGENT_ERROR": {
+				const run = this.subagentRuns.get(event.subagentRunId);
+				if (run) {
+					run.status = {
+						type: "incomplete",
+						reason: "error",
+						...event.message !== void 0 ? { error: event.message } : {}
+					};
+					if (event.code !== void 0) run.errorCode = event.code;
+				}
+				this.emit();
+				break;
+			}
 			default: this.logger.debug?.("[agui] aggregator ignored event", event);
 		}
 	}
@@ -265,11 +350,13 @@ var RunAggregator = class {
 				kind: "tool-call",
 				toolCallId
 			});
+			this.nestingMemo = void 0;
 			this.toolCalls.set(toolCallId, entry);
 			this.a2uiToolCallIds.add(toolCallId);
 		}
 		for (const toolCallId of this.a2uiToolCallIds) {
 			if (activeToolCallIds.has(toolCallId)) continue;
+			this.nestingMemo = void 0;
 			this.toolCalls.delete(toolCallId);
 			const partIndex = this.partOrder.findIndex((part) => part.kind === "tool-call" && part.toolCallId === toolCallId);
 			if (partIndex !== -1) this.partOrder.splice(partIndex, 1);
@@ -277,63 +364,103 @@ var RunAggregator = class {
 		}
 	}
 	reportServerMessageId(messageId) {
-		if (this.serverMessageIdReported || !messageId) return;
+		if (!messageId) return;
+		if (this.lastTextMessageId === void 0) this.lastTextMessageId = messageId;
+		if (this.serverMessageIdReported) return;
 		this.serverMessageIdReported = true;
+		this.reportedServerMessageId = messageId;
 		this.onServerMessageId?.(messageId);
 	}
 	clearTextParts() {
 		this.textParts.clear();
 	}
+	resetMessageParts() {
+		this.clearTextParts();
+		this.reasoningParts.clear();
+		this.reasoningSignatures.clear();
+		this.reasoningSignatureIds.clear();
+		this.reasoningMessageIds.clear();
+		this.hiddenSignatures.clear();
+		this.hiddenSignatureAnchors.clear();
+		this.hiddenBlockAnchors.clear();
+		this.hiddenAnonymousAnchor = void 0;
+		this.hiddenReasoningIds.clear();
+		this.hiddenActiveReasoning = "none";
+		this.loggedDroppedOpaqueIds.clear();
+		this.anonymousReasoningKeys.clear();
+		this.activeReasoningKeyByScope.clear();
+		this.nestingMemo = void 0;
+		this.subagentRuns.clear();
+		this.reasoningPartCounter = 0;
+		this.toolCalls.clear();
+		this.a2uiBuckets.clear();
+		this.a2uiToolCallIds.clear();
+		this.lastResolvedToolCallIdByScope.clear();
+		this.partOrder.length = 0;
+		this.textPartCounter = 0;
+		this.activeTextMessageIdByScope.clear();
+		this.reportedServerMessageId = void 0;
+	}
+	closeOpenSubagentRuns(status) {
+		for (const run of this.subagentRuns.values()) if (run.status.type === "running") run.status = status;
+	}
+	scopeOf(event) {
+		return event.subagentRunId ?? ROOT_SCOPE;
+	}
+	partKey(scope, id) {
+		return scope === ROOT_SCOPE ? id : `${scope}\u0000${id}`;
+	}
+	beginDistinctTextMessage(messageId) {
+		if (!messageId || this.lastTextMessageId === void 0 || this.lastTextMessageId === messageId || !this.onTextMessageStart) return;
+		this.resetMessageParts();
+		this.onTextMessageStart(messageId);
+	}
 	generateTextKey() {
 		this.textPartCounter += 1;
 		return `text-${this.textPartCounter}`;
 	}
-	startTextMessage(messageId) {
+	startTextMessage(scope, messageId) {
 		const id = messageId ?? this.generateTextKey();
-		this.ensureTextPart(id);
-		this.activeTextMessageId = id;
-		return id;
+		const key = this.ensureTextPart(scope, id);
+		this.activeTextMessageIdByScope.set(scope, key);
+		return key;
 	}
-	resolveTextMessageId(messageId) {
+	resolveTextMessageId(scope, messageId) {
 		if (messageId) {
-			this.ensureTextPart(messageId);
-			this.activeTextMessageId = messageId;
-			return messageId;
+			const key = this.ensureTextPart(scope, messageId);
+			this.activeTextMessageIdByScope.set(scope, key);
+			return key;
 		}
-		if (this.activeTextMessageId) return this.activeTextMessageId;
-		const generated = this.generateTextKey();
-		this.ensureTextPart(generated);
-		this.activeTextMessageId = generated;
-		return generated;
-	}
-	ensureTextPart(id) {
-		if (!this.textParts.has(id)) {
-			this.textParts.set(id, {
-				buffer: "",
-				touched: false
-			});
-			if (!this.partOrder.some((part) => part.kind === "text" && part.key === id)) this.partOrder.push({
+		const active = this.activeTextMessageIdByScope.get(scope);
+		if (active) return active;
+		const key = this.ensureTextPart(scope, this.generateTextKey());
+		this.activeTextMessageIdByScope.set(scope, key);
+		return key;
+	}
+	ensureTextPart(scope, id) {
+		const key = this.partKey(scope, id);
+		if (!this.textParts.has(key)) {
+			this.textParts.set(key, { buffer: "" });
+			if (!this.partOrder.some((part) => part.kind === "text" && part.key === key)) this.partOrder.push(scope === ROOT_SCOPE ? {
+				kind: "text",
+				key
+			} : {
 				kind: "text",
-				key: id
+				key,
+				subagentRunId: scope
 			});
 		}
-	}
-	markTextPartTouched(id) {
-		const entry = this.textParts.get(id);
-		if (!entry) return;
-		entry.touched = true;
+		return key;
 	}
 	appendText(id, delta) {
-		this.ensureTextPart(id);
 		const entry = this.textParts.get(id);
 		if (!entry) return;
 		entry.buffer += delta;
-		entry.touched = true;
 	}
-	startToolCall(id, name, parentMessageId) {
+	startToolCall(scope, id, name, parentMessageId) {
 		if (!id) return;
-		this.activeTextMessageId = void 0;
-		if (!this.partOrder.some((part) => part.kind === "tool-call" && part.toolCallId === id)) this.insertToolPart(id, parentMessageId);
+		this.activeTextMessageIdByScope.delete(scope);
+		if (!this.partOrder.some((part) => part.kind === "tool-call" && part.toolCallId === id)) this.insertToolPart(scope, id, parentMessageId);
 		const state = {
 			toolCallId: id,
 			toolCallName: name ?? "tool",
@@ -344,15 +471,18 @@ var RunAggregator = class {
 			snapshotResultApplied: false
 		};
 		if (parentMessageId) state.parentMessageId = parentMessageId;
+		if (scope !== ROOT_SCOPE) state.subagentRunId = scope;
+		this.nestingMemo = void 0;
 		this.toolCalls.set(id, state);
 	}
-	insertToolPart(id, parentMessageId) {
+	insertToolPart(scope, id, parentMessageId) {
 		const entry = {
 			kind: "tool-call",
 			toolCallId: id
 		};
 		if (parentMessageId) {
-			const parentIndex = this.partOrder.findIndex((part) => part.kind === "text" && part.key === parentMessageId);
+			const parentKey = this.partKey(scope, parentMessageId);
+			const parentIndex = this.partOrder.findIndex((part) => part.kind === "text" && part.key === parentKey);
 			if (parentIndex !== -1) {
 				let insertAt = parentIndex + 1;
 				while (insertAt < this.partOrder.length) {
@@ -381,7 +511,7 @@ var RunAggregator = class {
 			entry.parsedArgs = void 0;
 		}
 	}
-	finishToolCall(id, content, isError, toolMessageId, mcpResult) {
+	finishToolCall(scope, id, content, isError, toolMessageId, mcpResult) {
 		if (!id) return;
 		let entry = this.toolCalls.get(id);
 		if (!entry) {
@@ -392,8 +522,10 @@ var RunAggregator = class {
 				parsedArgs: void 0,
 				result: void 0,
 				isError: void 0,
-				snapshotResultApplied: false
+				snapshotResultApplied: false,
+				...scope !== ROOT_SCOPE ? { subagentRunId: scope } : {}
 			};
+			this.nestingMemo = void 0;
 			this.toolCalls.set(id, entry);
 		}
 		if (!this.partOrder.some((part) => part.kind === "tool-call" && part.toolCallId === id)) this.partOrder.push({
@@ -423,16 +555,110 @@ var RunAggregator = class {
 			entry.isError = isError;
 		}
 		if (toolMessageId) entry.toolMessageId = toolMessageId;
-		this.lastResolvedToolCallId = id;
+		this.lastResolvedToolCallIdByScope.set(scope, id);
 	}
-	emit() {
+	nesting() {
+		if (!this.nestingMemo) {
+			const subagentsByParentToolCallId = this.subagentsByParentToolCallId();
+			this.nestingMemo = {
+				subagentsByParentToolCallId,
+				reachable: this.reachableSubagentRunIds(subagentsByParentToolCallId)
+			};
+		}
+		return this.nestingMemo;
+	}
+	subagentsByParentToolCallId() {
+		const map = /* @__PURE__ */ new Map();
+		for (const run of this.subagentRuns.values()) {
+			if (!run.parentToolCallId) continue;
+			const list = map.get(run.parentToolCallId) ?? [];
+			list.push(run.subagentRunId);
+			map.set(run.parentToolCallId, list);
+		}
+		return map;
+	}
+	reachableSubagentRunIds(subagentsByParentToolCallId) {
+		const reachable = /* @__PURE__ */ new Set();
+		const walk = (scope, depth) => {
+			if (depth > MAX_SUBAGENT_DEPTH) return;
+			for (const entry of this.toolCalls.values()) {
+				if ((entry.subagentRunId ?? ROOT_SCOPE) !== scope) continue;
+				for (const id of subagentsByParentToolCallId.get(entry.toolCallId) ?? []) {
+					if (reachable.has(id)) continue;
+					reachable.add(id);
+					walk(id, depth + 1);
+				}
+			}
+		};
+		walk(ROOT_SCOPE, 0);
+		return reachable;
+	}
+	materializeSubagentMessage(subagentRunId, depth, ctx) {
+		const run = this.subagentRuns.get(subagentRunId);
+		if (!run || depth > MAX_SUBAGENT_DEPTH) return void 0;
+		const content = this.buildParts(subagentRunId, depth + 1, ctx);
+		return {
+			id: run.subagentRunId,
+			role: "assistant",
+			createdAt: run.createdAt,
+			status: run.status,
+			content,
+			metadata: {
+				unstable_state: null,
+				unstable_annotations: [],
+				unstable_data: [],
+				steps: [],
+				custom: { [AG_UI_METADATA_NAMESPACE]: {
+					name: run.name,
+					...run.description !== void 0 ? { description: run.description } : {},
+					...run.parentSubagentRunId !== void 0 ? { parentSubagentRunId: run.parentSubagentRunId } : {},
+					...run.result !== void 0 ? { result: run.result } : {},
+					...run.interruptIds !== void 0 ? { interruptIds: run.interruptIds } : {},
+					...run.errorCode !== void 0 ? { errorCode: run.errorCode } : {}
+				} }
+			}
+		};
+	}
+	buildParts(scope, depth, ctx) {
 		const snapshot = [];
-		const approvals = projectAgUiToolApprovals(this.status?.type === "requires-action" ? this.interrupts : void 0, new Set(this.toolCalls.keys()));
-		for (const part of this.partOrder) {
+		const isRoot = scope === ROOT_SCOPE;
+		for (const { index, part } of ctx.partsByScope.get(scope) ?? []) {
+			const materialized = () => {
+				if (isRoot && ctx.root) ctx.root.lastMaterializedIndex = index;
+			};
+			if (part.kind === "tool-call") {
+				const entry = this.toolCalls.get(part.toolCallId);
+				if (!entry) continue;
+				const approval = ctx.approvals.get(entry.toolCallId);
+				const nestedMessages = (ctx.subagentsByParentToolCallId.get(entry.toolCallId) ?? []).filter((id) => ctx.reachable.has(id)).map((id) => this.materializeSubagentMessage(id, depth, ctx)).filter((m) => m !== void 0);
+				const toolPart = {
+					type: "tool-call",
+					toolCallId: entry.toolCallId,
+					toolName: entry.toolCallName,
+					args: entry.parsedArgs ?? {},
+					argsText: entry.argsText,
+					...approval ? { approval } : {},
+					...entry.result !== void 0 ? { result: entry.result } : {},
+					...entry.modelContent !== void 0 ? { modelContent: entry.modelContent } : {},
+					...entry.isError !== void 0 ? { isError: entry.isError } : {},
+					...entry.mcpAppResourceUri ? { mcp: { app: {
+						resourceUri: entry.mcpAppResourceUri,
+						...entry.mcpAppServerId ? { serverId: entry.mcpAppServerId } : {}
+					} } } : {},
+					...entry.parentMessageId ? { parentId: entry.parentMessageId } : {},
+					...entry.toolMessageId ? { unstable_toolMessageId: entry.toolMessageId } : {},
+					...nestedMessages.length > 0 ? { messages: nestedMessages } : {}
+				};
+				snapshot.push(toolPart);
+				materialized();
+				continue;
+			}
+			const rawScope = "subagentRunId" in part ? part.subagentRunId ?? ROOT_SCOPE : ROOT_SCOPE;
 			if (part.kind === "reasoning") {
 				if (this.showThinking) {
 					const buffer = this.reasoningParts.get(part.key) ?? "";
-					if (buffer.length > 0 || this.activeReasoningKey === part.key) {
+					const isActive = this.activeReasoningKeyByScope.get(rawScope) === part.key;
+					if (buffer.length > 0 || isActive) {
 						const encryptedValue = this.reasoningSignatures.get(part.key);
 						const reasoningId = this.reasoningMessageIds.get(part.key);
 						const meta = {
@@ -444,16 +670,28 @@ var RunAggregator = class {
 							text: buffer,
 							...Object.keys(meta).length > 0 ? { providerMetadata: { [AG_UI_METADATA_NAMESPACE]: meta } } : {}
 						});
+						materialized();
+					} else if (isRoot && ctx.root) {
+						const encryptedValue = this.reasoningSignatures.get(part.key);
+						const id = this.reasoningSignatureIds.get(part.key);
+						if (id?.trim() && encryptedValue?.trim()) ctx.root.opaqueCandidates.push({
+							id,
+							encryptedValue,
+							anchor: index + 1
+						});
 					}
 				}
 				continue;
 			}
 			if (part.kind === "text") {
 				const entry = this.textParts.get(part.key);
-				if (entry?.touched) snapshot.push({
-					type: "text",
-					text: entry.buffer
-				});
+				if (entry && entry.buffer.trim().length > 0) {
+					snapshot.push({
+						type: "text",
+						text: entry.buffer
+					});
+					materialized();
+				}
 				continue;
 			}
 			if (part.kind === "data") {
@@ -462,34 +700,68 @@ var RunAggregator = class {
 					name: part.name,
 					data: part.value
 				});
+				materialized();
 				continue;
 			}
-			const entry = this.toolCalls.get(part.toolCallId);
-			if (!entry) continue;
-			const approval = approvals.get(entry.toolCallId);
-			const toolPart = {
-				type: "tool-call",
-				toolCallId: entry.toolCallId,
-				toolName: entry.toolCallName,
-				args: entry.parsedArgs ?? {},
-				argsText: entry.argsText,
-				...approval ? { approval } : {},
-				...entry.result !== void 0 ? { result: entry.result } : {},
-				...entry.modelContent !== void 0 ? { modelContent: entry.modelContent } : {},
-				...entry.isError !== void 0 ? { isError: entry.isError } : {},
-				...entry.mcpAppResourceUri ? { mcp: { app: {
-					resourceUri: entry.mcpAppResourceUri,
-					...entry.mcpAppServerId ? { serverId: entry.mcpAppServerId } : {}
-				} } } : {},
-				...entry.parentMessageId ? { parentId: entry.parentMessageId } : {},
-				...entry.toolMessageId ? { unstable_toolMessageId: entry.toolMessageId } : {}
-			};
-			snapshot.push(toolPart);
 		}
+		return snapshot;
+	}
+	emit() {
+		const { subagentsByParentToolCallId, reachable } = this.nesting();
+		const root = {
+			opaqueCandidates: Array.from(this.hiddenSignatures, ([id, encryptedValue]) => ({
+				id,
+				encryptedValue,
+				anchor: this.hiddenSignatureAnchors.get(id)
+			})),
+			lastMaterializedIndex: -1
+		};
+		const partsByScope = /* @__PURE__ */ new Map();
+		for (const [index, part] of this.partOrder.entries()) {
+			const rawScope = part.kind === "tool-call" ? this.toolCalls.get(part.toolCallId)?.subagentRunId ?? ROOT_SCOPE : "subagentRunId" in part ? part.subagentRunId ?? ROOT_SCOPE : ROOT_SCOPE;
+			const bucketScope = rawScope === ROOT_SCOPE || reachable.has(rawScope) ? rawScope : ROOT_SCOPE;
+			const bucket = partsByScope.get(bucketScope);
+			if (bucket) bucket.push({
+				index,
+				part
+			});
+			else partsByScope.set(bucketScope, [{
+				index,
+				part
+			}]);
+		}
+		const ctx = {
+			subagentsByParentToolCallId,
+			reachable,
+			partsByScope,
+			approvals: projectAgUiToolApprovals(this.status?.type === "requires-action" ? this.interrupts : void 0, new Set(Array.from(this.toolCalls.values()).map((entry) => entry.toolCallId))),
+			root
+		};
+		const snapshot = this.buildParts(ROOT_SCOPE, 0, ctx);
+		const { opaqueCandidates, lastMaterializedIndex } = root;
+		const toolMessageIds = /* @__PURE__ */ new Set();
+		for (const call of this.toolCalls.values()) if (call.toolMessageId) toolMessageIds.add(call.toolMessageId);
+		opaqueCandidates.sort((a, b) => a.anchor - b.anchor);
+		const publishableOpaqueReasoning = opaqueCandidates.filter((entry) => {
+			const collides = this.textParts.has(entry.id) || entry.id === this.reportedServerMessageId || toolMessageIds.has(entry.id);
+			if (collides && !this.loggedDroppedOpaqueIds.has(entry.id)) {
+				this.loggedDroppedOpaqueIds.add(entry.id);
+				this.logger.debug?.("[agui] aggregator dropped opaque reasoning signature: id collides with a message id", entry.id);
+			}
+			return !collides;
+		}).map(({ anchor, ...entry }) => lastMaterializedIndex < anchor ? {
+			...entry,
+			after: true
+		} : entry);
+		if (publishableOpaqueReasoning.length > 0) this.hasEmittedOpaqueReasoning = true;
+		const includeOpaque = this.hasEmittedOpaqueReasoning;
 		const timing = this.getTiming();
 		const metadata = {
 			...timing ? { timing } : {},
-			...this.interrupts ? { custom: { [AG_UI_METADATA_NAMESPACE]: { interrupts: this.interrupts } } } : {}
+			...this.interrupts || includeOpaque ? { custom: { [AG_UI_METADATA_NAMESPACE]: {
+				...this.interrupts ? { interrupts: this.interrupts } : {},
+				...includeOpaque ? { opaqueReasoning: publishableOpaqueReasoning } : {}
+			} } } : {}
 		};
 		const result = {
 			content: snapshot,
@@ -516,33 +788,57 @@ var RunAggregator = class {
 			toolCallCount: this.toolCalls.size
 		};
 	}
-	handleReasoningStart(messageId, isMessageId = false) {
-		if (!this.showThinking) return;
-		this.activeTextMessageId = void 0;
-		const key = messageId ?? `__auto-reasoning-${++this.reasoningPartCounter}`;
+	handleReasoningStart(scope, messageId, isMessageId = false) {
+		if (!this.showThinking) {
+			if (scope !== ROOT_SCOPE) return;
+			const anchor = this.partOrder.length;
+			if (messageId === void 0) {
+				this.hiddenActiveReasoning = "anonymous";
+				this.hiddenAnonymousAnchor = anchor;
+			} else {
+				this.hiddenReasoningIds.add(messageId);
+				this.hiddenBlockAnchors.set(messageId, anchor);
+				this.hiddenActiveReasoning = "identified";
+			}
+			return;
+		}
+		this.activeTextMessageIdByScope.delete(scope);
+		const key = this.partKey(scope, messageId ?? `__auto-reasoning-${++this.reasoningPartCounter}`);
 		if (messageId === void 0) this.anonymousReasoningKeys.add(key);
 		else if (isMessageId) this.reasoningMessageIds.set(key, messageId);
 		if (!this.reasoningParts.has(key)) {
 			this.reasoningParts.set(key, "");
-			this.partOrder.push({
+			this.partOrder.push(scope === ROOT_SCOPE ? {
 				kind: "reasoning",
 				key
+			} : {
+				kind: "reasoning",
+				key,
+				subagentRunId: scope
 			});
 		}
-		this.activeReasoningKey = key;
+		this.activeReasoningKeyByScope.set(scope, key);
 		this.emit();
 	}
-	handleReasoningContent(delta, messageId, isMessageId = false) {
-		if (!this.showThinking || !delta) return;
-		if (!this.activeReasoningKey) this.handleReasoningStart(messageId, isMessageId);
-		const key = this.activeReasoningKey;
+	handleReasoningContent(scope, delta, messageId, isMessageId = false) {
+		if (!delta) return;
+		if (!this.showThinking) {
+			if (scope !== ROOT_SCOPE) return;
+			if (this.hiddenActiveReasoning === "none") this.handleReasoningStart(scope, messageId, isMessageId);
+			return;
+		}
+		if (!this.activeReasoningKeyByScope.has(scope)) this.handleReasoningStart(scope, messageId, isMessageId);
+		const key = this.activeReasoningKeyByScope.get(scope);
 		if (!key) return;
 		this.reasoningParts.set(key, (this.reasoningParts.get(key) ?? "") + delta);
 		this.emit();
 	}
-	handleReasoningEnd() {
-		if (!this.showThinking) return;
-		this.activeReasoningKey = void 0;
+	handleReasoningEnd(scope) {
+		if (!this.showThinking) {
+			if (scope === ROOT_SCOPE) this.hiddenActiveReasoning = "none";
+			return;
+		}
+		this.activeReasoningKeyByScope.delete(scope);
 		this.emit();
 	}
 };