fix(rmcp): preserve elicitation requestedSchema $schema dialect - #1176
Merged
DaleSeo merged 3 commits intoAug 18, 2026
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
ElicitationSchema round-trips through ElicitationSchemaWire, which had no field for the top-level `$schema` keyword. A dialect declared on an incoming requestedSchema (allowed since protocol revision 2025-11-25) was therefore accepted but silently dropped on re-serialization. Add a `schema` field to both the public struct and the wire bridge, thread it through the two `From` conversions, and expose a `with_schema` setter. The field is `skip_serializing_if = "Option::is_none"`, so schemas without a dialect serialize unchanged. Refs #1168
… $schema The $schema dialect field added to ElicitationSchema changes the schemars-generated ServerJsonRpcMessage schema. Regenerate the golden snapshot so test_server_json_rpc_message_schema passes.
latent-9
force-pushed
the
fix/elicitation-schema-dialect
branch
from
3d774d8 to
312afb0
Compare
August 15, 2026 08:01
DaleSeo
previously approved these changes
Aug 18, 2026
Comment thread
crates/rmcp/src/model/elicitation_schema.rs
Outdated
Use schemars(with = "String") on ElicitationSchema::$schema so schemars generates "type": "string" instead of ["string", "null"].
latent-9
force-pushed
the
fix/elicitation-schema-dialect
branch
from
bb180d0 to
0dafbd3
Compare
August 18, 2026 14:34
DaleSeo
approved these changes
Aug 18, 2026
This was referenced Aug 18, 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.
What
ElicitationSchema (de)serializes through an internal ElicitationSchemaWire
bridge. The bridge had no field for the top-level $schema keyword, so a
dialect declared on an incoming requestedSchema was accepted but silently
dropped when the schema was re-serialized.
The 2025-11-25 protocol revision allows a requestedSchema to carry a
$schema dialect identifier, and ElicitationSchema::from_type already emits
one (schemars draft-07), so the value was being lost on any round-trip.
Change
to both ElicitationSchema and the ElicitationSchemaWire bridge.
with_description builders. The struct is #[non_exhaustive], so an
external caller needs a setter to populate the field.
The field uses skip_serializing_if = "Option::is_none", so a schema without a
dialect serializes exactly as before. Adding a field to a #[non_exhaustive]
struct is semver compatible.
Tests
Three unit tests in elicitation_schema.rs:
Scope
This handles the $schema half of #1168. The other half (preserving unknown
property-level keywords) needs a data-model decision on where arbitrary
keywords should live, so I left it out of this change and kept the issue open
for it.
Refs #1168