Commit badcba0
committed
Advertise subscription capabilities era-aware and apply review feedback
The big one: MCPServer served subscriptions/listen but still advertised
listChanged: false / subscribe: false everywhere, so a spec-following
client - which capability-gates its listen filter - would never
subscribe, making the publish surface unreachable. get_capabilities now
takes an optional protocol_version: at 2026-07-28+ the listChanged and
resources.subscribe bits derive from whether subscriptions/listen is
served (that is what those bits mean on a wire whose only delivery
channel is the listen stream); the handshake-era derivation is unchanged
and remains the default. server/discover passes the request's version.
The everything-server gains test_trigger_tool_change /
test_trigger_prompt_change diagnostic tools (backed by a new
MCPServer.remove_prompt mirroring remove_tool), so the conformance
list-changed SHOULD checks now run and pass: server-stateless is 30/30.
Review follow-ups:
- The bus is no longer exposed as a public MCPServer property; Context
receives it at construction and the notify_* methods publish through
it directly. Publishing from outside a request means keeping a
reference to the bus you constructed.
- json_response=True no longer hangs subscriptions/listen: a listen
response is a notification stream, so it takes the SSE path regardless
of the JSON-response preference (TypeScript/Go parity).
- ListenHandler gains max_subscriptions (rejected pre-ack past the cap)
and max_buffered_events (a stream whose client stopped reading is
ended at the cap; the client re-listens - no replay means the backlog
was already lossy).
- Honored resource URIs are matched via a frozenset instead of a list
scan on every publish.
- InMemorySubscriptionBus isolates raising listeners (logged + skipped)
so one bad listener cannot starve the others or fail the publisher.
- close() docs now say it initiates closure; each stream flushes from
its own handler task.
- Story and docs corrections: cancelling the parked listen request only
releases the local task over HTTP today (the stream ends with the
connection); capability docs/tests updated for the era-aware bits;
stories index row promoted; small example hardening.1 parent a06581f commit badcba0
21 files changed
Lines changed: 406 additions & 77 deletions
File tree
- docs
- advanced
- client
- tutorial
- examples
- servers/everything-server/mcp_everything_server
- stories
- subscriptions
- src/mcp/server
- lowlevel
- mcpserver
- prompts
- tests
- docs_src
- server
- lowlevel
- mcpserver
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | | - | |
| 60 | + | |
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
148 | | - | |
| 148 | + | |
149 | 149 | | |
150 | 150 | | |
151 | 151 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
97 | 97 | | |
98 | 98 | | |
99 | 99 | | |
100 | | - | |
| 100 | + | |
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
| |||
Lines changed: 29 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
603 | 603 | | |
604 | 604 | | |
605 | 605 | | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
606 | 634 | | |
607 | 635 | | |
608 | 636 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
148 | 148 | | |
149 | 149 | | |
150 | 150 | | |
| 151 | + | |
151 | 152 | | |
152 | 153 | | |
153 | 154 | | |
154 | 155 | | |
155 | 156 | | |
156 | 157 | | |
157 | 158 | | |
158 | | - | |
159 | 159 | | |
160 | 160 | | |
161 | 161 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
30 | | - | |
31 | | - | |
32 | | - | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
33 | 35 | | |
34 | 36 | | |
35 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
42 | | - | |
43 | | - | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
44 | 46 | | |
45 | 47 | | |
46 | 48 | | |
| |||
69 | 71 | | |
70 | 72 | | |
71 | 73 | | |
72 | | - | |
| 74 | + | |
| 75 | + | |
73 | 76 | | |
74 | 77 | | |
75 | 78 | | |
76 | 79 | | |
77 | 80 | | |
78 | 81 | | |
79 | 82 | | |
80 | | - | |
81 | | - | |
| 83 | + | |
| 84 | + | |
82 | 85 | | |
83 | 86 | | |
84 | 87 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
25 | 27 | | |
26 | 28 | | |
27 | 29 | | |
28 | | - | |
29 | | - | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
30 | 35 | | |
31 | 36 | | |
32 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
272 | 272 | | |
273 | 273 | | |
274 | 274 | | |
275 | | - | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
276 | 279 | | |
277 | 280 | | |
278 | 281 | | |
| |||
0 commit comments