@j0hanz/filesystem-context-mcp 1.3.0 → 1.3.2

package/dist/tools/shared/search-formatting.js

@@ -1,12 +1,28 @@
 import * as pathModule from 'node:path';
-import { formatOperationSummary } from './formatting.js';
+import { formatOperationSummary, joinLines } from '../../config/formatting.js';
 const LINE_NUMBER_PAD_WIDTH = 4;
+function normalizeMatches(result) {
+    const normalized = result.matches.map((match, index) => ({
+        ...match,
+        relativeFile: pathModule.relative(result.basePath, match.file),
+        index,
+    }));
+    normalized.sort((a, b) => {
+        const fileCompare = a.relativeFile.localeCompare(b.relativeFile);
+        if (fileCompare !== 0)
+            return fileCompare;
+        if (a.line !== b.line)
+            return a.line - b.line;
+        return a.index - b.index;
+    });
+    return normalized;
+}
 function groupMatchesByFile(matches) {
     const byFile = new Map();
     for (const match of matches) {
-        const list = byFile.get(match.file) ?? [];
+        const list = byFile.get(match.relativeFile) ?? [];
         list.push(match);
-        byFile.set(match.file, list);
+        byFile.set(match.relativeFile, list);
     }
     return byFile;
 }
@@ -38,22 +54,24 @@ function formatFileMatches(file, matches) {
 }
 function formatContentMatches(matches) {
     if (matches.length === 0)
-        return 'No matches found';
+        return 'No matches';
     const byFile = groupMatchesByFile(matches);
-    const lines = [`Found ${matches.length} matches:`, ''];
+    const lines = [`Found ${matches.length}:`];
     for (const [file, fileMatches] of byFile) {
         lines.push(...formatFileMatches(file, fileMatches));
     }
-    return lines.join('\n');
+    return joinLines(lines);
 }
 export function buildStructuredResult(result) {
+    const { basePath, pattern, filePattern, summary } = result;
+    const normalizedMatches = normalizeMatches(result);
     return {
         ok: true,
-        basePath: result.basePath,
-        pattern: result.pattern,
-        filePattern: result.filePattern,
-        matches: result.matches.map((m) => ({
-            file: pathModule.relative(result.basePath, m.file),
+        basePath,
+        pattern,
+        filePattern,
+        matches: normalizedMatches.map((m) => ({
+            file: m.relativeFile,
             line: m.line,
             content: m.content,
             contextBefore: m.contextBefore,
@@ -61,15 +79,15 @@ export function buildStructuredResult(result) {
             matchCount: m.matchCount,
         })),
         summary: {
-            filesScanned: result.summary.filesScanned,
-            filesMatched: result.summary.filesMatched,
-            totalMatches: result.summary.matches,
-            truncated: result.summary.truncated,
-            skippedTooLarge: result.summary.skippedTooLarge || undefined,
-            skippedBinary: result.summary.skippedBinary || undefined,
-            skippedInaccessible: result.summary.skippedInaccessible || undefined,
-            linesSkippedDueToRegexTimeout: result.summary.linesSkippedDueToRegexTimeout || undefined,
-            stoppedReason: result.summary.stoppedReason,
+            filesScanned: summary.filesScanned,
+            filesMatched: summary.filesMatched,
+            totalMatches: summary.matches,
+            truncated: summary.truncated,
+            skippedTooLarge: summary.skippedTooLarge || undefined,
+            skippedBinary: summary.skippedBinary || undefined,
+            skippedInaccessible: summary.skippedInaccessible || undefined,
+            linesSkippedDueToRegexTimeout: summary.linesSkippedDueToRegexTimeout || undefined,
+            stoppedReason: summary.stoppedReason,
         },
     };
 }
@@ -95,19 +113,26 @@ function buildTruncationInfo(result) {
     return {};
 }
 export function buildTextResult(result) {
+    const { summary } = result;
     const { truncatedReason, tip } = buildTruncationInfo(result);
-    let textOutput = formatContentMatches(result.matches);
+    const header = joinLines([
+        `Base path: ${result.basePath}`,
+        `Pattern: ${result.pattern}`,
+        `File pattern: ${result.filePattern}`,
+    ]);
+    const normalizedMatches = normalizeMatches(result);
+    let textOutput = joinLines([header, formatContentMatches(normalizedMatches)]);
     textOutput += formatOperationSummary({
-        truncated: result.summary.truncated,
+        truncated: summary.truncated,
         truncatedReason,
         tip,
-        skippedTooLarge: result.summary.skippedTooLarge,
-        skippedBinary: result.summary.skippedBinary,
-        skippedInaccessible: result.summary.skippedInaccessible,
-        linesSkippedDueToRegexTimeout: result.summary.linesSkippedDueToRegexTimeout,
+        skippedTooLarge: summary.skippedTooLarge,
+        skippedBinary: summary.skippedBinary,
+        skippedInaccessible: summary.skippedInaccessible,
+        linesSkippedDueToRegexTimeout: summary.linesSkippedDueToRegexTimeout,
     });
-    if (result.summary.truncated && !tip) {
-        textOutput += `\nScanned ${result.summary.filesScanned} files, found ${result.summary.matches} matches in ${result.summary.filesMatched} files.`;
+    if (summary.truncated && !tip) {
+        textOutput += `\nScanned ${summary.filesScanned} files, found ${summary.matches} matches in ${summary.filesMatched} files.`;
     }
     return textOutput;
 }

package/dist/tools/shared/search-formatting.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-formatting.js","sourceRoot":"","sources":["../../../src/tools/shared/search-formatting.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,WAAW,CAAC;AAMxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAIzD,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEhC,SAAS,kBAAkB,CACzB,OAAuC;IAEvC,MAAM,MAAM,GAAG,IAAI,GAAG,EAA0C,CAAC;IACjE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjB,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,kBAAkB,CACzB,OAA6B,EAC7B,SAAiB;IAEjB,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CACxB,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CACZ,OAAO,MAAM,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,KAAK,IAAI,EAAE,CAC5E,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,KAA6C;IAE7C,MAAM,MAAM,GAAG,kBAAkB,CAC/B,KAAK,CAAC,aAAa,EACnB,KAAK,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,IAAI,CAAC,CAAC,CAChD,CAAC;IACF,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,KAAK,GAAG;QACZ,GAAG,MAAM;QACT,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE;QAC7E,GAAG,KAAK;KACT,CAAC;IACF,IAAI,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACzD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAY,EACZ,OAAuC;IAEvC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACrE,MAAM,KAAK,GAAa;QACtB,GAAG,IAAI,KAAK,UAAU,SAAS,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI;KAChE,CAAC;IACF,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAuC;IACnE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,kBAAkB,CAAC;IAEpD,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAa,CAAC,SAAS,OAAO,CAAC,MAAM,WAAW,EAAE,EAAE,CAAC,CAAC;IACjE,KAAK,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,MAAM,EAAE,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,MAA2B;IAE3B,OAAO;QACL,EAAE,EAAE,IAAI;QACR,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAClC,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC;YAClD,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,aAAa,EAAE,CAAC,CAAC,aAAa;YAC9B,YAAY,EAAE,CAAC,CAAC,YAAY;YAC5B,UAAU,EAAE,CAAC,CAAC,UAAU;SACzB,CAAC,CAAC;QACH,OAAO,EAAE;YACP,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY;YACzC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY;YACzC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;YACpC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS;YACnC,eAAe,EAAE,MAAM,CAAC,OAAO,CAAC,eAAe,IAAI,SAAS;YAC5D,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,IAAI,SAAS;YACxD,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,mBAAmB,IAAI,SAAS;YACpE,6BAA6B,EAC3B,MAAM,CAAC,OAAO,CAAC,6BAA6B,IAAI,SAAS;YAC3D,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa;SAC5C;KACF,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,MAA2B;IAItD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IACzC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QAC/C,OAAO;YACL,eAAe,EAAE,kBAAkB;YACnC,GAAG,EAAE,4FAA4F;SAClG,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,KAAK,YAAY,EAAE,CAAC;QAClD,OAAO;YACL,eAAe,EAAE,8BAA8B,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG;SACzE,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;QAChD,OAAO;YACL,eAAe,EAAE,4BAA4B,MAAM,CAAC,OAAO,CAAC,YAAY,WAAW;SACpF,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAA2B;IACzD,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC7D,IAAI,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtD,UAAU,IAAI,sBAAsB,CAAC;QACnC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS;QACnC,eAAe;QACf,GAAG;QACH,eAAe,EAAE,MAAM,CAAC,OAAO,CAAC,eAAe;QAC/C,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa;QAC3C,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,mBAAmB;QACvD,6BAA6B,EAAE,MAAM,CAAC,OAAO,CAAC,6BAA6B;KAC5E,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,GAAG,EAAE,CAAC;QACrC,UAAU,IAAI,aAAa,MAAM,CAAC,OAAO,CAAC,YAAY,iBAAiB,MAAM,CAAC,OAAO,CAAC,OAAO,eAAe,MAAM,CAAC,OAAO,CAAC,YAAY,SAAS,CAAC;IACnJ,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
+{"version":3,"file":"search-formatting.js","sourceRoot":"","sources":["../../../src/tools/shared/search-formatting.ts"],"names":[],"mappings":"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"}

package/dist/tools/tool-response.d.ts

@@ -1,3 +1,4 @@
+import { ErrorCode } from '../lib/errors.js';
 export declare function buildToolResponse<T>(text: string, structuredContent: T): {
     content: {
         type: 'text';
@@ -6,4 +7,25 @@ export declare function buildToolResponse<T>(text: string, structuredContent: T)
     structuredContent: T;
 };
 export type ToolResponse<T> = ReturnType<typeof buildToolResponse<T>>;
+type ToolErrorResponse = ReturnType<typeof buildToolErrorResponse>;
+export type ToolResult<T> = ToolResponse<T> | ToolErrorResponse;
+export declare function withToolErrorHandling<T>(run: () => Promise<ToolResponse<T>>, onError: (error: unknown) => ToolResult<T>): Promise<ToolResult<T>>;
+interface ToolErrorStructuredContent extends Record<string, unknown> {
+    ok: false;
+    error: {
+        code: string;
+        message: string;
+        path?: string;
+        suggestion?: string;
+    };
+}
+export declare function buildToolErrorResponse(error: unknown, defaultCode: ErrorCode, path?: string): {
+    content: {
+        type: 'text';
+        text: string;
+    }[];
+    structuredContent: ToolErrorStructuredContent;
+    isError: true;
+};
+export {};
 //# sourceMappingURL=tool-response.d.ts.map

package/dist/tools/tool-response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-response.d.ts","sourceRoot":"","sources":["../../src/tools/tool-response.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,IAAI,EAAE,MAAM,EACZ,iBAAiB,EAAE,CAAC,GACnB;IACD,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,iBAAiB,EAAE,CAAC,CAAC;CACtB,CAKA;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"tool-response.d.ts","sourceRoot":"","sources":["../../src/tools/tool-response.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EAGV,MAAM,kBAAkB,CAAC;AAE1B,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,IAAI,EAAE,MAAM,EACZ,iBAAiB,EAAE,CAAC,GACnB;IACD,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,iBAAiB,EAAE,CAAC,CAAC;CACtB,CAKA;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;AACtE,KAAK,iBAAiB,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACnE,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC;AAEhE,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,GAAG,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EACnC,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,GACzC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAMxB;AAED,UAAU,0BAA2B,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAClE,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,SAAS,EACtB,IAAI,CAAC,EAAE,MAAM,GACZ;IACD,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,iBAAiB,EAAE,0BAA0B,CAAC;IAC9C,OAAO,EAAE,IAAI,CAAC;CACf,CAsBA"}

package/dist/tools/tool-response.js

@@ -1,7 +1,37 @@
+import { createDetailedError, ErrorCode, formatDetailedError, getSuggestion, } from '../lib/errors.js';
 export function buildToolResponse(text, structuredContent) {
     return {
         content: [{ type: 'text', text }],
         structuredContent,
     };
 }
+export async function withToolErrorHandling(run, onError) {
+    try {
+        return await run();
+    }
+    catch (error) {
+        return onError(error);
+    }
+}
+export function buildToolErrorResponse(error, defaultCode, path) {
+    const detailed = createDetailedError(error, path);
+    if (detailed.code === ErrorCode.E_UNKNOWN) {
+        detailed.code = defaultCode;
+        detailed.suggestion = getSuggestion(defaultCode);
+    }
+    const text = formatDetailedError(detailed);
+    return {
+        content: [{ type: 'text', text }],
+        structuredContent: {
+            ok: false,
+            error: {
+                code: detailed.code,
+                message: detailed.message,
+                path: detailed.path,
+                suggestion: detailed.suggestion,
+            },
+        },
+        isError: true,
+    };
+}
 //# sourceMappingURL=tool-response.js.map

package/dist/tools/tool-response.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-response.js","sourceRoot":"","sources":["../../src/tools/tool-response.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAC/B,IAAY,EACZ,iBAAoB;IAKpB,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjC,iBAAiB;KAClB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"tool-response.js","sourceRoot":"","sources":["../../src/tools/tool-response.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,SAAS,EACT,mBAAmB,EACnB,aAAa,GACd,MAAM,kBAAkB,CAAC;AAE1B,MAAM,UAAU,iBAAiB,CAC/B,IAAY,EACZ,iBAAoB;IAKpB,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjC,iBAAiB;KAClB,CAAC;AACJ,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,GAAmC,EACnC,OAA0C;IAE1C,IAAI,CAAC;QACH,OAAO,MAAM,GAAG,EAAE,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;AACH,CAAC;AAYD,MAAM,UAAU,sBAAsB,CACpC,KAAc,EACd,WAAsB,EACtB,IAAa;IAMb,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAClD,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,SAAS,EAAE,CAAC;QAC1C,QAAQ,CAAC,IAAI,GAAG,WAAW,CAAC;QAC5B,QAAQ,CAAC,UAAU,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,IAAI,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAE3C,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjC,iBAAiB,EAAE;YACjB,EAAE,EAAE,KAAK;YACT,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,UAAU,EAAE,QAAQ,CAAC,UAAU;aAChC;SACF;QACD,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@j0hanz/filesystem-context-mcp",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "mcpName": "io.github.j0hanz/filesystem-context",
   "description": "🔍 Read-only MCP server for secure filesystem exploration, searching, and analysis",
   "type": "module",
@@ -53,6 +53,7 @@
     "@modelcontextprotocol/sdk": "^1.25.1",
     "fast-glob": "^3.3.3",
     "minimatch": "^10.1.1",
+    "re2": "^1.23.0",
     "safe-regex2": "^5.0.0",
     "zod": "^3.24.0"
   },