@mastra/ai-sdk 1.10.7 → 1.11.0-alpha.1

package/dist/index.js

@@ -13670,7 +13670,8 @@ function convertMastraChunkToAISDKBase({ chunk, mode = "stream", normalizeWarnin
 			providerExecuted: chunk.payload.providerExecuted,
 			toolName: chunk.payload.toolName,
 			input: hasTransformedToolPayload(displayInputTransform) ? displayInputTransform.transformed : chunk.payload.args,
-			...chunk.payload.observability ? { observability: chunk.payload.observability } : {}
+			...chunk.payload.observability ? { observability: chunk.payload.observability } : {},
+			...chunk.payload.toolMetadata ? { toolMetadata: chunk.payload.toolMetadata } : {}
 		};
 		case "tool-call-approval": return {
 			type: "data-tool-call-approval",
@@ -13730,7 +13731,8 @@ function convertMastraChunkToAISDKBase({ chunk, mode = "stream", normalizeWarnin
 			dynamic: !!chunk.payload.dynamic,
 			providerMetadata: chunk.payload.providerMetadata,
 			providerExecuted: chunk.payload.providerExecuted,
-			...chunk.payload.observability ? { observability: chunk.payload.observability } : {}
+			...chunk.payload.observability ? { observability: chunk.payload.observability } : {},
+			...chunk.payload.toolMetadata ? { toolMetadata: chunk.payload.toolMetadata } : {}
 		};
 		case "tool-call-input-streaming-end": return {
 			type: "tool-input-end",
@@ -14024,13 +14026,17 @@ function convertFullStreamChunkToUIMessageStream({ part, messageMetadataValue, s
 				...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
 			};
 			return;
-		case "tool-input-start": return {
-			type: "tool-input-start",
-			toolCallId: part.id,
-			toolName: part.toolName,
-			...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
-			...part.dynamic != null ? { dynamic: part.dynamic } : {}
-		};
+		case "tool-input-start": {
+			const toolMetadata = part.toolMetadata;
+			return {
+				type: "tool-input-start",
+				toolCallId: part.id,
+				toolName: part.toolName,
+				...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
+				...part.dynamic != null ? { dynamic: part.dynamic } : {},
+				...toolMetadata != null ? { toolMetadata } : {}
+			};
+		}
 		case "tool-input-delta": return {
 			type: "tool-input-delta",
 			toolCallId: part.id,
@@ -14038,6 +14044,7 @@ function convertFullStreamChunkToUIMessageStream({ part, messageMetadataValue, s
 		};
 		case "tool-call": {
 			const observability = part.observability;
+			const toolMetadata = part.toolMetadata;
 			return {
 				type: "tool-input-available",
 				toolCallId: part.toolCallId,
@@ -14046,7 +14053,10 @@ function convertFullStreamChunkToUIMessageStream({ part, messageMetadataValue, s
 				...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
 				...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
 				...part.dynamic != null ? { dynamic: part.dynamic } : {},
-				...observability != null ? { toolMetadata: { __mastraObservability: observability } } : {}
+				...observability != null || toolMetadata != null ? { toolMetadata: {
+					...toolMetadata,
+					...observability != null ? { __mastraObservability: observability } : {}
+				} } : {}
 			};
 		}
 		case "tool-approval-request": return {
@@ -14258,7 +14268,10 @@ function createAgentStreamToAISDKTransformer(convertMastraChunkToAISDK, { lastMe
 				part: p,
 				sendReasoning,
 				sendSources,
-				messageMetadataValue: p ? messageMetadata?.({ part: p }) : void 0,
+				messageMetadataValue: p ? messageMetadata?.({
+					part: p,
+					traceId: chunk.traceId
+				}) : void 0,
 				sendStart,
 				sendFinish,
 				responseMessageId: lastMessageId,
@@ -15423,7 +15436,7 @@ function extractV6NativeApprovals(messages) {
 /** Streams exact approval targets sequentially as one v6/v7 UI-message response. */
 function streamV6ApprovalResumes(args) {
 	const { agent, approvals, baseOptions, structuredOutput, messages, lastMessageId } = args;
-	const { sendStart, sendFinish, sendReasoning, sendSources, onError, messageMetadata, experimentalTransform } = args;
+	const { sendStart, sendFinish, sendReasoning, sendSources, includeSubAgentMetadata, onError, messageMetadata, experimentalTransform } = args;
 	return (args.version === "v7" ? createUIMessageStream : createUIMessageStream$1)({
 		originalMessages: messages,
 		onError,
@@ -15447,6 +15460,7 @@ function streamV6ApprovalResumes(args) {
 					sendFinish,
 					sendReasoning,
 					sendSources,
+					includeSubAgentMetadata,
 					experimentalTransform,
 					onError,
 					messageMetadata
@@ -15493,7 +15507,7 @@ const CREDENTIAL_HEADER_NAMES = /* @__PURE__ */ new Set([
 	"x-goog-api-key",
 	"cookie"
 ]);
-async function handleChatStream({ mastra, agentId, agentVersion, params, defaultOptions, experimentalTransform, version = "v5", sendStart = true, sendFinish = true, sendReasoning = false, sendSources = false, onError, messageMetadata }) {
+async function handleChatStream({ mastra, agentId, agentVersion, params, defaultOptions, experimentalTransform, version = "v5", sendStart = true, sendFinish = true, sendReasoning = false, sendSources = false, includeSubAgentMetadata = true, onError, messageMetadata }) {
 	const { messages, resumeData, runId, requestContext, trigger, ...rest } = params;
 	if (resumeData && !runId) throw new Error("runId is required when resumeData is provided");
 	const baseAgent = mastra.getAgentById(agentId);
@@ -15545,6 +15559,7 @@ async function handleChatStream({ mastra, agentId, agentVersion, params, default
 			sendFinish,
 			sendReasoning,
 			sendSources,
+			includeSubAgentMetadata,
 			onError,
 			experimentalTransform: effectiveExperimentalTransform,
 			messageMetadata
@@ -15568,6 +15583,7 @@ async function handleChatStream({ mastra, agentId, agentVersion, params, default
 				sendFinish,
 				sendReasoning,
 				sendSources,
+				includeSubAgentMetadata,
 				experimentalTransform: effectiveExperimentalTransform,
 				onError,
 				messageMetadata
@@ -15584,6 +15600,7 @@ async function handleChatStream({ mastra, agentId, agentVersion, params, default
 				sendFinish,
 				sendReasoning,
 				sendSources,
+				includeSubAgentMetadata,
 				experimentalTransform: effectiveExperimentalTransform,
 				onError,
 				messageMetadata
@@ -15604,9 +15621,10 @@ async function handleChatStream({ mastra, agentId, agentVersion, params, default
 * @param {boolean} [options.sendFinish=true] - Whether to send finish events in the stream
 * @param {boolean} [options.sendReasoning=false] - Whether to include reasoning steps in the stream
 * @param {boolean} [options.sendSources=false] - Whether to include source citations in the stream
+* @param {boolean} [options.includeSubAgentMetadata=true] - Whether to emit `data-tool-agent` / `data-tool-agent-step` parts with sub-agent progress
 * @param {number} [options.heartbeatMs] - Target interval for periodic SSE comment heartbeats. Already-buffered source events and stream lifecycle signals take priority. Values up to 0 disable heartbeats. `NaN`, positive infinity, and values above 2,147,483,647 throw a `RangeError`.
 * @param {(error: unknown) => string} [options.onError] - Custom error serializer streamed to the client. When omitted, errors are passed through a default serializer that strips sensitive fields (e.g. `APICallError.requestBodyValues`, which holds the system prompt) before they reach the client.
-* @param {Function} [options.messageMetadata] - Maps stream parts to metadata attached to AI SDK start and finish message parts.
+* @param {Function} [options.messageMetadata] - Maps stream parts to metadata attached to AI SDK start and finish message parts. Receives `{ part, traceId }`.
 *
 * @returns {ReturnType<typeof registerApiRoute>} A registered API route handler
 *
@@ -15638,7 +15656,7 @@ async function handleChatStream({ mastra, agentId, agentVersion, params, default
 * - If both `agent` and `:agentId` are present, a warning is logged and the fixed `agent` takes precedence
 * - Request context from the incoming request overrides `defaultOptions.requestContext` if both are present
 */
-function chatRoute({ path = "/chat/:agentId", agent, defaultOptions, experimentalTransform, version = "v5", agentVersion, sendStart = true, sendFinish = true, sendReasoning = false, sendSources = false, heartbeatMs, onError, messageMetadata }) {
+function chatRoute({ path = "/chat/:agentId", agent, defaultOptions, experimentalTransform, version = "v5", agentVersion, sendStart = true, sendFinish = true, sendReasoning = false, sendSources = false, includeSubAgentMetadata = true, heartbeatMs, onError, messageMetadata }) {
 	if (!agent && !path.includes("/:agentId")) throw new Error("Path must include :agentId to route to the correct agent or pass the agent explicitly");
 	assertValidHeartbeatMs(heartbeatMs);
 	return registerApiRoute(path, {
@@ -15767,6 +15785,7 @@ function chatRoute({ path = "/chat/:agentId", agent, defaultOptions, experimenta
 				sendFinish,
 				sendReasoning,
 				sendSources,
+				includeSubAgentMetadata,
 				onError
 			};
 			let response;