@mastra/ai-sdk 1.10.3 → 1.10.4-alpha.0

package/dist/index.d.ts

@@ -6,7 +6,7 @@ export type { WorkflowDataPart, WorkflowStepDataPart } from './transformers.js';
 export { networkRoute, handleNetworkStream } from './network-route.js';
 export type { NetworkRouteOptions, NetworkStreamHandlerParams, NetworkStreamHandlerOptions } from './network-route.js';
 export type { NetworkDataPart } from './transformers.js';
-export type { AgentDataPart, AgentStepDataPart } from './transformers.js';
+export type { AgentDataPart, AgentStepDataPart, AgentDataPartWithAncestry, AgentStepDataPartWithAncestry, AgentStreamAncestryEntry, } from './transformers.js';
 export { toAISdkStream, toAISdkV5Stream } from './convert-streams.js';
 export { workflowSnapshotToStream } from './convert-snapshot.js';
 export { smoothStream } from './smooth-stream.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,YAAY,EACV,gBAAgB,EAChB,uBAAuB,EACvB,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvE,YAAY,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AACxH,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACpE,YAAY,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACpH,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,YAAY,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAG3E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,YAAY,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAGhH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,YAAY,EACV,gBAAgB,EAChB,uBAAuB,EACvB,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvE,YAAY,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AACxH,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACpE,YAAY,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACpH,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,YAAY,EACV,aAAa,EACb,iBAAiB,EACjB,yBAAyB,EACzB,6BAA6B,EAC7B,wBAAwB,GACzB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,YAAY,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAG3E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,YAAY,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAGhH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/index.js

@@ -9,7 +9,7 @@ import { MASTRA_RESOURCE_ID_KEY } from "@mastra/core/request-context";
 import { MessageList, TripWire, aiV5ModelMessageToV2PromptMessage } from "@mastra/core/agent";
 import { RequestContext } from "@mastra/core/di";
 import { MessageHistory, SemanticRecall, WorkingMemory } from "@mastra/core/processors";
-//#region ../../packages/_vendored/ai_v5/dist/dist-Dqv4QeJJ.js
+//#region ../../packages/_vendored/ai_v5/dist/dist-CQthBS6n.js
 var marker$1$6 = "vercel.ai.error";
 var symbol$1$7 = Symbol.for(marker$1$6);
 var _a$1$7;
@@ -5027,7 +5027,7 @@ function createUIMessageStream$2({ execute, onError = () => "An error occurred."
 	});
 }
 //#endregion
-//#region ../../packages/_vendored/ai_v6/dist/dist-Cx98_f-i.js
+//#region ../../packages/_vendored/ai_v6/dist/dist-BJ8L5vTo.js
 var marker$1$4 = "vercel.ai.error";
 var symbol$1$4 = Symbol.for(marker$1$4);
 var _a$1$4;
@@ -8806,7 +8806,7 @@ var doWrap = ({ model, middleware: { transformParams, wrapGenerate, wrapStream,
 	};
 };
 //#endregion
-//#region ../../packages/_vendored/ai_v7/dist/dist-CiMv_aBf.js
+//#region ../../packages/_vendored/ai_v7/dist/dist-BWqbqY3Z.js
 var marker$1 = "vercel.ai.error";
 var symbol$1 = Symbol.for(marker$1);
 var _a$1;
@@ -12342,6 +12342,39 @@ function convertMastraChunkToAISDKv6({ chunk, mode = "stream" }) {
 		includeRawFinishReason: true
 	});
 }
+function createToolOutputAncestryEntry(toolCallId, toolName) {
+	const agentId = toolName?.startsWith("agent-") ? toolName.slice(6) : void 0;
+	return {
+		toolCallId,
+		...toolName ? { toolName } : {},
+		...agentId ? { agentId } : {}
+	};
+}
+/**
+* Each agent-as-tool delegation wraps progressive chunks in another `tool-output`
+* envelope. Preserve every boundary for routing while returning only the originating
+* leaf chunk to downstream transformers.
+*/
+function normalizeNestedToolOutput(part) {
+	const ancestry = [createToolOutputAncestryEntry(part.toolCallId, part.toolName)];
+	const seen = /* @__PURE__ */ new Set();
+	let current = part.output;
+	while (current !== null && typeof current === "object") {
+		if (seen.has(current)) return;
+		seen.add(current);
+		if (current.type !== "tool-output") return {
+			output: current,
+			ancestry
+		};
+		const toolCallId = current.payload?.toolCallId ?? current.toolCallId;
+		if (typeof toolCallId !== "string") return;
+		const toolName = current.payload?.toolName ?? current.toolName;
+		ancestry.push(createToolOutputAncestryEntry(toolCallId, typeof toolName === "string" ? toolName : void 0));
+		const nested = current.payload?.output ?? current.output;
+		if (nested === void 0) return;
+		current = nested;
+	}
+}
 function convertFullStreamChunkToUIMessageStream({ part, messageMetadataValue, sendReasoning, sendSources, onError, sendStart, sendFinish, responseMessageId }) {
 	const partType = part?.type;
 	if (!sendReasoning && (partType === "text-start" || partType === "text-delta" || partType === "text-end") && part.providerMetadata?.openai?.itemId != null) {
@@ -12457,25 +12490,29 @@ function convertFullStreamChunkToUIMessageStream({ part, messageMetadataValue, s
 			type: "tool-output-denied",
 			toolCallId: part.toolCallId
 		};
-		case "tool-output":
-			if (part.output.from === "AGENT") return {
+		case "tool-output": {
+			const normalized = normalizeNestedToolOutput(part);
+			if (!normalized) return;
+			const { output, ancestry } = normalized;
+			if (output.from === "AGENT") return {
 				type: "tool-agent",
 				toolCallId: part.toolCallId,
-				payload: part.output
+				payload: output,
+				ancestry
 			};
-			else if (part.output.from === "WORKFLOW") return {
+			else if (output.from === "WORKFLOW") return {
 				type: "tool-workflow",
 				toolCallId: part.toolCallId,
-				payload: part.output
+				payload: output
 			};
-			else if (part.output.from === "NETWORK") return {
+			else if (output.from === "NETWORK") return {
 				type: "tool-network",
 				toolCallId: part.toolCallId,
-				payload: part.output
+				payload: output
 			};
-			else if (isDataChunkType(part.output)) {
-				if (!("data" in part.output)) throw new Error(`UI Messages require a data property when using data- prefixed chunks \n ${JSON.stringify(part)}`);
-				const { type, data, id } = part.output;
+			else if (isDataChunkType(output)) {
+				if (!("data" in output)) throw new Error(`UI Messages require a data property when using data- prefixed chunks \n ${JSON.stringify(part)}`);
+				const { type, data, id } = output;
 				return {
 					type,
 					data,
@@ -12483,6 +12520,7 @@ function convertFullStreamChunkToUIMessageStream({ part, messageMetadataValue, s
 				};
 			}
 			return;
+		}
 		case "tool-error": return {
 			type: "tool-output-error",
 			toolCallId: part.toolCallId,
@@ -12637,7 +12675,7 @@ function AgentNetworkToAISDKTransformer() {
 function AgentNetworkToAISDKV6Transformer() {
 	return createAgentNetworkToAISDKTransformer();
 }
-function createAgentStreamToAISDKTransformer(convertMastraChunkToAISDK, { lastMessageId, sendStart = true, sendFinish = true, sendReasoning, sendSources, messageMetadata, onError }) {
+function createAgentStreamToAISDKTransformer(convertMastraChunkToAISDK, { lastMessageId, sendStart = true, sendFinish = true, sendReasoning, sendSources, messageMetadata, onError, includeSubAgentMetadata = false }) {
 	let bufferedSteps = /* @__PURE__ */ new Map();
 	let tripwireOccurred = false;
 	let finishEventSent = false;
@@ -12668,8 +12706,9 @@ function createAgentStreamToAISDKTransformer(convertMastraChunkToAISDK, { lastMe
 				}
 			});
 			if (transformedChunk) if (transformedChunk.type === "tool-agent") {
-				const payload = transformedChunk.payload;
-				const agentTransformed = transformAgent(payload, bufferedSteps);
+				if (!includeSubAgentMetadata) return;
+				const { payload, ancestry } = transformedChunk;
+				const agentTransformed = transformAgent(payload, bufferedSteps, ancestry);
 				if (agentTransformed) if (Array.isArray(agentTransformed)) for (const part of agentTransformed) controller.enqueue(part);
 				else controller.enqueue(agentTransformed);
 			} else if (transformedChunk.type === "tool-workflow") {
@@ -12731,7 +12770,7 @@ function createAgentStreamToAISDKTransformer(convertMastraChunkToAISDK, { lastMe
 		}
 	});
 }
-function AgentStreamToAISDKTransformer({ lastMessageId, sendStart = true, sendFinish = true, sendReasoning, sendSources, messageMetadata, onError }) {
+function AgentStreamToAISDKTransformer({ lastMessageId, sendStart = true, sendFinish = true, sendReasoning, sendSources, messageMetadata, onError, includeSubAgentMetadata = false }) {
 	return createAgentStreamToAISDKTransformer(convertMastraChunkToAISDKv5, {
 		lastMessageId,
 		sendStart,
@@ -12739,10 +12778,11 @@ function AgentStreamToAISDKTransformer({ lastMessageId, sendStart = true, sendFi
 		sendReasoning,
 		sendSources,
 		messageMetadata,
-		onError
+		onError,
+		includeSubAgentMetadata
 	});
 }
-function AgentStreamToAISDKV6Transformer({ lastMessageId, sendStart = true, sendFinish = true, sendReasoning, sendSources, messageMetadata, onError }) {
+function AgentStreamToAISDKV6Transformer({ lastMessageId, sendStart = true, sendFinish = true, sendReasoning, sendSources, messageMetadata, onError, includeSubAgentMetadata = false }) {
 	return createAgentStreamToAISDKTransformer(convertMastraChunkToAISDKv6, {
 		lastMessageId,
 		sendStart,
@@ -12750,7 +12790,8 @@ function AgentStreamToAISDKV6Transformer({ lastMessageId, sendStart = true, send
 		sendReasoning,
 		sendSources,
 		messageMetadata,
-		onError
+		onError,
+		includeSubAgentMetadata
 	});
 }
 function ensureAgentRunState(bufferedSteps, runId) {
@@ -12862,19 +12903,28 @@ function serializeAgentRun(current, { includeCompletedStepDetails, includeRespon
 		steps: data.steps.map((step) => cloneAgentStep(step, { includeDetails: includeCompletedStepDetails }))
 	};
 }
+function createAgentStreamAncestryMetadata(ancestry) {
+	const parentAgentId = ancestry.at(-2)?.agentId;
+	return {
+		ancestry,
+		depth: ancestry.length,
+		...parentAgentId ? { parentAgentId } : {}
+	};
+}
 function createAgentDataPart(args) {
-	const { current, runId, includeCompletedStepDetails, includeResponseMessages } = args;
+	const { current, runId, ancestry, includeCompletedStepDetails, includeResponseMessages } = args;
 	return {
 		type: "data-tool-agent",
 		id: runId,
 		data: serializeAgentRun(current, {
 			includeCompletedStepDetails,
 			includeResponseMessages
-		})
+		}),
+		...createAgentStreamAncestryMetadata(ancestry)
 	};
 }
 function createAgentStepDataPart(args) {
-	const { runId, stepIndex, step } = args;
+	const { runId, stepIndex, step, ancestry } = args;
 	return {
 		type: "data-tool-agent-step",
 		id: `${runId}:${stepIndex}`,
@@ -12882,10 +12932,11 @@ function createAgentStepDataPart(args) {
 			runId,
 			stepIndex,
 			step: cloneAgentStep(step, { includeDetails: true })
-		}
+		},
+		...createAgentStreamAncestryMetadata(ancestry)
 	};
 }
-function transformAgent(payload, bufferedSteps) {
+function transformAgent(payload, bufferedSteps, ancestry = []) {
 	let hasChanged = false;
 	let completedStep = null;
 	switch (payload.type) {
@@ -13098,13 +13149,15 @@ function transformAgent(payload, bufferedSteps) {
 		const snapshot = createAgentDataPart({
 			current: bufferedSteps.get(payload.runId),
 			runId: payload.runId,
+			ancestry,
 			includeCompletedStepDetails: payload.type === "finish",
 			includeResponseMessages: payload.type === "finish"
 		});
 		if (completedStep) return [snapshot, createAgentStepDataPart({
 			runId: payload.runId,
 			stepIndex: completedStep.stepIndex,
-			step: completedStep.step
+			step: completedStep.step,
+			ancestry
 		})];
 		return snapshot;
 	}
@@ -13623,7 +13676,8 @@ function toAISdkV5Stream(stream, options = {
 		sendReasoning: options.sendReasoning,
 		sendSources: options.sendSources,
 		messageMetadata: options.messageMetadata,
-		onError: options.onError
+		onError: options.onError,
+		includeSubAgentMetadata: options.includeSubAgentMetadata
 	}));
 }
 function toAISdkStream(stream, options = {
@@ -13649,7 +13703,8 @@ function toAISdkStream(stream, options = {
 			sendReasoning: options.sendReasoning,
 			sendSources: options.sendSources,
 			messageMetadata: options.messageMetadata,
-			onError: options.onError
+			onError: options.onError,
+			includeSubAgentMetadata: options.includeSubAgentMetadata
 		}));
 	}
 	const from = options.from;
@@ -13669,7 +13724,8 @@ function toAISdkStream(stream, options = {
 		sendReasoning: options.sendReasoning,
 		sendSources: options.sendSources,
 		messageMetadata: options.messageMetadata,
-		onError: options.onError
+		onError: options.onError,
+		includeSubAgentMetadata: options.includeSubAgentMetadata
 	}));
 }
 //#endregion