Skip to content

mcp: bind peer cancellation before request ID reuse #1390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guglielmo-san merged 3 commits into from
Oct 13, 2026
Merged

mcp: bind peer cancellation before request ID reuse #1390

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5811a6
mcp: bind peer cancellation before request ID reuse
skosovsky Oct 12, 2026
227b844
test: remove cancellation reuse harness per upstream review
skosovsky Oct 13, 2026
939b344
Merge branch 'main' into fix/cancellation-request-id-reuse
guglielmo-san Oct 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion mcp/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,9 @@ func (c *canceller) Preempt(ctx context.Context, req *jsonrpc.Request) (result a
// travels as the cause of the request's context rather than being
// dropped here.
c.logger.Debug("request cancelled by the peer", "id", id.Raw(), "reason", params.Reason)
go c.conn.CancelCause(id, &peerCancelledError{reason: params.Reason})
// Resolve the active request before the read loop can admit another
// invocation with the same ID. A deferred lookup could cancel that one.
c.conn.CancelCause(id, &peerCancelledError{reason: params.Reason})
}
return nil, jsonrpc2.ErrNotHandled
}
Expand Down
Loading