@mastra/editor 0.7.22-alpha.0 → 0.7.22-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @mastra/editor
 
+## 0.7.22-alpha.1
+
+### Patch Changes
+
+- Fix MCP client support in the agent editor: ([#15945](https://github.com/mastra-ai/mastra/pull/15945))
+  - MCP client form dirty state: Save button now enables after adding/removing MCP clients
+  - MCP tool name matching: Both bare and namespaced tool names are matched correctly
+  - Auth token forwarding: Token from cookie or header is forwarded to auth-protected MCP servers
+  - String interpolation: Request context variables in system prompts now resolve correctly
+- Updated dependencies [[`920c757`](https://github.com/mastra-ai/mastra/commit/920c75799c6bd71787d86deaf654a35af4c839ca), [`1fe2533`](https://github.com/mastra-ai/mastra/commit/1fe2533c4382ca6858aac7c4b63e888c2eac6541), [`f8694b6`](https://github.com/mastra-ai/mastra/commit/f8694b6fa0b7a5cde71d794c3bbef4957c55bcb8)]:
+  - @mastra/core@1.30.0-alpha.1
+
 ## 0.7.22-alpha.0
 
 ### Patch Changes

package/dist/index.cjs

@@ -541,7 +541,7 @@ var EditorMCPNamespace = class _EditorMCPNamespace extends CrudEditorNamespace {
    * Converts `url` from string to URL for HTTP servers.
    * Returns a plain object — callers must pass it to `new MCPClient()`.
    */
-  static toMCPServerDefinition(serverConfig) {
+  static toMCPServerDefinition(serverConfig, requestInit) {
     if (serverConfig.type === "stdio") {
       return {
         command: serverConfig.command,
@@ -552,16 +552,17 @@ var EditorMCPNamespace = class _EditorMCPNamespace extends CrudEditorNamespace {
     }
     return {
       url: new URL(serverConfig.url),
-      timeout: serverConfig.timeout
+      timeout: serverConfig.timeout,
+      ...requestInit ? { requestInit } : {}
     };
   }
   /**
    * Convert all servers in a stored MCP client to MCPClientOptions shape.
    */
-  static toMCPClientOptions(config) {
+  static toMCPClientOptions(config, requestInit) {
     const servers = {};
     for (const [name, serverConfig] of Object.entries(config.servers)) {
-      servers[name] = _EditorMCPNamespace.toMCPServerDefinition(serverConfig);
+      servers[name] = _EditorMCPNamespace.toMCPServerDefinition(serverConfig, requestInit);
     }
     return { id: config.id, servers };
   }
@@ -659,7 +660,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
    * they may contain SDK instances or dynamic functions that cannot be safely serialized.
    * Returns the (possibly mutated) agent.
    */
-  async applyStoredOverrides(agent, options) {
+  async applyStoredOverrides(agent, options, requestContext) {
     let storedConfig = null;
     try {
       this.ensureRegistered();
@@ -697,9 +698,9 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools;
       if (isDynamicTools) {
         const originalTools = fork.listTools.bind(fork);
-        const toolsFn = async ({ requestContext }) => {
-          const codeTools = await originalTools({ requestContext });
-          const ctx = requestContext.toJSON();
+        const toolsFn = async ({ requestContext: requestContext2 }) => {
+          const codeTools = await originalTools({ requestContext: requestContext2 });
+          const ctx = requestContext2.toJSON();
           const resolvedToolsConfig = hasConditionalTools ? this.accumulateObjectVariants(
             storedConfig.tools,
             ctx
@@ -709,7 +710,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
             storedConfig.mcpClients,
             ctx
           ) : storedConfig.mcpClients;
-          const mcpTools = await this.resolveStoredMCPTools(resolvedMCPClientsConfig);
+          const mcpTools = await this.resolveStoredMCPTools(resolvedMCPClientsConfig, requestContext2);
           const resolvedIntegrationToolsConfig = hasConditionalIntegrationTools ? this.accumulateObjectVariants(
             storedConfig.integrationTools,
             ctx
@@ -724,7 +725,8 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
           storedConfig.tools
         );
         const mcpTools = await this.resolveStoredMCPTools(
-          storedConfig.mcpClients
+          storedConfig.mcpClients,
+          requestContext
         );
         const integrationTools = await this.resolveStoredIntegrationTools(
           storedConfig.integrationTools
@@ -809,7 +811,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
           storedAgent.mcpClients,
           ctx
         ) : storedAgent.mcpClients;
-        const mcpTools = await this.resolveStoredMCPTools(resolvedMCPClientsConfig);
+        const mcpTools = await this.resolveStoredMCPTools(resolvedMCPClientsConfig, requestContext);
         const resolvedIntegrationToolsConfig = hasConditionalIntegrationTools ? this.accumulateObjectVariants(
           storedAgent.integrationTools,
           ctx
@@ -1042,10 +1044,12 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
    * When `clientToolsConfig.tools` is an empty object `{}`, all tools from the source are included.
    * When specified with keys, only listed tools are included with optional description overrides.
    */
-  async resolveStoredMCPTools(mcpClients) {
+  async resolveStoredMCPTools(mcpClients, requestContext) {
     if (!mcpClients || Object.keys(mcpClients).length === 0) return {};
     if (!this.mastra) return {};
     const allTools = {};
+    const authToken = requestContext?.get("mastra__authToken");
+    const authRequestInit = authToken ? { headers: { Authorization: `Bearer ${authToken}` } } : void 0;
     let MCPClient;
     for (const [clientId, clientToolsConfig] of Object.entries(mcpClients)) {
       try {
@@ -1064,7 +1068,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
               continue;
             }
           }
-          const clientOptions = EditorMCPNamespace.toMCPClientOptions(storedClient);
+          const clientOptions = EditorMCPNamespace.toMCPClientOptions(storedClient, authRequestInit);
           const client = new MCPClient(clientOptions);
           tools = await client.listTools();
           this.logger?.debug(`[resolveStoredMCPTools] Loaded tools from stored MCP client "${clientId}"`);
@@ -1089,9 +1093,10 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
             if (!(bareToolName in clientServers[serverName].tools)) continue;
           }
           const hasAgentFilter = agentAllowedTools && Object.keys(agentAllowedTools).length > 0;
-          if (hasAgentFilter && !(namespacedToolName in agentAllowedTools)) continue;
+          if (hasAgentFilter && !(namespacedToolName in agentAllowedTools) && !(bareToolName in agentAllowedTools))
+            continue;
           const serverToolConfig = serverName ? clientServers?.[serverName]?.tools?.[bareToolName] : void 0;
-          const description = agentAllowedTools?.[namespacedToolName]?.description ?? serverToolConfig?.description;
+          const description = agentAllowedTools?.[namespacedToolName]?.description ?? agentAllowedTools?.[bareToolName]?.description ?? serverToolConfig?.description;
           if (description) {
             allTools[namespacedToolName] = { ...tool, description };
           } else {

package/dist/index.d.cts

@@ -119,7 +119,7 @@ declare class EditorAgentNamespace extends CrudEditorNamespace<StorageCreateAgen
         status?: 'draft' | 'published';
     } | {
         versionId: string;
-    }): Promise<Agent>;
+    }, requestContext?: RequestContext): Promise<Agent>;
     /**
      * Detect whether a StorageConditionalField value is a conditional variant array
      * (as opposed to the plain static value T).
@@ -215,11 +215,15 @@ declare class EditorMCPNamespace extends CrudEditorNamespace<StorageCreateMCPCli
      * Converts `url` from string to URL for HTTP servers.
      * Returns a plain object — callers must pass it to `new MCPClient()`.
      */
-    static toMCPServerDefinition(serverConfig: StorageMCPServerConfig): Record<string, unknown>;
+    static toMCPServerDefinition(serverConfig: StorageMCPServerConfig, requestInit?: {
+        headers: Record<string, string>;
+    }): Record<string, unknown>;
     /**
      * Convert all servers in a stored MCP client to MCPClientOptions shape.
      */
-    static toMCPClientOptions(config: StorageResolvedMCPClientType): {
+    static toMCPClientOptions(config: StorageResolvedMCPClientType, requestInit?: {
+        headers: Record<string, string>;
+    }): {
         id: string;
         servers: Record<string, Record<string, unknown>>;
     };

package/dist/index.d.ts

@@ -119,7 +119,7 @@ declare class EditorAgentNamespace extends CrudEditorNamespace<StorageCreateAgen
         status?: 'draft' | 'published';
     } | {
         versionId: string;
-    }): Promise<Agent>;
+    }, requestContext?: RequestContext): Promise<Agent>;
     /**
      * Detect whether a StorageConditionalField value is a conditional variant array
      * (as opposed to the plain static value T).
@@ -215,11 +215,15 @@ declare class EditorMCPNamespace extends CrudEditorNamespace<StorageCreateMCPCli
      * Converts `url` from string to URL for HTTP servers.
      * Returns a plain object — callers must pass it to `new MCPClient()`.
      */
-    static toMCPServerDefinition(serverConfig: StorageMCPServerConfig): Record<string, unknown>;
+    static toMCPServerDefinition(serverConfig: StorageMCPServerConfig, requestInit?: {
+        headers: Record<string, string>;
+    }): Record<string, unknown>;
     /**
      * Convert all servers in a stored MCP client to MCPClientOptions shape.
      */
-    static toMCPClientOptions(config: StorageResolvedMCPClientType): {
+    static toMCPClientOptions(config: StorageResolvedMCPClientType, requestInit?: {
+        headers: Record<string, string>;
+    }): {
         id: string;
         servers: Record<string, Record<string, unknown>>;
     };

package/dist/index.js

@@ -493,7 +493,7 @@ var EditorMCPNamespace = class _EditorMCPNamespace extends CrudEditorNamespace {
    * Converts `url` from string to URL for HTTP servers.
    * Returns a plain object — callers must pass it to `new MCPClient()`.
    */
-  static toMCPServerDefinition(serverConfig) {
+  static toMCPServerDefinition(serverConfig, requestInit) {
     if (serverConfig.type === "stdio") {
       return {
         command: serverConfig.command,
@@ -504,16 +504,17 @@ var EditorMCPNamespace = class _EditorMCPNamespace extends CrudEditorNamespace {
     }
     return {
       url: new URL(serverConfig.url),
-      timeout: serverConfig.timeout
+      timeout: serverConfig.timeout,
+      ...requestInit ? { requestInit } : {}
     };
   }
   /**
    * Convert all servers in a stored MCP client to MCPClientOptions shape.
    */
-  static toMCPClientOptions(config) {
+  static toMCPClientOptions(config, requestInit) {
     const servers = {};
     for (const [name, serverConfig] of Object.entries(config.servers)) {
-      servers[name] = _EditorMCPNamespace.toMCPServerDefinition(serverConfig);
+      servers[name] = _EditorMCPNamespace.toMCPServerDefinition(serverConfig, requestInit);
     }
     return { id: config.id, servers };
   }
@@ -611,7 +612,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
    * they may contain SDK instances or dynamic functions that cannot be safely serialized.
    * Returns the (possibly mutated) agent.
    */
-  async applyStoredOverrides(agent, options) {
+  async applyStoredOverrides(agent, options, requestContext) {
     let storedConfig = null;
     try {
       this.ensureRegistered();
@@ -649,9 +650,9 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools;
       if (isDynamicTools) {
         const originalTools = fork.listTools.bind(fork);
-        const toolsFn = async ({ requestContext }) => {
-          const codeTools = await originalTools({ requestContext });
-          const ctx = requestContext.toJSON();
+        const toolsFn = async ({ requestContext: requestContext2 }) => {
+          const codeTools = await originalTools({ requestContext: requestContext2 });
+          const ctx = requestContext2.toJSON();
           const resolvedToolsConfig = hasConditionalTools ? this.accumulateObjectVariants(
             storedConfig.tools,
             ctx
@@ -661,7 +662,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
             storedConfig.mcpClients,
             ctx
           ) : storedConfig.mcpClients;
-          const mcpTools = await this.resolveStoredMCPTools(resolvedMCPClientsConfig);
+          const mcpTools = await this.resolveStoredMCPTools(resolvedMCPClientsConfig, requestContext2);
           const resolvedIntegrationToolsConfig = hasConditionalIntegrationTools ? this.accumulateObjectVariants(
             storedConfig.integrationTools,
             ctx
@@ -676,7 +677,8 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
           storedConfig.tools
         );
         const mcpTools = await this.resolveStoredMCPTools(
-          storedConfig.mcpClients
+          storedConfig.mcpClients,
+          requestContext
         );
         const integrationTools = await this.resolveStoredIntegrationTools(
           storedConfig.integrationTools
@@ -761,7 +763,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
           storedAgent.mcpClients,
           ctx
         ) : storedAgent.mcpClients;
-        const mcpTools = await this.resolveStoredMCPTools(resolvedMCPClientsConfig);
+        const mcpTools = await this.resolveStoredMCPTools(resolvedMCPClientsConfig, requestContext);
         const resolvedIntegrationToolsConfig = hasConditionalIntegrationTools ? this.accumulateObjectVariants(
           storedAgent.integrationTools,
           ctx
@@ -994,10 +996,12 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
    * When `clientToolsConfig.tools` is an empty object `{}`, all tools from the source are included.
    * When specified with keys, only listed tools are included with optional description overrides.
    */
-  async resolveStoredMCPTools(mcpClients) {
+  async resolveStoredMCPTools(mcpClients, requestContext) {
     if (!mcpClients || Object.keys(mcpClients).length === 0) return {};
     if (!this.mastra) return {};
     const allTools = {};
+    const authToken = requestContext?.get("mastra__authToken");
+    const authRequestInit = authToken ? { headers: { Authorization: `Bearer ${authToken}` } } : void 0;
     let MCPClient;
     for (const [clientId, clientToolsConfig] of Object.entries(mcpClients)) {
       try {
@@ -1016,7 +1020,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
               continue;
             }
           }
-          const clientOptions = EditorMCPNamespace.toMCPClientOptions(storedClient);
+          const clientOptions = EditorMCPNamespace.toMCPClientOptions(storedClient, authRequestInit);
           const client = new MCPClient(clientOptions);
           tools = await client.listTools();
           this.logger?.debug(`[resolveStoredMCPTools] Loaded tools from stored MCP client "${clientId}"`);
@@ -1041,9 +1045,10 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
             if (!(bareToolName in clientServers[serverName].tools)) continue;
           }
           const hasAgentFilter = agentAllowedTools && Object.keys(agentAllowedTools).length > 0;
-          if (hasAgentFilter && !(namespacedToolName in agentAllowedTools)) continue;
+          if (hasAgentFilter && !(namespacedToolName in agentAllowedTools) && !(bareToolName in agentAllowedTools))
+            continue;
           const serverToolConfig = serverName ? clientServers?.[serverName]?.tools?.[bareToolName] : void 0;
-          const description = agentAllowedTools?.[namespacedToolName]?.description ?? serverToolConfig?.description;
+          const description = agentAllowedTools?.[namespacedToolName]?.description ?? agentAllowedTools?.[bareToolName]?.description ?? serverToolConfig?.description;
           if (description) {
             allTools[namespacedToolName] = { ...tool, description };
           } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/editor",
-  "version": "0.7.22-alpha.0",
+  "version": "0.7.22-alpha.1",
   "description": "Mastra Editor for agent management and instantiation",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -65,8 +65,8 @@
     "@arcadeai/arcadejs": "^2.3.0",
     "@composio/core": "^0.6.5",
     "@composio/mastra": "^0.6.5",
-    "@mastra/schema-compat": "1.2.9",
-    "@mastra/memory": "1.17.4-alpha.0"
+    "@mastra/memory": "1.17.4-alpha.0",
+    "@mastra/schema-compat": "1.2.9"
   },
   "devDependencies": {
     "@hono/node-server": "^1.19.11",
@@ -76,12 +76,12 @@
     "vitest": "4.1.5",
     "zod": "^3.25.76",
     "@internal/ai-sdk-v4": "0.0.35",
+    "@internal/ai-sdk-v5": "0.0.35",
     "@internal/ai-v6": "0.0.35",
-    "@mastra/core": "1.29.2-alpha.0",
-    "@mastra/hono": "1.4.10-alpha.0",
+    "@mastra/hono": "1.4.10-alpha.1",
     "@mastra/libsql": "1.9.0",
     "@mastra/mcp": "1.6.0",
-    "@internal/ai-sdk-v5": "0.0.35"
+    "@mastra/core": "1.30.0-alpha.1"
   },
   "peerDependencies": {
     "@mastra/core": ">=1.7.1-0 <2.0.0-0",