From 6421ba388342a1231d6031642b6db19d488cad90 Mon Sep 17 00:00:00 2001
From: Vladimir Alabov <vladimir.alabov@bsc-ideas.com>
Date: Tue, 17 Mar 2026 18:19:39 +0300
Subject: [PATCH] fix(filesystem): merge MCP roots with CLI-provided
 directories instead of replacing them

---
 src/filesystem/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/filesystem/index.ts b/src/filesystem/index.ts
index 7b67e63e58..9373a875ef 100644
--- a/src/filesystem/index.ts
+++ b/src/filesystem/index.ts
@@ -706,7 +706,9 @@ server.registerTool(
 async function updateAllowedDirectoriesFromRoots(requestedRoots: Root[]) {
   const validatedRootDirs = await getValidRootDirectories(requestedRoots);
   if (validatedRootDirs.length > 0) {
-    allowedDirectories = [...validatedRootDirs];
+    // Merge with existing CLI-provided directories instead of replacing
+    const merged = new Set([...allowedDirectories, ...validatedRootDirs]);
+    allowedDirectories = [...merged];
     setAllowedDirectories(allowedDirectories); // Update the global state in lib.ts
     console.error(`Updated allowed directories from MCP roots: ${validatedRootDirs.length} valid directories`);
   } else {