feat: Add workers-bindings mcp server with KV tools

Author: deloreyj

apps/workers-bindings/img/available-tools.png

@@ -11,18 +11,18 @@
 		"types": "wrangler types"
 	},
 	"devDependencies": {
-		"@types/node": "^22.14.1",
-		"marked": "^15.0.7",
-		"typescript": "^5.5.2",
+		"@types/node": "22.14.1",
+		"marked": "15.0.7",
+		"typescript": "5.5.4",
 		"workers-mcp": "^0.1.0-3",
-		"wrangler": "^4.10.0"
+		"wrangler": "4.10.0"
 	},
 	"dependencies": {
-		"@cloudflare/workers-oauth-provider": "^0.0.2",
-		"@modelcontextprotocol/sdk": "^1.7.0",
-		"agents": "^0.0.43",
-		"hono": "^4.7.4",
-		"zod": "^3.24.2",
+		"@cloudflare/workers-oauth-provider": "0.0.2",
+		"@modelcontextprotocol/sdk": "1.8.0",
+		"agents": "0.0.49",
+		"hono": "4.7.6",
+		"zod": "3.24.2",
 		"@repo/mcp-common": "workspace:*"
 	}
 }

apps/workers-bindings/img/claude-does-math-the-fancy-way.png

@@ -1,103 +1,75 @@
-import app from "./app";
-import { McpAgent } from "agents/mcp";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { z } from "zod";
-import OAuthProvider from "@cloudflare/workers-oauth-provider";
-import { handleKVNamespacesList } from "@repo/mcp-common/src/api/kv";
-import { getCloudflareClient } from "@repo/mcp-common/src/cloudflare-api";
+import OAuthProvider from '@cloudflare/workers-oauth-provider'
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
+import { McpAgent } from 'agents/mcp'
+
 import {
 	CloudflareAuthHandler,
 	handleTokenExchangeCallback,
-	type AccountSchema,
-	type UserSchema,
-} from "@repo/mcp-common/src/cloudflare-oauth-handler";
+} from '@repo/mcp-common/src/cloudflare-oauth-handler'
+import { registerAccountTools } from '@repo/mcp-common/src/tools/account'
+import { registerKVTools } from '@repo/mcp-common/src/tools/kv_namespace'
+import { registerWorkersTools } from '@repo/mcp-common/src/tools/worker'
+
+import type { AccountSchema, UserSchema } from '@repo/mcp-common/src/cloudflare-oauth-handler'
 
-export type WorkersBindingsMCPState = { activeAccountId: string | null };
+export type WorkersBindingsMCPState = { activeAccountId: string | null }
 
 // Context from the auth process, encrypted & stored in the auth token
 // and provided to the DurableMCP as this.props
 export type Props = {
-	accessToken: string;
-	user: UserSchema["result"];
-	accounts: AccountSchema["result"];
-};
+	accessToken: string
+	user: UserSchema['result']
+	accounts: AccountSchema['result']
+}
 
 export class WorkersBindingsMCP extends McpAgent<Env, WorkersBindingsMCPState, Props> {
 	server = new McpServer({
-		name: "Demo",
-		version: "1.0.0",
-	});
+		name: 'Demo',
+		version: '1.0.0',
+	})
 
 	initialState: WorkersBindingsMCPState = {
 		activeAccountId: null,
-	};
+	}
 
 	async init() {
-		this.server.tool("add", { a: z.number(), b: z.number() }, async ({ a, b }) => ({
-			content: [{ type: "text", text: String(a + b) }],
-		}));
-		this.server.tool('kv_namespaces_list', "List all of the kv namespaces in your Cloudflare account", {}, async () => {
-			const account_id = this.getActiveAccountId();
-			if (!account_id) {
-				return {
-					content: [
-						{
-							type: "text",
-							text: "No currently active accountId. Try listing your accounts (accounts_list) and then setting an active account (set_active_account)",
-						},
-					],
-				};
-			}
-			try {
-				const namespaces = await handleKVNamespacesList({
-					client: getCloudflareClient(this.props.accessToken),
-					account_id
-				});
-
-				return {
-					content: [
-						{
-							type: "text",
-							text: JSON.stringify({
-								namespaces,
-								count: namespaces.length
-							})
-						}
-					]
-				}
-			} catch(error) {
-				return {
-					content: [
-						{
-							type: "text",
-							text: `Error listing KV namespaces: ${error instanceof Error && error.message}`,
-						},
-					],
-				};
-			}
-		})
+		registerAccountTools(this)
+		registerKVTools(this)
+		registerWorkersTools(this)
 	}
 	getActiveAccountId() {
 		// TODO: Figure out why this fail sometimes, and why we need to wrap this in a try catch
 		try {
-			return this.state.activeAccountId ?? null;
+			return this.state.activeAccountId ?? null
+		} catch (e) {
+			return null
+		}
+	}
+
+	setActiveAccountId(accountId: string) {
+		// TODO: Figure out why this fail sometimes, and why we need to wrap this in a try catch
+		try {
+			this.setState({
+				...this.state,
+				activeAccountId: accountId,
+			})
 		} catch (e) {
-			return null;
+			return null
 		}
 	}
 }
 
 // Export the OAuth handler as the default
 export default new OAuthProvider({
-	apiRoute: "/workers/bindings/sse",
-	// TODO: fix these types
+	apiRoute: '/workers/bindings/sse',
 	// @ts-ignore
-	apiHandler: WorkersBindingsMCP.mount("/workers/bindings/sse"),
+	apiHandler: WorkersBindingsMCP.mount('/workers/bindings/sse'),
 	// @ts-ignore
 	defaultHandler: CloudflareAuthHandler,
-	authorizeEndpoint: "/oauth/authorize",
-	tokenEndpoint: "/token",
+	authorizeEndpoint: '/oauth/authorize',
+	tokenEndpoint: '/token',
 	tokenExchangeCallback: handleTokenExchangeCallback,
+	// Cloudflare access token TTL
 	accessTokenTTL: 3600,
-	clientRegistrationEndpoint: "/register",
-});
+	clientRegistrationEndpoint: '/register',
+})