fix(filesystem): merge MCP roots with CLI-provided directories instead of replacing them#3616
Open
flobo3 wants to merge 1 commit intomodelcontextprotocol:mainfrom
Open
fix(filesystem): merge MCP roots with CLI-provided directories instead of replacing them#3616flobo3 wants to merge 1 commit intomodelcontextprotocol:mainfrom
flobo3 wants to merge 1 commit intomodelcontextprotocol:mainfrom
Conversation
…d of replacing them
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.
Fixes #3602
Problem
When an MCP client supports the roots protocol, the filesystem server's
oninitializedhandler unconditionally replaces all command-line allowed directories with only the roots provided by the client. This causes any additional directories passed via CLI arguments to be silently discarded and become inaccessible.Solution
Modified
updateAllowedDirectoriesFromRootsinsrc/filesystem/index.tsto merge the client-provided roots with the existingallowedDirectories(which contains the CLI-provided directories) using aSetto ensure uniqueness, instead of completely replacing them.This ensures that both CLI-provided directories and client-provided roots are accessible to the server.