fix: expose MRTR state to tool handlers - #1104
Merged
DaleSeo merged 2 commits intoAug 5, 2026
Merged
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
DaleSeo
marked this pull request as ready for review
July 31, 2026 00:22
DaleSeo
force-pushed
the
fix/mrtr-tool-context
branch
from
b0c2ce4 to
aff4f5c
Compare
July 31, 2026 15:11
alexhancock
previously approved these changes
Aug 3, 2026
Comment thread
crates/rmcp/src/handler/server/tool.rs
| pub service: &'s S, | ||
| pub name: Cow<'static, str>, | ||
| pub arguments: Option<JsonObject>, | ||
| /// Client responses to input requests from the previous MRTR round. |
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
I'd strip these comments
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
There was a problem hiding this comment.
@alexhancock Would you be open to documenting the existing fields instead? Since this struct is public, I think rustdoc for all of its fields would be useful and more consistent.
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
There was a problem hiding this comment.
I've added comments to the existing fields.
Sorry, something went wrong.
DaleSeo
force-pushed
the
fix/mrtr-tool-context
branch
from
aff4f5c to
9b6b5af
Compare
August 5, 2026 13:43
alexhancock
approved these changes
Aug 5, 2026
This was referenced Aug 4, 2026
Merged
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.
Fixes #1095.
Motivation and Context
ToolCallContext::new was dropping request_state and input_responses, so #[tool] handlers could not continue an MRTR call after the client completed its input requests. Because of that, servers had to bypass the macro routing path and implement ServerHandler::call_tool manually.
This PR preserves the SEP-2322 retry state and input responses when macro-generated tool handlers route calls through ToolCallContext. It also adds extractors for both values and lets #[tool] handlers return CallToolResponse. This allows a single handler to produce both input_required responses and completed results.
How Has This Been Tested?
Added regression tests
Breaking Changes
None.
Types of changes
Checklist