feat(cloudflare): Drop the legacy MCP SDK transport from chat routes

packages/mcp-cloudflare/package.json

@@ -56,7 +56,6 @@
     "@ai-sdk/mcp": "catalog:",
     "@ai-sdk/react": "catalog:",
     "@cloudflare/workers-oauth-provider": "catalog:",
-    "@modelcontextprotocol/sdk": "catalog:",
     "@modelcontextprotocol/server": "catalog:",
     "@radix-ui/react-accordion": "catalog:",
     "@radix-ui/react-slot": "catalog:",

packages/mcp-cloudflare/src/server/routes/chat.ts

@@ -1,5 +1,4 @@
 import { experimental_createMCPClient } from "@ai-sdk/mcp";
-import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import {
   getOpenRouterModel,
   getOpenRouterProviderOptions,
@@ -245,19 +244,17 @@ export default new Hono<{ Bindings: Env }>().post("/", async (c) => {
       // Get the current request URL to construct the MCP endpoint URL
       const requestUrl = new URL(c.req.url);
       const mcpUrl = new URL(`${requestUrl.protocol}//${requestUrl.host}/mcp`);
-      const httpTransport = new StreamableHTTPClientTransport(mcpUrl, {
-        requestInit: {
+      mcpClient = await experimental_createMCPClient({
+        name: "mcp.sentry.dev (web)",
+        transport: {
+          type: "http",
+          url: mcpUrl.href,
           headers: {
             Authorization: `Bearer ${currentAccessToken}`,
           },
         },
       });
 
-      mcpClient = await experimental_createMCPClient({
-        name: "mcp.sentry.dev (web)",
-        transport: httpTransport,
-      });
-
       // Get available tools from MCP server
       Object.assign(tools, await mcpClient.tools());
       logInfo(`Connected to ${mcpUrl}`, {
@@ -281,19 +278,17 @@ export default new Hono<{ Bindings: Env }>().post("/", async (c) => {
             const mcpUrl = new URL(
               `${requestUrl.protocol}//${requestUrl.host}/mcp`,
             );
-            const httpTransport = new StreamableHTTPClientTransport(mcpUrl, {
-              requestInit: {
+            mcpClient = await experimental_createMCPClient({
+              name: "mcp.sentry.dev (web)",
+              transport: {
+                type: "http",
+                url: mcpUrl.href,
                 headers: {
                   Authorization: `Bearer ${currentAccessToken}`,
                 },
               },
             });
 
-            mcpClient = await experimental_createMCPClient({
-              name: "mcp.sentry.dev (web)",
-              transport: httpTransport,
-            });
-
             Object.assign(tools, await mcpClient.tools());
             logInfo(`Connected to ${mcpUrl} (after refresh)`, {
               loggerScope: ["cloudflare", "chat", "connection"],

packages/mcp-cloudflare/src/server/routes/metadata.ts

@@ -6,7 +6,6 @@
  */
 import { Hono } from "hono";
 import { experimental_createMCPClient } from "@ai-sdk/mcp";
-import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import type { Env } from "../types";
 import { logIssue, logWarn } from "@sentry/mcp-core/telem/logging";
 import { AuthDataSchema } from "../types/chat";
@@ -58,19 +57,17 @@ export default new Hono<{ Bindings: Env }>().get("/", async (c) => {
       const requestUrl = new URL(c.req.url);
       const mcpUrl = `${requestUrl.protocol}//${requestUrl.host}/mcp`;
 
-      const httpTransport = new StreamableHTTPClientTransport(new URL(mcpUrl), {
-        requestInit: {
+      mcpClient = await experimental_createMCPClient({
+        name: "sentry",
+        transport: {
+          type: "http",
+          url: mcpUrl,
           headers: {
             Authorization: `Bearer ${accessToken}`,
           },
         },
       });
 
-      mcpClient = await experimental_createMCPClient({
-        name: "sentry",
-        transport: httpTransport,
-      });
-
       const mcpTools = await mcpClient.tools();
       tools = Object.keys(mcpTools);
     } catch (error) {

packages/mcp-cloudflare/vitest.config.ts

@@ -1,4 +1,3 @@
-import path from "node:path";
 import { cloudflareTest } from "@cloudflare/vitest-plugin";
 import { defineConfig } from "vitest/config";
 import { createMockOutboundService } from "./src/test-utils/configure-fetch-mock";
@@ -29,25 +28,4 @@ export default defineConfig({
     fileParallelism: false,
     maxWorkers: 1,
   },
-  /**
-   * Workaround for ajv CJS compatibility in workerd runtime.
-   *
-   * The legacy MCP SDK imports ajv at module level even though hosted requests use
-   * the v2 SDK's workerd-compatible default validator. ajv uses CJS require() for
-   * JSON files which fails in workerd.
-   * See: https://github.com/cloudflare/workers-sdk/issues/9822
-   *
-   * This is TEST-ONLY: hosted MCP requests do not invoke ajv, but importing the
-   * legacy SDK still triggers the CJS issue.
-   */
-  resolve: {
-    alias: {
-      ajv: path.resolve(__dirname, "src/test-utils/ajv-stub.ts"),
-      "ajv-formats": path.resolve(__dirname, "src/test-utils/ajv-stub.ts"),
-    },
-  },
-  // Force bundling to apply the ajv alias during module resolution
-  ssr: {
-    noExternal: ["@modelcontextprotocol/sdk", "agents"],
-  },
 });