@mastra/mcp 0.10.0 → 0.10.1

package/dist/index.js

@@ -1,19 +1,20 @@
 import { MastraBase } from '@mastra/core/base';
-import { createTool } from '@mastra/core/tools';
+import { createTool as createTool$1 } from '@mastra/core/tools';
 import { 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, ListResourcesResultSchema, CallToolResultSchema, JSONRPCMessageSchema } from '@modelcontextprotocol/sdk/types.js';
+import { ListToolsRequestSchema, CallToolRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ListResourceTemplatesRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, ListResourcesResultSchema, ReadResourceResultSchema, ListResourceTemplatesResultSchema, ResourceUpdatedNotificationSchema, ResourceListChangedNotificationSchema, 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';
 import equal from 'fast-deep-equal';
 import { v5 } from 'uuid';
-import { randomUUID } from 'crypto';
-import { makeCoreTool } from '@mastra/core';
+import { randomUUID } from 'node:crypto';
+import { createTool, makeCoreTool } from '@mastra/core';
+import { Agent } from '@mastra/core/agent';
 import { MCPServerBase } from '@mastra/core/mcp';
 import { RuntimeContext } from '@mastra/core/runtime-context';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
@@ -22,7 +23,110 @@ import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { streamSSE } from 'hono/streaming';
 
-// src/client.ts
+// src/client/client.ts
+var ResourceClientActions = class {
+  client;
+  logger;
+  constructor({ client, logger }) {
+    this.client = client;
+    this.logger = logger;
+  }
+  /**
+   * Get all resources from the connected MCP server.
+   * @returns A list of resources.
+   */
+  async list() {
+    try {
+      const response = await this.client.listResources();
+      if (response && response.resources && Array.isArray(response.resources)) {
+        return response.resources;
+      } else {
+        this.logger.warn(`Resources response from server ${this.client.name} did not have expected structure.`, {
+          response
+        });
+        return [];
+      }
+    } catch (e) {
+      if (e.code === ErrorCode.MethodNotFound) {
+        return [];
+      }
+      this.logger.error(`Error getting resources from server ${this.client.name}`, {
+        error: e instanceof Error ? e.message : String(e)
+      });
+      console.log("errorheere", e);
+      throw new Error(
+        `Failed to fetch resources from server ${this.client.name}: ${e instanceof Error ? e.stack || e.message : String(e)}`
+      );
+    }
+  }
+  /**
+   * Get all resource templates from the connected MCP server.
+   * @returns A list of resource templates.
+   */
+  async templates() {
+    try {
+      const response = await this.client.listResourceTemplates();
+      if (response && response.resourceTemplates && Array.isArray(response.resourceTemplates)) {
+        return response.resourceTemplates;
+      } else {
+        this.logger.warn(
+          `Resource templates response from server ${this.client.name} did not have expected structure.`,
+          { response }
+        );
+        return [];
+      }
+    } catch (e) {
+      console.log({ errorcooode: e.code });
+      if (e.code === ErrorCode.MethodNotFound) {
+        return [];
+      }
+      this.logger.error(`Error getting resource templates from server ${this.client.name}`, {
+        error: e instanceof Error ? e.message : String(e)
+      });
+      throw new Error(
+        `Failed to fetch resource templates from server ${this.client.name}: ${e instanceof Error ? e.stack || e.message : String(e)}`
+      );
+    }
+  }
+  /**
+   * Read a specific resource.
+   * @param uri The URI of the resource to read.
+   * @returns The resource content.
+   */
+  async read(uri) {
+    return this.client.readResource(uri);
+  }
+  /**
+   * Subscribe to a specific resource.
+   * @param uri The URI of the resource to subscribe to.
+   */
+  async subscribe(uri) {
+    return this.client.subscribeResource(uri);
+  }
+  /**
+   * Unsubscribe from a specific resource.
+   * @param uri The URI of the resource to unsubscribe from.
+   */
+  async unsubscribe(uri) {
+    return this.client.unsubscribeResource(uri);
+  }
+  /**
+   * Set a notification handler for when a specific resource is updated.
+   * @param handler The callback function to handle the notification.
+   */
+  async onUpdated(handler) {
+    this.client.setResourceUpdatedNotificationHandler(handler);
+  }
+  /**
+   * Set a notification handler for when the list of available resources changes.
+   * @param handler The callback function to handle the notification.
+   */
+  async onListChanged(handler) {
+    this.client.setResourceListChangedNotificationHandler(handler);
+  }
+};
+
+// src/client/client.ts
 function convertLogLevelToLoggerMethod(level) {
   switch (level) {
     case "debug":
@@ -50,6 +154,7 @@ var InternalMastraMCPClient = class extends MastraBase {
   serverConfig;
   transport;
   currentOperationContext = null;
+  resources;
   constructor({
     name,
     version = "1.0.0",
@@ -73,6 +178,7 @@ var InternalMastraMCPClient = class extends MastraBase {
       }
     );
     this.setupLogging();
+    this.resources = new ResourceClientActions({ client: this, logger: this.logger });
   }
   /**
    * Log a message at the specified level
@@ -226,13 +332,48 @@ var InternalMastraMCPClient = class extends MastraBase {
       this.isConnected = false;
     }
   }
-  // TODO: do the type magic to return the right method type. Right now we get infinitely deep infered type errors from Zod without using "any"
-  async resources() {
+  async listResources() {
     this.log("debug", `Requesting resources from MCP server`);
     return await this.client.request({ method: "resources/list" }, ListResourcesResultSchema, {
       timeout: this.timeout
     });
   }
+  async readResource(uri) {
+    this.log("debug", `Reading resource from MCP server: ${uri}`);
+    return await this.client.request({ method: "resources/read", params: { uri } }, ReadResourceResultSchema, {
+      timeout: this.timeout
+    });
+  }
+  async subscribeResource(uri) {
+    this.log("debug", `Subscribing to resource on MCP server: ${uri}`);
+    return await this.client.request({ method: "resources/subscribe", params: { uri } }, z.object({}), {
+      timeout: this.timeout
+    });
+  }
+  async unsubscribeResource(uri) {
+    this.log("debug", `Unsubscribing from resource on MCP server: ${uri}`);
+    return await this.client.request({ method: "resources/unsubscribe", params: { uri } }, z.object({}), {
+      timeout: this.timeout
+    });
+  }
+  async listResourceTemplates() {
+    this.log("debug", `Requesting resource templates from MCP server`);
+    return await this.client.request({ method: "resources/templates/list" }, ListResourceTemplatesResultSchema, {
+      timeout: this.timeout
+    });
+  }
+  setResourceUpdatedNotificationHandler(handler) {
+    this.log("debug", "Setting resource updated notification handler");
+    this.client.setNotificationHandler(ResourceUpdatedNotificationSchema, (notification) => {
+      handler(notification.params);
+    });
+  }
+  setResourceListChangedNotificationHandler(handler) {
+    this.log("debug", "Setting resource list changed notification handler");
+    this.client.setNotificationHandler(ResourceListChangedNotificationSchema, () => {
+      handler();
+    });
+  }
   convertInputSchema(inputSchema) {
     if (isZodType(inputSchema)) {
       return inputSchema;
@@ -264,7 +405,7 @@ var InternalMastraMCPClient = class extends MastraBase {
     tools.forEach((tool) => {
       this.log("debug", `Processing tool: ${tool.name}`);
       try {
-        const mastraTool = createTool({
+        const mastraTool = createTool$1({
           id: `${this.name}_${tool.name}`,
           description: tool.description || "",
           inputSchema: this.convertInputSchema(tool.inputSchema),
@@ -336,6 +477,7 @@ var MCPClient = class extends MastraBase {
         const existingInstance2 = mcpClientInstances.get(this.id);
         if (existingInstance2) {
           void existingInstance2.disconnect();
+          mcpClientInstances.delete(this.id);
         }
       }
     } else {
@@ -360,6 +502,55 @@ To fix this you have three different options:
     this.addToInstanceCache();
     return this;
   }
+  get resources() {
+    this.addToInstanceCache();
+    return {
+      list: async () => {
+        const allResources = {};
+        for (const serverName of Object.keys(this.serverConfigs)) {
+          try {
+            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 });
+          }
+        }
+        return allResources;
+      },
+      templates: async () => {
+        const allTemplates = {};
+        for (const serverName of Object.keys(this.serverConfigs)) {
+          try {
+            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 });
+          }
+        }
+        return allTemplates;
+      },
+      read: async (serverName, uri) => {
+        const internalClient = await this.getConnectedClientForServer(serverName);
+        return internalClient.resources.read(uri);
+      },
+      subscribe: async (serverName, uri) => {
+        const internalClient = await this.getConnectedClientForServer(serverName);
+        return internalClient.resources.subscribe(uri);
+      },
+      unsubscribe: async (serverName, uri) => {
+        const internalClient = await this.getConnectedClientForServer(serverName);
+        return internalClient.resources.unsubscribe(uri);
+      },
+      onUpdated: async (serverName, handler) => {
+        const internalClient = await this.getConnectedClientForServer(serverName);
+        return internalClient.resources.onUpdated(handler);
+      },
+      onListChanged: async (serverName, handler) => {
+        const internalClient = await this.getConnectedClientForServer(serverName);
+        return internalClient.resources.onListChanged(handler);
+      }
+    };
+  }
   addToInstanceCache() {
     if (!mcpClientInstances.has(this.id)) {
       mcpClientInstances.set(this.id, this);
@@ -406,18 +597,10 @@ To fix this you have three different options:
     return connectedToolsets;
   }
   /**
-   * Get all resources from connected MCP servers
-   * @returns A record of server names to their resources
+   * @deprecated all resource actions have been moved to the this.resources object. Use this.resources.list() instead.
    */
   async getResources() {
-    this.addToInstanceCache();
-    const connectedResources = {};
-    await this.eachClientResources(async ({ serverName, resources }) => {
-      if (resources && Array.isArray(resources)) {
-        connectedResources[serverName] = resources;
-      }
-    });
-    return connectedResources;
+    return this.resources.list();
   }
   /**
    * Get the current session IDs for all connected MCP clients using the Streamable HTTP transport.
@@ -466,6 +649,13 @@ To fix this you have three different options:
     this.logger.debug(`Connected to ${name} MCP server`);
     return mcpClient;
   }
+  async getConnectedClientForServer(serverName) {
+    const serverConfig = this.serverConfigs[serverName];
+    if (!serverConfig) {
+      throw new Error(`Server configuration not found for name: ${serverName}`);
+    }
+    return this.getConnectedClient(serverName, serverConfig);
+  }
   async eachClientTools(cb) {
     await Promise.all(
       Object.entries(this.serverConfigs).map(async ([serverName, serverConfig]) => {
@@ -475,27 +665,6 @@ To fix this you have three different options:
       })
     );
   }
-  /**
-   * Helper method to iterate through each connected MCP client and retrieve resources
-   * @param cb Callback function to process resources from each server
-   */
-  async eachClientResources(cb) {
-    await Promise.all(
-      Object.entries(this.serverConfigs).map(async ([serverName, serverConfig]) => {
-        try {
-          const client = await this.getConnectedClient(serverName, serverConfig);
-          const response = await client.resources();
-          if (response && "resources" in response && Array.isArray(response.resources)) {
-            await cb({ serverName, resources: response.resources, client });
-          }
-        } catch (e) {
-          this.logger.error(`Error getting resources from server ${serverName}`, {
-            error: e instanceof Error ? e.message : String(e)
-          });
-        }
-      })
-    );
-  }
 };
 var MCPConfiguration = class extends MCPClient {
   constructor(args) {
@@ -589,6 +758,58 @@ var SSETransport = class {
     });
   }
 };
+
+// src/server/resourceActions.ts
+var ServerResourceActions = class {
+  getSubscriptions;
+  getLogger;
+  getSdkServer;
+  clearDefinedResources;
+  clearDefinedResourceTemplates;
+  constructor(dependencies) {
+    this.getSubscriptions = dependencies.getSubscriptions;
+    this.getLogger = dependencies.getLogger;
+    this.getSdkServer = dependencies.getSdkServer;
+    this.clearDefinedResources = dependencies.clearDefinedResources;
+    this.clearDefinedResourceTemplates = dependencies.clearDefinedResourceTemplates;
+  }
+  /**
+   * Checks if any resources have been updated.
+   * If the resource is subscribed to by clients, an update notification will be sent.
+   */
+  async notifyUpdated({ uri }) {
+    if (this.getSubscriptions().has(uri)) {
+      this.getLogger().info(`Sending notifications/resources/updated for externally notified resource: ${uri}`);
+      try {
+        await this.getSdkServer().sendResourceUpdated({ uri });
+      } catch (error) {
+        this.getLogger().error("Failed to send resource updated notification:", { error });
+        throw error;
+      }
+    } else {
+      this.getLogger().debug(`Resource ${uri} was updated, but no active subscriptions for it.`);
+    }
+  }
+  /**
+   * Notifies the server that the overall list of available resources has changed.
+   * This will clear the internal cache of defined resources and send a list_changed notification to clients.
+   */
+  async notifyListChanged() {
+    this.getLogger().info(
+      "Resource list change externally notified. Clearing definedResources and sending notification."
+    );
+    this.clearDefinedResources();
+    this.clearDefinedResourceTemplates();
+    try {
+      await this.getSdkServer().sendResourceListChanged();
+    } catch (error) {
+      this.getLogger().error("Failed to send resource list changed notification:", { error });
+      throw error;
+    }
+  }
+};
+
+// src/server/server.ts
 var MCPServer = class extends MCPServerBase {
   server;
   stdioTransport;
@@ -597,6 +818,16 @@ var MCPServer = class extends MCPServerBase {
   streamableHTTPTransport;
   listToolsHandlerIsRegistered = false;
   callToolHandlerIsRegistered = false;
+  listResourcesHandlerIsRegistered = false;
+  readResourceHandlerIsRegistered = false;
+  listResourceTemplatesHandlerIsRegistered = false;
+  subscribeResourceHandlerIsRegistered = false;
+  unsubscribeResourceHandlerIsRegistered = false;
+  definedResources;
+  definedResourceTemplates;
+  resourceOptions;
+  subscriptions = /* @__PURE__ */ new Set();
+  resources;
   /**
    * Get the current stdio transport.
    */
@@ -627,24 +858,179 @@ var MCPServer = class extends MCPServerBase {
    */
   constructor(opts) {
     super(opts);
-    this.server = new Server(
-      { name: this.name, version: this.version },
-      { capabilities: { tools: {}, logging: { enabled: true } } }
-    );
+    this.resourceOptions = opts.resources;
+    const capabilities = {
+      tools: {},
+      logging: { enabled: true }
+    };
+    if (opts.resources) {
+      capabilities.resources = { subscribe: true, listChanged: true };
+    }
+    this.server = new Server({ name: this.name, version: this.version }, { capabilities });
     this.logger.info(
-      `Initialized MCPServer '${this.name}' v${this.version} (ID: ${this.id}) with tools: ${Object.keys(this.convertedTools).join(", ")}`
+      `Initialized MCPServer '${this.name}' v${this.version} (ID: ${this.id}) with tools: ${Object.keys(this.convertedTools).join(", ")} and resources. Capabilities: ${JSON.stringify(capabilities)}`
     );
     this.sseHonoTransports = /* @__PURE__ */ new Map();
     this.registerListToolsHandler();
     this.registerCallToolHandler();
+    if (opts.resources) {
+      this.registerListResourcesHandler();
+      this.registerReadResourceHandler({ getResourcesCallback: opts.resources.getResourceContent });
+      this.registerSubscribeResourceHandler();
+      this.registerUnsubscribeResourceHandler();
+      if (opts.resources.resourceTemplates) {
+        this.registerListResourceTemplatesHandler();
+      }
+    }
+    this.resources = new ServerResourceActions({
+      getSubscriptions: () => this.subscriptions,
+      getLogger: () => this.logger,
+      getSdkServer: () => this.server,
+      clearDefinedResources: () => {
+        this.definedResources = void 0;
+      },
+      clearDefinedResourceTemplates: () => {
+        this.definedResourceTemplates = void 0;
+      }
+    });
+  }
+  convertAgentsToTools(agentsConfig, definedConvertedTools) {
+    const agentTools = {};
+    if (!agentsConfig) {
+      return agentTools;
+    }
+    for (const agentKey in agentsConfig) {
+      const agent = agentsConfig[agentKey];
+      if (!agent || !(agent instanceof Agent)) {
+        this.logger.warn(`Agent instance for '${agentKey}' is invalid or missing a generate function. Skipping.`);
+        continue;
+      }
+      const agentDescription = agent.getDescription();
+      if (!agentDescription) {
+        throw new Error(
+          `Agent '${agent.name}' (key: '${agentKey}') must have a non-empty description to be used in an MCPServer.`
+        );
+      }
+      const agentToolName = `ask_${agentKey}`;
+      if (definedConvertedTools?.[agentToolName] || agentTools[agentToolName]) {
+        this.logger.warn(
+          `Tool with name '${agentToolName}' already exists. Agent '${agentKey}' will not be added as a duplicate tool.`
+        );
+        continue;
+      }
+      const agentToolDefinition = createTool({
+        id: agentToolName,
+        description: `Ask agent '${agent.name}' a question. Agent description: ${agentDescription}`,
+        inputSchema: z.object({
+          message: z.string().describe("The question or input for the agent.")
+        }),
+        execute: async ({ context, runtimeContext }) => {
+          this.logger.debug(
+            `Executing agent tool '${agentToolName}' for agent '${agent.name}' with message: "${context.message}"`
+          );
+          try {
+            const response = await agent.generate(context.message, { runtimeContext });
+            return response;
+          } catch (error) {
+            this.logger.error(`Error executing agent tool '${agentToolName}' for agent '${agent.name}':`, error);
+            throw error;
+          }
+        }
+      });
+      const options = {
+        name: agentToolName,
+        logger: this.logger,
+        mastra: this.mastra,
+        runtimeContext: new RuntimeContext(),
+        description: agentToolDefinition.description
+      };
+      const coreTool = makeCoreTool(agentToolDefinition, options);
+      agentTools[agentToolName] = {
+        name: agentToolName,
+        description: coreTool.description,
+        parameters: coreTool.parameters,
+        execute: coreTool.execute
+      };
+      this.logger.info(`Registered agent '${agent.name}' (key: '${agentKey}') as tool: '${agentToolName}'`);
+    }
+    return agentTools;
+  }
+  convertWorkflowsToTools(workflowsConfig, definedConvertedTools) {
+    const workflowTools = {};
+    if (!workflowsConfig) {
+      return workflowTools;
+    }
+    for (const workflowKey in workflowsConfig) {
+      const workflow = workflowsConfig[workflowKey];
+      if (!workflow || typeof workflow.createRun !== "function") {
+        this.logger.warn(
+          `Workflow instance for '${workflowKey}' is invalid or missing a createRun function. Skipping.`
+        );
+        continue;
+      }
+      const workflowDescription = workflow.description;
+      if (!workflowDescription) {
+        throw new Error(
+          `Workflow '${workflow.id}' (key: '${workflowKey}') must have a non-empty description to be used in an MCPServer.`
+        );
+      }
+      const workflowToolName = `run_${workflowKey}`;
+      if (definedConvertedTools?.[workflowToolName] || workflowTools[workflowToolName]) {
+        this.logger.warn(
+          `Tool with name '${workflowToolName}' already exists. Workflow '${workflowKey}' will not be added as a duplicate tool.`
+        );
+        continue;
+      }
+      const workflowToolDefinition = createTool({
+        id: workflowToolName,
+        description: `Run workflow '${workflowKey}'. Workflow description: ${workflowDescription}`,
+        inputSchema: workflow.inputSchema,
+        execute: async ({ context, runtimeContext }) => {
+          this.logger.debug(
+            `Executing workflow tool '${workflowToolName}' for workflow '${workflow.id}' with input:`,
+            context
+          );
+          try {
+            const run = workflow.createRun({ runId: runtimeContext?.get("runId") });
+            const response = await run.start({ inputData: context, runtimeContext });
+            return response;
+          } catch (error) {
+            this.logger.error(
+              `Error executing workflow tool '${workflowToolName}' for workflow '${workflow.id}':`,
+              error
+            );
+            throw error;
+          }
+        }
+      });
+      const options = {
+        name: workflowToolName,
+        logger: this.logger,
+        mastra: this.mastra,
+        runtimeContext: new RuntimeContext(),
+        description: workflowToolDefinition.description
+      };
+      const coreTool = makeCoreTool(workflowToolDefinition, options);
+      workflowTools[workflowToolName] = {
+        name: workflowToolName,
+        description: coreTool.description,
+        parameters: coreTool.parameters,
+        execute: coreTool.execute
+      };
+      this.logger.info(`Registered workflow '${workflow.id}' (key: '${workflowKey}') as tool: '${workflowToolName}'`);
+    }
+    return workflowTools;
   }
   /**
    * Convert and validate all provided tools, logging registration status.
+   * Also converts agents and workflows into tools.
    * @param tools Tool definitions
+   * @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
    */
-  convertTools(tools) {
-    const convertedTools = {};
+  convertTools(tools, agentsConfig, workflowsConfig) {
+    const definedConvertedTools = {};
     for (const toolName of Object.keys(tools)) {
       const toolInstance = tools[toolName];
       if (!toolInstance) {
@@ -663,16 +1049,26 @@ var MCPServer = class extends MCPServerBase {
         description: toolInstance?.description
       };
       const coreTool = makeCoreTool(toolInstance, options);
-      convertedTools[toolName] = {
+      definedConvertedTools[toolName] = {
         name: toolName,
         description: coreTool.description,
         parameters: coreTool.parameters,
         execute: coreTool.execute
       };
-      this.logger.info(`Registered tool: '${toolName}' [${toolInstance?.description || "No description"}]`);
+      this.logger.info(`Registered explicit tool: '${toolName}'`);
     }
-    this.logger.info(`Total tools registered: ${Object.keys(convertedTools).length}`);
-    return convertedTools;
+    this.logger.info(`Total defined tools registered: ${Object.keys(definedConvertedTools).length}`);
+    const agentDerivedTools = this.convertAgentsToTools(agentsConfig, definedConvertedTools);
+    const workflowDerivedTools = this.convertWorkflowsToTools(workflowsConfig, definedConvertedTools);
+    const allConvertedTools = { ...definedConvertedTools, ...agentDerivedTools, ...workflowDerivedTools };
+    const finalToolCount = Object.keys(allConvertedTools).length;
+    const definedCount = Object.keys(definedConvertedTools).length;
+    const fromAgentsCount = Object.keys(agentDerivedTools).length;
+    const fromWorkflowsCount = Object.keys(workflowDerivedTools).length;
+    this.logger.info(
+      `${finalToolCount} total tools registered (${definedCount} defined + ${fromAgentsCount} agents + ${fromWorkflowsCount} workflows)`
+    );
+    return allConvertedTools;
   }
   /**
    * Register the ListTools handler for listing all available tools.
@@ -768,6 +1164,159 @@ var MCPServer = class extends MCPServerBase {
       }
     });
   }
+  /**
+   * Register the ListResources handler for listing all available resources.
+   */
+  registerListResourcesHandler() {
+    if (this.listResourcesHandlerIsRegistered) {
+      return;
+    }
+    this.listResourcesHandlerIsRegistered = true;
+    const capturedResourceOptions = this.resourceOptions;
+    if (!capturedResourceOptions?.listResources) {
+      this.logger.warn("ListResources capability not supported by server configuration.");
+      return;
+    }
+    this.server.setRequestHandler(ListResourcesRequestSchema, async () => {
+      this.logger.debug("Handling ListResources request");
+      if (this.definedResources) {
+        return { resources: this.definedResources };
+      } else {
+        try {
+          const resources = await capturedResourceOptions.listResources();
+          this.definedResources = resources;
+          this.logger.debug(`Fetched and cached ${this.definedResources.length} resources.`);
+          return { resources: this.definedResources };
+        } catch (error) {
+          this.logger.error("Error fetching resources via listResources():", { error });
+          throw error;
+        }
+      }
+    });
+  }
+  /**
+   * Register the ReadResource handler for reading a resource by URI.
+   */
+  registerReadResourceHandler({
+    getResourcesCallback
+  }) {
+    if (this.readResourceHandlerIsRegistered) {
+      return;
+    }
+    this.readResourceHandlerIsRegistered = true;
+    this.server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
+      const startTime = Date.now();
+      const uri = request.params.uri;
+      this.logger.debug(`Handling ReadResource request for URI: ${uri}`);
+      if (!this.definedResources) {
+        const resources = await this.resourceOptions?.listResources?.();
+        if (!resources) throw new Error("Failed to load resources");
+        this.definedResources = resources;
+      }
+      const resource = this.definedResources?.find((r) => r.uri === uri);
+      if (!resource) {
+        this.logger.warn(`ReadResource: Unknown resource URI '${uri}' requested.`);
+        throw new Error(`Resource not found: ${uri}`);
+      }
+      try {
+        const resourcesOrResourceContent = await getResourcesCallback({ uri });
+        const resourcesContent = Array.isArray(resourcesOrResourceContent) ? resourcesOrResourceContent : [resourcesOrResourceContent];
+        const contents = resourcesContent.map((resourceContent) => {
+          const contentItem = {
+            uri: resource.uri,
+            mimeType: resource.mimeType
+          };
+          if ("text" in resourceContent) {
+            contentItem.text = resourceContent.text;
+          }
+          if ("blob" in resourceContent) {
+            contentItem.blob = resourceContent.blob;
+          }
+          return contentItem;
+        });
+        const duration = Date.now() - startTime;
+        this.logger.info(`Resource '${uri}' read successfully in ${duration}ms.`);
+        return {
+          contents
+        };
+      } catch (error) {
+        const duration = Date.now() - startTime;
+        this.logger.error(`Failed to get content for resource URI '${uri}' in ${duration}ms`, { error });
+        throw error;
+      }
+    });
+  }
+  /**
+   * Register the ListResourceTemplates handler.
+   */
+  registerListResourceTemplatesHandler() {
+    if (this.listResourceTemplatesHandlerIsRegistered) {
+      return;
+    }
+    if (!this.resourceOptions || typeof this.resourceOptions.resourceTemplates !== "function") {
+      this.logger.warn(
+        "ListResourceTemplates handler called, but resourceTemplates function is not available on resourceOptions or not a function."
+      );
+      this.server.setRequestHandler(ListResourceTemplatesRequestSchema, async () => {
+        this.logger.debug("Handling ListResourceTemplates request (no templates configured or resourceOptions issue)");
+        return { resourceTemplates: [] };
+      });
+      this.listResourceTemplatesHandlerIsRegistered = true;
+      return;
+    }
+    const resourceTemplatesFn = this.resourceOptions.resourceTemplates;
+    this.listResourceTemplatesHandlerIsRegistered = true;
+    this.server.setRequestHandler(ListResourceTemplatesRequestSchema, async () => {
+      this.logger.debug("Handling ListResourceTemplates request");
+      if (this.definedResourceTemplates) {
+        return { resourceTemplates: this.definedResourceTemplates };
+      } else {
+        try {
+          const templates = await resourceTemplatesFn();
+          this.definedResourceTemplates = templates;
+          this.logger.debug(`Fetched and cached ${this.definedResourceTemplates.length} resource templates.`);
+          return { resourceTemplates: this.definedResourceTemplates };
+        } catch (error) {
+          this.logger.error("Error fetching resource templates via resourceTemplates():", { error });
+          throw error;
+        }
+      }
+    });
+  }
+  /**
+   * Register the SubscribeResource handler.
+   */
+  registerSubscribeResourceHandler() {
+    if (this.subscribeResourceHandlerIsRegistered) {
+      return;
+    }
+    if (!SubscribeRequestSchema) {
+      this.logger.warn("SubscribeRequestSchema not available, cannot register SubscribeResource handler.");
+      return;
+    }
+    this.subscribeResourceHandlerIsRegistered = true;
+    this.server.setRequestHandler(SubscribeRequestSchema, async (request) => {
+      const uri = request.params.uri;
+      this.logger.info(`Received resources/subscribe request for URI: ${uri}`);
+      this.subscriptions.add(uri);
+      return {};
+    });
+  }
+  /**
+   * Register the UnsubscribeResource handler.
+   */
+  registerUnsubscribeResourceHandler() {
+    if (this.unsubscribeResourceHandlerIsRegistered) {
+      return;
+    }
+    this.unsubscribeResourceHandlerIsRegistered = true;
+    this.server.setRequestHandler(UnsubscribeRequestSchema, async (request) => {
+      const uri = request.params.uri;
+      this.logger.info(`Received resources/unsubscribe request for URI: ${uri}`);
+      this.subscriptions.delete(uri);
+      return {};
+    });
+  }
   /**
    * Start the MCP server using stdio transport (for Windsurf integration).
    */
@@ -934,6 +1483,11 @@ var MCPServer = class extends MCPServerBase {
   async close() {
     this.callToolHandlerIsRegistered = false;
     this.listToolsHandlerIsRegistered = false;
+    this.listResourcesHandlerIsRegistered = false;
+    this.readResourceHandlerIsRegistered = false;
+    this.listResourceTemplatesHandlerIsRegistered = false;
+    this.subscribeResourceHandlerIsRegistered = false;
+    this.unsubscribeResourceHandlerIsRegistered = false;
     try {
       if (this.stdioTransport) {
         await this.stdioTransport.close?.();