More fixes

irvinebroque · irvinebroque · commit 2c21a458ec94 · 2025-03-18T17:16:22.000-07:00
diff --git a/src/content/docs/agents/guides/build-mcp-server.mdx b/src/content/docs/agents/guides/build-mcp-server.mdx
@@ -1,6 +1,6 @@
 ---
 pcx_content_type: tutorial
-title: Build an MCP Server
+title: Build a Local MCP Server
 sidebar:
   order: 100
   group:
@@ -19,7 +19,7 @@ import { Aside } from "@astrojs/starlight/components";
 
 [Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is an open standard that allows AI agents and assistants (like [Claude Desktop](https://claude.ai/download) or [Cursor](https://www.cursor.com/)) to interact with services directly. If you want users to access your service through an AI assistant, you can spin up an MCP server for your application.
 
-### Building an MCP Server on Workers
+### Building a local MCP Server on Workers
 
 With Cloudflare Workers, you can turn any API or service into an MCP server with minimal setup.
 
@@ -36,11 +36,9 @@ Below we will run you through an example of building an MCP server that fetches
 
 Follow these steps to create and deploy your own MCP server on Cloudflare Workers.
 
-<Aside type="note">
-	Remote MCP servers are not supported yet. The workers-mcp tooling creates a
-	local proxy that forwards requests to your Worker, allowing the server to be
-	used by an MCP client.
-</Aside>
+:::note
+Looking to deploy a MCP server that supports _remote_ connections over the Internet, with authentication and authorization? Check out our [guide](/docs/agents/model-context-protocol/getting-started) for building and deploying remote MCP servers to Cloudflare.
+:::
 
 ### Create a new Worker
 
@@ -63,8 +61,14 @@ cd my-mcp-worker
 When you run the setup command, it will build your Worker using the configuration in your wrangler.toml or wrangler.jsonc file. By default, no additional configuration is needed, but if you have multiple Cloudflare accounts, you'll need to specify your account ID as shown below.
 
 <WranglerConfig>
-	```toml name = "my-mcp-worker" main = "src/index.ts" compatibility_date =
-	"2025-03-03" account_id = "your-account-id" ```
+
+```toml
+name = "my-mcp-worker"
+main = "src/index.ts"
+compatibility_date = "2025-03-03"
+account_id = "your-account-id"
+```
+
 </WranglerConfig>
 
 ### Install the MCP tooling
@@ -224,11 +228,8 @@ For [Windsurf](https://modelcontextprotocol.io/clients#windsurf-editor) and othe
 
 Make sure to replace the placeholders with your actual server name, URL, and project path.
 
-### Coming soon
+## Next steps
 
-The Model Context Protocol spec is [actively evolving](https://github.com/modelcontextprotocol/specification/discussions) and we're working on expanding Cloudflare's MCP support. Here's what we're working on:
+Now that you've built an MCP server that users can install and run locally, you should consider building a remote MCP server that supports _remote_ connections over the Internet.
 
-- **Remote MCP support**: Connect to MCP servers directly without requiring a local proxy
-- **Authentication**: OAuth support for secure MCP server connections
-- **Real-time communication**: SSE (Server-Sent Events) and WebSocket support for persistent connections and stateful interactions between clients and servers
-- **Extended capabilities**: Native support for more MCP protocol capabilities like [resources](https://modelcontextprotocol.io/docs/concepts/resources), [prompts](https://modelcontextprotocol.io/docs/concepts/prompts) and [sampling](https://modelcontextprotocol.io/docs/concepts/sampling)
+Cloudflare provides [everything you need to start building a remote MCP server](/agents/model-context-protocol/getting-started), so that you're ready for when MCP clients become capable of connecting to remote servers.
diff --git a/src/content/docs/agents/guides/remote-mcp-server-github.mdx b/src/content/docs/agents/guides/remote-mcp-server-github.mdx
@@ -1,8 +1,8 @@
 ---
 pcx_content_type: example
-title: GitHub as Oauth Provider
+title: Build a Remote MCP Server with GitHub Auth
 description: An example MCP server that uses GitHub as an OAuth provider
 external_link: https://github.com/cloudflare/ai/demos/remote-mcp-server-github
 sidebar:
-  order: 2
+  order: 8
 ---
diff --git a/src/content/docs/agents/guides/remote-mcp-server-slack.mdx b/src/content/docs/agents/guides/remote-mcp-server-slack.mdx
@@ -1,8 +1,8 @@
 ---
 pcx_content_type: example
-title: Slack MCP Server
+title: Build a Remote MCP Server that exposes Slack as a tool
 description: An MCP server that uses Slack as an OAuth provider, and allows MCP clients to send messages to a Slack channel.
 external_link: https://github.com/cloudflare/ai/demos/remote-mcp-server-slack
 sidebar:
-  order: 3
+  order: 9
 ---
diff --git a/src/content/docs/agents/guides/remote-mcp-server.mdx b/src/content/docs/agents/guides/remote-mcp-server.mdx
@@ -0,0 +1,8 @@
+---
+pcx_content_type: example
+title: Build a Remote MCP Server
+description: Complete example of a remote MCP server, with authorization built-in, that you can deploy to Cloudflare
+external_link: https://github.com/cloudflare/ai/demos/remote-mcp-server
+sidebar:
+  order: 7
+---
diff --git a/src/content/docs/agents/model-context-protocol/examples/hello-world.mdx b/src/content/docs/agents/model-context-protocol/examples/hello-world.mdx
diff --git a/src/content/docs/agents/model-context-protocol/examples/index.mdx b/src/content/docs/agents/model-context-protocol/examples/index.mdx
diff --git a/src/content/docs/agents/model-context-protocol/getting-started.mdx b/src/content/docs/agents/model-context-protocol/getting-started.mdx
@@ -7,6 +7,29 @@ sidebar:
 
 import { Details, Render, PackageManagers } from "~/components";
 
+You can build both local and remote MCP servers on Cloudflare.
+
+Local MCP servers rely on running a local proxy on the same machine as your application. Remote MCP servers run on Cloudflare and support remote, authenticated connections over the Internet.
+
+This guide will teach you how to build and deploy your first remote MCP server to Cloudflare. If you want to build a local MCP server, see the [build a local MCP server](/agents/guides/build-mcp-server/) guide.
+
+### What is the Model Context Protocol (MCP)?
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io) is an open standard that connects AI systems with external applications. Think of MCP like a USB-C port for AI applications. Just as USB-C provides a standardized way to connect your devices to various accessories, MCP provides a standardized way to connect AI agents to different services.
+
+#### MCP Terminology
+
+- **MCP Hosts**: AI assistants (like [Claude](http://claude.ai) or [Cursor](http://cursor.com)), AI agents, or applications that need to access external capabilities.
+- **MCP Clients**: Clients embedded within the MCP hosts that connect to MCP servers and invoke tools. Each MCP client instance has a single connection to an MCP server.
+- **MCP Servers**: Applications that expose [tools](/agents/model-context-protocol/mcp-server/tools/), [prompts](https://modelcontextprotocol.io/docs/concepts/prompts), and [resources](https://modelcontextprotocol.io/docs/concepts/resources) that MCP clients can use.
+
+#### Remote vs. local MCP connections
+
+The MCP standard supports two modes of operation:
+
+- **Remote MCP connections**: MCP clients connect to MCP servers over the Internet, establishing a [long-lived connection using HTTP and Server-Sent Events (SSE)](/agents/model-context-protocol/mcp-server/transport/), and authorizing the MCP client access to resources on the user's account using [OAuth](/agents/model-context-protocol/mcp-server/authorization/).
+- **Local MCP connections**: MCP clients connect to MCP servers on the same machine, using [stdio](https://spec.modelcontextprotocol.io/specification/draft/basic/transports/#stdio) as a local transport method.
+
 ## Deploy your first MCP server
 
 This guide will walk you through how to deploy an [example MCP server](https://github.com/cloudflare/ai/demos/remote-mcp-server) to your Cloudflare account. You will then customize this example to suit your needs.
diff --git a/src/content/docs/agents/model-context-protocol/index.mdx b/src/content/docs/agents/model-context-protocol/index.mdx
@@ -4,39 +4,5 @@ pcx_content_type: navigation
 sidebar:
   order: 4
   group:
-    hideIndex: false
+    hideIndex: true
 ---
-
-# Deploy MCP Servers to Cloudflare
-
-You can build and deploy MCP servers on Cloudflare, using the [`workers-mcp` package](https://github.com/cloudflare/workers-mcp), which provides an SDK for [authorization](/agents/model-context-protocol/mcp-server/authorization/), [transport](/agents/model-context-protocol/mcp-server/transport/), and [tool definition and discovery](/agents/model-context-protocol/mcp-server/tools/).
-
-The [getting started section](/agents/model-context-protocol/mcp-server/getting-started/) will guide you to build and deploy your first MCP server to Cloudflare.
-
-### What is the Model Context Protocol (MCP)?
-
-[Model Context Protocol (MCP)](https://modelcontextprotocol.io) is an open standard that connects AI systems with external applications. Think of MCP like a USB-C port for AI applications. Just as USB-C provides a standardized way to connect your devices to various accessories, MCP provides a standardized way to connect AI agents to different services.
-
-#### MCP Terminology
-
-- **MCP Hosts**: AI assistants (like [Claude](http://claude.ai) or [Cursor](http://cursor.com)), AI agents, or applications that need to access external capabilities.
-- **MCP Clients**: Clients embedded within the MCP hosts that connect to MCP servers and invoke tools. Each MCP client instance has a single connection to an MCP server.
-- **MCP Servers**: Applications that expose [tools](/agents/model-context-protocol/mcp-server/tools/), [prompts](https://modelcontextprotocol.io/docs/concepts/prompts), and [resources](https://modelcontextprotocol.io/docs/concepts/resources) that MCP clients can use.
-
-#### Remote vs. local MCP connections
-
-The MCP standard supports two modes of operation:
-
-- **Remote MCP connections**: MCP clients connect to MCP servers over the Internet, establishing a [long-lived connection using HTTP and Server-Sent Events (SSE)](/agents/model-context-protocol/mcp-server/transport/), and authorizing the MCP client access to resources on the user's account using [OAuth](/agents/model-context-protocol/mcp-server/authorization/).
-- **Local MCP connections**: MCP clients connect to MCP servers on the same machine, using [stdio](https://spec.modelcontextprotocol.io/specification/draft/basic/transports/#stdio) as a local transport method.
-
-[`workers-mcp`](https://github.com/cloudflare/workers-mcp) is designed to support remote MCP connections. Remote MCP connections allow MCP clients that run in web browsers, mobile apps, and other environments outside of the end-user's machine to connect to your MCP server, such as [Claude.ai](https://www.anthropic.com/claude), and other AI agents.
-
-### Why deploy your MCP server to Cloudflare?
-
-- Authorization is [built-in](/agents/model-context-protocol/mcp-server/authorization/). Cloudflare handles the hard parts of the OAuth flow for you.
-- Transport over HTTP with Server-Sent Events (SSE) is [built-in](/agents/model-context-protocol/mcp-server/transport/)
-
-### Next step — deploy your first MCP server to Cloudflare
-
-Go to [getting started](/agents/model-context-protocol/mcp-server/getting-started/) to learn how to build and deploy MCP servers to Cloudflare.
diff --git a/src/content/docs/agents/model-context-protocol/tools.mdx b/src/content/docs/agents/model-context-protocol/tools.mdx
@@ -9,11 +9,9 @@ import { Render } from "~/components";
 
 Model Context Protocol (MCP) tools are functions that a [MCP Server](/agents/model-context-protocol/mcp-server) provides and MCP clients can call.
 
-When you build MCP Servers with the `@cloudflare/model-context-protocol` package, you can define tools using the `@modelcontextprotocol/typescript-sdk` package.
+When you build MCP Servers with the `@cloudflare/model-context-protocol` package, you can define tools the [same way as shown in the `@modelcontextprotocol/typescript-sdk` package's examples](https://github.com/modelcontextprotocol/typescript-sdk?tab=readme-ov-file#tools).
 
-For example, the following code defines a simple MCP server that adds two numbers together:
-
-{/* TODO: Reference code in Github, link to a runnable example, use Deploy to Workers button */}
+For example, the following code from [this example MCP server](https://github.com/cloudflare/ai/demos/remote-mcp-server) defines a simple MCP server that adds two numbers together:
 
 ```ts title="src/index.ts"
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp";
