fix(mcp): harden OAuth callback recovery#1926
Merged
Merged
Conversation
🦋 Changeset detectedLatest commit: c1b8b40 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
agents
@cloudflare/ai-chat
@cloudflare/codemode
create-think
hono-agents
@cloudflare/shell
@cloudflare/think
@cloudflare/voice
@cloudflare/worker-bundler
commit: |
Verify callback state before mutating an MCP connection, let genuine callbacks recover failed flows, and refresh authorization URLs whose embedded state has expired.
mattzcarey
force-pushed
the
fix/mcp-oauth-callback-robustness
branch
from
July 22, 2026 10:45
f67b2ff to
c1b8b40
Compare
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.
Summary
Harden the MCP OAuth callback state machine:
failed;addMcpServer()reconnect when an authorization URL embeds expired state, so it returns a fresh flow instead of an unusable URL.Why this is needed
A well-formed callback carrying an unknown nonce could move an in-flight connection from
authenticatingtofailedand clear its authorization URL. The genuine callback was then rejected. Separately, preserving the connection on expired state requires refreshing the expired URL or the flow remains stuck.The minimized callback tests and stale-flow integration test both fail on current
mainand pass with this branch.Validation
pnpm --filter agents exec vitest run src/tests/mcp— 30 files, 549 tests passedmainvoice errors inexamples/voice-agentandvoice-providers/assemblyaiIncludes a patch changeset for
agents.