Updates

Author: cf-ml

apps/dex-analysis/README.md

@@ -2,12 +2,20 @@
 
 This is a [Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) server that supports remote MCP connections, with Cloudflare OAuth built-in.
 
-You should use this as a template to build an MCP server for Cloudflare, provided by Cloudflare at `server-name.mcp.cloudflare.com`. It has a basic set of tools `apps/template-start-here/src/tools/logs.ts` — you can modify these to do what you need
+You can deploy it to your own Cloudflare account, and after you create your own Cloudflare OAuth client app, you'll have a fully functional remote MCP server that you can build off. Users will be able to connect to your MCP server by signing in with their Cloudflare account.
+
+You can use this as a reference example for how to integrate other OAuth providers with an MCP server deployed to Cloudflare, using the [`workers-oauth-provider` library](https://github.com/cloudflare/workers-oauth-provider).
+
+The MCP server (powered by [Cloudflare Workers](https://developers.cloudflare.com/workers/)):
+
+- Acts as OAuth _Server_ to your MCP clients
+- Acts as OAuth _Client_ to your _real_ OAuth server (in this case, Cloudflare)
 
 ## Getting Started
 
+### For Production
 
-- Set secrets via Wrangler (ask in the `Cloudflare's Own MCP Servers` internal channel to get credentials)
+- Set secrets via Wrangler
 
 ```bash
 wrangler secret put CLOUDFLARE_CLIENT_ID
@@ -31,6 +39,88 @@ Test the remote server using [Inspector](https://modelcontextprotocol.io/docs/to
 npx @modelcontextprotocol/inspector@latest
 ```
 
-## Deploying to production
+Enter `https://mcp-cloudflare-staging.<your-subdomain>.workers.dev/sse` and hit connect. Once you go through the authentication flow, you'll see the Tools working:
+
+<img width="640" alt="image" src="https://github.com/user-attachments/assets/7973f392-0a9d-4712-b679-6dd23f824287" />
+
+You now have a remote MCP server deployed!
+
+#### Access the remote MCP server from Claude Desktop
+
+Open Claude Desktop and navigate to Settings -> Developer -> Edit Config. This opens the configuration file that controls which MCP servers Claude can access.
+
+Replace the content with the following configuration. Once you restart Claude Desktop, a browser window will open showing your OAuth login page. Complete the authentication flow to grant Claude access to your MCP server. After you grant access, the tools will become available for you to use.
+
+```
+{
+  "mcpServers": {
+    "cloudflare": {
+      "command": "npx",
+      "args": [
+        "mcp-remote",
+        "https://<your-subdomain>.workers.dev/sse"
+      ]
+    }
+  }
+}
+```
+
+Once the Tools (under 🔨) show up in the interface, you can ask Claude to use them. For example: "Could you use the math tool to add 23 and 19?". Claude should invoke the tool and show the result generated by the MCP server.
+
+### For Local Development
+
+If you'd like to iterate and test your MCP server, you can do so in local development. This will require you to create another OAuth App on Cloudflare:
+
+- Create a `.dev.vars` file in your project root with:
+
+```
+CLOUDFLARE_CLIENT_ID=your_development_cloudflare_client_id
+CLOUDFLARE_CLIENT_SECRET=your_development_cloudflare_client_secret
+```
+
+#### Develop & Test
+
+Run the server locally to make it available at `http://localhost:8788`
+`wrangler dev`
+
+To test the local server, enter `http://localhost:8788/sse` into Inspector and hit connect. Once you follow the prompts, you'll be able to "List Tools".
+
+#### Using Claude and other MCP Clients
+
+When using Claude to connect to your remote MCP server, you may see some error messages. This is because Claude Desktop doesn't yet support remote MCP servers, so it sometimes gets confused. To verify whether the MCP server is connected, hover over the 🔨 icon in the bottom right corner of Claude's interface. You should see your tools available there.
+
+#### Using Cursor and other MCP Clients
+
+To connect Cursor with your MCP server, choose `Type`: "Command" and in the `Command` field, combine the command and args fields into one (e.g. `npx mcp-remote https://<your-worker-name>.<your-subdomain>.workers.dev/sse`).
+
+Note that while Cursor supports HTTP+SSE servers, it doesn't support authentication, so you still need to use `mcp-remote` (and to use a STDIO server, not an HTTP one).
+
+You can connect your MCP server to other MCP clients like Windsurf by opening the client's configuration file, adding the same JSON that was used for the Claude setup, and restarting the MCP client.
+
+## How does it work?
+
+#### OAuth Provider
+
+The OAuth Provider library serves as a complete OAuth 2.1 server implementation for Cloudflare Workers. It handles the complexities of the OAuth flow, including token issuance, validation, and management. In this project, it plays the dual role of:
+
+- Authenticating MCP clients that connect to your server
+- Managing the connection to Cloudflare's OAuth services
+- Securely storing tokens and authentication state in KV storage
+
+#### Durable MCP
+
+Durable MCP extends the base MCP functionality with Cloudflare's Durable Objects, providing:
+
+- Persistent state management for your MCP server
+- Secure storage of authentication context between requests
+- Access to authenticated user information via `this.props`
+- Support for conditional tool availability based on user identity
+
+#### MCP Remote
+
+The MCP Remote library enables your server to expose tools that can be invoked by MCP clients like the Inspector. It:
 
-- You will need to liberate the zone (LTZ) for your `<server-name>.mcp.cloudflare.com`
+- Defines the protocol for communication between clients and your server
+- Provides a structured way to define tools
+- Handles serialization and deserialization of requests and responses
+- Maintains the Server-Sent Events (SSE) connection between clients and your server

apps/dex-analysis/src/index.ts

@@ -23,7 +23,7 @@ export type Props = {
 
 export type State = { activeAccountId: string | null }
 
-export class MyMCP extends McpAgent<Env, State, Props> {
+export class CloudflareDEXMCP extends McpAgent<Env, State, Props> {
 	server = new McpServer({
 		name: 'Remote MCP Server with Cloudflare DEX Analysis',
 		version: '1.0.0',
@@ -65,14 +65,14 @@ export class MyMCP extends McpAgent<Env, State, Props> {
 const DexScopes = {
 	'account:read': 'See your account info such as account details, analytics, and memberships.',
 	'user:read': 'See your user info such as name, email address, and account memberships.',
-	'teams:read': 'See Cloudflare Cloudflare Zero Trust data for your account', // TODO: Finalize configuration for this.
+	'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({
 	apiRoute: '/sse',
 	// @ts-ignore
-	apiHandler: MyMCP.mount('/sse'),
+	apiHandler: CloudflareDEXMCP.mount('/sse'),
 	// @ts-ignore
 	defaultHandler: createAuthHandlers({ scopes: DexScopes }),
 	authorizeEndpoint: '/oauth/authorize',

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

@@ -2,9 +2,9 @@ import { z } from 'zod'
 
 import { fetchDexTestAnalyzation, fetchDexTests } from '../api/dex'
 
-import type { MyMCP } from '../index'
+import type { CloudflareDEXMCP } from '../index'
 
-// Worker logs parameter schema
+// DEX parameter schema
 const dexTestIdParam = z.string().describe('The DEX Test ID to analyze details of.')
 const dexTestTimeStart = z
 	.string()
@@ -17,14 +17,7 @@ const dexTestTimeEnd = z
 		'The datetime of the ending point of time range for DEX test analyzation. Must be in ISO 8601 datetime string in the extended format with UTC time (e.g, 2025-04-22T00:00:00Z).'
 	)
 
-/**
- * Registers the dex analysis tool with the MCP server
- * @param server The MCP server instance
- * @param accountId Cloudflare account ID
- * @param apiToken Cloudflare API token
- */
-
-export function registerDEXTools(agent: MyMCP) {
+export function registerDEXTools(agent: CloudflareDEXMCP) {
 	// Register the dex test analysis tool by test id
 	agent.server.tool(
 		'dex_test_statistics',

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

@@ -7,7 +7,7 @@ declare namespace Cloudflare {
 		CLOUDFLARE_CLIENT_SECRET: string;
         ENVIRONMENT: string;
 		// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-		MCP_OBJECT: DurableObjectNamespace<import("./src/index").MyMCP>;
+		MCP_OBJECT: DurableObjectNamespace<import("./src/index").CloudflareDEXMCP>;
 	}
 }
 interface Env extends Cloudflare.Env {}