Merge remote-tracking branch 'origin/main' into pr/19/sammorrowdrums/fix-discovery-md-primitives

# Conflicts:
#	docs/discovery.md
This commit is contained in:
Sam Morrow 2026-06-08 13:02:09 +02:00
commit ee1f187084
No known key found for this signature in database

View file

@ -50,12 +50,12 @@ An MCP Catalog document is a JSON object that MUST contain the following members
Each entry in the `entries` array describes a single MCP server and MUST contain: Each entry in the `entries` array describes a single MCP server and MUST contain:
| Member | Type | Required | Description | | Member | Type | Required | Description |
| :------------ | :----- | :------- | :------------------------------------------------------------------------------- | | :------------ | :----- | :------- | :------------------------------------------------------------------------------------ |
| `identifier` | string | Yes | A URN identifying this server (e.g., `urn:mcp:server:com.example/weather`) | | `identifier` | string | Yes | A URN identifying this server (e.g., `urn:mcp:server:com.example/weather`) |
| `displayName` | string | Yes | A human-readable name for the server | | `displayName` | string | Yes | A human-readable name for the server |
| `mediaType` | string | Yes | The media type of the referenced artifact. MUST be `application/mcp-server+json` | | `mediaType` | string | Yes | The media type of the referenced artifact. MUST be `application/mcp-server-card+json` |
| `url` | string | Yes | URL where the full [Server Card](#mcp-server-cards) can be retrieved | | `url` | string | Yes | URL where the full [Server Card](#mcp-server-cards) can be retrieved |
The `identifier` MUST begin with `urn:mcp:server:` and end with the `name` value of the The `identifier` MUST begin with `urn:mcp:server:` and end with the `name` value of the
referenced Server Card, with no characters in between. referenced Server Card, with no characters in between.
@ -71,7 +71,7 @@ A domain hosting a single MCP server, using only the required fields:
{ {
"identifier": "urn:mcp:server:com.example/weather", "identifier": "urn:mcp:server:com.example/weather",
"displayName": "Weather Service", "displayName": "Weather Service",
"mediaType": "application/mcp-server+json", "mediaType": "application/mcp-server-card+json",
"url": "https://example.com/.well-known/mcp-server-card" "url": "https://example.com/.well-known/mcp-server-card"
} }
] ]
@ -89,19 +89,19 @@ A domain hosting several MCP servers, each with its own server card:
{ {
"identifier": "urn:mcp:server:com.acme/code-review", "identifier": "urn:mcp:server:com.acme/code-review",
"displayName": "Code Review Assistant", "displayName": "Code Review Assistant",
"mediaType": "application/mcp-server+json", "mediaType": "application/mcp-server-card+json",
"url": "https://acme.com/.well-known/mcp-server-card/code-review" "url": "https://acme.com/.well-known/mcp-server-card/code-review"
}, },
{ {
"identifier": "urn:mcp:server:com.acme/docs-search", "identifier": "urn:mcp:server:com.acme/docs-search",
"displayName": "Documentation Search", "displayName": "Documentation Search",
"mediaType": "application/mcp-server+json", "mediaType": "application/mcp-server-card+json",
"url": "https://acme.com/.well-known/mcp-server-card/docs-search" "url": "https://acme.com/.well-known/mcp-server-card/docs-search"
}, },
{ {
"identifier": "urn:mcp:server:com.acme/ci-cd", "identifier": "urn:mcp:server:com.acme/ci-cd",
"displayName": "CI/CD Pipeline", "displayName": "CI/CD Pipeline",
"mediaType": "application/mcp-server+json", "mediaType": "application/mcp-server-card+json",
"url": "https://acme.com/.well-known/mcp-server-card/ci-cd" "url": "https://acme.com/.well-known/mcp-server-card/ci-cd"
} }
] ]
@ -127,14 +127,14 @@ flowchart TD
3. For each entry, retrieve the server card from the entry's `url` 3. For each entry, retrieve the server card from the entry's `url`
4. Use the server card metadata to configure and establish an MCP connection 4. Use the server card metadata to configure and establish an MCP connection
Clients SHOULD validate that each entry has `mediaType` set to `application/mcp-server+json` Clients SHOULD validate that each entry has `mediaType` set to `application/mcp-server-card+json`
and ignore entries with unrecognized media types. and ignore entries with unrecognized media types.
## MCP Server Cards ## MCP Server Cards
An **MCP Server Card** is a JSON document that describes a single MCP server — its An **MCP Server Card** is a JSON document that describes a single MCP server — its
identity and connection details. Server Cards use the media type identity and connection details. Server Cards use the media type
`application/mcp-server+json`. `application/mcp-server-card+json`.
Server Cards do not enumerate primitives (tools, resources, prompts); those remain Server Cards do not enumerate primitives (tools, resources, prompts); those remain
subject to runtime listing via the protocol's standard list operations. subject to runtime listing via the protocol's standard list operations.