@mastra/mcp 1.9.1 → 1.9.2-alpha.0

package/dist/index.js

@@ -2664,8 +2664,6 @@ var ServerResourceActions = class {
   getSubscriptions;
   getLogger;
   getSdkServer;
-  clearDefinedResources;
-  clearDefinedResourceTemplates;
   /**
    * @internal
    */
@@ -2673,8 +2671,6 @@ var ServerResourceActions = class {
     this.getSubscriptions = dependencies.getSubscriptions;
     this.getLogger = dependencies.getLogger;
     this.getSdkServer = dependencies.getSdkServer;
-    this.clearDefinedResources = dependencies.clearDefinedResources;
-    this.clearDefinedResourceTemplates = dependencies.clearDefinedResourceTemplates;
   }
   /**
    * Notifies subscribed clients that a specific resource has been updated.
@@ -2723,8 +2719,9 @@ var ServerResourceActions = class {
   /**
    * Notifies clients that the overall list of available resources has changed.
    *
-   * This clears the internal resource cache and sends a `notifications/resources/list_changed`
-   * message to all clients, prompting them to re-fetch the resource list.
+   * This sends a `notifications/resources/list_changed` message to all clients, prompting
+   * them to re-fetch the resource list. Resource lists and templates are always evaluated
+   * per request, so there is no server-side cache to clear.
    *
    * @throws {MastraError} If sending the notification fails
    *
@@ -2735,11 +2732,7 @@ var ServerResourceActions = class {
    * ```
    */
   async notifyListChanged() {
-    this.getLogger().info(
-      "Resource list change externally notified. Clearing definedResources and sending notification."
-    );
-    this.clearDefinedResources();
-    this.clearDefinedResourceTemplates();
+    this.getLogger().info("Resource list change externally notified. Sending notification.");
     try {
       await this.getSdkServer().sendResourceListChanged();
     } catch (error) {
@@ -2770,9 +2763,11 @@ var MCPServer = class extends MCPServerBase {
   streamableHTTPTransports = /* @__PURE__ */ new Map();
   // Track server instances for each HTTP session
   httpServerInstances = /* @__PURE__ */ new Map();
-  definedResources;
-  definedResourceTemplates;
   resourceOptions;
+  // Whether any UI (`ui://`) app resources are configured. Captured at construction so
+  // per-request server instances can advertise the MCP Apps extension without relying on
+  // a shared, per-caller resource cache.
+  hasUiResources = false;
   definedPrompts;
   promptOptions;
   jsonSchemaValidator;
@@ -2913,6 +2908,7 @@ var MCPServer = class extends MCPServerBase {
   constructor(opts) {
     super(opts);
     this.resourceOptions = this.mergeAppResources(opts.resources, opts.appResources);
+    this.hasUiResources = !!opts.appResources && Object.keys(opts.appResources).length > 0;
     this.promptOptions = opts.prompts;
     this.jsonSchemaValidator = opts.jsonSchemaValidator;
     this.mapAuthInfoToUser = opts.mapAuthInfoToUser;
@@ -2958,13 +2954,7 @@ var MCPServer = class extends MCPServerBase {
     this.resources = new ServerResourceActions({
       getSubscriptions: () => this.subscriptions,
       getLogger: () => this.logger,
-      getSdkServer: () => this.server,
-      clearDefinedResources: () => {
-        this.definedResources = void 0;
-      },
-      clearDefinedResourceTemplates: () => {
-        this.definedResourceTemplates = void 0;
-      }
+      getSdkServer: () => this.server
     });
     this.prompts = new ServerPromptActions({
       getLogger: () => this.logger,
@@ -3123,14 +3113,11 @@ var MCPServer = class extends MCPServerBase {
     const hasUiTools = Object.values(this.convertedTools).some(
       (tool) => tool.mcp?._meta?.ui?.resourceUri
     );
-    if (hasUiTools || this.resourceOptions) {
-      const hasUiResources = this.definedResources?.some((r) => r.uri.startsWith("ui://"));
-      if (hasUiTools || hasUiResources) {
-        capabilities.extensions = {
-          ...capabilities.extensions,
-          "io.modelcontextprotocol/ui": {}
-        };
-      }
+    if (hasUiTools || this.hasUiResources) {
+      capabilities.extensions = {
+        ...capabilities.extensions,
+        "io.modelcontextprotocol/ui": {}
+      };
     }
     const serverInstance = new Server(
       {
@@ -3347,18 +3334,13 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
     if (!capturedResourceOptions) return;
     if (capturedResourceOptions.listResources) {
       serverInstance.setRequestHandler(ListResourcesRequestSchema, async (_request, extra) => {
-        if (this.definedResources) {
-          return { resources: this.definedResources };
-        } else {
-          try {
-            const resources = await capturedResourceOptions.listResources({ extra });
-            this.definedResources = resources;
-            this.logger.debug("Fetched and cached resources", { count: this.definedResources.length });
-            return { resources: this.definedResources };
-          } catch (error) {
-            this.logger.error("Error fetching resources", { error });
-            throw error;
-          }
+        try {
+          const resources = await capturedResourceOptions.listResources({ extra });
+          this.logger.debug("Fetched resources", { count: resources.length });
+          return { resources };
+        } catch (error) {
+          this.logger.error("Error fetching resources", { error });
+          throw error;
         }
       });
     }
@@ -3367,12 +3349,9 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
         const startTime = Date.now();
         const uri = request.params.uri;
         this.logger.debug("Handling ReadResource request", { uri });
-        if (!this.definedResources) {
-          const resources = await this.resourceOptions?.listResources?.({ extra });
-          if (!resources) throw new Error("Failed to load resources");
-          this.definedResources = resources;
-        }
-        const resource = this.definedResources?.find((r) => r.uri === uri);
+        const resources = await capturedResourceOptions.listResources?.({ extra });
+        if (!resources) throw new Error("Failed to load resources");
+        const resource = resources.find((r) => r.uri === uri);
         if (!resource) {
           this.logger.warn("Unknown resource URI requested", { uri });
           throw new Error(`Resource not found: ${uri}`);
@@ -3412,18 +3391,13 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
     }
     if (capturedResourceOptions.resourceTemplates) {
       serverInstance.setRequestHandler(ListResourceTemplatesRequestSchema, async (_request, extra) => {
-        if (this.definedResourceTemplates) {
-          return { resourceTemplates: this.definedResourceTemplates };
-        } else {
-          try {
-            const templates = await capturedResourceOptions.resourceTemplates({ extra });
-            this.definedResourceTemplates = templates;
-            this.logger.debug("Fetched and cached resource templates", { count: this.definedResourceTemplates.length });
-            return { resourceTemplates: this.definedResourceTemplates };
-          } catch (error) {
-            this.logger.error("Error fetching resource templates via resourceTemplates():", { error });
-            throw error;
-          }
+        try {
+          const templates = await capturedResourceOptions.resourceTemplates({ extra });
+          this.logger.debug("Fetched resource templates", { count: templates.length });
+          return { resourceTemplates: templates };
+        } catch (error) {
+          this.logger.error("Error fetching resource templates via resourceTemplates():", { error });
+          throw error;
         }
       });
     }
@@ -4747,11 +4721,7 @@ Provided arguments: ${JSON.stringify(args, null, 2)}`,
       return { resources: [] };
     }
     const extra = {};
-    if (this.definedResources) {
-      return { resources: this.definedResources };
-    }
     const resources = await this.resourceOptions.listResources({ extra });
-    this.definedResources = resources;
     return { resources };
   }
 };