Merge branch 'main' of https://github.com/modelcontextprotocol/modelcontextprotocol into feat/tasks

Author: LucaButBoring

docs/specification/2025-06-18/schema.mdx

@@ -103,16 +103,26 @@ MCP endpoint.
    `Content-Type: application/json`, to return one JSON object. The client **MUST**
    support both these cases.
 6. If the server initiates an SSE stream:
-   - The SSE stream **SHOULD** eventually include JSON-RPC _response_ for the
+   - The server **SHOULD** immediately send an SSE event consisting of an event
+     ID and an empty `data` field in order to prime the client to reconnect
+     (using that event ID as `Last-Event-ID`).
+   - After the server has sent an SSE event with an event ID to the client, the
+     server **MAY** close the _connection_ (without terminating the _SSE stream_)
+     at any time in order to avoid holding a long-lived connection. The client
+     **SHOULD** then "poll" the SSE stream by attempting to reconnect.
+   - If the server does close the _connection_ prior to terminating the _SSE stream_,
+     it **SHOULD** send an SSE event with a standard `retry` field before
+     closing the connection. The client **MUST** respect the `retry` field,
+     waiting the given number of milliseconds before attempting to reconnect.
+   - The SSE stream **SHOULD** eventually include a JSON-RPC _response_ for the
      JSON-RPC _request_ sent in the POST body.
    - The server **MAY** send JSON-RPC _requests_ and _notifications_ before sending the
      JSON-RPC _response_. These messages **SHOULD** relate to the originating client
      _request_.
-   - The server **SHOULD NOT** close the SSE stream before sending the JSON-RPC _response_
-     for the received JSON-RPC _request_, unless the [session](#session-management)
+   - The server **MAY** terminate the SSE stream if the [session](#session-management)
      expires.
-   - After the JSON-RPC _response_ has been sent, the server **SHOULD** close the SSE
-     stream.
+   - After the JSON-RPC _response_ has been sent, the server **SHOULD** terminate the
+     SSE stream.
    - Disconnection **MAY** occur at any time (e.g., due to network conditions).
      Therefore:
      - Disconnection **SHOULD NOT** be interpreted as the client cancelling its request.

docs/specification/draft/basic/transports.mdx

@@ -21,6 +21,7 @@ the previous revision, [2025-06-18](/specification/2025-06-18).
 1. Clarify that servers must respond with HTTP 403 Forbidden for invalid Origin headers in Streamable HTTP transport. (PR [#1439](https://github.com/modelcontextprotocol/modelcontextprotocol/pull/1439))
 2. Updated the [Security Best Practices guidance](https://modelcontextprotocol.io/specification/draft/basic/security_best_practices).
 3. Clarify that input validation errors should be returned as Tool Execution Errors rather than Protocol Errors to enable model self-correction ([SEP-1303](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/1303)).
+4. Support polling SSE streams by allowing servers to disconnect at will ([SEP-1699](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/1699)).
 
 ## Other schema changes
 

docs/specification/draft/changelog.mdx

@@ -25,13 +25,13 @@
     "check:schema": "npm run check:schema:ts && npm run check:schema:json && npm run check:schema:md",
     "check:schema:ts": "tsc --noEmit && eslint schema/ && prettier --check \"schema/**/*.ts\"",
     "check:schema:json": "for f in schema/*/schema.ts; do typescript-json-schema --defaultNumberType integer --required --skipLibCheck \"$f\" \"*\" | cat | cmp \"${f%.ts}.json\" - || exit 1; done",
-    "check:schema:md": "for f in docs/specification/*/schema.mdx; do typedoc --entryPoints \"schema/$(basename -- $(dirname -- \"$f\"))/schema.ts\" | cmp \"$f\" - || exit 1; done",
+    "check:schema:md": "for f in schema/*/schema.mdx; do typedoc --entryPoints \"${f%.mdx}.ts\" --schemaPageTemplate \"$f\" | cmp docs/specification/$(basename -- $(dirname -- \"$f\"))/schema.mdx - || exit 1; done",
     "check:docs": "npm run check:docs:format && npm run check:docs:links",
     "check:docs:format": "prettier --check \"**/*.{md,mdx}\"",
     "check:docs:links": "cd docs && npx mint broken-links",
     "generate:schema": "npm run generate:schema:json && npm run generate:schema:md",
     "generate:schema:json": "for f in schema/*/schema.ts; do typescript-json-schema --defaultNumberType integer --required --skipLibCheck \"$f\" \"*\" -o \"${f%.ts}.json\"; done",
-    "generate:schema:md": "for f in docs/specification/*/schema.mdx; do typedoc --entryPoints \"schema/$(basename -- $(dirname -- \"$f\"))/schema.ts\" > \"$f\"; done",
+    "generate:schema:md": "for f in schema/*/schema.mdx; do typedoc --entryPoints \"${f%.mdx}.ts\" --schemaPageTemplate \"$f\" > docs/specification/$(basename -- $(dirname -- \"$f\"))/schema.mdx; done",
     "format": "prettier --write \"**/*.{md,mdx}\" --ignore \"docs/specification/*/schema.mdx\" ",
     "serve:docs": "cd docs && npx mint dev",
     "serve:blog": "cd blog && hugo serve"
@@ -45,7 +45,7 @@
     "glob": "^11.0.0",
     "prettier": "^3.6.2",
     "tsx": "^4.19.1",
-    "typedoc": "^0.28.7",
+    "typedoc": "^0.28.14",
     "typescript": "^5.6.2",
     "typescript-eslint": "^8.0.0",
     "typescript-json-schema": "^0.65.1"

docs/specification/draft/schema.mdx

@@ -0,0 +1,117 @@
+---
+title: Schema Reference
+---
+
+<div id="schema-reference" />
+
+## JSON-RPC
+
+{/* @category JSON-RPC */}
+
+## Common Types
+
+{/* @category Common Types */}
+
+## Content
+
+{/* @category Content */}
+
+## `completion/complete`
+
+{/* @category `completion/complete` */}
+
+## `elicitation/create`
+
+{/* @category `elicitation/create` */}
+
+## `initialize`
+
+{/* @category `initialize` */}
+
+## `logging/setLevel`
+
+{/* @category `logging/setLevel` */}
+
+## `notifications/cancelled`
+
+{/* @category `notifications/cancelled` */}
+
+## `notifications/initialized`
+
+{/* @category `notifications/initialized` */}
+
+## `notifications/message`
+
+{/* @category `notifications/message` */}
+
+## `notifications/progress`
+
+{/* @category `notifications/progress` */}
+
+## `notifications/prompts/list_changed`
+
+{/* @category `notifications/prompts/list_changed` */}
+
+## `notifications/resources/list_changed`
+
+{/* @category `notifications/resources/list_changed` */}
+
+## `notifications/resources/updated`
+
+{/* @category `notifications/resources/updated` */}
+
+## `notifications/roots/list_changed`
+
+{/* @category `notifications/roots/list_changed` */}
+
+## `notifications/tools/list_changed`
+
+{/* @category `notifications/tools/list_changed` */}
+
+## `ping`
+
+{/* @category `ping` */}
+
+## `prompts/get`
+
+{/* @category `prompts/get` */}
+
+## `prompts/list`
+
+{/* @category `prompts/list` */}
+
+## `resources/list`
+
+{/* @category `resources/list` */}
+
+## `resources/read`
+
+{/* @category `resources/read` */}
+
+## `resources/subscribe`
+
+{/* @category `resources/subscribe` */}
+
+## `resources/templates/list`
+
+{/* @category `resources/templates/list` */}
+
+## `resources/unsubscribe`
+
+{/* @category `resources/unsubscribe` */}
+
+## `roots/list`
+
+{/* @category `roots/list` */}
+
+## `sampling/createMessage`
+
+{/* @category `sampling/createMessage` */}
+
+## `tools/call`
+
+{/* @category `tools/call` */}
+
+## `tools/list`
+
+{/* @category `tools/list` */}