fix: await MCP server initialization before returning McpHub instance#11518
Merged
hannesrudolph merged 2 commits intomainfrom Feb 18, 2026
Merged
fix: await MCP server initialization before returning McpHub instance#11518hannesrudolph merged 2 commits intomainfrom
hannesrudolph merged 2 commits intomainfrom
Conversation
MCP tools were unavailable on the first task turn when started via IPC because McpHub's constructor fired initializeGlobalMcpServers() and initializeProjectMcpServers() without awaiting them. getInstance() returned a hub with servers still in "connecting" state. Store the combined initialization promise and expose waitUntilReady(), then await it in McpServerManager.getInstance() so the hub is only returned after all servers have connected or timed out. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Contributor
All previously flagged issues have been resolved. No new issues found.
Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues. |
Contributor
Fixed the race condition by assigning |
Closes race condition where concurrent callers of getInstance() could receive a hub that has not finished initialization. The hub is now created in a local variable and only assigned to this.instance after waitUntilReady() completes.
hannesrudolph
approved these changes
Feb 18, 2026
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
McpHub's constructor firedinitializeGlobalMcpServers()andinitializeProjectMcpServers()as fire-and-forget async calls.McpServerManager.getInstance()returned a hub with servers still in "connecting" state.McpHuband exposewaitUntilReady(), then await it inMcpServerManager.getInstance()so the hub is only returned after all servers have connected or timed out.Test plan
McpHub.spec.tstests passroo-clinepackage🤖 Generated with Claude Code
Start a new Roo Code Cloud session on this branch