@mastra/react 1.2.6-alpha.8 → 1.3.0-alpha.11

package/dist/index.js

@@ -1981,7 +1981,7 @@ var useChat = ({
   const _onChunk = useRef(void 0);
   const _networkRunId = useRef(void 0);
   const _onNetworkChunk = useRef(void 0);
-  const _requestContext = useRef(propsRequestContext);
+  const _activeContinuation = useRef({ requestContext: propsRequestContext });
   const _streamAbortRef = useRef(null);
   const _threadSubscriptionAbortRef = useRef(null);
   const _threadSubscriptionRef = useRef(
@@ -2007,7 +2007,10 @@ var useChat = ({
     _currentRunId.current = extractRunIdFromMessages(formattedMessages);
   }, [initialMessages]);
   useEffect(() => {
-    _requestContext.current = propsRequestContext;
+    _activeContinuation.current = {
+      ..._activeContinuation.current,
+      requestContext: propsRequestContext
+    };
   }, [propsRequestContext]);
   const normalizeSignalFileData = (data) => {
     if (data instanceof URL) return data.toString();
@@ -2179,6 +2182,7 @@ var useChat = ({
   }, [agentId, closeThreadSubscription, ensureThreadSubscription, resourceId, threadId, threadSignalsDisabled]);
   const generate = async ({
     coreUserMessages,
+    model,
     requestContext,
     threadId: threadId2,
     modelSettings,
@@ -2202,7 +2206,10 @@ var useChat = ({
     } = modelSettings || {};
     const resolvedRequestContext = requestContext ?? propsRequestContext;
     const resolvedClientTools = clientTools ?? hookClientTools;
-    _requestContext.current = resolvedRequestContext;
+    _activeContinuation.current = {
+      model,
+      requestContext: resolvedRequestContext
+    };
     setIsRunning(true);
     const clientWithAbort = new MastraClient({
       ...baseClient.options,
@@ -2212,6 +2219,7 @@ var useChat = ({
     const runId = v4();
     _currentRunId.current = runId;
     const response = await agent.generate(coreUserMessages, {
+      model,
       runId,
       maxSteps,
       modelSettings: {
@@ -2254,6 +2262,7 @@ var useChat = ({
   };
   const stream = async ({
     coreUserMessages,
+    model,
     requestContext,
     threadId: threadId2,
     onChunk,
@@ -2280,6 +2289,7 @@ var useChat = ({
     const resolvedRequestContext = requestContext ?? propsRequestContext;
     const resolvedClientTools = clientTools ?? hookClientTools;
     const signalContinuationOptions = {
+      model,
       maxSteps,
       modelSettings: {
         frequencyPenalty,
@@ -2295,7 +2305,10 @@ var useChat = ({
       requireToolApproval,
       tracingOptions
     };
-    _requestContext.current = resolvedRequestContext;
+    _activeContinuation.current = {
+      model,
+      requestContext: resolvedRequestContext
+    };
     setIsRunning(true);
     _streamAbortRef.current?.abort();
     const internalAbort = new AbortController();
@@ -2312,6 +2325,7 @@ var useChat = ({
     const streamWithLegacyRoute = async () => {
       const runId = v4();
       const response = await agent.stream(coreUserMessages, {
+        model,
         runId,
         maxSteps,
         untilIdle: true,
@@ -2356,6 +2370,7 @@ var useChat = ({
     const messageContents = getSignalContents(coreUserMessages);
     const requestContextRecord = resolvedRequestContext;
     const streamOptions = {
+      model,
       maxSteps,
       modelSettings: {
         frequencyPenalty,
@@ -2424,6 +2439,7 @@ var useChat = ({
   };
   const network = async ({
     coreUserMessages,
+    model,
     requestContext,
     threadId: threadId2,
     onNetworkChunk,
@@ -2433,7 +2449,10 @@ var useChat = ({
   }) => {
     const { frequencyPenalty, presencePenalty, maxRetries, maxTokens, temperature, topK, topP, maxSteps } = modelSettings || {};
     const resolvedRequestContext = requestContext ?? propsRequestContext;
-    _requestContext.current = resolvedRequestContext;
+    _activeContinuation.current = {
+      model,
+      requestContext: resolvedRequestContext
+    };
     setIsRunning(true);
     const clientWithAbort = new MastraClient({
       ...baseClient.options,
@@ -2442,6 +2461,7 @@ var useChat = ({
     const agent = clientWithAbort.getAgent(agentId);
     const runId = v4();
     const response = await agent.network(coreUserMessages, {
+      model,
       maxSteps,
       modelSettings: {
         frequencyPenalty,
@@ -2484,11 +2504,12 @@ var useChat = ({
     _onChunk.current = void 0;
     _networkRunId.current = void 0;
     _onNetworkChunk.current = void 0;
-    _requestContext.current = void 0;
+    _activeContinuation.current = {};
   };
   const approveToolCall = async (toolCallId, resumeData) => {
     const onChunk = _onChunk.current;
     const currentRunId = _currentRunId.current;
+    const continuation = _activeContinuation.current;
     if (!currentRunId)
       return console.info("[approveToolCall] approveToolCall can only be called after a stream has started");
     setIsRunning(true);
@@ -2501,8 +2522,9 @@ var useChat = ({
           threadId,
           toolCallId,
           approved: true,
+          ...continuation.model !== void 0 ? { streamOptions: { model: continuation.model } } : {},
           ...resumeData !== void 0 ? { resumeData } : {},
-          requestContext: _requestContext.current
+          requestContext: continuation.requestContext
         });
         pendingToolApprovalIdsRef.current.delete(toolCallId);
         setIsAwaitingToolApproval(pendingToolApprovalIdsRef.current.size > 0);
@@ -2521,7 +2543,7 @@ var useChat = ({
     const response = await agent.approveToolCall({
       runId: currentRunId,
       toolCallId,
-      requestContext: _requestContext.current
+      ...continuation
     });
     await response.processDataStream({
       onChunk: async (chunk) => {
@@ -2533,6 +2555,7 @@ var useChat = ({
   const declineToolCall = async (toolCallId) => {
     const onChunk = _onChunk.current;
     const currentRunId = _currentRunId.current;
+    const continuation = _activeContinuation.current;
     if (!currentRunId)
       return console.info("[declineToolCall] declineToolCall can only be called after a stream has started");
     setIsRunning(true);
@@ -2545,7 +2568,8 @@ var useChat = ({
           threadId,
           toolCallId,
           approved: false,
-          requestContext: _requestContext.current
+          ...continuation.model !== void 0 ? { streamOptions: { model: continuation.model } } : {},
+          requestContext: continuation.requestContext
         });
         pendingToolApprovalIdsRef.current.delete(toolCallId);
         setIsAwaitingToolApproval(pendingToolApprovalIdsRef.current.size > 0);
@@ -2564,7 +2588,7 @@ var useChat = ({
     const response = await agent.declineToolCall({
       runId: currentRunId,
       toolCallId,
-      requestContext: _requestContext.current
+      ...continuation
     });
     await response.processDataStream({
       onChunk: async (chunk) => {
@@ -2575,6 +2599,7 @@ var useChat = ({
   };
   const approveToolCallGenerate = async (toolCallId) => {
     const currentRunId = _currentRunId.current;
+    const continuation = _activeContinuation.current;
     if (!currentRunId)
       return console.info(
         "[approveToolCallGenerate] approveToolCallGenerate can only be called after a generate has started"
@@ -2585,7 +2610,7 @@ var useChat = ({
     const response = await agent.approveToolCallGenerate({
       runId: currentRunId,
       toolCallId,
-      requestContext: _requestContext.current
+      ...continuation
     });
     if (response && "uiMessages" in response.response && response.response.uiMessages) {
       const dbMessages = dbFromServerUiMessages(response.response.uiMessages, { mode: "generate" });
@@ -2595,6 +2620,7 @@ var useChat = ({
   };
   const declineToolCallGenerate = async (toolCallId) => {
     const currentRunId = _currentRunId.current;
+    const continuation = _activeContinuation.current;
     if (!currentRunId)
       return console.info(
         "[declineToolCallGenerate] declineToolCallGenerate can only be called after a generate has started"
@@ -2605,7 +2631,7 @@ var useChat = ({
     const response = await agent.declineToolCallGenerate({
       runId: currentRunId,
       toolCallId,
-      requestContext: _requestContext.current
+      ...continuation
     });
     if (response && "uiMessages" in response.response && response.response.uiMessages) {
       const dbMessages = dbFromServerUiMessages(response.response.uiMessages, { mode: "generate" });
@@ -2616,6 +2642,7 @@ var useChat = ({
   const approveNetworkToolCall = async (toolName, runId) => {
     const onNetworkChunk = _onNetworkChunk.current;
     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"
@@ -2628,7 +2655,7 @@ var useChat = ({
     const agent = baseClient.getAgent(agentId);
     const response = await agent.approveNetworkToolCall({
       runId: networkRunId,
-      requestContext: _requestContext.current
+      ...continuation
     });
     await response.processDataStream({
       onChunk: async (chunk) => {
@@ -2642,6 +2669,7 @@ var useChat = ({
   const declineNetworkToolCall = async (toolName, runId) => {
     const onNetworkChunk = _onNetworkChunk.current;
     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"
@@ -2654,7 +2682,7 @@ var useChat = ({
     const agent = baseClient.getAgent(agentId);
     const response = await agent.declineNetworkToolCall({
       runId: networkRunId,
-      requestContext: _requestContext.current
+      ...continuation
     });
     await response.processDataStream({
       onChunk: async (chunk) => {