Skip to content

Commit 886471e

Browse files
Merge branch 'main' into feat/user-agent
2 parents 56b20a4 + 9f78fe2 commit 886471e

File tree

78 files changed

+4733
-1425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+4733
-1425
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
/schema/ @modelcontextprotocol/core-maintainers
99

1010
# Authorization-related files - @auth team should be notified
11-
/docs/specification/**/authorization.mdx @modelcontextprotocol/core-maintainers @modelcontextprotocol/auth
12-
/docs/specification/**/security_best_practices.mdx @modelcontextprotocol/core-maintainers @modelcontextprotocol/auth
11+
/docs/specification/**/authorization.mdx @modelcontextprotocol/core-maintainers @modelcontextprotocol/auth-wg
12+
/docs/specification/**/security_best_practices.mdx @modelcontextprotocol/core-maintainers @modelcontextprotocol/auth-wg

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
.claude/
12
node_modules/
23
.DS_Store

ANTITRUST.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
**MCP Project Antitrust Policy**
2+
3+
**Antitrust Policy**
4+
5+
Effective: September 29, 2025
6+
7+
**Introduction**
8+
9+
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.
10+
11+
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”).
12+
13+
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.
14+
15+
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.
16+
17+
**Participation**
18+
19+
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.
20+
21+
**Conduct of Meetings**
22+
23+
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”).
24+
25+
Participants must not, in fact or appearance, discuss or exchange information regarding:
26+
27+
- 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.
28+
- Industry-wide pricing policies, price levels, price changes, differentials, or the like.
29+
- Actual or projected changes in industry production, capacity or inventories.
30+
- Matters relating to bids or intentions to bid for particular products, procedures for responding to bid invitations or specific contractual arrangements.
31+
- Plans of individual companies concerning the design, characteristics, production, distribution, marketing or introduction dates of particular products, including proposed territories or customers.
32+
- 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.
33+
- Matters relating to actual or potential customers that might have the effect of influencing the business conduct of firms toward such customers.
34+
- Individual company current or projected cost of procurement, development or manufacture of any product.
35+
- Individual company market shares for any product or for all products.
36+
- Confidential or otherwise sensitive business plans or strategy.
37+
38+
In connection with all Project Meetings, participants must do the following:
39+
40+
- Adhere to prepared agendas.
41+
- Insist that meeting minutes be prepared and distributed to all participants, and that meeting minutes accurately reflect the matters that transpired.
42+
- Consult with their respective counsel on all antitrust questions related to Project Meetings.
43+
- 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.
44+
45+
**Requirements/Standard Setting**
46+
47+
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.
48+
49+
The Project shall not promote standardization of commercial terms, such as terms for license and sale.
50+
51+
**Contact Information**
52+
53+
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

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,38 @@ The following software is required to work on the spec:
1818
### Getting Started
1919

2020
1. [Fork the repository](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo)
21+
2122
2. Clone your fork:
2223

23-
```bash
24-
git clone https://github.com/YOUR-USERNAME/modelcontextprotocol.git
25-
cd modelcontextprotocol
26-
```
24+
```bash
25+
git clone https://github.com/YOUR-USERNAME/modelcontextprotocol.git
26+
cd modelcontextprotocol
27+
```
2728

2829
3. Install dependencies:
2930

30-
```bash
31-
nvm install # install correct Node version
32-
npm install # install dependencies
33-
```
31+
```bash
32+
nvm install # install correct Node version
33+
npm install # install dependencies
34+
```
3435

35-
## Schema changes
36+
4. Create a new branch:
37+
38+
```bash
39+
git checkout -b feature/your-feature-name
40+
```
3641

37-
Note that schema changes are made to `schema.ts`, and `schema.json` is generated from
38-
`schema.ts`.
42+
## Schema changes
3943

40-
1. Create a new branch:
44+
Schema changes go in `schema/draft/schema.ts`. To validate your changes, run:
4145

4246
```bash
43-
git checkout -b feature/your-feature-name
47+
npm run check:schema:ts
4448
```
4549

46-
2. Make your changes.
47-
48-
3. Validate schema changes and generate `schema.json`:
50+
`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:
4951

5052
```bash
51-
npm run check:schema:ts
5253
npm run generate:schema
5354
```
5455

@@ -69,7 +70,17 @@ npm run check:docs
6970
npm run format
7071
```
7172

72-
### Documentation Guidelines
73+
## Blog changes
74+
75+
The blog is built using [Hugo](https://gohugo.io/installation/) and located in the [`blog`](./blog) directory.
76+
77+
To preview blog changes locally:
78+
79+
```bash
80+
npm run serve:blog
81+
```
82+
83+
## Documentation Guidelines
7384

7485
When contributing to the documentation:
7586

@@ -85,9 +96,9 @@ When contributing to the documentation:
8596
- Follow existing file naming conventions (`kebab-case.mdx`)
8697
- Include proper frontmatter in MDX files
8798

88-
### Specification Proposal Guidelines
99+
## Specification Proposal Guidelines
89100

90-
#### Principles of MCP
101+
### Principles of MCP
91102

92103
1. **Simple + Minimal**: It is much easier to add things to a specification than it is to
93104
remove them. To maintain simplicity, we keep a high bar for adding new concepts and

MAINTAINERS.md

Lines changed: 64 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# MCP Maintainers
22

3-
This document lists current maintainers and working groups in the Model Context Protocol project.
3+
This document lists current maintainers in the Model Context Protocol project.
44

5-
**Last updated:** July 23, 2025
5+
**Last updated:** October 15, 2025
66

77
## Lead Maintainers
88

9-
- [Justin Spahr-Summers](https://github.com/jspahrsummers)
109
- [David Soria Parra](https://github.com/dsp-ant)
10+
- _[Justin Spahr-Summers](https://github.com/jspahrsummers) (currently inactive)_
1111

1212
## Core Maintainers
1313

@@ -25,6 +25,7 @@ This document lists current maintainers and working groups in the Model Context
2525

2626
- [Christian Tzolov](https://github.com/tzolov)
2727
- [Dariusz Jędrzejczyk](https://github.com/chemicL)
28+
- [Daniel Garnier-Moiroux](https://github.com/Kehrlann)
2829

2930
### Ruby SDK
3031

@@ -40,6 +41,8 @@ This document lists current maintainers and working groups in the Model Context
4041
### Go SDK
4142

4243
- [Rob Findley](https://github.com/findleyr)
44+
- [Jonathan Amsterdam](https://github.com/jba)
45+
- [Sam Thanawalla](https://github.com/samthanawalla)
4346

4447
### C# SDK
4548

@@ -68,16 +71,36 @@ This document lists current maintainers and working groups in the Model Context
6871

6972
- [Alex Hancock](https://github.com/alexhancock)
7073

74+
### PHP SDK
75+
76+
- [Kyrian Obikwelu](https://github.com/CodeWithKyrian)
77+
- [Christopher Hertel](https://github.com/chr-hertel)
78+
7179
## Project Maintainers
7280

73-
- [Glen Maddern](https://github.com/geelen) (use-mcp)
74-
- [Ola Hungerford](https://github.com/olaservo) (Inspector, Reference Servers)
75-
- [Cliff Hall](https://github.com/cliffhall) (Inspector, Reference Servers)
76-
- [Toby Padilla](https://github.com/toby) (Registry)
77-
- [Tadas Antanavicius](https://github.com/tadasant) (Registry, Reference Servers)
78-
- [Shaun Smith](https://github.com/evalstate) (Reference Servers)
79-
- [Jonathan Hefner](https://github.com/jonathanhefner) (Reference Servers)
80-
- [Adam Jones](https://github.com/domdomegg) (Registry)
81+
### use-mcp
82+
83+
- [Glen Maddern](https://github.com/geelen)
84+
85+
### Inspector
86+
87+
- [Ola Hungerford](https://github.com/olaservo)
88+
- [Cliff Hall](https://github.com/cliffhall)
89+
90+
### Registry
91+
92+
- [Toby Padilla](https://github.com/toby)
93+
- [Tadas Antanavicius](https://github.com/tadasant)
94+
- [Adam Jones](https://github.com/domdomegg)
95+
- [Radoslav (Rado) Dimitrov](https://github.com/rdimitrov)
96+
97+
### Reference Servers
98+
99+
- [Ola Hungerford](https://github.com/olaservo)
100+
- [Cliff Hall](https://github.com/cliffhall)
101+
- [Tadas Antanavicius](https://github.com/tadasant)
102+
- [Shaun Smith](https://github.com/evalstate)
103+
- [Jonathan Hefner](https://github.com/jonathanhefner)
81104

82105
## Community Moderators
83106

@@ -87,33 +110,55 @@ This document lists current maintainers and working groups in the Model Context
87110
- [Jonathan Hefner](https://github.com/jonathanhefner)
88111
- [Tadas Antanavicius](https://github.com/tadasant)
89112

90-
## Working Groups
113+
## Working Group & Interest Group Maintainers
114+
115+
[Working Groups and Interest Groups](https://modelcontextprotocol.io/community/working-interest-groups) are not required to have maintainers (they can be managed by informal facilitators), but maintainers may be appointed on an as-needed basis.
91116

92-
### Security Working Group
117+
### Security Interest Group
93118

94119
- [Den Delimarsky](https://github.com/dend)
95120
- [Paul Carleton](https://github.com/pcarleton)
96121
- [Jenn Newton](https://github.com/jenn-newton)
97122

98-
### Authorization Working Group
123+
### Authorization Interest Group
99124

100125
- [Aaron Parecki](https://github.com/aaronpk)
101126
- [Darin McAdams](https://github.com/D-McAdams)
102127
- [Paul Carleton](https://github.com/pcarleton)
103128

104-
### Client Implementor Working Group
129+
### Client Implementor Interest Group
130+
131+
**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.
132+
133+
- [Alex Hancock](https://github.com/alexhancock) - Goose
134+
- [Ben Brandt](https://github.com/benbrandt) - Zed
135+
- [Connor Peet](https://github.com/connor4312) - VS Code
136+
- [Gabriel Peal](https://github.com/gpeal) - Codex
137+
- [Jun Han](https://github.com/formulahendry) - GitHub Copilot for JetBrains
138+
- [Tyler Leonhardt](https://github.com/TylerLeonhardt) - VS Code
139+
- [Michael Feldstein](https://github.com/msfeldstein) - Cursor
140+
141+
### Financial Services Interest Group
105142

106-
- [Michael Feldstein](https://github.com/msfeldstein)
107-
- [Harald Kirschner](https://github.com/digitarald)
108-
- [Connor Peet](https://github.com/connor4312)
143+
- [Sambhav Kothari](https://github.com/sambhav)
109144

110-
### Transports Working Group
145+
### Transports Interest Group
111146

112147
- [Kurtis Van Gent](https://github.com/kurtisvg)
113148
- [Jonathan Hefner](https://github.com/jonathanhefner)
114149
- [Shaun Smith](https://github.com/evalstate)
115150
- [Harvey Tuch](https://github.com/htuch)
116151

152+
### Server Identity Working Group
153+
154+
- [Nick Cooper](https://github.com/nicknotfun)
155+
156+
### Agents Working Group
157+
158+
- [Peter Alexander](https://github.com/pja-ant)
159+
- [Luca Chang](https://github.com/LucaButBoring)
160+
- [Inna Harper](https://github.com/ihrpr)
161+
117162
## About This Document
118163

119164
This document is updated by the MCP maintainers and reflects the current

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ compatibility.
1515
The official MCP documentation is built using Mintlify and available at
1616
[modelcontextprotocol.io](https://modelcontextprotocol.io).
1717

18+
## Authors
19+
20+
The Model Context Protocol was created by David Soria Parra ([@dsp](https://github.com/dsp)) and Justin Spahr-Summers ([@jspahrsummers](https://github.com/jspahrsummers)).
21+
1822
## Contributing
1923

2024
See [CONTRIBUTING.md](./CONTRIBUTING.md).

blog/assets/css/extended/custom.css

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,14 @@
66
/* Dark mode remains unchanged */
77
.dark.list {
88
background: var(--theme);
9-
}
9+
}
10+
11+
/* Mermaid diagram styling for dark mode */
12+
.dark .mermaid {
13+
filter: invert(0.85) hue-rotate(180deg);
14+
}
15+
16+
/* Prevent awkward wrapping in post metadata. See https://github.com/adityatelange/hugo-PaperMod/issues/1789 */
17+
.post-meta {
18+
display: block !important;
19+
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
+++
2+
date = '2025-09-05T00:00:00Z'
3+
title = 'Announcing the Official PHP SDK for MCP'
4+
author = 'David Soria Parra (Lead Maintainer), Christopher Hertel (Symfony), Roman Pronskiy (PHP Foundation)'
5+
tags = ['announcement', 'community']
6+
+++
7+
8+
The official [PHP SDK](https://github.com/modelcontextprotocol/php-sdk) for the Model Context Protocol is now generally available.
9+
10+
Built in collaboration with the [PHP Foundation](https://thephp.foundation/) and [Symfony](https://symfony.com/), the PHP SDK handles protocol details, so developers don’t have to worry about low-level mechanics and can focus on building their applications.
11+
12+
The initial release enables PHP developers to build MCP [servers](https://modelcontextprotocol.io/docs/learn/server-concepts), exposing [tools](https://modelcontextprotocol.io/docs/learn/server-concepts#tools-ai-actions), [prompts](https://modelcontextprotocol.io/docs/learn/server-concepts#prompts-interaction-templates), and [resources](https://modelcontextprotocol.io/docs/learn/server-concepts#resources-context-data) to AI applications. Support for PHP applications to act as MCP [clients](https://modelcontextprotocol.io/docs/learn/client-concepts) will follow.
13+
14+
The PHP SDK now joins 9 other [officially supported language SDKs](https://modelcontextprotocol.io/docs/sdk) in the MCP ecosystem, making it easier for developers everywhere to adopt MCP in their preferred language.
15+
16+
## Get involved
17+
18+
The PHP SDK is now open to the community to install, test, and contribute:
19+
20+
- SDK repo: [modelcontextprotocol/php-sdk](https://github.com/modelcontextprotocol/php-sdk)
21+
- Composer package: [mcp/sdk](https://packagist.org/packages/mcp/sdk)
22+
23+
We welcome your feedback and contribution, including issues, documentation improvements, and pull requests. Framework-specific integrations and real-world examples are also particularly valuable.
24+
25+
## Thanks to the MCP community
26+
27+
This release consolidates earlier community work into a single, trusted implementation. The SDK is maintained by the [Symfony](https://symfony.com/) team, with [Kyrian Obikwelu](https://github.com/CodeWithKyrian) joining as a maintainer based on his previous [PHP-MCP](https://github.com/php-mcp) work. The [PHP Foundation](https://thephp.foundation/) helped to coordinate the initiative with support from the members of MCP steering group.
28+
29+
Thank you to all involved in bringing PHP to the MCP ecosystem.

0 commit comments

Comments
 (0)