feat: merge default config files#250
Open
haosenwang1018 wants to merge 1 commit intophilschmid:mainfrom
Open
Conversation
Signed-off-by: haosenwang1018 <haosenwang1018@users.noreply.github.com>
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
mcp_servers.jsonfiles instead of stopping at the first hit-c/--configandMCP_CONFIG_PATHbehavior unchanged (single file)Problem
Issue #28 points out that
mcp-clicurrently stops at the first config file it finds. That makes it impossible to combine a project-local MCP setup with personal/user-level MCP servers.Fix
When no explicit config path is provided,
loadConfig()now loads every existing default config path and merges them from lowest priority to highest priority:~/.config/mcp/mcp_servers.json~/.mcp_servers.json./mcp_servers.jsonThis preserves the current precedence model while allowing project configs to extend or override user configs. Explicit
-c/--configandMCP_CONFIG_PATHstill load exactly one file, as before.Fixes #28
Validation
git diff --checknpx tsc --noEmitbun test tests/config.test.tsbun test tests/client.test.tsbun test tests/output.test.tsnpx @biomejs/biome check src/config.ts tests/config.test.ts README.md