Sync enable-2026-07-28 with upstream main (#1012, #1008/SEP-2549, #1014) - #1
Merged
Merged
Conversation
…ol#1012) Copy of existing [PR](modelcontextprotocol#972) patching 1.6.0 version
…ocol#1014) To guarantee a better compatibility with legacy server, enable the fallback to the legacy initialize rpc in case of any error returned by the server, in case of `server/discover` request.
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
2 participants
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.
Brings the fork's
enable-2026-07-28branch up to date withmodelcontextprotocol/go-sdk@mainby merging upstream forward (non-destructive — no history rewrite). The branch was 3 commits behind upstream (last synced atd9728a8, 2026-06-16; upstream now atb85574f, 2026-06-18).What this pulls in
71ffcb4—MCPGPDEBUGfor opt-in Content-Type check (mcp: add MCPGPDEBUG for opt-in Content-Type check modelcontextprotocol/go-sdk#1012)6333aa7— add ttl for list results (SEP-2549) (mcp: add ttl for list results (SEP-2549) modelcontextprotocol/go-sdk#1008) — part of the modern stateless draftb85574f— Enable legacy initialize fallback on any error (mcp: Enable legacy initialize fallback on any error modelcontextprotocol/go-sdk#1014)Our patch is untouched
The single-commit enable patch (
19527b6, addsprotocolVersion20260728 = "2026-07-28"tosupportedProtocolVersionsinmcp/shared.go) is preserved verbatim —mcp/shared.goblob is byte-identical (ef24b40d) before and after, and none of the 3 upstream commits touch that file, so the merge is conflict-free. The net diff vs the old branch tip is exactly the 3 upstream commits' files.Why still needed
Upstream
mainstill lists only up to2025-11-25insupportedProtocolVersions(2026-06-30is defined-but-unlisted;2026-07-28is absent entirely), and the config-knob PR modelcontextprotocol#947 (ServerOptions.SupportedVersions) remains open. So the fork + thego.modreplace inconstellos/mcpstay load-bearing.After merge,
services/mcp/go.modwill re-point itsreplaceat the new branch tip.