Merge branch 'main' into thisistonydang/catch-error

Author: dsp-ant

.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

.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
+      }
+    }
+  ]
+}

ANTITRUST.md

@@ -0,0 +1,53 @@
+**MCP Project Antitrust Policy**
+
+**Antitrust Policy**
+
+Effective: September 29, 2025
+
+**Introduction**
+
+The goal of the Model Context Protocol open source project (the “Project”) is to develop a universal standard for model-to-world interactions, including enabling LLMs and agents to seamlessly connect with and utilize external data sources and tools. The purpose of this Antitrust Policy (the “Policy”) is to avoid antitrust risks in carrying out this pro-competitive mission.
+
+Participants in and contributors to the Project (collectively, “participants”) will use their best reasonable efforts to comply in all respects with all applicable state and federal antitrust and trade regulation laws, and applicable antitrust/competition laws of other countries (collectively, the “Antitrust Laws”).
+
+The goal of Antitrust Laws is to encourage vigorous competition. Nothing in this Policy prohibits or limits the ability of participants to make, sell or use any product, or otherwise to compete in the marketplace. This Policy provides general guidance on compliance with Antitrust Law. Participants should contact their respective legal counsel to address specific questions.
+
+This Policy is conservative and is intended to promote compliance with the Antitrust Laws, not to create duties or obligations beyond what the Antitrust Laws actually require. In the event of any inconsistency between this Policy and the Antitrust Laws, the Antitrust Laws preempt and control.
+
+**Participation**
+
+Technical participation in the Project shall be open to all, subject only to compliance with the provisions of the Project’s charter and other governance documents.
+
+**Conduct of Meetings**
+
+At meetings among actual or potential competitors, there is a risk that participants in those meetings may improperly disclose or discuss information in violation of the Antitrust Laws or otherwise act in an anti-competitive manner. To avoid this risk, participants must adhere to the following policies when participating in Project-related or sponsored meetings, conference calls, or other forums (collectively, “Project Meetings”).
+
+Participants must not, in fact or appearance, discuss or exchange information regarding:
+
+- An individual company’s current or projected prices, price changes, price differentials, markups, discounts, allowances, terms and conditions of sale, including credit terms, etc., or data that bear on prices, including profits, margins or cost.
+- Industry-wide pricing policies, price levels, price changes, differentials, or the like.
+- Actual or projected changes in industry production, capacity or inventories.
+- Matters relating to bids or intentions to bid for particular products, procedures for responding to bid invitations or specific contractual arrangements.
+- Plans of individual companies concerning the design, characteristics, production, distribution, marketing or introduction dates of particular products, including proposed territories or customers.
+- Matters relating to actual or potential individual suppliers that might have the effect of excluding them from any market or of influencing the business conduct of firms toward such suppliers.
+- Matters relating to actual or potential customers that might have the effect of influencing the business conduct of firms toward such customers.
+- Individual company current or projected cost of procurement, development or manufacture of any product.
+- Individual company market shares for any product or for all products.
+- Confidential or otherwise sensitive business plans or strategy.
+
+In connection with all Project Meetings, participants must do the following:
+
+- Adhere to prepared agendas.
+- Insist that meeting minutes be prepared and distributed to all participants, and that meeting minutes accurately reflect the matters that transpired.
+- Consult with their respective counsel on all antitrust questions related to Project Meetings.
+- Protest against any discussions that appear to violate these policies or the Antitrust Laws, leave any meeting in which such discussions continue, and either insist that such protest be noted in the minutes.
+
+**Requirements/Standard Setting**
+
+The Project may establish standards, technical requirements and/or specifications for use (collectively, “requirements”). Participants shall not enter into agreements that prohibit or restrict any participant from establishing or adopting any other requirements. Participants shall not undertake any efforts, directly or indirectly, to prevent any firm from manufacturing, selling, or supplying any product not conforming to a requirement.
+
+The Project shall not promote standardization of commercial terms, such as terms for license and sale.
+
+**Contact Information**
+
+To contact the Project regarding matters addressed by this Antitrust Policy, please send an email to [email protected], and reference “Antitrust Policy” in the subject line.

CONTRIBUTING.md

@@ -18,37 +18,38 @@ The following software is required to work on the spec:
 ### Getting Started
 
 1. [Fork the repository](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo)
+
 2. Clone your fork:
 
-```bash
-git clone https://github.com/YOUR-USERNAME/modelcontextprotocol.git
-cd modelcontextprotocol
-```
+   ```bash
+   git clone https://github.com/YOUR-USERNAME/modelcontextprotocol.git
+   cd modelcontextprotocol
+   ```
 
 3. Install dependencies:
 
-```bash
-nvm install  # install correct Node version
-npm install  # install dependencies
-```
+   ```bash
+   nvm install  # install correct Node version
+   npm install  # install dependencies
+   ```
 
-## Schema changes
+4. Create a new branch:
+
+   ```bash
+   git checkout -b feature/your-feature-name
+   ```
 
-Note that schema changes are made to `schema.ts`, and `schema.json` is generated from
-`schema.ts`.
+## Schema changes
 
-1. Create a new branch:
+Schema changes go in `schema/draft/schema.ts`. To validate your changes, run:
 
 ```bash
-git checkout -b feature/your-feature-name
+npm run check:schema:ts
 ```
 
-2. Make your changes.
-
-3. Validate schema changes and generate `schema.json`:
+`schema/draft/schema.json` and `docs/specification/draft/schema.mdx` are generated from `schema/draft/schema.ts`; do not edit them directly. To generate them, run:
 
 ```bash
-npm run check:schema:ts
 npm run generate:schema
 ```
 
@@ -120,6 +121,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

@@ -2,7 +2,7 @@
 
 This document lists current maintainers in the Model Context Protocol project.
 
-**Last updated:** August 17, 2025
+**Last updated:** October 15, 2025
 
 ## Lead Maintainers
 
@@ -41,6 +41,8 @@ This document lists current maintainers in the Model Context Protocol project.
 ### Go SDK
 
 - [Rob Findley](https://github.com/findleyr)
+- [Jonathan Amsterdam](https://github.com/jba)
+- [Sam Thanawalla](https://github.com/samthanawalla)
 
 ### C# SDK
 
@@ -56,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
 
@@ -69,6 +71,11 @@ This document lists current maintainers in the Model Context Protocol project.
 
 - [Alex Hancock](https://github.com/alexhancock)
 
+### PHP SDK
+
+- [Kyrian Obikwelu](https://github.com/CodeWithKyrian)
+- [Christopher Hertel](https://github.com/chr-hertel)
+
 ## Project Maintainers
 
 ### use-mcp
@@ -77,14 +84,22 @@ 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
 
 - [Toby Padilla](https://github.com/toby)
 - [Tadas Antanavicius](https://github.com/tadasant)
 - [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
 
@@ -120,9 +135,19 @@ This document lists current maintainers in the Model Context Protocol project.
 
 ### Client Implementor Interest Group
 
-- [Michael Feldstein](https://github.com/msfeldstein)
-- [Harald Kirschner](https://github.com/digitarald)
-- [Connor Peet](https://github.com/connor4312)
+**Note:** These individuals serve as MCP protocol representatives for their respective clients. For client-specific issues, use the official support channels provided by each product.
+
+- [Alex Hancock](https://github.com/alexhancock) - Goose
+- [Ben Brandt](https://github.com/benbrandt) - Zed
+- [Connor Peet](https://github.com/connor4312) - VS Code
+- [Gabriel Peal](https://github.com/gpeal) - Codex
+- [Jun Han](https://github.com/formulahendry) - GitHub Copilot for JetBrains
+- [Tyler Leonhardt](https://github.com/TylerLeonhardt) - VS Code
+- [Michael Feldstein](https://github.com/msfeldstein) - Cursor
+
+### Financial Services Interest Group
+
+- [Sambhav Kothari](https://github.com/sambhav)
 
 ### Transports Interest Group
 
@@ -135,8 +160,10 @@ This document lists current maintainers in the Model Context Protocol project.
 
 - [Nick Cooper](https://github.com/nicknotfun)
 
-### Long-Running / Async Tool Calls Working Group
+### Agents Working Group
 
+- [Peter Alexander](https://github.com/pja-ant)
+- [Luca Chang](https://github.com/LucaButBoring)
 - [Inna Harper](https://github.com/ihrpr)
 
 ## About This Document

README.md

@@ -15,6 +15,10 @@ compatibility.
 The official MCP documentation is built using Mintlify and available at
 [modelcontextprotocol.io](https://modelcontextprotocol.io).
 
+## Authors
+
+The Model Context Protocol was created by David Soria Parra ([@dsp](https://github.com/dsp)) and Justin Spahr-Summers ([@jspahrsummers](https://github.com/jspahrsummers)).
+
 ## Contributing
 
 See [CONTRIBUTING.md](./CONTRIBUTING.md).

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.