[Agents] Document MCP servers with createMcpHandler only

public/__redirects

@@ -319,6 +319,8 @@
 /agents/guides/webhooks/ /agents/communication-channels/webhooks/ 301
 /agents/model-context-protocol/authorization/ /agents/model-context-protocol/protocol/authorization/ 301
 /agents/model-context-protocol/protocol/codemode/ /agents/tools/codemode/ 301
+/agents/model-context-protocol/codemode/ /agents/model-context-protocol/guides/build-codemode-mcp-server/ 301
+/agents/model-context-protocol/guides/build-codemode-openapi-mcp-server/ /agents/model-context-protocol/guides/build-codemode-mcp-server/ 301
 /agents/model-context-protocol/governance/ /agents/model-context-protocol/protocol/governance/ 301
 /agents/model-context-protocol/mcp-portal/ /agents/model-context-protocol/cloudflare/mcp-portal/ 301
 /agents/model-context-protocol/mcp-servers-for-cloudflare/ /agents/model-context-protocol/cloudflare/servers-for-cloudflare/ 301

src/content/changelog/access/2026-03-26-mcp-portal-code-mode.mdx

@@ -6,7 +6,7 @@ products:
   - access
 ---
 
-[MCP server portals](/cloudflare-one/access-controls/ai-controls/mcp-portals/) support [Code Mode MCP server patterns](/agents/model-context-protocol/codemode/), a technique that reduces context window usage by replacing individual tool definitions with a single code execution tool. Code Mode is turned on by default on all portals.
+[MCP server portals](/cloudflare-one/access-controls/ai-controls/mcp-portals/) support [Build a Code Mode MCP server](/agents/model-context-protocol/guides/build-codemode-mcp-server/), a technique that reduces context window usage by replacing individual tool definitions with a single code execution tool. Code Mode is turned on by default on all portals.
 
 To turn it off, edit the portal in **Access controls** > **AI controls** and turn off **Code Mode** under **Basic information**.
 

src/content/changelog/agents/2026-10-01-workers-oauth-provider-1x.mdx

@@ -19,7 +19,7 @@ import {
 - `insufficientScope()` gives you [step-up authorization](https://github.com/cloudflare/workers-oauth-provider/blob/main/docs/authorization-server.md#scopes-and-step-up-authorization) in one line.
 - The authorization server and the resource server can run in [different Workers](https://github.com/cloudflare/workers-oauth-provider/blob/main/docs/resource-servers.md#separate-workers) with different [WAF](/waf/) and [rate limiting](/waf/rate-limiting-rules/) rules.
 - One authorization server can issue tokens for [many MCP servers](https://github.com/cloudflare/workers-oauth-provider/blob/main/docs/authorization-server.md#resources-and-token-audiences).
-- A [migration skill](https://github.com/cloudflare/workers-oauth-provider/blob/main/skills/migrate-to-1.0/SKILL.md) ships in the npm package so a coding agent can perform the upgrade.
+- A [migration skill](https://github.com/cloudflare/workers-oauth-provider/blob/main/skills/migrate-to-1.x/SKILL.md) ships in the npm package so a coding agent can perform the upgrade.
 
 ## The split API
 
@@ -117,6 +117,6 @@ You can still use `OAuthProvider` as both the authorization server and the MCP s
 
 <PackageManagers pkg="@cloudflare/workers-oauth-provider@latest" />
 
-Point your coding agent at `node_modules/@cloudflare/workers-oauth-provider/skills/migrate-to-1.0/SKILL.md`, or follow the [migration guide](https://github.com/cloudflare/workers-oauth-provider/blob/main/docs/migration-1.0.md).
+Point your coding agent at `node_modules/@cloudflare/workers-oauth-provider/skills/migrate-to-1.x/SKILL.md`, or follow the [migration guide](https://github.com/cloudflare/workers-oauth-provider/blob/main/docs/migration-1.x.md).
 
 For both Workers in full, refer to the [split Workers example](https://github.com/cloudflare/workers-oauth-provider/tree/main/examples/split-workers).

src/content/docs/agent-lee/index.mdx

@@ -166,13 +166,13 @@ Agent Lee is entirely optional. If you do not open the Ask AI panel, none of you
 
 Agent Lee is built on Cloudflare's own developer platform using the same primitives available to any Cloudflare developer.
 
-| Component                                                     | Role                                                  |
-| ------------------------------------------------------------- | ----------------------------------------------------- |
-| [Agents SDK](/agents/)                                        | Agent lifecycle, state management, and scheduling     |
-| [Durable Objects](/durable-objects/)                          | Per-user conversation storage and write approval gate |
-| [Workers AI](/workers-ai/)                                    | LLM inference                                         |
-| [AI Gateway](/ai-gateway/)                                    | Model request routing, logging, and analytics         |
-| [Cloudflare MCP server](/agents/model-context-protocol/apis/agent-api/) | Tool definitions for Cloudflare API operations        |
+| Component                                                                                  | Role                                                  |
+| ------------------------------------------------------------------------------------------ | ----------------------------------------------------- |
+| [Agents SDK](/agents/)                                                                     | Agent lifecycle, state management, and scheduling     |
+| [Durable Objects](/durable-objects/)                                                       | Per-user conversation storage and write approval gate |
+| [Workers AI](/workers-ai/)                                                                 | LLM inference                                         |
+| [AI Gateway](/ai-gateway/)                                                                 | Model request routing, logging, and analytics         |
+| [Cloudflare MCP server](/agents/model-context-protocol/cloudflare/servers-for-cloudflare/) | Tool definitions for Cloudflare API operations        |
 
 ---
 

src/content/docs/agents/concepts/agentic-patterns/human-in-the-loop.mdx

@@ -334,7 +334,7 @@ Configure the user-facing handlers in `onStart()`:
 
 ```ts
 import { Agent } from "agents";
-import type { ElicitRequest, ElicitResult } from "agents/mcp";
+import type { ElicitRequest, ElicitResult } from "agents/mcp/client";
 
 export class MyAgent extends Agent<Env> {
 	onStart() {
@@ -360,7 +360,7 @@ export class MyAgent extends Agent<Env> {
 
 </TypeScriptExample>
 
-For the complete form, URL, and browser forwarding patterns, refer to [MCP client elicitation](/agents/model-context-protocol/apis/client-api/#elicitation). For the server-side request API, refer to [McpAgent elicitation](/agents/model-context-protocol/apis/agent-api/#elicitation).
+For the complete form, URL, and browser forwarding patterns, refer to [MCP client elicitation](/agents/model-context-protocol/apis/client-api/#elicitation). For the server side, refer to [Elicitation with a stateless handler](/agents/model-context-protocol/apis/handler-api/#elicitation-with-a-stateless-handler).
 
 ## Durable Code Mode approvals
 
@@ -588,7 +588,7 @@ class MultiApprovalAgent extends Agent<Env, State> {
 
 <LinkCard
 	title="MCP servers"
-	href="/agents/model-context-protocol/apis/agent-api/"
+	href="/agents/model-context-protocol/apis/handler-api/"
 	description="Request form or URL elicitation from an MCP server."
 />
 

src/content/docs/agents/concepts/tools.mdx

@@ -68,7 +68,7 @@ An Agent can expose MCP tools through either model interface:
 - Pass MCP tools directly to a model with the [Agents MCP client](/agents/tools/mcp/).
 - Expose MCP tools inside Code Mode for composition and progressive discovery with [MCP connectors](/agents/tools/codemode/mcp/).
 
-An MCP server can also expose Code Mode itself. For example, it can present one `code` tool or separate `search` and `execute` tools. For these server-side patterns, refer to [Code Mode MCP server patterns](/agents/model-context-protocol/codemode/).
+An MCP server can also expose Code Mode itself. For example, it can present one `code` tool or separate `search` and `execute` tools. For these server-side patterns, refer to [Build a Code Mode MCP server](/agents/model-context-protocol/guides/build-codemode-mcp-server/).
 
 ## Control side effects