Merge pull request #1 from frankmeszaros/fm/v0

wip

Author: frankmeszaros

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

@@ -1,12 +1,12 @@
 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 { registerIntegrationsTools } from './tools/integrations'
@@ -22,19 +22,13 @@ export type Props = {
 }
 
 export type State = { activeAccountId: string | null }
-export class MyMCP extends McpAgent<Env, State, Props> {
-	// @ts-ignore
-	server = new McpServer({
-		name: 'Remote MCP Server with Workers Observability',
-		version: '1.0.0',
+export class CASBMCP extends McpAgent<Env, State, Props> {
+	server = new CloudflareMCPServer(undefined, env.MCP_METRICS, {
+		name: env.MCP_SERVER_NAME,
+		version: env.MCP_SERVER_VERSION,
 	})
 
-	initialState: State = {
-		activeAccountId: null,
-	}
-
 	async init() {
-		// @ts-ignore
 		registerAccountTools(this)
 		registerIntegrationsTools(this)
 	}
@@ -50,8 +44,6 @@ export class MyMCP 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,
@@ -72,7 +64,7 @@ const CloudflareOneCasbScopes = {
 export default new OAuthProvider({
 	apiRoute: '/sse',
 	// @ts-ignore
-	apiHandler: MyMCP.mount('/sse'),
+	apiHandler: CASBMCP.mount('/sse'),
 	// @ts-ignore
 	defaultHandler: createAuthHandlers({ scopes: CloudflareOneCasbScopes }),
 	authorizeEndpoint: '/oauth/authorize',

apps/cloudflare-one-casb/src/tools/integrations.ts

@@ -15,7 +15,7 @@ import {
 	assetCategoryVendorParam,
 } from '@repo/mcp-common/src/schemas/cf1-integrations'
 
-import type { MyMCP } from '../index'
+import type { CASBMCP } from '../index'
 
 const PAGE_SIZE = 3
 
@@ -40,7 +40,10 @@ interface ToolDefinition<T extends Record<string, any>> {
 }
 
 // Helper function to handle common error cases and account ID checks
-const withAccountCheck = <T extends Record<string, any>>(agent: MyMCP, handler: ToolHandler<T>) => {
+const withAccountCheck = <T extends Record<string, any>>(
+	agent: CASBMCP,
+	handler: ToolHandler<T>
+) => {
 	return async (params: T) => {
 		const accountId = agent.getActiveAccountId()
 		if (!accountId) {
@@ -295,7 +298,7 @@ const toolDefinitions: Array<ToolDefinition<any>> = [
  * Registers the logs analysis tool with the MCP server
  * @param agent The MCP server instance
  */
-export function registerIntegrationsTools(agent: MyMCP) {
+export function registerIntegrationsTools(agent: CASBMCP) {
 	toolDefinitions.forEach(({ name, description, params, handler }) => {
 		agent.server.tool(name, description, params, withAccountCheck(agent, handler))
 	})

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

@@ -5,7 +5,11 @@ declare namespace Cloudflare {
 		OAUTH_KV: KVNamespace;
 		CLOUDFLARE_CLIENT_ID: string;
 		CLOUDFLARE_CLIENT_SECRET: string;
-		MCP_OBJECT: DurableObjectNamespace<import("./src/index").MyMCP>;
+		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

@@ -9,20 +9,24 @@
 	"compatibility_flags": ["nodejs_compat"],
 	"migrations": [
 		{
-			"new_sqlite_classes": ["MyMCP"],
+			"new_sqlite_classes": ["CASBMCP"],
 			"tag": "v1"
 		}
 	],
 	"observability": {
 		"enabled": true
 	},
+	"vars": {
+		"MCP_SERVER_NAME": "PLACEHOLDER",
+		"MCP_SERVER_VERSION": "PLACEHOLDER"
+	},
 	"dev": {
 		"port": 8976
 	},
 	"durable_objects": {
 		"bindings": [
 			{
-				"class_name": "MyMCP",
+				"class_name": "CASBMCP",
 				"name": "MCP_OBJECT"
 			}
 		]
@@ -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",
@@ -43,7 +53,7 @@
 			"durable_objects": {
 				"bindings": [
 					{
-						"class_name": "MyMCP",
+						"class_name": "CASBMCP",
 						"name": "MCP_OBJECT"
 					}
 				]
@@ -53,6 +63,12 @@
 					"binding": "OAUTH_KV",
 					"id": "18e839155d00407095d793dcf7e78f25"
 				}
+			],
+			"analytics_engine_datasets": [
+				{
+					"binding": "MCP_METRICS",
+					"dataset": "mcp-metrics-staging"
+				}
 			]
 		},
 		"production": {
@@ -62,7 +78,7 @@
 			"durable_objects": {
 				"bindings": [
 					{
-						"class_name": "MyMCP",
+						"class_name": "CASBMCP",
 						"name": "MCP_OBJECT"
 					}
 				]
@@ -72,6 +88,12 @@
 					"binding": "OAUTH_KV",
 					"id": "f9782295993747df90c29c45ca89edb1"
 				}
+			],
+			"analytics_engine_datasets": [
+				{
+					"binding": "MCP_METRICS",
+					"dataset": "mcp-metrics-production"
+				}
 			]
 		}
 	}

packages/mcp-common/src/cloudflare-oauth-handler.ts

@@ -237,7 +237,7 @@ export function createAuthHandlers({
 						label: user.email,
 					},
 					scope: oauthReqInfo.scope,
-					// This will be available on this.props inside MyMCP
+					// This will be available on this.props inside CASBMCP
 					props: {
 						user,
 						accounts,