Fix MCP compatibility client shutdown deadlock - #308
Merged
Merged
Conversation
JAORMX
force-pushed
the
fix/mcp-client-close-deadlock
branch
from
September 25, 2026 21:25
951a355 to
f70a8a5
Compare
ChrisJBurns
approved these changes
Sep 25, 2026
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
Root cause
Client.Closeheldc.muwhileClientSession.Closewaited for active SDK notification handlers. A synchronousOnNotificationcallback re-enteringListPromptsthen blocked on that mutex, deadlocking shutdown.Validation
go test -race ./mcpcompat/client -run TestClientClose_DoesNotHoldMutexWhileNotificationHandlerDrains -count=1task linttask testtaskThe new regression was also run against a temporary restoration of the affected implementation and failed because the callback could not re-enter the client; it passes with this change.