@mastra/react 0.2.18-alpha.7 → 0.2.18

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @mastra/react
 
+## 0.2.18
+
+### Patch Changes
+
+- Added requestContext support to tool approval and decline methods, ensuring agent version context is preserved when resuming after tool approval. ([#14847](https://github.com/mastra-ai/mastra/pull/14847))
+
+- **Fixed** React UIs getting `401` from Mastra after a successful cookie login when the app and API run on different hosts or ports (for example Mastra Studio against a custom server). API calls from `MastraReactProvider` now include session cookies by default ([#14770](https://github.com/mastra-ai/mastra/issues/14770)). ([#14777](https://github.com/mastra-ai/mastra/pull/14777))
+
+  **Added** optional `credentials` prop when you want tighter control, for example same-origin-only requests:
+
+  ```tsx
+  <MastraReactProvider baseUrl="http://localhost:4000" credentials="same-origin">
+    {children}
+  </MastraReactProvider>
+  ```
+
+  **Added** `MastraClientCredentials` and `MastraClientProviderProps` type exports.
+
+- Fix restored subagent tool results so approval cards and nested tool state appear correctly in the dev server. ([#14348](https://github.com/mastra-ai/mastra/pull/14348))
+
+- Updated dependencies [[`dc514a8`](https://github.com/mastra-ai/mastra/commit/dc514a83dba5f719172dddfd2c7b858e4943d067), [`e333b77`](https://github.com/mastra-ai/mastra/commit/e333b77e2d76ba57ccec1818e08cebc1993469ff), [`dc9fc19`](https://github.com/mastra-ai/mastra/commit/dc9fc19da4437f6b508cc355f346a8856746a76b), [`60a224d`](https://github.com/mastra-ai/mastra/commit/60a224dd497240e83698cfa5bfd02e3d1d854844), [`fbf22a7`](https://github.com/mastra-ai/mastra/commit/fbf22a7ad86bcb50dcf30459f0d075e51ddeb468), [`12c647c`](https://github.com/mastra-ai/mastra/commit/12c647cf3a26826eb72d40b42e3c8356ceae16ed), [`f16d92c`](https://github.com/mastra-ai/mastra/commit/f16d92c677a119a135cebcf7e2b9f51ada7a9df4), [`949b7bf`](https://github.com/mastra-ai/mastra/commit/949b7bfd4e40f2b2cba7fef5eb3f108a02cfe938), [`404fea1`](https://github.com/mastra-ai/mastra/commit/404fea13042181f0b0c73a101392ac87c79ceae2), [`ebf5047`](https://github.com/mastra-ai/mastra/commit/ebf5047e825c38a1a356f10b214c1d4260dfcd8d), [`12c647c`](https://github.com/mastra-ai/mastra/commit/12c647cf3a26826eb72d40b42e3c8356ceae16ed), [`819f03c`](https://github.com/mastra-ai/mastra/commit/819f03c25823373b32476413bd76be28a5d8705a), [`fbf22a7`](https://github.com/mastra-ai/mastra/commit/fbf22a7ad86bcb50dcf30459f0d075e51ddeb468), [`d084b66`](https://github.com/mastra-ai/mastra/commit/d084b6692396057e83c086b954c1857d20b58a14), [`79c699a`](https://github.com/mastra-ai/mastra/commit/79c699acf3cd8a77e11c55530431f48eb48456e9), [`62757b6`](https://github.com/mastra-ai/mastra/commit/62757b6db6e8bb86569d23ad0b514178f57053f8), [`675f15b`](https://github.com/mastra-ai/mastra/commit/675f15b7eaeea649158d228ea635be40480c584d), [`b174c63`](https://github.com/mastra-ai/mastra/commit/b174c63a093108d4e53b9bc89a078d9f66202b3f), [`819f03c`](https://github.com/mastra-ai/mastra/commit/819f03c25823373b32476413bd76be28a5d8705a), [`04160ee`](https://github.com/mastra-ai/mastra/commit/04160eedf3130003cf842ad08428c8ff69af4cc1), [`2c27503`](https://github.com/mastra-ai/mastra/commit/2c275032510d131d2cde47f99953abf0fe02c081), [`424a1df`](https://github.com/mastra-ai/mastra/commit/424a1df7bee59abb5c83717a54807fdd674a6224), [`3d70b0b`](https://github.com/mastra-ai/mastra/commit/3d70b0b3524d817173ad870768f259c06d61bd23), [`eef7cb2`](https://github.com/mastra-ai/mastra/commit/eef7cb2abe7ef15951e2fdf792a5095c6c643333), [`260fe12`](https://github.com/mastra-ai/mastra/commit/260fe1295fe7354e39d6def2775e0797a7a277f0), [`260fe12`](https://github.com/mastra-ai/mastra/commit/260fe1295fe7354e39d6def2775e0797a7a277f0), [`197daf0`](https://github.com/mastra-ai/mastra/commit/197daf03a33e4650bd90391eef0ec7d0392a6c9c), [`12c88a6`](https://github.com/mastra-ai/mastra/commit/12c88a6e32bf982c2fe0c6af62e65a3414519a75), [`43595bf`](https://github.com/mastra-ai/mastra/commit/43595bf7b8df1a6edce7a23b445b5124d2a0b473), [`78670e9`](https://github.com/mastra-ai/mastra/commit/78670e97e76d7422cf7025faf371b2aeafed860d), [`e8a5b0b`](https://github.com/mastra-ai/mastra/commit/e8a5b0b9bc94d12dee4150095512ca27a288d778), [`3b45a13`](https://github.com/mastra-ai/mastra/commit/3b45a138d09d040779c0aba1edbbfc1b57442d23), [`d400e7c`](https://github.com/mastra-ai/mastra/commit/d400e7c8b8d7afa6ba2c71769eace4048e3cef8e), [`f58d1a7`](https://github.com/mastra-ai/mastra/commit/f58d1a7a457588a996c3ecb53201a68f3d28c432), [`a49a929`](https://github.com/mastra-ai/mastra/commit/a49a92904968b4fc67e01effee8c7c8d0464ba85), [`8127d96`](https://github.com/mastra-ai/mastra/commit/8127d96280492e335d49b244501088dfdd59a8f1)]:
+  - @mastra/core@1.18.0
+  - @mastra/client-js@1.11.0
+
+## 0.2.18-alpha.8
+
+### Patch Changes
+
+- Added requestContext support to tool approval and decline methods, ensuring agent version context is preserved when resuming after tool approval. ([#14847](https://github.com/mastra-ai/mastra/pull/14847))
+
+- Updated dependencies [[`12c647c`](https://github.com/mastra-ai/mastra/commit/12c647cf3a26826eb72d40b42e3c8356ceae16ed), [`12c647c`](https://github.com/mastra-ai/mastra/commit/12c647cf3a26826eb72d40b42e3c8356ceae16ed), [`819f03c`](https://github.com/mastra-ai/mastra/commit/819f03c25823373b32476413bd76be28a5d8705a), [`819f03c`](https://github.com/mastra-ai/mastra/commit/819f03c25823373b32476413bd76be28a5d8705a)]:
+  - @mastra/client-js@1.11.0-alpha.8
+  - @mastra/core@1.18.0-alpha.5
+
 ## 0.2.18-alpha.7
 
 ### Patch Changes

package/dist/agent/hooks.d.ts

@@ -9,6 +9,8 @@ export interface MastraChatProps {
     agentId: string;
     resourceId?: string;
     initialMessages?: MastraUIMessage[];
+    /** Persistent request context used for tool approval/decline calls (e.g. agentVersionId). */
+    requestContext?: RequestContext;
 }
 interface SharedArgs {
     coreUserMessages: CoreUserMessage[];
@@ -39,7 +41,7 @@ export type StreamArgs = SharedArgs & {
 export type NetworkArgs = SharedArgs & {
     onNetworkChunk?: (chunk: NetworkChunkType) => Promise<void>;
 };
-export declare const useChat: ({ agentId, resourceId, initialMessages }: MastraChatProps) => {
+export declare const useChat: ({ agentId, resourceId, initialMessages, requestContext: propsRequestContext, }: MastraChatProps) => {
     setMessages: import("react").Dispatch<import("react").SetStateAction<MastraUIMessage[]>>;
     sendMessage: ({ mode, ...args }: SendMessageArgs) => Promise<void>;
     isRunning: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/agent/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,KAAK,EAA2B,eAAe,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAO7C,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,eAAe,EAAE,CAAC;CACrC;AAED,UAAU,UAAU;IAClB,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,MAAM,eAAe,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAA;CAAE,GAAG,CACtF,CAAC;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GAAG,IAAI,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC,GAC/D,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAAG,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC,GAC3D,CAAC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GAAG,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC,GAC7D,CAAC;IAAE,IAAI,CAAC,EAAE,SAAS,CAAA;CAAE,GAAG,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC,CAChE,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG;IAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC;AAEhG,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG;IACrC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D,CAAC;AAgBF,eAAO,MAAM,OAAO,GAAI,0CAA0C,eAAe;;qCAwatB,eAAe;;;kCArK7B,MAAM;kCAyBN,MAAM;0CAwBE,MAAM;0CA4BN,MAAM;;;;oBAzUvB,UAAU,GAAG,UAAU;;;uCAqWT,MAAM,UAAU,MAAM;uCA8BtB,MAAM,UAAU,MAAM;;;oBAhYtC,UAAU,GAAG,UAAU;;;CAicxD,CAAC"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/agent/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,KAAK,EAA2B,eAAe,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAO7C,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,eAAe,EAAE,CAAC;IACpC,6FAA6F;IAC7F,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,UAAU,UAAU;IAClB,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,MAAM,eAAe,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAA;CAAE,GAAG,CACtF,CAAC;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GAAG,IAAI,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC,GAC/D,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAAG,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC,GAC3D,CAAC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GAAG,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC,GAC7D,CAAC;IAAE,IAAI,CAAC,EAAE,SAAS,CAAA;CAAE,GAAG,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC,CAChE,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG;IAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC;AAEhG,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG;IACrC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D,CAAC;AAgBF,eAAO,MAAM,OAAO,GAAI,gFAKrB,eAAe;;qCA0cyC,eAAe;;;kCA3L7B,MAAM;kCA6BN,MAAM;0CA4BE,MAAM;0CAgCN,MAAM;;;;oBAhWvB,UAAU,GAAG,UAAU;;;uCAgYT,MAAM,UAAU,MAAM;uCAiCtB,MAAM,UAAU,MAAM;;;oBA9ZtC,UAAU,GAAG,UAAU;;;CAkexD,CAAC"}

package/dist/index.cjs

@@ -1690,11 +1690,17 @@ var extractRunIdFromMessages = (messages) => {
   }
   return void 0;
 };
-var useChat = ({ agentId, resourceId, initialMessages }) => {
+var useChat = ({
+  agentId,
+  resourceId,
+  initialMessages,
+  requestContext: propsRequestContext
+}) => {
   const _currentRunId = react.useRef(void 0);
   const _onChunk = react.useRef(void 0);
   const _networkRunId = react.useRef(void 0);
   const _onNetworkChunk = react.useRef(void 0);
+  const _requestContext = react.useRef(propsRequestContext);
   const [messages, setMessages] = react.useState([]);
   const [toolCallApprovals, setToolCallApprovals] = react.useState({});
   const [networkToolCallApprovals, setNetworkToolCallApprovals] = react.useState({});
@@ -1705,6 +1711,9 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
     setMessages(formattedMessages);
     _currentRunId.current = extractRunIdFromMessages(formattedMessages);
   }, [initialMessages]);
+  react.useEffect(() => {
+    _requestContext.current = propsRequestContext;
+  }, [propsRequestContext]);
   const generate = async ({
     coreUserMessages,
     requestContext,
@@ -1727,6 +1736,8 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
       maxSteps,
       requireToolApproval
     } = modelSettings || {};
+    const resolvedRequestContext = requestContext ?? propsRequestContext;
+    _requestContext.current = resolvedRequestContext;
     setIsRunning(true);
     const clientWithAbort = new clientJs.MastraClient({
       ...baseClient.options,
@@ -1748,7 +1759,7 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
         topP
       },
       instructions,
-      requestContext,
+      requestContext: resolvedRequestContext,
       ...threadId ? { memory: { thread: threadId, resource: resourceId || agentId } } : {},
       providerOptions,
       tracingOptions,
@@ -1809,6 +1820,8 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
       maxSteps,
       requireToolApproval
     } = modelSettings || {};
+    const resolvedRequestContext = requestContext ?? propsRequestContext;
+    _requestContext.current = resolvedRequestContext;
     setIsRunning(true);
     const clientWithAbort = new clientJs.MastraClient({
       ...baseClient.options,
@@ -1829,7 +1842,7 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
         topP
       },
       instructions,
-      requestContext,
+      requestContext: resolvedRequestContext,
       ...threadId ? { memory: { thread: threadId, resource: resourceId || agentId } } : {},
       providerOptions,
       requireToolApproval,
@@ -1855,6 +1868,8 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
     tracingOptions
   }) => {
     const { frequencyPenalty, presencePenalty, maxRetries, maxTokens, temperature, topK, topP, maxSteps } = modelSettings || {};
+    const resolvedRequestContext = requestContext ?? propsRequestContext;
+    _requestContext.current = resolvedRequestContext;
     setIsRunning(true);
     const clientWithAbort = new clientJs.MastraClient({
       ...baseClient.options,
@@ -1874,7 +1889,7 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
         topP
       },
       runId,
-      requestContext,
+      requestContext: resolvedRequestContext,
       ...threadId ? { memory: { thread: threadId, resource: resourceId || agentId } } : {},
       tracingOptions
     });
@@ -1895,6 +1910,7 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
     _onChunk.current = void 0;
     _networkRunId.current = void 0;
     _onNetworkChunk.current = void 0;
+    _requestContext.current = void 0;
   };
   const approveToolCall = async (toolCallId) => {
     const onChunk = _onChunk.current;
@@ -1904,7 +1920,11 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
     setIsRunning(true);
     setToolCallApprovals((prev) => ({ ...prev, [toolCallId]: { status: "approved" } }));
     const agent = baseClient.getAgent(agentId);
-    const response = await agent.approveToolCall({ runId: currentRunId, toolCallId });
+    const response = await agent.approveToolCall({
+      runId: currentRunId,
+      toolCallId,
+      requestContext: _requestContext.current
+    });
     await response.processDataStream({
       onChunk: async (chunk) => {
         setMessages((prev) => toUIMessage({ chunk, conversation: prev, metadata: { mode: "stream" } }));
@@ -1921,7 +1941,11 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
     setIsRunning(true);
     setToolCallApprovals((prev) => ({ ...prev, [toolCallId]: { status: "declined" } }));
     const agent = baseClient.getAgent(agentId);
-    const response = await agent.declineToolCall({ runId: currentRunId, toolCallId });
+    const response = await agent.declineToolCall({
+      runId: currentRunId,
+      toolCallId,
+      requestContext: _requestContext.current
+    });
     await response.processDataStream({
       onChunk: async (chunk) => {
         setMessages((prev) => toUIMessage({ chunk, conversation: prev, metadata: { mode: "stream" } }));
@@ -1939,7 +1963,11 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
     setIsRunning(true);
     setToolCallApprovals((prev) => ({ ...prev, [toolCallId]: { status: "approved" } }));
     const agent = baseClient.getAgent(agentId);
-    const response = await agent.approveToolCallGenerate({ runId: currentRunId, toolCallId });
+    const response = await agent.approveToolCallGenerate({
+      runId: currentRunId,
+      toolCallId,
+      requestContext: _requestContext.current
+    });
     if (response && "uiMessages" in response.response && response.response.uiMessages) {
       const mastraUIMessages = (response.response.uiMessages || []).map((message) => ({
         ...message,
@@ -1960,7 +1988,11 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
     setIsRunning(true);
     setToolCallApprovals((prev) => ({ ...prev, [toolCallId]: { status: "declined" } }));
     const agent = baseClient.getAgent(agentId);
-    const response = await agent.declineToolCallGenerate({ runId: currentRunId, toolCallId });
+    const response = await agent.declineToolCallGenerate({
+      runId: currentRunId,
+      toolCallId,
+      requestContext: _requestContext.current
+    });
     if (response && "uiMessages" in response.response && response.response.uiMessages) {
       const mastraUIMessages = (response.response.uiMessages || []).map((message) => ({
         ...message,
@@ -1985,7 +2017,10 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
       [runId ? `${runId}-${toolName}` : toolName]: { status: "approved" }
     }));
     const agent = baseClient.getAgent(agentId);
-    const response = await agent.approveNetworkToolCall({ runId: networkRunId });
+    const response = await agent.approveNetworkToolCall({
+      runId: networkRunId,
+      requestContext: _requestContext.current
+    });
     const transformer = new AISdkNetworkTransformer();
     await response.processDataStream({
       onChunk: async (chunk) => {
@@ -2008,7 +2043,10 @@ var useChat = ({ agentId, resourceId, initialMessages }) => {
       [runId ? `${runId}-${toolName}` : toolName]: { status: "declined" }
     }));
     const agent = baseClient.getAgent(agentId);
-    const response = await agent.declineNetworkToolCall({ runId: networkRunId });
+    const response = await agent.declineNetworkToolCall({
+      runId: networkRunId,
+      requestContext: _requestContext.current
+    });
     const transformer = new AISdkNetworkTransformer();
     await response.processDataStream({
       onChunk: async (chunk) => {