@assistant-ui/react-ag-ui 0.0.70 → 0.1.0

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

@@ -1,5 +1,5 @@
 "use client";
-import { readMcpAppResourceUri } from "../mcp-tool-result.js";
+import { readMcpAppResourceUri, toolContentText } from "../mcp-tool-result.js";
 import { AG_UI_METADATA_NAMESPACE } from "../types.js";
 import { projectAgUiToolApprovals } from "./tool-approval.js";
 import { isMcpAppUri } from "@assistant-ui/core";
@@ -76,11 +76,13 @@ const isPlainObject = (value) => !!value && typeof value === "object" && !Array.
 var RunAggregator = class {
 	emitUpdate;
 	showThinking;
+	joinStrategy;
 	logger;
 	onServerMessageId;
 	onTextMessageStart;
 	status;
 	interrupts;
+	pendingToolCallIds;
 	textParts = /* @__PURE__ */ new Map();
 	activeTextMessageIdByScope = /* @__PURE__ */ new Map();
 	reasoningParts = /* @__PURE__ */ new Map();
@@ -89,17 +91,14 @@ var RunAggregator = class {
 	hiddenSignatures = /* @__PURE__ */ new Map();
 	hiddenSignatureAnchors = /* @__PURE__ */ new Map();
 	hiddenBlockAnchors = /* @__PURE__ */ new Map();
-	hiddenAnonymousAnchor;
 	hiddenReasoningIds = /* @__PURE__ */ new Set();
-	hiddenActiveReasoning = "none";
+	hiddenActiveReasoningId;
 	hasEmittedOpaqueReasoning = false;
 	loggedDroppedOpaqueIds = /* @__PURE__ */ new Set();
 	reasoningMessageIds = /* @__PURE__ */ new Map();
-	anonymousReasoningKeys = /* @__PURE__ */ new Set();
 	activeReasoningKeyByScope = /* @__PURE__ */ new Map();
 	subagentRuns = /* @__PURE__ */ new Map();
 	nestingMemo;
-	reasoningPartCounter = 0;
 	toolCalls = /* @__PURE__ */ new Map();
 	a2uiBuckets = /* @__PURE__ */ new Map();
 	a2uiToolCallIds = /* @__PURE__ */ new Set();
@@ -117,6 +116,7 @@ var RunAggregator = class {
 	constructor(options) {
 		this.emitUpdate = options.emit;
 		this.showThinking = options.showThinking;
+		this.joinStrategy = options.joinStrategy;
 		this.logger = options.logger;
 		this.onServerMessageId = options.onServerMessageId;
 		this.onTextMessageStart = options.onTextMessageStart;
@@ -139,6 +139,16 @@ var RunAggregator = class {
 				this.emit();
 				break;
 			case "RUN_FINISHED": {
+				if (event.outcome?.type === "cancelled") {
+					this.interrupts = void 0;
+					this.status = {
+						type: "incomplete",
+						reason: "cancelled"
+					};
+					this.closeOpenSubagentRuns(this.status);
+					this.emit();
+					break;
+				}
 				if (event.outcome?.type === "interrupt") {
 					this.interrupts = event.outcome.interrupts;
 					this.status = {
@@ -149,7 +159,11 @@ var RunAggregator = class {
 					break;
 				}
 				this.interrupts = void 0;
-				const hasUnresolvedToolCalls = Array.from(this.toolCalls.values()).some((tc) => tc.result === void 0);
+				const pendingToolCallIds = event.outcome?.type === "success" ? event.outcome.pendingToolCallIds : void 0;
+				const hasUnresolvedToolCalls = pendingToolCallIds && pendingToolCallIds.length > 0 ? pendingToolCallIds.some((id) => {
+					const call = this.toolCalls.get(id);
+					return call !== void 0 && call.result === void 0;
+				}) : Array.from(this.toolCalls.values()).some((tc) => tc.result === void 0);
 				this.status = hasUnresolvedToolCalls ? {
 					type: "requires-action",
 					reason: "tool-calls"
@@ -157,6 +171,7 @@ var RunAggregator = class {
 					type: "complete",
 					reason: "unknown"
 				};
+				this.pendingToolCallIds = hasUnresolvedToolCalls && pendingToolCallIds?.length ? pendingToolCallIds : void 0;
 				this.closeOpenSubagentRuns(this.status);
 				this.emit();
 				break;
@@ -190,9 +205,8 @@ var RunAggregator = class {
 				this.emit();
 				break;
 			}
-			case "TEXT_MESSAGE_CONTENT":
-			case "TEXT_MESSAGE_CHUNK": {
-				const incomingId = "messageId" in event ? event.messageId : void 0;
+			case "TEXT_MESSAGE_CONTENT": {
+				const incomingId = event.messageId;
 				const scope = this.scopeOf(event);
 				if (scope === ROOT_SCOPE) {
 					this.beginDistinctTextMessage(incomingId);
@@ -223,43 +237,31 @@ var RunAggregator = class {
 				});
 				this.emit();
 				break;
-			case "THINKING_START":
-			case "THINKING_TEXT_MESSAGE_START":
 			case "REASONING_START":
 			case "REASONING_MESSAGE_START":
-				this.handleReasoningStart(this.scopeOf("subagentRunId" in event ? event : {}), "messageId" in event ? event.messageId : void 0, event.type === "REASONING_MESSAGE_START", event.timestamp);
+				this.handleReasoningStart(this.scopeOf(event), event.messageId, event.type === "REASONING_MESSAGE_START", event.timestamp);
 				break;
 			case "REASONING_ENCRYPTED_VALUE":
 				if (event.subtype === "message") {
 					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;
+					const key = this.showThinking && this.reasoningParts.has(entityKey) ? entityKey : 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")) {
+					} else if (!this.showThinking && scope === ROOT_SCOPE && event.entityId.trim().length > 0 && event.encryptedValue.trim().length > 0 && this.hiddenReasoningIds.has(event.entityId)) {
 						this.hiddenSignatures.set(event.entityId, event.encryptedValue);
-						this.hiddenSignatureAnchors.set(event.entityId, this.hiddenBlockAnchors.get(event.entityId) ?? this.hiddenAnonymousAnchor ?? this.partOrder.length);
+						this.hiddenSignatureAnchors.set(event.entityId, this.hiddenBlockAnchors.get(event.entityId) ?? this.partOrder.length);
 						this.emit();
 					}
 				}
 				break;
-			case "THINKING_TEXT_MESSAGE_CONTENT":
-				this.handleReasoningContent(ROOT_SCOPE, event.delta);
-				this.totalChunks++;
-				this.recordFirstToken();
-				break;
 			case "REASONING_MESSAGE_CONTENT":
-				this.handleReasoningContent(this.scopeOf(event), event.delta, "messageId" in event ? event.messageId : void 0, true);
+				this.handleReasoningContent(this.scopeOf(event), event.delta, event.messageId, true);
 				this.totalChunks++;
 				this.recordFirstToken();
 				break;
-			case "THINKING_TEXT_MESSAGE_END":
-			case "THINKING_END":
-				this.handleReasoningEnd(ROOT_SCOPE, event.timestamp);
-				break;
 			case "REASONING_MESSAGE_END":
 			case "REASONING_END":
 				this.handleReasoningEnd(this.scopeOf(event), event.timestamp);
@@ -272,8 +274,6 @@ var RunAggregator = class {
 				break;
 			}
 			case "TOOL_CALL_ARGS":
-			case "TOOL_CALL_CHUNK":
-				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();
@@ -492,15 +492,12 @@ var RunAggregator = class {
 		this.hiddenSignatures.clear();
 		this.hiddenSignatureAnchors.clear();
 		this.hiddenBlockAnchors.clear();
-		this.hiddenAnonymousAnchor = void 0;
 		this.hiddenReasoningIds.clear();
-		this.hiddenActiveReasoning = "none";
+		this.hiddenActiveReasoningId = void 0;
 		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();
@@ -522,13 +519,12 @@ var RunAggregator = class {
 		return scope === ROOT_SCOPE ? id : `${scope}\u0000${id}`;
 	}
 	beginDistinctTextMessage(messageId) {
-		if (!messageId || this.lastTextMessageId === void 0 || this.lastTextMessageId === messageId || !this.onTextMessageStart) return;
+		if (this.joinStrategy === "concat-content" || !messageId || this.lastTextMessageId === void 0 || this.lastTextMessageId === messageId || !this.onTextMessageStart) return;
 		const carried = this.takeTrailingReasoning();
 		if (carried.parts.length > 0 || carried.hiddenSignatures.length > 0) this.emit();
-		const reasoningPartCounter = this.reasoningPartCounter;
+		const openToolCallIds = Array.from(this.toolCalls.values()).filter((call) => call.result === void 0).map((call) => call.toolCallId);
 		this.resetMessageParts();
-		this.onTextMessageStart(messageId);
-		this.reasoningPartCounter = reasoningPartCounter;
+		this.onTextMessageStart(messageId, openToolCallIds);
 		this.restoreReasoning(carried);
 	}
 	takeTrailingReasoning() {
@@ -541,8 +537,7 @@ var RunAggregator = class {
 				entry: this.reasoningParts.get(last.key) ?? { buffer: "" },
 				signature: this.reasoningSignatures.get(last.key),
 				signatureId: this.reasoningSignatureIds.get(last.key),
-				reasoningId: this.reasoningMessageIds.get(last.key),
-				anonymous: this.anonymousReasoningKeys.has(last.key)
+				reasoningId: this.reasoningMessageIds.get(last.key)
 			});
 			last = this.partOrder.at(-1);
 		}
@@ -553,15 +548,13 @@ var RunAggregator = class {
 			this.hiddenSignatureAnchors.delete(id);
 		}
 		const hiddenBlockIds = Array.from(this.hiddenBlockAnchors).filter(([, anchor]) => anchor >= cut).map(([id]) => id);
-		const hiddenAnonymous = this.hiddenAnonymousAnchor !== void 0 && this.hiddenAnonymousAnchor >= cut;
-		const activeCarried = this.hiddenActiveReasoning === "identified" && hiddenBlockIds.length > 0 || this.hiddenActiveReasoning === "anonymous" && hiddenAnonymous;
+		const hiddenActiveReasoningId = this.hiddenActiveReasoningId;
 		return {
 			parts,
 			activeKey: this.activeReasoningKeyByScope.get(ROOT_SCOPE),
 			hiddenSignatures,
 			hiddenBlockIds,
-			hiddenAnonymous,
-			hiddenActiveReasoning: activeCarried ? this.hiddenActiveReasoning : "none"
+			hiddenActiveReasoningId: hiddenActiveReasoningId !== void 0 && hiddenBlockIds.includes(hiddenActiveReasoningId) ? hiddenActiveReasoningId : void 0
 		};
 	}
 	restoreReasoning(carried) {
@@ -574,7 +567,6 @@ var RunAggregator = class {
 			if (part.signature !== void 0) this.reasoningSignatures.set(part.key, part.signature);
 			if (part.signatureId !== void 0) this.reasoningSignatureIds.set(part.key, part.signatureId);
 			if (part.reasoningId !== void 0) this.reasoningMessageIds.set(part.key, part.reasoningId);
-			if (part.anonymous) this.anonymousReasoningKeys.add(part.key);
 		}
 		if (carried.activeKey !== void 0 && this.reasoningParts.has(carried.activeKey)) this.activeReasoningKeyByScope.set(ROOT_SCOPE, carried.activeKey);
 		for (const [id, encryptedValue] of carried.hiddenSignatures) {
@@ -585,8 +577,7 @@ var RunAggregator = class {
 			this.hiddenReasoningIds.add(id);
 			this.hiddenBlockAnchors.set(id, 0);
 		}
-		if (carried.hiddenAnonymous) this.hiddenAnonymousAnchor = 0;
-		this.hiddenActiveReasoning = carried.hiddenActiveReasoning;
+		this.hiddenActiveReasoningId = carried.hiddenActiveReasoningId;
 	}
 	generateTextKey() {
 		this.textPartCounter += 1;
@@ -694,6 +685,7 @@ var RunAggregator = class {
 	}
 	finishToolCall(scope, id, content, isError, toolMessageId, mcpResult) {
 		if (!id) return;
+		const modelText = toolContentText(content);
 		let entry = this.toolCalls.get(id);
 		if (!entry) {
 			entry = {
@@ -717,7 +709,7 @@ var RunAggregator = class {
 			entry.result = mcpResult;
 			entry.modelContent = [{
 				type: "text",
-				text: content
+				text: modelText
 			}];
 			entry.snapshotResultApplied = true;
 			entry.isError = isError;
@@ -728,11 +720,12 @@ var RunAggregator = class {
 		} else if (entry.snapshotResultApplied) {
 			if (entry.modelContent === void 0) entry.modelContent = [{
 				type: "text",
-				text: content
+				text: modelText
 			}];
 			if (entry.isError === void 0) entry.isError = isError;
 		} else {
-			entry.result = tryParseJSON(content);
+			entry.result = Array.isArray(content) ? content : tryParseJSON(content);
+			if (Array.isArray(content)) delete entry.modelContent;
 			entry.isError = isError;
 		}
 		if (toolMessageId) entry.toolMessageId = toolMessageId;
@@ -942,8 +935,9 @@ var RunAggregator = class {
 		const timing = this.getTiming();
 		const metadata = {
 			...timing ? { timing } : {},
-			...this.interrupts || includeOpaque ? { custom: { [AG_UI_METADATA_NAMESPACE]: {
+			...this.interrupts || this.status?.type === "requires-action" && this.status.reason === "tool-calls" && this.pendingToolCallIds || includeOpaque ? { custom: { [AG_UI_METADATA_NAMESPACE]: {
 				...this.interrupts ? { interrupts: this.interrupts } : {},
+				...this.status?.type === "requires-action" && this.status.reason === "tool-calls" && this.pendingToolCallIds ? { pendingToolCallIds: this.pendingToolCallIds } : {},
 				...includeOpaque ? { opaqueReasoning: publishableOpaqueReasoning } : {}
 			} } } : {}
 		};
@@ -976,20 +970,14 @@ var RunAggregator = class {
 		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";
-			}
+			this.hiddenReasoningIds.add(messageId);
+			this.hiddenBlockAnchors.set(messageId, anchor);
+			this.hiddenActiveReasoningId = messageId;
 			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);
+		const key = this.partKey(scope, messageId);
+		if (isMessageId) this.reasoningMessageIds.set(key, messageId);
 		if (!this.reasoningParts.has(key)) {
 			this.reasoningParts.set(key, { buffer: "" });
 			this.partOrder.push(scope === ROOT_SCOPE ? {
@@ -1011,7 +999,7 @@ var RunAggregator = class {
 		if (!delta) return;
 		if (!this.showThinking) {
 			if (scope !== ROOT_SCOPE) return;
-			if (this.hiddenActiveReasoning === "none") this.handleReasoningStart(scope, messageId, isMessageId);
+			if (this.hiddenActiveReasoningId === void 0) this.handleReasoningStart(scope, messageId, isMessageId);
 			return;
 		}
 		if (!this.activeReasoningKeyByScope.has(scope)) this.handleReasoningStart(scope, messageId, isMessageId);
@@ -1023,7 +1011,7 @@ var RunAggregator = class {
 	}
 	handleReasoningEnd(scope, timestamp) {
 		if (!this.showThinking) {
-			if (scope === ROOT_SCOPE) this.hiddenActiveReasoning = "none";
+			if (scope === ROOT_SCOPE) this.hiddenActiveReasoningId = void 0;
 			return;
 		}
 		const key = this.activeReasoningKeyByScope.get(scope);