@mastra/react 1.6.0-alpha.9 → 1.6.0

package/dist/index.js

@@ -139,6 +139,37 @@ function toolErrorText(error) {
 	}
 	return String(error);
 }
+/**
+* Agent-as-tool boundaries wrap progressive chunks in nested `tool-output`
+* envelopes. Peel only agent boundaries; workflow/tool envelopes remain the
+* leaf so existing child-message accumulation can process them normally.
+*/
+const normalizeNestedAgentOutput = (output) => {
+	const boundaries = [];
+	const seen = /* @__PURE__ */ new Set();
+	let current = output;
+	while (current !== null && typeof current === "object") {
+		if (seen.has(current)) return void 0;
+		seen.add(current);
+		const chunk = current;
+		if (chunk.type !== "tool-output") return {
+			leaf: current,
+			boundaries
+		};
+		const toolCallId = chunk.payload?.toolCallId;
+		const toolName = chunk.payload?.toolName;
+		if (typeof toolName !== "string" || !toolName.startsWith("agent-")) return {
+			leaf: current,
+			boundaries
+		};
+		if (typeof toolCallId !== "string" || !("output" in (chunk.payload ?? {}))) return void 0;
+		boundaries.push({
+			toolCallId,
+			toolName
+		});
+		current = chunk.payload?.output;
+	}
+};
 const cloneMetadata = (metadata) => metadata ? { ...metadata } : {};
 const withParts = (message, parts) => ({
 	...message,
@@ -836,7 +867,7 @@ const accumulateChunk = ({ chunk, conversation, metadata }) => {
 							toolName,
 							args,
 							errorText,
-							...toolName?.startsWith("agent-") ? { result: toolPart.toolInvocation.result } : {}
+							...chunk.from === "AGENT" ? { result: toolPart.toolInvocation.result } : {}
 						}
 					};
 				} else {
@@ -858,7 +889,7 @@ const accumulateChunk = ({ chunk, conversation, metadata }) => {
 						};
 						else output = payloadResult;
 					} else if (isAgent) {
-						const existingOutput = toolPart.toolInvocation.state === "result" ? toolPart.toolInvocation.result : void 0;
+						const existingOutput = toolPart.toolInvocation.state === "partial-call" || toolPart.toolInvocation.state === "result" ? toolPart.toolInvocation.result : void 0;
 						const existingChild = existingOutput?.childMessages;
 						output = existingOutput ? {
 							...payloadResult,
@@ -935,8 +966,13 @@ const accumulateChunk = ({ chunk, conversation, metadata }) => {
 						result: updated
 					}
 				};
-			} else if (payloadOutput?.from === "AGENT" || payloadOutput?.from === "USER" && payloadOutput?.payload?.output?.type?.startsWith("workflow-")) return accumulateAgentChunk(payloadOutput, result, metadata, toolCallId, toolName);
-			else {
+			} else if (toolName.startsWith("agent-") || payloadOutput?.from === "AGENT") {
+				const normalized = normalizeNestedAgentOutput(payloadOutput);
+				if (!normalized) return result;
+				const { leaf, boundaries } = normalized;
+				if (leaf.from === "AGENT" || leaf.type === "tool-output" && leaf.payload?.output?.type?.startsWith("workflow-")) return accumulateAgentChunk(leaf, result, metadata, toolCallId, toolName, boundaries);
+				return result;
+			} else {
 				const currentResult = toolPart.toolInvocation.result;
 				const existing = Array.isArray(currentResult) ? currentResult : [];
 				parts[toolPartIndex] = {
@@ -1164,112 +1200,130 @@ const accumulateChunk = ({ chunk, conversation, metadata }) => {
 * that isn't enumerated above.
 */
 const assertExhaustive = (_chunk, fallback) => fallback;
-const accumulateAgentChunk = (chunk, conversation, _metadata, parentToolCallId, parentToolName) => {
-	const lastMessage = conversation[conversation.length - 1];
-	if (!lastMessage || lastMessage.role !== "assistant") return conversation;
-	const parts = [...lastMessage.content.parts];
-	const findToolPartIndex = () => parts.findIndex((part) => isToolPart(part) && (parentToolCallId && part.toolInvocation.toolCallId === parentToolCallId || parentToolName && part.toolInvocation.toolName === parentToolName));
+const findAgentChildToolIndex = (childMessages, toolCallId, toolName) => {
+	for (let index = childMessages.length - 1; index >= 0; index--) {
+		const message = childMessages[index];
+		if (message?.type !== "tool") continue;
+		if (toolCallId ? message.toolCallId === toolCallId : toolName && message.toolName === toolName) return index;
+	}
+	return -1;
+};
+const accumulateAgentChildMessages = (chunk, childMessages) => {
 	if (chunk.type === "text-delta") {
-		const agentChunk = chunk.payload;
-		const toolPartIndex = findToolPartIndex();
-		if (toolPartIndex === -1) return conversation;
-		const toolPart = parts[toolPartIndex];
-		const existingResult = toolPart.toolInvocation.result || {};
-		const childMessages = existingResult.childMessages || [];
+		const text = chunk.payload.text;
 		const lastChildMessage = childMessages[childMessages.length - 1];
 		const textMessage = {
 			type: "text",
-			content: (lastChildMessage?.content || "") + agentChunk.text
+			content: (lastChildMessage?.type === "text" ? lastChildMessage.content : "") + text
 		};
-		const nextChildren = lastChildMessage?.type === "text" ? [...childMessages.slice(0, -1), textMessage] : [...childMessages, textMessage];
-		parts[toolPartIndex] = {
-			...toolPart,
-			toolInvocation: {
-				...toolPart.toolInvocation,
-				result: {
-					...existingResult,
-					childMessages: nextChildren
-				}
-			}
+		return lastChildMessage?.type === "text" ? [...childMessages.slice(0, -1), textMessage] : [...childMessages, textMessage];
+	}
+	if (chunk.type === "tool-call") {
+		const existingIndex = findAgentChildToolIndex(childMessages, chunk.payload.toolCallId);
+		const toolMessage = {
+			...existingIndex === -1 ? {} : childMessages[existingIndex],
+			type: "tool",
+			toolCallId: chunk.payload.toolCallId,
+			toolName: chunk.payload.toolName,
+			args: chunk.payload.args
 		};
-	} else if (chunk.type === "tool-call") {
-		const agentChunk = chunk.payload;
-		const toolPartIndex = findToolPartIndex();
-		if (toolPartIndex === -1) return conversation;
-		const toolPart = parts[toolPartIndex];
-		const existingResult = toolPart.toolInvocation.result || {};
-		const childMessages = existingResult.childMessages || [];
-		parts[toolPartIndex] = {
-			...toolPart,
-			toolInvocation: {
-				...toolPart.toolInvocation,
-				result: {
-					...existingResult,
-					childMessages: [...childMessages, {
-						type: "tool",
-						toolCallId: agentChunk.toolCallId,
-						toolName: agentChunk.toolName,
-						args: agentChunk.args
-					}]
-				}
+		if (existingIndex === -1) return [...childMessages, toolMessage];
+		const nextMessages = [...childMessages];
+		nextMessages[existingIndex] = toolMessage;
+		return nextMessages;
+	}
+	if (chunk.type === "tool-output" && chunk.payload.output?.type?.startsWith("workflow-")) {
+		const toolIndex = findAgentChildToolIndex(childMessages, chunk.payload.toolCallId, chunk.payload.toolName);
+		if (toolIndex === -1) return childMessages;
+		const currentMessage = childMessages[toolIndex];
+		if (currentMessage?.type !== "tool") return childMessages;
+		const existingWorkflowState = currentMessage.toolOutput && typeof currentMessage.toolOutput === "object" ? currentMessage.toolOutput : {};
+		const updated = mapWorkflowStreamChunkToWatchResult(existingWorkflowState, chunk.payload.output);
+		const nextMessages = [...childMessages];
+		nextMessages[toolIndex] = {
+			...currentMessage,
+			toolOutput: {
+				...updated,
+				runId: chunk.payload.output.runId
 			}
 		};
-	} else if (chunk.type === "tool-output") {
-		const agentChunk = chunk.payload;
-		const toolPartIndex = findToolPartIndex();
-		if (toolPartIndex === -1) return conversation;
-		const toolPart = parts[toolPartIndex];
-		if (agentChunk?.output?.type?.startsWith("workflow-")) {
-			const existingResult = toolPart.toolInvocation.result || {};
-			const childMessages = existingResult.childMessages || [];
-			const lastIndex = childMessages.length - 1;
-			const currentMessage = childMessages[lastIndex];
-			const actualExistingWorkflowState = currentMessage?.toolOutput || {};
-			const updated = mapWorkflowStreamChunkToWatchResult(actualExistingWorkflowState, agentChunk.output);
-			if (lastIndex >= 0 && childMessages[lastIndex]?.type === "tool") parts[toolPartIndex] = {
-				...toolPart,
-				toolInvocation: {
-					...toolPart.toolInvocation,
-					result: {
-						...existingResult,
-						childMessages: [...childMessages.slice(0, -1), {
-							...currentMessage,
-							toolOutput: {
-								...updated,
-								runId: agentChunk.output.runId
-							}
-						}]
-					}
-				}
-			};
-		}
-	} else if (chunk.type === "tool-result") {
-		const agentChunk = chunk.payload;
-		const toolPartIndex = findToolPartIndex();
-		if (toolPartIndex === -1) return conversation;
-		const toolPart = parts[toolPartIndex];
-		const existingResult = toolPart.toolInvocation.result || {};
-		const childMessages = existingResult.childMessages || [];
-		const lastIndex = childMessages.length - 1;
-		const isWorkflow = agentChunk?.toolName?.startsWith("workflow-");
-		if (lastIndex >= 0 && childMessages[lastIndex]?.type === "tool") parts[toolPartIndex] = {
-			...toolPart,
-			toolInvocation: {
-				...toolPart.toolInvocation,
-				result: {
-					...existingResult,
-					childMessages: [...childMessages.slice(0, -1), {
-						...childMessages[lastIndex],
-						toolOutput: isWorkflow ? {
-							...agentChunk.result?.result,
-							runId: agentChunk.result?.runId
-						} : agentChunk.result
-					}]
-				}
-			}
+		return nextMessages;
+	}
+	if (chunk.type === "tool-result") {
+		const toolIndex = findAgentChildToolIndex(childMessages, chunk.payload.toolCallId, chunk.payload.toolName);
+		if (toolIndex === -1) return childMessages;
+		const currentMessage = childMessages[toolIndex];
+		if (currentMessage?.type !== "tool") return childMessages;
+		const result = chunk.payload.result;
+		const nextMessages = [...childMessages];
+		nextMessages[toolIndex] = {
+			...currentMessage,
+			toolOutput: chunk.payload.toolName?.startsWith("workflow-") ? {
+				...result?.result ?? {},
+				runId: result?.runId
+			} : chunk.payload.result
 		};
+		return nextMessages;
 	}
-	return replaceLast(conversation, withParts(lastMessage, parts));
+	return childMessages;
+};
+const routeAgentChunk = (chunk, childMessages, boundaries) => {
+	const [boundary, ...remaining] = boundaries;
+	if (!boundary) return accumulateAgentChildMessages(chunk, childMessages);
+	let toolIndex = findAgentChildToolIndex(childMessages, boundary.toolCallId, boundary.toolName);
+	let nextMessages = childMessages;
+	if (toolIndex === -1) {
+		toolIndex = childMessages.length;
+		nextMessages = [...childMessages, {
+			type: "tool",
+			toolCallId: boundary.toolCallId,
+			toolName: boundary.toolName,
+			args: {}
+		}];
+	}
+	const currentMessage = nextMessages[toolIndex];
+	if (currentMessage?.type !== "tool" || !currentMessage.toolName.startsWith("agent-")) return childMessages;
+	const currentOutput = currentMessage.toolOutput !== null && typeof currentMessage.toolOutput === "object" ? currentMessage.toolOutput : {};
+	const nestedMessages = Array.isArray(currentOutput.childMessages) ? currentOutput.childMessages : [];
+	const updatedNestedMessages = routeAgentChunk(chunk, nestedMessages, remaining);
+	if (updatedNestedMessages === nestedMessages) return childMessages;
+	const updatedMessages = [...nextMessages];
+	updatedMessages[toolIndex] = {
+		...currentMessage,
+		toolOutput: {
+			...currentOutput,
+			childMessages: updatedNestedMessages
+		}
+	};
+	return updatedMessages;
+};
+const accumulateAgentChunk = (chunk, conversation, _metadata, parentToolCallId, parentToolName, boundaries = []) => {
+	if (!parentToolCallId) return conversation;
+	const location = locateToolPart(conversation, parentToolCallId, false);
+	if (!location) return conversation;
+	const targetMessage = conversation[location.messageIndex];
+	if (!targetMessage || targetMessage.role !== "assistant") return conversation;
+	const parts = [...targetMessage.content.parts];
+	const toolPart = parts[location.toolPartIndex];
+	if (!toolPart || !isToolPart(toolPart)) return conversation;
+	if (parentToolName && toolPart.toolInvocation.toolName !== parentToolName) return conversation;
+	const invocationResult = "result" in toolPart.toolInvocation && toolPart.toolInvocation.result !== null ? toolPart.toolInvocation.result : void 0;
+	const existingResult = invocationResult && typeof invocationResult === "object" ? invocationResult : {};
+	const childMessages = Array.isArray(existingResult.childMessages) ? existingResult.childMessages : [];
+	const updatedChildMessages = routeAgentChunk(chunk, childMessages, boundaries);
+	if (updatedChildMessages === childMessages) return conversation;
+	parts[location.toolPartIndex] = {
+		...toolPart,
+		toolInvocation: {
+			...toolPart.toolInvocation,
+			state: "partial-call",
+			result: {
+				...existingResult,
+				childMessages: updatedChildMessages
+			}
+		}
+	};
+	return replaceAt(conversation, location.messageIndex, withParts(targetMessage, parts));
 };
 const networkMode = (metadata) => ({
 	...metadata,
@@ -2885,14 +2939,17 @@ function useStreamWorkflow({ debugMode, tracingOptions, onError }) {
 			}
 		}
 	}
-	const streamWorkflow = useMutation(({ workflowId, runId, inputData, initialState, requestContext, perStep }) => {
+	const streamWorkflow = useMutation(({ workflowId, runId, inputData, initialState, requestContext, perStep, resourceId }) => {
 		setStreamResult({
 			status: "pending",
 			input: inputData,
 			steps: {}
 		});
 		return consumeStream(async (signal) => {
-			const run = await client.getWorkflow(workflowId).createRun({ runId });
+			const run = await client.getWorkflow(workflowId).createRun({
+				runId,
+				resourceId
+			});
 			if (signal.aborted) return;
 			return run.stream({
 				inputData,
@@ -2900,7 +2957,8 @@ function useStreamWorkflow({ debugMode, tracingOptions, onError }) {
 				requestContext,
 				closeOnSuspend: true,
 				tracingOptions,
-				perStep: perStep ?? debugMode
+				perStep: perStep ?? debugMode,
+				resourceId
 			});
 		}, "Error streaming workflow");
 	});
@@ -2971,9 +3029,12 @@ function useStreamWorkflow({ debugMode, tracingOptions, onError }) {
 */
 function useCreateWorkflowRun() {
 	const client = useMastraClient();
-	return useMutation(async ({ workflowId, prevRunId }) => {
+	return useMutation(async ({ workflowId, prevRunId, resourceId }) => {
 		try {
-			const { runId: newRunId } = await client.getWorkflow(workflowId).createRun({ runId: prevRunId });
+			const { runId: newRunId } = await client.getWorkflow(workflowId).createRun({
+				runId: prevRunId,
+				resourceId
+			});
 			return { runId: newRunId };
 		} catch (error) {
 			console.error("Error creating workflow run:", error);
@@ -3155,7 +3216,8 @@ const useBrowserSpeechRecognition = ({ language = "en-US" }) => {
 			setState((prev) => ({
 				...prev,
 				isListening: true,
-				error: null
+				error: null,
+				transcript: ""
 			}));
 		};
 		recognition.onresult = (event) => {
@@ -3164,9 +3226,10 @@ const useBrowserSpeechRecognition = ({ language = "en-US" }) => {
 				const transcript = event.results[i][0].transcript;
 				if (event.results[i].isFinal) finalTranscript += transcript + " ";
 			}
+			if (!finalTranscript) return;
 			setState((prev) => ({
 				...prev,
-				transcript: finalTranscript
+				transcript: prev.transcript + finalTranscript
 			}));
 		};
 		recognition.onerror = (event) => {