Merge branch 'main' of https://github.com/frankmeszaros/mcp-server-cloudflare into fm/v0

Author: frankmeszaros

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+	"configurations": [
+		{
+			"name": "Wrangler",
+			"type": "node",
+			"request": "attach",
+			"port": 9229,
+			"cwd": "/",
+			"resolveSourceMapLocations": null,
+			"attachExistingChildren": false,
+			"autoAttachChildProcesses": false,
+			"sourceMaps": true // works with or without this line
+		}
+	]
+}

apps/cloudflare-one-casb/src/index.ts

@@ -1,17 +1,24 @@
 import OAuthProvider from '@cloudflare/workers-oauth-provider'
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { McpAgent } from 'agents/mcp'
 import { env } from 'cloudflare:workers'
 
 import {
 	createAuthHandlers,
 	handleTokenExchangeCallback,
 } from '@repo/mcp-common/src/cloudflare-oauth-handler'
+import { CloudflareMCPServer } from '@repo/mcp-common/src/server'
 import { registerAccountTools } from '@repo/mcp-common/src/tools/account'
 
+import { MetricsTracker } from '../../../packages/mcp-observability/src'
 import { registerIntegrationsTools } from './tools/integrations'
 
 import type { AccountSchema, UserSchema } from '@repo/mcp-common/src/cloudflare-oauth-handler'
+import type { CloudflareMcpAgent } from '@repo/mcp-common/src/types/cloudflare-mcp-agent'
+
+const metrics = new MetricsTracker(env.MCP_METRICS, {
+	name: env.MCP_SERVER_NAME,
+	version: env.MCP_SERVER_VERSION,
+})
 
 // Context from the auth process, encrypted & stored in the auth token
 // and provided to the DurableMCP as this.props
@@ -23,18 +30,13 @@ export type Props = {
 
 export type State = { activeAccountId: string | null }
 export class CASBMCP extends McpAgent<Env, State, Props> {
-	// @ts-ignore
-	server = new McpServer({
-		name: "Remote MCP Server with Cloudflare One's Cloud Access Security Broker (CASB)",
-		version: '1.0.0',
+	server = new CloudflareMCPServer(undefined, env.MCP_METRICS, {
+		name: env.MCP_SERVER_NAME,
+		version: env.MCP_SERVER_VERSION,
 	})
 
-	initialState: State = {
-		activeAccountId: null,
-	}
-
 	async init() {
-		registerAccountTools(this)
+		registerAccountTools(this as unknown as CloudflareMcpAgent)
 		registerIntegrationsTools(this)
 	}
 
@@ -49,8 +51,6 @@ export class CASBMCP extends McpAgent<Env, State, Props> {
 	}
 
 	setActiveAccountId(accountId: string) {
-		console.log('Setting account ID: ', accountId)
-		// TODO: Figure out why this fail sometimes, and why we need to wrap this in a try catch
 		try {
 			this.setState({
 				...this.state,
@@ -73,7 +73,7 @@ export default new OAuthProvider({
 	// @ts-ignore
 	apiHandler: CASBMCP.mount('/sse'),
 	// @ts-ignore
-	defaultHandler: createAuthHandlers({ scopes: CloudflareOneCasbScopes }),
+	defaultHandler: createAuthHandlers({ scopes: CloudflareOneCasbScopes, metrics }),
 	authorizeEndpoint: '/oauth/authorize',
 	tokenEndpoint: '/token',
 	tokenExchangeCallback: (options) =>

apps/cloudflare-one-casb/worker-configuration.d.ts

@@ -6,6 +6,10 @@ declare namespace Cloudflare {
 		CLOUDFLARE_CLIENT_ID: string;
 		CLOUDFLARE_CLIENT_SECRET: string;
 		MCP_OBJECT: DurableObjectNamespace<import("./src/index").CASBMCP>;
+
+        MCP_SERVER_NAME: "PLACEHOLDER";
+		MCP_SERVER_VERSION: "PLACEHOLDER";
+        MCP_METRICS: AnalyticsEngineDataset;
 	}
 }
 interface Env extends Cloudflare.Env {}

apps/cloudflare-one-casb/wrangler.jsonc

@@ -16,6 +16,10 @@
 	"observability": {
 		"enabled": true
 	},
+	"vars": {
+		"MCP_SERVER_NAME": "PLACEHOLDER",
+		"MCP_SERVER_VERSION": "PLACEHOLDER"
+	},
 	"dev": {
 		"port": 8976
 	},
@@ -35,6 +39,12 @@
 	],
 	"workers_dev": false,
 	"preview_urls": false,
+	"analytics_engine_datasets": [
+		{
+			"binding": "MCP_METRICS",
+			"dataset": "mcp-metrics-dev"
+		}
+	],
 	"env": {
 		"staging": {
 			"name": "mcp-cloudflare-casb-staging",
@@ -53,6 +63,12 @@
 					"binding": "OAUTH_KV",
 					"id": "18e839155d00407095d793dcf7e78f25"
 				}
+			],
+			"analytics_engine_datasets": [
+				{
+					"binding": "MCP_METRICS",
+					"dataset": "mcp-metrics-staging"
+				}
 			]
 		},
 		"production": {
@@ -72,6 +88,12 @@
 					"binding": "OAUTH_KV",
 					"id": "f9782295993747df90c29c45ca89edb1"
 				}
+			],
+			"analytics_engine_datasets": [
+				{
+					"binding": "MCP_METRICS",
+					"dataset": "mcp-metrics-production"
+				}
 			]
 		}
 	}

apps/docs-autorag/package.json

@@ -5,7 +5,7 @@
 	"scripts": {
 		"check:lint": "run-eslint-workers",
 		"check:types": "run-tsc",
-		"deploy": "wrangler deploy",
+		"deploy": "run-wrangler-deploy",
 		"dev": "wrangler dev",
 		"start": "wrangler dev",
 		"cf-typegen": "wrangler types",
@@ -16,6 +16,7 @@
 		"@hono/zod-validator": "0.4.3",
 		"@modelcontextprotocol/sdk": "1.9.0",
 		"@repo/mcp-common": "workspace:*",
+		"@repo/mcp-observability": "workspace:*",
 		"agents": "0.0.62",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
@@ -25,6 +26,7 @@
 	"devDependencies": {
 		"@cloudflare/vitest-pool-workers": "0.8.14",
 		"@cloudflare/workers-types": "4.20250410.0",
+		"@types/node": "^22.14.1",
 		"prettier": "3.5.3",
 		"typescript": "5.5.4",
 		"vitest": "3.0.9",

apps/docs-autorag/src/index.ts

@@ -1,5 +1,7 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { McpAgent } from 'agents/mcp'
+import { env } from 'cloudflare:workers'
+
+import { CloudflareMCPServer } from '@repo/mcp-common/src/server'
 
 import { registerDocsTools } from './tools/docs'
 
@@ -9,9 +11,9 @@ export type Props = never
 export type State = never
 
 export class CloudflareDocumentationMCP extends McpAgent<Env, State, Props> {
-	server = new McpServer({
-		name: 'Remote MCP Server with Cloudflare Documentation',
-		version: '1.0.0',
+	server = new CloudflareMCPServer(undefined, env.MCP_METRICS, {
+		name: env.MCP_SERVER_NAME,
+		version: env.MCP_SERVER_VERSION,
 	})
 
 	constructor(

apps/docs-autorag/worker-configuration.d.ts

@@ -1,11 +1,14 @@
 /* eslint-disable */
-// Generated by Wrangler by running `wrangler types` (hash: f47f9f62d3a1ddb9823a379fdafce5ce)
-// Runtime types generated with workerd@1.20250417.0 2025-03-10 nodejs_compat
+// Generated by Wrangler by running `wrangler types` (hash: 23bfeb1ecdb06845b72c16f50728901d)
+// Runtime types generated with workerd@1.20250422.0 2025-03-10 nodejs_compat
 declare namespace Cloudflare {
 	interface Env {
 		ENVIRONMENT: "development" | "staging" | "production";
 		AUTORAG_NAME: "cloudflare-docs-autorag";
+		MCP_SERVER_NAME: "PLACEHOLDER";
+		MCP_SERVER_VERSION: "PLACEHOLDER";
 		MCP_OBJECT: DurableObjectNamespace<import("./src/index").CloudflareDocumentationMCP>;
+		MCP_METRICS: AnalyticsEngineDataset;
 		AI: Ai;
 	}
 }

apps/docs-autorag/wrangler.jsonc

@@ -30,13 +30,21 @@
 	},
 	"vars": {
 		"ENVIRONMENT": "development",
-		"AUTORAG_NAME": "cloudflare-docs-autorag"
+		"AUTORAG_NAME": "cloudflare-docs-autorag",
+		"MCP_SERVER_NAME": "PLACEHOLDER",
+		"MCP_SERVER_VERSION": "PLACEHOLDER"
 	},
 	"dev": {
 		"port": 8976
 	},
 	"workers_dev": false,
 	"preview_urls": false,
+	"analytics_engine_datasets": [
+		{
+			"binding": "MCP_METRICS",
+			"dataset": "mcp-metrics-dev"
+		}
+	],
 	"env": {
 		"staging": {
 			"name": "mcp-cloudflare-docs-autorag-staging",
@@ -54,10 +62,15 @@
 				"ENVIRONMENT": "staging",
 				"AUTORAG_NAME": "cloudflare-docs-autorag"
 			},
-
 			"ai": {
 				"binding": "AI"
-			}
+			},
+			"analytics_engine_datasets": [
+				{
+					"binding": "MCP_METRICS",
+					"dataset": "mcp-metrics-staging"
+				}
+			]
 		},
 		"production": {
 			"name": "mcp-cloudflare-docs-autorag-production",
@@ -77,7 +90,13 @@
 			},
 			"ai": {
 				"binding": "AI"
-			}
+			},
+			"analytics_engine_datasets": [
+				{
+					"binding": "MCP_METRICS",
+					"dataset": "mcp-metrics-production"
+				}
+			]
 		}
 	}
 }

apps/sandbox-container/evals/exec.eval.ts

@@ -52,5 +52,6 @@ eachModel('$modelName', ({ model }) => {
 		},
 		scorers: [checkFactuality],
 		threshold: 1,
+		timeout: 60000,
 	})
 })

apps/sandbox-container/evals/files.eval.ts

@@ -51,6 +51,7 @@ eachModel('$modelName', ({ model }) => {
 		},
 		scorers: [checkFactuality],
 		threshold: 1,
+		timeout: 60000,
 	})
 
 	describeEval('Runs container file delete', {
@@ -102,5 +103,6 @@ eachModel('$modelName', ({ model }) => {
 		},
 		scorers: [checkFactuality],
 		threshold: 1,
+		timeout: 60000,
 	})
 })