@mastra/react 1.5.0-alpha.4 → 1.5.0-alpha.6

package/dist/index.js

@@ -2045,11 +2045,29 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 	const processStreamChunk = useCallback(async (chunk, onChunk) => {
 		const isTerminal = chunk.type === "finish" || chunk.type === "abort" || chunk.type === "error";
 		if (isTerminal && liveRunId.current && chunk.runId !== liveRunId.current) return;
-		setMessages((prev) => accumulateChunk({
-			chunk,
-			conversation: prev,
-			metadata: { mode: "stream" }
-		}));
+		const runId = "runId" in chunk && typeof chunk.runId === "string" ? chunk.runId : void 0;
+		setMessages((prev) => {
+			const metadata = {
+				mode: "stream",
+				runId
+			};
+			const next = accumulateChunk({
+				chunk,
+				conversation: prev,
+				metadata
+			});
+			if ((chunk.type === "start" || chunk.type === "step-start") && chunk.payload?.messageId && runId) return next.map((message) => message.id === chunk.payload.messageId && message.role === "assistant" ? {
+				...message,
+				content: {
+					...message.content,
+					metadata: {
+						...message.content.metadata,
+						...metadata
+					}
+				}
+			} : message);
+			return next;
+		});
 		const streamedTasks = extractTasksFromToolResultChunk(chunk) ?? extractTasksFromSignalChunk(chunk);
 		if (streamedTasks !== void 0) {
 			liveTasks.current = streamedTasks;
@@ -2403,6 +2421,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			abortSignal: signal
 		}).getAgent(agentId, void 0, { stream: streamPath });
 		const runId = v4();
+		_currentRunId.current = runId;
 		const response = await agent.network(coreUserMessages, {
 			model,
 			maxSteps,
@@ -2429,7 +2448,10 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			setMessages((prev) => accumulateNetworkChunk({
 				chunk,
 				conversation: prev,
-				metadata: { mode: "network" }
+				metadata: {
+					mode: "network",
+					runId
+				}
 			}));
 			onNetworkChunk?.(chunk);
 		} });
@@ -2607,6 +2629,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		const networkRunId = runId || _networkRunId.current;
 		const continuation = _activeContinuation.current;
 		if (!networkRunId) return console.info("[approveNetworkToolCall] approveNetworkToolCall can only be called after a network stream has started");
+		_currentRunId.current = networkRunId;
 		setIsRunning(true);
 		setNetworkToolCallApprovals((prev) => ({
 			...prev,
@@ -2619,7 +2642,10 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			setMessages((prev) => accumulateNetworkChunk({
 				chunk,
 				conversation: prev,
-				metadata: { mode: "network" }
+				metadata: {
+					mode: "network",
+					runId: networkRunId
+				}
 			}));
 			onNetworkChunk?.(chunk);
 		} });
@@ -2631,6 +2657,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		const networkRunId = runId || _networkRunId.current;
 		const continuation = _activeContinuation.current;
 		if (!networkRunId) return console.info("[declineNetworkToolCall] declineNetworkToolCall can only be called after a network stream has started");
+		_currentRunId.current = networkRunId;
 		setIsRunning(true);
 		setNetworkToolCallApprovals((prev) => ({
 			...prev,
@@ -2643,7 +2670,10 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			setMessages((prev) => accumulateNetworkChunk({
 				chunk,
 				conversation: prev,
-				metadata: { mode: "network" }
+				metadata: {
+					mode: "network",
+					runId: networkRunId
+				}
 			}));
 			onNetworkChunk?.(chunk);
 		} });
@@ -2651,6 +2681,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		setIsRunning(false);
 	};
 	const sendMessage = async ({ mode = "stream", ...args }) => {
+		if (!isRunning && !isAwaitingToolApproval) _currentRunId.current = void 0;
 		const coreUserMessages = [{
 			role: "user",
 			content: [{
@@ -2704,6 +2735,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		setMessages,
 		sendMessage,
 		isRunning,
+		activeRunId: isRunning || isAwaitingToolApproval ? _currentRunId.current : void 0,
 		isAwaitingToolApproval,
 		messages,
 		tasks,