Skip to content

Commit dd0f6eb

Browse files
committed
Merge branch 'main' into feature/add-codegpt-mcp-client
2 parents dc43664 + 0d63e2d commit dd0f6eb

File tree

107 files changed

+11973
-1248
lines changed

Some content is hidden

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

107 files changed

+11973
-1248
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
package-lock.json linguist-generated=true
2+
schema/*/schema.json linguist-generated=true

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818

1919
- run: npm ci
2020

21-
- run: npm run validate:schema
21+
- name: Check TypeScript definitions
22+
run: npm run check:schema:ts
2223

23-
- run: npm run generate:json
2424
- name: Verify that `npm run generate:json` did not change outputs (if it did, please re-run it and re-commit!)
25-
run: git diff --exit-code
25+
run: npm run check:schema:json

.github/workflows/markdown-format.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,28 @@ on:
44
push:
55
paths:
66
- '**/*.md'
7+
- '**/*.mdx'
78
pull_request:
89
paths:
910
- '**/*.md'
11+
- '**/*.mdx'
1012

1113
jobs:
1214
format:
1315
runs-on: ubuntu-latest
1416
steps:
1517
- uses: actions/checkout@v4
16-
18+
1719
- name: Setup Node.js
1820
uses: actions/setup-node@v4
1921
with:
2022
node-version: '20'
21-
23+
2224
- name: Install dependencies
2325
run: npm ci
24-
26+
2527
- name: Check markdown formatting
26-
run: npm run format:check
28+
run: npm run check:docs:format
29+
30+
- name: Check markdown links
31+
run: npm run check:docs:links

CONTRIBUTING.md

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,32 @@ npm install # install dependencies
3232

3333
## Making Changes
3434

35-
Note that schema changes are made to `schema.ts`. `schema.json` is generated from
36-
`schema.ts` using `npm run validate:schema`.
35+
Note that schema changes are made to `schema.ts`, and `schema.json` is generated from
36+
`schema.ts`.
3737

3838
1. Create a new branch:
3939

4040
```bash
4141
git checkout -b feature/your-feature-name
4242
```
4343

44-
2. Make your changes
45-
3. Validate your changes:
44+
2. Make your changes.
45+
46+
3. Validate schema changes and generate `schema.json`:
47+
48+
```bash
49+
npm run check:schema:ts
50+
npm run generate:json
51+
```
52+
53+
4. Validate documentation changes and apply formatting:
4654

4755
```bash
48-
npm run validate:schema # validate schema
49-
npm run generate:json # generate JSON schema
56+
npm run check:docs
57+
npm run format
5058
```
5159

52-
4. Run docs locally (optional):
60+
5. Preview documentation locally (optional):
5361

5462
```bash
5563
npm run serve:docs
@@ -64,10 +72,11 @@ When contributing to the documentation:
6472
- Include code examples where appropriate
6573
- Use proper MDX formatting and components
6674
- Test all links and code samples
75+
- You may run `npm run check:docs:links` to look for broken internal links.
6776
- Use appropriate headings: "When to use", "Steps", and "Tips" for tutorials
6877
- Place new pages in appropriate sections (concepts, tutorials, etc.)
69-
- Update docs.json when adding new pages
70-
- Follow existing file naming conventions (kebab-case.mdx)
78+
- Update `docs.json` when adding new pages
79+
- Follow existing file naming conventions (`kebab-case.mdx`)
7180
- Include proper frontmatter in MDX files
7281

7382
### Specification Proposal Guidelines

docs/clients.mdx

Lines changed: 359 additions & 91 deletions
Large diffs are not rendered by default.

docs/development/contributing.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: Contributing
33
description: How to participate in Model Context Protocol development
44
---
55

6-
We welcome contributions from the community! Please review our [contributing guidelines](https://github.com/modelcontextprotocol/.github/blob/main/CONTRIBUTING.md) for details on how to submit changes.
6+
We welcome contributions from the community! Please review our [contributing guidelines](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/CONTRIBUTING.md) for details on how to submit changes.
77

8-
All contributors must adhere to our [Code of Conduct](https://github.com/modelcontextprotocol/.github/blob/main/CODE_OF_CONDUCT.md).
8+
All contributors must adhere to our [Code of Conduct](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/CODE_OF_CONDUCT.md).
99

10-
For questions and discussions, please use [GitHub Discussions](https://github.com/orgs/modelcontextprotocol/discussions).
10+
For questions and discussions, please use [GitHub Discussions](https://github.com/modelcontextprotocol/modelcontextprotocol/discussions).

docs/development/roadmap.mdx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ description: Our plans for evolving Model Context Protocol
55

66
<Info>Last updated: **2025-03-27**</Info>
77

8-
The Model Context Protocol is rapidly evolving. This page outlines our current thinking on key priorities and direction for approximately **the next six months**, though these may change significantly as the project develops. To see what's changed recently, check out the **[specification changelog](/specification/2025-03-26/changelog/)**.
8+
The Model Context Protocol is rapidly evolving. This page outlines our current thinking on key priorities and direction for approximately **the next six months**, though these may change significantly as the project develops. To see what's changed recently, check out the **[specification changelog](/specification/2025-06-18/changelog/)**.
99

10-
<Note>The ideas presented here are not commitments—we may solve these challenges differently than described, or some may not materialize at all. This is also not an _exhaustive_ list; we may incorporate work that isn't mentioned here.</Note>
10+
<Note>
11+
12+
The ideas presented here are not commitments—we may solve these challenges differently than described, or some may not materialize at all. This is also not an _exhaustive_ list; we may incorporate work that isn't mentioned here.
13+
14+
</Note>
1115

1216
We value community participation! Each section links to relevant discussions where you can learn more and contribute your thoughts.
1317

docs/development/updates.mdx

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)