fix: MCP client global variable causes tool duplication #76
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.
Replace global mcpClient with Map to store separate client instances for each MCP server. Previously all servers shared one client and showed identical tools.
TLDR
Fixed MCP servers all showing the same tools instead of their unique toolsets. Changed from global variable to Map-based storage so each server gets its own client instance.
Dive Deeper
The issue was in `packages/core/src/tools/mcp-client.ts` where a global `mcpClient` variable was being overwritten by each new connection. This meant the last connected server's tools would appear for all servers.
Solution:
Reviewer Test Plan
Testing Matrix
Linked issues / bugs