@mastra/mcp 0.4.4-alpha.0 → 0.5.0-alpha.2

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/mcp@0.4.4-alpha.0 build /home/runner/work/mastra/mastra/packages/mcp
+> @mastra/mcp@0.5.0-alpha.2 build /home/runner/work/mastra/mastra/packages/mcp
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.4.0
 TSC Build start
-TSC ⚡️ Build success in 15710ms
+TSC ⚡️ Build success in 18478ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/mcp/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/mcp/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 14943ms
+DTS ⚡️ Build success in 12208ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-CJS dist/index.cjs 205.43 KB
-CJS ⚡️ Build success in 5121ms
-ESM dist/index.js 204.63 KB
-ESM ⚡️ Build success in 5125ms
+ESM dist/index.js 25.82 KB
+ESM ⚡️ Build success in 1060ms
+CJS dist/index.cjs 26.18 KB
+CJS ⚡️ Build success in 1060ms

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @mastra/mcp
 
+## 0.5.0-alpha.2
+
+### Patch Changes
+
+- Updated dependencies [3171b5b]
+- Updated dependencies [973e5ac]
+- Updated dependencies [9e1eff5]
+  - @mastra/core@0.9.4-alpha.2
+
+## 0.5.0-alpha.1
+
+### Minor Changes
+
+- e229660: MCPClient: expose connected client resources.
+
+  Added a new `getResources()` method to the MCPClient class that allows clients to retrieve resources from connected MCP servers. Resources are data or content exposed by MCP servers that can be accessed by clients.
+
+  The implementation includes:
+
+  - Direct access to resources from all connected MCP servers, grouped by server name
+  - Robust error handling that allows partial results when some servers fail
+  - Comprehensive test coverage with real server implementation
+
+  This feature enables applications to access data and content exposed by MCP servers through the resources capability, such as files, databases, or other content sources.
+
+### Patch Changes
+
+- edf1e88: allows ability to pass McpServer into the mastra class and creates an endpoint /api/servers/:serverId/mcp to POST messages to an MCP server
+- Updated dependencies [ab80e7e]
+- Updated dependencies [6fa1ad1]
+- Updated dependencies [c28d7a0]
+- Updated dependencies [edf1e88]
+  - @mastra/core@0.9.4-alpha.1
+
 ## 0.4.4-alpha.0
 
 ### Patch Changes

package/README.md

@@ -301,6 +301,51 @@ The `MCPClient` class automatically:
 - Handles connection lifecycle and cleanup
 - Provides both flat and grouped access to tools
 
+## Accessing MCP Resources
+
+MCP servers can expose resources - data or content that can be retrieved and used in your application. The `MCPClient` class provides methods to access these resources across multiple servers:
+
+```typescript
+import { MCPClient } from '@mastra/mcp';
+
+const mcp = new MCPClient({
+  servers: {
+    weather: {
+      url: new URL('http://localhost:8080/mcp'),
+    },
+    dataService: {
+      command: 'npx',
+      args: ['tsx', 'data-service.ts'],
+    },
+  },
+});
+
+// Get resources from all connected MCP servers
+const resources = await mcp.getResources();
+
+// Resources are grouped by server name
+console.log(Object.keys(resources)); // ['weather', 'dataService']
+
+// Each server entry contains an array of resources
+if (resources.weather) {
+  // Access resources from the weather server
+  const weatherResources = resources.weather;
+  
+  // Each resource has uri, name, description, and mimeType
+  weatherResources.forEach(resource => {
+    console.log(`${resource.uri}: ${resource.name} (${resource.mimeType})`);
+  });
+  
+  // Find a specific resource by URI
+  const forecast = weatherResources.find(r => r.uri === 'weather://forecast');
+  if (forecast) {
+    console.log(`Found forecast resource: ${forecast.description}`);
+  }
+}
+```
+
+The `getResources()` method handles errors gracefully - if a server fails or doesn't support resources, it will be omitted from the results without causing the entire operation to fail.
+
 ## SSE Authentication and Headers (Legacy Fallback)
 
 When the client falls back to using the legacy SSE (Server-Sent Events) transport and you need to include authentication or custom headers, you need to configure headers in a specific way. The standard `requestInit` headers won't work alone because SSE connections using the browser's `EventSource` API don't support custom headers directly.

package/dist/_tsup-dts-rollup.d.cts

@@ -1,12 +1,18 @@
 import type { ClientCapabilities } from '@modelcontextprotocol/sdk/types.js';
+import type { ConvertedTool } from '@mastra/core/mcp';
+import type * as http from 'node:http';
 import { LoggingLevel } from '@modelcontextprotocol/sdk/types.js';
 import { MastraBase } from '@mastra/core/base';
+import { MCPServerBase } from '@mastra/core/mcp';
+import type { MCPServerSSEOptions } from '@mastra/core/mcp';
 import type { Protocol } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import type { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
 import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import type { StreamableHTTPClientTransportOptions } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import type { StreamableHTTPServerTransportOptions } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { Tool } from '@mastra/core/tools';
 import { ToolExecutionContext } from '@mastra/core';
 import type { ToolsInput } from '@mastra/core/agent';
@@ -19,14 +25,6 @@ declare type BaseServerOptions = {
     enableServerLogs?: boolean;
 };
 
-declare type ConvertedTool = {
-    name: string;
-    description?: string;
-    inputSchema: any;
-    zodSchema: z.ZodTypeAny;
-    execute: any;
-};
-
 export declare function createLogger(server?: Server): Logger;
 
 declare type HttpServerDefinition = BaseServerOptions & {
@@ -131,6 +129,17 @@ declare class MCPClient extends MastraBase {
     disconnect(): Promise<void>;
     getTools(): Promise<Record<string, any>>;
     getToolsets(): Promise<Record<string, Record<string, any>>>;
+    /**
+     * Get all resources from connected MCP servers
+     * @returns A record of server names to their resources
+     */
+    getResources(): Promise<Record<string, {
+        [x: string]: unknown;
+        name: string;
+        uri: string;
+        mimeType?: string | undefined;
+        description?: string | undefined;
+    }[]>>;
     /**
      * Get the current session IDs for all connected MCP clients using the Streamable HTTP transport.
      * Returns an object mapping server names to their session IDs.
@@ -138,6 +147,11 @@ declare class MCPClient extends MastraBase {
     get sessionIds(): Record<string, string>;
     private getConnectedClient;
     private eachClientTools;
+    /**
+     * Helper method to iterate through each connected MCP client and retrieve resources
+     * @param cb Callback function to process resources from each server
+     */
+    private eachClientResources;
 }
 export { MCPClient }
 export { MCPClient as MCPClient_alias_1 }
@@ -170,11 +184,11 @@ declare interface MCPConfigurationOptions {
 export { MCPConfigurationOptions }
 export { MCPConfigurationOptions as MCPConfigurationOptions_alias_1 }
 
-declare class MCPServer {
+declare class MCPServer extends MCPServerBase {
     private server;
-    private convertedTools;
     private stdioTransport?;
     private sseTransport?;
+    private streamableHTTPTransport?;
     /**
      * Get the current stdio transport.
      */
@@ -184,9 +198,9 @@ declare class MCPServer {
      */
     getSseTransport(): SSEServerTransport | undefined;
     /**
-     * Get a read-only view of the registered tools (for testing/introspection).
+     * Get the current streamable HTTP transport.
      */
-    tools(): Readonly<Record<string, ConvertedTool>>;
+    getStreamableHTTPTransport(): StreamableHTTPServerTransport | undefined;
     /**
      * Construct a new MCPServer instance.
      * @param opts.name - Server name
@@ -203,7 +217,7 @@ declare class MCPServer {
      * @param tools Tool definitions
      * @returns Converted tools registry
      */
-    private convertTools;
+    convertTools(tools: ToolsInput): Record<string, ConvertedTool>;
     /**
      * Register the ListTools handler for listing all available tools.
      */
@@ -226,13 +240,33 @@ declare class MCPServer {
      * @param req Incoming HTTP request
      * @param res HTTP response (must support .write/.end)
      */
-    startSSE({ url, ssePath, messagePath, req, res, }: {
+    startSSE({ url, ssePath, messagePath, req, res }: MCPServerSSEOptions): Promise<void>;
+    /**
+     * Handles MCP-over-StreamableHTTP protocol for user-provided HTTP servers.
+     * Call this from your HTTP server for the streamable HTTP endpoint.
+     *
+     * @param url Parsed URL of the incoming request
+     * @param httpPath Path for establishing the streamable HTTP connection (e.g. '/mcp')
+     * @param req Incoming HTTP request
+     * @param res HTTP response (must support .write/.end)
+     * @param options Optional options to pass to the transport (e.g. sessionIdGenerator)
+     */
+    startHTTP({ url, httpPath, req, res, options, }: {
         url: URL;
-        ssePath: string;
+        httpPath: string;
+        req: http.IncomingMessage;
+        res: http.ServerResponse<http.IncomingMessage>;
+        options?: StreamableHTTPServerTransportOptions;
+    }): Promise<void>;
+    handlePostMessage(req: http.IncomingMessage, res: http.ServerResponse<http.IncomingMessage>): Promise<void>;
+    connectSSE({ messagePath, res, }: {
         messagePath: string;
-        req: any;
-        res: any;
+        res: http.ServerResponse<http.IncomingMessage>;
     }): Promise<void>;
+    /**
+     * Close the MCP server and all its connections
+     */
+    close(): Promise<void>;
 }
 export { MCPServer }
 export { MCPServer as MCPServer_alias_1 }

package/dist/_tsup-dts-rollup.d.ts

@@ -1,12 +1,18 @@
 import type { ClientCapabilities } from '@modelcontextprotocol/sdk/types.js';
+import type { ConvertedTool } from '@mastra/core/mcp';
+import type * as http from 'node:http';
 import { LoggingLevel } from '@modelcontextprotocol/sdk/types.js';
 import { MastraBase } from '@mastra/core/base';
+import { MCPServerBase } from '@mastra/core/mcp';
+import type { MCPServerSSEOptions } from '@mastra/core/mcp';
 import type { Protocol } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import type { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
 import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import type { StreamableHTTPClientTransportOptions } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import type { StreamableHTTPServerTransportOptions } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { Tool } from '@mastra/core/tools';
 import { ToolExecutionContext } from '@mastra/core';
 import type { ToolsInput } from '@mastra/core/agent';
@@ -19,14 +25,6 @@ declare type BaseServerOptions = {
     enableServerLogs?: boolean;
 };
 
-declare type ConvertedTool = {
-    name: string;
-    description?: string;
-    inputSchema: any;
-    zodSchema: z.ZodTypeAny;
-    execute: any;
-};
-
 export declare function createLogger(server?: Server): Logger;
 
 declare type HttpServerDefinition = BaseServerOptions & {
@@ -131,6 +129,17 @@ declare class MCPClient extends MastraBase {
     disconnect(): Promise<void>;
     getTools(): Promise<Record<string, any>>;
     getToolsets(): Promise<Record<string, Record<string, any>>>;
+    /**
+     * Get all resources from connected MCP servers
+     * @returns A record of server names to their resources
+     */
+    getResources(): Promise<Record<string, {
+        [x: string]: unknown;
+        name: string;
+        uri: string;
+        mimeType?: string | undefined;
+        description?: string | undefined;
+    }[]>>;
     /**
      * Get the current session IDs for all connected MCP clients using the Streamable HTTP transport.
      * Returns an object mapping server names to their session IDs.
@@ -138,6 +147,11 @@ declare class MCPClient extends MastraBase {
     get sessionIds(): Record<string, string>;
     private getConnectedClient;
     private eachClientTools;
+    /**
+     * Helper method to iterate through each connected MCP client and retrieve resources
+     * @param cb Callback function to process resources from each server
+     */
+    private eachClientResources;
 }
 export { MCPClient }
 export { MCPClient as MCPClient_alias_1 }
@@ -170,11 +184,11 @@ declare interface MCPConfigurationOptions {
 export { MCPConfigurationOptions }
 export { MCPConfigurationOptions as MCPConfigurationOptions_alias_1 }
 
-declare class MCPServer {
+declare class MCPServer extends MCPServerBase {
     private server;
-    private convertedTools;
     private stdioTransport?;
     private sseTransport?;
+    private streamableHTTPTransport?;
     /**
      * Get the current stdio transport.
      */
@@ -184,9 +198,9 @@ declare class MCPServer {
      */
     getSseTransport(): SSEServerTransport | undefined;
     /**
-     * Get a read-only view of the registered tools (for testing/introspection).
+     * Get the current streamable HTTP transport.
      */
-    tools(): Readonly<Record<string, ConvertedTool>>;
+    getStreamableHTTPTransport(): StreamableHTTPServerTransport | undefined;
     /**
      * Construct a new MCPServer instance.
      * @param opts.name - Server name
@@ -203,7 +217,7 @@ declare class MCPServer {
      * @param tools Tool definitions
      * @returns Converted tools registry
      */
-    private convertTools;
+    convertTools(tools: ToolsInput): Record<string, ConvertedTool>;
     /**
      * Register the ListTools handler for listing all available tools.
      */
@@ -226,13 +240,33 @@ declare class MCPServer {
      * @param req Incoming HTTP request
      * @param res HTTP response (must support .write/.end)
      */
-    startSSE({ url, ssePath, messagePath, req, res, }: {
+    startSSE({ url, ssePath, messagePath, req, res }: MCPServerSSEOptions): Promise<void>;
+    /**
+     * Handles MCP-over-StreamableHTTP protocol for user-provided HTTP servers.
+     * Call this from your HTTP server for the streamable HTTP endpoint.
+     *
+     * @param url Parsed URL of the incoming request
+     * @param httpPath Path for establishing the streamable HTTP connection (e.g. '/mcp')
+     * @param req Incoming HTTP request
+     * @param res HTTP response (must support .write/.end)
+     * @param options Optional options to pass to the transport (e.g. sessionIdGenerator)
+     */
+    startHTTP({ url, httpPath, req, res, options, }: {
         url: URL;
-        ssePath: string;
+        httpPath: string;
+        req: http.IncomingMessage;
+        res: http.ServerResponse<http.IncomingMessage>;
+        options?: StreamableHTTPServerTransportOptions;
+    }): Promise<void>;
+    handlePostMessage(req: http.IncomingMessage, res: http.ServerResponse<http.IncomingMessage>): Promise<void>;
+    connectSSE({ messagePath, res, }: {
         messagePath: string;
-        req: any;
-        res: any;
+        res: http.ServerResponse<http.IncomingMessage>;
     }): Promise<void>;
+    /**
+     * Close the MCP server and all its connections
+     */
+    close(): Promise<void>;
 }
 export { MCPServer }
 export { MCPServer as MCPServer_alias_1 }