@assistant-ui/react-ag-ui 0.0.59 → 0.0.61

package/dist/runtime/adapter/conversions.d.ts

@@ -1,69 +1,67 @@
-import { ThreadMessageLike } from "@assistant-ui/core";
-import { InputContent, RunAgentParameters } from "@ag-ui/client";
-import { Tool } from "assistant-stream";
-//#region src/runtime/adapter/conversions.d.ts
+import type { InputContent, RunAgentParameters } from "@ag-ui/client";
+import type { ThreadMessageLike as CoreThreadMessageLike } from "@assistant-ui/core";
+import { type Tool } from "assistant-stream";
+export type { InputContent };
 type AttachmentLike = {
-  name?: string | undefined;
-  contentType?: string | undefined;
-  content?: readonly unknown[] | undefined;
+    name?: string | undefined;
+    contentType?: string | undefined;
+    content?: readonly unknown[] | undefined;
 };
-type ThreadMessageLike$1 = {
-  id?: string;
-  role: string;
-  content: unknown;
-  metadata?: unknown;
-  name?: string;
-  toolCallId?: string;
-  error?: string;
-  attachments?: readonly AttachmentLike[];
+type ThreadMessageLike = {
+    id?: string | undefined;
+    role: string;
+    content: unknown;
+    metadata?: unknown;
+    name?: string | undefined;
+    toolCallId?: string | undefined;
+    error?: string | undefined;
+    attachments?: readonly AttachmentLike[] | undefined;
 };
 type AgUiToolCall = {
-  id: string;
-  type: "function";
-  function: {
-    name: string;
-    arguments: string;
-  };
+    id: string;
+    type: "function";
+    function: {
+        name: string;
+        arguments: string;
+    };
 };
-type AgUiMessage = {
-  id: string;
-  role: "user";
-  content: string | InputContent[];
-  name?: string;
+export type AgUiMessage = {
+    id: string;
+    role: "user";
+    content: string | InputContent[];
+    name?: string;
 } | {
-  id: string;
-  role: "assistant";
-  content: string;
-  name?: string;
-  toolCalls?: AgUiToolCall[];
+    id: string;
+    role: "assistant";
+    content: string;
+    name?: string;
+    toolCalls?: AgUiToolCall[];
 } | {
-  id: string;
-  role: "system" | "developer";
-  content: string;
-  name?: string;
+    id: string;
+    role: "system" | "developer";
+    content: string;
+    name?: string;
 } | {
-  id: string;
-  role: "reasoning";
-  content: string;
-  encryptedValue?: string;
+    id: string;
+    role: "reasoning";
+    content: string;
+    encryptedValue?: string;
 } | {
-  id: string;
-  role: "tool";
-  content: string;
-  toolCallId: string;
-  error?: string;
+    id: string;
+    role: "tool";
+    content: string;
+    toolCallId: string;
+    error?: string;
 };
-type FromAgUiMessagesOptions = {
-  /**
-   * Whether to convert `reasoning` messages into visible reasoning parts.
-   * Matches the `showThinking` option of `useAgUiRuntime`. Defaults to `true`.
-   */
-  showThinking?: boolean;
+export type FromAgUiMessagesOptions = {
+    /**
+     * Whether to convert `reasoning` messages into visible reasoning parts.
+     * Matches the `showThinking` option of `useAgUiRuntime`. Defaults to `true`.
+     */
+    showThinking?: boolean;
 };
-declare function fromAgUiMessages(messages: readonly unknown[], options?: FromAgUiMessagesOptions): ThreadMessageLike[];
-declare function toAgUiMessages(messages: readonly ThreadMessageLike$1[]): AgUiMessage[];
+export declare function fromAgUiMessages(messages: readonly unknown[], options?: FromAgUiMessagesOptions): CoreThreadMessageLike[];
+export declare function toAgUiMessages(messages: readonly ThreadMessageLike[]): AgUiMessage[];
 type AgUiTool = NonNullable<RunAgentParameters["tools"]>[number];
-declare function toAgUiTools(tools: Record<string, Tool> | undefined): AgUiTool[];
-//#endregion
-export { AgUiMessage, FromAgUiMessagesOptions, type InputContent, fromAgUiMessages, toAgUiMessages, toAgUiTools };
+export declare function toAgUiTools(tools: Record<string, Tool> | undefined): AgUiTool[];
 //# sourceMappingURL=conversions.d.ts.map

package/dist/runtime/adapter/conversions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversions.d.ts","names":[],"sources":["../../../src/runtime/adapter/conversions.ts"],"mappings":";;;;KAuCK;EACH;EACA;EACA;;KAGG;EACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA,uBAAuB;;KAKpB;EACH;EACA;EACA;IAAY;IAAc;;;KAGhB;EAEN;EACA;EACA,kBAAkB;EAClB;;EAGA;EACA;EACA;EACA;EACA,YAAY;;EAGZ;EACA;EACA;EACA;;EAGA;EACA;EACA;EACA;;EAGA;EACA;EACA;EACA;EACA;;KAgoBM;;;;;EAKV;;iBAGc,iBACd,8BACA,UAAU,0BACT;iBAuaa,eACd,mBAAmB,wBAClB;KAsFE,WAAW,YAAY;iBAEZ,YACd,OAAO,eAAe,oBACrB"}
+{"version":3,"file":"conversions.d.ts","sourceRoot":"","sources":["../../../src/runtime/adapter/conversions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEtE,OAAO,KAAK,EACV,iBAAiB,IAAI,qBAAqB,EAM3C,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,KAAK,IAAI,EAAqB,MAAM,kBAAkB,CAAC;AAuBhE,YAAY,EAAE,YAAY,EAAE,CAAC;AAE7B,KAAK,cAAc,GAAG;IACpB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,OAAO,CAAC,EAAE,SAAS,OAAO,EAAE,GAAG,SAAS,CAAC;CAC1C,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,cAAc,EAAE,GAAG,SAAS,CAAC;CACrD,CAAC;AAIF,KAAK,YAAY,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,WAAW,GACnB;IACE,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,YAAY,EAAE,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IACE,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,YAAY,EAAE,CAAC;CAC5B,GACD;IACE,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,QAAQ,GAAG,WAAW,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IACE,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AA8vBN,MAAM,MAAM,uBAAuB,GAAG;IACpC;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,OAAO,CAAC,EAAE,uBAAuB,GAChC,qBAAqB,EAAE,CAsXzB;AAiKD,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,SAAS,iBAAiB,EAAE,GACrC,WAAW,EAAE,CAoFf;AAED,KAAK,QAAQ,GAAG,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjE,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,SAAS,GACtC,QAAQ,EAAE,CASZ"}

package/dist/runtime/adapter/conversions.js

@@ -4,7 +4,7 @@ import { projectAgUiToolApprovals } from "./tool-approval.js";
 import { AG_UI_METADATA_NAMESPACE } from "./run-aggregator.js";
 import { generateId } from "@assistant-ui/core";
 import { getAutoStatus, parseDataUrl, resolveFilePartSource } from "@assistant-ui/core/internal";
-import { applyA2uiOperations, convertSurfaceToUISpec } from "@assistant-ui/react-generative-ui/a2ui";
+import { applyA2uiOperations, convertSurfaceToUISpec, surfaceToOperations } from "@assistant-ui/react-generative-ui/a2ui";
 import { toToolsJSONSchema } from "assistant-stream";
 //#region src/runtime/adapter/conversions.ts
 const isObject = (value) => typeof value === "object" && value !== null;
@@ -79,7 +79,7 @@ function buildInputSource(value, declaredMimeType, sourceType) {
 	const source = resolveFilePartSource({
 		data: value,
 		mimeType: declaredMimeType ?? "application/octet-stream",
-		sourceType
+		sourceType: /^data:/i.test(value) && !parseDataUrl(value) ? "url" : sourceType
 	});
 	if (source.kind === "url") return declaredMimeType !== void 0 ? {
 		type: "url",
@@ -424,7 +424,8 @@ function attachA2uiSurfaces(message, state) {
 			toolName: "present",
 			args: spec,
 			argsText: JSON.stringify(spec),
-			result: {}
+			result: {},
+			artifact: { a2ui: surfaceToOperations(surface) }
 		});
 	}
 	const preserved = (Array.isArray(message.content) ? message.content : []).filter((part) => !(isObject(part) && part.type === "tool-call" && typeof part.toolCallId === "string" && part.toolCallId.startsWith("a2ui:")));
@@ -433,17 +434,100 @@ function attachA2uiSurfaces(message, state) {
 		content: [...preserved, ...a2uiParts]
 	};
 }
+function isSyntheticToolCallContainer(message) {
+	if (message.role !== "assistant" || !Array.isArray(message.content)) return false;
+	let carriesOwnId = false;
+	for (const part of message.content) {
+		if (!isObject(part)) continue;
+		if (part.type === "text") return false;
+		if (part.type === "tool-call" && getString(part, "toolCallId") === message.id) carriesOwnId = true;
+	}
+	return carriesOwnId;
+}
+function carriesPart(message, type) {
+	return Array.isArray(message.content) && message.content.some((part) => isObject(part) && part.type === type);
+}
+function carriesText(message) {
+	return carriesPart(message, "text");
+}
+function opensTurn(message) {
+	return message.role === "assistant" && (carriesText(message) || carriesPart(message, "tool-call"));
+}
+function answersToolCallContainer(message) {
+	if (message.role !== "assistant" || !Array.isArray(message.content)) return false;
+	if (message.content.length === 0) return false;
+	return !message.content.some((part) => isObject(part) && part.type === "tool-call");
+}
+function readCustomMetadata(metadata) {
+	if (!isObject(metadata) || !isObject(metadata.custom)) return {};
+	return metadata.custom;
+}
+function readNamespacedMetadata(metadata) {
+	const namespaced = readCustomMetadata(metadata)[AG_UI_METADATA_NAMESPACE];
+	return isObject(namespaced) ? namespaced : {};
+}
+function foldTurnRecords(previous, message) {
+	const interrupts = [...readPersistedInterrupts(previous.metadata) ?? [], ...readPersistedInterrupts(message.metadata) ?? []];
+	const trailsCalls = carriesPart(previous, "tool-call");
+	const opaqueReasoning = [...readOpaqueReasoning(previous.metadata), ...readOpaqueReasoning(message.metadata).map((entry) => trailsCalls ? {
+		...entry,
+		after: true
+	} : entry)];
+	const namespaced = {
+		...readNamespacedMetadata(previous.metadata),
+		...readNamespacedMetadata(message.metadata),
+		...interrupts.length > 0 ? { interrupts } : {},
+		...opaqueReasoning.length > 0 ? { opaqueReasoning } : {}
+	};
+	const custom = {
+		...readCustomMetadata(previous.metadata),
+		...readCustomMetadata(message.metadata),
+		...Object.keys(namespaced).length > 0 ? { [AG_UI_METADATA_NAMESPACE]: namespaced } : {}
+	};
+	const metadata = {
+		...isObject(previous.metadata) ? previous.metadata : {},
+		...isObject(message.metadata) ? message.metadata : {},
+		...Object.keys(custom).length > 0 ? { custom } : {}
+	};
+	return {
+		...previous,
+		...message,
+		id: carriesText(message) ? message.id : previous.id,
+		content: [...Array.isArray(previous.content) ? previous.content : [], ...Array.isArray(message.content) ? message.content : []],
+		...Object.keys(metadata).length > 0 ? { metadata } : {}
+	};
+}
 function fromAgUiMessages(messages, options) {
 	const showThinking = options?.showThinking ?? true;
 	const converted = [];
 	const a2uiBuckets = /* @__PURE__ */ new Map();
 	const a2uiBucketOwnerIndices = /* @__PURE__ */ new Map();
+	const activityParts = /* @__PURE__ */ new Map();
 	const opaqueReasoning = [];
+	const pendingReasoning = [];
+	const flushPendingReasoning = () => {
+		for (const { id, part } of pendingReasoning) converted.push({
+			id: id ?? generateId(),
+			role: "assistant",
+			content: [part]
+		});
+		pendingReasoning.length = 0;
+	};
+	const withPendingReasoning = (message) => {
+		if (pendingReasoning.length === 0) return message;
+		const parts = pendingReasoning.map(({ part }) => part);
+		pendingReasoning.length = 0;
+		return {
+			...message,
+			content: [...parts, ...Array.isArray(message.content) ? message.content : []]
+		};
+	};
 	for (const rawMessage of messages) {
 		if (!isObject(rawMessage)) continue;
 		const role = getString(rawMessage, "role");
 		if (!role) continue;
 		if (role === "tool") {
+			flushPendingReasoning();
 			const toolCallId = getToolCallId(rawMessage) ?? `tool-${generateId()}`;
 			const toolMessageId = getString(rawMessage, "id");
 			const modelContent = extractText(rawMessage.content);
@@ -503,9 +587,9 @@ function fromAgUiMessages(messages, options) {
 			continue;
 		}
 		if (role === "activity") {
-			if (getString(rawMessage, "activityType") !== "a2ui-surface") continue;
-			const operations = (isObject(rawMessage.content) ? rawMessage.content : null)?.["a2ui_operations"];
-			if (!Array.isArray(operations)) continue;
+			const activityType = getString(rawMessage, "activityType");
+			if (activityType === void 0 || activityType === "mcp-apps") continue;
+			flushPendingReasoning();
 			let ownerIndex = -1;
 			for (let i = converted.length - 1; i >= 0; i--) {
 				const candidate = converted[i];
@@ -516,6 +600,42 @@ function fromAgUiMessages(messages, options) {
 			}
 			if (ownerIndex === -1) continue;
 			const owner = converted[ownerIndex];
+			if (activityType !== "a2ui-surface") {
+				const bucketKey = getString(rawMessage, "id") ?? `agui-activity:${activityType}`;
+				const part = {
+					type: "data",
+					name: `agui-activity/${activityType}`,
+					data: rawMessage.content
+				};
+				const existing = activityParts.get(bucketKey);
+				const existingOwner = existing && converted[existing.ownerIndex];
+				const existingIndex = existingOwner && Array.isArray(existingOwner.content) ? existingOwner.content.indexOf(existing.part) : -1;
+				if (existing && existingOwner && existingIndex !== -1) {
+					const content = [...existingOwner.content];
+					content[existingIndex] = part;
+					converted[existing.ownerIndex] = {
+						...existingOwner,
+						content
+					};
+					activityParts.set(bucketKey, {
+						ownerIndex: existing.ownerIndex,
+						part
+					});
+					continue;
+				}
+				const content = Array.isArray(owner.content) ? owner.content : [];
+				activityParts.set(bucketKey, {
+					ownerIndex,
+					part
+				});
+				converted[ownerIndex] = {
+					...owner,
+					content: [...content, part]
+				};
+				continue;
+			}
+			const operations = (isObject(rawMessage.content) ? rawMessage.content : null)?.["a2ui_operations"];
+			if (!Array.isArray(operations)) continue;
 			const bucketKey = getString(rawMessage, "id") ?? "a2ui:anonymous";
 			const { state } = applyA2uiOperations(/* @__PURE__ */ new Map(), operations);
 			a2uiBuckets.delete(bucketKey);
@@ -531,7 +651,7 @@ function fromAgUiMessages(messages, options) {
 			continue;
 		}
 		if (role === "assistant") {
-			converted.push(toAssistantSnapshotMessage(rawMessage));
+			converted.push(withPendingReasoning(toAssistantSnapshotMessage(rawMessage)));
 			continue;
 		}
 		if (role === "reasoning") {
@@ -539,11 +659,14 @@ function fromAgUiMessages(messages, options) {
 			const encryptedValue = getString(rawMessage, "encryptedValue");
 			if (text.trim().length === 0) {
 				const opaqueId = getString(rawMessage, "id");
-				if (opaqueId?.trim() && encryptedValue?.trim()) opaqueReasoning.push({
-					id: opaqueId,
-					encryptedValue,
-					anchor: converted.length
-				});
+				if (opaqueId?.trim() && encryptedValue?.trim()) {
+					flushPendingReasoning();
+					opaqueReasoning.push({
+						id: opaqueId,
+						encryptedValue,
+						anchor: converted.length
+					});
+				}
 				continue;
 			}
 			if (!showThinking) {
@@ -555,19 +678,28 @@ function fromAgUiMessages(messages, options) {
 				});
 				continue;
 			}
-			converted.push({
-				id: getString(rawMessage, "id") ?? generateId(),
-				role: "assistant",
-				content: [{
+			const rawReasoningId = getString(rawMessage, "id");
+			const reasoningId = rawReasoningId?.trim() ? rawReasoningId : void 0;
+			const meta = {
+				...reasoningId !== void 0 ? { reasoningId } : {},
+				...encryptedValue !== void 0 ? { encryptedValue } : {}
+			};
+			pendingReasoning.push({
+				id: reasoningId,
+				part: {
 					type: "reasoning",
 					text,
-					...encryptedValue !== void 0 ? { providerMetadata: { [AG_UI_METADATA_NAMESPACE]: { encryptedValue } } } : {}
-				}]
+					...Object.keys(meta).length > 0 ? { providerMetadata: { [AG_UI_METADATA_NAMESPACE]: meta } } : {}
+				}
 			});
 			continue;
 		}
-		if (role === "user" || role === "system" || role === "developer") converted.push(toUserOrSystemSnapshotMessage(role, rawMessage));
+		if (role === "user" || role === "system" || role === "developer") {
+			flushPendingReasoning();
+			converted.push(toUserOrSystemSnapshotMessage(role, rawMessage));
+		}
 	}
+	flushPendingReasoning();
 	for (const { anchor, ...entry } of opaqueReasoning) {
 		const trailing = anchor >= converted.length;
 		const index = trailing ? converted.length - 1 : anchor;
@@ -578,17 +710,26 @@ function fromAgUiMessages(messages, options) {
 			after: true
 		}] : [entry]]);
 	}
-	for (let i = 0; i < converted.length; i++) {
-		const message = converted[i];
+	const folded = [];
+	for (const message of converted) {
+		const previous = folded[folded.length - 1];
+		if (previous !== void 0 && (isSyntheticToolCallContainer(message) ? opensTurn(previous) : isSyntheticToolCallContainer(previous) && answersToolCallContainer(message))) {
+			folded[folded.length - 1] = foldTurnRecords(previous, message);
+			continue;
+		}
+		folded.push(message);
+	}
+	for (let i = 0; i < folded.length; i++) {
+		const message = folded[i];
 		if (message.role !== "assistant") continue;
 		const hasInterrupt = readPersistedInterrupts(message.metadata) !== void 0;
 		const hasPendingToolCall = Array.isArray(message.content) && message.content.some((part) => isObject(part) && part.type === "tool-call" && part.result === void 0);
-		if (hasInterrupt || hasPendingToolCall) converted[i] = {
+		if (hasInterrupt || hasPendingToolCall) folded[i] = {
 			...message,
 			status: getAutoStatus(false, false, hasInterrupt, hasPendingToolCall, void 0)
 		};
 	}
-	return converted;
+	return folded;
 }
 function convertAssistantMessage(message, converted) {
 	const content = extractText(message.content);