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

package/dist/runtime/adapter/replay-content.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"replay-content.js","names":[],"sources":["../../../src/runtime/adapter/replay-content.ts"],"sourcesContent":["import type {\n  ThreadAssistantMessage,\n  ThreadMessage,\n  ToolCallMessagePart,\n} from \"@assistant-ui/core\";\nimport {\n  iterateToolCallParts,\n  mapToolCallPartsDeep,\n} from \"@assistant-ui/core/internal\";\n\nimport { preserveToolApprovalDecision } from \"./tool-approval\";\n\ntype Content = ThreadAssistantMessage[\"content\"];\ntype Part = Content[number];\n\nexport function indexReplayToolOwners(\n  owners: readonly ThreadAssistantMessage[],\n): ReadonlyMap<string, string> {\n  const ownerByToolCallId = new Map<string, string>();\n  for (const owner of owners) {\n    for (const part of iterateToolCallParts(owner.content)) {\n      if (!ownerByToolCallId.has(part.toolCallId))\n        ownerByToolCallId.set(part.toolCallId, owner.id);\n    }\n  }\n  return ownerByToolCallId;\n}\n\nexport function groupReplayToolContent(\n  owners: readonly ThreadAssistantMessage[],\n  content: Content,\n  fallbackMessageId: string,\n): Map<string, Part[]> {\n  const ownerByToolCallId = indexReplayToolOwners(owners);\n  const grouped = new Map<string, Part[]>([[fallbackMessageId, []]]);\n  for (const part of content) {\n    const ownerId =\n      part.type === \"tool-call\"\n        ? (ownerByToolCallId.get(part.toolCallId) ?? fallbackMessageId)\n        : fallbackMessageId;\n    const parts = grouped.get(ownerId) ?? [];\n    parts.push(part);\n    grouped.set(ownerId, parts);\n  }\n  return grouped;\n}\n\nexport function preserveToolResult(\n  previous: ToolCallMessagePart,\n  next: ToolCallMessagePart,\n): ToolCallMessagePart {\n  if (previous.result === undefined || next.result !== undefined) return next;\n  return {\n    ...next,\n    result: previous.result,\n    ...(previous.artifact !== undefined ? { artifact: previous.artifact } : {}),\n    ...(previous.isError !== undefined ? { isError: previous.isError } : {}),\n    ...(previous.modelContent !== undefined\n      ? { modelContent: previous.modelContent }\n      : {}),\n  };\n}\n\nfunction mergeOrdered<T>(\n  previous: readonly (readonly [T, string])[],\n  next: readonly (readonly [T, string])[],\n  merge: (old: T, fresh: T) => T,\n): T[] {\n  const old = new Map(previous.map(([value, key]) => [key, value] as const));\n  const indexes = new Map(next.map(([, key], index) => [key, index] as const));\n  const insertions: T[][] = Array.from({ length: next.length + 1 }, () => []);\n  let predecessor = -1;\n  for (const [value, key] of previous) {\n    const index = indexes.get(key);\n    if (index === undefined) insertions[predecessor + 1]!.push(value);\n    else predecessor = index;\n  }\n  const result: T[] = [];\n  for (const [index, [value, key]] of next.entries()) {\n    const prior = old.get(key);\n    result.push(\n      ...insertions[index]!,\n      prior === undefined ? value : merge(prior, value),\n    );\n  }\n  result.push(...insertions[next.length]!);\n  return result;\n}\n\nfunction mergeMessages(\n  previous: readonly ThreadMessage[],\n  next: readonly ThreadMessage[],\n): readonly ThreadMessage[] {\n  return mergeOrdered(\n    previous.map((message) => [message, message.id] as const),\n    next.map((message) => [message, message.id] as const),\n    (old, fresh) =>\n      old.role === \"assistant\" && fresh.role === \"assistant\"\n        ? { ...fresh, content: mergeReplayContent(old.content, fresh.content) }\n        : fresh,\n  );\n}\n\nfunction mergeTool(\n  previous: ToolCallMessagePart,\n  next: ToolCallMessagePart,\n): ToolCallMessagePart {\n  const result = preserveToolResult(previous, next);\n  const approval = preserveToolApprovalDecision(previous, next);\n  return {\n    ...result,\n    ...(approval ? { approval } : {}),\n    ...(result.unstable_interactions === undefined &&\n    previous.unstable_interactions !== undefined\n      ? { unstable_interactions: previous.unstable_interactions }\n      : {}),\n    ...(previous.messages !== undefined || next.messages !== undefined\n      ? {\n          messages: mergeMessages(previous.messages ?? [], next.messages ?? []),\n        }\n      : {}),\n  };\n}\n\nfunction partKey(part: Part): string {\n  if (part.type === \"tool-call\") return `tool:${part.toolCallId}`;\n  if (part.type === \"text\" || part.type === \"reasoning\") return part.type;\n  if (\"id\" in part && typeof part.id === \"string\" && part.id)\n    return `${part.type}:${part.id}`;\n  if (part.type === \"data\") return `data:${part.name}`;\n  return part.type;\n}\n\nfunction keyed(content: Content): [Part, string][] {\n  const ordinals = new Map<string, number>();\n  return content.map((part) => {\n    const base = partKey(part);\n    const ordinal = ordinals.get(base) ?? 0;\n    ordinals.set(base, ordinal + 1);\n    return [part, `${base}:${ordinal}`] as [Part, string];\n  });\n}\n\nfunction identity(part: Part, key: string, scope: readonly string[]): string {\n  return JSON.stringify(\n    part.type === \"tool-call\" ? [\"tool\", part.toolCallId] : [...scope, key],\n  );\n}\n\nfunction visitMessages(\n  messages: readonly ThreadMessage[],\n  scope: readonly string[],\n  visit: (key: string) => void,\n): void {\n  for (const message of messages) {\n    const path = [...scope, \"message\", message.id];\n    visit(JSON.stringify(path));\n    if (message.role === \"assistant\")\n      visitContent(message.content, path, visit);\n  }\n}\n\nfunction visitContent(\n  content: Content,\n  scope: readonly string[],\n  visit: (key: string) => void,\n): void {\n  for (const [part, key] of keyed(content)) {\n    visit(identity(part, key, scope));\n    if (part.type === \"tool-call\" && part.messages)\n      visitMessages(part.messages, [\"tool\", part.toolCallId], visit);\n  }\n}\n\nfunction pruneMessages(\n  messages: readonly ThreadMessage[],\n  scope: readonly string[],\n  present: ReadonlySet<string>,\n  owned: ReadonlySet<string>,\n): { messages: readonly ThreadMessage[]; hasCurrent: boolean } {\n  let hasCurrent = false;\n  const kept = messages.flatMap((message) => {\n    const path = [...scope, \"message\", message.id];\n    const key = JSON.stringify(path);\n    const nested =\n      message.role === \"assistant\"\n        ? pruneContent(message.content, path, present, owned)\n        : undefined;\n    const current = present.has(key) || (nested?.hasCurrent ?? false);\n    if (owned.has(key) && !current) return [];\n    hasCurrent ||= current;\n    return [\n      nested && message.role === \"assistant\"\n        ? { ...message, content: nested.content }\n        : message,\n    ];\n  });\n  return { messages: kept, hasCurrent };\n}\n\nfunction pruneContent(\n  content: Content,\n  scope: readonly string[],\n  present: ReadonlySet<string>,\n  owned: ReadonlySet<string>,\n): { content: Content; hasCurrent: boolean } {\n  let hasCurrent = false;\n  const kept = keyed(content).flatMap(([part, localKey]) => {\n    const key = identity(part, localKey, scope);\n    const nested =\n      part.type === \"tool-call\" && part.messages\n        ? pruneMessages(\n            part.messages,\n            [\"tool\", part.toolCallId],\n            present,\n            owned,\n          )\n        : undefined;\n    const current = present.has(key) || (nested?.hasCurrent ?? false);\n    if (owned.has(key) && !current) return [];\n    hasCurrent ||= current;\n    return [nested ? { ...part, messages: nested.messages } : part];\n  });\n  return { content: kept, hasCurrent };\n}\n\nexport function createReplayContentMerger(): (\n  previous: Content,\n  next: Content,\n) => Content {\n  // Remember stream-owned identities, never a second copy of tool payloads.\n  const owned = new Set<string>();\n  return (previous, next) => {\n    const present = new Set<string>();\n    visitContent(next, [], (key) => present.add(key));\n    for (const key of present) owned.add(key);\n    return pruneContent(mergeReplayContent(previous, next), [], present, owned)\n      .content;\n  };\n}\n\nfunction nestedToolIds(content: Content): Set<string> {\n  const nestedIds = new Set<string>();\n  for (const part of content) {\n    if (part.type !== \"tool-call\") continue;\n    for (const message of part.messages ?? []) {\n      if (message.role !== \"assistant\") continue;\n      for (const child of iterateToolCallParts(message.content)) {\n        nestedIds.add(child.toolCallId);\n      }\n    }\n  }\n  return nestedIds;\n}\n\nfunction mergeReplayContent(previous: Content, next: Content): Content {\n  const nestedIds = nestedToolIds(previous);\n  const incomingNestedIds = nestedToolIds(next);\n  const movingRoots = new Map(\n    previous.flatMap((part) =>\n      part.type === \"tool-call\" && incomingNestedIds.has(part.toolCallId)\n        ? [[part.toolCallId, part] as const]\n        : [],\n    ),\n  );\n  const flattened = new Map<string, ToolCallMessagePart>();\n  for (const part of next) {\n    if (part.type === \"tool-call\" && nestedIds.has(part.toolCallId)) {\n      flattened.set(part.toolCallId, part);\n    }\n  }\n  const prior = (\n    flattened.size\n      ? mapToolCallPartsDeep(previous, (part) => {\n          const fresh = flattened.get(part.toolCallId);\n          return fresh ? mergeTool(part, fresh) : part;\n        }).content\n      : previous\n  ).filter(\n    (part) => part.type !== \"tool-call\" || !movingRoots.has(part.toolCallId),\n  );\n  let incoming = next.filter(\n    (part) => part.type !== \"tool-call\" || !flattened.has(part.toolCallId),\n  );\n  if (movingRoots.size) {\n    incoming = [\n      ...mapToolCallPartsDeep(incoming, (part) => {\n        const prior = movingRoots.get(part.toolCallId);\n        return prior ? mergeTool(prior, part) : part;\n      }).content,\n    ];\n  }\n  return mergeOrdered(keyed(prior), keyed(incoming), (old, fresh) => {\n    if (old.type === \"tool-call\" && fresh.type === \"tool-call\")\n      return mergeTool(old, fresh);\n    if (\n      (old.type === \"text\" || old.type === \"reasoning\") &&\n      (fresh.type === \"text\" || fresh.type === \"reasoning\") &&\n      old.text.startsWith(fresh.text) &&\n      old.text.length > fresh.text.length\n    ) {\n      return { ...fresh, text: old.text };\n    }\n    return fresh;\n  });\n}\n"],"mappings":"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"}

package/dist/runtime/adapter/run-aggregator.d.ts

@@ -10,7 +10,7 @@ export type RunAggregatorOptions = {
     logger: Logger;
     emit: Emit;
     onServerMessageId?: (messageId: string) => void;
-    onTextMessageStart?: (messageId: string) => void;
+    onTextMessageStart?: (messageId: string, openToolCallIds: string[]) => void;
 };
 /**
  * Collects AG-UI events into assistant-ui run snapshots that can be yielded from a ChatModelAdapter.
@@ -31,6 +31,7 @@ export declare class RunAggregator {
     private readonly onTextMessageStart;
     private status;
     private interrupts;
+    private pendingToolCallIds;
     private readonly textParts;
     private readonly activeTextMessageIdByScope;
     private readonly reasoningParts;
@@ -39,17 +40,14 @@ export declare class RunAggregator {
     private readonly hiddenSignatures;
     private readonly hiddenSignatureAnchors;
     private readonly hiddenBlockAnchors;
-    private hiddenAnonymousAnchor;
     private readonly hiddenReasoningIds;
-    private hiddenActiveReasoning;
+    private hiddenActiveReasoningId;
     private hasEmittedOpaqueReasoning;
     private readonly loggedDroppedOpaqueIds;
     private readonly reasoningMessageIds;
-    private readonly anonymousReasoningKeys;
     private readonly activeReasoningKeyByScope;
     private readonly subagentRuns;
     private nestingMemo;
-    private reasoningPartCounter;
     private readonly toolCalls;
     private readonly a2uiBuckets;
     private readonly a2uiToolCallIds;

package/dist/runtime/adapter/run-aggregator.d.ts.map

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

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

@@ -1,11 +1,11 @@
 "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";
 import jsonpatch from "fast-json-patch";
 import { applyA2uiOperations, surfaceToPresentToolCall } from "@assistant-ui/generative-ui/a2ui";
-//#region src/runtime/adapter/run-aggregator.ts
+// src/runtime/adapter/run-aggregator.ts
 const ROOT_SCOPE = "";
 const MAX_SUBAGENT_DEPTH = 16;
 const createJSONContainerScanner = () => ({
@@ -82,6 +82,7 @@ var RunAggregator = class {
 	onTextMessageStart;
 	status;
 	interrupts;
+	pendingToolCallIds;
 	textParts = /* @__PURE__ */ new Map();
 	activeTextMessageIdByScope = /* @__PURE__ */ new Map();
 	reasoningParts = /* @__PURE__ */ new Map();
@@ -90,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();
@@ -141,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 = {
@@ -151,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"
@@ -159,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;
@@ -192,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);
@@ -225,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);
@@ -274,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();
@@ -494,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();
@@ -527,10 +522,9 @@ var RunAggregator = class {
 		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() {
@@ -543,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);
 		}
@@ -555,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) {
@@ -576,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) {
@@ -587,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;
@@ -696,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 = {
@@ -719,7 +709,7 @@ var RunAggregator = class {
 			entry.result = mcpResult;
 			entry.modelContent = [{
 				type: "text",
-				text: content
+				text: modelText
 			}];
 			entry.snapshotResultApplied = true;
 			entry.isError = isError;
@@ -730,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;
@@ -944,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 } : {}
 			} } } : {}
 		};
@@ -978,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 ? {
@@ -1013,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);
@@ -1025,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);
@@ -1046,7 +1032,6 @@ function tryParseJSON(value) {
 		return value;
 	}
 }
-//#endregion
 export { RunAggregator, isPlainObject, tryParseJSON };
 
 //# sourceMappingURL=run-aggregator.js.map