Skip to content

Commit b06a440

Browse files
Ejb503Ejb503
authored
Merge branch 'main' into add-systemprompt-client
2 parents 1a6ffc1 + f5ccad9 commit b06a440

36 files changed

+8429
-146
lines changed

‎docs/development/roadmap.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ 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

1010
<Note>
1111

‎docs/docs.json

Lines changed: 180 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"navigation": {
2020
"versions": [
2121
{
22-
"version": "2025-03-26",
22+
"version": "Version 2025-06-18 (latest)",
2323
"groups": [
2424
{
25-
"group": "Get Started",
25+
"group": "User Guide",
2626
"pages": [
2727
"introduction",
2828
{
@@ -34,23 +34,20 @@
3434
]
3535
},
3636
{
37-
"group": "SDKs",
37+
"group": "Concepts",
3838
"pages": [
39-
"links/sdks/csharp",
40-
"links/sdks/java",
41-
"links/sdks/kotlin",
42-
"links/sdks/python",
43-
"links/sdks/ruby",
44-
"links/sdks/swift",
45-
"links/sdks/typescript"
39+
"docs/concepts/architecture",
40+
"docs/concepts/resources",
41+
"docs/concepts/prompts",
42+
"docs/concepts/tools",
43+
"docs/concepts/sampling",
44+
"docs/concepts/roots",
45+
"docs/concepts/transports"
4646
]
4747
},
4848
{
4949
"group": "Examples",
50-
"pages": [
51-
"examples",
52-
"clients"
53-
]
50+
"pages": ["examples", "clients"]
5451
},
5552
{
5653
"group": "Tutorials",
@@ -64,15 +61,118 @@
6461
]
6562
},
6663
{
67-
"group": "Concepts",
64+
"group": "Protocol",
6865
"pages": [
69-
"docs/concepts/architecture",
70-
"docs/concepts/resources",
71-
"docs/concepts/prompts",
72-
"docs/concepts/tools",
73-
"docs/concepts/sampling",
74-
"docs/concepts/roots",
75-
"docs/concepts/transports"
66+
"specification/2025-06-18/index",
67+
"specification/2025-06-18/changelog",
68+
"specification/2025-06-18/architecture/index",
69+
{
70+
"group": "Base Protocol",
71+
"pages": [
72+
"specification/2025-06-18/basic/index",
73+
"specification/2025-06-18/basic/lifecycle",
74+
"specification/2025-06-18/basic/transports",
75+
"specification/2025-06-18/basic/authorization",
76+
"specification/2025-06-18/basic/security_best_practices",
77+
{
78+
"group": "Utilities",
79+
"pages": [
80+
"specification/2025-06-18/basic/utilities/cancellation",
81+
"specification/2025-06-18/basic/utilities/ping",
82+
"specification/2025-06-18/basic/utilities/progress"
83+
]
84+
}
85+
]
86+
},
87+
{
88+
"group": "Client Features",
89+
"pages": [
90+
"specification/2025-06-18/client/roots",
91+
"specification/2025-06-18/client/sampling",
92+
"specification/2025-06-18/client/elicitation"
93+
]
94+
},
95+
{
96+
"group": "Server Features",
97+
"pages": [
98+
"specification/2025-06-18/server/index",
99+
"specification/2025-06-18/server/prompts",
100+
"specification/2025-06-18/server/resources",
101+
"specification/2025-06-18/server/tools",
102+
{
103+
"group": "Utilities",
104+
"pages": [
105+
"specification/2025-06-18/server/utilities/completion",
106+
"specification/2025-06-18/server/utilities/logging",
107+
"specification/2025-06-18/server/utilities/pagination"
108+
]
109+
}
110+
]
111+
}
112+
]
113+
},
114+
{
115+
"group": "Development",
116+
"pages": [
117+
"specification/versioning",
118+
"development/roadmap",
119+
"development/contributing"
120+
]
121+
},
122+
{
123+
"group": "SDKs",
124+
"pages": [
125+
"links/sdks/csharp",
126+
"links/sdks/java",
127+
"links/sdks/kotlin",
128+
"links/sdks/python",
129+
"links/sdks/ruby",
130+
"links/sdks/swift",
131+
"links/sdks/typescript"
132+
]
133+
}
134+
]
135+
},
136+
{
137+
"version": "Version 2025-03-26",
138+
"groups": [
139+
{
140+
"group": "User Guide",
141+
"pages": [
142+
"introduction",
143+
{
144+
"group": "Quickstart",
145+
"pages": [
146+
"quickstart/server",
147+
"quickstart/client",
148+
"quickstart/user"
149+
]
150+
},
151+
{
152+
"group": "Concepts",
153+
"pages": [
154+
"docs/concepts/architecture",
155+
"docs/concepts/resources",
156+
"docs/concepts/prompts",
157+
"docs/concepts/tools",
158+
"docs/concepts/sampling",
159+
"docs/concepts/roots",
160+
"docs/concepts/transports"
161+
]
162+
},
163+
{
164+
"group": "Examples",
165+
"pages": ["examples", "clients"]
166+
},
167+
{
168+
"group": "Tutorials",
169+
"pages": [
170+
"tutorials/building-mcp-with-llms",
171+
"docs/tools/debugging",
172+
"docs/tools/inspector"
173+
]
174+
},
175+
"faqs"
76176
]
77177
},
78178
{
@@ -131,14 +231,26 @@
131231
"development/roadmap",
132232
"development/contributing"
133233
]
234+
},
235+
{
236+
"group": "SDKs",
237+
"pages": [
238+
"links/sdks/csharp",
239+
"links/sdks/java",
240+
"links/sdks/kotlin",
241+
"links/sdks/python",
242+
"links/sdks/ruby",
243+
"links/sdks/swift",
244+
"links/sdks/typescript"
245+
]
134246
}
135247
]
136248
},
137249
{
138-
"version": "2024-11-05",
250+
"version": "Version 2024-11-05",
139251
"groups": [
140252
{
141-
"group": "Get Started",
253+
"group": "User Guide",
142254
"pages": [
143255
"introduction",
144256
{
@@ -150,23 +262,20 @@
150262
]
151263
},
152264
{
153-
"group": "SDKs",
265+
"group": "Concepts",
154266
"pages": [
155-
"links/sdks/csharp",
156-
"links/sdks/java",
157-
"links/sdks/kotlin",
158-
"links/sdks/python",
159-
"links/sdks/ruby",
160-
"links/sdks/swift",
161-
"links/sdks/typescript"
267+
"docs/concepts/architecture",
268+
"docs/concepts/resources",
269+
"docs/concepts/prompts",
270+
"docs/concepts/tools",
271+
"docs/concepts/sampling",
272+
"docs/concepts/roots",
273+
"docs/concepts/transports"
162274
]
163275
},
164276
{
165277
"group": "Examples",
166-
"pages": [
167-
"examples",
168-
"clients"
169-
]
278+
"pages": ["examples", "clients"]
170279
},
171280
{
172281
"group": "Tutorials",
@@ -179,18 +288,6 @@
179288
"faqs"
180289
]
181290
},
182-
{
183-
"group": "Concepts",
184-
"pages": [
185-
"docs/concepts/architecture",
186-
"docs/concepts/resources",
187-
"docs/concepts/prompts",
188-
"docs/concepts/tools",
189-
"docs/concepts/sampling",
190-
"docs/concepts/roots",
191-
"docs/concepts/transports"
192-
]
193-
},
194291
{
195292
"group": "Protocol",
196293
"pages": [
@@ -246,14 +343,26 @@
246343
"development/roadmap",
247344
"development/contributing"
248345
]
346+
},
347+
{
348+
"group": "SDKs",
349+
"pages": [
350+
"links/sdks/csharp",
351+
"links/sdks/java",
352+
"links/sdks/kotlin",
353+
"links/sdks/python",
354+
"links/sdks/ruby",
355+
"links/sdks/swift",
356+
"links/sdks/typescript"
357+
]
249358
}
250359
]
251360
},
252361
{
253362
"version": "Draft",
254363
"groups": [
255364
{
256-
"group": "Get Started",
365+
"group": "User Guide",
257366
"pages": [
258367
"introduction",
259368
{
@@ -265,23 +374,20 @@
265374
]
266375
},
267376
{
268-
"group": "SDKs",
377+
"group": "Concepts",
269378
"pages": [
270-
"links/sdks/csharp",
271-
"links/sdks/java",
272-
"links/sdks/kotlin",
273-
"links/sdks/python",
274-
"links/sdks/ruby",
275-
"links/sdks/swift",
276-
"links/sdks/typescript"
379+
"docs/concepts/architecture",
380+
"docs/concepts/resources",
381+
"docs/concepts/prompts",
382+
"docs/concepts/tools",
383+
"docs/concepts/sampling",
384+
"docs/concepts/roots",
385+
"docs/concepts/transports"
277386
]
278387
},
279388
{
280389
"group": "Examples",
281-
"pages": [
282-
"examples",
283-
"clients"
284-
]
390+
"pages": ["examples", "clients"]
285391
},
286392
{
287393
"group": "Tutorials",
@@ -294,18 +400,6 @@
294400
"faqs"
295401
]
296402
},
297-
{
298-
"group": "Concepts",
299-
"pages": [
300-
"docs/concepts/architecture",
301-
"docs/concepts/resources",
302-
"docs/concepts/prompts",
303-
"docs/concepts/tools",
304-
"docs/concepts/sampling",
305-
"docs/concepts/roots",
306-
"docs/concepts/transports"
307-
]
308-
},
309403
{
310404
"group": "Protocol",
311405
"pages": [
@@ -364,6 +458,18 @@
364458
"development/roadmap",
365459
"development/contributing"
366460
]
461+
},
462+
{
463+
"group": "SDKs",
464+
"pages": [
465+
"links/sdks/csharp",
466+
"links/sdks/java",
467+
"links/sdks/kotlin",
468+
"links/sdks/python",
469+
"links/sdks/ruby",
470+
"links/sdks/swift",
471+
"links/sdks/typescript"
472+
]
367473
}
368474
]
369475
}
@@ -395,7 +501,7 @@
395501
},
396502
{
397503
"source": "/specification/latest",
398-
"destination": "/specification/2025-03-26",
504+
"destination": "/specification/2025-06-18",
399505
"permanent": false
400506
}
401507
],

0 commit comments

Comments
 (0)