mattzcarey · Oct 8, 2026 · Oct 6, 2026
diff --git a/.changeset/rename-code-mode-server.md b/.changeset/rename-code-mode-server.md
@@ -0,0 +1,7 @@
+---
+'auditlogs': patch
+'cloudflare-autorag-mcp-server': patch
+'cloudflare-radar-mcp-server': patch
+---
+
+Refer to the replacement as the Cloudflare API MCP server, not Code Mode, in the deprecation instructions.
diff --git a/README.md b/README.md
@@ -6,18 +6,18 @@ These MCP servers allow your [MCP Client](https://modelcontextprotocol.io/client
 
 Every server in this repository exposes the same stateless Streamable HTTP handler at `/mcp` and `/sse` through a fresh SDK v2 server factory. `/sse` remains as a URL compatibility alias; it does not use the deprecated HTTP+SSE transport. A legacy SSE `GET /sse` request receives a `410 Gone` Problem Details response with two migration options: configure the existing URL to use Streamable HTTP, or switch to the recommended `/mcp` URL for future compatibility. Modern 2026 requests and stateless 2025 requests share the same request-scoped implementation without an MCP protocol session. OAuth, credentials, account selection, application caches, and product Durable Objects remain application/security state where required.
 
-Cloudflare offers the following MCP servers. The domain-specific servers are included in this repository, while the recommended Code Mode server is maintained in [`cloudflare/mcp`](https://github.com/cloudflare/mcp):
-
-| Server Name                                                             | Description                                                                                     | Server URL                                  |
-| ----------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ------------------------------------------- |
-| [**Code Mode server (recommended)**](https://github.com/cloudflare/mcp) | Best when you want broad access across Cloudflare's APIs through code execution                 | `https://mcp.cloudflare.com/mcp`            |
-| [**Documentation server**](/apps/docs-ai-search)                        | Get up-to-date reference information on Cloudflare                                              | `https://docs.mcp.cloudflare.com/mcp`       |
-| [**Container server**](/apps/sandbox-container)                         | Spin up a sandbox development environment                                                       | `https://containers.mcp.cloudflare.com/mcp` |
-| [**Browser Run server**](/apps/browser-rendering)                       | Fetch web pages, convert them to markdown and take screenshots                                  | `https://browser.mcp.cloudflare.com/mcp`    |
-| [**Digital Experience Monitoring server**](/apps/dex-analysis)          | Get quick insight on critical applications for your organization                                | `https://dex.mcp.cloudflare.com/mcp`        |
-| [**Cloudflare One CASB server**](/apps/cloudflare-one-casb)             | Quickly identify any security misconfigurations for SaaS applications to safeguard users & data | `https://casb.mcp.cloudflare.com/mcp`       |
-| [**Cloudflare Blog server**](/apps/cloudflare-blog)                     | Search and read posts from the Cloudflare Blog                                                  | `https://blog.mcp.cloudflare.com/mcp`       |
-| [**Demo Day server**](/apps/demo-day)                                   | Demonstrate a minimal Cloudflare MCP server                                                     | `https://demo-day.mcp.cloudflare.com/mcp`   |
+Cloudflare offers the following MCP servers. The domain-specific servers are included in this repository, while the recommended Cloudflare API MCP Server is maintained in [`cloudflare/mcp`](https://github.com/cloudflare/mcp):
+
+| Server Name                                                                      | Description                                                                                     | Server URL                                  |
+| -------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ------------------------------------------- |
+| [**Cloudflare API MCP Server (recommended)**](https://github.com/cloudflare/mcp) | Best when you want broad access across Cloudflare's APIs through code execution                 | `https://mcp.cloudflare.com/mcp`            |
+| [**Documentation server**](/apps/docs-ai-search)                                 | Get up-to-date reference information on Cloudflare                                              | `https://docs.mcp.cloudflare.com/mcp`       |
+| [**Container server**](/apps/sandbox-container)                                  | Spin up a sandbox development environment                                                       | `https://containers.mcp.cloudflare.com/mcp` |
+| [**Browser Run server**](/apps/browser-rendering)                                | Fetch web pages, convert them to markdown and take screenshots                                  | `https://browser.mcp.cloudflare.com/mcp`    |
+| [**Digital Experience Monitoring server**](/apps/dex-analysis)                   | Get quick insight on critical applications for your organization                                | `https://dex.mcp.cloudflare.com/mcp`        |
+| [**Cloudflare One CASB server**](/apps/cloudflare-one-casb)                      | Quickly identify any security misconfigurations for SaaS applications to safeguard users & data | `https://casb.mcp.cloudflare.com/mcp`       |
+| [**Cloudflare Blog server**](/apps/cloudflare-blog)                              | Search and read posts from the Cloudflare Blog                                                  | `https://blog.mcp.cloudflare.com/mcp`       |
+| [**Demo Day server**](/apps/demo-day)                                            | Demonstrate a minimal Cloudflare MCP server                                                     | `https://demo-day.mcp.cloudflare.com/mcp`   |
 
 <details>
 <summary><strong>Deprecated servers</strong></summary>
@@ -43,14 +43,14 @@ Please migrate to the [Cloudflare API MCP Server](https://mcp.cloudflare.com/mcp
 
 Cloudflare provides two categories of MCP servers:
 
-- **Code Mode server** (`mcp.cloudflare.com`) in [`cloudflare/mcp`](https://github.com/cloudflare/mcp):
+- **Cloudflare API MCP Server** (`mcp.cloudflare.com`) in [`cloudflare/mcp`](https://github.com/cloudflare/mcp):
   best when you want broad access across Cloudflare's APIs through code execution.
 - **Domain-specific servers** (`*.mcp.cloudflare.com`) in this repository:
   best when you want curated, typed tools for a specific Cloudflare product area.
 
 ### When should you use each?
 
-Use the **Code Mode server** when:
+Use the **Cloudflare API MCP Server** when:
 
 - you need broad API coverage across many Cloudflare products
 - you prefer a smaller set of general-purpose tools
@@ -62,7 +62,7 @@ Use the **domain-specific servers** in this repository when:
 - you want more guided, typed interactions
 - you are working primarily within one Cloudflare domain such as Browser Run or containers
 
-Learn more about the Code Mode server here: [`cloudflare/mcp`](https://github.com/cloudflare/mcp).
+Learn more about the Cloudflare API MCP Server here: [`cloudflare/mcp`](https://github.com/cloudflare/mcp).
 
 ## Connect to an MCP server
 

diff --git a/apps/auditlogs/README.md b/apps/auditlogs/README.md
@@ -18,7 +18,7 @@ Configure the replacement server in your MCP client:
 }
 ```
 
-The replacement uses [Code Mode](https://blog.cloudflare.com/code-mode-mcp/). Its `search` and `execute` tools cover the full Cloudflare API and return the complete Audit Logs API response. Clients that need endpoint-specific tools can use `https://mcp.cloudflare.com/mcp?codemode=false`; Audit Logs is exposed as `get_accounts_logs_audit`. See [`cloudflare/mcp`](https://github.com/cloudflare/mcp) for details.
+The replacement's `search` and `execute` tools cover the full Cloudflare API and return the complete Audit Logs API response. Clients that need endpoint-specific tools can use `https://mcp.cloudflare.com/mcp?codemode=false`; Audit Logs is exposed as `get_accounts_logs_audit`. See [`cloudflare/mcp`](https://github.com/cloudflare/mcp) for details.
 
 The tool below still works for now, but no new features will be added. Please migrate to the Cloudflare API MCP server.
 

diff --git a/apps/auditlogs/src/auditlogs.app.ts b/apps/auditlogs/src/auditlogs.app.ts
@@ -13,8 +13,8 @@ Use the Cloudflare API MCP server instead:
     https://mcp.cloudflare.com/mcp
 
 It covers Audit Logs v2 through the full Cloudflare API, including filters and
-cursor pagination for GET /accounts/{account_id}/logs/audit. Its Code Mode
-search and execute tools support both OAuth and Cloudflare API tokens.
+cursor pagination for GET /accounts/{account_id}/logs/audit. Its search and
+execute tools support both OAuth and Cloudflare API tokens.
 
 This Audit Logs server continues to respond for now, but will be retired. Please
 migrate at your earliest convenience.`

diff --git a/apps/autorag/README.md b/apps/autorag/README.md
@@ -16,7 +16,7 @@ All new work should move to the unified server:
 }
 ```
 
-That server uses [Code Mode](https://blog.cloudflare.com/code-mode-mcp/) — two generic tools (`search` and `execute`) that give agents access to the full Cloudflare API through code execution. It supports both OAuth (connect to the URL and authorize) and Cloudflare API tokens (send as a bearer token). See [`cloudflare/mcp`](https://github.com/cloudflare/mcp) for details.
+That server has two generic tools (`search` and `execute`) that give agents access to the full Cloudflare API through code execution. It supports both OAuth (connect to the URL and authorize) and Cloudflare API tokens (send as a bearer token). See [`cloudflare/mcp`](https://github.com/cloudflare/mcp) for details.
 
 ### What about my existing AutoRAG instances?
 

diff --git a/apps/autorag/src/autorag.app.ts b/apps/autorag/src/autorag.app.ts
@@ -16,7 +16,7 @@ to the unified Cloudflare MCP server at:
     https://mcp.cloudflare.com/mcp
 
 That server covers the full Cloudflare API — including AI Search, which
-replaces AutoRAG — via Code Mode (two generic tools: \`search\` and \`execute\`).
+replaces AutoRAG — through two generic tools: \`search\` and \`execute\`.
 It supports both OAuth (connect to the URL and authorize) and Cloudflare API
 tokens (send as a bearer token).
 

diff --git a/apps/graphql/README.md b/apps/graphql/README.md
@@ -18,7 +18,7 @@ Configure the replacement server in your MCP client:
 }
 ```
 
-The replacement uses [Code Mode](https://blog.cloudflare.com/code-mode-mcp/). Its `search` and `execute` tools cover the full Cloudflare API, including `POST /client/v4/graphql`. See the [GraphQL Analytics API example](https://github.com/cloudflare/mcp#graphql-analytics-api) in [`cloudflare/mcp`](https://github.com/cloudflare/mcp).
+The replacement's `search` and `execute` tools cover the full Cloudflare API, including `POST /client/v4/graphql`. See the [GraphQL Analytics API example](https://github.com/cloudflare/mcp#graphql-analytics-api) in [`cloudflare/mcp`](https://github.com/cloudflare/mcp).
 
 The tools below still work for now, but no new features will be added. Please migrate to the Cloudflare API MCP server.
 

diff --git a/apps/radar/README.md b/apps/radar/README.md
@@ -16,7 +16,7 @@ All new work should move to the unified server:
 }
 ```
 
-That server uses [Code Mode](https://blog.cloudflare.com/code-mode-mcp/) — two generic tools (`search` and `execute`) that give agents access to the full Cloudflare API through code execution. It supports both OAuth (connect to the URL and authorize) and Cloudflare API tokens (send as a bearer token). See [`cloudflare/mcp`](https://github.com/cloudflare/mcp) for details.
+That server has two generic tools (`search` and `execute`) that give agents access to the full Cloudflare API through code execution. It supports both OAuth (connect to the URL and authorize) and Cloudflare API tokens (send as a bearer token). See [`cloudflare/mcp`](https://github.com/cloudflare/mcp) for details.
 
 Until retirement, the `/mcp` and `/sse` URLs use the same stateless SDK v2 handler and create a fresh server with request-scoped auth/account context for every request. `/sse` is not the deprecated HTTP+SSE transport. OAuth remains durable security state; no MCP protocol session or protocol Durable Object is retained.
 

diff --git a/apps/radar/src/radar.app.ts b/apps/radar/src/radar.app.ts
@@ -12,7 +12,7 @@ import type { Env } from './radar.context'
 export const DEPRECATION_INSTRUCTIONS = `⚠️ DEPRECATED: This Radar MCP server is deprecated.
 
 The unified Cloudflare MCP server at mcp.cloudflare.com/mcp already covers all
-Radar API endpoints (along with the rest of the Cloudflare API) via Code Mode —
+Radar API endpoints (along with the rest of the Cloudflare API) through
 two generic tools (\`search\` and \`execute\`) that give agents access to the full
 Cloudflare API through code execution. It supports both OAuth (connect to the URL
 and authorize) and Cloudflare API tokens (send as a bearer token).
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ Configure the replacement server in your MCP client: @@
     }
     ```
-    The replacement uses [Code Mode](https://blog.cloudflare.com/code-mode-mcp/). Its `search` and `execute` tools cover the full Cloudflare API and return the complete Audit Logs API response. Clients that need endpoint-specific tools can use `https://mcp.cloudflare.com/mcp?codemode=false`; Audit Logs is exposed as `get_accounts_logs_audit`. See [`cloudflare/mcp`](https://github.com/cloudflare/mcp) for details.
+    The replacement's `search` and `execute` tools cover the full Cloudflare API and return the complete Audit Logs API response. Clients that need endpoint-specific tools can use `https://mcp.cloudflare.com/mcp?codemode=false`; Audit Logs is exposed as `get_accounts_logs_audit`. See [`cloudflare/mcp`](https://github.com/cloudflare/mcp) for details.
     The tool below still works for now, but no new features will be added. Please migrate to the Cloudflare API MCP server.
@@ Expand Down @@