-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
⚒️ fix: MCP Initialization Flows #8734
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.
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
Merged
Conversation
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
…initialization flows
…because we didn't clear interval)
…n OAuth after cancellation
…en checking status for indicators (so error triangle indicator doesn't show up on cancellaiton)
jhrozek
pushed a commit
to StacklokLabs/LibreChat
that referenced
this pull request
Jul 31, 2025
* fix: add OAuth flow back in to success state * feat: disable server clicks during initialization to prevent spam * fix: correct new tab behavior for OAuth between one-click and normal initialization flows * fix: stop polling on error during oauth (was infinite popping toasts because we didn't clear interval) * fix: cleanupServerState should be called after successful cancelOauth, not before * fix: change from completeFlow to failFlow to avoid stale client IDs on OAuth after cancellation * fix: add logic to differentiate between cancelled and failed flows when checking status for indicators (so error triangle indicator doesn't show up on cancellaiton)
xycjscs
pushed a commit
to xycjscs/LibreChat
that referenced
this pull request
Aug 9, 2025
* fix: add OAuth flow back in to success state * feat: disable server clicks during initialization to prevent spam * fix: correct new tab behavior for OAuth between one-click and normal initialization flows * fix: stop polling on error during oauth (was infinite popping toasts because we didn't clear interval) * fix: cleanupServerState should be called after successful cancelOauth, not before * fix: change from completeFlow to failFlow to avoid stale client IDs on OAuth after cancellation * fix: add logic to differentiate between cancelled and failed flows when checking status for indicators (so error triangle indicator doesn't show up on cancellaiton)
miguelwon
pushed a commit
to miguelwon/LibreChat
that referenced
this pull request
Aug 10, 2025
* fix: add OAuth flow back in to success state * feat: disable server clicks during initialization to prevent spam * fix: correct new tab behavior for OAuth between one-click and normal initialization flows * fix: stop polling on error during oauth (was infinite popping toasts because we didn't clear interval) * fix: cleanupServerState should be called after successful cancelOauth, not before * fix: change from completeFlow to failFlow to avoid stale client IDs on OAuth after cancellation * fix: add logic to differentiate between cancelled and failed flows when checking status for indicators (so error triangle indicator doesn't show up on cancellaiton)
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
This pull request fixes issues with MCP OAuth flows concerning cancellation handling, polling cleanup, UI state management during server initialization, and most critically resolving a bug introduced in #8718 which broke initial OAuth flows.
Backend Changes:
api/server/routes/mcp.js
:completeFlow
tofailFlow
for proper cancellation state management, preventing stale client IDs and "Client ID mismatch" errorssuccess: (userConnection && !oauthRequired) || (oauthRequired && oauthUrl)
)api/server/services/MCP.js
:hasFailedFlow: false
for cancelled flows to prevent error triangle display in UIFrontend Changes:
client/src/hooks/MCP/useMCPServerManager.ts
:clearInterval(pollInterval)
in error conditions and catch blocks to stop infinite pollingisInitializing
checks to prevent server selection/toggling during initializationautoOpenOAuth
parameter toinitializeServer
for better OAuth URL handling controlclient/src/components/Chat/Input/MCPSelect.tsx
:client/src/components/Chat/Input/MCPSubMenu.tsx
:client/src/components/MCP/ServerInitializationSection.tsx
:initializeServer
call to passautoOpenOAuth: false
for manual initializationChange Type
Testing
Manual verification of MCP OAuth flow scenarios:
Checklist