@mastra/react 0.2.18-alpha.5 → 0.2.18-alpha.7

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @mastra/react
 
+## 0.2.18-alpha.7
+
+### Patch Changes
+
+- Updated dependencies [[`fbf22a7`](https://github.com/mastra-ai/mastra/commit/fbf22a7ad86bcb50dcf30459f0d075e51ddeb468), [`fbf22a7`](https://github.com/mastra-ai/mastra/commit/fbf22a7ad86bcb50dcf30459f0d075e51ddeb468), [`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), [`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), [`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)]:
+  - @mastra/core@1.18.0-alpha.4
+  - @mastra/client-js@1.11.0-alpha.7
+
+## 0.2.18-alpha.6
+
+### Patch Changes
+
+- **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 [[`e333b77`](https://github.com/mastra-ai/mastra/commit/e333b77e2d76ba57ccec1818e08cebc1993469ff), [`60a224d`](https://github.com/mastra-ai/mastra/commit/60a224dd497240e83698cfa5bfd02e3d1d854844), [`949b7bf`](https://github.com/mastra-ai/mastra/commit/949b7bfd4e40f2b2cba7fef5eb3f108a02cfe938), [`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), [`3d70b0b`](https://github.com/mastra-ai/mastra/commit/3d70b0b3524d817173ad870768f259c06d61bd23), [`3b45a13`](https://github.com/mastra-ai/mastra/commit/3b45a138d09d040779c0aba1edbbfc1b57442d23), [`8127d96`](https://github.com/mastra-ai/mastra/commit/8127d96280492e335d49b244501088dfdd59a8f1)]:
+  - @mastra/client-js@1.11.0-alpha.6
+  - @mastra/core@1.18.0-alpha.3
+
 ## 0.2.18-alpha.5
 
 ### Patch Changes

package/dist/index.cjs

@@ -12,8 +12,14 @@ var web = require('shiki/bundle/web');
 
 // src/mastra-client-context.tsx
 var MastraClientContext = react.createContext({});
-var MastraClientProvider = ({ children, baseUrl, headers, apiPrefix }) => {
-  const client = createMastraClient(baseUrl, headers, apiPrefix);
+var MastraClientProvider = ({
+  children,
+  baseUrl,
+  headers,
+  apiPrefix,
+  credentials = "include"
+}) => {
+  const client = createMastraClient(baseUrl, headers, apiPrefix, credentials);
   return /* @__PURE__ */ jsxRuntime.jsx(MastraClientContext.Provider, { value: client, children });
 };
 var useMastraClient = () => react.useContext(MastraClientContext);
@@ -32,15 +38,22 @@ var isLocalUrl = (url) => {
     return false;
   }
 };
-var createMastraClient = (baseUrl, mastraClientHeaders = {}, apiPrefix) => {
+var createMastraClient = (baseUrl, mastraClientHeaders = {}, apiPrefix, credentials = "include") => {
   return new clientJs.MastraClient({
     baseUrl: baseUrl || "",
     headers: isLocalUrl(baseUrl) ? { ...mastraClientHeaders, "x-mastra-dev-playground": "true" } : mastraClientHeaders,
-    apiPrefix
+    apiPrefix,
+    credentials
   });
 };
-var MastraReactProvider = ({ children, baseUrl, headers, apiPrefix }) => {
-  return /* @__PURE__ */ jsxRuntime.jsx(MastraClientProvider, { baseUrl, headers, apiPrefix, children });
+var MastraReactProvider = ({
+  children,
+  baseUrl,
+  headers,
+  apiPrefix,
+  credentials
+}) => {
+  return /* @__PURE__ */ jsxRuntime.jsx(MastraClientProvider, { baseUrl, headers, apiPrefix, credentials, children });
 };
 
 // src/lib/ai-sdk/utils/formatCompletionFeedback.ts
@@ -424,7 +437,11 @@ var toUIMessage = ({ chunk, conversation, metadata }) => {
             if (isWorkflow) {
               output = chunk.payload.result?.result;
             } else if (isAgent) {
-              output = parts[toolPartIndex].output ?? chunk.payload.result;
+              const existingOutput = parts[toolPartIndex].output;
+              output = existingOutput ? {
+                ...chunk.payload.result,
+                childMessages: existingOutput.childMessages?.length ? existingOutput.childMessages : chunk.payload.result?.childMessages
+              } : chunk.payload.result;
             } else {
               output = chunk.payload.result;
             }
@@ -1020,12 +1037,23 @@ var resolveInitialMessages = (messages) => {
     const extendedMessage = message;
     const pendingToolApprovals = extendedMessage.metadata?.pendingToolApprovals;
     if (pendingToolApprovals && typeof pendingToolApprovals === "object") {
+      const stillPending = Object.fromEntries(
+        Object.entries(pendingToolApprovals).filter(([_, approval]) => {
+          if (!approval || typeof approval !== "object" || !("toolCallId" in approval)) {
+            return false;
+          }
+          const toolCallId = approval.toolCallId;
+          return !message.parts.some(
+            (part) => part.toolCallId === toolCallId && (part.state === "output-available" || part.output != null)
+          );
+        })
+      );
       return {
         ...message,
         metadata: {
           ...message.metadata,
           mode: "stream",
-          requireApprovalMetadata: pendingToolApprovals
+          ...Object.keys(stillPending).length > 0 ? { requireApprovalMetadata: stillPending } : {}
         }
       };
     }