Merge pull request #97 from cloudflare/dex-mcp

DEX Minor Updates

Author: cf-ml

apps/dex-analysis/package.json

@@ -8,6 +8,7 @@
 		"deploy": "wrangler deploy",
 		"dev": "wrangler dev",
 		"start": "wrangler dev",
+		"types": "wrangler types --include-env=false",
 		"cf-typegen": "wrangler types",
 		"test": "vitest run"
 	},
@@ -16,6 +17,7 @@
 		"@hono/zod-validator": "0.4.3",
 		"@modelcontextprotocol/sdk": "1.10.2",
 		"@repo/mcp-common": "workspace:*",
+		"@repo/mcp-observability": "workspace:*",
 		"agents": "0.0.67",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",

apps/dex-analysis/src/context.ts

@@ -0,0 +1,14 @@
+import type { UserDetails } from '@repo/mcp-common/src/durable-objects/user_details'
+import type { CloudflareDEXMCP } from './index'
+
+export interface Env {
+	OAUTH_KV: KVNamespace
+	ENVIRONMENT: 'development' | 'staging' | 'production'
+	MCP_SERVER_NAME: string
+	MCP_SERVER_VERSION: string
+	CLOUDFLARE_CLIENT_ID: string
+	CLOUDFLARE_CLIENT_SECRET: string
+	MCP_OBJECT: DurableObjectNamespace<CloudflareDEXMCP>
+	USER_DETAILS: DurableObjectNamespace<UserDetails>
+	MCP_METRICS: AnalyticsEngineDataset
+}

apps/dex-analysis/src/index.ts

@@ -1,11 +1,12 @@
 import OAuthProvider from '@cloudflare/workers-oauth-provider'
 import { McpAgent } from 'agents/mcp'
-import { env } from 'cloudflare:workers'
 
 import {
 	createAuthHandlers,
 	handleTokenExchangeCallback,
 } from '@repo/mcp-common/src/cloudflare-oauth-handler'
+import { getUserDetails, UserDetails } from '@repo/mcp-common/src/durable-objects/user_details'
+import { getEnv } from '@repo/mcp-common/src/env'
 import { RequiredScopes } from '@repo/mcp-common/src/scopes'
 import { CloudflareMCPServer } from '@repo/mcp-common/src/server'
 import { registerAccountTools } from '@repo/mcp-common/src/tools/account'
@@ -14,6 +15,11 @@ import { MetricsTracker } from '@repo/mcp-observability'
 import { registerDEXTools } from './tools/dex'
 
 import type { AccountSchema, UserSchema } from '@repo/mcp-common/src/cloudflare-oauth-handler'
+import type { Env } from './context'
+
+export { UserDetails }
+
+const env = getEnv<Env>()
 
 const metrics = new MetricsTracker(env.MCP_METRICS, {
 	name: env.MCP_SERVER_NAME,
@@ -62,36 +68,32 @@ export class CloudflareDEXMCP extends McpAgent<Env, State, Props> {
 		registerDEXTools(this)
 	}
 
-	initialState: State = {
-		activeAccountId: null,
-	}
-
-	getActiveAccountId() {
-		// TODO: Figure out why this fail sometimes, and why we need to wrap this in a try catch
+	async getActiveAccountId() {
 		try {
-			return this.state.activeAccountId ?? null
+			// Get UserDetails Durable Object based off the userId and retrieve the activeAccountId from it
+			// we do this so we can persist activeAccountId across sessions
+			const userDetails = getUserDetails(env, this.props.user.id)
+			return await userDetails.getActiveAccountId()
 		} catch (e) {
+			this.server.recordError(e)
 			return null
 		}
 	}
 
-	setActiveAccountId(accountId: string) {
-		// TODO: Figure out why this fail sometimes, and why we need to wrap this in a try catch
+	async setActiveAccountId(accountId: string) {
 		try {
-			this.setState({
-				...this.state,
-				activeAccountId: accountId,
-			})
+			const userDetails = getUserDetails(env, this.props.user.id)
+			await userDetails.setActiveAccountId(accountId)
 		} catch (e) {
-			return null
+			this.server.recordError(e)
 		}
 	}
 }
 
 const DexScopes = {
 	...RequiredScopes,
+	'account:read': 'See your account info such as account details, analytics, and memberships.',
 	'dex:read': 'See Cloudflare Cloudflare DEX data for your account',
-	offline_access: 'Grants refresh tokens for long-lived access.',
 } as const
 
 export default new OAuthProvider({

apps/dex-analysis/src/tools/dex.ts

@@ -28,7 +28,7 @@ export function registerDEXTools(agent: CloudflareDEXMCP) {
 			timeEnd: dexTestTimeEnd,
 		},
 		async (params) => {
-			const accountId = agent.getActiveAccountId()
+			const accountId = await agent.getActiveAccountId()
 			if (!accountId) {
 				return {
 					content: [
@@ -82,7 +82,7 @@ export function registerDEXTools(agent: CloudflareDEXMCP) {
 		'Retrieve a list of all Cloudflare DEX Tests configured.',
 		{},
 		async () => {
-			const accountId = agent.getActiveAccountId()
+			const accountId = await agent.getActiveAccountId()
 			if (!accountId) {
 				return {
 					content: [

apps/dex-analysis/tsconfig.json

@@ -1,3 +1,4 @@
 {
-	"extends": "@repo/typescript-config/workers.json"
-}
+	"extends": "@repo/typescript-config/workers.json",
+	"include": ["*/**.ts"]
+}

apps/dex-analysis/worker-configuration.d.ts

@@ -1,17 +1,4 @@
-// Generated by Wrangler by running `wrangler types` (hash: 085ce38c6421603ed1a73fa9678ae0a7)
 // Runtime types generated with [email protected] 2025-03-10 nodejs_compat
-declare namespace Cloudflare {
-	interface Env {
-		OAUTH_KV: KVNamespace;
-		CLOUDFLARE_CLIENT_ID: string;
-		CLOUDFLARE_CLIENT_SECRET: string;
-        ENVIRONMENT: string;
-		// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-		MCP_OBJECT: DurableObjectNamespace<import("./src/index").CloudflareDEXMCP>;
-	}
-}
-interface Env extends Cloudflare.Env {}
-
 // Begin runtime types
 /*! *****************************************************************************
 Copyright (c) Cloudflare. All rights reserved.

apps/dex-analysis/wrangler.jsonc

@@ -21,6 +21,10 @@
 			{
 				"class_name": "CloudflareDEXMCP",
 				"name": "MCP_OBJECT"
+			},
+			{
+				"class_name": "UserDetails",
+				"name": "USER_DETAILS"
 			}
 		]
 	},
@@ -54,6 +58,11 @@
 					{
 						"class_name": "CloudflareDEXMCP",
 						"name": "MCP_OBJECT"
+					},
+					{
+						"class_name": "UserDetails",
+						"name": "USER_DETAILS",
+						"script_name": "mcp-cloudflare-workers-observability-staging"
 					}
 				]
 			},
@@ -82,6 +91,11 @@
 					{
 						"class_name": "CloudflareDEXMCP",
 						"name": "MCP_OBJECT"
+					},
+					{
+						"class_name": "UserDetails",
+						"name": "USER_DETAILS",
+						"script_name": "mcp-cloudflare-workers-observability-production"
 					}
 				]
 			},