') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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: negotiate protocol version in handler by actsalan · Pull Request #930 · modelcontextprotocol/rust-sdk · GitHub
Skip to content

fix: negotiate protocol version in handler - #930

Merged
DaleSeo merged 2 commits into
modelcontextprotocol:mainfrom
actsalan:fix/protocol-version-negotiation
Jun 29, 2026
Merged

fix: negotiate protocol version in handler#930
DaleSeo merged 2 commits into
modelcontextprotocol:mainfrom
actsalan:fix/protocol-version-negotiation

Conversation

@actsalan

Copy link
Copy Markdown
Contributor

Summary

Fixes#916 - ensures context.protocol_version() returns the negotiated version in all transports and modes.

Motivation and Context

Three related bugs existed in protocol version handling:

  1. Stateless HTTP: serve_directly passed None as peer_info, so context.protocol_version() was always None in handlers
  2. Stateful/stdio: serve_server negotiated the version in the initialize response but never updated peer_info to match, so handlers saw the client's raw requested version instead of the negotiated one
  3. Default handler: The default ServerHandler::initialize didn't apply negotiation logic, so the response could echo an unnegotiated version

How Has This Been Tested?

  • Added tests for both stdio (test_protocol_version_negotiation.rs) and stateless HTTP (test_stateless_protocol_version.rs) transports
  • Tests verify that all KNOWN_VERSIONS are correctly echoed back to clients
  • Tests verify that unknown versions fall back to LATEST
  • All existing tests continue to pass

Breaking Changes

None. This fix maintains backward compatibility while ensuring correct protocol version negotiation.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update

Checklist

  • I have read the MCP Documentation
  • My code follows the repository's style guidelines
  • New and existing tests pass locally
  • I have added appropriate error handling
  • I have added or updated documentation as needed

Additional context

Changes made:

  • tower.rs: Reconstruct peer_info per-request from MCP-Protocol-Version header for stateless mode
  • service/server.rs: Update peer_info after negotiation so subsequent handlers see the negotiated version
  • handler/server.rs: Apply negotiate_protocol_version in default initialize response

@actsalan
actsalan requested a review from a team as a code ownerJune 26, 2026 17:02
@github-actionsgithub-actionsBot added T-dependencies Dependencies related changes T-test Testing related changes T-config Configuration file changes T-core Core library changes T-handler Handler implementation changes T-service Service layer changes T-transport Transport layer changes labels Jun 26, 2026
@actsalan
actsalanforce-pushed the fix/protocol-version-negotiation branch from 83708af to 0f12a96CompareJune 26, 2026 17:28
@DaleSeo
DaleSeo merged commit 80a7479 into modelcontextprotocol:mainJun 29, 2026
19 checks passed
@github-actionsgithub-actionsBot mentioned this pull request Jun 29, 2026
@actsalan
actsalan deleted the fix/protocol-version-negotiation branch June 29, 2026 18:50
This was referenced Jul 1, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

T-configConfiguration file changesT-coreCore library changesT-dependenciesDependencies related changesT-handlerHandler implementation changesT-serviceService layer changesT-testTesting related changesT-transportTransport layer changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

streamable_http transport does not perform MCP protocol version negotiation

2 participants

@actsalan@DaleSeo