fix(dispatcher): advance mint counter past caller-supplied IDs (#3126) - #3274
Open
elang2 wants to merge 3 commits into
Open
fix(dispatcher): advance mint counter past caller-supplied IDs (#3126)#3274elang2 wants to merge 3 commits into
elang2 wants to merge 3 commits into
Conversation
…ontextprotocol#3126) When a caller supplies an integer request ID via CallOptions["request_id"], advance the monotonic mint counter past it so future auto-minted IDs never collide with a previously-used supplied ID. This satisfies the JSON-RPC spec requirement that request IDs MUST NOT be reused within the same session. Applied to both JSONRPCDispatcher and DirectDispatcher.
Add a test that exercises the while-loop body in DirectDispatcher._dispatch_request which skips past in-flight IDs when minting. CI was failing with 99.99% coverage (fail-under=100%) because line 264 was unreachable through normal API usage — the max() advancement on caller-supplied IDs prevents natural collisions. The test injects synthetic in-flight keys to prove the guard works.
The test accesses DirectDispatcher internals (_in_flight_ids, _next_id) but direct_pair() returns the Dispatcher protocol. Add an isinstance assertion so pyright can see the concrete type.
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
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
1 participant
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.
Summary
When a caller supplies an integer request ID, the dispatcher's internal
_next_idcounter can mint the same value for a later request. The spec says IDs MUST NOT be reused within a session, so this is a correctness bug.The fix eagerly advances
_next_idtomax(_next_id, supplied_id)in bothJsonRpcDispatcherandDirectDispatcher. Two lines per dispatcher, no behavioral change for callers using string-only IDs.Test plan
pair_factoryparametrization)Fixes #3126