Skip to content

Commit 1f60cf5

Browse files
committed
Merge remote-tracking branch 'upstream/main' into connor4312/597
2 parents bac2064 + a52e9d7 commit 1f60cf5

Some content is hidden

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

59 files changed

+1407
-726
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/markdown-format.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,25 @@ 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 format:check

CONTRIBUTING.md

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ 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`. You should validate your `schema.ts` changes first and then generate the
37+
`schema.json`.
3738

3839
1. Create a new branch:
3940

@@ -46,15 +47,27 @@ git checkout -b feature/your-feature-name
4647

4748
```bash
4849
npm run validate:schema # validate schema
49-
npm run generate:json # generate JSON schema
5050
```
5151

52-
4. Run docs locally (optional):
52+
4. Generate the `schema.json`:
53+
54+
```bash
55+
npm run generate:json # generate JSON schema
56+
```
57+
58+
5. Run docs locally (optional):
5359

5460
```bash
5561
npm run serve:docs
5662
```
5763

64+
6. Format/lint your changes:
65+
66+
```bash
67+
npm run format:check # check formatting
68+
npm run format # apply formatting
69+
```
70+
5871
### Documentation Guidelines
5972

6073
When contributing to the documentation:
@@ -64,10 +77,11 @@ When contributing to the documentation:
6477
- Include code examples where appropriate
6578
- Use proper MDX formatting and components
6679
- Test all links and code samples
80+
- You may run `npm run check-links` to look for broken internal links.
6781
- Use appropriate headings: "When to use", "Steps", and "Tips" for tutorials
6882
- 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)
83+
- Update `docs.json` when adding new pages
84+
- Follow existing file naming conventions (`kebab-case.mdx`)
7185
- Include proper frontmatter in MDX files
7286

7387
### Specification Proposal Guidelines

docs/clients.mdx

Lines changed: 188 additions & 61 deletions
Large diffs are not rendered by default.

docs/development/roadmap.mdx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ description: Our plans for evolving Model Context Protocol
77

88
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/)**.
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.

docs/docs.json

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
{
5454
"group": "Development",
5555
"pages": [
56-
"development/updates",
5756
"development/roadmap",
5857
"development/contributing"
5958
]
@@ -228,25 +227,17 @@
228227
},
229228
{
230229
"group": "Resources",
231-
"pages": [
232-
"specification/versioning",
233-
"specification/contributing"
234-
]
230+
"pages": ["specification/versioning", "specification/contributing"]
235231
}
236232
]
237233
}
238234
],
239235
"global": {
240236
"anchors": [
241237
{
242-
"anchor": "Python SDK",
243-
"href": "https://github.com/modelcontextprotocol/python-sdk",
244-
"icon": "python"
245-
},
246-
{
247-
"anchor": "TypeScript SDK",
248-
"href": "https://github.com/modelcontextprotocol/typescript-sdk",
249-
"icon": "square-js"
238+
"anchor": "C# SDK",
239+
"href": "https://github.com/modelcontextprotocol/csharp-sdk",
240+
"icon": "square-c"
250241
},
251242
{
252243
"anchor": "Java SDK",
@@ -259,14 +250,24 @@
259250
"icon": "square-k"
260251
},
261252
{
262-
"anchor": "C# SDK",
263-
"href": "https://github.com/modelcontextprotocol/csharp-sdk",
264-
"icon": "square-c"
253+
"anchor": "Python SDK",
254+
"href": "https://github.com/modelcontextprotocol/python-sdk",
255+
"icon": "python"
256+
},
257+
{
258+
"anchor": "Ruby SDK",
259+
"href": "https://github.com/modelcontextprotocol/ruby-sdk",
260+
"icon": "gem"
265261
},
266262
{
267263
"anchor": "Swift SDK",
268264
"href": "https://github.com/modelcontextprotocol/swift-sdk",
269265
"icon": "swift"
266+
},
267+
{
268+
"anchor": "TypeScript SDK",
269+
"href": "https://github.com/modelcontextprotocol/typescript-sdk",
270+
"icon": "square-js"
270271
}
271272
]
272273
}
@@ -310,9 +311,6 @@
310311
}
311312
],
312313
"contextual": {
313-
"options": [
314-
"copy",
315-
"view"
316-
]
314+
"options": ["copy", "view"]
317315
}
318316
}

0 commit comments

Comments
 (0)