mcp-use 1.9.1-canary.1 → 1.10.0-canary.2

package/dist/src/server/index.cjs

@@ -456,7 +456,67 @@ function createLogMethod(sendNotification2, minLogLevel) {
     });
   };
 }
-function createEnhancedContext(baseContext, createMessage, elicitInput, progressToken, sendNotification2, minLogLevel) {
+function createClientCapabilityChecker(clientCapabilities) {
+  const caps = clientCapabilities || {};
+  return {
+    can(capability) {
+      return capability in caps;
+    },
+    capabilities() {
+      return { ...caps };
+    }
+  };
+}
+function createSendNotificationMethod(sessionId, sessions) {
+  if (!sessionId || !sessions) {
+    return void 0;
+  }
+  return async (method, params) => {
+    const session = sessions.get(sessionId);
+    if (!session?.sendNotification) {
+      console.warn(
+        `[MCP] Cannot send notification to session ${sessionId} - no sendNotification function`
+      );
+      return;
+    }
+    try {
+      await session.sendNotification({
+        method,
+        params: params || {}
+      });
+    } catch (error2) {
+      console.error(
+        `[MCP] Error sending notification to session ${sessionId}:`,
+        error2
+      );
+    }
+  };
+}
+function createSendNotificationToSessionMethod(sessions) {
+  if (!sessions) {
+    return void 0;
+  }
+  return async (sessionId, method, params) => {
+    const session = sessions.get(sessionId);
+    if (!session?.sendNotification) {
+      return false;
+    }
+    try {
+      await session.sendNotification({
+        method,
+        params: params || {}
+      });
+      return true;
+    } catch (error2) {
+      console.error(
+        `[MCP] Error sending notification to session ${sessionId}:`,
+        error2
+      );
+      return false;
+    }
+  };
+}
+function createEnhancedContext(baseContext, createMessage, elicitInput, progressToken, sendNotification2, minLogLevel, clientCapabilities, sessionId, sessions) {
   const enhancedContext = baseContext ? Object.create(baseContext) : {};
   enhancedContext.sample = createSampleMethod(
     createMessage,
@@ -469,6 +529,23 @@ function createEnhancedContext(baseContext, createMessage, elicitInput, progress
     sendNotification2
   );
   enhancedContext.log = createLogMethod(sendNotification2, minLogLevel);
+  enhancedContext.client = createClientCapabilityChecker(clientCapabilities);
+  if (sessionId) {
+    enhancedContext.session = {
+      sessionId
+    };
+  }
+  const sendNotificationMethod = createSendNotificationMethod(
+    sessionId,
+    sessions
+  );
+  if (sendNotificationMethod) {
+    enhancedContext.sendNotification = sendNotificationMethod;
+  }
+  const sendNotificationToSessionMethod = createSendNotificationToSessionMethod(sessions);
+  if (sendNotificationToSessionMethod) {
+    enhancedContext.sendNotificationToSession = sendNotificationToSessionMethod;
+  }
   return enhancedContext;
 }
 var import_zod_json_schema_compat, LOG_LEVELS, VALID_LOG_LEVELS;
@@ -508,6 +585,9 @@ var init_tool_execution_helpers = __esm({
     __name(isValidLogLevel, "isValidLogLevel");
     __name(shouldLogMessage, "shouldLogMessage");
     __name(createLogMethod, "createLogMethod");
+    __name(createClientCapabilityChecker, "createClientCapabilityChecker");
+    __name(createSendNotificationMethod, "createSendNotificationMethod");
+    __name(createSendNotificationToSessionMethod, "createSendNotificationToSessionMethod");
     __name(createEnhancedContext, "createEnhancedContext");
   }
 });
@@ -705,6 +785,7 @@ var init_conversion2 = __esm({
 // src/server/index.ts
 var server_exports = {};
 __export(server_exports, {
+  MCPServer: () => MCPServer,
   adaptConnectMiddleware: () => adaptConnectMiddleware,
   adaptMiddleware: () => adaptMiddleware,
   array: () => array,
@@ -2599,7 +2680,7 @@ function toolRegistration(toolDefinition, callback) {
       const initialRequestContext = getRequestContext();
       const extraProgressToken = extra?._meta?.progressToken;
       const extraSendNotification = extra?.sendNotification;
-      const { requestContext, progressToken, sendNotification: sendNotification2 } = findSessionContext(
+      const { requestContext, session, progressToken, sendNotification: sendNotification2 } = findSessionContext(
         this.sessions,
         initialRequestContext,
         extraProgressToken,
@@ -2610,7 +2691,9 @@ function toolRegistration(toolDefinition, callback) {
         this.createMessage.bind(this),
         this.server.server.elicitInput.bind(this.server.server),
         progressToken,
-        sendNotification2
+        sendNotification2,
+        session?.logLevel,
+        session?.clientCapabilities
       );
       const executeCallback = /* @__PURE__ */ __name(async () => {
         if (actualCallback.length >= 2) {
@@ -2839,24 +2922,25 @@ function registerResourceTemplate(resourceTemplateDefinition, callback) {
       `Resource template '${resourceTemplateDefinition.name}' must have either a readCallback property or a callback parameter`
     );
   }
-  const template = new import_mcp.ResourceTemplate(
-    resourceTemplateDefinition.resourceTemplate.uriTemplate,
-    {
-      list: void 0,
-      // Optional: callback to list all matching resources
-      complete: void 0
-      // Optional: callback for auto-completion
-    }
-  );
+  const isFlatStructure = "uriTemplate" in resourceTemplateDefinition;
+  const uriTemplate = isFlatStructure ? resourceTemplateDefinition.uriTemplate : resourceTemplateDefinition.resourceTemplate.uriTemplate;
+  const mimeType = isFlatStructure ? resourceTemplateDefinition.mimeType : resourceTemplateDefinition.resourceTemplate.mimeType;
+  const templateDescription = isFlatStructure ? void 0 : resourceTemplateDefinition.resourceTemplate.description;
+  const template = new import_mcp.ResourceTemplate(uriTemplate, {
+    list: void 0,
+    // Optional: callback to list all matching resources
+    complete: void 0
+    // Optional: callback for auto-completion
+  });
   const metadata = {};
   if (resourceTemplateDefinition.title) {
     metadata.title = resourceTemplateDefinition.title;
   }
-  if (resourceTemplateDefinition.description || resourceTemplateDefinition.resourceTemplate.description) {
-    metadata.description = resourceTemplateDefinition.description || resourceTemplateDefinition.resourceTemplate.description;
+  if (resourceTemplateDefinition.description || templateDescription) {
+    metadata.description = resourceTemplateDefinition.description || templateDescription;
   }
-  if (resourceTemplateDefinition.resourceTemplate.mimeType) {
-    metadata.mimeType = resourceTemplateDefinition.resourceTemplate.mimeType;
+  if (mimeType) {
+    metadata.mimeType = mimeType;
   }
   if (resourceTemplateDefinition.annotations) {
     metadata.annotations = resourceTemplateDefinition.annotations;
@@ -2866,10 +2950,7 @@ function registerResourceTemplate(resourceTemplateDefinition, callback) {
     template,
     metadata,
     async (uri) => {
-      const params = this.parseTemplateUri(
-        resourceTemplateDefinition.resourceTemplate.uriTemplate,
-        uri.toString()
-      );
+      const params = this.parseTemplateUri(uriTemplate, uri.toString());
       const { getRequestContext: getRequestContext2, runWithContext: runWithContext2 } = await Promise.resolve().then(() => (init_context_storage(), context_storage_exports));
       const { findSessionContext: findSessionContext2 } = await Promise.resolve().then(() => (init_tool_execution_helpers(), tool_execution_helpers_exports));
       const initialRequestContext = getRequestContext2();
@@ -2884,8 +2965,12 @@ function registerResourceTemplate(resourceTemplateDefinition, callback) {
       const executeCallback = /* @__PURE__ */ __name(async () => {
         if (actualCallback.length >= 3) {
           return await actualCallback(uri, params, enhancedContext);
+        } else if (actualCallback.length === 2) {
+          return await actualCallback(uri, params);
+        } else if (actualCallback.length === 1) {
+          return await actualCallback(uri);
         }
-        return await actualCallback(uri, params);
+        return await actualCallback();
       }, "executeCallback");
       const result = requestContext ? await runWithContext2(requestContext, executeCallback) : await executeCallback();
       if ("contents" in result && Array.isArray(result.contents)) {
@@ -3266,6 +3351,17 @@ async function mountMcp(app, mcpServerInstance, sessions, config, isProductionMo
           context: c,
           honoContext: c
         });
+        server.server.oninitialized = () => {
+          const clientCapabilities = server.server.getClientCapabilities();
+          if (clientCapabilities && sessions.has(sid)) {
+            const session = sessions.get(sid);
+            session.clientCapabilities = clientCapabilities;
+            console.log(
+              `[MCP] Captured client capabilities for session ${sid}:`,
+              Object.keys(clientCapabilities)
+            );
+          }
+        };
       }, "onsessioninitialized"),
       onsessionclosed: /* @__PURE__ */ __name((sid) => {
         console.log(`[MCP] Session closed: ${sid}`);
@@ -3562,9 +3658,9 @@ async function setupOAuthForServer(app, oauthProvider, baseUrl, state) {
 __name(setupOAuthForServer, "setupOAuthForServer");
 
 // src/server/mcp-server.ts
-var McpServer = class {
+var MCPServer = class {
   static {
-    __name(this, "McpServer");
+    __name(this, "MCPServer");
   }
   /**
    * Native MCP server instance from @modelcontextprotocol/sdk
@@ -3631,7 +3727,7 @@ var McpServer = class {
    * access to Hono methods while preserving MCP server functionality.
    *
    * @param config - Server configuration including name, version, and description
-   * @returns A proxied McpServer instance that supports both MCP and Hono methods
+   * @returns A proxied MCPServer instance that supports both MCP and Hono methods
    */
   constructor(config) {
     this.config = config;
@@ -3737,6 +3833,15 @@ var McpServer = class {
           extraProgressToken,
           extraSendNotification
         );
+        let sessionId;
+        if (session) {
+          for (const [id, s] of this.sessions.entries()) {
+            if (s === session) {
+              sessionId = id;
+              break;
+            }
+          }
+        }
         const createMessageWithLogging = /* @__PURE__ */ __name(async (params2, options) => {
           console.log("[createMessage] About to call server.createMessage");
           console.log("[createMessage] Has server:", !!newServer);
@@ -3763,7 +3868,10 @@ var McpServer = class {
           newServer.server.elicitInput.bind(newServer.server),
           progressToken,
           sendNotification2,
-          session?.logLevel
+          session?.logLevel,
+          session?.clientCapabilities,
+          sessionId,
+          this.sessions
         );
         const executeCallback = /* @__PURE__ */ __name(async () => {
           if (actualCallback.length >= 2) {
@@ -3839,22 +3947,23 @@ var McpServer = class {
     }
     for (const [_name, recipe] of this.registrationRecipes.resourceTemplates) {
       const { config, handler } = recipe;
-      const template = new import_mcp2.ResourceTemplate(
-        config.resourceTemplate.uriTemplate,
-        {
-          list: void 0,
-          complete: void 0
-        }
-      );
+      const isFlatStructure = "uriTemplate" in config;
+      const uriTemplate = isFlatStructure ? config.uriTemplate : config.resourceTemplate.uriTemplate;
+      const mimeType = isFlatStructure ? config.mimeType : config.resourceTemplate.mimeType;
+      const templateDescription = isFlatStructure ? void 0 : config.resourceTemplate.description;
+      const template = new import_mcp2.ResourceTemplate(uriTemplate, {
+        list: void 0,
+        complete: void 0
+      });
       const metadata = {};
       if (config.title) {
         metadata.title = config.title;
       }
-      if (config.description || config.resourceTemplate.description) {
-        metadata.description = config.description || config.resourceTemplate.description;
+      if (config.description || templateDescription) {
+        metadata.description = config.description || templateDescription;
       }
-      if (config.resourceTemplate.mimeType) {
-        metadata.mimeType = config.resourceTemplate.mimeType;
+      if (mimeType) {
+        metadata.mimeType = mimeType;
       }
       if (config.annotations) {
         metadata.annotations = config.annotations;
@@ -3864,10 +3973,7 @@ var McpServer = class {
         template,
         metadata,
         async (uri) => {
-          const params = this.parseTemplateUri(
-            config.resourceTemplate.uriTemplate,
-            uri.toString()
-          );
+          const params = this.parseTemplateUri(uriTemplate, uri.toString());
           const result = await handler(uri, params);
           if ("contents" in result && Array.isArray(result.contents)) {
             return result;
@@ -3993,7 +4099,7 @@ var McpServer = class {
     const result = await mountMcp(
       this.app,
       this,
-      // Pass the McpServer instance so mountMcp can call getServerForSession()
+      // Pass the MCPServer instance so mountMcp can call getServerForSession()
       this.sessions,
       this.config,
       isProductionMode()
@@ -4093,7 +4199,7 @@ var McpServer = class {
    * @example
    * ```typescript
    * // For Supabase Edge Functions (handles path rewriting automatically)
-   * const server = createMCPServer('my-server');
+   * const server = new MCPServer({ name: 'my-server', version: '1.0.0' });
    * server.tool({ ... });
    * const handler = await server.getHandler({ provider: 'supabase' });
    * Deno.serve(handler);
@@ -4102,7 +4208,7 @@ var McpServer = class {
    * @example
    * ```typescript
    * // For Cloudflare Workers
-   * const server = createMCPServer('my-server');
+   * const server = new MCPServer({ name: 'my-server', version: '1.0.0' });
    * server.tool({ ... });
    * const handler = await server.getHandler();
    * export default { fetch: handler };
@@ -4180,7 +4286,7 @@ var McpServer = class {
   }
 };
 function createMCPServer(name, config = {}) {
-  const instance = new McpServer({
+  const instance = new MCPServer({
     name,
     version: config.version || "1.0.0",
     description: config.description,

package/dist/src/server/index.d.ts

@@ -1,4 +1,4 @@
-export { createMCPServer, type McpServerInstance } from "./mcp-server.js";
+export { MCPServer, createMCPServer, type McpServerInstance, } from "./mcp-server.js";
 export type { ToolContext, SampleOptions, ElicitOptions, ElicitFormParams, ElicitUrlParams, } from "./types/tool-context.js";
 export * from "./types/index.js";
 export { getRequestContext, runWithContext, hasRequestContext, } from "./context-storage.js";
@@ -6,5 +6,5 @@ export { text, image, resource, error, object, array, widget, mix, audio, html,
 export { getAuth, hasScope, hasAnyScope, requireScope, requireAnyScope, oauthSupabaseProvider, oauthAuth0Provider, oauthKeycloakProvider, oauthWorkOSProvider, oauthCustomProvider, type AuthInfo, type OAuthProvider, type UserInfo, type SupabaseProviderConfig, type Auth0ProviderConfig, type KeycloakProviderConfig, type WorkOSProviderConfig, type CustomProviderConfig, } from "./oauth/index.js";
 export { buildWidgetUrl, createExternalUrlResource, createRawHtmlResource, createRemoteDomResource, createUIResourceFromDefinition, type UrlConfig, } from "./widgets/mcp-ui-adapter.js";
 export { adaptConnectMiddleware, adaptMiddleware, isExpressMiddleware, } from "./connect-adapter.js";
-export type { DiscoverWidgetsOptions, ExternalUrlUIResource, InputDefinition, McpContext, PromptCallback, PromptDefinition, RawHtmlUIResource, ReadResourceCallback, ReadResourceTemplateCallback, RemoteDomUIResource, ResourceDefinition, ServerConfig, ToolCallback, ToolDefinition, UIResourceDefinition, WidgetConfig, WidgetManifest, WidgetProps, } from "./types/index.js";
+export type { DiscoverWidgetsOptions, ExternalUrlUIResource, InputDefinition, McpContext, PromptCallback, PromptDefinition, RawHtmlUIResource, ReadResourceCallback, ReadResourceTemplateCallback, RemoteDomUIResource, ResourceDefinition, ServerConfig, ToolCallback, ToolDefinition, UIResourceDefinition, WidgetConfig, WidgetManifest, WidgetProps, ToolAnnotations, GetPromptResult, PromptResult, } from "./types/index.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAG1E,YAAY,EACV,WAAW,EACX,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,GAChB,MAAM,yBAAyB,CAAC;AAEjC,cAAc,kBAAkB,CAAC;AAGjC,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,KAAK,EACL,MAAM,EACN,KAAK,EACL,MAAM,EACN,GAAG,EACH,KAAK,EAEL,IAAI,EACJ,QAAQ,EACR,GAAG,EACH,GAAG,EACH,UAAU,EACV,MAAM,EACN,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,GACzB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,OAAO,EACP,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,eAAe,EACf,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,mBAAmB,EACnB,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,GAC1B,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,cAAc,EACd,yBAAyB,EACzB,qBAAqB,EACrB,uBAAuB,EACvB,8BAA8B,EAC9B,KAAK,SAAS,GACf,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAE9B,YAAY,EACV,sBAAsB,EACtB,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,oBAAoB,EACpB,4BAA4B,EAC5B,mBAAmB,EACnB,kBAAkB,EAClB,YAAY,EACZ,YAAY,EACZ,cAAc,EAEd,oBAAoB,EACpB,YAAY,EACZ,cAAc,EACd,WAAW,GACZ,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,eAAe,EACf,KAAK,iBAAiB,GACvB,MAAM,iBAAiB,CAAC;AAGzB,YAAY,EACV,WAAW,EACX,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,GAChB,MAAM,yBAAyB,CAAC;AAEjC,cAAc,kBAAkB,CAAC;AAGjC,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,KAAK,EACL,MAAM,EACN,KAAK,EACL,MAAM,EACN,GAAG,EACH,KAAK,EAEL,IAAI,EACJ,QAAQ,EACR,GAAG,EACH,GAAG,EACH,UAAU,EACV,MAAM,EACN,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,GACzB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,OAAO,EACP,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,eAAe,EACf,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,mBAAmB,EACnB,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,GAC1B,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,cAAc,EACd,yBAAyB,EACzB,qBAAqB,EACrB,uBAAuB,EACvB,8BAA8B,EAC9B,KAAK,SAAS,GACf,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAE9B,YAAY,EACV,sBAAsB,EACtB,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,oBAAoB,EACpB,4BAA4B,EAC5B,mBAAmB,EACnB,kBAAkB,EAClB,YAAY,EACZ,YAAY,EACZ,cAAc,EAEd,oBAAoB,EACpB,YAAY,EACZ,cAAc,EACd,WAAW,EAEX,eAAe,EACf,eAAe,EACf,YAAY,GACb,MAAM,kBAAkB,CAAC"}

package/dist/src/server/index.js

@@ -7,7 +7,7 @@ import {
   createEnhancedContext,
   findSessionContext,
   isValidLogLevel
-} from "../../chunk-33U4IA4N.js";
+} from "../../chunk-Q3PFK7Y4.js";
 import {
   convertToolResultToResourceResult
 } from "../../chunk-362PI25Z.js";
@@ -1867,7 +1867,7 @@ function toolRegistration(toolDefinition, callback) {
       const initialRequestContext = getRequestContext();
       const extraProgressToken = extra?._meta?.progressToken;
       const extraSendNotification = extra?.sendNotification;
-      const { requestContext, progressToken, sendNotification: sendNotification2 } = findSessionContext(
+      const { requestContext, session, progressToken, sendNotification: sendNotification2 } = findSessionContext(
         this.sessions,
         initialRequestContext,
         extraProgressToken,
@@ -1878,7 +1878,9 @@ function toolRegistration(toolDefinition, callback) {
         this.createMessage.bind(this),
         this.server.server.elicitInput.bind(this.server.server),
         progressToken,
-        sendNotification2
+        sendNotification2,
+        session?.logLevel,
+        session?.clientCapabilities
       );
       const executeCallback = /* @__PURE__ */ __name(async () => {
         if (actualCallback.length >= 2) {
@@ -2057,7 +2059,7 @@ function registerResource(resourceDefinition, callback) {
   const explicitMimeType = resourceDefinition.mimeType;
   const wrappedCallback = /* @__PURE__ */ __name(async () => {
     const { getRequestContext: getRequestContext2, runWithContext: runWithContext2 } = await import("../../context-storage-NA4MHWOZ.js");
-    const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-BQJTPWPN.js");
+    const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-RRMGLAHR.js");
     const initialRequestContext = getRequestContext2();
     const sessions = this.sessions || /* @__PURE__ */ new Map();
     const { requestContext } = findSessionContext2(
@@ -2105,24 +2107,25 @@ function registerResourceTemplate(resourceTemplateDefinition, callback) {
       `Resource template '${resourceTemplateDefinition.name}' must have either a readCallback property or a callback parameter`
     );
   }
-  const template = new ResourceTemplate(
-    resourceTemplateDefinition.resourceTemplate.uriTemplate,
-    {
-      list: void 0,
-      // Optional: callback to list all matching resources
-      complete: void 0
-      // Optional: callback for auto-completion
-    }
-  );
+  const isFlatStructure = "uriTemplate" in resourceTemplateDefinition;
+  const uriTemplate = isFlatStructure ? resourceTemplateDefinition.uriTemplate : resourceTemplateDefinition.resourceTemplate.uriTemplate;
+  const mimeType = isFlatStructure ? resourceTemplateDefinition.mimeType : resourceTemplateDefinition.resourceTemplate.mimeType;
+  const templateDescription = isFlatStructure ? void 0 : resourceTemplateDefinition.resourceTemplate.description;
+  const template = new ResourceTemplate(uriTemplate, {
+    list: void 0,
+    // Optional: callback to list all matching resources
+    complete: void 0
+    // Optional: callback for auto-completion
+  });
   const metadata = {};
   if (resourceTemplateDefinition.title) {
     metadata.title = resourceTemplateDefinition.title;
   }
-  if (resourceTemplateDefinition.description || resourceTemplateDefinition.resourceTemplate.description) {
-    metadata.description = resourceTemplateDefinition.description || resourceTemplateDefinition.resourceTemplate.description;
+  if (resourceTemplateDefinition.description || templateDescription) {
+    metadata.description = resourceTemplateDefinition.description || templateDescription;
   }
-  if (resourceTemplateDefinition.resourceTemplate.mimeType) {
-    metadata.mimeType = resourceTemplateDefinition.resourceTemplate.mimeType;
+  if (mimeType) {
+    metadata.mimeType = mimeType;
   }
   if (resourceTemplateDefinition.annotations) {
     metadata.annotations = resourceTemplateDefinition.annotations;
@@ -2132,12 +2135,9 @@ function registerResourceTemplate(resourceTemplateDefinition, callback) {
     template,
     metadata,
     async (uri) => {
-      const params = this.parseTemplateUri(
-        resourceTemplateDefinition.resourceTemplate.uriTemplate,
-        uri.toString()
-      );
+      const params = this.parseTemplateUri(uriTemplate, uri.toString());
       const { getRequestContext: getRequestContext2, runWithContext: runWithContext2 } = await import("../../context-storage-NA4MHWOZ.js");
-      const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-BQJTPWPN.js");
+      const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-RRMGLAHR.js");
       const initialRequestContext = getRequestContext2();
       const sessions = this.sessions || /* @__PURE__ */ new Map();
       const { requestContext } = findSessionContext2(
@@ -2150,8 +2150,12 @@ function registerResourceTemplate(resourceTemplateDefinition, callback) {
       const executeCallback = /* @__PURE__ */ __name(async () => {
         if (actualCallback.length >= 3) {
           return await actualCallback(uri, params, enhancedContext);
+        } else if (actualCallback.length === 2) {
+          return await actualCallback(uri, params);
+        } else if (actualCallback.length === 1) {
+          return await actualCallback(uri);
         }
-        return await actualCallback(uri, params);
+        return await actualCallback();
       }, "executeCallback");
       const result = requestContext ? await runWithContext2(requestContext, executeCallback) : await executeCallback();
       if ("contents" in result && Array.isArray(result.contents)) {
@@ -2188,7 +2192,7 @@ function registerPrompt(promptDefinition, callback) {
   }
   const wrappedCallback = /* @__PURE__ */ __name(async (params, extra) => {
     const { getRequestContext: getRequestContext2, runWithContext: runWithContext2 } = await import("../../context-storage-NA4MHWOZ.js");
-    const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-BQJTPWPN.js");
+    const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-RRMGLAHR.js");
     const initialRequestContext = getRequestContext2();
     const sessions = this.sessions || /* @__PURE__ */ new Map();
     const { requestContext } = findSessionContext2(
@@ -2522,6 +2526,17 @@ async function mountMcp(app, mcpServerInstance, sessions, config, isProductionMo
           context: c,
           honoContext: c
         });
+        server.server.oninitialized = () => {
+          const clientCapabilities = server.server.getClientCapabilities();
+          if (clientCapabilities && sessions.has(sid)) {
+            const session = sessions.get(sid);
+            session.clientCapabilities = clientCapabilities;
+            console.log(
+              `[MCP] Captured client capabilities for session ${sid}:`,
+              Object.keys(clientCapabilities)
+            );
+          }
+        };
       }, "onsessioninitialized"),
       onsessionclosed: /* @__PURE__ */ __name((sid) => {
         console.log(`[MCP] Session closed: ${sid}`);
@@ -2818,9 +2833,9 @@ async function setupOAuthForServer(app, oauthProvider, baseUrl, state) {
 __name(setupOAuthForServer, "setupOAuthForServer");
 
 // src/server/mcp-server.ts
-var McpServer = class {
+var MCPServer = class {
   static {
-    __name(this, "McpServer");
+    __name(this, "MCPServer");
   }
   /**
    * Native MCP server instance from @modelcontextprotocol/sdk
@@ -2887,7 +2902,7 @@ var McpServer = class {
    * access to Hono methods while preserving MCP server functionality.
    *
    * @param config - Server configuration including name, version, and description
-   * @returns A proxied McpServer instance that supports both MCP and Hono methods
+   * @returns A proxied MCPServer instance that supports both MCP and Hono methods
    */
   constructor(config) {
     this.config = config;
@@ -2993,6 +3008,15 @@ var McpServer = class {
           extraProgressToken,
           extraSendNotification
         );
+        let sessionId;
+        if (session) {
+          for (const [id, s] of this.sessions.entries()) {
+            if (s === session) {
+              sessionId = id;
+              break;
+            }
+          }
+        }
         const createMessageWithLogging = /* @__PURE__ */ __name(async (params2, options) => {
           console.log("[createMessage] About to call server.createMessage");
           console.log("[createMessage] Has server:", !!newServer);
@@ -3019,7 +3043,10 @@ var McpServer = class {
           newServer.server.elicitInput.bind(newServer.server),
           progressToken,
           sendNotification2,
-          session?.logLevel
+          session?.logLevel,
+          session?.clientCapabilities,
+          sessionId,
+          this.sessions
         );
         const executeCallback = /* @__PURE__ */ __name(async () => {
           if (actualCallback.length >= 2) {
@@ -3095,22 +3122,23 @@ var McpServer = class {
     }
     for (const [_name, recipe] of this.registrationRecipes.resourceTemplates) {
       const { config, handler } = recipe;
-      const template = new ResourceTemplate2(
-        config.resourceTemplate.uriTemplate,
-        {
-          list: void 0,
-          complete: void 0
-        }
-      );
+      const isFlatStructure = "uriTemplate" in config;
+      const uriTemplate = isFlatStructure ? config.uriTemplate : config.resourceTemplate.uriTemplate;
+      const mimeType = isFlatStructure ? config.mimeType : config.resourceTemplate.mimeType;
+      const templateDescription = isFlatStructure ? void 0 : config.resourceTemplate.description;
+      const template = new ResourceTemplate2(uriTemplate, {
+        list: void 0,
+        complete: void 0
+      });
       const metadata = {};
       if (config.title) {
         metadata.title = config.title;
       }
-      if (config.description || config.resourceTemplate.description) {
-        metadata.description = config.description || config.resourceTemplate.description;
+      if (config.description || templateDescription) {
+        metadata.description = config.description || templateDescription;
       }
-      if (config.resourceTemplate.mimeType) {
-        metadata.mimeType = config.resourceTemplate.mimeType;
+      if (mimeType) {
+        metadata.mimeType = mimeType;
       }
       if (config.annotations) {
         metadata.annotations = config.annotations;
@@ -3120,10 +3148,7 @@ var McpServer = class {
         template,
         metadata,
         async (uri) => {
-          const params = this.parseTemplateUri(
-            config.resourceTemplate.uriTemplate,
-            uri.toString()
-          );
+          const params = this.parseTemplateUri(uriTemplate, uri.toString());
           const result = await handler(uri, params);
           if ("contents" in result && Array.isArray(result.contents)) {
             return result;
@@ -3249,7 +3274,7 @@ var McpServer = class {
     const result = await mountMcp(
       this.app,
       this,
-      // Pass the McpServer instance so mountMcp can call getServerForSession()
+      // Pass the MCPServer instance so mountMcp can call getServerForSession()
       this.sessions,
       this.config,
       isProductionMode()
@@ -3349,7 +3374,7 @@ var McpServer = class {
    * @example
    * ```typescript
    * // For Supabase Edge Functions (handles path rewriting automatically)
-   * const server = createMCPServer('my-server');
+   * const server = new MCPServer({ name: 'my-server', version: '1.0.0' });
    * server.tool({ ... });
    * const handler = await server.getHandler({ provider: 'supabase' });
    * Deno.serve(handler);
@@ -3358,7 +3383,7 @@ var McpServer = class {
    * @example
    * ```typescript
    * // For Cloudflare Workers
-   * const server = createMCPServer('my-server');
+   * const server = new MCPServer({ name: 'my-server', version: '1.0.0' });
    * server.tool({ ... });
    * const handler = await server.getHandler();
    * export default { fetch: handler };
@@ -3436,7 +3461,7 @@ var McpServer = class {
   }
 };
 function createMCPServer(name, config = {}) {
-  const instance = new McpServer({
+  const instance = new MCPServer({
     name,
     version: config.version || "1.0.0",
     description: config.description,
@@ -4039,6 +4064,7 @@ function requireAnyScope(needed) {
 }
 __name(requireAnyScope, "requireAnyScope");
 export {
+  MCPServer,
   adaptConnectMiddleware,
   adaptMiddleware,
   array,