fix(rmcp): surface JSON-RPC error bodies on HTTP 4xx responses#748
Open
kakarot-dev wants to merge 3 commits intomodelcontextprotocol:mainfrom
Open
fix(rmcp): surface JSON-RPC error bodies on HTTP 4xx responses#748kakarot-dev wants to merge 3 commits intomodelcontextprotocol:mainfrom
kakarot-dev wants to merge 3 commits intomodelcontextprotocol:mainfrom
Conversation
When a server returns a 4xx status with Content-Type: application/json, attempt to deserialize the body as a ServerJsonRpcMessage before falling back to UnexpectedServerResponse. This allows JSON-RPC error payloads carried on HTTP error responses to be surfaced as McpError instead of being lost in a transport-level error string. Fixes modelcontextprotocol#724
When a server returns a 4xx status with Content-Type: application/json, attempt to deserialize the body as a ServerJsonRpcMessage before falling back to UnexpectedServerResponse. This allows JSON-RPC error payloads carried on HTTP error responses to be surfaced as McpError instead of being lost in a transport-level error string. Fixes modelcontextprotocol#724
github-actions
bot
added
T-core
DaleSeo
reviewed
Mar 12, 2026
Member
DaleSeo
left a comment
DaleSeo
left a comment
There was a problem hiding this comment.
Thanks for tackling this, @kakarot-dev! I have a couple of comments below. It looks like you've done some manual testing, but it would be great if you could add some automated tests to avoid any regressions.
| .as_deref() | ||
| .is_some_and(|ct| ct.as_bytes().starts_with(JSON_MIME_TYPE.as_bytes())) | ||
| { | ||
| match serde_json::from_str::<ServerJsonRpcMessage>(&body) { |
Member
There was a problem hiding this comment.
ServerJsonRpcMessage can parse any valid JSON-RPC message including Request, Response, Notification, not just Error. The deserialization should verify the parsed message is actually a JsonRpcMessage::Error.
Contributor
Author
There was a problem hiding this comment.
sorry about that, updated it so that it now only matches JsonRpcMessage::Error
Comment on lines
+202
to
+205
| // For non-success responses, attempt to parse JSON-RPC error bodies | ||
| // before falling back to a transport error. HTTP 4xx responses with | ||
| // Content-Type: application/json may carry valid JSON-RPC error | ||
| // payloads that should be surfaced as McpError, not TransportSend. |
Member
There was a problem hiding this comment.
The comment says "HTTP 4xx responses" but the guard is !status.is_success(), which also covers 1xx, 3xx, and 5xx. This could be clearer and simpler.
Suggested change
| // For non-success responses, attempt to parse JSON-RPC error bodies | |
| // before falling back to a transport error. HTTP 4xx responses with | |
| // Content-Type: application/json may carry valid JSON-RPC error | |
| // payloads that should be surfaced as McpError, not TransportSend. | |
| // Non-success responses may carry valid JSON-RPC error payloads that | |
| // should be surfaced as McpError rather than lost in TransportSend. |
Contributor
Author
There was a problem hiding this comment.
updated the comments, thank you
github-actions
bot
added
T-dependencies
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.
When a server returns a 4xx status with Content-Type: application/json, attempt to deserialize the body as a ServerJsonRpcMessage before falling back to UnexpectedServerResponse. This allows JSON-RPC error payloads carried on HTTP error responses to be surfaced as McpError instead of being lost in a transport-level error string.
Fixes #724
Attempt to deserialize HTTP 4xx response bodies as ServerJsonRpcMessage when Content-Type: application/json, surfacing JSON-RPC errors as McpError instead of discarding them as UnexpectedServerResponse.
How Has This Been Tested?
Tested locally with a mock axum server against three scenarios: valid JSON-RPC error body on 400, non-JSON 400, and malformed JSON on 400. All pass.
Breaking Changes
None.
Types of changes
Checklist
Additional context
I created a test file locally, Test file available if needed