@mastra/editor 0.7.24-alpha.1 → 0.7.24-alpha.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @mastra/editor
 
+## 0.7.24-alpha.3
+
+### Patch Changes
+
+- Updated dependencies [[`b560d6f`](https://github.com/mastra-ai/mastra/commit/b560d6f88b9b904b15c10f75c949eb145bc27684), [`36b3bbf`](https://github.com/mastra-ai/mastra/commit/36b3bbf5a8d59f7e23d47e29340e76c681b4929c), [`b275631`](https://github.com/mastra-ai/mastra/commit/b275631dc10541a482b2e2d4a3e3cfa843bd5fa1)]:
+  - @mastra/core@1.33.0-alpha.6
+  - @mastra/memory@1.17.6-alpha.1
+
+## 0.7.24-alpha.2
+
+### Patch Changes
+
+- Fixed `@mastra/editor` integrations (Composio, Arcade) collapsing every tool call onto a shared `'default'` user. Tools resolved during `agent.generate` now scope to the authenticated resource from the request context, so per-user OAuth connections route to the correct account instead of a shared one. ([#16122](https://github.com/mastra-ai/mastra/pull/16122))
+
 ## 0.7.24-alpha.1
 
 ### Patch Changes

package/dist/arcade.cjs

@@ -25,6 +25,7 @@ __export(arcade_exports, {
 module.exports = __toCommonJS(arcade_exports);
 
 // src/providers/arcade.ts
+var import_request_context = require("@mastra/core/request-context");
 var import_arcadejs = require("@arcadeai/arcadejs");
 var import_lib = require("@arcadeai/arcadejs/lib/index");
 var KNOWN_TOOLKITS = [
@@ -254,7 +255,8 @@ var ArcadeToolProvider = class {
   async resolveTools(toolSlugs, toolConfigs, options) {
     if (toolSlugs.length === 0) return {};
     const client = this.getClient();
-    const userId = options?.userId ?? "default";
+    const resourceId = options?.requestContext?.[import_request_context.MASTRA_RESOURCE_ID_KEY];
+    const userId = typeof resourceId === "string" ? resourceId : options?.userId ?? "default";
     const toolDefs = await Promise.all(toolSlugs.map((slug) => client.tools.get(slug).catch(() => null)));
     const validDefs = toolDefs.filter((d) => d !== null);
     if (validDefs.length === 0) return {};

package/dist/arcade.js

@@ -1,4 +1,5 @@
 // src/providers/arcade.ts
+import { MASTRA_RESOURCE_ID_KEY } from "@mastra/core/request-context";
 import { Arcade } from "@arcadeai/arcadejs";
 import { toZodToolSet, executeOrAuthorizeZodTool } from "@arcadeai/arcadejs/lib/index";
 var KNOWN_TOOLKITS = [
@@ -228,7 +229,8 @@ var ArcadeToolProvider = class {
   async resolveTools(toolSlugs, toolConfigs, options) {
     if (toolSlugs.length === 0) return {};
     const client = this.getClient();
-    const userId = options?.userId ?? "default";
+    const resourceId = options?.requestContext?.[MASTRA_RESOURCE_ID_KEY];
+    const userId = typeof resourceId === "string" ? resourceId : options?.userId ?? "default";
     const toolDefs = await Promise.all(toolSlugs.map((slug) => client.tools.get(slug).catch(() => null)));
     const validDefs = toolDefs.filter((d) => d !== null);
     if (validDefs.length === 0) return {};

package/dist/composio.cjs

@@ -25,6 +25,7 @@ __export(composio_exports, {
 module.exports = __toCommonJS(composio_exports);
 
 // src/providers/composio.ts
+var import_request_context = require("@mastra/core/request-context");
 var import_core = require("@composio/core");
 var import_mastra = require("@composio/mastra");
 var ComposioToolProvider = class {
@@ -119,7 +120,8 @@ var ComposioToolProvider = class {
    */
   async resolveTools(toolSlugs, toolConfigs, options) {
     if (toolSlugs.length === 0) return {};
-    const userId = options?.userId ?? "default";
+    const resourceId = options?.requestContext?.[import_request_context.MASTRA_RESOURCE_ID_KEY];
+    const userId = typeof resourceId === "string" ? resourceId : options?.userId ?? "default";
     const composio = this.getMastraClient();
     const mastraTools = await composio.tools.get(userId, { tools: toolSlugs });
     const result = {};

package/dist/composio.js

@@ -1,4 +1,5 @@
 // src/providers/composio.ts
+import { MASTRA_RESOURCE_ID_KEY } from "@mastra/core/request-context";
 import { Composio } from "@composio/core";
 import { MastraProvider } from "@composio/mastra";
 var ComposioToolProvider = class {
@@ -93,7 +94,8 @@ var ComposioToolProvider = class {
    */
   async resolveTools(toolSlugs, toolConfigs, options) {
     if (toolSlugs.length === 0) return {};
-    const userId = options?.userId ?? "default";
+    const resourceId = options?.requestContext?.[MASTRA_RESOURCE_ID_KEY];
+    const userId = typeof resourceId === "string" ? resourceId : options?.userId ?? "default";
     const composio = this.getMastraClient();
     const mastraTools = await composio.tools.get(userId, { tools: toolSlugs });
     const result = {};

package/dist/index.cjs

@@ -695,7 +695,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       const hasConditionalTools = this.isConditionalVariants(storedConfig.tools);
       const hasConditionalMCPClients = storedConfig.mcpClients != null && this.isConditionalVariants(storedConfig.mcpClients);
       const hasConditionalIntegrationTools = storedConfig.integrationTools != null && this.isConditionalVariants(storedConfig.integrationTools);
-      const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools;
+      const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools || hasStoredIntegrationTools;
       if (isDynamicTools) {
         const originalTools = fork.listTools.bind(fork);
         const toolsFn = async ({ requestContext: requestContext2 }) => {
@@ -715,7 +715,10 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
             storedConfig.integrationTools,
             ctx
           ) : storedConfig.integrationTools;
-          const integrationTools = await this.resolveStoredIntegrationTools(resolvedIntegrationToolsConfig, ctx);
+          const integrationTools = await this.resolveStoredIntegrationTools(
+            resolvedIntegrationToolsConfig,
+            requestContext2
+          );
           return { ...codeTools, ...registryTools, ...mcpTools, ...integrationTools };
         };
         fork.__setTools(toolsFn);
@@ -797,7 +800,8 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
     const hasConditionalDefaultOptions = storedAgent.defaultOptions != null && this.isConditionalVariants(storedAgent.defaultOptions);
     const hasConditionalModel = this.isConditionalVariants(storedAgent.model);
     const hasConditionalWorkspace = storedAgent.workspace != null && this.isConditionalVariants(storedAgent.workspace);
-    const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools;
+    const hasIntegrationTools = storedAgent.integrationTools != null;
+    const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools || hasIntegrationTools;
     let tools;
     if (isDynamicTools) {
       tools = async ({ requestContext }) => {
@@ -816,7 +820,10 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
           storedAgent.integrationTools,
           ctx
         ) : storedAgent.integrationTools;
-        const integrationTools = await this.resolveStoredIntegrationTools(resolvedIntegrationToolsConfig, ctx);
+        const integrationTools = await this.resolveStoredIntegrationTools(
+          resolvedIntegrationToolsConfig,
+          requestContext
+        );
         return { ...registryTools, ...mcpTools, ...integrationTools };
       };
     } else {
@@ -1122,6 +1129,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
   async resolveStoredIntegrationTools(integrationTools, requestContext) {
     if (!integrationTools || Object.keys(integrationTools).length === 0) return {};
     const allTools = {};
+    const providerOptions = { requestContext: requestContext?.toJSON() };
     for (const [providerId, providerConfig] of Object.entries(integrationTools)) {
       try {
         if (!providerConfig.tools) continue;
@@ -1140,7 +1148,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
         } else {
           slugsToResolve = wantedSlugs;
         }
-        const providerTools = await provider.resolveTools(slugsToResolve, providerConfig.tools, { requestContext });
+        const providerTools = await provider.resolveTools(slugsToResolve, providerConfig.tools, providerOptions);
         for (const [toolId, tool] of Object.entries(providerTools)) {
           const description = providerConfig.tools?.[toolId]?.description;
           if (description) {

package/dist/index.js

@@ -647,7 +647,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       const hasConditionalTools = this.isConditionalVariants(storedConfig.tools);
       const hasConditionalMCPClients = storedConfig.mcpClients != null && this.isConditionalVariants(storedConfig.mcpClients);
       const hasConditionalIntegrationTools = storedConfig.integrationTools != null && this.isConditionalVariants(storedConfig.integrationTools);
-      const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools;
+      const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools || hasStoredIntegrationTools;
       if (isDynamicTools) {
         const originalTools = fork.listTools.bind(fork);
         const toolsFn = async ({ requestContext: requestContext2 }) => {
@@ -667,7 +667,10 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
             storedConfig.integrationTools,
             ctx
           ) : storedConfig.integrationTools;
-          const integrationTools = await this.resolveStoredIntegrationTools(resolvedIntegrationToolsConfig, ctx);
+          const integrationTools = await this.resolveStoredIntegrationTools(
+            resolvedIntegrationToolsConfig,
+            requestContext2
+          );
           return { ...codeTools, ...registryTools, ...mcpTools, ...integrationTools };
         };
         fork.__setTools(toolsFn);
@@ -749,7 +752,8 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
     const hasConditionalDefaultOptions = storedAgent.defaultOptions != null && this.isConditionalVariants(storedAgent.defaultOptions);
     const hasConditionalModel = this.isConditionalVariants(storedAgent.model);
     const hasConditionalWorkspace = storedAgent.workspace != null && this.isConditionalVariants(storedAgent.workspace);
-    const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools;
+    const hasIntegrationTools = storedAgent.integrationTools != null;
+    const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools || hasIntegrationTools;
     let tools;
     if (isDynamicTools) {
       tools = async ({ requestContext }) => {
@@ -768,7 +772,10 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
           storedAgent.integrationTools,
           ctx
         ) : storedAgent.integrationTools;
-        const integrationTools = await this.resolveStoredIntegrationTools(resolvedIntegrationToolsConfig, ctx);
+        const integrationTools = await this.resolveStoredIntegrationTools(
+          resolvedIntegrationToolsConfig,
+          requestContext
+        );
         return { ...registryTools, ...mcpTools, ...integrationTools };
       };
     } else {
@@ -1074,6 +1081,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
   async resolveStoredIntegrationTools(integrationTools, requestContext) {
     if (!integrationTools || Object.keys(integrationTools).length === 0) return {};
     const allTools = {};
+    const providerOptions = { requestContext: requestContext?.toJSON() };
     for (const [providerId, providerConfig] of Object.entries(integrationTools)) {
       try {
         if (!providerConfig.tools) continue;
@@ -1092,7 +1100,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
         } else {
           slugsToResolve = wantedSlugs;
         }
-        const providerTools = await provider.resolveTools(slugsToResolve, providerConfig.tools, { requestContext });
+        const providerTools = await provider.resolveTools(slugsToResolve, providerConfig.tools, providerOptions);
         for (const [toolId, tool] of Object.entries(providerTools)) {
           const description = providerConfig.tools?.[toolId]?.description;
           if (description) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/editor",
-  "version": "0.7.24-alpha.1",
+  "version": "0.7.24-alpha.3",
   "description": "Mastra Editor for agent management and instantiation",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -65,7 +65,7 @@
     "@arcadeai/arcadejs": "^2.3.0",
     "@composio/core": "^0.6.5",
     "@composio/mastra": "^0.6.5",
-    "@mastra/memory": "1.17.6-alpha.0",
+    "@mastra/memory": "1.17.6-alpha.1",
     "@mastra/schema-compat": "1.2.9"
   },
   "devDependencies": {
@@ -75,13 +75,13 @@
     "typescript": "^6.0.3",
     "vitest": "4.1.5",
     "zod": "^3.25.76",
-    "@internal/ai-v6": "0.0.39",
     "@internal/ai-sdk-v4": "0.0.39",
     "@internal/ai-sdk-v5": "0.0.39",
-    "@mastra/core": "1.33.0-alpha.0",
-    "@mastra/libsql": "1.10.0",
-    "@mastra/hono": "1.4.14-alpha.0",
-    "@mastra/mcp": "1.7.0"
+    "@internal/ai-v6": "0.0.39",
+    "@mastra/libsql": "1.10.1-alpha.0",
+    "@mastra/core": "1.33.0-alpha.6",
+    "@mastra/mcp": "1.7.0",
+    "@mastra/hono": "1.4.14-alpha.6"
   },
   "peerDependencies": {
     "@mastra/core": ">=1.13.2-0 <2.0.0-0",