Move docs-vectorize MCP server to be stateless

mhart · mhart · commit 5fb0edbbc990 · 2025-10-28T19:51:10.000+11:00
Still keeping the old serving method on /sse – but for /mcp it no longer has a DO as a bottleneck.

A more wider fix here would be to make a common stateless MCP server with all the same observability, etc
diff --git a/apps/ai-gateway/package.json b/apps/ai-gateway/package.json
@@ -14,10 +14,10 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"zod": "3.24.2"
diff --git a/apps/auditlogs/package.json b/apps/auditlogs/package.json
@@ -14,10 +14,10 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"zod": "3.24.2"
diff --git a/apps/autorag/package.json b/apps/autorag/package.json
@@ -14,10 +14,10 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"zod": "3.24.2"
diff --git a/apps/browser-rendering/package.json b/apps/browser-rendering/package.json
@@ -14,10 +14,10 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"zod": "3.24.2"
diff --git a/apps/cloudflare-one-casb/package.json b/apps/cloudflare-one-casb/package.json
@@ -14,9 +14,9 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"zod": "3.24.2"
diff --git a/apps/demo-day/package.json b/apps/demo-day/package.json
@@ -11,10 +11,10 @@
 		"test": "vitest run"
 	},
 	"dependencies": {
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"zod": "3.24.2"
 	},
 	"devDependencies": {
diff --git a/apps/dex-analysis/package.json b/apps/dex-analysis/package.json
@@ -15,10 +15,10 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"jszip": "3.10.1",
diff --git a/apps/dns-analytics/package.json b/apps/dns-analytics/package.json
@@ -14,10 +14,10 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"zod": "3.24.2"
diff --git a/apps/docs-autorag/package.json b/apps/docs-autorag/package.json
@@ -14,10 +14,10 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"mime": "4.0.6",
diff --git a/apps/docs-vectorize/package.json b/apps/docs-vectorize/package.json
@@ -14,10 +14,10 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"mime": "4.0.6",
diff --git a/apps/docs-vectorize/src/docs-vectorize.app.ts b/apps/docs-vectorize/src/docs-vectorize.app.ts
@@ -1,6 +1,6 @@
-import { McpAgent } from 'agents/mcp'
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
+import { experimental_createMcpHandler as createMcpHandler, McpAgent } from 'agents/mcp'
 
-import { createApiHandler } from '@repo/mcp-common/src/api-handler'
 import { getEnv } from '@repo/mcp-common/src/env'
 import { registerPrompts } from '@repo/mcp-common/src/prompts/docs-vectorize.prompts'
 import { initSentry } from '@repo/mcp-common/src/sentry'
@@ -48,9 +48,45 @@ export class CloudflareDocumentationMCP extends McpAgent<Env, State, Props> {
 			sentry,
 		})
 
-		registerDocsTools(this, this.env)
-		registerPrompts(this)
+		registerDocsTools(this.server, this.env)
+		registerPrompts(this.server)
 	}
 }
 
-export default createApiHandler(CloudflareDocumentationMCP)
+const sseHandler = CloudflareDocumentationMCP.serveSSE('/sse')
+
+const statelessServer = new McpServer({
+	name: env.MCP_SERVER_NAME,
+	version: env.MCP_SERVER_VERSION,
+})
+
+registerDocsTools(statelessServer, env)
+registerPrompts(statelessServer)
+
+const mcpHandler = createMcpHandler(statelessServer)
+
+export default {
+	fetch: async (req: Request, env: unknown, ctx: ExecutionContext) => {
+		const url = new URL(req.url)
+		if (url.pathname === '/sse' || url.pathname === '/sse/message') {
+			return sseHandler.fetch(req, env, ctx)
+		}
+		if (url.pathname === '/mcp') {
+			if (req.method === 'OPTIONS') {
+				return new Response(null, {
+					status: 200,
+					headers: {
+						'Access-Control-Allow-Origin': '*',
+						'Access-Control-Allow-Headers':
+							'Content-Type, Accept, mcp-session-id, mcp-protocol-version',
+						'Access-Control-Allow-Methods': 'GET, POST, DELETE, OPTIONS',
+						'Access-Control-Expose-Headers': 'mcp-session-id',
+						'Access-Control-Max-Age': '86400',
+					},
+				})
+			}
+			return mcpHandler(req, env, ctx)
+		}
+		return new Response('Not found', { status: 404 })
+	},
+}
diff --git a/apps/graphql/package.json b/apps/graphql/package.json
@@ -14,14 +14,14 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
-		"zod": "3.24.2",
-		"lz-string": "1.5.0"
+		"lz-string": "1.5.0",
+		"zod": "3.24.2"
 	},
 	"devDependencies": {
 		"@cloudflare/vitest-pool-workers": "0.8.14",
diff --git a/apps/logpush/package.json b/apps/logpush/package.json
@@ -14,10 +14,10 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"zod": "3.24.2"
diff --git a/apps/radar/package.json b/apps/radar/package.json
@@ -14,10 +14,10 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"zod": "3.24.2"
diff --git a/apps/sandbox-container/package.json b/apps/sandbox-container/package.json
@@ -22,12 +22,12 @@
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/node-server": "1.13.8",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@n8n/json-schema-to-zod": "1.1.0",
 		"@repo/eval-tools": "workspace:*",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cron-schedule": "5.0.4",
 		"esbuild": "0.25.1",
 		"hono": "4.7.6",
diff --git a/apps/workers-bindings/package.json b/apps/workers-bindings/package.json
@@ -26,12 +26,12 @@
 	},
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@n8n/json-schema-to-zod": "1.1.0",
 		"@repo/eval-tools": "workspace:*",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"ai": "4.3.10",
 		"concurrently": "9.1.2",
 		"hono": "4.7.6",
diff --git a/apps/workers-bindings/src/bindings.app.ts b/apps/workers-bindings/src/bindings.app.ts
@@ -83,8 +83,8 @@ export class WorkersBindingsMCP extends McpAgent<Env, WorkersBindingsMCPState, P
 		registerHyperdriveTools(this)
 
 		// Add docs tools
-		registerDocsTools(this, this.env)
-		registerPrompts(this)
+		registerDocsTools(this.server, this.env)
+		registerPrompts(this.server)
 	}
 
 	async getActiveAccountId() {
diff --git a/apps/workers-builds/package.json b/apps/workers-builds/package.json
@@ -14,10 +14,10 @@
 	"dependencies": {
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"zod": "3.24.2"
diff --git a/apps/workers-observability/package.json b/apps/workers-observability/package.json
@@ -15,10 +15,10 @@
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@fast-csv/format": "5.0.2",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"workers-tagged-logger": "0.13.5",
diff --git a/apps/workers-observability/src/workers-observability.app.ts b/apps/workers-observability/src/workers-observability.app.ts
@@ -87,8 +87,8 @@ export class ObservabilityMCP extends McpAgent<Env, State, Props> {
 		registerObservabilityTools(this)
 
 		// Add docs tools
-		registerDocsTools(this, this.env)
-		registerPrompts(this)
+		registerDocsTools(this.server, this.env)
+		registerPrompts(this.server)
 	}
 
 	async getActiveAccountId() {
diff --git a/packages/eval-tools/package.json b/packages/eval-tools/package.json
@@ -15,7 +15,7 @@
 		"@ai-sdk/google": "1.2.17",
 		"@ai-sdk/openai": "1.3.20",
 		"@cloudflare/vitest-pool-workers": "0.8.14",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"ai": "4.3.10",
 		"ai-gateway-provider": "0.0.6",
 		"workers-ai-provider": "0.3.0",
diff --git a/packages/mcp-common/package.json b/packages/mcp-common/package.json
@@ -14,9 +14,9 @@
 		"@cloudflare/workers-oauth-provider": "0.0.5",
 		"@fast-csv/format": "5.0.2",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.18.2",
+		"@modelcontextprotocol/sdk": "1.20.2",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.2.7",
+		"agents": "0.2.17",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"toucan-js": "4.1.1",
diff --git a/packages/mcp-common/src/prompts/docs-vectorize.prompts.ts b/packages/mcp-common/src/prompts/docs-vectorize.prompts.ts
@@ -1,11 +1,11 @@
-import type { CloudflareMcpAgentNoAccount } from '../types/cloudflare-mcp-agent.types'
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 
 /**
  * Registers developer-platform-related prompts with the MCP server
- * @param agent The MCP server instance
+ * @param server The MCP server instance
  */
-export function registerPrompts(agent: CloudflareMcpAgentNoAccount) {
-	agent.server.prompt(
+export function registerPrompts(server: McpServer) {
+	server.prompt(
 		'workers-prompt-full',
 		'Detailed prompt for generating Cloudflare Workers code (and other developer platform products) from https://developers.cloudflare.com/workers/prompt.txt',
 		async () => ({
diff --git a/packages/mcp-common/src/tools/docs-vectorize.tools.ts b/packages/mcp-common/src/tools/docs-vectorize.tools.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 
-import type { CloudflareMcpAgentNoAccount } from '../types/cloudflare-mcp-agent.types'
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 
 interface RequiredEnv {
 	AI: Ai
@@ -12,10 +12,10 @@ const TOP_K = 10
 
 /**
  * Registers the docs search tool with the MCP server
- * @param agent The MCP server instance
+ * @param server The MCP server instance
  */
-export function registerDocsTools(agent: CloudflareMcpAgentNoAccount, env: RequiredEnv) {
-	agent.server.tool(
+export function registerDocsTools(server: McpServer, env: RequiredEnv) {
+	server.tool(
 		'search_cloudflare_documentation',
 		`Search the Cloudflare documentation.
 
@@ -57,7 +57,7 @@ ${result.text}
 
 	// Note: this is a tool instead of a prompt because
 	// prompt support is much less common than tools.
-	agent.server.tool(
+	server.tool(
 		'migrate_pages_to_workers_guide',
 		`ALWAYS read this guide before migrating Pages projects to Workers.`,
 		{},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
