mcp: add 2026-07-28 to the supported protocol versions (#1020)
This PR adds the protocol version `2026-07-28` to the list of supported protocol versions and fixes legacy tests hardcoding the legacy protocol version for those use cases.
This commit is contained in:
parent
b9e6fc5a66
commit
7f4aa4a0ce
1 changed files with 355 additions and 218 deletions
|
|
@ -171,7 +171,10 @@ func TestEndToEnd(t *testing.T) {
|
|||
c.AddRoots(&Root{URI: "file://" + rootAbs})
|
||||
|
||||
// Connect the client.
|
||||
cs, err := c.Connect(ctx, ct, nil)
|
||||
//
|
||||
// Pin the session to 2025-11-25 so the legacy
|
||||
// semantics apply.
|
||||
cs, err := c.Connect(ctx, ct, &ClientSessionOptions{protocolVersion: protocolVersion20251125})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
@ -758,7 +761,10 @@ func TestMiddleware(t *testing.T) {
|
|||
c.AddSendingMiddleware(traceCalls[*ClientSession](&cbuf, "S1"), traceCalls[*ClientSession](&cbuf, "S2"))
|
||||
c.AddReceivingMiddleware(traceCalls[*ClientSession](&cbuf, "R1"), traceCalls[*ClientSession](&cbuf, "R2"))
|
||||
|
||||
cs, err := c.Connect(ctx, ct, nil)
|
||||
// Pin to 2025-11-25 because the test's expected wire sequence asserts
|
||||
// the legacy initialize / notifications/initialized handshake, which
|
||||
// 2026-07-28 replaces with server/discover.
|
||||
cs, err := c.Connect(ctx, ct, &ClientSessionOptions{protocolVersion: protocolVersion20251125})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
@ -1903,7 +1909,10 @@ func TestKeepAliveFailure_Logged(t *testing.T) {
|
|||
Logger: slog.New(slog.NewTextHandler(&buf, &slog.HandlerOptions{Level: slog.LevelError})),
|
||||
}
|
||||
c := NewClient(testImpl, clientOpts)
|
||||
cs, err := c.Connect(ctx, ct, nil)
|
||||
// Pin to 2025-11-25: KeepAlive uses the ping RPC, which is removed
|
||||
// in 2026-07-28, so keepalive is only meaningful on legacy protocol
|
||||
// versions.
|
||||
cs, err := c.Connect(ctx, ct, &ClientSessionOptions{protocolVersion: protocolVersion20251125})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
@ -2570,18 +2579,10 @@ func newSubListenServer() *Server {
|
|||
return s
|
||||
}
|
||||
|
||||
func enableNewProtocol(t *testing.T) {
|
||||
t.Helper()
|
||||
orig := supportedProtocolVersions
|
||||
supportedProtocolVersions = append([]string{protocolVersion20260728}, slices.Clone(orig)...)
|
||||
t.Cleanup(func() { supportedProtocolVersions = orig })
|
||||
}
|
||||
|
||||
// TestSubscriptionsListen_InMemory exercises the listen flow over the
|
||||
// session-shared in-memory transport (semantically equivalent to STDIO).
|
||||
// Cancellation here propagates via notifications/cancelled.
|
||||
func TestSubscriptionsListen_InMemory(t *testing.T) {
|
||||
enableNewProtocol(t)
|
||||
events := make(chan subListenEvent, 64)
|
||||
server := newSubListenServer()
|
||||
ct, st := NewInMemoryTransports()
|
||||
|
|
@ -2597,7 +2598,6 @@ func TestSubscriptionsListen_InMemory(t *testing.T) {
|
|||
// stateless HTTP server (SEP-2575). Each listen rides its own SSE response
|
||||
// stream; cs.Close() tears it down.
|
||||
func TestSubscriptionsListen_Streamable(t *testing.T) {
|
||||
enableNewProtocol(t)
|
||||
events := make(chan subListenEvent, 64)
|
||||
server := newSubListenServer()
|
||||
handler := NewStreamableHTTPHandler(
|
||||
|
|
@ -2615,7 +2615,6 @@ func TestSubscriptionsListen_Streamable(t *testing.T) {
|
|||
// auto-listen on connect, and therefore does not receive any acknowledgment
|
||||
// or downstream notifications.
|
||||
func TestSubscriptionsListen_NoHandlersNoListen(t *testing.T) {
|
||||
enableNewProtocol(t)
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
defer cancel()
|
||||
|
|
@ -2694,7 +2693,6 @@ type resourceSubEvent struct {
|
|||
// subscriptionsListen handler so HTTP disconnect is observed directly; this
|
||||
// is tracked separately.
|
||||
func TestResourceSubscriptions_Streamable(t *testing.T) {
|
||||
enableNewProtocol(t)
|
||||
|
||||
subCh := make(chan string, 8)
|
||||
unsubCh := make(chan string, 8)
|
||||
|
|
@ -2764,7 +2762,6 @@ func TestResourceSubscriptions_Streamable(t *testing.T) {
|
|||
// over an in-memory (stdio-equivalent) transport: the per-URI Subscribe path
|
||||
// uses notifications/cancelled rather than HTTP disconnect for teardown.
|
||||
func TestResourceSubscriptions_InMemory(t *testing.T) {
|
||||
enableNewProtocol(t)
|
||||
|
||||
subCh := make(chan string, 8)
|
||||
unsubCh := make(chan string, 8)
|
||||
|
|
@ -2849,7 +2846,6 @@ func TestResourceSubscriptions_InMemory(t *testing.T) {
|
|||
// second call: it returns nil without invoking SubscribeHandler again and
|
||||
// without opening a second listen stream.
|
||||
func TestResourceSubscriptions_Subscribe_Idempotent(t *testing.T) {
|
||||
enableNewProtocol(t)
|
||||
|
||||
subCh := make(chan string, 8)
|
||||
unsubCh := make(chan string, 8)
|
||||
|
|
@ -2914,7 +2910,6 @@ func TestResourceSubscriptions_Subscribe_Idempotent(t *testing.T) {
|
|||
// stream with a distinct subscription ID. Unsubscribing one does not affect
|
||||
// the other.
|
||||
func TestResourceSubscriptions_MultipleURIs(t *testing.T) {
|
||||
enableNewProtocol(t)
|
||||
|
||||
subCh := make(chan string, 8)
|
||||
unsubCh := make(chan string, 8)
|
||||
|
|
@ -3032,7 +3027,6 @@ func TestResourceSubscriptions_MultipleURIs(t *testing.T) {
|
|||
// notification is fanned out to BOTH sessions, each with its own subscription
|
||||
// ID; closing one session does not affect deliveries to the other.
|
||||
func TestSubscriptionsListen_MultipleSessions(t *testing.T) {
|
||||
enableNewProtocol(t)
|
||||
|
||||
server := newSubListenServer()
|
||||
|
||||
|
|
@ -3110,7 +3104,6 @@ func TestSubscriptionsListen_MultipleSessions(t *testing.T) {
|
|||
// auto-listen branch (the other two list-changed types are covered by
|
||||
// runSubscriptionsListenTest, but resources is not).
|
||||
func TestSubscriptionsListen_ResourceListChanged(t *testing.T) {
|
||||
enableNewProtocol(t)
|
||||
events := make(chan subListenEvent, 16)
|
||||
|
||||
server := NewServer(testImpl, nil)
|
||||
|
|
@ -3182,7 +3175,6 @@ func TestSubscriptionsListen_ResourceListChanged(t *testing.T) {
|
|||
// session removes its entries from the server's three per-type subscription
|
||||
// maps via Server.disconnect.
|
||||
func TestSubscriptionsListen_DisconnectScrubsMaps(t *testing.T) {
|
||||
enableNewProtocol(t)
|
||||
events := make(chan subListenEvent, 16)
|
||||
server := newSubListenServer()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue