Skip to content

fix(filesystem): prevent MCP roots from overriding CLI-provided directories #3994

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.

Sign up for GitHub

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

Open
Will-hxw wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −0
Open

fix(filesystem): prevent MCP roots from overriding CLI-provided directories #3994

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6ea8a0
fix(release): include lock files in version bump check
Will-hxw Apr 21, 2026
9ca4b6b
fix(filesystem): prevent MCP roots from overriding CLI-provided direc…
Will-hxw Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/filesystem/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ if (accessibleDirectories.length === 0 && allowedDirectories.length > 0) {

allowedDirectories = accessibleDirectories;

// Track if directories were explicitly provided via CLI args
const hasCliDirectories = args.length > 0;

// Initialize the global allowedDirectories in lib.ts
setAllowedDirectories(allowedDirectories);

Expand Down Expand Up @@ -703,7 +706,13 @@ server.registerTool(
);

// Updates allowed directories based on MCP client roots
// Only overrides if no CLI directories were explicitly provided
async function updateAllowedDirectoriesFromRoots(requestedRoots: Root[]) {
// If CLI directories were explicitly provided, MCP roots should not override them
if (hasCliDirectories) {
console.error("Ignoring MCP roots: CLI-provided directories take precedence");
return;
}
const validatedRootDirs = await getValidRootDirectories(requestedRoots);
if (validatedRootDirs.length > 0) {
allowedDirectories = [...validatedRootDirs];
Expand Down
Loading