@mastra/mcp 0.11.3-alpha.2 → 0.11.3

package/dist/index.js

@@ -1,14 +1,14 @@
 import $RefParser from '@apidevtools/json-schema-ref-parser';
 import { MastraBase } from '@mastra/core/base';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { createTool } from '@mastra/core/tools';
+import { createTool, validateToolInput } from '@mastra/core/tools';
 import { makeCoreTool, isZodType } from '@mastra/core/utils';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { StdioClientTransport, getDefaultEnvironment } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { DEFAULT_REQUEST_TIMEOUT_MSEC } from '@modelcontextprotocol/sdk/shared/protocol.js';
-import { ListToolsRequestSchema, CallToolRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ListResourceTemplatesRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, ListPromptsRequestSchema, PromptSchema, GetPromptRequestSchema, ListResourcesResultSchema, ReadResourceResultSchema, ListResourceTemplatesResultSchema, ListPromptsResultSchema, GetPromptResultSchema, PromptListChangedNotificationSchema, ResourceUpdatedNotificationSchema, ResourceListChangedNotificationSchema, ElicitRequestSchema, CallToolResultSchema, JSONRPCMessageSchema, ErrorCode } from '@modelcontextprotocol/sdk/types.js';
+import { ListToolsRequestSchema, CallToolRequestSchema, SetLevelRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ListResourceTemplatesRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, ListPromptsRequestSchema, PromptSchema, GetPromptRequestSchema, ListResourcesResultSchema, ReadResourceResultSchema, ListResourceTemplatesResultSchema, ListPromptsResultSchema, GetPromptResultSchema, PromptListChangedNotificationSchema, ResourceUpdatedNotificationSchema, ResourceListChangedNotificationSchema, ElicitRequestSchema, CallToolResultSchema, JSONRPCMessageSchema, ErrorCode } from '@modelcontextprotocol/sdk/types.js';
 import { asyncExitHook, gracefulExit } from 'exit-hook';
 import { z } from 'zod';
 import { convertJsonSchemaToZod } from 'zod-from-json-schema';
@@ -82,7 +82,11 @@ var PromptClientActions = class {
    * @param version Optional version of the prompt to get.
    * @returns The prompt content.
    */
-  async get({ name, args, version }) {
+  async get({
+    name,
+    args,
+    version
+  }) {
     return this.client.getPrompt({ name, args, version });
   }
   /**
@@ -684,14 +688,17 @@ To fix this you have three different options:
           const internalClient = await this.getConnectedClientForServer(serverName);
           return internalClient.elicitation.onRequest(handler);
         } catch (err) {
-          throw new MastraError({
-            id: "MCP_CLIENT_ON_REQUEST_ELICITATION_FAILED",
-            domain: ErrorDomain.MCP,
-            category: ErrorCategory.THIRD_PARTY,
-            details: {
-              serverName
-            }
-          }, err);
+          throw new MastraError(
+            {
+              id: "MCP_CLIENT_ON_REQUEST_ELICITATION_FAILED",
+              domain: ErrorDomain.MCP,
+              category: ErrorCategory.THIRD_PARTY,
+              details: {
+                serverName
+              }
+            },
+            err
+          );
         }
       }
     };
@@ -706,14 +713,17 @@ To fix this you have three different options:
             const internalClient = await this.getConnectedClientForServer(serverName);
             allResources[serverName] = await internalClient.resources.list();
           } catch (error) {
-            const mastraError = new MastraError({
-              id: "MCP_CLIENT_LIST_RESOURCES_FAILED",
-              domain: ErrorDomain.MCP,
-              category: ErrorCategory.THIRD_PARTY,
-              details: {
-                serverName
-              }
-            }, error);
+            const mastraError = new MastraError(
+              {
+                id: "MCP_CLIENT_LIST_RESOURCES_FAILED",
+                domain: ErrorDomain.MCP,
+                category: ErrorCategory.THIRD_PARTY,
+                details: {
+                  serverName
+                }
+              },
+              error
+            );
             this.logger.trackException(mastraError);
             this.logger.error("Failed to list resources from server:", { error: mastraError.toString() });
           }
@@ -727,14 +737,17 @@ To fix this you have three different options:
             const internalClient = await this.getConnectedClientForServer(serverName);
             allTemplates[serverName] = await internalClient.resources.templates();
           } catch (error) {
-            const mastraError = new MastraError({
-              id: "MCP_CLIENT_LIST_RESOURCE_TEMPLATES_FAILED",
-              domain: ErrorDomain.MCP,
-              category: ErrorCategory.THIRD_PARTY,
-              details: {
-                serverName
-              }
-            }, error);
+            const mastraError = new MastraError(
+              {
+                id: "MCP_CLIENT_LIST_RESOURCE_TEMPLATES_FAILED",
+                domain: ErrorDomain.MCP,
+                category: ErrorCategory.THIRD_PARTY,
+                details: {
+                  serverName
+                }
+              },
+              error
+            );
             this.logger.trackException(mastraError);
             this.logger.error("Failed to list resource templates from server:", { error: mastraError.toString() });
           }
@@ -746,15 +759,18 @@ To fix this you have three different options:
           const internalClient = await this.getConnectedClientForServer(serverName);
           return internalClient.resources.read(uri);
         } catch (error) {
-          throw new MastraError({
-            id: "MCP_CLIENT_READ_RESOURCE_FAILED",
-            domain: ErrorDomain.MCP,
-            category: ErrorCategory.THIRD_PARTY,
-            details: {
-              serverName,
-              uri
-            }
-          }, error);
+          throw new MastraError(
+            {
+              id: "MCP_CLIENT_READ_RESOURCE_FAILED",
+              domain: ErrorDomain.MCP,
+              category: ErrorCategory.THIRD_PARTY,
+              details: {
+                serverName,
+                uri
+              }
+            },
+            error
+          );
         }
       },
       subscribe: async (serverName, uri) => {
@@ -762,15 +778,18 @@ To fix this you have three different options:
           const internalClient = await this.getConnectedClientForServer(serverName);
           return internalClient.resources.subscribe(uri);
         } catch (error) {
-          throw new MastraError({
-            id: "MCP_CLIENT_SUBSCRIBE_RESOURCE_FAILED",
-            domain: ErrorDomain.MCP,
-            category: ErrorCategory.THIRD_PARTY,
-            details: {
-              serverName,
-              uri
-            }
-          }, error);
+          throw new MastraError(
+            {
+              id: "MCP_CLIENT_SUBSCRIBE_RESOURCE_FAILED",
+              domain: ErrorDomain.MCP,
+              category: ErrorCategory.THIRD_PARTY,
+              details: {
+                serverName,
+                uri
+              }
+            },
+            error
+          );
         }
       },
       unsubscribe: async (serverName, uri) => {
@@ -778,15 +797,18 @@ To fix this you have three different options:
           const internalClient = await this.getConnectedClientForServer(serverName);
           return internalClient.resources.unsubscribe(uri);
         } catch (err) {
-          throw new MastraError({
-            id: "MCP_CLIENT_UNSUBSCRIBE_RESOURCE_FAILED",
-            domain: ErrorDomain.MCP,
-            category: ErrorCategory.THIRD_PARTY,
-            details: {
-              serverName,
-              uri
-            }
-          }, err);
+          throw new MastraError(
+            {
+              id: "MCP_CLIENT_UNSUBSCRIBE_RESOURCE_FAILED",
+              domain: ErrorDomain.MCP,
+              category: ErrorCategory.THIRD_PARTY,
+              details: {
+                serverName,
+                uri
+              }
+            },
+            err
+          );
         }
       },
       onUpdated: async (serverName, handler) => {
@@ -794,14 +816,17 @@ To fix this you have three different options:
           const internalClient = await this.getConnectedClientForServer(serverName);
           return internalClient.resources.onUpdated(handler);
         } catch (err) {
-          throw new MastraError({
-            id: "MCP_CLIENT_ON_UPDATED_RESOURCE_FAILED",
-            domain: ErrorDomain.MCP,
-            category: ErrorCategory.THIRD_PARTY,
-            details: {
-              serverName
-            }
-          }, err);
+          throw new MastraError(
+            {
+              id: "MCP_CLIENT_ON_UPDATED_RESOURCE_FAILED",
+              domain: ErrorDomain.MCP,
+              category: ErrorCategory.THIRD_PARTY,
+              details: {
+                serverName
+              }
+            },
+            err
+          );
         }
       },
       onListChanged: async (serverName, handler) => {
@@ -809,14 +834,17 @@ To fix this you have three different options:
           const internalClient = await this.getConnectedClientForServer(serverName);
           return internalClient.resources.onListChanged(handler);
         } catch (err) {
-          throw new MastraError({
-            id: "MCP_CLIENT_ON_LIST_CHANGED_RESOURCE_FAILED",
-            domain: ErrorDomain.MCP,
-            category: ErrorCategory.THIRD_PARTY,
-            details: {
-              serverName
-            }
-          }, err);
+          throw new MastraError(
+            {
+              id: "MCP_CLIENT_ON_LIST_CHANGED_RESOURCE_FAILED",
+              domain: ErrorDomain.MCP,
+              category: ErrorCategory.THIRD_PARTY,
+              details: {
+                serverName
+              }
+            },
+            err
+          );
         }
       }
     };
@@ -831,34 +859,45 @@ To fix this you have three different options:
             const internalClient = await this.getConnectedClientForServer(serverName);
             allPrompts[serverName] = await internalClient.prompts.list();
           } catch (error) {
-            const mastraError = new MastraError({
-              id: "MCP_CLIENT_LIST_PROMPTS_FAILED",
-              domain: ErrorDomain.MCP,
-              category: ErrorCategory.THIRD_PARTY,
-              details: {
-                serverName
-              }
-            }, error);
+            const mastraError = new MastraError(
+              {
+                id: "MCP_CLIENT_LIST_PROMPTS_FAILED",
+                domain: ErrorDomain.MCP,
+                category: ErrorCategory.THIRD_PARTY,
+                details: {
+                  serverName
+                }
+              },
+              error
+            );
             this.logger.trackException(mastraError);
             this.logger.error("Failed to list prompts from server:", { error: mastraError.toString() });
           }
         }
         return allPrompts;
       },
-      get: async ({ serverName, name, args, version }) => {
+      get: async ({
+        serverName,
+        name,
+        args,
+        version
+      }) => {
         try {
           const internalClient = await this.getConnectedClientForServer(serverName);
           return internalClient.prompts.get({ name, args, version });
         } catch (error) {
-          throw new MastraError({
-            id: "MCP_CLIENT_GET_PROMPT_FAILED",
-            domain: ErrorDomain.MCP,
-            category: ErrorCategory.THIRD_PARTY,
-            details: {
-              serverName,
-              name
-            }
-          }, error);
+          throw new MastraError(
+            {
+              id: "MCP_CLIENT_GET_PROMPT_FAILED",
+              domain: ErrorDomain.MCP,
+              category: ErrorCategory.THIRD_PARTY,
+              details: {
+                serverName,
+                name
+              }
+            },
+            error
+          );
         }
       },
       onListChanged: async (serverName, handler) => {
@@ -866,14 +905,17 @@ To fix this you have three different options:
           const internalClient = await this.getConnectedClientForServer(serverName);
           return internalClient.prompts.onListChanged(handler);
         } catch (error) {
-          throw new MastraError({
-            id: "MCP_CLIENT_ON_LIST_CHANGED_PROMPT_FAILED",
-            domain: ErrorDomain.MCP,
-            category: ErrorCategory.THIRD_PARTY,
-            details: {
-              serverName
-            }
-          }, error);
+          throw new MastraError(
+            {
+              id: "MCP_CLIENT_ON_LIST_CHANGED_PROMPT_FAILED",
+              domain: ErrorDomain.MCP,
+              category: ErrorCategory.THIRD_PARTY,
+              details: {
+                serverName
+              }
+            },
+            error
+          );
         }
       }
     };
@@ -913,11 +955,14 @@ To fix this you have three different options:
         }
       });
     } catch (error) {
-      throw new MastraError({
-        id: "MCP_CLIENT_GET_TOOLS_FAILED",
-        domain: ErrorDomain.MCP,
-        category: ErrorCategory.THIRD_PARTY
-      }, error);
+      throw new MastraError(
+        {
+          id: "MCP_CLIENT_GET_TOOLS_FAILED",
+          domain: ErrorDomain.MCP,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
     }
     return connectedTools;
   }
@@ -931,11 +976,14 @@ To fix this you have three different options:
         }
       });
     } catch (error) {
-      throw new MastraError({
-        id: "MCP_CLIENT_GET_TOOLSETS_FAILED",
-        domain: ErrorDomain.MCP,
-        category: ErrorCategory.THIRD_PARTY
-      }, error);
+      throw new MastraError(
+        {
+          id: "MCP_CLIENT_GET_TOOLSETS_FAILED",
+          domain: ErrorDomain.MCP,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
     }
     return connectedToolsets;
   }
@@ -983,15 +1031,18 @@ To fix this you have three different options:
     try {
       await mcpClient.connect();
     } catch (e) {
-      const mastraError = new MastraError({
-        id: "MCP_CLIENT_CONNECT_FAILED",
-        domain: ErrorDomain.MCP,
-        category: ErrorCategory.THIRD_PARTY,
-        text: `Failed to connect to MCP server ${name}: ${e instanceof Error ? e.stack || e.message : String(e)}`,
-        details: {
-          name
-        }
-      }, e);
+      const mastraError = new MastraError(
+        {
+          id: "MCP_CLIENT_CONNECT_FAILED",
+          domain: ErrorDomain.MCP,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to connect to MCP server ${name}: ${e instanceof Error ? e.stack || e.message : String(e)}`,
+          details: {
+            name
+          }
+        },
+        e
+      );
       this.logger.trackException(mastraError);
       this.logger.error("MCPClient errored connecting to MCP server:", { error: mastraError.toString() });
       this.mcpClientsById.delete(name);
@@ -1399,6 +1450,7 @@ var MCPServer = class extends MCPServerBase {
   definedPrompts;
   promptOptions;
   subscriptions = /* @__PURE__ */ new Set();
+  currentLoggingLevel;
   resources;
   prompts;
   elicitation;
@@ -1643,6 +1695,11 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
         };
       }
     });
+    serverInstance.setRequestHandler(SetLevelRequestSchema, async (request) => {
+      this.currentLoggingLevel = request.params.level;
+      this.logger.debug(`Logging level set to: ${request.params.level}`);
+      return {};
+    });
     if (this.resourceOptions) {
       this.registerResourceHandlersOnServer(serverInstance);
     }
@@ -1960,7 +2017,7 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
   /**
    * Convert and validate all provided tools, logging registration status.
    * Also converts agents and workflows into tools.
-   * @param tools Tool definitions
+   * @param tools Tool definitions (supports ToolsInput, MCPToolsInput)
    * @param agentsConfig Agent definitions to be converted to tools, expected from MCPServerConfig
    * @param workflowsConfig Workflow definitions to be converted to tools, expected from MCPServerConfig
    * @returns Converted tools registry
@@ -1993,7 +2050,7 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
         outputSchema: coreTool.outputSchema,
         execute: coreTool.execute
       };
-      this.logger.info(`Registered explicit tool: '${toolName}'`);
+      this.logger.info(`Registered tool: '${toolName}'`);
     }
     this.logger.info(`Total defined tools registered: ${Object.keys(definedConvertedTools).length}`);
     let agentDerivedTools = {};
@@ -2586,7 +2643,57 @@ Provided arguments: ${JSON.stringify(args, null, 2)}`,
     }
   }
 };
+function createMCPTool(opts) {
+  let parameters;
+  let outputSchema;
+  if (opts.inputSchema) {
+    parameters = {
+      jsonSchema: opts.inputSchema,
+      validate: (value) => {
+        try {
+          const result = opts.inputSchema.safeParse(value);
+          return result.success ? { success: true, value: result.data } : { success: false, error: result.error };
+        } catch (e) {
+          return { success: false, error: e };
+        }
+      }
+    };
+  } else {
+    parameters = void 0;
+  }
+  if (opts.outputSchema) {
+    outputSchema = {
+      jsonSchema: opts.outputSchema,
+      validate: (value) => {
+        try {
+          const result = opts.outputSchema.safeParse(value);
+          return result.success ? { success: true, value: result.data } : { success: false, error: result.error };
+        } catch (e) {
+          return { success: false, error: e };
+        }
+      }
+    };
+  }
+  return {
+    id: opts.id,
+    description: opts.description,
+    parameters,
+    outputSchema,
+    execute: async (params, options) => {
+      const mcpOptions = {
+        context: params,
+        elicitation: options.elicitation,
+        extra: options.extra
+      };
+      const { data, error } = validateToolInput(opts.inputSchema, params, opts.id);
+      if (error) {
+        return error;
+      }
+      return opts.execute(data, mcpOptions);
+    }
+  };
+}
 
-export { MCPClient, MCPConfiguration, MCPServer, MastraMCPClient };
+export { MCPClient, MCPConfiguration, MCPServer, MastraMCPClient, createMCPTool };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map