wip

Author: frankmeszaros

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

@@ -22,10 +22,10 @@ export type Props = {
 }
 
 export type State = { activeAccountId: string | null }
-export class MyMCP extends McpAgent<Env, State, Props> {
+export class CASBMCP extends McpAgent<Env, State, Props> {
 	// @ts-ignore
 	server = new McpServer({
-		name: 'Remote MCP Server with Workers Observability',
+		name: "Remote MCP Server with Cloudflare One's Cloud Access Security Broker (CASB)",
 		version: '1.0.0',
 	})
 
@@ -34,7 +34,6 @@ export class MyMCP extends McpAgent<Env, State, Props> {
 	}
 
 	async init() {
-		// @ts-ignore
 		registerAccountTools(this)
 		registerIntegrationsTools(this)
 	}
@@ -72,7 +71,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,7 @@ 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>;
 	}
 }
 interface Env extends Cloudflare.Env {}

apps/cloudflare-one-casb/wrangler.jsonc

@@ -9,7 +9,7 @@
 	"compatibility_flags": ["nodejs_compat"],
 	"migrations": [
 		{
-			"new_sqlite_classes": ["MyMCP"],
+			"new_sqlite_classes": ["CASBMCP"],
 			"tag": "v1"
 		}
 	],
@@ -22,7 +22,7 @@
 	"durable_objects": {
 		"bindings": [
 			{
-				"class_name": "MyMCP",
+				"class_name": "CASBMCP",
 				"name": "MCP_OBJECT"
 			}
 		]
@@ -43,7 +43,7 @@
 			"durable_objects": {
 				"bindings": [
 					{
-						"class_name": "MyMCP",
+						"class_name": "CASBMCP",
 						"name": "MCP_OBJECT"
 					}
 				]
@@ -62,7 +62,7 @@
 			"durable_objects": {
 				"bindings": [
 					{
-						"class_name": "MyMCP",
+						"class_name": "CASBMCP",
 						"name": "MCP_OBJECT"
 					}
 				]

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

@@ -222,7 +222,7 @@ export function createAuthHandlers({ scopes }: { scopes: Record<string, string>
 						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,