Skip to content

Commit 40bf813

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feature/resource-size
2 parents 13bd351 + 169269d commit 40bf813

File tree

12 files changed

+41
-20
lines changed

12 files changed

+41
-20
lines changed

.gitignore

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

docs/.DS_Store

-6 KB
Binary file not shown.

docs/_index.md

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

docs/specification/_index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ This specification defines the authoritative protocol requirements, based on the
1616

1717
For implementation guides and examples, visit [modelcontextprotocol.io](https://modelcontextprotocol.io).
1818

19+
The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "NOT RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in [BCP 14](https://datatracker.ietf.org/doc/html/bcp14) [[RFC2119](https://datatracker.ietf.org/doc/html/rfc2119)] [[RFC8174](https://datatracker.ietf.org/doc/html/rfc8174)] when, and only when, they appear in all capitals, as shown here.
20+
1921
## Overview
2022

2123
MCP provides a standardized way for applications to:

docs/specification/basic/lifecycle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ After successful initialization, the client **MUST** send an `initialized` notif
107107
```json
108108
{
109109
"jsonrpc": "2.0",
110-
"method": "initialized"
110+
"method": "notifications/initialized"
111111
}
112112
```
113113

docs/specification/client/roots.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ To retrieve roots, servers send a `roots/list` request:
6767

6868
### Root List Changes
6969

70-
When roots change, clients that support `listChanged` MUST send a notification:
70+
When roots change, clients that support `listChanged` **MUST** send a notification:
7171

7272
```json
7373
{
@@ -128,7 +128,7 @@ Example roots for different use cases:
128128

129129
## Error Handling
130130

131-
Clients SHOULD return standard JSON-RPC errors for common failure cases:
131+
Clients **SHOULD** return standard JSON-RPC errors for common failure cases:
132132

133133
- Client does not support roots: `-32601` (Method not found)
134134
- Internal errors: `-32603`

docs/specification/server/prompts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ Image content allows including visual information in messages:
187187
"mimeType": "image/png"
188188
}
189189
```
190-
The image data MUST be base64-encoded and include a valid MIME type. This enables multi-modal interactions where visual context is important.
190+
The image data **MUST** be base64-encoded and include a valid MIME type. This enables multi-modal interactions where visual context is important.
191191

192192
#### Embedded Resources
193193
Embedded resources allow referencing server-side resources directly in messages:
@@ -202,7 +202,7 @@ Embedded resources allow referencing server-side resources directly in messages:
202202
}
203203
```
204204

205-
Resources can contain either text or binary (blob) data and MUST include:
205+
Resources can contain either text or binary (blob) data and **MUST** include:
206206
- A valid resource URI
207207
- The appropriate MIME type
208208
- Either text content or base64-encoded blob data
@@ -211,7 +211,7 @@ Embedded resources enable prompts to seamlessly incorporate server-managed conte
211211

212212
## Error Handling
213213

214-
Servers SHOULD return standard JSON-RPC errors for common failure cases:
214+
Servers **SHOULD** return standard JSON-RPC errors for common failure cases:
215215

216216
- Invalid prompt name: `-32602` (Invalid params)
217217
- Missing required arguments: `-32602` (Invalid params)

docs/specification/server/resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ Git version control integration.
294294

295295
## Error Handling
296296

297-
Servers SHOULD return standard JSON-RPC errors for common failure cases:
297+
Servers **SHOULD** return standard JSON-RPC errors for common failure cases:
298298

299299
- Resource not found: `-32002`
300300
- Internal errors: `-32603`

schema/schema.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,9 @@
199199
{
200200
"$ref": "#/definitions/ListResourcesRequest"
201201
},
202+
{
203+
"$ref": "#/definitions/ListResourceTemplatesRequest"
204+
},
202205
{
203206
"$ref": "#/definitions/ReadResourceRequest"
204207
},
@@ -1839,6 +1842,9 @@
18391842
{
18401843
"$ref": "#/definitions/ListResourcesResult"
18411844
},
1845+
{
1846+
"$ref": "#/definitions/ListResourceTemplatesResult"
1847+
},
18421848
{
18431849
"$ref": "#/definitions/ReadResourceResult"
18441850
},
@@ -1988,6 +1994,12 @@
19881994
},
19891995
"type": "object"
19901996
},
1997+
"required": {
1998+
"items": {
1999+
"type": "string"
2000+
},
2001+
"type": "array"
2002+
},
19912003
"type": {
19922004
"const": "object",
19932005
"type": "string"

schema/schema.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,7 @@ export interface Tool {
702702
inputSchema: {
703703
type: "object";
704704
properties?: { [key: string]: object };
705+
required?: string[];
705706
};
706707
}
707708

@@ -1078,6 +1079,7 @@ export type ClientRequest =
10781079
| GetPromptRequest
10791080
| ListPromptsRequest
10801081
| ListResourcesRequest
1082+
| ListResourceTemplatesRequest
10811083
| ReadResourceRequest
10821084
| SubscribeRequest
10831085
| UnsubscribeRequest
@@ -1114,6 +1116,7 @@ export type ServerResult =
11141116
| GetPromptResult
11151117
| ListPromptsResult
11161118
| ListResourcesResult
1119+
| ListResourceTemplatesResult
11171120
| ReadResourceResult
11181121
| CallToolResult
11191122
| ListToolsResult;

0 commit comments

Comments
 (0)