@cloudinary/environment-config-mcp 0.6.2 → 0.6.3

package/src/landing-page.ts

@@ -12,13 +12,28 @@ import { toolNames } from "./tool-names.js";
 // Cloudflare-specific wrapper
 export function landingPage(req: Request): Response {
   const origin = new URL(req.url).origin;
-  return new Response(landingPageHTML(origin), {
+  return new Response(landingPageHTML(origin, "http", "cloudflare"), {
     headers: { "Content-Type": "text/html" },
   });
 }
 
 // express wrapper
 export function landingPageExpress(req: ExpressRequest, res: ExpressResponse) {
+  sendLandingPage(req, res, "sse");
+}
+
+export function landingPageExpressHTTP(
+  req: ExpressRequest,
+  res: ExpressResponse,
+) {
+  sendLandingPage(req, res, "http");
+}
+
+function sendLandingPage(
+  req: ExpressRequest,
+  res: ExpressResponse,
+  transport: "sse" | "http",
+) {
   const proto = req.get("x-forwarded-proto")?.split(",")[0]?.trim()
     || req.protocol;
   const host = req.get("host");
@@ -26,33 +41,71 @@ export function landingPageExpress(req: ExpressRequest, res: ExpressResponse) {
     res.status(400).send("Missing Host header");
     return;
   }
-  res.type("html").send(landingPageHTML(`${proto}://${host}`));
+  res.type("html").send(landingPageHTML(`${proto}://${host}`, transport));
 }
 
-export function landingPageHTML(origin: string): string {
+export function landingPageHTML(
+  origin: string,
+  transport: "sse" | "http" = "sse",
+  runtime: "node" | "cloudflare" = "node",
+): string {
   const o = origin;
+  const endpoint = transport === "sse" ? "sse" : "mcp";
+  const headers: Array<{ name: string; env: string }> = runtime === "cloudflare"
+    ? [{ "name": "x-cloudinary-auth", "env": "CLOUDINARY_AUTH" }, {
+      "name": "x-oauth2",
+      "env": "OAUTH2",
+    }]
+    : transport === "sse"
+    ? [{ "name": "api-key", "env": "API_KEY" }, {
+      "name": "api-secret",
+      "env": "API_SECRET",
+    }, { "name": "oauth2", "env": "OAUTH2" }]
+    : [
+      { "name": "api-key", "env": "API_KEY" },
+      { "name": "api-secret", "env": "API_SECRET" },
+      { "name": "oauth2", "env": "OAUTH2" },
+      { "name": "cloud-name", "env": "CLOUD_NAME" },
+      { "name": "region", "env": "REGION" },
+      { "name": "api-host", "env": "API_HOST" },
+    ];
   const mcpConfig = {
-    "command": "npx",
-    "args": [
+    command: "npx",
+    args: [
       "-y",
       "mcp-remote@0.1.25",
-      `${o}/sse`,
-      "--header",
-      "api-key:${API_KEY}",
-      "--header",
-      "api-secret:${API_SECRET}",
-      "--header",
-      "cloud-name:${CLOUD_NAME}",
+      `${o}/${endpoint}`,
+      ...headers.flatMap(({ name, env }) => ["--header", `${name}:\${${env}}`]),
     ],
-    "env": {
-      "API_KEY": "YOUR_VALUE_HERE",
-      "API_SECRET": "YOUR_VALUE_HERE",
-      "CLOUD_NAME": "YOUR_VALUE_HERE",
-    },
+    env: Object.fromEntries(headers.map(({ env }) => [env, "YOUR_VALUE_HERE"])),
   };
-  const codexConfig = `[mcp_servers.CloudinaryEnvConfig]
-url = "${o}/sse"
-http_headers = { "api-key" = "YOUR_API_KEY", "api-secret" = "YOUR_API_SECRET", "cloud-name" = "YOUR_CLOUD_NAME" }`;
+  const cliHeaders = headers.map(({ name }) => `--header "${name}: ..."`).join(
+    " ",
+  );
+  const codexConfig = transport === "sse"
+    ? `[mcp_servers.CloudinaryEnvConfig]
+command = ${JSON.stringify(mcpConfig.command)}
+args = ${JSON.stringify(mcpConfig.args)}
+env = { ${
+      Object.entries(mcpConfig.env).map(([name, value]) =>
+        `${JSON.stringify(name)} = ${JSON.stringify(value)}`
+      ).join(", ")
+    } }`
+    : `[mcp_servers.CloudinaryEnvConfig]
+url = ${JSON.stringify(`${o}/${endpoint}`)}
+http_headers = { ${
+      headers.map(({ name, env }) =>
+        `${JSON.stringify(name)} = ${JSON.stringify(`YOUR_${env}`)}`
+      ).join(", ")
+    } }`;
+  const encodedConfig = encodeURIComponent(
+    btoa(
+      Array.from(
+        new TextEncoder().encode(JSON.stringify(mcpConfig)),
+        byte => String.fromCharCode(byte),
+      ).join(""),
+    ),
+  );
 
   return `
 <!DOCTYPE html>
@@ -690,7 +743,7 @@ http_headers = { "api-key" = "YOUR_API_KEY", "api-secret" = "YOUR_API_SECRET", "
                   </svg>
                 </button>
                 <div class="popover-menu hidden" id="popover-menu">
-                  <a class="popover-button install-link" href="cursor://anysphere.cursor-deeplink/mcp/install?name=CloudinaryEnvConfig&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyJAY2xvdWRpbmFyeS9lbnZpcm9ubWVudC1jb25maWctbWNwIiwic3RhcnQiLCItLWFwaS1rZXkiLCIiLCItLWFwaS1zZWNyZXQiLCIiLCItLWNsb3VkLW5hbWUiLCIiXX0=">
+                  <a class="popover-button install-link" href="cursor://anysphere.cursor-deeplink/mcp/install?name=CloudinaryEnvConfig&config=${encodedConfig}">
                     Cursor
                   </a>
                   <button class="popover-button" onclick="showModal('claude-code')">
@@ -699,7 +752,7 @@ http_headers = { "api-key" = "YOUR_API_KEY", "api-secret" = "YOUR_API_SECRET", "
                   <button class="popover-button" onclick="showModal('claude-desktop')">
                     Claude Desktop
                   </button>
-                  <a class="popover-button install-link" href="vscode://ms-vscode.vscode-mcp/install?name=CloudinaryEnvConfig&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyJAY2xvdWRpbmFyeS9lbnZpcm9ubWVudC1jb25maWctbWNwIiwic3RhcnQiLCItLWFwaS1rZXkiLCIiLCItLWFwaS1zZWNyZXQiLCIiLCItLWNsb3VkLW5hbWUiLCIiXX0=">
+                  <a class="popover-button install-link" href="vscode://ms-vscode.vscode-mcp/install?name=CloudinaryEnvConfig&config=${encodedConfig}">
                     VS Code
                   </a>
                   <button class="popover-button" onclick="showModal('gemini')">
@@ -722,7 +775,7 @@ http_headers = { "api-key" = "YOUR_API_KEY", "api-secret" = "YOUR_API_SECRET", "
             </div>
           </header>
           <div class="install-targets">
-            <a tabindex="0" class="card install-target install-link" href="cursor://anysphere.cursor-deeplink/mcp/install?name=CloudinaryEnvConfig&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyJAY2xvdWRpbmFyeS9lbnZpcm9ubWVudC1jb25maWctbWNwIiwic3RhcnQiLCItLWFwaS1rZXkiLCIiLCItLWFwaS1zZWNyZXQiLCIiLCItLWNsb3VkLW5hbWUiLCIiXX0=">
+            <a tabindex="0" class="card install-target install-link" href="cursor://anysphere.cursor-deeplink/mcp/install?name=CloudinaryEnvConfig&config=${encodedConfig}">
               <div class="target">
                 <img src="https://cursor.com/assets/images/logo.svg" alt="Cursor">
                 <span>Cursor</span>
@@ -744,7 +797,7 @@ http_headers = { "api-key" = "YOUR_API_KEY", "api-secret" = "YOUR_API_SECRET", "
                 <span>Claude Desktop</span>
               </div>
             </div>
-            <a tabindex="0" class="card install-target install-link" href="vscode://ms-vscode.vscode-mcp/install?name=CloudinaryEnvConfig&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyJAY2xvdWRpbmFyeS9lbnZpcm9ubWVudC1jb25maWctbWNwIiwic3RhcnQiLCItLWFwaS1rZXkiLCIiLCItLWFwaS1zZWNyZXQiLCIiLCItLWNsb3VkLW5hbWUiLCIiXX0=">
+            <a tabindex="0" class="card install-target install-link" href="vscode://ms-vscode.vscode-mcp/install?name=CloudinaryEnvConfig&config=${encodedConfig}">
               <div class="target">
                 <svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
                   <mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="100" height="100">
@@ -866,7 +919,7 @@ http_headers = { "api-key" = "YOUR_API_KEY", "api-secret" = "YOUR_API_SECRET", "
                 <path d="M4 16c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h10c1.1 0 2 .9 2 2"></path>
               </svg>
             </button>
-            <code class="code-snippet" id="server-url">${o}/mcp</code>
+            <code class="code-snippet" id="server-url">${o}/${endpoint}</code>
           </div>
         </section>
 
@@ -923,7 +976,7 @@ http_headers = { "api-key" = "YOUR_API_KEY", "api-secret" = "YOUR_API_SECRET", "
               <path d="M4 16c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h10c1.1 0 2 .9 2 2"></path>
             </svg>
           </button>
-          <code class="code-snippet language-json" id="claude-cli-cmd">claude mcp add CloudinaryEnvConfig -- npx -y @cloudinary/environment-config-mcp start --api-key  --api-secret  --cloud-name </code>
+          <code class="code-snippet language-json" id="claude-cli-cmd">claude mcp add --transport ${transport} CloudinaryEnvConfig ${o}/${endpoint} ${cliHeaders}</code>
         </div>
       </div>
     </div>
@@ -939,7 +992,7 @@ http_headers = { "api-key" = "YOUR_API_KEY", "api-secret" = "YOUR_API_SECRET", "
         <h1>Instructions</h1>
         <p>One-click installation for Claude Desktop users</p>
         <div class="instruction-item">
-          <a href="https://github.com/cloudinary/environment-config-mcp/releases/download/v0.6.2/mcp-server.mcpb" download="mcp-server.mcpb" class="action-button header-action" style="display: inline-flex; margin-bottom: 16px;">
+          <a href="https://github.com/cloudinary/environment-config-mcp/releases/download/v0.6.3/mcp-server.mcpb" download="mcp-server.mcpb" class="action-button header-action" style="display: inline-flex; margin-bottom: 16px;">
             📥 Download MCP Bundle
           </a>
         </div>
@@ -974,7 +1027,7 @@ http_headers = { "api-key" = "YOUR_API_KEY", "api-secret" = "YOUR_API_SECRET", "
               <path d="M4 16c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h10c1.1 0 2 .9 2 2"></path>
             </svg>
           </button>
-          <code class="code-snippet language-json" id="gemini-config">gemini mcp add CloudinaryEnvConfig -- npx -y @cloudinary/environment-config-mcp start --api-key  --api-secret  --cloud-name </code>
+          <code class="code-snippet language-json" id="gemini-config">gemini mcp add --transport ${transport} CloudinaryEnvConfig ${o}/${endpoint} ${cliHeaders}</code>
         </div>
       </div>
     </div>

package/src/lib/config.ts

@@ -113,8 +113,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "0.5.5",
-  sdkVersion: "0.6.2",
-  genVersion: "2.943.0",
+  sdkVersion: "0.6.3",
+  genVersion: "2.950.2",
   userAgent:
-    "speakeasy-sdk/mcp-typescript 0.6.2 2.943.0 0.5.5 @cloudinary/environment-config-mcp",
+    "speakeasy-sdk/mcp-typescript 0.6.3 2.950.2 0.5.5 @cloudinary/environment-config-mcp",
 } as const;

package/src/mcp-server/cli/serve/impl.ts

@@ -3,8 +3,8 @@
  * @generated-id: 03e83f226068
  */
 
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
-import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
+import { toNodeHandler } from "@modelcontextprotocol/node";
+import { createMcpHandler } from "@modelcontextprotocol/server";
 import express from "express";
 import { LocalContext } from "../../cli.js";
 import {
@@ -16,7 +16,7 @@ import { createMCPServer } from "../../server.js";
 import { buildAnnotationFilter } from "../../tools.js";
 import { buildSDK } from "../../tools.js";
 
-import { landingPageExpress } from "../../../landing-page.js";
+import { landingPageExpressHTTP } from "../../../landing-page.js";
 
 interface ServeCommandFlags extends MCPServerFlags {
   readonly port: number;
@@ -40,7 +40,7 @@ async function startStreamableHTTP(cliFlags: ServeCommandFlags) {
   // Enable CORS for cross-origin requests
   app.use((req, res, next) => {
     res.header("Access-Control-Allow-Origin", "*");
-    res.header("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
+    res.header("Access-Control-Allow-Methods", "GET, POST, DELETE, OPTIONS");
     res.header("Access-Control-Allow-Headers", "*");
     if (req.method === "OPTIONS") {
       res.sendStatus(204);
@@ -49,19 +49,10 @@ async function startStreamableHTTP(cliFlags: ServeCommandFlags) {
     next();
   });
 
-  app.use(express.json());
+  app.use(express.json({ inflate: false }));
 
-  app.post("/mcp", async (req, res) => {
-    const headers = new Headers();
-    for (const [key, value] of Object.entries(req.headers)) {
-      if (Array.isArray(value)) {
-        for (const v of value) headers.append(key, v);
-      } else if (value !== undefined) {
-        headers.set(key, value);
-      }
-    }
-
-    const transport = new StreamableHTTPServerTransport({});
+  const handler = createMcpHandler(({ requestInfo }) => {
+    const headers = requestInfo?.headers ?? new Headers();
 
     const { server: mcpServer } = createMCPServer({
       logger,
@@ -85,11 +76,41 @@ async function startStreamableHTTP(cliFlags: ServeCommandFlags) {
       });
     };
 
-    await mcpServer.connect(transport as Transport);
-    await transport.handleRequest(req, res, req.body);
+    return mcpServer;
+  });
+  const nodeHandler = toNodeHandler(handler);
+  const activeResponses = new Set<Promise<void>>();
+  let closing = false;
+  app.use((_req, res, next) => {
+    if (closing) {
+      res.set("Connection", "close").status(503).send(
+        "Server is shutting down",
+      );
+      return;
+    }
+    next();
+  });
+  app.all("/mcp", (req, res) => {
+    // Notification streams remain open until handler.close().
+    if (req.method !== "GET" && req.body?.method !== "subscriptions/listen") {
+      let finish!: () => void;
+      const completed = new Promise<void>((resolve) => {
+        finish = resolve;
+      });
+      const done = () => {
+        res.off("finish", done);
+        res.off("close", done);
+        activeResponses.delete(completed);
+        finish();
+      };
+      activeResponses.add(completed);
+      res.once("finish", done);
+      res.once("close", done);
+    }
+    return nodeHandler(req, res, req.body);
   });
 
-  app.get("/", landingPageExpress);
+  app.get("/", landingPageExpressHTTP);
 
   const httpServer = app.listen(cliFlags.port, "0.0.0.0", () => {
     const ha = httpServer.address();
@@ -97,7 +118,11 @@ async function startStreamableHTTP(cliFlags: ServeCommandFlags) {
     logger.info("MCP Streamable HTTP server started", { host });
   });
 
-  const shutdown = () => {
+  const shutdown = async () => {
+    if (closing) {
+      process.exit(1);
+    }
+    closing = true;
     logger.info("Shutting down HTTP server");
 
     const timer = setTimeout(() => {
@@ -105,11 +130,16 @@ async function startStreamableHTTP(cliFlags: ServeCommandFlags) {
       process.exit(1);
     }, 5000);
 
-    httpServer.close(() => {
-      clearTimeout(timer);
-      logger.info("Graceful shutdown complete");
-      process.exit(0);
-    });
+    const stopped = new Promise<void>((resolve) =>
+      httpServer.close(() => resolve())
+    );
+    await Promise.all(activeResponses);
+    await handler.close();
+    httpServer.closeAllConnections();
+    await stopped;
+    clearTimeout(timer);
+    logger.info("Graceful shutdown complete");
+    process.exit(0);
   };
 
   process.on("SIGTERM", shutdown);

package/src/mcp-server/cli/start/impl.ts

@@ -3,8 +3,8 @@
  * @generated-id: 37494f674015
  */
 
-import { SSEServerTransport } from "@modelcontextprotocol/sdk/server/sse.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { SSEServerTransport } from "@modelcontextprotocol/server-legacy/sse";
+import { serveStdio } from "@modelcontextprotocol/server/stdio";
 import express from "express";
 import { LocalContext } from "../../cli.js";
 import {
@@ -49,8 +49,7 @@ export async function main(this: LocalContext, flags: StartCommandFlags) {
 
 async function startStdio(flags: StartCommandFlags) {
   const logger = createConsoleLogger(flags["log-level"]);
-  const transport = new StdioServerTransport();
-  const { server } = createMCPServer({
+  const createServer = createMCPServerFactory({
     logger,
     allowedTools: flags.tool,
     dynamic: flags.mode === "dynamic",
@@ -71,16 +70,22 @@ async function startStdio(flags: StartCommandFlags) {
     region: flags.region,
     host: flags["api-host"],
   });
-  await server.connect(transport);
+  const handle = serveStdio(createServer);
 
   const abort = async () => {
-    await server.close();
+    await handle.close();
     process.exit(0);
   };
   process.on("SIGTERM", abort);
   process.on("SIGINT", abort);
 }
 
+function createMCPServerFactory(
+  options: Parameters<typeof createMCPServer>[0],
+) {
+  return () => createMCPServer(options).server;
+}
+
 async function startSSE(cliFlags: StartCommandFlags) {
   const logger = createConsoleLogger(cliFlags["log-level"]);
   const app = express();
@@ -108,9 +113,11 @@ async function startSSE(cliFlags: StartCommandFlags) {
     const flags: StartCommandFlags = {
       ...cliFlags,
       // Security fields can be overridden via headers
-      "api-key": (req.headers["api_key"] as string) ?? cliFlags["api-key"],
-      "api-secret": (req.headers["api_secret"] as string)
-        ?? cliFlags["api-secret"],
+      "api-key": ((req.headers["api-key"] ?? req.headers["api_key"]) as string)
+        ?? cliFlags["api-key"],
+      "api-secret":
+        ((req.headers["api-secret"] ?? req.headers["api_secret"]) as string)
+          ?? cliFlags["api-secret"],
       "oauth2": (req.headers["oauth2"] as string) ?? cliFlags["oauth2"],
     };
 

package/src/mcp-server/extensions.ts

@@ -3,18 +3,16 @@
  * @generated-id: 3d9d20ff158f
  */
 
-import { ZodRawShapeCompat } from "@modelcontextprotocol/sdk/server/zod-compat.js";
+import * as z from "zod";
 import { PromptDefinition } from "./prompts.js";
 import { ResourceDefinition, ResourceTemplateDefinition } from "./resources.js";
 import { ToolDefinition } from "./tools.js";
 
 export type Register = {
-  tool: <A extends ZodRawShapeCompat | undefined>(
-    def: ToolDefinition<A>,
-  ) => void;
+  tool: <A extends z.ZodRawShape | undefined>(def: ToolDefinition<A>) => void;
   resource: (def: ResourceDefinition) => void;
   resourceTemplate: (def: ResourceTemplateDefinition) => void;
-  prompt: <A extends ZodRawShapeCompat | undefined>(
+  prompt: <A extends z.ZodRawShape | undefined>(
     prompt: PromptDefinition<A>,
   ) => void;
 };

package/src/mcp-server/mcp-server.ts

@@ -22,7 +22,7 @@ const routes = buildRouteMap({
 export const app = buildApplication(routes, {
   name: "mcp",
   versionInfo: {
-    currentVersion: "0.6.2",
+    currentVersion: "0.6.3",
   },
 });
 

package/src/mcp-server/prompts.ts

@@ -3,32 +3,28 @@
  * @generated-id: 26f3d73cbf31
  */
 
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import {
-  ShapeOutput,
-  ZodRawShapeCompat,
-} from "@modelcontextprotocol/sdk/server/zod-compat.js";
-import { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
-import {
-  GetPromptResult,
-  ServerNotification,
-  ServerRequest,
-} from "@modelcontextprotocol/sdk/types.js";
+import { GetPromptResult, McpServer } from "@modelcontextprotocol/server";
+import * as z from "zod";
 import { CloudinaryEnvConfigCore } from "../core.js";
 import { ConsoleLogger } from "./console-logger.js";
 import { MCPScope } from "./scopes.js";
+import {
+  mcpInputSchema,
+  MCPServerContext,
+  mcpServerContext,
+} from "./shared.js";
 
 export type PromptDefinition<
-  Args extends undefined | ZodRawShapeCompat = undefined,
-> = Args extends ZodRawShapeCompat ? {
+  Args extends undefined | z.ZodRawShape = undefined,
+> = Args extends z.ZodRawShape ? {
     name: string;
     description?: string;
     scopes?: MCPScope[];
     args: Args;
     prompt: (
       client: CloudinaryEnvConfigCore,
-      args: ShapeOutput<Args>,
-      extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+      args: z.output<z.ZodObject<Args>>,
+      extra: MCPServerContext,
     ) => GetPromptResult | Promise<GetPromptResult>;
   }
   : {
@@ -38,7 +34,7 @@ export type PromptDefinition<
     args?: undefined;
     prompt: (
       client: CloudinaryEnvConfigCore,
-      extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+      extra: MCPServerContext,
     ) => GetPromptResult | Promise<GetPromptResult>;
   };
 
@@ -62,10 +58,8 @@ export function createRegisterPrompt(
   server: McpServer,
   getSDK: () => CloudinaryEnvConfigCore,
   allowedScopes: Set<MCPScope>,
-): <A extends ZodRawShapeCompat | undefined>(
-  prompt: PromptDefinition<A>,
-) => void {
-  return <A extends ZodRawShapeCompat | undefined>(
+): <A extends z.ZodRawShape | undefined>(prompt: PromptDefinition<A>) => void {
+  return <A extends z.ZodRawShape | undefined>(
     prompt: PromptDefinition<A>,
   ): void => {
     const scopes = prompt.scopes ?? [];
@@ -81,30 +75,23 @@ export function createRegisterPrompt(
     }
 
     if (prompt.args) {
-      if (prompt.description) {
-        server.prompt(
-          prompt.name,
-          prompt.description,
-          prompt.args,
-          async (args, ctx) => prompt.prompt(getSDK(), args, ctx),
-        );
-      } else {
-        server.prompt(
-          prompt.name,
-          prompt.args,
-          async (args, ctx) => prompt.prompt(getSDK(), args, ctx),
-        );
-      }
+      server.registerPrompt(
+        prompt.name,
+        {
+          ...(prompt.description === undefined
+            ? {}
+            : { description: prompt.description }),
+          argsSchema: { ...mcpInputSchema(prompt.args), shape: prompt.args },
+        },
+        async (args, ctx) =>
+          prompt.prompt(getSDK(), args, mcpServerContext(ctx)),
+      );
     } else {
-      if (prompt.description) {
-        server.prompt(
-          prompt.name,
-          prompt.description,
-          async (ctx) => prompt.prompt(getSDK(), ctx),
-        );
-      } else {
-        server.prompt(prompt.name, async (ctx) => prompt.prompt(getSDK(), ctx));
-      }
+      server.registerPrompt(prompt.name, {
+        ...(prompt.description === undefined
+          ? {}
+          : { description: prompt.description }),
+      }, async (ctx) => prompt.prompt(getSDK(), mcpServerContext(ctx)));
     }
 
     logger.debug("Registered prompt", { name: prompt.name });

package/src/mcp-server/resources.ts

@@ -3,27 +3,23 @@
  * @generated-id: cb0c57ebeaea
  */
 
+import type { ResourceTemplate as LegacyResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
 import {
   McpServer,
+  ReadResourceResult,
   ResourceMetadata,
   ResourceTemplate,
-} from "@modelcontextprotocol/sdk/server/mcp.js";
-import { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
-import { Variables } from "@modelcontextprotocol/sdk/shared/uriTemplate.js";
-import {
-  ReadResourceResult,
-  ServerNotification,
-  ServerRequest,
-} from "@modelcontextprotocol/sdk/types.js";
+  Variables,
+} from "@modelcontextprotocol/server";
 import { CloudinaryEnvConfigCore } from "../core.js";
 import { ConsoleLogger } from "./console-logger.js";
 import { MCPScope } from "./scopes.js";
-import { valueToBase64 } from "./shared.js";
+import { MCPServerContext, mcpServerContext, valueToBase64 } from "./shared.js";
 
 export type ReadResourceCallback = (
   client: CloudinaryEnvConfigCore,
   uri: URL,
-  extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+  extra: MCPServerContext,
 ) => ReadResourceResult | Promise<ReadResourceResult>;
 
 export type ResourceDefinition = {
@@ -39,7 +35,7 @@ export type ReadResourceTemplateCallback = (
   client: CloudinaryEnvConfigCore,
   uri: URL,
   vars: Variables,
-  extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+  extra: MCPServerContext,
 ) => ReadResourceResult | Promise<ReadResourceResult>;
 
 export type ResourceTemplateDefinition = {
@@ -47,7 +43,7 @@ export type ResourceTemplateDefinition = {
   description: string;
   metadata?: ResourceMetadata;
   scopes?: MCPScope[];
-  resource: ResourceTemplate;
+  resource: ResourceTemplate | LegacyResourceTemplate;
   read: ReadResourceTemplateCallback;
 };
 
@@ -95,11 +91,11 @@ export function createRegisterResource(
       description: resource.description,
     };
 
-    server.resource(
+    server.registerResource(
       resource.name,
       resource.resource,
       metadata,
-      async (uri, ctx) => resource.read(getSDK(), uri, ctx),
+      async (uri, ctx) => resource.read(getSDK(), uri, mcpServerContext(ctx)),
     );
 
     logger.debug("Registered resource", { name: resource.name });
@@ -130,13 +126,32 @@ export function createRegisterResourceTemplate(
       description: resource.description,
     };
 
-    server.resource(
+    server.registerResource(
       resource.name,
-      resource.resource,
+      normalizeResourceTemplate(resource.resource),
       metadata,
-      async (uri, vars, ctx) => resource.read(getSDK(), uri, vars, ctx),
+      async (uri, vars, ctx) =>
+        resource.read(getSDK(), uri, vars, mcpServerContext(ctx)),
     );
 
     logger.debug("Registered resource template", { name: resource.name });
   };
 }
+
+function normalizeResourceTemplate(
+  resource: ResourceTemplate | LegacyResourceTemplate,
+): ResourceTemplate {
+  if (resource instanceof ResourceTemplate) return resource;
+  const complete: NonNullable<
+    ConstructorParameters<typeof ResourceTemplate>[1]["complete"]
+  > = {};
+  for (const variable of resource.uriTemplate.variableNames) {
+    const callback = resource.completeCallback(variable);
+    if (callback) complete[variable] = callback;
+  }
+  const list = resource.listCallback;
+  return new ResourceTemplate(resource.uriTemplate.toString(), {
+    list: list ? (ctx) => list(mcpServerContext(ctx)) : undefined,
+    complete,
+  });
+}

package/src/mcp-server/server.ts

@@ -3,7 +3,7 @@
  * @generated-id: 2784dd48e82a
  */
 
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer } from "@modelcontextprotocol/server";
 import { CloudinaryEnvConfigCore } from "../core.js";
 import { SDKOptions } from "../lib/config.js";
 import type { ConsoleLogger } from "./console-logger.js";
@@ -60,7 +60,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "CloudinaryEnvConfig",
-    version: "0.6.2",
+    version: "0.6.3",
     ...serverInfo,
   }, { instructions });