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

package/dist/agent/hooks.d.ts

@@ -3,7 +3,7 @@ import type { CoreUserMessage } from '@mastra/core/llm';
 import type { TracingOptions } from '@mastra/core/observability';
 import type { RequestContext } from '@mastra/core/request-context';
 import type { ChunkType, NetworkChunkType } from '@mastra/core/stream';
-import type { ClientToolsInput, ModelSettings } from './types.js';
+import type { ClientToolsInput, ClientToolsResolver, ModelSettings } from './types.js';
 export interface MastraChatProps {
     agentId: string;
     resourceId?: string;
@@ -25,6 +25,8 @@ export interface MastraChatProps {
      * Defaults to `false`; set to `true` to opt into thread signals.
      */
     enableThreadSignals?: boolean;
+    /** Override the legacy stream route for editor-owned hidden agents. */
+    streamPath?: string;
 }
 interface SharedArgs {
     coreUserMessages: CoreUserMessage[];
@@ -50,10 +52,12 @@ export type SendMessageArgs = {
 export type GenerateArgs = SharedArgs & {
     onFinish?: (messages: MastraDBMessage[]) => Promise<void>;
     clientTools?: ClientToolsInput;
+    clientToolsResolver?: ClientToolsResolver;
 };
 export type StreamArgs = SharedArgs & {
     onChunk?: (chunk: ChunkType) => Promise<void>;
     clientTools?: ClientToolsInput;
+    clientToolsResolver?: ClientToolsResolver;
     signalId?: string;
     /**
      * Client-generated correlation id stamped on the optimistic pending bubble
@@ -64,10 +68,11 @@ export type StreamArgs = SharedArgs & {
 export type NetworkArgs = SharedArgs & {
     onNetworkChunk?: (chunk: NetworkChunkType) => Promise<void>;
 };
-export declare const useChat: ({ agentId, resourceId, threadId, initialMessages, requestContext: propsRequestContext, clientTools: hookClientTools, onSignalSent, onSignalEcho, onThreadSignalsUnsupported, enableThreadSignals, }: MastraChatProps) => {
+export declare const useChat: ({ agentId, resourceId, threadId, initialMessages, requestContext: propsRequestContext, clientTools: hookClientTools, onSignalSent, onSignalEcho, onThreadSignalsUnsupported, enableThreadSignals, streamPath, }: MastraChatProps) => {
     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/agent/types.d.ts

@@ -1,6 +1,7 @@
 import type { GenerateLegacyParams } from '@mastra/client-js';
 import type { ToolsInput } from '@mastra/core/agent';
 export type ClientToolsInput = ToolsInput;
+export type ClientToolsResolver = () => ClientToolsInput | undefined;
 export type ProviderOptionsInput = GenerateLegacyParams['providerOptions'];
 export interface ModelSettings {
     frequencyPenalty?: number;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/agent/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC;AAC1C,MAAM,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;AAE3E,MAAM,WAAW,aAAa;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,oBAAoB,CAAC;IACvC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/agent/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC;AAC1C,MAAM,MAAM,mBAAmB,GAAG,MAAM,gBAAgB,GAAG,SAAS,CAAC;AACrE,MAAM,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;AAE3E,MAAM,WAAW,aAAa;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,oBAAoB,CAAC;IACvC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B"}

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_ui = require("./ui-DL8WaLmH.cjs");
+const require_ui = require("./ui-C979LXC_.cjs");
 let _mastra_client_js = require("@mastra/client-js");
 let react = require("react");
 let react_jsx_runtime = require("react/jsx-runtime");
@@ -1909,7 +1909,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 = (0, react.useRef)(void 0);
 	const _onChunk = (0, react.useRef)(void 0);
@@ -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;
@@ -2085,7 +2103,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		(onChunk ?? _onChunk.current)?.(chunk);
 	}, [onSignalEcho]);
 	const ensureThreadSubscription = (0, react.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;
@@ -2104,7 +2122,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		const subscriptionAgent = new _mastra_client_js.MastraClient({
 			...baseClient.options,
 			abortSignal: subscriptionAbort.signal
-		}).getAgent(agentId);
+		}).getAgent(agentId, void 0, { stream: streamPath });
 		_threadSubscriptionPromiseRef.current = subscriptionAgent.subscribeToThread({
 			resourceId,
 			threadId
@@ -2142,7 +2160,8 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		baseClient,
 		closeThreadSubscription,
 		markThreadSignalsUnsupported,
-		processStreamChunk
+		processStreamChunk,
+		streamPath
 	]);
 	(0, react.useEffect)(() => {
 		_threadSignalsUnsupportedRef.current = false;
@@ -2172,7 +2191,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;
@@ -2184,7 +2203,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		const agent = new _mastra_client_js.MastraClient({
 			...baseClient.options,
 			abortSignal: signal
-		}).getAgent(agentId);
+		}).getAgent(agentId, void 0, { stream: streamPath });
 		const runId = (0, _lukeed_uuid.v4)();
 		_currentRunId.current = runId;
 		const response = await agent.generate(coreUserMessages, {
@@ -2210,7 +2229,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;
@@ -2235,7 +2255,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;
@@ -2270,7 +2290,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		const agent = new _mastra_client_js.MastraClient({
 			...baseClient.options,
 			abortSignal: internalAbort.signal
-		}).getAgent(agentId);
+		}).getAgent(agentId, void 0, { stream: streamPath });
 		const streamWithLegacyRoute = async () => {
 			const runId = (0, _lukeed_uuid.v4)();
 			const response = await agent.stream(coreUserMessages, {
@@ -2297,7 +2317,8 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 				providerOptions,
 				requireToolApproval,
 				tracingOptions,
-				clientTools: resolvedClientTools
+				clientTools: resolvedClientTools,
+				clientToolsResolver
 			});
 			_onChunk.current = onChunk;
 			_currentRunId.current = runId;
@@ -2338,7 +2359,9 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			requestContext: requestContextRecord,
 			providerOptions,
 			requireToolApproval,
-			tracingOptions
+			tracingOptions,
+			clientTools: resolvedClientTools,
+			clientToolsResolver
 		};
 		try {
 			const result = await agent.sendMessage({
@@ -2351,7 +2374,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;
@@ -2396,8 +2420,9 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		const agent = new _mastra_client_js.MastraClient({
 			...baseClient.options,
 			abortSignal: signal
-		}).getAgent(agentId);
+		}).getAgent(agentId, void 0, { stream: streamPath });
 		const runId = (0, _lukeed_uuid.v4)();
+		_currentRunId.current = runId;
 		const response = await agent.network(coreUserMessages, {
 			model,
 			maxSteps,
@@ -2424,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);
 		} });
@@ -2460,7 +2488,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({
@@ -2521,7 +2549,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({
@@ -2566,7 +2594,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
@@ -2586,7 +2614,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
@@ -2602,19 +2630,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);
 		} });
@@ -2626,19 +2658,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);
 		} });
@@ -2646,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: [{
@@ -2699,6 +2736,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		setMessages,
 		sendMessage,
 		isRunning,
+		activeRunId: isRunning || isAwaitingToolApproval ? _currentRunId.current : void 0,
 		isAwaitingToolApproval,
 		messages,
 		tasks,