fix(core): skip cancellation notification for initialize requests#1932
Open
ameenalkhaldi wants to merge 1 commit intomodelcontextprotocol:mainfrom
Open
Conversation
Per the MCP spec, clients must not cancel the `initialize` request. When the caller aborts or the request times out during `connect()`, the promise still rejects locally, but `notifications/cancelled` is no longer emitted on the wire. Fixes modelcontextprotocol#998
🦋 Changeset detectedLatest commit: 52478f7 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
@modelcontextprotocol/client
@modelcontextprotocol/server
@modelcontextprotocol/express
@modelcontextprotocol/fastify
@modelcontextprotocol/hono
@modelcontextprotocol/node
commit: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #998.
Per the MCP specification, clients must not cancel the
initializerequest:Before this change, when
Client.connect()received anAbortSignalthat later aborted, or when the initialize request timed out,Protocol._requestWithSchemaunconditionally sentnotifications/cancelledto the server for the in-flightinitializerequest.Fix
In
cancel()inside_requestWithSchema(packages/core/src/shared/protocol.ts), guard the outboundnotifications/cancelledsend onrequest.method !== 'initialize'. The abort/reject path is unchanged — the caller's promise still rejects with the supplied reason — only the wire notification is suppressed forinitialize.Tests
Added three cases in
packages/core/test/shared/protocol.test.tsunder a newinitialize request cancellationdescribe block:notifications/cancellednotifications/cancellednotifications/cancelled(regression guard)Test plan
pnpm typecheck:allpnpm lint:allpnpm test:all(all packages green, 492/492 in core)pnpm build:all