Merge branch 'main' into feat/user-agent

Author: LucaButBoring

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 # CODEOWNERS file for MCP Specification repository
 
-# General documentation ownership - @modelcontextprotocol/docs-maintaners owns all of /docs
-/docs/ @modelcontextprotocol/docs-maintaners
+# General documentation ownership - @modelcontextprotocol/docs-maintaners and core-maintainers own all of /docs
+/docs/ @modelcontextprotocol/docs-maintaners @modelcontextprotocol/core-maintainers
 
 # Specific ownership - @core-maintainer team owns docs/specification and schema/ directories
 /docs/specification/ @modelcontextprotocol/core-maintainers

.gitignore

@@ -1,3 +1,4 @@
 .claude/
 node_modules/
 .DS_Store
+.idea/

.nvmrc

@@ -1 +1 @@
-v20.16.0
+v20.17.0

.prettierrc.json

@@ -0,0 +1,20 @@
+{
+  "printWidth": 140,
+  "tabWidth": 4,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "bracketSameLine": false,
+  "proseWrap": "always",
+  "arrowParens": "avoid",
+  "overrides": [
+    {
+      "files": "**/*.md",
+      "options": {
+        "printWidth": 280
+      }
+    }
+  ]
+}

CONTRIBUTING.md

@@ -70,6 +70,10 @@ npm run check:docs
 npm run format
 ```
 
+> [!NOTE]
+> You can run all schema/documentation
+> changes at once with `npm run prep:changes`.
+
 ## Blog changes
 
 The blog is built using [Hugo](https://gohugo.io/installation/) and located in the [`blog`](./blog) directory.
@@ -80,7 +84,7 @@ To preview blog changes locally:
 npm run serve:blog
 ```
 
-## Documentation Guidelines
+### Documentation Guidelines
 
 When contributing to the documentation:
 
@@ -121,6 +125,55 @@ When contributing to the documentation:
 3. Follow the pull request template
 4. Wait for review
 
+## AI Contributions
+
+> [!IMPORTANT]
+>
+> If you are using **any kind of AI assistance** to contribute to Model Context Protocol,
+> it must be disclosed in the pull request or issue.
+
+We welcome and encourage the use of AI tools to help improve Model Context Protocol. Many valuable contributions
+have been enhanced with AI assistance for code generation, issue detection, and feature definition.
+
+That being said, if you are using any kind of AI assistance (e.g., agents such as Claude Code, ChatGPT)
+while contributing to Model Context Protocol, **this must be disclosed in the pull request or issue**,
+along with the extent to which AI assistance was used (e.g., documentation comments vs. code generation).
+
+If your PR responses or comments are being generated by an AI, disclose that as well.
+
+As an exception, trivial spacing or typo fixes don't need to be disclosed, so long as the changes are
+limited to small parts of the code or short phrases.
+
+An example disclosure:
+
+> This PR was written primarily by Claude Code.
+
+Or a more detailed disclosure:
+
+> I consulted ChatGPT to understand the codebase but the solution
+> was fully authored manually by myself.
+
+Failure to disclose this is first and foremost rude to the human operators on the other end of the pull request,
+but it also makes it difficult to determine how much scrutiny to apply to the contribution.
+
+In a perfect world, AI assistance would produce equal or higher quality work than any human. That isn't the world
+we live in today, and in most cases where human supervision or expertise is not in the loop, it's generating code
+or changes that cannot be reasonably maintained or evolved.
+
+### What we're looking for
+
+When submitting AI-assisted contributions, please ensure they include:
+
+- **Clear disclosure of AI use** - You are transparent about AI use and degree to which you're using it for the contribution
+- **Human understanding** - You personally understand what the changes do
+- **Clear rationale** - You can explain why the change is needed and how it fits within Model Context Protocol goals
+- **Concrete evidence** - Include test cases, scenarios, or examples that demonstrate the improvement
+- **Your own analysis** - Share your thoughts on the end-to-end experience
+
+### What we'll close
+
+We reserve the right to close submissions that appear to not follow the disclosure policy.
+
 ## License
 
 By contributing, you agree that your contributions will be licensed under the MIT

MAINTAINERS.md

@@ -58,8 +58,8 @@ This document lists current maintainers in the Model Context Protocol project.
 
 - [Inna Harper](https://github.com/ihrpr)
 - [Jerome Swannack](https://github.com/jerome3o)
-- [Samuel Colvin](https://github.com/samuelcolvin)
 - [Marcelo Trylesinski](https://github.com/Kludex)
+- [Max Isbey](https://github.com/maxisbey)
 
 ### TypeScript SDK
 
@@ -84,8 +84,9 @@ This document lists current maintainers in the Model Context Protocol project.
 
 ### Inspector
 
-- [Ola Hungerford](https://github.com/olaservo)
 - [Cliff Hall](https://github.com/cliffhall)
+- [Konstantin Konstantinov](https://github.com/KKonstantinov)
+- [Ola Hungerford](https://github.com/olaservo)
 
 ### Registry
 
@@ -94,6 +95,12 @@ This document lists current maintainers in the Model Context Protocol project.
 - [Adam Jones](https://github.com/domdomegg)
 - [Radoslav (Rado) Dimitrov](https://github.com/rdimitrov)
 
+### MCPB (Model Context Protocol Bundle)
+
+- [Alexander Sklar](https://github.com/asklar)
+- [Adam Jones](https://github.com/domdomegg)
+- [Joan Xie](https://github.com/joan-anthropic)
+
 ### Reference Servers
 
 - [Ola Hungerford](https://github.com/olaservo)

blog/content/posts/2025-09-08-mcp-registry-preview.md

@@ -9,8 +9,8 @@ Today, we're launching the Model Context Protocol (MCP) Registry—an open catal
 
 The MCP Registry is now available in preview. To get started:
 
-- **Add your server** by following our guide on [Adding Servers to the MCP Registry](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/publishing/publish-server.md) (for server maintainers)
-- **Access server data** by following our guide on [Accessing MCP Registry Data](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/consuming/use-rest-api.md) (for client maintainers)
+- **Add your server** by following our guide on [Adding Servers to the MCP Registry](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/quickstart.mdx) (for server maintainers)
+- **Access server data** by following our guide on [Accessing MCP Registry Data](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/registry-aggregators.mdx) (for client maintainers)
 
 # Single source of truth for MCP servers
 
@@ -20,7 +20,7 @@ Our goal is to standardize how servers are distributed and discovered, providing
 
 ## Public and private sub-registries
 
-In building a central registry, it was important to us not to take away from existing registries that the community and companies have built. The MCP Registry serves as a primary source of truth for publicly available MCP servers, and organizations can choose to [create sub-registries](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/consuming/use-rest-api.md#building-a-subregistry) based on custom criteria. For example:
+In building a central registry, it was important to us not to take away from existing registries that the community and companies have built. The MCP Registry serves as a primary source of truth for publicly available MCP servers, and organizations can choose to [create sub-registries](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/registry-aggregators.mdx) based on custom criteria. For example:
 
 **Public subregistries** like opinionated “MCP marketplaces” associated with each MCP client are free to augment and enhance data they ingest from the upstream MCP Registry. Every MCP end-user persona will have different needs, and it is up to the MCP client marketplaces to properly serve their end-users in opinionated ways.
 
@@ -30,14 +30,14 @@ In both cases, the MCP Registry is the starting point – it’s the centralized
 
 ## Community-driven mechanism for moderation
 
-The MCP Registry is an official MCP project maintained by the registry working group and permissively licensed. Community members can submit issues to flag servers that violate the MCP [moderation guidelines](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/administration/moderation-guidelines.md)—such as those containing spam, malicious code, or impersonating legitimate services. Registry maintainers can then denylist these entries and retroactively remove them from public access.
+The MCP Registry is an official MCP project maintained by the registry working group and permissively licensed. Community members can submit issues to flag servers that violate the MCP [moderation guidelines](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/moderation-policy.mdx)—such as those containing spam, malicious code, or impersonating legitimate services. Registry maintainers can then denylist these entries and retroactively remove them from public access.
 
 # Getting started
 
 To get started:
 
-- **Add your server** by following our guide on [Adding Servers to the MCP Registry](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/publishing/publish-server.md) (for server maintainers)
-- **Access server data** by following our guide on [Accessing MCP Registry Data](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/consuming/use-rest-api.md) (for client maintainers)
+- **Add your server** by following our guide on [Adding Servers to the MCP Registry](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/quickstart.mdx) (for server maintainers)
+- **Access server data** by following our guide on [Accessing MCP Registry Data](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/registry-aggregators.mdx) (for client maintainers)
 
 This preview of the MCP Registry is meant to help us improve the user experience before general availability and does not provide data durability guarantees or other warranties. We advise MCP adopters to watch development closely as breaking changes may occur before the registry is made generally available.
 

blog/content/posts/2025-09-26-mcp-next-version-update.md

@@ -7,6 +7,8 @@ author: "David Soria Parra"
 description: "An update on the timeline and priorities for the next Model Context Protocol specification version"
 ---
 
+**Update (November 11, 2025):** The specification release candidate (RC) date has been shifted from November 11th to **November 14th, 2025**. The specification release date remains to be **November 25th, 2025**.
+
 ## Release Timeline
 
 The next version of the Model Context Protocol specification will be released on **November 25th, 2025**, with a release candidate (RC) available on **November 11th, 2025**.