cloudflare · Maximo-Guk · Jun 16, 2025 · Jun 16, 2025
diff --git a/.changeset/long-spies-peel.md b/.changeset/long-spies-peel.md
@@ -0,0 +1,8 @@
+---
+'workers-observability': minor
+'workers-bindings': minor
+'docs-vectorize': minor
+'@repo/mcp-common': minor
+---
+
+Add search docs tool to bindings and obs servers
diff --git a/apps/docs-vectorize/src/docs-vectorize.app.ts b/apps/docs-vectorize/src/docs-vectorize.app.ts
@@ -2,10 +2,9 @@ import { McpAgent } from 'agents/mcp'
 
 import { createApiHandler } from '@repo/mcp-common/src/api-handler'
 import { getEnv } from '@repo/mcp-common/src/env'
+import { registerPrompts } from '@repo/mcp-common/src/prompts/docs-vectorize.prompts'
 import { CloudflareMCPServer } from '@repo/mcp-common/src/server'
-
-import { registerPrompts } from './prompts/docs-vectorize.prompts'
-import { registerDocsTools } from './tools/docs-vectorize.tools'
+import { registerDocsTools } from '@repo/mcp-common/src/tools/docs-vectorize.tools'
 
 import type { Env } from './docs-vectorize.context'
 
@@ -33,7 +32,7 @@ export class CloudflareDocumentationMCP extends McpAgent<Env, State, Props> {
 	}
 
 	async init() {
-		registerDocsTools(this)
+		registerDocsTools(this, this.env)
 		registerPrompts(this)
 	}
 }

diff --git a/apps/workers-bindings/src/bindings.app.ts b/apps/workers-bindings/src/bindings.app.ts
@@ -8,10 +8,12 @@ import {
 } from '@repo/mcp-common/src/cloudflare-oauth-handler'
 import { getUserDetails, UserDetails } from '@repo/mcp-common/src/durable-objects/user_details.do'
 import { getEnv } from '@repo/mcp-common/src/env'
+import { registerPrompts } from '@repo/mcp-common/src/prompts/docs-vectorize.prompts'
 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.tools'
 import { registerD1Tools } from '@repo/mcp-common/src/tools/d1.tools'
+import { registerDocsTools } from '@repo/mcp-common/src/tools/docs-vectorize.tools'
 import { registerHyperdriveTools } from '@repo/mcp-common/src/tools/hyperdrive.tools'
 import { registerKVTools } from '@repo/mcp-common/src/tools/kv_namespace.tools'
 import { registerR2BucketTools } from '@repo/mcp-common/src/tools/r2_bucket.tools'
@@ -77,6 +79,10 @@ export class WorkersBindingsMCP extends McpAgent<Env, WorkersBindingsMCPState, P
 		registerR2BucketTools(this)
 		registerD1Tools(this)
 		registerHyperdriveTools(this)
+
+		// Add docs tools
+		registerDocsTools(this, this.env)
+		registerPrompts(this)
 	}
 
 	async getActiveAccountId() {

diff --git a/apps/workers-bindings/src/bindings.context.ts b/apps/workers-bindings/src/bindings.context.ts
@@ -11,13 +11,14 @@ export interface Env {
 	MCP_OBJECT: DurableObjectNamespace<WorkersBindingsMCP>
 	USER_DETAILS: DurableObjectNamespace<UserDetails>
 	MCP_METRICS: AnalyticsEngineDataset
-	DEV_DISABLE_OAUTH: string
-	DEV_CLOUDFLARE_API_TOKEN: string
-	DEV_CLOUDFLARE_EMAIL: string
 	CLOUDFLARE_API_TOKEN: string
 	OPENAI_API_KEY: string
 	AI_GATEWAY_TOKEN: string
 	CLOUDFLARE_ACCOUNT_ID: string
 	AI_GATEWAY_ID: string
 	AI: Ai
+	VECTORIZE: VectorizeIndex
+	DEV_DISABLE_OAUTH: string
+	DEV_CLOUDFLARE_API_TOKEN: string
+	DEV_CLOUDFLARE_EMAIL: string
 }
diff --git a/apps/workers-bindings/wrangler.jsonc b/apps/workers-bindings/wrangler.jsonc
@@ -45,6 +45,15 @@
 		"CLOUDFLARE_CLIENT_ID": "<PLACEHOLDER>",
 		"CLOUDFLARE_CLIENT_SECRET": "<PLACEHOLDER>"
 	},
+	"ai": {
+		"binding": "AI"
+	},
+	"vectorize": [
+		{
+			"binding": "VECTORIZE",
+			"index_name": "docs-bge-base"
+		}
+	],
 	"workers_dev": false,
 	"preview_urls": false,
 	"analytics_engine_datasets": [
@@ -77,6 +86,15 @@
 					"id": "4258ce2dee98428db6c9870eb5097f26"
 				}
 			],
+			"ai": {
+				"binding": "AI"
+			},
+			"vectorize": [
+				{
+					"binding": "VECTORIZE",
+					"index_name": "docs-bge-base"
+				}
+			],
 			"vars": {
 				"ENVIRONMENT": "staging",
 				"MCP_SERVER_NAME": "workers-bindings-staging",
@@ -117,6 +135,15 @@
 				"MCP_SERVER_NAME": "workers-bindings",
 				"MCP_SERVER_VERSION": "1.0.0"
 			},
+			"ai": {
+				"binding": "AI"
+			},
+			"vectorize": [
+				{
+					"binding": "VECTORIZE",
+					"index_name": "docs-bge-base"
+				}
+			],
 			"analytics_engine_datasets": [
 				{
 					"binding": "MCP_METRICS",

diff --git a/apps/workers-observability/src/workers-observability.app.ts b/apps/workers-observability/src/workers-observability.app.ts
@@ -8,10 +8,12 @@ import {
 } from '@repo/mcp-common/src/cloudflare-oauth-handler'
 import { getUserDetails, UserDetails } from '@repo/mcp-common/src/durable-objects/user_details.do'
 import { getEnv } from '@repo/mcp-common/src/env'
+import { registerPrompts } from '@repo/mcp-common/src/prompts/docs-vectorize.prompts'
 import { RequiredScopes } from '@repo/mcp-common/src/scopes'
 import { initSentryWithUser } from '@repo/mcp-common/src/sentry'
 import { CloudflareMCPServer } from '@repo/mcp-common/src/server'
 import { registerAccountTools } from '@repo/mcp-common/src/tools/account.tools'
+import { registerDocsTools } from '@repo/mcp-common/src/tools/docs-vectorize.tools'
 import { registerWorkersTools } from '@repo/mcp-common/src/tools/worker.tools'
 
 import { MetricsTracker } from '../../../packages/mcp-observability/src'
@@ -83,6 +85,10 @@ export class ObservabilityMCP extends McpAgent<Env, State, Props> {
 
 		// Register Cloudflare Workers logs tools
 		registerObservabilityTools(this)
+
+		// Add docs tools
+		registerDocsTools(this, this.env)
+		registerPrompts(this)
 	}
 
 	async getActiveAccountId() {

diff --git a/apps/workers-observability/src/workers-observability.context.ts b/apps/workers-observability/src/workers-observability.context.ts
@@ -15,6 +15,8 @@ export interface Env {
 	SENTRY_ACCESS_CLIENT_SECRET: string
 	GIT_HASH: string
 	SENTRY_DSN: string
+	AI: Ai
+	VECTORIZE: VectorizeIndex
 	DEV_DISABLE_OAUTH: string
 	DEV_CLOUDFLARE_API_TOKEN: string
 	DEV_CLOUDFLARE_EMAIL: string

diff --git a/apps/workers-observability/wrangler.jsonc b/apps/workers-observability/wrangler.jsonc
@@ -35,6 +35,15 @@
 			"id": "DEV_KV"
 		}
 	],
+	"ai": {
+		"binding": "AI"
+	},
+	"vectorize": [
+		{
+			"binding": "VECTORIZE",
+			"index_name": "docs-bge-base"
+		}
+	],
 	"vars": {
 		"ENVIRONMENT": "development",
 		"MCP_SERVER_NAME": "PLACEHOLDER",
@@ -83,6 +92,15 @@
 				"MCP_SERVER_NAME": "workers-observability-staging",
 				"MCP_SERVER_VERSION": "1.0.0"
 			},
+			"ai": {
+				"binding": "AI"
+			},
+			"vectorize": [
+				{
+					"binding": "VECTORIZE",
+					"index_name": "docs-bge-base"
+				}
+			],
 			"analytics_engine_datasets": [
 				{
 					"binding": "MCP_METRICS",
@@ -112,6 +130,15 @@
 					"id": "753f27a19ef94d7dbd49de05588ca890"
 				}
 			],
+			"ai": {
+				"binding": "AI"
+			},
+			"vectorize": [
+				{
+					"binding": "VECTORIZE",
+					"index_name": "docs-bge-base"
+				}
+			],
 			"vars": {
 				"ENVIRONMENT": "production",
 				"GIT_HASH": "OVERRIDEN_DURING_DEPLOYMENT",

diff --git a/...ize/src/prompts/docs-vectorize.prompts.ts → ...mon/src/prompts/docs-vectorize.prompts.ts b/...ize/src/prompts/docs-vectorize.prompts.ts → ...mon/src/prompts/docs-vectorize.prompts.ts
@@ -1,10 +1,10 @@
-import type { CloudflareDocumentationMCP } from '../docs-vectorize.app'
+import type { CloudflareMcpAgentNoAccount } from '../types/cloudflare-mcp-agent.types'
 
 /**
  * Registers developer-platform-related prompts with the MCP server
  * @param agent The MCP server instance
  */
-export function registerPrompts(agent: CloudflareDocumentationMCP) {
+export function registerPrompts(agent: CloudflareMcpAgentNoAccount) {
 	agent.server.prompt(
 		'workers-prompt-full',
 		'Detailed prompt for generating Cloudflare Workers code (and other developer platform products) from https://developers.cloudflare.com/workers/prompt.txt',

diff --git a/...ctorize/src/tools/docs-vectorize.tools.ts → ...-common/src/tools/docs-vectorize.tools.ts b/...ctorize/src/tools/docs-vectorize.tools.ts → ...-common/src/tools/docs-vectorize.tools.ts
@@ -1,6 +1,11 @@
 import { z } from 'zod'
 
-import type { CloudflareDocumentationMCP } from '../docs-vectorize.app'
+import type { CloudflareMcpAgentNoAccount } from '../types/cloudflare-mcp-agent.types'
+
+interface RequiredEnv {
+	AI: Ai
+	VECTORIZE: VectorizeIndex
+}
 
 // Always return 10 results for simplicity, don't make it configurable
 const TOP_K = 10
@@ -9,7 +14,7 @@ const TOP_K = 10
  * Registers the docs search tool with the MCP server
  * @param agent The MCP server instance
  */
-export function registerDocsTools(agent: CloudflareDocumentationMCP) {
+export function registerDocsTools(agent: CloudflareMcpAgentNoAccount, env: RequiredEnv) {
 	agent.server.tool(
 		'search_cloudflare_documentation',
 		`Search the Cloudflare documentation.
@@ -26,7 +31,7 @@ export function registerDocsTools(agent: CloudflareDocumentationMCP) {
 			query: z.string(),
 		},
 		async ({ query }) => {
-			const results = await queryVectorize(agent.env.AI, agent.env.VECTORIZE, query, TOP_K)
+			const results = await queryVectorize(env.AI, env.VECTORIZE, query, TOP_K)
 			const resultsAsXml = results
 				.map((result) => {
 					return `<result>

diff --git a/packages/mcp-common/src/types/cloudflare-mcp-agent.types.ts b/packages/mcp-common/src/types/cloudflare-mcp-agent.types.ts
@@ -13,8 +13,13 @@ type McpAgentWithoutServer<EnvType = unknown> = Omit<
 	'server'
 >
 
-export interface CloudflareMcpAgent<EnvType = unknown> extends McpAgentWithoutServer<EnvType> {
+export interface CloudflareMcpAgentNoAccount<EnvType = unknown>
+	extends McpAgentWithoutServer<EnvType> {
 	server: CloudflareMCPServer
+}
+
+export interface CloudflareMcpAgent<EnvType = unknown>
+	extends CloudflareMcpAgentNoAccount<EnvType> {
 	setActiveAccountId(accountId: string): Promise<void>
 	getActiveAccountId(): Promise<string | null>
 }