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

package/dist/agent/hooks.d.ts

@@ -72,6 +72,7 @@ export declare const useChat: ({ agentId, resourceId, threadId, initialMessages,
     setMessages: import("react").Dispatch<import("react").SetStateAction<MastraDBMessage[]>>;
     sendMessage: ({ mode, ...args }: SendMessageArgs) => Promise<void>;
     isRunning: boolean;
+    activeRunId: string | undefined;
     isAwaitingToolApproval: boolean;
     messages: MastraDBMessage[];
     tasks: {

package/dist/agent/hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/agent/hooks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/agent/hooks.ts"],"names":[],"mappings":"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"}

package/dist/index.cjs

@@ -2046,11 +2046,29 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 	const processStreamChunk = (0, react.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;
@@ -2404,6 +2422,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			abortSignal: signal
 		}).getAgent(agentId, void 0, { stream: streamPath });
 		const runId = (0, _lukeed_uuid.v4)();
+		_currentRunId.current = runId;
 		const response = await agent.network(coreUserMessages, {
 			model,
 			maxSteps,
@@ -2430,7 +2449,10 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			setMessages((prev) => accumulateNetworkChunk({
 				chunk,
 				conversation: prev,
-				metadata: { mode: "network" }
+				metadata: {
+					mode: "network",
+					runId
+				}
 			}));
 			onNetworkChunk?.(chunk);
 		} });
@@ -2608,6 +2630,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,
@@ -2620,7 +2643,10 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			setMessages((prev) => accumulateNetworkChunk({
 				chunk,
 				conversation: prev,
-				metadata: { mode: "network" }
+				metadata: {
+					mode: "network",
+					runId: networkRunId
+				}
 			}));
 			onNetworkChunk?.(chunk);
 		} });
@@ -2632,6 +2658,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,
@@ -2644,7 +2671,10 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			setMessages((prev) => accumulateNetworkChunk({
 				chunk,
 				conversation: prev,
-				metadata: { mode: "network" }
+				metadata: {
+					mode: "network",
+					runId: networkRunId
+				}
 			}));
 			onNetworkChunk?.(chunk);
 		} });
@@ -2652,6 +2682,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: [{
@@ -2705,6 +2736,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		setMessages,
 		sendMessage,
 		isRunning,
+		activeRunId: isRunning || isAwaitingToolApproval ? _currentRunId.current : void 0,
 		isAwaitingToolApproval,
 		messages,
 		tasks,