Add protocol version negotiation to server initialization#223
Open
duboff wants to merge 1 commit intomodelcontextprotocol:mainfrom
Open
Add protocol version negotiation to server initialization#223duboff wants to merge 1 commit intomodelcontextprotocol:mainfrom
duboff wants to merge 1 commit intomodelcontextprotocol:mainfrom
Conversation
92a0880 to
3c3f0d5
Compare
3c3f0d5 to
1c14f65
Compare
koic
reviewed
Feb 3, 2026
atesgoral
previously approved these changes
Feb 4, 2026
Contributor
atesgoral
left a comment
There was a problem hiding this comment.
Thanks for doing this!
koic
reviewed
Feb 4, 2026
koic
reviewed
Feb 4, 2026
211753e to
8d1ac82
Compare
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
8d1ac82 to
8ad04db
Compare
Member
|
Thanks! Can you rebase on the latest main branch and resolve the conflicts? |
koic
reviewed
Feb 5, 2026
|
|
||
| info = server_info | ||
| info = info.reject { |key| [:description, :icons].include?(key) } if negotiated_version <= "2025-06-18" | ||
| info = info.reject { |key| [:title, :websiteUrl].include?(key) } if negotiated_version <= "2025-03-26" |
Member
There was a problem hiding this comment.
The filtering loop logic seems a bit redundant, and the terminology could be clearer. Can you update it?
diff --git a/lib/mcp/server.rb b/lib/mcp/server.rb
index af3ea15..03628bb 100644
--- a/lib/mcp/server.rb
+++ b/lib/mcp/server.rb
@@ -18,6 +18,9 @@ module MCP
class Server
DEFAULT_VERSION = "0.1.0"
+ UNSUPPORTED_PROPERTIES_UNTIL_2025_06_18 = [:description, :icons].freeze
+ UNSUPPORTED_PROPERTIES_UNTIL_2025_03_26 = [:title, :websiteUrl].freeze
+
class RequestHandlerError < StandardError
attr_reader :error_type
attr_reader :original_error
@@ -321,9 +324,10 @@ module MCP
configuration.protocol_version
end
- info = server_info
- info = info.reject { |key| [:description, :icons].include?(key) } if negotiated_version <= "2025-06-18"
- info = info.reject { |key| [:title, :websiteUrl].include?(key) } if negotiated_version <= "2025-03-26"
+ info = server_info.reject do |property|
+ negotiated_version <= "2025-06-18" && UNSUPPORTED_PROPERTIES_UNTIL_2025_06_18.include?(property) ||
+ negotiated_version <= "2025-03-26" && UNSUPPORTED_PROPERTIES_UNTIL_2025_03_26.include?(property)
+ end
response_instructions = instructions
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.
Motivation and Context
Currently server launched enforces the latest protocol regardless of the protocols supported by the client. This leads to issues when a client (eg. Claude Desktop) supports only protocol versions (2025-06-18) behind the current version supported by the server (2025-11-25).
This PR adds full protocol version negotiation logic (as per the MCP Spec), including dropping parameters not supported by each individual protocol version, to maximize compatibility.
How Has This Been Tested?
Tested with the Chattermill MCP (proprietary).
Breaking Changes
No breaking changes expected.
Types of changes
Checklist
Additional context
A potential consideration could be to add a config option to enumerate supported protocols if the server developer wants to explicitly avoid supporting all possible protocols. Not implemented here as doesn't seem necessary.