@mastra/ai-sdk 1.7.0 → 1.7.1-alpha.1

package/dist/index.js

@@ -8858,7 +8858,7 @@ function convertMastraChunkToAISDKBase({ chunk, mode = "stream", normalizeWarnin
 			type: "finish",
 			finishReason: normalizeFinishReason(chunk.payload.stepResult.reason),
 			...includeRawFinishReason ? { rawFinishReason: chunk.payload.stepResult.reason } : {},
-			totalUsage: normalizeUsage(chunk.payload.output.usage)
+			totalUsage: normalizeUsage(chunk.payload.output?.usage ?? chunk.payload.usage)
 		};
 		case "reasoning-start": return {
 			type: "reasoning-start",
@@ -9414,52 +9414,88 @@ function createAgentStreamToAISDKTransformer(convertMastraChunkToAISDK, { lastMe
 	let bufferedSteps = /* @__PURE__ */ new Map();
 	let tripwireOccurred = false;
 	let finishEventSent = false;
+	let heldChunks = null;
+	let startIdResolved = false;
+	const processChunk = (chunk, controller) => {
+		if (chunk.type === "tripwire") tripwireOccurred = true;
+		if (chunk.type === "finish") finishEventSent = true;
+		if (chunk.type === "object-result") controller.enqueue({
+			type: "data-structured-output",
+			data: { object: chunk.object }
+		});
+		const part = convertMastraChunkToAISDK({
+			chunk,
+			mode: "stream"
+		});
+		const enqueueTransformedPart = (p) => {
+			const transformedChunk = convertFullStreamChunkToUIMessageStream({
+				part: p,
+				sendReasoning,
+				sendSources,
+				messageMetadataValue: p ? messageMetadata?.({ part: p }) : void 0,
+				sendStart,
+				sendFinish,
+				responseMessageId: lastMessageId,
+				onError(error) {
+					return onError ? onError(error) : safeParseErrorObject(error);
+				}
+			});
+			if (transformedChunk) if (transformedChunk.type === "tool-agent") {
+				const payload = transformedChunk.payload;
+				const agentTransformed = transformAgent(payload, bufferedSteps);
+				if (agentTransformed) controller.enqueue(agentTransformed);
+			} else if (transformedChunk.type === "tool-workflow") {
+				const payload = transformedChunk.payload;
+				const workflowChunk = transformWorkflow(payload, bufferedSteps, true, void 0, void 0, convertMastraChunkToAISDK);
+				if (workflowChunk) if (Array.isArray(workflowChunk)) for (const item of workflowChunk) controller.enqueue(item);
+				else controller.enqueue(workflowChunk);
+			} else if (transformedChunk.type === "tool-network") {
+				const payload = transformedChunk.payload;
+				const networkChunk = transformNetwork(payload, bufferedSteps, true);
+				if (Array.isArray(networkChunk)) {
+					for (const c of networkChunk) if (c) controller.enqueue(c);
+				} else if (networkChunk) controller.enqueue(networkChunk);
+			} else controller.enqueue(transformedChunk);
+		};
+		if (Array.isArray(part)) for (const p of part) enqueueTransformedPart(p);
+		else enqueueTransformedPart(part);
+	};
 	return new TransformStream$1({
 		transform(chunk, controller) {
-			if (chunk.type === "tripwire") tripwireOccurred = true;
-			if (chunk.type === "finish") finishEventSent = true;
-			if (chunk.type === "object-result") controller.enqueue({
-				type: "data-structured-output",
-				data: { object: chunk.object }
-			});
-			const part = convertMastraChunkToAISDK({
-				chunk,
-				mode: "stream"
-			});
-			const enqueueTransformedPart = (p) => {
-				const transformedChunk = convertFullStreamChunkToUIMessageStream({
-					part: p,
-					sendReasoning,
-					sendSources,
-					messageMetadataValue: p ? messageMetadata?.({ part: p }) : void 0,
-					sendStart,
-					sendFinish,
-					responseMessageId: lastMessageId,
-					onError(error) {
-						return onError ? onError(error) : safeParseErrorObject(error);
+			if (!startIdResolved) {
+				if (sendStart && chunk.type === "start") {
+					heldChunks = [chunk];
+					return;
+				}
+				if (heldChunks) {
+					if (typeof chunk.type === "string" && chunk.type.startsWith("data-")) {
+						heldChunks.push(chunk);
+						return;
 					}
-				});
-				if (transformedChunk) if (transformedChunk.type === "tool-agent") {
-					const payload = transformedChunk.payload;
-					const agentTransformed = transformAgent(payload, bufferedSteps);
-					if (agentTransformed) controller.enqueue(agentTransformed);
-				} else if (transformedChunk.type === "tool-workflow") {
-					const payload = transformedChunk.payload;
-					const workflowChunk = transformWorkflow(payload, bufferedSteps, true, void 0, void 0, convertMastraChunkToAISDK);
-					if (workflowChunk) if (Array.isArray(workflowChunk)) for (const item of workflowChunk) controller.enqueue(item);
-					else controller.enqueue(workflowChunk);
-				} else if (transformedChunk.type === "tool-network") {
-					const payload = transformedChunk.payload;
-					const networkChunk = transformNetwork(payload, bufferedSteps, true);
-					if (Array.isArray(networkChunk)) {
-						for (const c of networkChunk) if (c) controller.enqueue(c);
-					} else if (networkChunk) controller.enqueue(networkChunk);
-				} else controller.enqueue(transformedChunk);
-			};
-			if (Array.isArray(part)) for (const p of part) enqueueTransformedPart(p);
-			else enqueueTransformedPart(part);
+					startIdResolved = true;
+					const held = heldChunks;
+					heldChunks = null;
+					if (chunk.type === "step-start") {
+						const startPayload = held[0]?.payload;
+						const stepMessageId = chunk.payload?.messageId;
+						if (held[0] && typeof stepMessageId === "string" && typeof startPayload?.messageId === "string" && stepMessageId !== startPayload.messageId) held[0] = {
+							...held[0],
+							payload: {
+								...startPayload,
+								messageId: stepMessageId
+							}
+						};
+					}
+					for (const heldChunk of held) processChunk(heldChunk, controller);
+				} else startIdResolved = true;
+			}
+			processChunk(chunk, controller);
 		},
 		flush(controller) {
+			if (heldChunks) {
+				for (const heldChunk of heldChunks) processChunk(heldChunk, controller);
+				heldChunks = null;
+			}
 			if (tripwireOccurred && !finishEventSent && sendFinish) controller.enqueue({
 				type: "finish",
 				finishReason: "other"