fix(client): close stdio read sources during shutdown - #798
Merged
devcrocod merged 1 commit intoJun 30, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a JVM shutdown hang in StdioClientTransport.close() by explicitly closing the read-side sources so a blocking readAtMostTo() can unblock and the transport’s coroutine scope can finish cleanly.
Changes:
- Close stdin
Sourceduring shutdown before waiting for transport coroutines to complete. - Also close the optional stderr
Sourceduring shutdown; failures to close are non-fatal and logged at debug level. - Add a JVM regression test using a
RawSourcethat blocks inreadAtMostTo()untilclose()is called, assertingclose()completes and triggersonClosewithoutonError.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| kotlin-sdk-client/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/client/StdioClientTransport.kt | Close stdin/stderr Sources during shutdown to prevent blocked read loops from hanging close(). |
| integration-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/client/StdioClientTransportTest.kt | Add JVM regression test covering blocked stdin read shutdown behavior. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+148
to
+149
| input.close() | ||
| closeJob.await() |
devcrocod
force-pushed
the
fix/stdio-client-close-blocking-read
branch
from
June 29, 2026 15:20
f972631 to
fb3a1e3
Compare
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
StdioClientTransport.close()so shutdown does not hang when the stdin read loop is blocked waiting for input.Root Cause / Context
StdioClientTransport.closeResources()stopped the transport coroutine scope and then waited for the scope job to finish. On the JVM, aSource.readAtMostTo()call backed by a blocking Java stream does not necessarily return when the coroutine is cancelled. If the read loop stayed blocked,close()could wait indefinitely.Changes
RawSourcethat blocks inreadAtMostTo()untilclose()is called.onClose, and does not invokeonError.Scope / Risk
This is limited to
StdioClientTransportshutdown behavior. It does not change the public API or server transports. The regression coverage is JVM-focused because the reported hang is caused by a blocking Java stream read.Verification
./gradlew :integration-test:jvmTest --tests 'io.modelcontextprotocol.kotlin.sdk.client.StdioClientTransportTest' ./gradlew :kotlin-sdk-client:jvmTest ./gradlew :kotlin-sdk-client:ktlintCheck :integration-test:ktlintCheck :kotlin-sdk-client:detekt :integration-test:detekt :kotlin-sdk-client:apiCheckCloses #514