Skip to content

fix(transport): make AsyncRwTransport::receive cancel-safe (#941) - #947

Merged
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety
Jul 2, 2026
Merged

fix(transport): make AsyncRwTransport::receive cancel-safe (#941)#947
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety

Conversation

@ameyypawar

Copy link
Copy Markdown
Contributor

Fixes#941.

Problem

An rmcp stdio server handling many concurrent requests that produce large responses can intermittently drop an incoming request: it never reaches a handler, so no response is produced and the client waits forever for that id.

Root cause

AsyncRwTransport::receive() reads incoming lines with read_until, which is not cancellation-safe, and receive() is polled inside the service loop's select! (service.rs). When another branch (e.g. an outgoing response on the sink-proxy channel) becomes ready while a request line is only partially read, the receive() future is dropped, and the next call's self.line_buf.clear() at the top of the loop discards the partially-read bytes — so that request is lost.

Under many concurrent large responses the read gets cancelled often, which is why the loss is intermittent and load-dependent. The loss is on the read side: instrumenting the loop shows the missing id never produces a "received request" event, i.e. it never arrives at all.

Fix

Keep the partially-read bytes in line_buf across calls and clear the buffer only after a whole line has been consumed. read_until returns only at a delimiter or EOF (a cancelled read never returns), so on return the buffer holds a complete line; a cancelled read leaves its partial bytes in place and the next call resumes the same line instead of discarding it. The buffer is cleared (retaining its capacity) rather than reallocated per message.

The fix is in AsyncRwTransport, so it also covers the child-process client transport (TokioChildProcess), which reuses the same transport.

Test

Adds crates/rmcp/tests/test_stdio_response_concurrency.rs — the reproducer from the issue. It sends 200 concurrent tools/call requests that each return 64 KiB over real stdio pipes and asserts every response id eventually arrives. It fails reliably on main and passes with this change (40/40 runs locally); the full rmcp test suite remains green, and cargo fmt/clippy are clean.

…extprotocol#941)
`receive()` reads incoming lines with `read_until`, which is not
cancellation-safe, and it is polled inside the service loop's `select!`.
When another branch (e.g. an outgoing response) becomes ready while a
request line is only partially read, the `receive()` future is dropped
and the next call's `self.line_buf.clear()` discards the partial bytes,
so that incoming request is silently lost and never gets a response.
Under many concurrent large responses this intermittently drops requests.
Keep the partially-read bytes in `line_buf` across calls and clear it
only after a whole line has been consumed, so a cancelled read resumes
the same line instead of dropping it. The buffer is cleared (retaining
capacity) rather than reallocated per message.
Adds a regression test that fires 200 concurrent 64 KiB tool responses
over real stdio pipes and asserts no response id goes missing.
This also covers the child-process client transport, which reuses
`AsyncRwTransport`.
@ameyypawar
ameyypawar requested a review from a team as a code ownerJuly 1, 2026 18:53
@github-actionsgithub-actionsBot added T-test Testing related changes T-core Core library changes T-transport Transport layer changes labels Jul 1, 2026

@DaleSeoDaleSeo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix, @ameyypawar!

@DaleSeo
DaleSeo merged commit 4833ec7 into modelcontextprotocol:mainJul 2, 2026
31 of 32 checks passed
@github-actionsgithub-actionsBot mentioned this pull request Jul 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

T-coreCore library changesT-testTesting related changesT-transportTransport layer changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Concurrent stdio responses can go missing under load

2 participants

@ameyypawar@DaleSeo
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(transport): make AsyncRwTransport::receive cancel-safe (#941) by ameyypawar · Pull Request #947 · modelcontextprotocol/rust-sdk · GitHub
Skip to content

fix(transport): make AsyncRwTransport::receive cancel-safe (#941) - #947

Merged
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety
Jul 2, 2026
Merged

fix(transport): make AsyncRwTransport::receive cancel-safe (#941)#947
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety

Conversation

@ameyypawar

Copy link
Copy Markdown
Contributor

Fixes#941.

Problem

An rmcp stdio server handling many concurrent requests that produce large responses can intermittently drop an incoming request: it never reaches a handler, so no response is produced and the client waits forever for that id.

Root cause

AsyncRwTransport::receive() reads incoming lines with read_until, which is not cancellation-safe, and receive() is polled inside the service loop's select! (service.rs). When another branch (e.g. an outgoing response on the sink-proxy channel) becomes ready while a request line is only partially read, the receive() future is dropped, and the next call's self.line_buf.clear() at the top of the loop discards the partially-read bytes — so that request is lost.

Under many concurrent large responses the read gets cancelled often, which is why the loss is intermittent and load-dependent. The loss is on the read side: instrumenting the loop shows the missing id never produces a "received request" event, i.e. it never arrives at all.

Fix

Keep the partially-read bytes in line_buf across calls and clear the buffer only after a whole line has been consumed. read_until returns only at a delimiter or EOF (a cancelled read never returns), so on return the buffer holds a complete line; a cancelled read leaves its partial bytes in place and the next call resumes the same line instead of discarding it. The buffer is cleared (retaining its capacity) rather than reallocated per message.

The fix is in AsyncRwTransport, so it also covers the child-process client transport (TokioChildProcess), which reuses the same transport.

Test

Adds crates/rmcp/tests/test_stdio_response_concurrency.rs — the reproducer from the issue. It sends 200 concurrent tools/call requests that each return 64 KiB over real stdio pipes and asserts every response id eventually arrives. It fails reliably on main and passes with this change (40/40 runs locally); the full rmcp test suite remains green, and cargo fmt/clippy are clean.

…extprotocol#941)
`receive()` reads incoming lines with `read_until`, which is not
cancellation-safe, and it is polled inside the service loop's `select!`.
When another branch (e.g. an outgoing response) becomes ready while a
request line is only partially read, the `receive()` future is dropped
and the next call's `self.line_buf.clear()` discards the partial bytes,
so that incoming request is silently lost and never gets a response.
Under many concurrent large responses this intermittently drops requests.
Keep the partially-read bytes in `line_buf` across calls and clear it
only after a whole line has been consumed, so a cancelled read resumes
the same line instead of dropping it. The buffer is cleared (retaining
capacity) rather than reallocated per message.
Adds a regression test that fires 200 concurrent 64 KiB tool responses
over real stdio pipes and asserts no response id goes missing.
This also covers the child-process client transport, which reuses
`AsyncRwTransport`.
@ameyypawar
ameyypawar requested a review from a team as a code ownerJuly 1, 2026 18:53
@github-actionsgithub-actionsBot added T-test Testing related changes T-core Core library changes T-transport Transport layer changes labels Jul 1, 2026

@DaleSeoDaleSeo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix, @ameyypawar!

@DaleSeo
DaleSeo merged commit 4833ec7 into modelcontextprotocol:mainJul 2, 2026
31 of 32 checks passed
@github-actionsgithub-actionsBot mentioned this pull request Jul 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

T-coreCore library changesT-testTesting related changesT-transportTransport layer changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Concurrent stdio responses can go missing under load

2 participants

@ameyypawar@DaleSeo
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(transport): make AsyncRwTransport::receive cancel-safe (#941) by ameyypawar · Pull Request #947 · modelcontextprotocol/rust-sdk · GitHub
Skip to content

fix(transport): make AsyncRwTransport::receive cancel-safe (#941) - #947

Merged
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety
Jul 2, 2026
Merged

fix(transport): make AsyncRwTransport::receive cancel-safe (#941)#947
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety

Conversation

@ameyypawar

Copy link
Copy Markdown
Contributor

Fixes#941.

Problem

An rmcp stdio server handling many concurrent requests that produce large responses can intermittently drop an incoming request: it never reaches a handler, so no response is produced and the client waits forever for that id.

Root cause

AsyncRwTransport::receive() reads incoming lines with read_until, which is not cancellation-safe, and receive() is polled inside the service loop's select! (service.rs). When another branch (e.g. an outgoing response on the sink-proxy channel) becomes ready while a request line is only partially read, the receive() future is dropped, and the next call's self.line_buf.clear() at the top of the loop discards the partially-read bytes — so that request is lost.

Under many concurrent large responses the read gets cancelled often, which is why the loss is intermittent and load-dependent. The loss is on the read side: instrumenting the loop shows the missing id never produces a "received request" event, i.e. it never arrives at all.

Fix

Keep the partially-read bytes in line_buf across calls and clear the buffer only after a whole line has been consumed. read_until returns only at a delimiter or EOF (a cancelled read never returns), so on return the buffer holds a complete line; a cancelled read leaves its partial bytes in place and the next call resumes the same line instead of discarding it. The buffer is cleared (retaining its capacity) rather than reallocated per message.

The fix is in AsyncRwTransport, so it also covers the child-process client transport (TokioChildProcess), which reuses the same transport.

Test

Adds crates/rmcp/tests/test_stdio_response_concurrency.rs — the reproducer from the issue. It sends 200 concurrent tools/call requests that each return 64 KiB over real stdio pipes and asserts every response id eventually arrives. It fails reliably on main and passes with this change (40/40 runs locally); the full rmcp test suite remains green, and cargo fmt/clippy are clean.

…extprotocol#941)
`receive()` reads incoming lines with `read_until`, which is not
cancellation-safe, and it is polled inside the service loop's `select!`.
When another branch (e.g. an outgoing response) becomes ready while a
request line is only partially read, the `receive()` future is dropped
and the next call's `self.line_buf.clear()` discards the partial bytes,
so that incoming request is silently lost and never gets a response.
Under many concurrent large responses this intermittently drops requests.
Keep the partially-read bytes in `line_buf` across calls and clear it
only after a whole line has been consumed, so a cancelled read resumes
the same line instead of dropping it. The buffer is cleared (retaining
capacity) rather than reallocated per message.
Adds a regression test that fires 200 concurrent 64 KiB tool responses
over real stdio pipes and asserts no response id goes missing.
This also covers the child-process client transport, which reuses
`AsyncRwTransport`.
@ameyypawar
ameyypawar requested a review from a team as a code ownerJuly 1, 2026 18:53
@github-actionsgithub-actionsBot added T-test Testing related changes T-core Core library changes T-transport Transport layer changes labels Jul 1, 2026

@DaleSeoDaleSeo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix, @ameyypawar!

@DaleSeo
DaleSeo merged commit 4833ec7 into modelcontextprotocol:mainJul 2, 2026
31 of 32 checks passed
@github-actionsgithub-actionsBot mentioned this pull request Jul 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

T-coreCore library changesT-testTesting related changesT-transportTransport layer changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Concurrent stdio responses can go missing under load

2 participants

@ameyypawar@DaleSeo
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(transport): make AsyncRwTransport::receive cancel-safe (#941) by ameyypawar · Pull Request #947 · modelcontextprotocol/rust-sdk · GitHub
Skip to content

fix(transport): make AsyncRwTransport::receive cancel-safe (#941) - #947

Merged
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety
Jul 2, 2026
Merged

fix(transport): make AsyncRwTransport::receive cancel-safe (#941)#947
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety

Conversation

@ameyypawar

Copy link
Copy Markdown
Contributor

Fixes#941.

Problem

An rmcp stdio server handling many concurrent requests that produce large responses can intermittently drop an incoming request: it never reaches a handler, so no response is produced and the client waits forever for that id.

Root cause

AsyncRwTransport::receive() reads incoming lines with read_until, which is not cancellation-safe, and receive() is polled inside the service loop's select! (service.rs). When another branch (e.g. an outgoing response on the sink-proxy channel) becomes ready while a request line is only partially read, the receive() future is dropped, and the next call's self.line_buf.clear() at the top of the loop discards the partially-read bytes — so that request is lost.

Under many concurrent large responses the read gets cancelled often, which is why the loss is intermittent and load-dependent. The loss is on the read side: instrumenting the loop shows the missing id never produces a "received request" event, i.e. it never arrives at all.

Fix

Keep the partially-read bytes in line_buf across calls and clear the buffer only after a whole line has been consumed. read_until returns only at a delimiter or EOF (a cancelled read never returns), so on return the buffer holds a complete line; a cancelled read leaves its partial bytes in place and the next call resumes the same line instead of discarding it. The buffer is cleared (retaining its capacity) rather than reallocated per message.

The fix is in AsyncRwTransport, so it also covers the child-process client transport (TokioChildProcess), which reuses the same transport.

Test

Adds crates/rmcp/tests/test_stdio_response_concurrency.rs — the reproducer from the issue. It sends 200 concurrent tools/call requests that each return 64 KiB over real stdio pipes and asserts every response id eventually arrives. It fails reliably on main and passes with this change (40/40 runs locally); the full rmcp test suite remains green, and cargo fmt/clippy are clean.

…extprotocol#941)
`receive()` reads incoming lines with `read_until`, which is not
cancellation-safe, and it is polled inside the service loop's `select!`.
When another branch (e.g. an outgoing response) becomes ready while a
request line is only partially read, the `receive()` future is dropped
and the next call's `self.line_buf.clear()` discards the partial bytes,
so that incoming request is silently lost and never gets a response.
Under many concurrent large responses this intermittently drops requests.
Keep the partially-read bytes in `line_buf` across calls and clear it
only after a whole line has been consumed, so a cancelled read resumes
the same line instead of dropping it. The buffer is cleared (retaining
capacity) rather than reallocated per message.
Adds a regression test that fires 200 concurrent 64 KiB tool responses
over real stdio pipes and asserts no response id goes missing.
This also covers the child-process client transport, which reuses
`AsyncRwTransport`.
@ameyypawar
ameyypawar requested a review from a team as a code ownerJuly 1, 2026 18:53
@github-actionsgithub-actionsBot added T-test Testing related changes T-core Core library changes T-transport Transport layer changes labels Jul 1, 2026

@DaleSeoDaleSeo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix, @ameyypawar!

@DaleSeo
DaleSeo merged commit 4833ec7 into modelcontextprotocol:mainJul 2, 2026
31 of 32 checks passed
@github-actionsgithub-actionsBot mentioned this pull request Jul 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

T-coreCore library changesT-testTesting related changesT-transportTransport layer changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Concurrent stdio responses can go missing under load

2 participants

@ameyypawar@DaleSeo
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(transport): make AsyncRwTransport::receive cancel-safe (#941) by ameyypawar · Pull Request #947 · modelcontextprotocol/rust-sdk · GitHub
Skip to content

fix(transport): make AsyncRwTransport::receive cancel-safe (#941) - #947

Merged
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety
Jul 2, 2026
Merged

fix(transport): make AsyncRwTransport::receive cancel-safe (#941)#947
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety

Conversation

@ameyypawar

Copy link
Copy Markdown
Contributor

Fixes#941.

Problem

An rmcp stdio server handling many concurrent requests that produce large responses can intermittently drop an incoming request: it never reaches a handler, so no response is produced and the client waits forever for that id.

Root cause

AsyncRwTransport::receive() reads incoming lines with read_until, which is not cancellation-safe, and receive() is polled inside the service loop's select! (service.rs). When another branch (e.g. an outgoing response on the sink-proxy channel) becomes ready while a request line is only partially read, the receive() future is dropped, and the next call's self.line_buf.clear() at the top of the loop discards the partially-read bytes — so that request is lost.

Under many concurrent large responses the read gets cancelled often, which is why the loss is intermittent and load-dependent. The loss is on the read side: instrumenting the loop shows the missing id never produces a "received request" event, i.e. it never arrives at all.

Fix

Keep the partially-read bytes in line_buf across calls and clear the buffer only after a whole line has been consumed. read_until returns only at a delimiter or EOF (a cancelled read never returns), so on return the buffer holds a complete line; a cancelled read leaves its partial bytes in place and the next call resumes the same line instead of discarding it. The buffer is cleared (retaining its capacity) rather than reallocated per message.

The fix is in AsyncRwTransport, so it also covers the child-process client transport (TokioChildProcess), which reuses the same transport.

Test

Adds crates/rmcp/tests/test_stdio_response_concurrency.rs — the reproducer from the issue. It sends 200 concurrent tools/call requests that each return 64 KiB over real stdio pipes and asserts every response id eventually arrives. It fails reliably on main and passes with this change (40/40 runs locally); the full rmcp test suite remains green, and cargo fmt/clippy are clean.

…extprotocol#941)
`receive()` reads incoming lines with `read_until`, which is not
cancellation-safe, and it is polled inside the service loop's `select!`.
When another branch (e.g. an outgoing response) becomes ready while a
request line is only partially read, the `receive()` future is dropped
and the next call's `self.line_buf.clear()` discards the partial bytes,
so that incoming request is silently lost and never gets a response.
Under many concurrent large responses this intermittently drops requests.
Keep the partially-read bytes in `line_buf` across calls and clear it
only after a whole line has been consumed, so a cancelled read resumes
the same line instead of dropping it. The buffer is cleared (retaining
capacity) rather than reallocated per message.
Adds a regression test that fires 200 concurrent 64 KiB tool responses
over real stdio pipes and asserts no response id goes missing.
This also covers the child-process client transport, which reuses
`AsyncRwTransport`.
@ameyypawar
ameyypawar requested a review from a team as a code ownerJuly 1, 2026 18:53
@github-actionsgithub-actionsBot added T-test Testing related changes T-core Core library changes T-transport Transport layer changes labels Jul 1, 2026

@DaleSeoDaleSeo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix, @ameyypawar!

@DaleSeo
DaleSeo merged commit 4833ec7 into modelcontextprotocol:mainJul 2, 2026
31 of 32 checks passed
@github-actionsgithub-actionsBot mentioned this pull request Jul 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

T-coreCore library changesT-testTesting related changesT-transportTransport layer changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Concurrent stdio responses can go missing under load

2 participants

@ameyypawar@DaleSeo
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(transport): make AsyncRwTransport::receive cancel-safe (#941) by ameyypawar · Pull Request #947 · modelcontextprotocol/rust-sdk · GitHub
Skip to content

fix(transport): make AsyncRwTransport::receive cancel-safe (#941) - #947

Merged
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety
Jul 2, 2026
Merged

fix(transport): make AsyncRwTransport::receive cancel-safe (#941)#947
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety

Conversation

@ameyypawar

Copy link
Copy Markdown
Contributor

Fixes#941.

Problem

An rmcp stdio server handling many concurrent requests that produce large responses can intermittently drop an incoming request: it never reaches a handler, so no response is produced and the client waits forever for that id.

Root cause

AsyncRwTransport::receive() reads incoming lines with read_until, which is not cancellation-safe, and receive() is polled inside the service loop's select! (service.rs). When another branch (e.g. an outgoing response on the sink-proxy channel) becomes ready while a request line is only partially read, the receive() future is dropped, and the next call's self.line_buf.clear() at the top of the loop discards the partially-read bytes — so that request is lost.

Under many concurrent large responses the read gets cancelled often, which is why the loss is intermittent and load-dependent. The loss is on the read side: instrumenting the loop shows the missing id never produces a "received request" event, i.e. it never arrives at all.

Fix

Keep the partially-read bytes in line_buf across calls and clear the buffer only after a whole line has been consumed. read_until returns only at a delimiter or EOF (a cancelled read never returns), so on return the buffer holds a complete line; a cancelled read leaves its partial bytes in place and the next call resumes the same line instead of discarding it. The buffer is cleared (retaining its capacity) rather than reallocated per message.

The fix is in AsyncRwTransport, so it also covers the child-process client transport (TokioChildProcess), which reuses the same transport.

Test

Adds crates/rmcp/tests/test_stdio_response_concurrency.rs — the reproducer from the issue. It sends 200 concurrent tools/call requests that each return 64 KiB over real stdio pipes and asserts every response id eventually arrives. It fails reliably on main and passes with this change (40/40 runs locally); the full rmcp test suite remains green, and cargo fmt/clippy are clean.

…extprotocol#941)
`receive()` reads incoming lines with `read_until`, which is not
cancellation-safe, and it is polled inside the service loop's `select!`.
When another branch (e.g. an outgoing response) becomes ready while a
request line is only partially read, the `receive()` future is dropped
and the next call's `self.line_buf.clear()` discards the partial bytes,
so that incoming request is silently lost and never gets a response.
Under many concurrent large responses this intermittently drops requests.
Keep the partially-read bytes in `line_buf` across calls and clear it
only after a whole line has been consumed, so a cancelled read resumes
the same line instead of dropping it. The buffer is cleared (retaining
capacity) rather than reallocated per message.
Adds a regression test that fires 200 concurrent 64 KiB tool responses
over real stdio pipes and asserts no response id goes missing.
This also covers the child-process client transport, which reuses
`AsyncRwTransport`.
@ameyypawar
ameyypawar requested a review from a team as a code ownerJuly 1, 2026 18:53
@github-actionsgithub-actionsBot added T-test Testing related changes T-core Core library changes T-transport Transport layer changes labels Jul 1, 2026

@DaleSeoDaleSeo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix, @ameyypawar!

@DaleSeo
DaleSeo merged commit 4833ec7 into modelcontextprotocol:mainJul 2, 2026
31 of 32 checks passed
@github-actionsgithub-actionsBot mentioned this pull request Jul 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

T-coreCore library changesT-testTesting related changesT-transportTransport layer changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Concurrent stdio responses can go missing under load

2 participants

@ameyypawar@DaleSeo
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); fix(transport): make AsyncRwTransport::receive cancel-safe (#941) by ameyypawar · Pull Request #947 · modelcontextprotocol/rust-sdk · GitHub
Skip to content

fix(transport): make AsyncRwTransport::receive cancel-safe (#941) - #947

Merged
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety
Jul 2, 2026
Merged

fix(transport): make AsyncRwTransport::receive cancel-safe (#941)#947
DaleSeo merged 1 commit into
modelcontextprotocol:mainfrom
ameyypawar:fix/941-stdio-receive-cancel-safety

Conversation

@ameyypawar

Copy link
Copy Markdown
Contributor

Fixes#941.

Problem

An rmcp stdio server handling many concurrent requests that produce large responses can intermittently drop an incoming request: it never reaches a handler, so no response is produced and the client waits forever for that id.

Root cause

AsyncRwTransport::receive() reads incoming lines with read_until, which is not cancellation-safe, and receive() is polled inside the service loop's select! (service.rs). When another branch (e.g. an outgoing response on the sink-proxy channel) becomes ready while a request line is only partially read, the receive() future is dropped, and the next call's self.line_buf.clear() at the top of the loop discards the partially-read bytes — so that request is lost.

Under many concurrent large responses the read gets cancelled often, which is why the loss is intermittent and load-dependent. The loss is on the read side: instrumenting the loop shows the missing id never produces a "received request" event, i.e. it never arrives at all.

Fix

Keep the partially-read bytes in line_buf across calls and clear the buffer only after a whole line has been consumed. read_until returns only at a delimiter or EOF (a cancelled read never returns), so on return the buffer holds a complete line; a cancelled read leaves its partial bytes in place and the next call resumes the same line instead of discarding it. The buffer is cleared (retaining its capacity) rather than reallocated per message.

The fix is in AsyncRwTransport, so it also covers the child-process client transport (TokioChildProcess), which reuses the same transport.

Test

Adds crates/rmcp/tests/test_stdio_response_concurrency.rs — the reproducer from the issue. It sends 200 concurrent tools/call requests that each return 64 KiB over real stdio pipes and asserts every response id eventually arrives. It fails reliably on main and passes with this change (40/40 runs locally); the full rmcp test suite remains green, and cargo fmt/clippy are clean.

…extprotocol#941)
`receive()` reads incoming lines with `read_until`, which is not
cancellation-safe, and it is polled inside the service loop's `select!`.
When another branch (e.g. an outgoing response) becomes ready while a
request line is only partially read, the `receive()` future is dropped
and the next call's `self.line_buf.clear()` discards the partial bytes,
so that incoming request is silently lost and never gets a response.
Under many concurrent large responses this intermittently drops requests.
Keep the partially-read bytes in `line_buf` across calls and clear it
only after a whole line has been consumed, so a cancelled read resumes
the same line instead of dropping it. The buffer is cleared (retaining
capacity) rather than reallocated per message.
Adds a regression test that fires 200 concurrent 64 KiB tool responses
over real stdio pipes and asserts no response id goes missing.
This also covers the child-process client transport, which reuses
`AsyncRwTransport`.
@ameyypawar
ameyypawar requested a review from a team as a code ownerJuly 1, 2026 18:53
@github-actionsgithub-actionsBot added T-test Testing related changes T-core Core library changes T-transport Transport layer changes labels Jul 1, 2026

@DaleSeoDaleSeo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix, @ameyypawar!

@DaleSeo
DaleSeo merged commit 4833ec7 into modelcontextprotocol:mainJul 2, 2026
31 of 32 checks passed
@github-actionsgithub-actionsBot mentioned this pull request Jul 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

T-coreCore library changesT-testTesting related changesT-transportTransport layer changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Concurrent stdio responses can go missing under load

2 participants

@ameyypawar@DaleSeo