Skip to content

mcp: keep a delivered response when the caller's context is cancelled #1370

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: keep a delivered response when the caller's context is cancelled #1370

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba70c87
mcp: keep a delivered response when the caller's context is cancelled
vbcherepanov Oct 10, 2026
f8ad6b6
mcp: drop the regression test for the delivered response
vbcherepanov Oct 12, 2026
694223a
Merge branch 'main' into fix/call-cancel-delivered-response
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
6 changes: 6 additions & 0 deletions mcp/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,12 @@ func call(ctx context.Context, conn *jsonrpc2.Connection, method string, params
call := conn.Call(ctx, method, params)
err := call.Await(ctx, result)
switch {
case err == nil:
// The response arrived and decoded. It is returned even if ctx has
// been cancelled in the meantime: the request is complete, so there
// is nothing to cancel, and the spec permits notifications/cancelled
// only for requests believed to still be in progress.
return nil
Comment on lines +304 to +309

@guglielmo-san guglielmo-san Oct 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the only change i would keep. This PR is aiming to fix a very niche issue and I would prefer to keep the code less convoluted

@vbcherepanov vbcherepanov Oct 10, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, done. The PR now only adds the case err == nil branch in call, plus the regression test. The Await change and its tests are gone. The test still fails on main and passes with the branch, so the one case covers it.

case errors.Is(err, jsonrpc2.ErrClientClosing), errors.Is(err, jsonrpc2.ErrServerClosing):
return fmt.Errorf("%w: calling %q: %v", ErrConnectionClosed, method, err)
case ctx.Err() != nil:
Expand Down
Loading