Refactor to reuse MCP server setup for both /sse and /mcp

Author: mhart

apps/docs-vectorize/src/docs-vectorize.app.ts

@@ -1,4 +1,3 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { createMcpHandler, McpAgent } from 'agents/mcp'
 
 import { getEnv } from '@repo/mcp-common/src/env'
@@ -11,12 +10,7 @@ import type { Env } from './docs-vectorize.context'
 
 const env = getEnv<Env>()
 
-// The docs MCP server isn't stateful, so we don't have state/props
-export type Props = never
-
-export type State = never
-
-export class CloudflareDocumentationMCP extends McpAgent<Env, State, Props> {
+export class CloudflareDocumentationMCP extends McpAgent<Env, never, never> {
 	_server: CloudflareMCPServer | undefined
 	set server(server: CloudflareMCPServer) {
 		this._server = server
@@ -25,7 +19,6 @@ export class CloudflareDocumentationMCP extends McpAgent<Env, State, Props> {
 		if (!this._server) {
 			throw new Error('Tried to access server before it was initialized')
 		}
-
 		return this._server
 	}
 
@@ -37,43 +30,47 @@ export class CloudflareDocumentationMCP extends McpAgent<Env, State, Props> {
 	}
 
 	async init() {
-		const sentry = initSentry(env, this.ctx)
-
-		this.server = new CloudflareMCPServer({
-			wae: env.MCP_METRICS,
-			serverInfo: {
-				name: env.MCP_SERVER_NAME,
-				version: env.MCP_SERVER_VERSION,
-			},
-			sentry,
-		})
-
-		registerDocsTools(this.server, this.env)
-		registerPrompts(this.server)
+		this.server = createMcpServer(env, this.ctx)
 	}
 }
 
 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) => {
+	fetch: async (req: Request, env: Env, 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') {
+			const server = createMcpServer(env, ctx, req)
+			const mcpHandler = createMcpHandler(server)
 			return mcpHandler(req, env, ctx)
 		}
 		return new Response('Not found', { status: 404 })
 	},
 }
+
+function createMcpServer(
+	env: Env,
+	ctx: {
+		waitUntil: ExecutionContext['waitUntil']
+	},
+	req?: Request
+) {
+	const sentry = initSentry(env, ctx, req)
+
+	const server = new CloudflareMCPServer({
+		wae: env.MCP_METRICS,
+		serverInfo: {
+			name: env.MCP_SERVER_NAME,
+			version: env.MCP_SERVER_VERSION,
+		},
+		sentry,
+	})
+
+	registerDocsTools(server, env)
+	registerPrompts(server)
+
+	return server
+}

apps/docs-vectorize/wrangler.jsonc

@@ -8,6 +8,7 @@
 	"compatibility_date": "2025-03-10",
 	"compatibility_flags": ["nodejs_compat"],
 	"name": "mcp-cloudflare-docs-vectorize-dev",
+	"minify": true,
 	"migrations": [
 		{
 			"new_sqlite_classes": ["CloudflareDocumentationMCP"],