') + ')', '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: stamp server info on graceful subscription results by mrcs64 · Pull Request #1078 · modelcontextprotocol/rust-sdk · GitHub
Skip to content

fix: stamp server info on graceful subscription results - #1078

Merged
DaleSeo merged 2 commits into
modelcontextprotocol:mainfrom
mrcs64:fix/listen-server-info
Jul 29, 2026
Merged

fix: stamp server info on graceful subscription results#1078
DaleSeo merged 2 commits into
modelcontextprotocol:mainfrom
mrcs64:fix/listen-server-info

Conversation

@mrcs64

@mrcs64mrcs64 commented Jul 29, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

Stamp the server implementation identity into the final result produced when a
subscriptions/listen handler completes gracefully.

Motivation and Context

The MCP 2026-07-28 specification says servers SHOULD include
io.modelcontextprotocol/serverInfo in every result's _meta.
ServerHandler::listen returns Result<(), McpError>, and rmcp constructs the
final SubscriptionsListenResult only after the handler returns. Applications
therefore cannot add this metadata themselves.

This PR intentionally covers only the graceful subscriptions/listen result
synthesized by rmcp after the application handler returns. SDK-wide stamping of
application-produced results is a separate concern.

How Has This Been Tested?

  • Added a stdio regression test that asserts the graceful final result contains
    the server implementation identity.
  • Added the same assertion to the real Streamable HTTP/SSE graceful-close test.
  • Ran the full repository test recipe, including the all-features and
    non-local-feature passes.
  • Ran cargo clippy --all-targets --all-features -- -D warnings.
  • Ran cargo +nightly fmt --all -- --check.

Breaking Changes

None. This adds missing response metadata without changing the handler API.

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

The request path captures ServerInfo once before establishing the
subscription, so capability filtering and the eventual server identity come
from the same snapshot. Cancellation, abrupt transport closure, and handler
errors keep their existing behavior.

@github-actionsgithub-actionsBot added T-test Testing related changes T-core Core library changes T-handler Handler implementation changes labels Jul 29, 2026
@github-actionsgithub-actionsBot added the T-config Configuration file changes label Jul 29, 2026
@mrcs64
mrcs64 marked this pull request as ready for review July 29, 2026 11:09
@mrcs64
mrcs64 requested a review from a team as a code ownerJuly 29, 2026 11:09
DaleSeo
DaleSeo approved these changes Jul 29, 2026
View reviewed changes

@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, @mrcs64!

@DaleSeo
DaleSeo merged commit cb50ae7 into modelcontextprotocol:mainJul 29, 2026
22 checks passed
@github-actionsgithub-actionsBot mentioned this pull request Jul 29, 2026
Merged
@DaleSeoDaleSeo mentioned this pull request Jul 29, 2026
Merged
9 tasks
@DaleSeo

DaleSeo commented Jul 29, 2026

Copy link
Copy Markdown
Member

Just for context, I initially implemented the shape documented in SEP-2575 in #1000. However, the final spec added a graceful result for subscriptions/listen and made serverInfo optional in the result metadata. Since the SEP page was not updated, those changes were easy to miss, so I opened modelcontextprotocol/modelcontextprotocol#3159 to document these post-final SEP changes for future implementers.

@DaleSeoDaleSeo mentioned this pull request Jul 29, 2026
Open
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DaleSeoDaleSeoDaleSeo approved these changes

Assignees

No one assigned

Labels

T-configConfiguration file changesT-coreCore library changesT-handlerHandler implementation changesT-testTesting related changes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mrcs64@DaleSeo