@mastra/mcp 0.10.4 → 0.10.5-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/mcp",
-  "version": "0.10.4",
+  "version": "0.10.5-alpha.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -51,7 +51,7 @@
     "zod": "^3.25.57",
     "zod-to-json-schema": "^3.24.5",
     "@internal/lint": "0.0.13",
-    "@mastra/core": "0.10.6"
+    "@mastra/core": "0.10.7-alpha.1"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",

package/src/client/configuration.ts

@@ -1,4 +1,5 @@
 import { MastraBase } from '@mastra/core/base';
+import { ErrorCategory, ErrorDomain, MastraError } from '@mastra/core/error';
 import { DEFAULT_REQUEST_TIMEOUT_MSEC } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import type { Prompt, Resource, ResourceTemplate } from '@modelcontextprotocol/sdk/types.js';
 import equal from 'fast-deep-equal';
@@ -74,7 +75,16 @@ To fix this you have three different options:
             const internalClient = await this.getConnectedClientForServer(serverName);
             allResources[serverName] = await internalClient.resources.list();
           } catch (error) {
-            this.logger.error(`Failed to list resources from server ${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() });
           }
         }
         return allResources;
@@ -86,30 +96,97 @@ To fix this you have three different options:
             const internalClient = await this.getConnectedClientForServer(serverName);
             allTemplates[serverName] = await internalClient.resources.templates();
           } catch (error) {
-            this.logger.error(`Failed to list resource templates from server ${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() });
           }
         }
         return allTemplates;
       },
       read: async (serverName: string, uri: string) => {
-        const internalClient = await this.getConnectedClientForServer(serverName);
-        return internalClient.resources.read(uri);
+        try {
+          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);
+        }
       },
       subscribe: async (serverName: string, uri: string) => {
-        const internalClient = await this.getConnectedClientForServer(serverName);
-        return internalClient.resources.subscribe(uri);
+        try {
+          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);
+        }
       },
       unsubscribe: async (serverName: string, uri: string) => {
-        const internalClient = await this.getConnectedClientForServer(serverName);
-        return internalClient.resources.unsubscribe(uri);
+        try {
+          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);
+        }
       },
       onUpdated: async (serverName: string, handler: (params: { uri: string }) => void) => {
-        const internalClient = await this.getConnectedClientForServer(serverName);
-        return internalClient.resources.onUpdated(handler);
+        try {
+          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);
+        }
       },
       onListChanged: async (serverName: string, handler: () => void) => {
-        const internalClient = await this.getConnectedClientForServer(serverName);
-        return internalClient.resources.onListChanged(handler);
+        try {
+          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);
+        }
       },
     };
   }
@@ -124,18 +201,50 @@ To fix this you have three different options:
             const internalClient = await this.getConnectedClientForServer(serverName);
             allPrompts[serverName] = await internalClient.prompts.list();
           } catch (error) {
-            this.logger.error(`Failed to list prompts from server ${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}: {serverName: string, name: string, args?: Record<string, any>, version?: string}) => {
-        const internalClient = await this.getConnectedClientForServer(serverName);
-        return internalClient.prompts.get({name, args, version});
+      get: async ({ serverName, name, args, version }: { serverName: string, name: string, args?: Record<string, any>, version?: string }) => {
+        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);
+        }
       },
       onListChanged: async (serverName: string, handler: () => void) => {
-        const internalClient = await this.getConnectedClientForServer(serverName);
-        return internalClient.prompts.onListChanged(handler);
+        try {
+          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);
+        }
       },
     };
   }
@@ -163,7 +272,7 @@ To fix this you have three different options:
     this.disconnectPromise = (async () => {
       try {
         mcpClientInstances.delete(this.id);
-        
+
         // Disconnect all clients in the cache
         await Promise.all(Array.from(this.mcpClientsById.values()).map(client => client.disconnect()));
         this.mcpClientsById.clear();
@@ -179,11 +288,19 @@ To fix this you have three different options:
     this.addToInstanceCache();
     const connectedTools: Record<string, any> = {}; // <- any because we don't have proper tool schemas
 
-    await this.eachClientTools(async ({ serverName, tools }) => {
-      for (const [toolName, toolConfig] of Object.entries(tools)) {
-        connectedTools[`${serverName}_${toolName}`] = toolConfig; // namespace tool to prevent tool name conflicts between servers
-      }
-    });
+    try {
+      await this.eachClientTools(async ({ serverName, tools }) => {
+        for (const [toolName, toolConfig] of Object.entries(tools)) {
+          connectedTools[`${serverName}_${toolName}`] = toolConfig; // namespace tool to prevent tool name conflicts between servers
+        }
+      });
+    } catch (error) {
+      throw new MastraError({
+        id: 'MCP_CLIENT_GET_TOOLS_FAILED',
+        domain: ErrorDomain.MCP,
+        category: ErrorCategory.THIRD_PARTY,
+      }, error);
+    }
 
     return connectedTools;
   }
@@ -192,11 +309,19 @@ To fix this you have three different options:
     this.addToInstanceCache();
     const connectedToolsets: Record<string, Record<string, any>> = {}; // <- any because we don't have proper tool schemas
 
-    await this.eachClientTools(async ({ serverName, tools }) => {
-      if (tools) {
-        connectedToolsets[serverName] = tools;
-      }
-    });
+    try {
+      await this.eachClientTools(async ({ serverName, tools }) => {
+        if (tools) {
+          connectedToolsets[serverName] = tools;
+        }
+      });
+    } catch (error) {
+      throw new MastraError({
+        id: 'MCP_CLIENT_GET_TOOLSETS_FAILED',
+        domain: ErrorDomain.MCP,
+        category: ErrorCategory.THIRD_PARTY,
+      }, error);
+    }
 
     return connectedToolsets;
   }
@@ -258,13 +383,19 @@ 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);
+      this.logger.trackException(mastraError);
+      this.logger.error('MCPClient errored connecting to MCP server:', { error: mastraError.toString() });
       this.mcpClientsById.delete(name);
-      this.logger.error(`MCPClient errored connecting to MCP server ${name}`, {
-        error: e instanceof Error ? e.message : String(e),
-      });
-      throw new Error(
-        `Failed to connect to MCP server ${name}: ${e instanceof Error ? e.stack || e.message : String(e)}`,
-      );
+      throw mastraError;
     }
     this.logger.debug(`Connected to ${name} MCP server`);
     return mcpClient;

package/src/server/promptActions.ts

@@ -1,3 +1,4 @@
+import { ErrorCategory, ErrorDomain, MastraError } from '@mastra/core/error';
 import type { IMastraLogger } from '@mastra/core/logger';
 import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
 
@@ -28,10 +29,20 @@ export class ServerPromptActions {
     try {
       await this.getSdkServer().sendPromptListChanged();
     } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: 'MCP_SERVER_PROMPT_LIST_CHANGED_NOTIFICATION_FAILED',
+          domain: ErrorDomain.MCP,
+          category: ErrorCategory.THIRD_PARTY,
+          text: 'Failed to send prompt list changed notification',
+        },
+        error,
+      );
       this.getLogger().error('Failed to send prompt list changed notification:', {
-        error: error instanceof Error ? error.message : String(error),
+        error: mastraError.toString(),
       });
-      throw error;
+      this.getLogger().trackException(mastraError);
+      throw mastraError;
     }
   }
 }

package/src/server/resourceActions.ts

@@ -1,3 +1,4 @@
+import { ErrorCategory, ErrorDomain, MastraError } from '@mastra/core/error';
 import type { IMastraLogger } from '@mastra/core/logger';
 import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
 
@@ -34,8 +35,23 @@ export class ServerResourceActions {
       try {
         await this.getSdkServer().sendResourceUpdated({ uri });
       } catch (error) {
-        this.getLogger().error('Failed to send resource updated notification:', { error });
-        throw error;
+        const mastraError = new MastraError(
+          {
+            id: 'MCP_SERVER_RESOURCE_UPDATED_NOTIFICATION_FAILED',
+            domain: ErrorDomain.MCP,
+            category: ErrorCategory.THIRD_PARTY,
+            text: 'Failed to send resource updated notification',
+            details: {
+              uri,
+            },
+          },
+          error,
+        );
+        this.getLogger().trackException(mastraError);
+        this.getLogger().error('Failed to send resource updated notification:', {
+          error: mastraError.toString(),
+        });
+        throw mastraError;
       }
     } else {
       this.getLogger().debug(`Resource ${uri} was updated, but no active subscriptions for it.`);
@@ -55,8 +71,20 @@ export class ServerResourceActions {
     try {
       await this.getSdkServer().sendResourceListChanged();
     } catch (error) {
-      this.getLogger().error('Failed to send resource list changed notification:', { error });
-      throw error;
+      const mastraError = new MastraError(
+        {
+          id: 'MCP_SERVER_RESOURCE_LIST_CHANGED_NOTIFICATION_FAILED',
+          domain: ErrorDomain.MCP,
+          category: ErrorCategory.THIRD_PARTY,
+          text: 'Failed to send resource list changed notification',
+        },
+        error,
+      );
+      this.getLogger().trackException(mastraError);
+      this.getLogger().error('Failed to send resource list changed notification:', {
+        error: mastraError.toString(),
+      });
+      throw mastraError;
     }
   }
 }