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

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

@@ -30,28 +30,33 @@ export type AgUiMessage = {
     role: "user";
     content: string | InputContent[];
     name?: string;
+    metadata?: Record<string, unknown>;
 } | {
     id: string;
     role: "assistant";
     content: string;
     name?: string;
     toolCalls?: AgUiToolCall[];
+    metadata?: Record<string, unknown>;
 } | {
     id: string;
     role: "system" | "developer";
     content: string;
     name?: string;
+    metadata?: Record<string, unknown>;
 } | {
     id: string;
     role: "reasoning";
     content: string;
     encryptedValue?: string;
+    metadata?: Record<string, unknown>;
 } | {
     id: string;
     role: "tool";
     content: string;
     toolCallId: string;
     error?: string;
+    metadata?: Record<string, unknown>;
 };
 export type FromAgUiMessagesOptions = {
     /**

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

@@ -1 +1 @@
-{"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,EAG3C,MAAM,oBAAoB,CAAC;AAQ5B,OAAO,EAAE,KAAK,IAAI,EAAqB,MAAM,kBAAkB,CAAC;AAsBhE,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;AAkvBN,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;AAoJD,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"}
+{"version":3,"file":"conversions.d.ts","sourceRoot":"","sources":["../../../src/runtime/adapter/conversions.ts"],"names":[],"mappings":"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"}

package/dist/runtime/adapter/conversions.js

@@ -12,6 +12,68 @@ const getString = (record, key) => {
 	const value = record[key];
 	return typeof value === "string" ? value : void 0;
 };
+function toAgUiWireMetadata(metadata) {
+	return isObject(metadata) ? { ...metadata } : void 0;
+}
+function readLegacyAgUiNamespace(metadata) {
+	if (!isObject(metadata) || !isObject(metadata.custom)) return {};
+	const namespaced = metadata.custom[AG_UI_METADATA_NAMESPACE];
+	if (!isObject(namespaced)) return {};
+	return "interrupts" in namespaced ? { interrupts: namespaced.interrupts } : {};
+}
+function withoutPersistedInterrupts(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;
+	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;
+	return Object.keys(remainingCustom).length > 0 ? {
+		...remainingWire,
+		custom: remainingCustom
+	} : remainingWire;
+}
+function toSnapshotCustom(metadata, state = {}) {
+	const wire = withoutPersistedInterrupts(toAgUiWireMetadata(metadata) ?? {});
+	const needsWireSlot = isObject(metadata) && (Object.keys(metadata).length === 0 || "agui" in wire);
+	const namespaced = {
+		...readLegacyAgUiNamespace(metadata),
+		...state,
+		...needsWireSlot ? { messageMetadata: wire } : {}
+	};
+	return {
+		...wire,
+		...Object.keys(namespaced).length > 0 ? { [AG_UI_METADATA_NAMESPACE]: namespaced } : {}
+	};
+}
+function toAgUiMessageMetadata(metadata) {
+	const custom = readCustomMetadata(metadata);
+	const namespaced = readNamespacedMetadata(metadata);
+	if (isObject(namespaced.messageMetadata)) return { ...namespaced.messageMetadata };
+	const { [AG_UI_METADATA_NAMESPACE]: _state, ...wire } = custom;
+	return Object.keys(wire).length > 0 ? wire : void 0;
+}
+function withAgUiMessageMetadata(metadata) {
+	const messageMetadata = toAgUiMessageMetadata(metadata);
+	return messageMetadata !== void 0 ? { metadata: messageMetadata } : {};
+}
+function withAgUiPartMessageMetadata(providerMetadata, messageMetadata) {
+	if (!messageMetadata) return providerMetadata ?? {};
+	const existing = providerMetadata ?? {};
+	const namespaced = isObject(existing["agui"]) ? existing[AG_UI_METADATA_NAMESPACE] : {};
+	return {
+		...existing,
+		[AG_UI_METADATA_NAMESPACE]: {
+			...namespaced,
+			messageMetadata
+		}
+	};
+}
+function readAgUiPartMessageMetadata(providerMetadata) {
+	const namespaced = readAgUiNamespace(providerMetadata);
+	return namespaced && isObject(namespaced.messageMetadata) ? toAgUiWireMetadata(namespaced.messageMetadata) : void 0;
+}
 const getToolCallId = (record) => getString(record, "toolCallId") ?? getString(record, "tool_call_id");
 const readAgUiNamespace = (providerMetadata) => {
 	if (!isObject(providerMetadata)) return void 0;
@@ -23,7 +85,8 @@ const readAgUiReasoningMeta = (providerMetadata) => {
 	if (!namespaced) return {};
 	return {
 		encryptedValue: getString(namespaced, "encryptedValue"),
-		reasoningId: getString(namespaced, "reasoningId")
+		reasoningId: getString(namespaced, "reasoningId"),
+		messageMetadata: toAgUiWireMetadata(namespaced.messageMetadata)
 	};
 };
 const buildInputMetadata = (part, filename) => {
@@ -356,9 +419,11 @@ function readOpaqueReasoning(metadata) {
 		const id = getString(entry, "id");
 		const encryptedValue = getString(entry, "encryptedValue");
 		if (!id?.trim() || !encryptedValue?.trim()) return [];
+		const metadata = toAgUiWireMetadata(entry.metadata);
 		return [{
 			id,
 			encryptedValue,
+			...metadata ? { metadata } : {},
 			...entry.after === true ? { after: true } : {}
 		}];
 	});
@@ -383,7 +448,8 @@ function withOpaqueReasoning(message, opaqueReasoning) {
 }
 function toAssistantSnapshotMessage(rawMessage) {
 	const text = extractText(rawMessage.content);
-	const interrupts = readPersistedInterrupts(rawMessage.metadata);
+	const custom = toSnapshotCustom(rawMessage.metadata);
+	const interrupts = readPersistedInterrupts({ custom });
 	const restoredToolCalls = extractAssistantToolCalls(rawMessage);
 	const approvals = projectAgUiToolApprovals(interrupts, new Set(restoredToolCalls.map((part) => part.toolCallId).filter((id) => !!id)));
 	const toolCallParts = restoredToolCalls.map((part) => {
@@ -398,16 +464,23 @@ function toAssistantSnapshotMessage(rawMessage) {
 		text
 	}] : [], ...toolCallParts];
 	const messageName = getString(rawMessage, "name");
+	const namespaced = isObject(custom["agui"]) ? { ...custom[AG_UI_METADATA_NAMESPACE] } : {};
+	if (interrupts) namespaced.interrupts = interrupts;
+	else delete namespaced.interrupts;
+	const messageCustom = { ...custom };
+	if (Object.keys(namespaced).length > 0) messageCustom[AG_UI_METADATA_NAMESPACE] = namespaced;
+	else delete messageCustom[AG_UI_METADATA_NAMESPACE];
 	return {
 		id: getString(rawMessage, "id") ?? generateId(),
 		role: "assistant",
 		content: assistantContent.length > 0 ? assistantContent : "",
 		...messageName !== void 0 ? { name: messageName } : {},
-		...interrupts ? { metadata: { custom: { [AG_UI_METADATA_NAMESPACE]: { interrupts } } } } : {}
+		...Object.keys(messageCustom).length > 0 ? { metadata: { custom: messageCustom } } : {}
 	};
 }
 function toUserOrSystemSnapshotMessage(role, rawMessage) {
 	const messageName = getString(rawMessage, "name");
+	const custom = toSnapshotCustom(rawMessage.metadata, role === "developer" ? { role: "developer" } : {});
 	const attachments = role === "user" ? toSnapshotAttachments(rawMessage.content) : [];
 	return {
 		id: getString(rawMessage, "id") ?? generateId(),
@@ -415,7 +488,7 @@ function toUserOrSystemSnapshotMessage(role, rawMessage) {
 		content: extractText(rawMessage.content),
 		...messageName !== void 0 ? { name: messageName } : {},
 		...attachments.length > 0 ? { attachments } : {},
-		...role === "developer" ? { metadata: { custom: { [AG_UI_METADATA_NAMESPACE]: { role: "developer" } } } } : {}
+		...Object.keys(custom).length > 0 ? { metadata: { custom } } : {}
 	};
 }
 function attachA2uiSurfaces(message, state) {
@@ -540,6 +613,7 @@ function fromAgUiMessages(messages, options) {
 			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;
+			const messageMetadata = toAgUiWireMetadata(rawMessage.metadata);
 			let updated = false;
 			for (let messageIndex = converted.length - 1; messageIndex >= 0 && !updated; messageIndex--) {
 				const message = converted[messageIndex];
@@ -554,7 +628,8 @@ function fromAgUiMessages(messages, options) {
 						...mcpModelContent ? { modelContent: mcpModelContent } : {},
 						...isError !== void 0 ? { isError } : {},
 						...toolMessageId !== void 0 ? { unstable_toolMessageId: toolMessageId } : {},
-						...mcpApp ? { mcp: { app: mcpApp } } : {}
+						...mcpApp ? { mcp: { app: mcpApp } } : {},
+						...messageMetadata ? { providerMetadata: withAgUiPartMessageMetadata(part.providerMetadata, messageMetadata) } : {}
 					};
 					const updatedContent = message.content.map((contentPart, index) => index === partIndex ? updatedPart : contentPart);
 					converted[messageIndex] = {
@@ -581,7 +656,8 @@ function fromAgUiMessages(messages, options) {
 					...mcpModelContent ? { modelContent: mcpModelContent } : {},
 					...isError !== void 0 ? { isError } : {},
 					...toolMessageId !== void 0 ? { unstable_toolMessageId: toolMessageId } : {},
-					...mcpApp ? { mcp: { app: mcpApp } } : {}
+					...mcpApp ? { mcp: { app: mcpApp } } : {},
+					...messageMetadata ? { providerMetadata: withAgUiPartMessageMetadata(void 0, messageMetadata) } : {}
 				}]
 			});
 			continue;
@@ -657,6 +733,7 @@ function fromAgUiMessages(messages, options) {
 		if (role === "reasoning") {
 			const text = extractText(rawMessage.content);
 			const encryptedValue = getString(rawMessage, "encryptedValue");
+			const messageMetadata = toAgUiWireMetadata(rawMessage.metadata);
 			if (text.trim().length === 0) {
 				const opaqueId = getString(rawMessage, "id");
 				if (opaqueId?.trim() && encryptedValue?.trim()) {
@@ -664,6 +741,7 @@ function fromAgUiMessages(messages, options) {
 					opaqueReasoning.push({
 						id: opaqueId,
 						encryptedValue,
+						...messageMetadata ? { metadata: messageMetadata } : {},
 						anchor: converted.length
 					});
 				}
@@ -674,6 +752,7 @@ function fromAgUiMessages(messages, options) {
 				if (hiddenId?.trim() && encryptedValue?.trim()) opaqueReasoning.push({
 					id: hiddenId,
 					encryptedValue,
+					...messageMetadata ? { metadata: messageMetadata } : {},
 					anchor: converted.length
 				});
 				continue;
@@ -682,7 +761,8 @@ function fromAgUiMessages(messages, options) {
 			const reasoningId = rawReasoningId?.trim() ? rawReasoningId : void 0;
 			const meta = {
 				...reasoningId !== void 0 ? { reasoningId } : {},
-				...encryptedValue !== void 0 ? { encryptedValue } : {}
+				...encryptedValue !== void 0 ? { encryptedValue } : {},
+				...messageMetadata ? { messageMetadata } : {}
 			};
 			pendingReasoning.push({
 				id: reasoningId,
@@ -744,12 +824,13 @@ function convertAssistantMessage(message, converted) {
 		if (!isObject(part) || part.type !== "reasoning") continue;
 		const text = getString(part, "text") ?? "";
 		if (text.trim().length === 0) continue;
-		const { encryptedValue, reasoningId } = readAgUiReasoningMeta(part.providerMetadata);
+		const { encryptedValue, reasoningId, messageMetadata } = readAgUiReasoningMeta(part.providerMetadata);
 		converted.push({
 			id: reasoningId?.trim() ? reasoningId : shellIsDropped && reasoningIndex === 0 ? message.id : `${message.id}:reasoning-${reasoningIndex}`,
 			role: "reasoning",
 			content: text,
-			...encryptedValue !== void 0 ? { encryptedValue } : {}
+			...encryptedValue !== void 0 ? { encryptedValue } : {},
+			...messageMetadata ? { metadata: messageMetadata } : {}
 		});
 		reasoningIndex++;
 	}
@@ -767,6 +848,7 @@ function convertAssistantMessage(message, converted) {
 		role: "assistant",
 		content,
 		...message.name ? { name: message.name } : {},
+		...withAgUiMessageMetadata(message.metadata),
 		...toolCalls.length + nestedToolCalls.length > 0 ? { toolCalls: [...toolCalls, ...nestedToolCalls].map((entry) => entry.call) } : {}
 	});
 	for (const { id: toolCallId, part } of toolCalls) emitToolResult(toolCallId, part, converted);
@@ -778,12 +860,14 @@ function convertAssistantMessage(message, converted) {
 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 messageMetadata = readAgUiPartMessageMetadata(part.providerMetadata);
 	converted.push({
 		id: part.unstable_toolMessageId ?? `${toolCallId}:tool`,
 		role: "tool",
 		content: resultContent,
 		toolCallId,
-		...part.isError ? { error: resultContent } : {}
+		...part.isError ? { error: resultContent } : {},
+		...messageMetadata ? { metadata: messageMetadata } : {}
 	});
 }
 function convertToolMessage(message, converted) {
@@ -794,7 +878,8 @@ function convertToolMessage(message, converted) {
 		role: "tool",
 		content,
 		toolCallId,
-		...typeof message.error === "string" ? { error: message.error } : {}
+		...typeof message.error === "string" ? { error: message.error } : {},
+		...withAgUiMessageMetadata(message.metadata)
 	});
 }
 function toAgUiMessages(messages) {
@@ -809,7 +894,8 @@ function toAgUiMessages(messages) {
 			id: entry.id,
 			role: "reasoning",
 			content: "",
-			encryptedValue: entry.encryptedValue
+			encryptedValue: entry.encryptedValue,
+			...entry.metadata ? { metadata: entry.metadata } : {}
 		});
 		for (const entry of opaqueReasoning) if (entry.after !== true) converted.push(toOpaqueRecord(entry));
 		const flushTrailingOpaqueReasoning = () => {
@@ -830,7 +916,8 @@ function toAgUiMessages(messages) {
 				id: message.id,
 				role: "user",
 				content: buildUserContent(message),
-				...message.name ? { name: message.name } : {}
+				...message.name ? { name: message.name } : {},
+				...withAgUiMessageMetadata(message.metadata)
 			});
 			flushTrailingOpaqueReasoning();
 			continue;
@@ -843,7 +930,8 @@ function toAgUiMessages(messages) {
 				id: message.id,
 				role: wireRole,
 				content: extractText(message.content),
-				...message.name ? { name: message.name } : {}
+				...message.name ? { name: message.name } : {},
+				...withAgUiMessageMetadata(message.metadata)
 			});
 			flushTrailingOpaqueReasoning();
 			continue;
@@ -852,7 +940,8 @@ function toAgUiMessages(messages) {
 			converted.push({
 				id: message.id,
 				role: "reasoning",
-				content: extractText(message.content)
+				content: extractText(message.content),
+				...withAgUiMessageMetadata(message.metadata)
 			});
 			flushTrailingOpaqueReasoning();
 			continue;