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

package/dist/runtime/adapter/conversions.js

@@ -1,5 +1,5 @@
 "use client";
-import { parseMcpToolCallResult, readMcpAppResourceUri } from "../mcp-tool-result.js";
+import { parseMcpToolCallResult, readMcpAppResourceUri, toolContentText } from "../mcp-tool-result.js";
 import { AG_UI_METADATA_NAMESPACE } from "../types.js";
 import { projectAgUiToolApprovals } from "./tool-approval.js";
 import { generateId } from "@assistant-ui/core";
@@ -21,11 +21,11 @@ function readLegacyAgUiNamespace(metadata) {
 	if (!isObject(namespaced)) return {};
 	return "interrupts" in namespaced ? { interrupts: namespaced.interrupts } : {};
 }
-function withoutPersistedInterrupts(wire) {
+function withoutPersistedStatusMetadata(wire) {
 	if (!isObject(wire.custom)) return wire;
 	const namespaced = wire.custom[AG_UI_METADATA_NAMESPACE];
-	if (!isObject(namespaced) || !("interrupts" in namespaced)) return wire;
-	const { interrupts: _interrupts, ...remainingNamespace } = namespaced;
+	if (!isObject(namespaced) || !("interrupts" in namespaced) && !("pendingToolCallIds" in namespaced)) return wire;
+	const { interrupts: _interrupts, pendingToolCallIds: _pendingToolCallIds, ...remainingNamespace } = namespaced;
 	const { [AG_UI_METADATA_NAMESPACE]: _namespace, ...remainingCustom } = wire.custom;
 	if (Object.keys(remainingNamespace).length > 0) remainingCustom[AG_UI_METADATA_NAMESPACE] = remainingNamespace;
 	const { custom: _custom, ...remainingWire } = wire;
@@ -35,10 +35,11 @@ function withoutPersistedInterrupts(wire) {
 	} : remainingWire;
 }
 function toSnapshotCustom(metadata, state = {}) {
-	const wire = withoutPersistedInterrupts(toAgUiWireMetadata(metadata) ?? {});
+	const wire = withoutPersistedStatusMetadata(toAgUiWireMetadata(metadata) ?? {});
 	const needsWireSlot = isObject(metadata) && (Object.keys(metadata).length === 0 || "agui" in wire);
 	const namespaced = {
 		...readLegacyAgUiNamespace(metadata),
+		...readPersistedPendingToolCallIds(metadata) !== void 0 ? { pendingToolCallIds: readPersistedPendingToolCallIds(metadata) } : {},
 		...state,
 		...needsWireSlot ? { messageMetadata: wire } : {}
 	};
@@ -89,14 +90,14 @@ const readAgUiReasoningMeta = (providerMetadata) => {
 		messageMetadata: toAgUiWireMetadata(namespaced.messageMetadata)
 	};
 };
-const buildInputMetadata = (part, filename) => {
+const buildPartMetadata = (part, filename) => {
 	const metadata = {
 		...readAgUiNamespace(part.providerMetadata),
 		...filename !== void 0 && { filename }
 	};
 	return Object.keys(metadata).length > 0 ? metadata : void 0;
 };
-const readInputMetadata = (metadata) => {
+const readPartMetadata = (metadata) => {
 	if (!isObject(metadata)) return {};
 	const { filename: _filename, ...rest } = metadata;
 	return {
@@ -139,7 +140,7 @@ function mediaTypeForMime(mimeType) {
 	if (mimeType?.startsWith("video/")) return "video";
 	return "document";
 }
-function buildInputSource(value, declaredMimeType, sourceType) {
+function buildPartSource(value, declaredMimeType, sourceType) {
 	const source = resolveFilePartSource({
 		data: value,
 		mimeType: declaredMimeType ?? "application/octet-stream",
@@ -159,7 +160,7 @@ function buildInputSource(value, declaredMimeType, sourceType) {
 		mimeType: source.mimeType
 	};
 }
-function toInputContent(part, fallbackMimeType) {
+function toContentPart(part, fallbackMimeType) {
 	if (!isObject(part)) return null;
 	const type = getString(part, "type");
 	if (type === "text") {
@@ -173,8 +174,8 @@ function toInputContent(part, fallbackMimeType) {
 	if (type === "image") {
 		const image = getString(part, "image");
 		if (image === void 0) return null;
-		const metadata = buildInputMetadata(part, getString(part, "filename"));
-		const source = buildInputSource(image, fallbackMimeType);
+		const metadata = buildPartMetadata(part, getString(part, "filename"));
+		const source = buildPartSource(image, fallbackMimeType);
 		return {
 			type: "image",
 			source: source.type === "data" ? {
@@ -189,8 +190,8 @@ function toInputContent(part, fallbackMimeType) {
 		if (data === void 0) return null;
 		const declaredMimeType = getString(part, "mimeType") || fallbackMimeType;
 		const filename = getString(part, "filename");
-		const source = buildInputSource(data, declaredMimeType, getString(part, "sourceType"));
-		const metadata = buildInputMetadata(part, filename);
+		const source = buildPartSource(data, declaredMimeType, getString(part, "sourceType"));
+		const metadata = buildPartMetadata(part, filename);
 		switch (mediaTypeForMime(source.mimeType)) {
 			case "image": return {
 				type: "image",
@@ -222,7 +223,7 @@ function toInputContent(part, fallbackMimeType) {
 		if (data === void 0 || format === void 0) return null;
 		return {
 			type: "audio",
-			source: buildInputSource(parseDataUrl(data)?.data ?? data, `audio/${format}`)
+			source: buildPartSource(parseDataUrl(data)?.data ?? data, `audio/${format}`)
 		};
 	}
 	return null;
@@ -233,7 +234,7 @@ const mediaInputTypes = /* @__PURE__ */ new Set([
 	"video",
 	"document"
 ]);
-function inputSourceToString(value) {
+function partSourceToString(value) {
 	if (!isObject(value)) return null;
 	const sourceValue = getString(value, "value");
 	if (sourceValue === void 0) return null;
@@ -275,18 +276,51 @@ function upgradeBinaryInputPart(part) {
 		...filename && { metadata: { filename } }
 	};
 }
+function normalizeInputPart(rawPart) {
+	return getString(rawPart, "type") === "binary" ? upgradeBinaryInputPart(rawPart) : rawPart;
+}
+function toUserContentLayout(content) {
+	const fileSourceParts = [];
+	const textParts = [];
+	if (!Array.isArray(content)) return {
+		fileSourceParts,
+		textParts
+	};
+	let mediaIndex = 0;
+	for (const rawPart of content) {
+		if (!isObject(rawPart)) continue;
+		if (rawPart.type === "text" && typeof rawPart.text === "string") {
+			textParts.push({
+				index: textParts.length + mediaIndex,
+				text: rawPart.text
+			});
+			continue;
+		}
+		const part = normalizeInputPart(rawPart);
+		if (!part || !mediaInputTypes.has(getString(part, "type") ?? "")) continue;
+		if (isObject(part.source) && part.source.type === "file" && typeof part.source.value === "string") fileSourceParts.push({
+			index: mediaIndex++,
+			part
+		});
+		else if (partSourceToString(part.source)) mediaIndex++;
+	}
+	return {
+		fileSourceParts,
+		textParts: textParts.length === 0 || textParts.length === 1 && textParts[0].index === 0 && textParts[0].text !== "" ? [] : textParts
+	};
+}
 function toSnapshotAttachments(content) {
 	if (!Array.isArray(content)) return [];
 	const attachments = [];
 	for (const rawPart of content) {
 		if (!isObject(rawPart)) continue;
-		const part = getString(rawPart, "type") === "binary" ? upgradeBinaryInputPart(rawPart) : rawPart;
+		const part = normalizeInputPart(rawPart);
 		if (!part) continue;
 		const type = getString(part, "type");
 		if (type === void 0 || !mediaInputTypes.has(type)) continue;
-		const source = inputSourceToString(part.source);
+		const source = partSourceToString(part.source);
 		if (!source) continue;
-		const { filename, providerMetadata } = readInputMetadata(part.metadata);
+		const { filename, providerMetadata } = readPartMetadata(part.metadata);
 		const id = attachments.length.toString();
 		if (type === "image") {
 			attachments.push({
@@ -323,6 +357,13 @@ function toSnapshotAttachments(content) {
 	}
 	return attachments;
 }
+function readContentSlots(value) {
+	if (!Array.isArray(value)) return [];
+	return value.flatMap((entry) => isObject(entry) && typeof entry.index === "number" && Number.isInteger(entry.index) && entry.index >= 0 ? [{
+		index: entry.index,
+		entry
+	}] : []);
+}
 function buildUserContent(message) {
 	const contentParts = Array.isArray(message.content) ? message.content : [];
 	const attachments = message.attachments ?? [];
@@ -332,7 +373,7 @@ function buildUserContent(message) {
 		text: message.content
 	});
 	for (const part of contentParts) {
-		const input = toInputContent(part, void 0);
+		const input = toContentPart(part, void 0);
 		if (input) converted.push(input);
 	}
 	for (const attachment of attachments) {
@@ -341,11 +382,31 @@ function buildUserContent(message) {
 		if (!Array.isArray(attachmentContent)) continue;
 		const fallbackMime = getString(attachment, "contentType");
 		for (const part of attachmentContent) {
-			const input = toInputContent(part, fallbackMime);
+			const input = toContentPart(part, fallbackMime);
 			if (input) converted.push(input);
 		}
 	}
-	if (converted.some((part) => part.type !== "text")) return converted;
+	const namespaced = readNamespacedMetadata(message.metadata);
+	const textSlots = readContentSlots(namespaced.textParts).flatMap(({ index, entry }) => typeof entry.text === "string" ? [{
+		index,
+		part: {
+			type: "text",
+			text: entry.text
+		}
+	}] : []);
+	const mergedText = converted.flatMap((part) => part.type === "text" ? [part.text] : []).join("\n");
+	const restoresText = textSlots.length > 0 && textSlots.map(({ part }) => part.text).join("\n") === mergedText;
+	const fileSourceSlots = readContentSlots(namespaced.fileSourceParts).flatMap(({ index, entry: { part } }) => isObject(part) && mediaInputTypes.has(getString(part, "type") ?? "") && isObject(part.source) && part.source.type === "file" && typeof part.source.value === "string" ? [{
+		index,
+		part
+	}] : []);
+	const ordered = restoresText ? converted.filter((part) => part.type !== "text") : converted;
+	for (const { index, part } of fileSourceSlots.sort((a, b) => a.index - b.index)) {
+		const mediaPositions = ordered.flatMap((contentPart, position) => contentPart.type !== "text" ? [position] : []);
+		ordered.splice(mediaPositions[index] ?? ordered.length, 0, part);
+	}
+	if (restoresText) for (const { index, part } of textSlots.sort((a, b) => a.index - b.index)) ordered.splice(Math.min(index, ordered.length), 0, part);
+	if (restoresText || ordered.some((part) => part.type !== "text")) return ordered;
 	if (converted.length === 0) return extractText(message.content);
 	return converted.filter((part) => part.type === "text").map((part) => part.text).join("\n");
 }
@@ -406,6 +467,10 @@ function readPersistedInterrupts(metadata) {
 	if (!isObject(namespaced)) return void 0;
 	return validateInterrupts(namespaced.interrupts);
 }
+function readPersistedPendingToolCallIds(metadata) {
+	const value = readNamespacedMetadata(metadata).pendingToolCallIds;
+	return Array.isArray(value) && value.length > 0 && value.every((id) => typeof id === "string") ? value : void 0;
+}
 function readOpaqueReasoning(metadata) {
 	if (!isObject(metadata)) return [];
 	const custom = metadata.custom;
@@ -480,7 +545,15 @@ function toAssistantSnapshotMessage(rawMessage) {
 }
 function toUserOrSystemSnapshotMessage(role, rawMessage) {
 	const messageName = getString(rawMessage, "name");
-	const custom = toSnapshotCustom(rawMessage.metadata, role === "developer" ? { role: "developer" } : {});
+	const { fileSourceParts, textParts } = role === "user" ? toUserContentLayout(rawMessage.content) : {
+		fileSourceParts: [],
+		textParts: []
+	};
+	const custom = toSnapshotCustom(rawMessage.metadata, {
+		...role === "developer" ? { role: "developer" } : {},
+		...fileSourceParts.length > 0 ? { fileSourceParts } : {},
+		...textParts.length > 0 ? { textParts } : {}
+	});
 	const attachments = role === "user" ? toSnapshotAttachments(rawMessage.content) : [];
 	return {
 		id: getString(rawMessage, "id") ?? generateId(),
@@ -603,13 +676,13 @@ function fromAgUiMessages(messages, options) {
 			flushPendingReasoning();
 			const toolCallId = getToolCallId(rawMessage) ?? `tool-${generateId()}`;
 			const toolMessageId = getString(rawMessage, "id");
-			const modelContent = extractText(rawMessage.content);
-			const mcpResult = parseMcpToolCallResult(rawMessage, modelContent);
-			const mcpModelContent = mcpResult ? [{
+			const modelContent = Array.isArray(rawMessage.content) ? toolContentText(rawMessage.content) : extractText(rawMessage.content);
+			const mcpResult = parseMcpToolCallResult(rawMessage, Array.isArray(rawMessage.content) ? rawMessage.content : modelContent);
+			const toolModelContent = mcpResult ? [{
 				type: "text",
 				text: modelContent
 			}] : void 0;
-			const result = mcpResult ?? (rawMessage.result !== void 0 ? rawMessage.result : typeof rawMessage.content === "string" ? parseJSONText(rawMessage.content) : rawMessage.content);
+			const result = mcpResult ?? (Array.isArray(rawMessage.content) ? rawMessage.content : rawMessage.result !== void 0 ? rawMessage.result : typeof rawMessage.content === "string" ? parseJSONText(rawMessage.content) : rawMessage.content);
 			const isError = typeof rawMessage.error === "string" || rawMessage.isError === true || rawMessage.status === "error" ? true : rawMessage.isError === false ? false : void 0;
 			const mcpAppUri = readMcpAppResourceUri(mcpResult?._meta);
 			const mcpApp = mcpAppUri !== void 0 ? { resourceUri: mcpAppUri } : void 0;
@@ -622,10 +695,11 @@ function fromAgUiMessages(messages, options) {
 					const part = message.content[partIndex];
 					if (!isObject(part) || part.type !== "tool-call") continue;
 					if (getString(part, "toolCallId") !== toolCallId) continue;
+					const { modelContent: _modelContent, ...partWithoutModelContent } = part;
 					const updatedPart = {
-						...part,
+						...Array.isArray(rawMessage.content) && !mcpResult ? partWithoutModelContent : part,
 						result,
-						...mcpModelContent ? { modelContent: mcpModelContent } : {},
+						...toolModelContent ? { modelContent: toolModelContent } : {},
 						...isError !== void 0 ? { isError } : {},
 						...toolMessageId !== void 0 ? { unstable_toolMessageId: toolMessageId } : {},
 						...mcpApp ? { mcp: { app: mcpApp } } : {},
@@ -653,7 +727,7 @@ function fromAgUiMessages(messages, options) {
 					args: {},
 					argsText: "{}",
 					result,
-					...mcpModelContent ? { modelContent: mcpModelContent } : {},
+					...toolModelContent ? { modelContent: toolModelContent } : {},
 					...isError !== void 0 ? { isError } : {},
 					...toolMessageId !== void 0 ? { unstable_toolMessageId: toolMessageId } : {},
 					...mcpApp ? { mcp: { app: mcpApp } } : {},
@@ -803,7 +877,8 @@ function fromAgUiMessages(messages, options) {
 		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);
+		const pendingToolCallIds = readPersistedPendingToolCallIds(message.metadata);
+		const hasPendingToolCall = Array.isArray(message.content) && message.content.some((part) => isObject(part) && part.type === "tool-call" && part.result === void 0 && (pendingToolCallIds === void 0 || pendingToolCallIds.includes(getString(part, "toolCallId") ?? "")));
 		if (hasInterrupt || hasPendingToolCall) folded[i] = {
 			...message,
 			status: getAutoStatus(false, false, hasInterrupt, hasPendingToolCall, void 0)
@@ -857,21 +932,24 @@ function convertAssistantMessage(message, converted) {
 		emitToolResult(toolCallId, part, converted);
 	}
 }
+function isToolContentParts(value) {
+	return Array.isArray(value) && value.length > 0 && value.every((part) => isObject(part) && (part.type === "text" ? typeof part.text === "string" : mediaInputTypes.has(getString(part, "type") ?? "") && isObject(part.source) && typeof part.source.value === "string"));
+}
 function emitToolResult(toolCallId, part, converted) {
 	if (part.result === void 0) return;
-	const resultContent = part.modelContent !== void 0 ? extractText(part.modelContent) : typeof part.result === "string" ? part.result : JSON.stringify(part.result);
+	const resultContent = part.modelContent !== void 0 ? extractText(part.modelContent) : isToolContentParts(part.result) ? part.result : typeof part.result === "string" ? part.result : JSON.stringify(part.result);
 	const messageMetadata = readAgUiPartMessageMetadata(part.providerMetadata);
 	converted.push({
 		id: part.unstable_toolMessageId ?? `${toolCallId}:tool`,
 		role: "tool",
 		content: resultContent,
 		toolCallId,
-		...part.isError ? { error: resultContent } : {},
+		...part.isError ? { error: Array.isArray(resultContent) ? toolContentText(resultContent) : resultContent } : {},
 		...messageMetadata ? { metadata: messageMetadata } : {}
 	});
 }
 function convertToolMessage(message, converted) {
-	const content = extractText(message.content);
+	const content = isToolContentParts(message.content) ? message.content : extractText(message.content);
 	const toolCallId = message.toolCallId ?? generateId();
 	converted.push({
 		id: message.id,