Merge branch 'bib/mcp-3-19' into change-20934

Author: irvinebroque

src/content/docs/agents/guides/build-mcp-server.mdx

@@ -37,7 +37,7 @@ 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.
 
 :::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.
+Looking to deploy a MCP server that supports _remote_ connections over the Internet, with authentication and authorization? Check out our [guide](/agents/model-context-protocol/getting-started) for building and deploying remote MCP servers to Cloudflare.
 :::
 
 ### Create a new Worker

src/content/docs/agents/guides/remote-mcp-server-github.mdx

@@ -2,7 +2,7 @@
 pcx_content_type: example
 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
+external_link: https://github.com/cloudflare/ai/tree/main/demos/remote-mcp-server-github
 sidebar:
   order: 8
 ---

src/content/docs/agents/guides/remote-mcp-server-slack.mdx

@@ -2,7 +2,7 @@
 pcx_content_type: example
 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
+external_link: https://github.com/cloudflare/ai/tree/main/demos/remote-mcp-server-slack
 sidebar:
   order: 9
 ---

src/content/docs/agents/guides/remote-mcp-server.mdx

@@ -2,7 +2,7 @@
 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
+external_link: https://github.com/cloudflare/ai/tree/main/demos/remote-mcp-server
 sidebar:
   order: 7
 ---

src/content/docs/agents/model-context-protocol/authorization.mdx

@@ -16,12 +16,12 @@ When building a [Model Context Protocol (MCP)](https://modelcontextprotocol.io)
 
 The Model Context Protocol uses [a subset of OAuth 2.1 for authorization](https://spec.modelcontextprotocol.io/specification/draft/basic/authorization/). OAuth allows your users to grant limited access to resources, without them having to share API keys or other credentials.
 
-Cloudflare provides an [OAuth Provider Library](https://github.com/cloudflare/ai/demos/remote-mcp-server/lib/workers-oauth-provider) that implements the provider side of the OAuth 2.1 protocol, allowing you to easily add authorization to your MCP server.
+Cloudflare provides an [OAuth Provider Library](https://github.com/cloudflare/workers-oauth-provider) that implements the provider side of the OAuth 2.1 protocol, allowing you to easily add authorization to your MCP server.
 
 You can use the OAuth Provider Library in three ways:
 
-1. **Your Worker handles authorization itself.** Your MCP server, running on Cloudflare, handles the complete OAuth flow. ([Example](/agents/model-context-protocol/mcp-server/getting-started/))
-2. **Integrate directly with a third-party OAuth provider**, such as GitHub or Google. ([Example](/agents/model-context-protocol/mcp-server/examples/github/))
+1. **Your Worker handles authorization itself.** Your MCP server, running on Cloudflare, handles the complete OAuth flow. ([Example](/agents/model-context-protocol/getting-started/))
+2. **Integrate directly with a third-party OAuth provider**, such as GitHub or Google. ([Example](/agents/guides/remote-mcp-server-github/))
 3. **Integrate with your own OAuth provider**, including authorization-as-a-service providers you might already rely on, such as Stytch and Auth0.
 
 The following sections describe each of these options and link to runnable code examples for each.
@@ -30,9 +30,9 @@ The following sections describe each of these options and link to runnable code
 
 ### (1) Your MCP Server handles authorization and authentication itself
 
-Your MCP Server, using the [OAuth Provider Library](https://github.com/cloudflare/ai/demos/remote-mcp-server/lib/workers-oauth-provider), can handle the complete OAuth authorization flow, without any third-party involvement.
+Your MCP Server, using the [OAuth Provider Library](https://github.com/cloudflare/workers-oauth-provider), can handle the complete OAuth authorization flow, without any third-party involvement.
 
-The [Workers OAuth Provider Library](https://github.com/cloudflare/ai/demos/remote-mcp-server/lib/workers-oauth-provider) is a Cloudflare Worker that implements a [`fetch()` handler](/workers/runtime-apis/handlers/fetch/), and handles incoming requests to your MCP server.
+The [Workers OAuth Provider Library](https://github.com/cloudflare/workers-oauth-provider) is a Cloudflare Worker that implements a [`fetch()` handler](/workers/runtime-apis/handlers/fetch/), and handles incoming requests to your MCP server.
 
 You provide your own handlers for your MCP Server's API, and autentication and authorization logic, and URI paths for the OAuth endpoints, as shown below:
 
@@ -49,7 +49,7 @@ export default new OAuthProvider({
 });
 ```
 
-Refer to the [getting started example](/agents/model-context-protocol/mcp-server/getting-started/) for a complete example of the `OAuthProvider` in use, with a mock authentication flow.
+Refer to the [getting started example](/agents/model-context-protocol/getting-started/) for a complete example of the `OAuthProvider` in use, with a mock authentication flow.
 
 The authorization flow in this case works like this:
 
@@ -73,11 +73,11 @@ sequenceDiagram
     Note over C,M: Begin standard MCP message exchange
 ```
 
-Remember — [authentication is different from authorization](https://www.cloudflare.com/learning/access-management/authn-vs-authz/). Your MCP Server can handle authorization itself, while still relying on an external authentication service to first authenticate users. The [example](/agents/model-context-protocol/mcp-server/getting-started) in getting started provides a mock authentdcation flow. You will need to implement your own authentication handler — either handling authentication yourself, or using an external authentication services.
+Remember — [authentication is different from authorization](https://www.cloudflare.com/learning/access-management/authn-vs-authz/). Your MCP Server can handle authorization itself, while still relying on an external authentication service to first authenticate users. The [example](/agents/model-context-protocol/getting-started) in getting started provides a mock authentdcation flow. You will need to implement your own authentication handler — either handling authentication yourself, or using an external authentication services.
 
 ### (2) Third-party OAuth Provider
 
-The [OAuth Provider Library](https://github.com/cloudflare/ai/demos/remote-mcp-server/lib/workers-oauth-provider) can be configured to use a third-party OAuth provider, such as GitHub or Google. You can see a complete example of this in the [GitHub example](/agents/guides/remote-mcp-server-github).
+The [OAuth Provider Library](https://github.com/cloudflare/workers-oauth-provider) can be configured to use a third-party OAuth provider, such as GitHub or Google. You can see a complete example of this in the [GitHub example](/agents/guides/remote-mcp-server-github).
 
 When you use a third-party OAuth provider, you must provide a handler to the `OAuthProvider` that implements the OAuth flow for the third-party provider.
 
@@ -120,13 +120,13 @@ sequenceDiagram
     M->>C: MCP access token
 ```
 
-Read the docs for the [Workers oAuth Provider Library](https://github.com/cloudflare/ai/demos/remote-mcp-server/lib/workers-oauth-provider) for more details.
+Read the docs for the [Workers oAuth Provider Library](https://github.com/cloudflare/workers-oauth-provider) for more details.
 
 ### (3) Bring your own OAuth Provider
 
 If your application already implements an Oauth Provider itself, or you use Stytch, Auth0, or authorization-as-a-service provider, you can use this in the same way that you would use a third-party OAuth provider, described above in (2).
 
 ## Next steps
 
-- [Learn how to use the OAuth Provider SDK](/agents/model-context-protocol/mcp-server/authorization/oauth-provider-api-reference/)
-- Learn how to use a third-party OAuth provider, using the [GitHub](/agents/model-context-protocol/mcp-server/examples/github/) and [Slack](/agents/model-context-protocol/mcp-server/examples/slack/) examples.
+- [Learn how to use the Workers OAuth Provider Library](https://github.com/cloudflare/workers-oauth-provider)
+- Learn how to use a third-party OAuth provider, using the [GitHub](/agents/guides/remote-mcp-server-github/) example MCP server.

src/content/docs/agents/model-context-protocol/getting-started.mdx

@@ -11,7 +11,7 @@ You can build both local and remote [Model Context Protocol (MCP)](https://model
 
 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.
+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 instead.
 
 ### What is the Model Context Protocol (MCP)?
 
@@ -21,24 +21,24 @@ This guide will teach you how to build and deploy your first remote MCP server t
 
 - **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.
+- **MCP Servers**: Applications that expose [tools](/agents/model-context-protocol/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/).
+- **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/transport/), and authorizing the MCP client access to resources on the user's account using [OAuth](/agents/model-context-protocol/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.
+This guide will walk you through how to deploy an [example MCP server](https://github.com/cloudflare/ai/tree/main/demos/remote-mcp-server) to your Cloudflare account. You will then customize this example to suit your needs.
 
-The link below will guide you through everything you need to do to deploy this [example MCP server](https://github.com/cloudflare/ai/demos/remote-mcp-server) to your Cloudflare account:
+The link below will guide you through everything you need to do to deploy this [example MCP server](https://github.com/cloudflare/ai/tree/main/demos/remote-mcp-server) to your Cloudflare account:
 
-[![Deploy to Workers](https://deploy.workers.cloudflare.com/button)](https://dash.cloudflare.com/?to=/:account/workers-and-pages/create/deploy-to-workers&repository=https://github.com/cloudflare/ai/demos/remote-mcp-server)
+[![Deploy to Workers](https://deploy.workers.cloudflare.com/button)](https://dash.cloudflare.com/?to=/:account/workers-and-pages/create/deploy-to-workers&repository=https://github.com/cloudflare/ai/tree/main/demos/remote-mcp-server)
 
-At the end of this process, you will have a new git repository on your GitHub or GitLab account for your MCP server, configured to automatically deploy Cloudflare each time you push a change or merge a pull request to the main branch of the repository. You can then clone this repository, [develop locally](/agents/model-context-protocol/mcp-server/getting-started/#local-development), and start writing code and building.
+At the end of this process, you will have a new git repository on your GitHub or GitLab account for your MCP server, configured to automatically deploy Cloudflare each time you push a change or merge a pull request to the main branch of the repository. You can then clone this repository, [develop locally](/agents/model-context-protocol/getting-started/#local-development), and start writing code and building.
 
 Alternatively, you can use the command line as shown below to create a new MCP Server on your local machine.
 
@@ -80,7 +80,7 @@ In the inspector, enter the URL of your MCP server, `http://localhost:8787/sse`,
 
 ![MCP inspector — where to enter the URL of your MCP server](~/assets/images/agents/mcp-inspector-enter-url.png)
 
-You will be redirected to an example OAuth login page. Enter any username and password and click "Log in and approve" to continue. (you can add your own authentication and/or authorization provider to replace this. Refer to the [authorization](/agents/model-context-protocol/mcp-server/authorization/) section for details on how to do this.)
+You will be redirected to an example OAuth login page. Enter any username and password and click "Log in and approve" to continue. (you can add your own authentication and/or authorization provider to replace this. Refer to the [authorization](/agents/model-context-protocol/authorization/) section for details on how to do this.)
 
 ![MCP OAuth Login Page](~/assets/images/agents/mcp-demo-oauth-flow.png)
 
@@ -277,18 +277,11 @@ wrangler secret put GITHUB_CLIENT_ID
 wrangler secret put GITHUB_CLIENT_SECRET
 ```
 
-#### Finally, deploy your MCP server
+#### Finally, connect to your MCP server
 
-Run the following command to deploy your MCP server:
-
-```sh
-npm run deploy
-```
-
-You should now be able to connect to your MCP server using the MCP Inspector or other MCP clients ([as shown above](/agents/model-context-protocol/getting-started/#connect-your-mcp-server-to-claude-and-other-mcp-clients)) and allow the user to authenticate with GitHub.
+Now that you've added the ID and secret of your production OAuth app, you should now be able to connect to your MCP server running at `worker-name.account-name.workers.dev/sse` using the MCP inspector or ([other MCP clients](/agents/model-context-protocol/getting-started/#connect-your-mcp-server-to-claude-and-other-mcp-clients)), and authenticate with GitHub.
 
 ## Next steps
 
-- Add [tools](/agents/model-context-protocol/mcp-server/tools/) to your MCP server.
-- Customize your MCP Server's [authentication and authorization](/agents/model-context-protocol/mcp-server/authorization/).
-- Try other [example MCP servers](/agents/model-context-protocol/mcp-server/examples/)
+- Add [tools](/agents/model-context-protocol/tools/) to your MCP server.
+- Customize your MCP Server's [authentication and authorization](/agents/model-context-protocol/authorization/).

src/content/docs/agents/model-context-protocol/tools.mdx

@@ -7,11 +7,11 @@ sidebar:
 
 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.
+Model Context Protocol (MCP) tools are functions that a [MCP Server](/agents/model-context-protocol) provides and MCP clients can call.
 
 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 from [this example MCP server](https://github.com/cloudflare/ai/demos/remote-mcp-server) defines a simple MCP server that adds two numbers together:
+For example, the following code from [this example MCP server](https://github.com/cloudflare/ai/tree/main/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";

src/content/docs/agents/model-context-protocol/transport.mdx

@@ -12,7 +12,7 @@ The Model Context Protocol (MCP) specification defines [two standard transport m
 1. **stdio, communication over standard in and standard out** — designed for local MCP connections
 2. **HTTP with Server-Sent Events (SSE)** — designed for remote MCP connections
 
-The [remote MCP examples](/agents/model-context-protocol/mcp-server/getting-started/) support remote MCP connections, using HTTP with Server-Sent Events (SSE) as transport. SSE requires a persistent HTTP connection, which is supported by Cloudflare [Durable Objects](/durable-objects/). Transport is configured and handled automatically. You don't need to configure anything — it just works.
+The [remote MCP examples](/agents/model-context-protocol/getting-started/) support remote MCP connections, using HTTP with Server-Sent Events (SSE) as transport. SSE requires a persistent HTTP connection, which is supported by Cloudflare [Durable Objects](/durable-objects/). Transport is configured and handled automatically. You don't need to configure anything — it just works.
 
 :::note
 If you are looking to deploy a MCP server that supports _local_ MCP connections, you should follow the [guide](/agents/guides/build-mcp-server/) for building local MCP servers using Cloudflare Workers.