Skip to content

Commit 76a62cb

Browse files
LucaButBoringLucaButBoring
authored
Merge branch 'main' into docs/tool-name-conflicts
2 parents 276ea38 + 80d942f commit 76a62cb

File tree

6 files changed

+40
-34
lines changed

6 files changed

+40
-34
lines changed

‎docs/specification/2025-03-26/basic/lifecycle.mdx‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,17 @@ available during the session.
144144

145145
Key capabilities include:
146146

147-
| Category | Capability | Description |
148-
| -------- | -------------- | ----------------------------------------------------------------------------------- |
149-
| Client | `roots` | Ability to provide filesystem [roots](/specification/2025-03-26/client/roots) |
150-
| Client | `sampling` | Support for LLM [sampling](/specification/2025-03-26/client/sampling) requests |
151-
| Client | `experimental` | Describes support for non-standard experimental features |
152-
| Server | `prompts` | Offers [prompt templates](/specification/2025-03-26/server/prompts) |
153-
| Server | `resources` | Provides readable [resources](/specification/2025-03-26/server/resources) |
154-
| Server | `tools` | Exposes callable [tools](/specification/2025-03-26/server/tools) |
155-
| Server | `logging` | Emits structured [log messages](/specification/2025-03-26/server/utilities/logging) |
156-
| Server | `experimental` | Describes support for non-standard experimental features |
147+
| Category | Capability | Description |
148+
| -------- | -------------- | ---------------------------------------------------------------------------------------- |
149+
| Client | `roots` | Ability to provide filesystem [roots](/specification/2025-03-26/client/roots) |
150+
| Client | `sampling` | Support for LLM [sampling](/specification/2025-03-26/client/sampling) requests |
151+
| Client | `experimental` | Describes support for non-standard experimental features |
152+
| Server | `prompts` | Offers [prompt templates](/specification/2025-03-26/server/prompts) |
153+
| Server | `resources` | Provides readable [resources](/specification/2025-03-26/server/resources) |
154+
| Server | `tools` | Exposes callable [tools](/specification/2025-03-26/server/tools) |
155+
| Server | `logging` | Emits structured [log messages](/specification/2025-03-26/server/utilities/logging) |
156+
| Server | `completions` | Supports argument [autocompletion](/specification/2025-03-26/server/utilites/completion) |
157+
| Server | `experimental` | Describes support for non-standard experimental features |
157158

158159
Capability objects can describe sub-capabilities like:
159160

‎docs/specification/draft/basic/lifecycle.mdx‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,18 @@ available during the session.
148148

149149
Key capabilities include:
150150

151-
| Category | Capability | Description |
152-
| -------- | -------------- | ---------------------------------------------------------------------------------- |
153-
| Client | `roots` | Ability to provide filesystem [roots](/specification/draft/client/roots) |
154-
| Client | `sampling` | Support for LLM [sampling](/specification/draft/client/sampling) requests |
155-
| Client | `elicitation` | Support for server [elicitation](/specification/draft/client/elicitation) requests |
156-
| Client | `experimental` | Describes support for non-standard experimental features |
157-
| Server | `prompts` | Offers [prompt templates](/specification/draft/server/prompts) |
158-
| Server | `resources` | Provides readable [resources](/specification/draft/server/resources) |
159-
| Server | `tools` | Exposes callable [tools](/specification/draft/server/tools) |
160-
| Server | `logging` | Emits structured [log messages](/specification/draft/server/utilities/logging) |
161-
| Server | `experimental` | Describes support for non-standard experimental features |
151+
| Category | Capability | Description |
152+
| -------- | -------------- | ------------------------------------------------------------------------------------ |
153+
| Client | `roots` | Ability to provide filesystem [roots](/specification/draft/client/roots) |
154+
| Client | `sampling` | Support for LLM [sampling](/specification/draft/client/sampling) requests |
155+
| Client | `elicitation` | Support for server [elicitation](/specification/draft/client/elicitation) requests |
156+
| Client | `experimental` | Describes support for non-standard experimental features |
157+
| Server | `prompts` | Offers [prompt templates](/specification/draft/server/prompts) |
158+
| Server | `resources` | Provides readable [resources](/specification/draft/server/resources) |
159+
| Server | `tools` | Exposes callable [tools](/specification/draft/server/tools) |
160+
| Server | `logging` | Emits structured [log messages](/specification/draft/server/utilities/logging) |
161+
| Server | `completions` | Supports argument [autocompletion](/specification/draft/server/utilities/completion) |
162+
| Server | `experimental` | Describes support for non-standard experimental features |
162163

163164
Capability objects can describe sub-capabilities like:
164165

‎docs/specification/draft/server/resources.mdx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,11 @@ otherwise have a standard MIME type.
326326

327327
Git version control integration.
328328

329+
### Custom URI Schemes
330+
331+
Custom URI schemes **MUST** be in accordance with [RFC3986](https://datatracker.ietf.org/doc/html/rfc3986),
332+
taking the above guidance in to account.
333+
329334
## Error Handling
330335

331336
Servers **SHOULD** return standard JSON-RPC errors for common failure cases:

‎docs/specification/draft/server/tools.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ or data. In this case, the tool will return a URI that can be subscribed to or f
252252

253253
#### Embedded Resources
254254

255-
A tool **MAY** return embedded [Resource contents](/specification/draft/server/resources), to provide additional context
256-
or data, along with a URI that can be subscribed to or fetched again by the client later:
255+
[Resources](resources) **MAY** be embedded to provide additional context
256+
or data using a suitable [URI scheme](./resources#common-uri-schemes). Servers that use embedded resources **SHOULD** implement the `resources` capability:
257257

258258
```json
259259
{

‎schema/draft/schema.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎schema/draft/schema.ts‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -961,15 +961,14 @@ export interface Annotations {
961961
priority?: number;
962962

963963
/**
964-
* The moment the resource was last modified, stored as a Unix epoch timestamp.
964+
* The moment the resource was last modified, as an ISO 8601 formatted string.
965965
*
966-
* Value is the number of **milliseconds** since 1970-01-01 00:00:00 UTC.
967-
* (Use `Date.now()` in JS/TS, or `Math.floor(Date.now() / 1000)` if you prefer seconds.)
966+
* Should be an ISO 8601 formatted string (e.g., "2025-01-12T15:00:58Z").
968967
*
969968
* Examples: last activity timestamp in an open file, timestamp when the resource
970969
* was attached, etc.
971970
*/
972-
lastModified?: number;
971+
lastModified?: string;
973972
}
974973

975974
/** */
@@ -1151,11 +1150,11 @@ export interface CompleteRequest extends Request {
11511150
* Additional, optional context for completions
11521151
*/
11531152
context?: {
1154-
/**
1155-
* Previously-resolved variables in a URI template or prompt.
1156-
*/
1157-
arguments?: { [key: string]: string };
1158-
};
1153+
/**
1154+
* Previously-resolved variables in a URI template or prompt.
1155+
*/
1156+
arguments?: { [key: string]: string };
1157+
};
11591158
};
11601159
}
11611160

0 commit comments

Comments
 (0)