@mastra/react 1.4.13-alpha.3 → 1.5.0-alpha.6

package/dist/index.js

@@ -1,4 +1,4 @@
-import { $ as useEntity, A as TooltipContentClass, B as ToolApprovalContent, C as CodeBlock, D as IconButtonClass, E as IconButton, F as EntryTitleClass, G as ToolApprovalTitleClass, H as ToolApprovalHeader, I as ToolApproval, J as EntityContent, K as Entity, L as ToolApprovalActions, M as Entry, N as EntryClass, O as Tooltip, P as EntryTitle, Q as EntityTriggerVariantClasses, R as ToolApprovalActionsClass, S as AgentIcon, T as CodeCopyButton, U as ToolApprovalHeaderClass, V as ToolApprovalContentClass, W as ToolApprovalTitle, X as EntityTrigger, Y as EntityContentClass, Z as EntityTriggerClass, _ as MessageUsageValueClass, a as MessageClass, b as WorkflowIcon, c as MessageList, d as MessageStreamingClass, et as Icon, f as MessageUsage, g as MessageUsageValue, h as MessageUsageEntryClass, i as MessageActionsClass, j as TooltipTrigger, k as TooltipContent, l as MessageListClass, m as MessageUsageEntry, n as Message, o as MessageContent, p as MessageUsageClass, q as EntityCaret, r as MessageActions, s as MessageContentClass, t as MessageFactory, tt as IconSizes, u as MessageStreaming, v as MessageUsages, w as CodeBlockClass, x as ToolsIcon, y as MessageUsagesClass, z as ToolApprovalClass } from "./ui-Bd2cu1B9.js";
+import { $ as useEntity, A as TooltipContentClass, B as ToolApprovalContent, C as CodeBlock, D as IconButtonClass, E as IconButton, F as EntryTitleClass, G as ToolApprovalTitleClass, H as ToolApprovalHeader, I as ToolApproval, J as EntityContent, K as Entity, L as ToolApprovalActions, M as Entry, N as EntryClass, O as Tooltip, P as EntryTitle, Q as EntityTriggerVariantClasses, R as ToolApprovalActionsClass, S as AgentIcon, T as CodeCopyButton, U as ToolApprovalHeaderClass, V as ToolApprovalContentClass, W as ToolApprovalTitle, X as EntityTrigger, Y as EntityContentClass, Z as EntityTriggerClass, _ as MessageUsageValueClass, a as MessageClass, b as WorkflowIcon, c as MessageList, d as MessageStreamingClass, et as Icon, f as MessageUsage, g as MessageUsageValue, h as MessageUsageEntryClass, i as MessageActionsClass, j as TooltipTrigger, k as TooltipContent, l as MessageListClass, m as MessageUsageEntry, n as Message, o as MessageContent, p as MessageUsageClass, q as EntityCaret, r as MessageActions, s as MessageContentClass, t as MessageFactory, tt as IconSizes, u as MessageStreaming, v as MessageUsages, w as CodeBlockClass, x as ToolsIcon, y as MessageUsagesClass, z as ToolApprovalClass } from "./ui-BQyoxYsH.js";
 import { MastraClient } from "@mastra/client-js";
 import { createContext, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
@@ -1908,7 +1908,7 @@ const dbFromServerUiMessages = (uiMessages, metadata) => uiMessages.map((uiMsg)
 		}
 	};
 });
-const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContext: propsRequestContext, clientTools: hookClientTools, onSignalSent, onSignalEcho, onThreadSignalsUnsupported, enableThreadSignals = false }) => {
+const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContext: propsRequestContext, clientTools: hookClientTools, onSignalSent, onSignalEcho, onThreadSignalsUnsupported, enableThreadSignals = false, streamPath }) => {
 	const threadSignalsDisabled = enableThreadSignals === false;
 	const _currentRunId = useRef(void 0);
 	const _onChunk = useRef(void 0);
@@ -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;
@@ -2084,7 +2102,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		(onChunk ?? _onChunk.current)?.(chunk);
 	}, [onSignalEcho]);
 	const ensureThreadSubscription = useCallback(async ({ threadId, resourceId }) => {
-		const subscriptionKey = `${agentId}:${resourceId ?? ""}:${threadId}`;
+		const subscriptionKey = `${agentId}:${resourceId ?? ""}:${threadId}:${streamPath ?? ""}`;
 		if (_threadSubscriptionKeyRef.current === subscriptionKey && _threadSubscriptionPromiseRef.current) {
 			await _threadSubscriptionPromiseRef.current;
 			return;
@@ -2103,7 +2121,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		const subscriptionAgent = new MastraClient({
 			...baseClient.options,
 			abortSignal: subscriptionAbort.signal
-		}).getAgent(agentId);
+		}).getAgent(agentId, void 0, { stream: streamPath });
 		_threadSubscriptionPromiseRef.current = subscriptionAgent.subscribeToThread({
 			resourceId,
 			threadId
@@ -2141,7 +2159,8 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		baseClient,
 		closeThreadSubscription,
 		markThreadSignalsUnsupported,
-		processStreamChunk
+		processStreamChunk,
+		streamPath
 	]);
 	useEffect(() => {
 		_threadSignalsUnsupportedRef.current = false;
@@ -2171,7 +2190,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		threadId,
 		threadSignalsDisabled
 	]);
-	const generate = async ({ coreUserMessages, model, requestContext, threadId, modelSettings, signal, onFinish, tracingOptions, clientTools }) => {
+	const generate = async ({ coreUserMessages, model, requestContext, threadId, modelSettings, signal, onFinish, tracingOptions, clientTools, clientToolsResolver }) => {
 		const { frequencyPenalty, presencePenalty, maxRetries, maxTokens, temperature, topK, topP, instructions, system, providerOptions, maxSteps, requireToolApproval } = modelSettings || {};
 		const resolvedRequestContext = requestContext ?? propsRequestContext;
 		const resolvedClientTools = clientTools ?? hookClientTools;
@@ -2183,7 +2202,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		const agent = new MastraClient({
 			...baseClient.options,
 			abortSignal: signal
-		}).getAgent(agentId);
+		}).getAgent(agentId, void 0, { stream: streamPath });
 		const runId = v4();
 		_currentRunId.current = runId;
 		const response = await agent.generate(coreUserMessages, {
@@ -2209,7 +2228,8 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			providerOptions,
 			tracingOptions,
 			requireToolApproval,
-			clientTools: resolvedClientTools
+			clientTools: resolvedClientTools,
+			clientToolsResolver
 		});
 		if (response.finishReason === "suspended" && response.suspendPayload) {
 			const { toolCallId, toolName, args } = response.suspendPayload;
@@ -2234,7 +2254,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			setMessages((prev) => [...prev, ...dbMessages]);
 		}
 	};
-	const stream = async ({ coreUserMessages, model, requestContext, threadId, onChunk, modelSettings, signal, tracingOptions, clientTools, signalId, clientMessageId }) => {
+	const stream = async ({ coreUserMessages, model, requestContext, threadId, onChunk, modelSettings, signal, tracingOptions, clientTools, clientToolsResolver, signalId, clientMessageId }) => {
 		const { frequencyPenalty, presencePenalty, maxRetries, maxTokens, temperature, topK, topP, instructions, system, providerOptions, maxSteps, requireToolApproval } = modelSettings || {};
 		const resolvedRequestContext = requestContext ?? propsRequestContext;
 		const resolvedClientTools = clientTools ?? hookClientTools;
@@ -2269,7 +2289,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		const agent = new MastraClient({
 			...baseClient.options,
 			abortSignal: internalAbort.signal
-		}).getAgent(agentId);
+		}).getAgent(agentId, void 0, { stream: streamPath });
 		const streamWithLegacyRoute = async () => {
 			const runId = v4();
 			const response = await agent.stream(coreUserMessages, {
@@ -2296,7 +2316,8 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 				providerOptions,
 				requireToolApproval,
 				tracingOptions,
-				clientTools: resolvedClientTools
+				clientTools: resolvedClientTools,
+				clientToolsResolver
 			});
 			_onChunk.current = onChunk;
 			_currentRunId.current = runId;
@@ -2337,7 +2358,9 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			requestContext: requestContextRecord,
 			providerOptions,
 			requireToolApproval,
-			tracingOptions
+			tracingOptions,
+			clientTools: resolvedClientTools,
+			clientToolsResolver
 		};
 		try {
 			const result = await agent.sendMessage({
@@ -2350,7 +2373,8 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 				ifIdle: { streamOptions: {
 					...signalContinuationOptions,
 					requestContext: requestContextRecord,
-					clientTools: resolvedClientTools
+					clientTools: resolvedClientTools,
+					clientToolsResolver
 				} }
 			});
 			const echoedSignalId = result.signal && typeof result.signal === "object" && "id" in result.signal && typeof result.signal.id === "string" ? result.signal.id : resolvedSignalId;
@@ -2395,8 +2419,9 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		const agent = new MastraClient({
 			...baseClient.options,
 			abortSignal: signal
-		}).getAgent(agentId);
+		}).getAgent(agentId, void 0, { stream: streamPath });
 		const runId = v4();
+		_currentRunId.current = runId;
 		const response = await agent.network(coreUserMessages, {
 			model,
 			maxSteps,
@@ -2423,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);
 		} });
@@ -2459,7 +2487,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			...prev,
 			[toolCallId]: { status: "approved" }
 		}));
-		const agent = baseClient.getAgent(agentId);
+		const agent = baseClient.getAgent(agentId, void 0, { stream: streamPath });
 		if (_threadSubscriptionKeyRef.current && threadId) {
 			try {
 				await agent.sendToolApproval({
@@ -2520,7 +2548,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			...prev,
 			[toolCallId]: { status: "declined" }
 		}));
-		const agent = baseClient.getAgent(agentId);
+		const agent = baseClient.getAgent(agentId, void 0, { stream: streamPath });
 		if (_threadSubscriptionKeyRef.current && threadId) {
 			try {
 				await agent.sendToolApproval({
@@ -2565,7 +2593,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			...prev,
 			[toolCallId]: { status: "approved" }
 		}));
-		const response = await baseClient.getAgent(agentId).approveToolCallGenerate({
+		const response = await baseClient.getAgent(agentId, void 0, { stream: streamPath }).approveToolCallGenerate({
 			runId: currentRunId,
 			toolCallId,
 			...continuation
@@ -2585,7 +2613,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			...prev,
 			[toolCallId]: { status: "declined" }
 		}));
-		const response = await baseClient.getAgent(agentId).declineToolCallGenerate({
+		const response = await baseClient.getAgent(agentId, void 0, { stream: streamPath }).declineToolCallGenerate({
 			runId: currentRunId,
 			toolCallId,
 			...continuation
@@ -2601,19 +2629,23 @@ 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,
 			[runId ? `${runId}-${toolName}` : toolName]: { status: "approved" }
 		}));
-		await (await baseClient.getAgent(agentId).approveNetworkToolCall({
+		await (await baseClient.getAgent(agentId, void 0, { stream: streamPath }).approveNetworkToolCall({
 			runId: networkRunId,
 			...continuation
 		})).processDataStream({ onChunk: async (chunk) => {
 			setMessages((prev) => accumulateNetworkChunk({
 				chunk,
 				conversation: prev,
-				metadata: { mode: "network" }
+				metadata: {
+					mode: "network",
+					runId: networkRunId
+				}
 			}));
 			onNetworkChunk?.(chunk);
 		} });
@@ -2625,19 +2657,23 @@ 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,
 			[runId ? `${runId}-${toolName}` : toolName]: { status: "declined" }
 		}));
-		await (await baseClient.getAgent(agentId).declineNetworkToolCall({
+		await (await baseClient.getAgent(agentId, void 0, { stream: streamPath }).declineNetworkToolCall({
 			runId: networkRunId,
 			...continuation
 		})).processDataStream({ onChunk: async (chunk) => {
 			setMessages((prev) => accumulateNetworkChunk({
 				chunk,
 				conversation: prev,
-				metadata: { mode: "network" }
+				metadata: {
+					mode: "network",
+					runId: networkRunId
+				}
 			}));
 			onNetworkChunk?.(chunk);
 		} });
@@ -2645,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: [{
@@ -2698,6 +2735,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		setMessages,
 		sendMessage,
 		isRunning,
+		activeRunId: isRunning || isAwaitingToolApproval ? _currentRunId.current : void 0,
 		isAwaitingToolApproval,
 		messages,
 		tasks,