Merge branch 'main' into localden/client-security

Author: localden

.github/CODEOWNERS

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

CONTRIBUTING.md

@@ -1,9 +1,11 @@
 # Contributing to Model Context Protocol
 
-Thank you for your interest in contributing to the Model Context Protocol specification!
+Thank you for your interest in contributing to the Model Context Protocol specification, schemas, or docs!
 This document outlines how to contribute to this project.
 
-## Prerequisites
+Also see the [overall MCP communication guidelines in our docs](https://modelcontextprotocol.io/community/communication), which explains how and where discussions about changes happen.
+
+## General prerequisites
 
 The following software is required to work on the spec:
 
@@ -13,9 +15,9 @@ The following software is required to work on the spec:
 - [Mintlify](https://mintlify.com/) (optional, for docs)
 - nvm (optional, for managing Node versions)
 
-## Getting Started
+### Getting Started
 
-1. Fork the repository
+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
@@ -30,7 +32,7 @@ nvm install  # install correct Node version
 npm install  # install dependencies
 ```
 
-## Making Changes
+## Schema changes
 
 Note that schema changes are made to `schema.ts`, and `schema.json` is generated from
 `schema.ts`.
@@ -50,17 +52,21 @@ npm run check:schema:ts
 npm run generate:schema
 ```
 
-4. Validate documentation changes and apply formatting:
+## Documentation changes
+
+Documentation is written in MDX format and in the [`docs`](./docs) directory.
+
+You can preview documentation changes locally by running:
 
 ```bash
-npm run check:docs
-npm run format
+npm run serve:docs
 ```
 
-5. Preview documentation locally (optional):
+And lint them with:
 
 ```bash
-npm run serve:docs
+npm run check:docs
+npm run format
 ```
 
 ### Documentation Guidelines
@@ -104,15 +110,6 @@ When contributing to the documentation:
 3. Follow the pull request template
 4. Wait for review
 
-## Code of Conduct
-
-This project follows a Code of Conduct. Please review it in
-[CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md).
-
-## Questions
-
-If you have questions, please create an issue in the repository.
-
 ## License
 
 By contributing, you agree that your contributions will be licensed under the MIT

MAINTAINERS.md

@@ -0,0 +1,120 @@
+# MCP Maintainers
+
+This document lists current maintainers and working groups in the Model Context Protocol project.
+
+**Last updated:** July 23, 2025
+
+## Lead Maintainers
+
+- [Justin Spahr-Summers](https://github.com/jspahrsummers)
+- [David Soria Parra](https://github.com/dsp-ant)
+
+## Core Maintainers
+
+- [Inna Harper](https://github.com/ihrpr)
+- [Basil Hosmer](https://github.com/bhosmer-ant)
+- [Paul Carleton](https://github.com/pcarleton)
+- [Nick Cooper](https://github.com/nicknotfun)
+- [Nick Aldridge](https://github.com/000-000-000-000-000)
+- Che Liu
+- [Den Delimarsky](https://github.com/localden)
+
+## SDK Maintainers
+
+### Java SDK
+
+- [Christian Tzolov](https://github.com/tzolov)
+- [Dariusz Jędrzejczyk](https://github.com/chemicL)
+
+### Ruby SDK
+
+- [Topher Bullock](https://github.com/topherbullock)
+- [Koichi Ito](https://github.com/koic)
+- [Ateş Göral](https://github.com/atesgoral)
+
+### Swift SDK
+
+- [Matt Zmuda](https://github.com/mattt)
+- [Carl Peaslee](https://github.com/carlpeaslee)
+
+### Go SDK
+
+- [Rob Findley](https://github.com/findleyr)
+
+### C# SDK
+
+- [Stephan Halter](https://github.com/halter73)
+- [Mike Kistler](https://github.com/mikekistler)
+
+### Kotlin SDK
+
+- [Leonid Stashevsky](https://github.com/e5l)
+- [Sergey Ignatov](https://github.com/ignatov)
+
+### Python SDK
+
+- [Inna Harper](https://github.com/ihrpr)
+- [Jerome Swannack](https://github.com/jerome3o)
+- [Samuel Colvin](https://github.com/samuelcolvin)
+- [Marcelo Trylesinski](https://github.com/Kludex)
+
+### TypeScript SDK
+
+- [Inna Harper](https://github.com/ihrpr)
+- [Felix Weinberger](https://github.com/felixweinberger)
+- [Olivier Chafik](https://github.com/ochafik)
+
+### Rust SDK
+
+- [Alex Hancock](https://github.com/alexhancock)
+
+## Project Maintainers
+
+- [Glen Maddern](https://github.com/geelen) (use-mcp)
+- [Ola Hungerford](https://github.com/olaservo) (Inspector, Reference Servers)
+- [Cliff Hall](https://github.com/cliffhall) (Inspector, Reference Servers)
+- [Toby Padilla](https://github.com/toby) (Registry)
+- [Tadas Antanavicius](https://github.com/tadasant) (Registry, Reference Servers)
+- [Shaun Smith](https://github.com/evalstate) (Reference Servers)
+- [Jonathan Hefner](https://github.com/jonathanhefner) (Reference Servers)
+
+## Community Moderators
+
+- [Ola Hungerford](https://github.com/olaservo)
+- [Cliff Hall](https://github.com/cliffhall)
+- [Shaun Smith](https://github.com/evalstate)
+- [Jonathan Hefner](https://github.com/jonathanhefner)
+- [Tadas Antanavicius](https://github.com/tadasant)
+
+## Working Groups
+
+### Security Working Group
+
+- [Den Delimarsky](https://github.com/dend)
+- [Paul Carleton](https://github.com/pcarleton)
+- [Jenn Newton](https://github.com/jenn-newton)
+
+### Authorization Working Group
+
+- [Aaron Parecki](https://github.com/aaronpk)
+- [Darin McAdams](https://github.com/D-McAdams)
+- [Paul Carleton](https://github.com/pcarleton)
+
+### Client Implementor Working Group
+
+- [Michael Feldstein](https://github.com/msfeldstein)
+- [Harald Kirschner](https://github.com/digitarald)
+- [Connor Peet](https://github.com/connor4312)
+
+### Transports Working Group
+
+- [Kurtis Van Gent](https://github.com/kurtisvg)
+- [Jonathan Hefner](https://github.com/jonathanhefner)
+- [Shaun Smith](https://github.com/evalstate)
+- [Harvey Tuch](https://github.com/htuch)
+
+## About This Document
+
+This document is updated by the MCP maintainers and reflects the current
+governance structure. For more information about MCP governance, see our
+[governance documentation](https://modelcontextprotocol.io/community/governance).

README.md

@@ -1,6 +1,12 @@
-# Model Context Protocol specification
+# Model Context Protocol (MCP)
 
-This repo contains the specification and protocol schema for the Model Context Protocol.
+_Just heard of MCP and not sure where to start? See [the documentation website instead](https://modelcontextprotocol.io)._
+
+This repo contains the:
+
+- MCP specification
+- MCP protocol schema
+- Official MCP documentation
 
 The schema is [defined in TypeScript](schema/2025-06-18/schema.ts) first, but
 [made available as JSON Schema](schema/2025-06-18/schema.json) as well, for wider
@@ -11,10 +17,8 @@ The official MCP documentation is built using Mintlify and available at
 
 ## Contributing
 
-Please see [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to this
-project.
+See [CONTRIBUTING.md](./CONTRIBUTING.md).
 
 ## License
 
-This project is licensed under the MIT License—see the [LICENSE](LICENSE) file for
-details.
+This project is licensed under the [MIT License](LICENSE).