@j0hanz/filesystem-context-mcp 1.2.6 → 1.2.7

package/dist/lib/fs-helpers/readers/utf8.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utf8.d.ts","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/utf8.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAyBjB"}
+{"version":3,"file":"utf8.d.ts","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/utf8.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAmBjB"}

package/dist/lib/fs-helpers/readers/utf8.js

@@ -3,20 +3,30 @@ export async function findUTF8Boundary(handle, position) {
         return 0;
     const backtrackSize = Math.min(4, position);
     const startPos = position - backtrackSize;
-    const buf = Buffer.allocUnsafe(backtrackSize);
+    const readResult = await readBacktrackBuffer(handle, backtrackSize, startPos, position);
+    if (!readResult)
+        return position;
+    const boundary = scanForBoundary(readResult.buffer, readResult.bytesRead, startPos);
+    return boundary ?? position;
+}
+async function readBacktrackBuffer(handle, backtrackSize, startPos, position) {
+    const buffer = Buffer.allocUnsafe(backtrackSize);
     try {
-        const { bytesRead } = await handle.read(buf, 0, backtrackSize, startPos);
-        for (let i = bytesRead - 1; i >= 0; i--) {
-            const byte = buf[i];
-            if (byte !== undefined && (byte & 0xc0) !== 0x80) {
-                return startPos + i;
-            }
-        }
+        const { bytesRead } = await handle.read(buffer, 0, backtrackSize, startPos);
+        return { buffer, bytesRead };
     }
     catch (error) {
         console.error(`[findUTF8Boundary] Read error at position ${position}:`, error instanceof Error ? error.message : String(error));
-        return position;
+        return null;
+    }
+}
+function scanForBoundary(buffer, bytesRead, startPos) {
+    for (let i = bytesRead - 1; i >= 0; i--) {
+        const byte = buffer[i];
+        if (byte !== undefined && (byte & 0xc0) !== 0x80) {
+            return startPos + i;
+        }
     }
-    return position;
+    return null;
 }
 //# sourceMappingURL=utf8.js.map

package/dist/lib/fs-helpers/readers/utf8.js.map

@@ -1 +1 @@
-{"version":3,"file":"utf8.js","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/utf8.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAkB,EAClB,QAAgB;IAEhB,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,CAAC,CAAC;IAE5B,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,QAAQ,GAAG,aAAa,CAAC;IAC1C,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IAE9C,IAAI,CAAC;QACH,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QAEzE,KAAK,IAAI,CAAC,GAAG,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACxC,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACjD,OAAO,QAAQ,GAAG,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CACX,6CAA6C,QAAQ,GAAG,EACxD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"utf8.js","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/utf8.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAkB,EAClB,QAAgB;IAEhB,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,CAAC,CAAC;IAE5B,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,QAAQ,GAAG,aAAa,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAC1C,MAAM,EACN,aAAa,EACb,QAAQ,EACR,QAAQ,CACT,CAAC;IACF,IAAI,CAAC,UAAU;QAAE,OAAO,QAAQ,CAAC;IAEjC,MAAM,QAAQ,GAAG,eAAe,CAC9B,UAAU,CAAC,MAAM,EACjB,UAAU,CAAC,SAAS,EACpB,QAAQ,CACT,CAAC;IACF,OAAO,QAAQ,IAAI,QAAQ,CAAC;AAC9B,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,MAAkB,EAClB,aAAqB,EACrB,QAAgB,EAChB,QAAgB;IAEhB,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACjD,IAAI,CAAC;QACH,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC5E,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CACX,6CAA6C,QAAQ,GAAG,EACxD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CACtB,MAAc,EACd,SAAiB,EACjB,QAAgB;IAEhB,KAAK,IAAI,CAAC,GAAG,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACvB,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YACjD,OAAO,QAAQ,GAAG,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/lib/path-validation/allowed-directories.d.ts

@@ -1,9 +1,8 @@
 export declare const RESERVED_DEVICE_NAMES: Set<string>;
 export declare function normalizeForComparison(p: string): string;
-export declare function normalizeAllowedDirectory(dir: string): string;
 export declare function setAllowedDirectories(dirs: string[]): void;
 export declare function getAllowedDirectories(): string[];
+export declare function isPathWithinDirectories(normalizedPath: string, allowedDirs: string[]): boolean;
 export declare function isPathWithinAllowedDirectories(normalizedPath: string): boolean;
-export declare function expandAllowedDirectories(dirs: string[]): Promise<string[]>;
 export declare function setAllowedDirectoriesResolved(dirs: string[]): Promise<void>;
 //# sourceMappingURL=allowed-directories.d.ts.map

package/dist/lib/path-validation/allowed-directories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"allowed-directories.d.ts","sourceRoot":"","sources":["../../../src/lib/path-validation/allowed-directories.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,qBAAqB,aAuBhC,CAAC;AAEH,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAExD;AAQD,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAU7D;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAK1D;AAED,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED,wBAAgB,8BAA8B,CAC5C,cAAc,EAAE,MAAM,GACrB,OAAO,CAYT;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,MAAM,EAAE,GACb,OAAO,CAAC,MAAM,EAAE,CAAC,CAwBnB;AAED,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,MAAM,EAAE,GACb,OAAO,CAAC,IAAI,CAAC,CAGf"}
+{"version":3,"file":"allowed-directories.d.ts","sourceRoot":"","sources":["../../../src/lib/path-validation/allowed-directories.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,qBAAqB,aAuBhC,CAAC;AAEH,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAExD;AAoBD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAK1D;AAED,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EAAE,GACpB,OAAO,CAYT;AAED,wBAAgB,8BAA8B,CAC5C,cAAc,EAAE,MAAM,GACrB,OAAO,CAET;AAuCD,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,MAAM,EAAE,GACb,OAAO,CAAC,IAAI,CAAC,CAGf"}

package/dist/lib/path-validation/allowed-directories.js

@@ -35,7 +35,7 @@ function stripTrailingSeparator(normalized) {
         ? normalized.slice(0, -1)
         : normalized;
 }
-export function normalizeAllowedDirectory(dir) {
+function normalizeAllowedDirectory(dir) {
     const normalized = normalizePath(dir);
     if (normalized.length === 0)
         return '';
@@ -54,9 +54,9 @@ export function setAllowedDirectories(dirs) {
 export function getAllowedDirectories() {
     return [...allowedDirectories];
 }
-export function isPathWithinAllowedDirectories(normalizedPath) {
+export function isPathWithinDirectories(normalizedPath, allowedDirs) {
     const candidate = normalizeForComparison(normalizedPath);
-    return allowedDirectories.some((allowedDir) => {
+    return allowedDirs.some((allowedDir) => {
         const allowed = normalizeForComparison(allowedDir);
         const root = normalizeForComparison(path.parse(allowedDir).root);
         if (allowed === root) {
@@ -65,28 +65,38 @@ export function isPathWithinAllowedDirectories(normalizedPath) {
         return (candidate === allowed || candidate.startsWith(allowed + PATH_SEPARATOR));
     });
 }
-export async function expandAllowedDirectories(dirs) {
+export function isPathWithinAllowedDirectories(normalizedPath) {
+    return isPathWithinDirectories(normalizedPath, allowedDirectories);
+}
+async function expandAllowedDirectories(dirs) {
     const expanded = [];
     for (const dir of dirs) {
         const normalized = normalizeAllowedDirectory(dir);
         if (!normalized)
             continue;
         expanded.push(normalized);
-        try {
-            const realPath = await fs.realpath(normalized);
-            const normalizedReal = normalizeAllowedDirectory(realPath);
-            if (normalizedReal &&
-                normalizeForComparison(normalizedReal) !==
-                    normalizeForComparison(normalized)) {
-                expanded.push(normalizedReal);
-            }
-        }
-        catch {
-            // Keep normalized path if realpath fails
+        const normalizedReal = await resolveRealPath(normalized);
+        if (normalizedReal && shouldAddRealPath(normalized, normalizedReal)) {
+            expanded.push(normalizedReal);
         }
     }
     return [...new Set(expanded)];
 }
+async function resolveRealPath(normalized) {
+    try {
+        const realPath = await fs.realpath(normalized);
+        return normalizeAllowedDirectory(realPath);
+    }
+    catch {
+        return null;
+    }
+}
+function shouldAddRealPath(normalized, normalizedReal) {
+    if (!normalizedReal)
+        return false;
+    return (normalizeForComparison(normalizedReal) !==
+        normalizeForComparison(normalized));
+}
 export async function setAllowedDirectoriesResolved(dirs) {
     const expanded = await expandAllowedDirectories(dirs);
     setAllowedDirectories(expanded);

package/dist/lib/path-validation/allowed-directories.js.map

@@ -1 +1 @@
-{"version":3,"file":"allowed-directories.js","sourceRoot":"","sources":["../../../src/lib/path-validation/allowed-directories.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"allowed-directories.js","sourceRoot":"","sources":["../../../src/lib/path-validation/allowed-directories.ts"],"names":[],"mappings":"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"}

package/dist/lib/path-validation/errors.d.ts

@@ -1,5 +1,4 @@
 import { McpError } from '../errors.js';
-export declare function buildAllowedDirectoriesHint(): string;
 export declare function toMcpError(requestedPath: string, error: unknown): McpError;
 export declare function toAccessDeniedWithHint(requestedPath: string, resolvedPath: string, normalizedResolved: string): McpError;
 //# sourceMappingURL=errors.d.ts.map

package/dist/lib/path-validation/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/lib/path-validation/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,QAAQ,EAAE,MAAM,cAAc,CAAC;AAanD,wBAAgB,2BAA2B,IAAI,MAAM,CAKpD;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,QAAQ,CAmD1E;AAED,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,GACzB,QAAQ,CAQV"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/lib/path-validation/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,QAAQ,EAAE,MAAM,cAAc,CAAC;AAmDnD,wBAAgB,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,QAAQ,CAsB1E;AAED,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,GACzB,QAAQ,CAQV"}

package/dist/lib/path-validation/errors.js

@@ -3,26 +3,40 @@ import { getAllowedDirectories } from './allowed-directories.js';
 function createMcpError(code, message, requestedPath, details, cause) {
     return new McpError(code, message, requestedPath, details, cause);
 }
-export function buildAllowedDirectoriesHint() {
+function buildAllowedDirectoriesHint() {
     const allowedDirs = getAllowedDirectories();
     return allowedDirs.length > 0
         ? `Allowed directories:\n${allowedDirs.map((d) => `  - ${d}`).join('\n')}`
         : 'No allowed directories configured. Use CLI arguments or MCP roots protocol.';
 }
+const NODE_ERROR_MAP = {
+    ENOENT: {
+        code: ErrorCode.E_NOT_FOUND,
+        message: (requestedPath) => `Path does not exist: ${requestedPath}`,
+    },
+    EACCES: {
+        code: ErrorCode.E_PERMISSION_DENIED,
+        message: (requestedPath) => `Permission denied accessing path: ${requestedPath}`,
+    },
+    EPERM: {
+        code: ErrorCode.E_PERMISSION_DENIED,
+        message: (requestedPath) => `Permission denied accessing path: ${requestedPath}`,
+    },
+    ELOOP: {
+        code: ErrorCode.E_SYMLINK_NOT_ALLOWED,
+        message: (requestedPath) => `Too many symbolic links in path (possible circular reference): ${requestedPath}`,
+    },
+    ENAMETOOLONG: {
+        code: ErrorCode.E_INVALID_INPUT,
+        message: (requestedPath) => `Path name too long: ${requestedPath}`,
+    },
+};
 export function toMcpError(requestedPath, error) {
     const nodeError = error;
     const { code } = nodeError;
-    if (code === 'ENOENT') {
-        return createMcpError(ErrorCode.E_NOT_FOUND, `Path does not exist: ${requestedPath}`, requestedPath, { originalCode: code }, error);
-    }
-    if (code === 'EACCES' || code === 'EPERM') {
-        return createMcpError(ErrorCode.E_PERMISSION_DENIED, `Permission denied accessing path: ${requestedPath}`, requestedPath, { originalCode: code }, error);
-    }
-    if (code === 'ELOOP') {
-        return createMcpError(ErrorCode.E_SYMLINK_NOT_ALLOWED, `Too many symbolic links in path (possible circular reference): ${requestedPath}`, requestedPath, { originalCode: code }, error);
-    }
-    if (code === 'ENAMETOOLONG') {
-        return createMcpError(ErrorCode.E_INVALID_INPUT, `Path name too long: ${requestedPath}`, requestedPath, { originalCode: code }, error);
+    const mapping = code ? NODE_ERROR_MAP[code] : undefined;
+    if (mapping) {
+        return createMcpError(mapping.code, mapping.message(requestedPath), requestedPath, { originalCode: code }, error);
     }
     return createMcpError(ErrorCode.E_NOT_FOUND, `Path is not accessible: ${requestedPath}`, requestedPath, { originalCode: code, originalMessage: nodeError.message }, error);
 }

package/dist/lib/path-validation/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/lib/path-validation/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,SAAS,cAAc,CACrB,IAAe,EACf,OAAe,EACf,aAAqB,EACrB,OAAgC,EAChC,KAAc;IAEd,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,2BAA2B;IACzC,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;IAC5C,OAAO,WAAW,CAAC,MAAM,GAAG,CAAC;QAC3B,CAAC,CAAC,yBAAyB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC1E,CAAC,CAAC,6EAA6E,CAAC;AACpF,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,aAAqB,EAAE,KAAc;IAC9D,MAAM,SAAS,GAAG,KAA8B,CAAC;IACjD,MAAM,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;IAE3B,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,OAAO,cAAc,CACnB,SAAS,CAAC,WAAW,EACrB,wBAAwB,aAAa,EAAE,EACvC,aAAa,EACb,EAAE,YAAY,EAAE,IAAI,EAAE,EACtB,KAAK,CACN,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1C,OAAO,cAAc,CACnB,SAAS,CAAC,mBAAmB,EAC7B,qCAAqC,aAAa,EAAE,EACpD,aAAa,EACb,EAAE,YAAY,EAAE,IAAI,EAAE,EACtB,KAAK,CACN,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,OAAO,cAAc,CACnB,SAAS,CAAC,qBAAqB,EAC/B,kEAAkE,aAAa,EAAE,EACjF,aAAa,EACb,EAAE,YAAY,EAAE,IAAI,EAAE,EACtB,KAAK,CACN,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;QAC5B,OAAO,cAAc,CACnB,SAAS,CAAC,eAAe,EACzB,uBAAuB,aAAa,EAAE,EACtC,aAAa,EACb,EAAE,YAAY,EAAE,IAAI,EAAE,EACtB,KAAK,CACN,CAAC;IACJ,CAAC;IAED,OAAO,cAAc,CACnB,SAAS,CAAC,WAAW,EACrB,2BAA2B,aAAa,EAAE,EAC1C,aAAa,EACb,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,CAAC,OAAO,EAAE,EAC1D,KAAK,CACN,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,aAAqB,EACrB,YAAoB,EACpB,kBAA0B;IAE1B,MAAM,UAAU,GAAG,2BAA2B,EAAE,CAAC;IACjD,OAAO,IAAI,QAAQ,CACjB,SAAS,CAAC,eAAe,EACzB,wBAAwB,aAAa,wCAAwC,UAAU,EAAE,EACzF,aAAa,EACb,EAAE,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,CAC7D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/lib/path-validation/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,SAAS,cAAc,CACrB,IAAe,EACf,OAAe,EACf,aAAqB,EACrB,OAAgC,EAChC,KAAc;IAEd,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,2BAA2B;IAClC,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;IAC5C,OAAO,WAAW,CAAC,MAAM,GAAG,CAAC;QAC3B,CAAC,CAAC,yBAAyB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC1E,CAAC,CAAC,6EAA6E,CAAC;AACpF,CAAC;AAED,MAAM,cAAc,GAKhB;IACF,MAAM,EAAE;QACN,IAAI,EAAE,SAAS,CAAC,WAAW;QAC3B,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,wBAAwB,aAAa,EAAE;KACpE;IACD,MAAM,EAAE;QACN,IAAI,EAAE,SAAS,CAAC,mBAAmB;QACnC,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE,CACzB,qCAAqC,aAAa,EAAE;KACvD;IACD,KAAK,EAAE;QACL,IAAI,EAAE,SAAS,CAAC,mBAAmB;QACnC,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE,CACzB,qCAAqC,aAAa,EAAE;KACvD;IACD,KAAK,EAAE;QACL,IAAI,EAAE,SAAS,CAAC,qBAAqB;QACrC,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE,CACzB,kEAAkE,aAAa,EAAE;KACpF;IACD,YAAY,EAAE;QACZ,IAAI,EAAE,SAAS,CAAC,eAAe;QAC/B,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,uBAAuB,aAAa,EAAE;KACnE;CACO,CAAC;AAEX,MAAM,UAAU,UAAU,CAAC,aAAqB,EAAE,KAAc;IAC9D,MAAM,SAAS,GAAG,KAA8B,CAAC;IACjD,MAAM,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;IAE3B,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACxD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,cAAc,CACnB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,EAC9B,aAAa,EACb,EAAE,YAAY,EAAE,IAAI,EAAE,EACtB,KAAK,CACN,CAAC;IACJ,CAAC;IAED,OAAO,cAAc,CACnB,SAAS,CAAC,WAAW,EACrB,2BAA2B,aAAa,EAAE,EAC1C,aAAa,EACb,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,CAAC,OAAO,EAAE,EAC1D,KAAK,CACN,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,aAAqB,EACrB,YAAoB,EACpB,kBAA0B;IAE1B,MAAM,UAAU,GAAG,2BAA2B,EAAE,CAAC;IACjD,OAAO,IAAI,QAAQ,CACjB,SAAS,CAAC,eAAe,EACzB,wBAAwB,aAAa,wCAAwC,UAAU,EAAE,EACzF,aAAa,EACb,EAAE,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,CAC7D,CAAC;AACJ,CAAC"}

package/dist/lib/path-validation/validators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../../src/lib/path-validation/validators.ts"],"names":[],"mappings":"AAYA,UAAU,oBAAoB;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;CACpB;AAoHD,wBAAsB,4BAA4B,CAChD,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,oBAAoB,CAAC,CAE/B;AAED,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED,wBAAsB,yBAAyB,CAC7C,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAIjB"}
+{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../../src/lib/path-validation/validators.ts"],"names":[],"mappings":"AAYA,UAAU,oBAAoB;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;CACpB;AA0HD,wBAAsB,4BAA4B,CAChD,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,oBAAoB,CAAC,CAE/B;AAED,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED,wBAAsB,yBAAyB,CAC7C,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAIjB"}

package/dist/lib/path-validation/validators.js

@@ -18,12 +18,18 @@ function ensureNoReservedWindowsNames(requestedPath) {
         return;
     const segments = requestedPath.split(/[\\/]/);
     for (const segment of segments) {
-        const baseName = segment.split('.')[0]?.toUpperCase();
-        if (baseName && RESERVED_DEVICE_NAMES.has(baseName)) {
-            throw new McpError(ErrorCode.E_INVALID_INPUT, `Windows reserved device name not allowed: ${baseName}`, requestedPath);
+        const reserved = getReservedDeviceName(segment);
+        if (reserved) {
+            throw new McpError(ErrorCode.E_INVALID_INPUT, `Windows reserved device name not allowed: ${reserved}`, requestedPath);
         }
     }
 }
+function getReservedDeviceName(segment) {
+    const baseName = segment.split('.')[0]?.toUpperCase();
+    if (!baseName)
+        return undefined;
+    return RESERVED_DEVICE_NAMES.has(baseName) ? baseName : undefined;
+}
 function ensureWithinAllowedDirectories(normalizedPath, requestedPath, details) {
     if (isPathWithinAllowedDirectories(normalizedPath))
         return;

package/dist/lib/path-validation/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/lib/path-validation/validators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/lib/path-validation/validators.ts"],"names":[],"mappings":"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"}

package/dist/lib/path-validation.d.ts

@@ -1,4 +1,4 @@
-export { getAllowedDirectories, setAllowedDirectories, setAllowedDirectoriesResolved, expandAllowedDirectories, RESERVED_DEVICE_NAMES, } from './path-validation/allowed-directories.js';
+export { getAllowedDirectories, isPathWithinDirectories, setAllowedDirectories, setAllowedDirectoriesResolved, RESERVED_DEVICE_NAMES, } from './path-validation/allowed-directories.js';
 export { validateExistingPath, validateExistingDirectory, validateExistingPathDetailed, } from './path-validation/validators.js';
 export { getValidRootDirectories } from './path-validation/roots.js';
 //# sourceMappingURL=path-validation.d.ts.map

package/dist/lib/path-validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"path-validation.d.ts","sourceRoot":"","sources":["../../src/lib/path-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,6BAA6B,EAC7B,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"path-validation.d.ts","sourceRoot":"","sources":["../../src/lib/path-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,EACrB,6BAA6B,EAC7B,qBAAqB,GACtB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/lib/path-validation.js

@@ -1,4 +1,4 @@
-export { getAllowedDirectories, setAllowedDirectories, setAllowedDirectoriesResolved, expandAllowedDirectories, RESERVED_DEVICE_NAMES, } from './path-validation/allowed-directories.js';
+export { getAllowedDirectories, isPathWithinDirectories, setAllowedDirectories, setAllowedDirectoriesResolved, RESERVED_DEVICE_NAMES, } from './path-validation/allowed-directories.js';
 export { validateExistingPath, validateExistingDirectory, validateExistingPathDetailed, } from './path-validation/validators.js';
 export { getValidRootDirectories } from './path-validation/roots.js';
 //# sourceMappingURL=path-validation.js.map

package/dist/lib/path-validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"path-validation.js","sourceRoot":"","sources":["../../src/lib/path-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,6BAA6B,EAC7B,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"path-validation.js","sourceRoot":"","sources":["../../src/lib/path-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,EACrB,6BAA6B,EAC7B,qBAAqB,GACtB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/schemas/outputs.d.ts

@@ -149,7 +149,6 @@ export declare const ListDirectoryOutputSchema: z.ZodObject<{
         path?: string | undefined;
         suggestion?: string | undefined;
     } | undefined;
-    path?: string | undefined;
     summary?: {
         truncated: boolean;
         totalFiles: number;
@@ -159,6 +158,7 @@ export declare const ListDirectoryOutputSchema: z.ZodObject<{
         symlinksNotFollowed?: number | undefined;
         totalEntries?: number | undefined;
     } | undefined;
+    path?: string | undefined;
 }, {
     ok: boolean;
     entries?: {
@@ -175,7 +175,6 @@ export declare const ListDirectoryOutputSchema: z.ZodObject<{
         path?: string | undefined;
         suggestion?: string | undefined;
     } | undefined;
-    path?: string | undefined;
     summary?: {
         truncated: boolean;
         totalFiles: number;
@@ -185,6 +184,7 @@ export declare const ListDirectoryOutputSchema: z.ZodObject<{
         symlinksNotFollowed?: number | undefined;
         totalEntries?: number | undefined;
     } | undefined;
+    path?: string | undefined;
 }>;
 export declare const SearchFilesOutputSchema: z.ZodObject<{
     ok: z.ZodBoolean;
@@ -312,25 +312,25 @@ export declare const ReadFileOutputSchema: z.ZodObject<{
     }>>;
 }, "strip", z.ZodTypeAny, {
     ok: boolean;
-    content?: string | undefined;
     error?: {
         code: string;
         message: string;
         path?: string | undefined;
         suggestion?: string | undefined;
     } | undefined;
+    content?: string | undefined;
     truncated?: boolean | undefined;
     totalLines?: number | undefined;
     path?: string | undefined;
 }, {
     ok: boolean;
-    content?: string | undefined;
     error?: {
         code: string;
         message: string;
         path?: string | undefined;
         suggestion?: string | undefined;
     } | undefined;
+    content?: string | undefined;
     truncated?: boolean | undefined;
     totalLines?: number | undefined;
     path?: string | undefined;
@@ -345,14 +345,14 @@ export declare const ReadMultipleFilesOutputSchema: z.ZodObject<{
         error: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         path: string;
-        content?: string | undefined;
         error?: string | undefined;
+        content?: string | undefined;
         truncated?: boolean | undefined;
         totalLines?: number | undefined;
     }, {
         path: string;
-        content?: string | undefined;
         error?: string | undefined;
+        content?: string | undefined;
         truncated?: boolean | undefined;
         totalLines?: number | undefined;
     }>, "many">>;
@@ -389,8 +389,8 @@ export declare const ReadMultipleFilesOutputSchema: z.ZodObject<{
     ok: boolean;
     results?: {
         path: string;
-        content?: string | undefined;
         error?: string | undefined;
+        content?: string | undefined;
         truncated?: boolean | undefined;
         totalLines?: number | undefined;
     }[] | undefined;
@@ -409,8 +409,8 @@ export declare const ReadMultipleFilesOutputSchema: z.ZodObject<{
     ok: boolean;
     results?: {
         path: string;
-        content?: string | undefined;
         error?: string | undefined;
+        content?: string | undefined;
         truncated?: boolean | undefined;
         totalLines?: number | undefined;
     }[] | undefined;
@@ -618,6 +618,7 @@ export declare const SearchContentOutputSchema: z.ZodObject<{
         skippedBinary?: number | undefined;
         filesScanned?: number | undefined;
     } | undefined;
+    filePattern?: string | undefined;
     basePath?: string | undefined;
     matches?: {
         file: string;
@@ -627,7 +628,6 @@ export declare const SearchContentOutputSchema: z.ZodObject<{
         contextAfter?: string[] | undefined;
         matchCount?: number | undefined;
     }[] | undefined;
-    filePattern?: string | undefined;
 }, {
     ok: boolean;
     pattern?: string | undefined;
@@ -648,6 +648,7 @@ export declare const SearchContentOutputSchema: z.ZodObject<{
         skippedBinary?: number | undefined;
         filesScanned?: number | undefined;
     } | undefined;
+    filePattern?: string | undefined;
     basePath?: string | undefined;
     matches?: {
         file: string;
@@ -657,7 +658,6 @@ export declare const SearchContentOutputSchema: z.ZodObject<{
         contextAfter?: string[] | undefined;
         matchCount?: number | undefined;
     }[] | undefined;
-    filePattern?: string | undefined;
 }>;
 export declare const AnalyzeDirectoryOutputSchema: z.ZodObject<{
     ok: z.ZodBoolean;
@@ -723,12 +723,12 @@ export declare const AnalyzeDirectoryOutputSchema: z.ZodObject<{
         path?: string | undefined;
         suggestion?: string | undefined;
     } | undefined;
-    path?: string | undefined;
     summary?: {
         truncated?: boolean | undefined;
         skippedInaccessible?: number | undefined;
         symlinksNotFollowed?: number | undefined;
     } | undefined;
+    path?: string | undefined;
     totalFiles?: number | undefined;
     totalDirectories?: number | undefined;
     totalSize?: number | undefined;
@@ -749,12 +749,12 @@ export declare const AnalyzeDirectoryOutputSchema: z.ZodObject<{
         path?: string | undefined;
         suggestion?: string | undefined;
     } | undefined;
-    path?: string | undefined;
     summary?: {
         truncated?: boolean | undefined;
         skippedInaccessible?: number | undefined;
         symlinksNotFollowed?: number | undefined;
     } | undefined;
+    path?: string | undefined;
     totalFiles?: number | undefined;
     totalDirectories?: number | undefined;
     totalSize?: number | undefined;

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA+CpE,wBAAsB,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC,CAkC1D;AAKD,UAAU,eAAe;IACvB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,UAAU,aAAa;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AA8CD,wBAAgB,YAAY,CAAC,OAAO,GAAE,aAAkB,GAAG,SAAS,CAmBnE;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBlE"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA+FpE,wBAAsB,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC,CAO1D;AAKD,UAAU,eAAe;IACvB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,UAAU,aAAa;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAsFD,wBAAgB,YAAY,CAAC,OAAO,GAAE,aAAkB,GAAG,SAAS,CAmBnE;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBlE"}

package/dist/server.js

@@ -6,7 +6,7 @@ import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import { RootsListChangedNotificationSchema } from '@modelcontextprotocol/sdk/types.js';
 import packageJson from '../package.json' with { type: 'json' };
 import { normalizePath } from './lib/path-utils.js';
-import { getAllowedDirectories, getValidRootDirectories, RESERVED_DEVICE_NAMES, setAllowedDirectoriesResolved, } from './lib/path-validation.js';
+import { getAllowedDirectories, getValidRootDirectories, isPathWithinDirectories, RESERVED_DEVICE_NAMES, setAllowedDirectoriesResolved, } from './lib/path-validation.js';
 import { registerAllTools } from './tools/index.js';
 const SERVER_VERSION = packageJson.version;
 const currentDir = path.dirname(fileURLToPath(import.meta.url));
@@ -24,42 +24,57 @@ function validateCliPath(inputPath) {
     if (inputPath.includes('\0')) {
         throw new Error('Path contains null bytes');
     }
-    if (process.platform === 'win32') {
-        const basename = path.basename(inputPath).split('.')[0]?.toUpperCase();
-        if (basename && RESERVED_DEVICE_NAMES.has(basename)) {
-            throw new Error(`Reserved device name not allowed: ${basename}`);
-        }
+    const reserved = getReservedCliDeviceName(inputPath);
+    if (reserved) {
+        throw new Error(`Reserved device name not allowed: ${reserved}`);
     }
 }
-export async function parseArgs() {
-    const args = process.argv.slice(2);
+function getReservedCliDeviceName(inputPath) {
+    if (process.platform !== 'win32')
+        return undefined;
+    const basename = path.basename(inputPath).split('.')[0]?.toUpperCase();
+    if (!basename)
+        return undefined;
+    return RESERVED_DEVICE_NAMES.has(basename) ? basename : undefined;
+}
+function extractAllowCwd(args) {
     const allowCwdIndex = args.indexOf('--allow-cwd');
-    const allowCwd = allowCwdIndex !== -1;
-    if (allowCwd) {
-        args.splice(allowCwdIndex, 1);
+    if (allowCwdIndex === -1) {
+        return { allowCwd: false, rest: args };
     }
-    if (args.length === 0) {
-        return { allowedDirs: [], allowCwd };
+    const rest = [...args];
+    rest.splice(allowCwdIndex, 1);
+    return { allowCwd: true, rest };
+}
+async function validateDirectoryPath(inputPath) {
+    validateCliPath(inputPath);
+    const normalized = normalizePath(inputPath);
+    try {
+        const stats = await fs.stat(normalized);
+        if (!stats.isDirectory()) {
+            throw new Error(`Error: '${inputPath}' is not a directory`);
+        }
+        return normalized;
     }
+    catch (error) {
+        if (error instanceof Error && error.message.startsWith('Error:')) {
+            throw error;
+        }
+        throw new Error(`Error: Cannot access directory '${inputPath}'`);
+    }
+}
+async function normalizeCliDirectories(args) {
     const validatedDirs = [];
     for (const dir of args) {
-        validateCliPath(dir);
-        const normalized = normalizePath(dir);
-        try {
-            const stats = await fs.stat(normalized);
-            if (!stats.isDirectory()) {
-                throw new Error(`Error: '${dir}' is not a directory`);
-            }
-            validatedDirs.push(normalized);
-        }
-        catch (error) {
-            if (error instanceof Error && error.message.startsWith('Error:')) {
-                throw error;
-            }
-            throw new Error(`Error: Cannot access directory '${dir}'`);
-        }
+        validatedDirs.push(await validateDirectoryPath(dir));
     }
-    return { allowedDirs: validatedDirs, allowCwd };
+    return validatedDirs;
+}
+export async function parseArgs() {
+    const argv = process.argv.slice(2);
+    const { allowCwd, rest } = extractAllowCwd(argv);
+    const allowedDirs = rest.length > 0 ? await normalizeCliDirectories(rest) : [];
+    return { allowedDirs, allowCwd };
 }
 let serverOptions = {};
 let rootDirectories = [];
@@ -72,14 +87,14 @@ function logMissingDirectories(options) {
     console.error('The server will not be able to access any files until directories are configured.');
 }
 async function recomputeAllowedDirectories() {
-    const cliAllowedDirs = serverOptions.cliAllowedDirs ?? [];
+    const cliAllowedDirs = normalizeAllowedDirectories(serverOptions.cliAllowedDirs ?? []);
     const allowCwd = serverOptions.allowCwd === true;
     const allowCwdDirs = allowCwd ? [normalizePath(process.cwd())] : [];
-    await setAllowedDirectoriesResolved([
-        ...cliAllowedDirs,
-        ...allowCwdDirs,
-        ...rootDirectories,
-    ]);
+    const baseline = [...cliAllowedDirs, ...allowCwdDirs];
+    const rootsToInclude = baseline.length > 0
+        ? await filterRootsWithinBaseline(rootDirectories, baseline)
+        : rootDirectories;
+    await setAllowedDirectoriesResolved([...baseline, ...rootsToInclude]);
 }
 async function updateRootsFromClient(server) {
     try {
@@ -90,12 +105,41 @@ async function updateRootsFromClient(server) {
             roots.length > 0 ? await getValidRootDirectories(roots) : [];
     }
     catch (error) {
+        rootDirectories = [];
         console.error('[DEBUG] MCP Roots protocol unavailable or failed:', error instanceof Error ? error.message : String(error));
     }
     finally {
         await recomputeAllowedDirectories();
     }
 }
+function normalizeAllowedDirectories(dirs) {
+    return dirs
+        .map((dir) => dir.trim())
+        .filter((dir) => dir.length > 0)
+        .map(normalizePath);
+}
+async function filterRootsWithinBaseline(roots, baseline) {
+    const normalizedBaseline = normalizeAllowedDirectories(baseline);
+    const filtered = [];
+    for (const root of roots) {
+        const normalizedRoot = normalizePath(root);
+        if (!isPathWithinDirectories(normalizedRoot, normalizedBaseline)) {
+            continue;
+        }
+        try {
+            const realPath = await fs.realpath(normalizedRoot);
+            const normalizedReal = normalizePath(realPath);
+            if (!isPathWithinDirectories(normalizedReal, normalizedBaseline)) {
+                continue;
+            }
+        }
+        catch {
+            continue;
+        }
+        filtered.push(normalizedRoot);
+    }
+    return filtered;
+}
 export function createServer(options = {}) {
     serverOptions = options;
     const server = new McpServer({