@j0hanz/filesystem-context-mcp 1.3.0 → 1.3.2

package/dist/tools/list-directory.js

@@ -1,62 +1,48 @@
 import * as pathModule from 'node:path';
-import { ErrorCode, toRpcError } from '../lib/errors.js';
+import { formatBytes, formatOperationSummary, joinLines, } from '../config/formatting.js';
+import { DEFAULT_LIST_MAX_ENTRIES, DEFAULT_MAX_DEPTH, } from '../lib/constants.js';
+import { ErrorCode } from '../lib/errors.js';
 import { listDirectory } from '../lib/file-operations.js';
 import { ListDirectoryInputSchema, ListDirectoryOutputSchema, } from '../schemas/index.js';
-import { formatBytes, formatOperationSummary } from './shared/formatting.js';
-import { buildToolResponse } from './tool-response.js';
+import { buildToolErrorResponse, buildToolResponse, withToolErrorHandling, } from './tool-response.js';
 function getExtension(name, isFile) {
     if (!isFile)
         return undefined;
     const ext = pathModule.extname(name);
     return ext ? ext.slice(1) : undefined;
 }
-function formatDirectoryListing(entries, basePath) {
-    if (entries.length === 0)
-        return 'Directory is empty';
-    const dirs = entries.filter((e) => e.type === 'directory');
-    const files = entries.filter((e) => e.type !== 'directory');
-    const lines = [
-        `Contents of ${basePath}:`,
-        '',
-        ...formatDirectoryLines(dirs),
-        ...formatFileLines(files),
-        '',
-        `Total: ${dirs.length} directories, ${files.length} files`,
-    ];
-    return lines.join('\n');
-}
-function formatDirectoryLines(dirs) {
-    if (dirs.length === 0)
-        return [];
-    return [
-        'Directories:',
-        ...dirs.map((dir) => {
-            const symlink = dir.symlinkTarget ? ` -> ${dir.symlinkTarget}` : '';
-            return `  [DIR]  ${dir.relativePath}${symlink}`;
-        }),
-        '',
-    ];
-}
-function formatFileLines(files) {
-    if (files.length === 0)
-        return [];
-    return [
-        'Files:',
-        ...files.map((file) => {
-            const size = file.size !== undefined ? ` (${formatBytes(file.size)})` : '';
-            const tag = file.type === 'symlink' ? '[LINK]' : '[FILE]';
-            const symlink = file.symlinkTarget ? ` -> ${file.symlinkTarget}` : '';
-            return `  ${tag} ${file.relativePath}${size}${symlink}`;
-        }),
-    ];
+function formatDirectoryListing(entries, basePath, summary) {
+    if (entries.length === 0) {
+        if (summary.entriesScanned && summary.entriesScanned > 0) {
+            if (summary.entriesVisible === 0) {
+                return 'No entries matched visibility filters (hidden/excludePatterns).';
+            }
+            return 'No entries matched the provided pattern.';
+        }
+        return 'Empty directory';
+    }
+    const dirs = entries.filter((e) => e.type === 'directory').length;
+    const files = entries.length - dirs;
+    const entryLines = entries.map((entry) => {
+        if (entry.type === 'directory') {
+            const symlink = entry.symlinkTarget ? ` -> ${entry.symlinkTarget}` : '';
+            return `[DIR] ${entry.relativePath}${symlink}`;
+        }
+        const size = entry.size !== undefined ? ` (${formatBytes(entry.size)})` : '';
+        const tag = entry.type === 'symlink' ? '[LINK]' : '[FILE]';
+        const symlink = entry.symlinkTarget ? ` -> ${entry.symlinkTarget}` : '';
+        return `${tag} ${entry.relativePath}${size}${symlink}`;
+    });
+    const lines = [`${basePath} (${dirs} dirs, ${files} files):`, ...entryLines];
+    return joinLines(lines);
 }
 const LIST_DIRECTORY_TOOL = {
     title: 'List Directory',
-    description: 'List files and subdirectories in a specified path with optional recursive traversal. ' +
-        'Returns names (basename), relative paths, types (file/directory/symlink), sizes, and modification dates. ' +
-        'Use recursive=true with maxDepth to explore nested structures. ' +
-        'Use excludePatterns to skip directories like node_modules, or pattern to include only matching paths. ' +
-        'For a visual tree structure, use directory_tree instead.',
+    description: 'List entries in a directory with optional recursion. ' +
+        'Returns name (basename), relative path, type (file/directory/symlink), size, and modified date. ' +
+        'Use recursive=true with maxDepth to traverse nested folders. ' +
+        'Use excludePatterns to skip paths, or pattern to include only matches. ' +
+        'Symlinks are not followed; includeSymlinkTargets can show targets.',
     inputSchema: ListDirectoryInputSchema,
     outputSchema: ListDirectoryOutputSchema.shape,
     annotations: {
@@ -66,10 +52,11 @@ const LIST_DIRECTORY_TOOL = {
     },
 };
 function buildStructuredResult(result) {
+    const { entries, summary, path } = result;
     return {
         ok: true,
-        path: result.path,
-        entries: result.entries.map((e) => ({
+        path,
+        entries: entries.map((e) => ({
             name: e.name,
             relativePath: e.relativePath,
             type: e.type,
@@ -79,54 +66,67 @@ function buildStructuredResult(result) {
             symlinkTarget: e.symlinkTarget,
         })),
         summary: {
-            totalEntries: result.summary.totalEntries,
-            totalFiles: result.summary.totalFiles,
-            totalDirectories: result.summary.totalDirectories,
-            maxDepthReached: result.summary.maxDepthReached,
-            truncated: result.summary.truncated,
-            skippedInaccessible: result.summary.skippedInaccessible,
-            symlinksNotFollowed: result.summary.symlinksNotFollowed,
+            totalEntries: summary.totalEntries,
+            totalFiles: summary.totalFiles,
+            totalDirectories: summary.totalDirectories,
+            maxDepthReached: summary.maxDepthReached,
+            truncated: summary.truncated,
+            stoppedReason: summary.stoppedReason,
+            skippedInaccessible: summary.skippedInaccessible,
+            symlinksNotFollowed: summary.symlinksNotFollowed,
+            entriesScanned: summary.entriesScanned,
+            entriesVisible: summary.entriesVisible,
         },
     };
 }
 function buildTextResult(result) {
-    let textOutput = formatDirectoryListing(result.entries, result.path);
-    if (result.entries.length === 0 && result.summary.totalEntries > 0) {
-        textOutput +=
-            '\n(No entries matched the provided pattern/filters, but the directory contains items.)';
-    }
+    const { entries, summary, path } = result;
+    let textOutput = formatDirectoryListing(entries, path, summary);
+    const truncatedReason = summary.stoppedReason === 'aborted'
+        ? 'operation aborted'
+        : summary.stoppedReason === 'maxEntries'
+            ? `reached max entries limit (${summary.totalEntries} returned)`
+            : undefined;
     textOutput += formatOperationSummary({
-        truncated: result.summary.truncated,
-        truncatedReason: `reached max entries limit (${result.summary.totalEntries} returned)`,
-        tip: 'Increase maxEntries or reduce maxDepth to see more results.',
-        skippedInaccessible: result.summary.skippedInaccessible,
-        symlinksNotFollowed: result.summary.symlinksNotFollowed,
+        truncated: summary.truncated,
+        truncatedReason,
+        tip: summary.stoppedReason === 'maxEntries'
+            ? 'Increase maxEntries or reduce maxDepth to see more results.'
+            : undefined,
+        skippedInaccessible: summary.skippedInaccessible,
+        symlinksNotFollowed: summary.symlinksNotFollowed,
     });
     return textOutput;
 }
-async function handleListDirectory({ path: dirPath, recursive, includeHidden, excludePatterns, maxDepth, maxEntries, sortBy, includeSymlinkTargets, pattern, }) {
-    const result = await listDirectory(dirPath, {
-        recursive,
-        includeHidden,
-        excludePatterns,
-        maxDepth,
-        maxEntries,
-        sortBy,
-        includeSymlinkTargets,
+async function handleListDirectory({ path: dirPath, recursive, includeHidden, excludePatterns, maxDepth, maxEntries, sortBy, includeSymlinkTargets, pattern, }, signal) {
+    const effectiveOptions = {
+        recursive: recursive ?? false,
+        includeHidden: includeHidden ?? false,
+        excludePatterns: excludePatterns ?? [],
+        maxDepth: maxDepth ?? DEFAULT_MAX_DEPTH,
+        maxEntries: maxEntries ?? DEFAULT_LIST_MAX_ENTRIES,
+        sortBy: sortBy ?? 'name',
+        includeSymlinkTargets: includeSymlinkTargets ?? false,
         pattern,
+    };
+    const result = await listDirectory(dirPath, {
+        recursive: effectiveOptions.recursive,
+        includeHidden: effectiveOptions.includeHidden,
+        excludePatterns: effectiveOptions.excludePatterns,
+        maxDepth: effectiveOptions.maxDepth,
+        maxEntries: effectiveOptions.maxEntries,
+        sortBy: effectiveOptions.sortBy,
+        includeSymlinkTargets: effectiveOptions.includeSymlinkTargets,
+        pattern: effectiveOptions.pattern,
+        signal,
     });
     const structured = buildStructuredResult(result);
+    structured.effectiveOptions = effectiveOptions;
     const textOutput = buildTextResult(result);
     return buildToolResponse(textOutput, structured);
 }
 export function registerListDirectoryTool(server) {
-    server.registerTool('list_directory', LIST_DIRECTORY_TOOL, async (args) => {
-        try {
-            return await handleListDirectory(args);
-        }
-        catch (error) {
-            throw toRpcError(error, ErrorCode.E_NOT_DIRECTORY, args.path);
-        }
-    });
+    const handler = (args, extra) => withToolErrorHandling(() => handleListDirectory(args, extra.signal), (error) => buildToolErrorResponse(error, ErrorCode.E_NOT_DIRECTORY, args.path));
+    server.registerTool('list_directory', LIST_DIRECTORY_TOOL, handler);
 }
 //# sourceMappingURL=list-directory.js.map

package/dist/tools/list-directory.js.map

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

package/dist/tools/read-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-file.d.ts","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAmJzE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAY5D"}
+{"version":3,"file":"read-file.d.ts","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAuKzE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAqB5D"}

package/dist/tools/read-file.js

@@ -1,38 +1,25 @@
-import { ErrorCode, McpError, toRpcError } from '../lib/errors.js';
+import { joinLines } from '../config/formatting.js';
+import { MAX_TEXT_FILE_SIZE } from '../lib/constants.js';
+import { ErrorCode } from '../lib/errors.js';
 import { readFile } from '../lib/file-operations.js';
 import { ReadFileInputSchema, ReadFileOutputSchema } from '../schemas/index.js';
-import { buildToolResponse } from './tool-response.js';
-function buildLineRange(lineStart, lineEnd, filePath) {
-    const hasLineStart = lineStart !== undefined;
-    const hasLineEnd = lineEnd !== undefined;
-    assertLineRangeComplete(hasLineStart, hasLineEnd, filePath);
-    if (hasLineStart && hasLineEnd)
-        return { start: lineStart, end: lineEnd };
-    return undefined;
-}
-function assertNoMixedRangeOptions(hasHeadTail, hasLineRange, filePath) {
-    if (!hasHeadTail || !hasLineRange)
-        return;
-    throw new McpError(ErrorCode.E_INVALID_INPUT, 'head/tail cannot be combined with lineStart/lineEnd', filePath);
-}
-function assertLineRangeComplete(hasLineStart, hasLineEnd, filePath) {
-    if (hasLineStart === hasLineEnd)
-        return;
-    const missing = hasLineStart ? 'lineEnd' : 'lineStart';
-    const provided = hasLineStart ? 'lineStart' : 'lineEnd';
-    throw new McpError(ErrorCode.E_INVALID_INPUT, `Invalid lineRange: ${provided} requires ${missing} to also be specified`, filePath);
-}
+import { createTimedAbortSignal } from './shared/abort.js';
+import { assertNoMixedRangeOptions, buildLineRange, } from './shared/read-range.js';
+import { buildToolErrorResponse, buildToolResponse, withToolErrorHandling, } from './tool-response.js';
+const READ_FILE_TIMEOUT_MS = 30000;
 function buildTextResult(result, head, tail) {
     const note = buildReadFileNote(result, head, tail);
-    return note ? `${result.content}\n${note}` : result.content;
+    return note ? joinLines([result.content, note]) : result.content;
 }
 function buildReadFileNote(result, head, tail) {
-    if (result.truncated) {
-        return buildTruncatedNote(result, head, tail);
-    }
-    return result.totalLines !== undefined
+    const rangeNote = buildRangeNote(result);
+    const linesNote = result.totalLines !== undefined
         ? `Total lines: ${result.totalLines}`
         : undefined;
+    if (result.truncated) {
+        return joinLines([buildTruncatedNote(result, head, tail), rangeNote, linesNote].filter((value) => Boolean(value)));
+    }
+    return joinLines([rangeNote, linesNote].filter((value) => Boolean(value)));
 }
 function buildTruncatedNote(result, head, tail) {
     if (result.totalLines !== undefined) {
@@ -46,16 +33,35 @@ function buildTruncatedNote(result, head, tail) {
     }
     return undefined;
 }
-async function handleReadFile(args) {
-    assertNoMixedRangeOptions(args.head !== undefined || args.tail !== undefined, args.lineStart !== undefined || args.lineEnd !== undefined, args.path);
+function buildRangeNote(result) {
+    if (result.readMode === 'lineRange') {
+        if (result.lineStart !== undefined && result.lineEnd !== undefined) {
+            return `Showing lines ${result.lineStart}-${result.lineEnd}`;
+        }
+    }
+    return undefined;
+}
+async function handleReadFile(args, signal) {
+    const hasHeadTail = args.head !== undefined || args.tail !== undefined;
+    const hasLineRange = args.lineStart !== undefined || args.lineEnd !== undefined;
+    assertNoMixedRangeOptions(hasHeadTail, hasLineRange, args.path);
     const lineRange = buildLineRange(args.lineStart, args.lineEnd, args.path);
-    const result = await readFile(args.path, {
-        encoding: args.encoding,
-        maxSize: args.maxSize,
+    const effectiveOptions = {
+        encoding: args.encoding ?? 'utf-8',
+        maxSize: Math.min(args.maxSize ?? MAX_TEXT_FILE_SIZE, MAX_TEXT_FILE_SIZE),
+        skipBinary: args.skipBinary ?? true,
         lineRange,
         head: args.head,
         tail: args.tail,
-        skipBinary: args.skipBinary,
+    };
+    const result = await readFile(args.path, {
+        encoding: effectiveOptions.encoding,
+        maxSize: effectiveOptions.maxSize,
+        lineRange: effectiveOptions.lineRange,
+        head: effectiveOptions.head,
+        tail: effectiveOptions.tail,
+        skipBinary: effectiveOptions.skipBinary,
+        signal,
     });
     const structured = {
         ok: true,
@@ -63,6 +69,22 @@ async function handleReadFile(args) {
         content: result.content,
         truncated: result.truncated,
         totalLines: result.totalLines,
+        readMode: result.readMode,
+        lineStart: result.lineStart,
+        lineEnd: result.lineEnd,
+        head: result.head,
+        tail: result.tail,
+        linesRead: result.linesRead,
+        hasMoreLines: result.hasMoreLines,
+        effectiveOptions: {
+            encoding: effectiveOptions.encoding,
+            maxSize: effectiveOptions.maxSize,
+            skipBinary: effectiveOptions.skipBinary,
+            lineStart: args.lineStart,
+            lineEnd: args.lineEnd,
+            head: args.head,
+            tail: args.tail,
+        },
     };
     const text = buildTextResult(result, args.head, args.tail);
     return buildToolResponse(text, structured);
@@ -70,11 +92,10 @@ async function handleReadFile(args) {
 const READ_FILE_TOOL = {
     title: 'Read File',
     description: 'Read the text contents of a single file. ' +
-        'Supports different encodings and partial reads via head (first N lines), tail (last N lines), ' +
-        'or lineStart/lineEnd (specific line range). ' +
-        'Use skipBinary=true to reject binary files and prefer read_media_file. ' +
-        'For multiple files, use read_multiple_files for efficiency. ' +
-        'For binary/media files, use read_media_file instead.',
+        'Supports encodings and partial reads via head (first N lines), tail (last N lines), ' +
+        'or lineStart/lineEnd (specific line range; mutually exclusive with head/tail). ' +
+        'Use skipBinary=true to reject binary files. ' +
+        'For multiple files, use read_multiple_files for efficiency.',
     inputSchema: ReadFileInputSchema,
     outputSchema: ReadFileOutputSchema.shape,
     annotations: {
@@ -84,13 +105,15 @@ const READ_FILE_TOOL = {
     },
 };
 export function registerReadFileTool(server) {
-    server.registerTool('read_file', READ_FILE_TOOL, async (args) => {
+    const handler = (args, extra) => withToolErrorHandling(async () => {
+        const { signal, cleanup } = createTimedAbortSignal(extra.signal, READ_FILE_TIMEOUT_MS);
         try {
-            return await handleReadFile(args);
+            return await handleReadFile(args, signal);
         }
-        catch (error) {
-            throw toRpcError(error, ErrorCode.E_NOT_FILE, args.path);
+        finally {
+            cleanup();
         }
-    });
+    }, (error) => buildToolErrorResponse(error, ErrorCode.E_NOT_FILE, args.path));
+    server.registerTool('read_file', READ_FILE_TOOL, handler);
 }
 //# sourceMappingURL=read-file.js.map

package/dist/tools/read-file.js.map

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

package/dist/tools/read-media-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-media-file.d.ts","sourceRoot":"","sources":["../../src/tools/read-media-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAoEzE,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAYjE"}
+{"version":3,"file":"read-media-file.d.ts","sourceRoot":"","sources":["../../src/tools/read-media-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA0EzE,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAYjE"}

package/dist/tools/read-media-file.js

@@ -1,7 +1,8 @@
-import { ErrorCode, toRpcError } from '../lib/errors.js';
+import { joinLines } from '../config/formatting.js';
+import { ErrorCode } from '../lib/errors.js';
 import { readMediaFile } from '../lib/file-operations.js';
 import { ReadMediaFileInputSchema, ReadMediaFileOutputSchema, } from '../schemas/index.js';
-import { buildToolResponse } from './tool-response.js';
+import { buildToolErrorResponse, buildToolResponse, } from './tool-response.js';
 function buildStructuredResult(result) {
     return {
         ok: true,
@@ -18,7 +19,7 @@ function buildTextResult(result) {
         `Size: ${result.size} bytes`,
         `Data: [base64 encoded, ${result.data.length} characters]`,
     ];
-    return textLines.join('\n');
+    return joinLines(textLines);
 }
 async function handleReadMediaFile({ path, maxSize, }) {
     const result = await readMediaFile(path, { maxSize });
@@ -38,13 +39,14 @@ const READ_MEDIA_FILE_TOOL = {
     },
 };
 export function registerReadMediaFileTool(server) {
-    server.registerTool('read_media_file', READ_MEDIA_FILE_TOOL, async (args) => {
+    const handler = async (args) => {
         try {
             return await handleReadMediaFile(args);
         }
         catch (error) {
-            throw toRpcError(error, ErrorCode.E_NOT_FILE, args.path);
+            return buildToolErrorResponse(error, ErrorCode.E_NOT_FILE, args.path);
         }
-    });
+    };
+    server.registerTool('read_media_file', READ_MEDIA_FILE_TOOL, handler);
 }
 //# sourceMappingURL=read-media-file.js.map

package/dist/tools/read-media-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-media-file.js","sourceRoot":"","sources":["../../src/tools/read-media-file.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EACL,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAqB,MAAM,oBAAoB,CAAC;AAK1E,SAAS,qBAAqB,CAC5B,MAAiD;IAEjD,OAAO;QACL,EAAE,EAAE,IAAI;QACR,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,MAAiD;IAEjD,MAAM,SAAS,GAAG;QAChB,SAAS,MAAM,CAAC,IAAI,EAAE;QACtB,cAAc,MAAM,CAAC,QAAQ,EAAE;QAC/B,SAAS,MAAM,CAAC,IAAI,QAAQ;QAC5B,0BAA0B,MAAM,CAAC,IAAI,CAAC,MAAM,cAAc;KAC3D,CAAC;IACF,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,EACjC,IAAI,EACJ,OAAO,GAIR;IACC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACtD,OAAO,iBAAiB,CACtB,eAAe,CAAC,MAAM,CAAC,EACvB,qBAAqB,CAAC,MAAM,CAAC,CAC9B,CAAC;AACJ,CAAC;AAED,MAAM,oBAAoB,GAAG;IAC3B,KAAK,EAAE,iBAAiB;IACxB,WAAW,EACT,yGAAyG;QACzG,oDAAoD;QACpD,+EAA+E;IACjF,WAAW,EAAE,wBAAwB;IACrC,YAAY,EAAE,yBAAyB,CAAC,KAAK;IAC7C,WAAW,EAAE;QACX,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,IAAI;KACpB;CACO,CAAC;AAEX,MAAM,UAAU,yBAAyB,CAAC,MAAiB;IACzD,MAAM,CAAC,YAAY,CACjB,iBAAiB,EACjB,oBAAoB,EACpB,KAAK,EAAE,IAAmB,EAAE,EAAE;QAC5B,IAAI,CAAC;YACH,OAAO,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"read-media-file.js","sourceRoot":"","sources":["../../src/tools/read-media-file.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EACL,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,sBAAsB,EACtB,iBAAiB,GAGlB,MAAM,oBAAoB,CAAC;AAK5B,SAAS,qBAAqB,CAC5B,MAAiD;IAEjD,OAAO;QACL,EAAE,EAAE,IAAI;QACR,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,MAAiD;IAEjD,MAAM,SAAS,GAAG;QAChB,SAAS,MAAM,CAAC,IAAI,EAAE;QACtB,cAAc,MAAM,CAAC,QAAQ,EAAE;QAC/B,SAAS,MAAM,CAAC,IAAI,QAAQ;QAC5B,0BAA0B,MAAM,CAAC,IAAI,CAAC,MAAM,cAAc;KAC3D,CAAC;IACF,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC;AAC9B,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,EACjC,IAAI,EACJ,OAAO,GAIR;IACC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACtD,OAAO,iBAAiB,CACtB,eAAe,CAAC,MAAM,CAAC,EACvB,qBAAqB,CAAC,MAAM,CAAC,CAC9B,CAAC;AACJ,CAAC;AAED,MAAM,oBAAoB,GAAG;IAC3B,KAAK,EAAE,iBAAiB;IACxB,WAAW,EACT,yGAAyG;QACzG,oDAAoD;QACpD,+EAA+E;IACjF,WAAW,EAAE,wBAAwB;IACrC,YAAY,EAAE,yBAAyB,CAAC,KAAK;IAC7C,WAAW,EAAE;QACX,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,IAAI;KACpB;CACO,CAAC;AAEX,MAAM,UAAU,yBAAyB,CAAC,MAAiB;IACzD,MAAM,OAAO,GAAG,KAAK,EACnB,IAAmB,EAC6B,EAAE;QAClD,IAAI,CAAC;YACH,OAAO,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,sBAAsB,CAAC,KAAK,EAAE,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACxE,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,YAAY,CAAC,iBAAiB,EAAE,oBAAoB,EAAE,OAAO,CAAC,CAAC;AACxE,CAAC"}

package/dist/tools/read-multiple-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-multiple-files.d.ts","sourceRoot":"","sources":["../../src/tools/read-multiple-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA0HzE,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAYrE"}
+{"version":3,"file":"read-multiple-files.d.ts","sourceRoot":"","sources":["../../src/tools/read-multiple-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA+KzE,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAqBrE"}

package/dist/tools/read-multiple-files.js

@@ -1,8 +1,13 @@
-import { ErrorCode, McpError, toRpcError } from '../lib/errors.js';
+import { joinLines } from '../config/formatting.js';
+import { MAX_TEXT_FILE_SIZE } from '../lib/constants.js';
+import { ErrorCode } from '../lib/errors.js';
 import { readMultipleFiles } from '../lib/file-operations.js';
 import { ReadMultipleFilesInputSchema, ReadMultipleFilesOutputSchema, } from '../schemas/index.js';
-import { buildToolResponse } from './tool-response.js';
-function buildStructuredResult(results) {
+import { createTimedAbortSignal } from './shared/abort.js';
+import { assertLineRangeComplete, assertNoMixedRangeOptions, } from './shared/read-range.js';
+import { buildToolErrorResponse, buildToolResponse, withToolErrorHandling, } from './tool-response.js';
+const READ_MULTIPLE_TIMEOUT_MS = 30000;
+function buildStructuredResult(results, effectiveOptions) {
     const succeeded = results.filter((r) => r.content !== undefined).length;
     const failed = results.filter((r) => r.error !== undefined).length;
     return {
@@ -13,49 +18,81 @@ function buildStructuredResult(results) {
             succeeded,
             failed,
         },
+        effectiveOptions,
     };
 }
 function buildTextResult(results) {
-    return results.map(formatReadMultipleResult).join('\n');
+    return joinLines(results.map(formatReadMultipleResult));
 }
 function formatReadMultipleResult(result) {
     if (result.content !== undefined) {
         const note = buildReadMultipleNote(result);
-        return `=== ${result.path} ===\n${result.content}${note}`;
+        const rangeNote = buildReadMultipleRangeNote(result);
+        const footer = [rangeNote, note].filter((value) => Boolean(value));
+        const contentBlock = footer.length
+            ? joinLines([result.content, ...footer])
+            : result.content;
+        return joinLines([`=== ${result.path} ===`, contentBlock]);
     }
-    return `=== ${result.path} ===\n[Error: ${result.error ?? 'Unknown error'}]`;
+    return joinLines([
+        `=== ${result.path} ===`,
+        `[Error: ${result.error ?? 'Unknown error'}]`,
+    ]);
 }
 function buildReadMultipleNote(result) {
     if (result.truncated !== true)
         return '';
     if (result.totalLines !== undefined) {
-        return `\n[Truncated. Total lines: ${result.totalLines}]`;
+        return `[Truncated. Total lines: ${result.totalLines}]`;
     }
-    return '\n[Truncated]';
+    return '[Truncated]';
 }
-function assertNoMixedRangeOptions(hasHeadTail, hasLineRange, pathLabel) {
-    if (!hasHeadTail || !hasLineRange)
-        return;
-    throw new McpError(ErrorCode.E_INVALID_INPUT, 'head/tail cannot be combined with lineStart/lineEnd', pathLabel);
+function buildReadMultipleRangeNote(result) {
+    if (result.readMode === 'lineRange') {
+        if (result.lineStart !== undefined && result.lineEnd !== undefined) {
+            return `Showing lines ${result.lineStart}-${result.lineEnd}`;
+        }
+    }
+    if (result.readMode === 'head' && result.head !== undefined) {
+        return `Showing first ${String(result.head)} lines`;
+    }
+    if (result.readMode === 'tail' && result.tail !== undefined) {
+        return `Showing last ${String(result.tail)} lines`;
+    }
+    return undefined;
 }
-async function handleReadMultipleFiles(args) {
-    assertNoMixedRangeOptions(args.head !== undefined || args.tail !== undefined, args.lineStart !== undefined || args.lineEnd !== undefined, args.paths[0] ?? '<paths>');
-    const results = await readMultipleFiles(args.paths, {
-        encoding: args.encoding,
-        maxSize: args.maxSize,
-        maxTotalSize: args.maxTotalSize,
+async function handleReadMultipleFiles(args, signal) {
+    const pathLabel = args.paths[0] ?? '<paths>';
+    const hasHeadTail = args.head !== undefined || args.tail !== undefined;
+    const hasLineRange = args.lineStart !== undefined || args.lineEnd !== undefined;
+    assertLineRangeComplete(args.lineStart, args.lineEnd, pathLabel);
+    assertNoMixedRangeOptions(hasHeadTail, hasLineRange, pathLabel);
+    const effectiveOptions = {
+        encoding: args.encoding ?? 'utf-8',
+        maxSize: Math.min(args.maxSize ?? MAX_TEXT_FILE_SIZE, MAX_TEXT_FILE_SIZE),
+        maxTotalSize: args.maxTotalSize ?? 100 * 1024 * 1024,
         head: args.head,
         tail: args.tail,
         lineStart: args.lineStart,
         lineEnd: args.lineEnd,
+    };
+    const results = await readMultipleFiles(args.paths, {
+        encoding: effectiveOptions.encoding,
+        maxSize: effectiveOptions.maxSize,
+        maxTotalSize: effectiveOptions.maxTotalSize,
+        head: effectiveOptions.head,
+        tail: effectiveOptions.tail,
+        lineStart: effectiveOptions.lineStart,
+        lineEnd: effectiveOptions.lineEnd,
+        signal,
     });
-    return buildToolResponse(buildTextResult(results), buildStructuredResult(results));
+    return buildToolResponse(buildTextResult(results), buildStructuredResult(results, effectiveOptions));
 }
 const READ_MULTIPLE_FILES_TOOL = {
     title: 'Read Multiple Files',
     description: 'Read contents of multiple files in a single operation (parallel processing). ' +
         'More efficient than calling read_file repeatedly. ' +
-        'Individual file errors do not fail the entire operation-each file reports success or error independently. ' +
+        'Individual file errors do not fail the entire operation; each file reports success or error independently. ' +
         'Supports head/tail or lineStart/lineEnd for reading partial content from all files (mutually exclusive).',
     inputSchema: ReadMultipleFilesInputSchema,
     outputSchema: ReadMultipleFilesOutputSchema.shape,
@@ -66,13 +103,15 @@ const READ_MULTIPLE_FILES_TOOL = {
     },
 };
 export function registerReadMultipleFilesTool(server) {
-    server.registerTool('read_multiple_files', READ_MULTIPLE_FILES_TOOL, async (args) => {
+    const handler = (args, extra) => withToolErrorHandling(async () => {
+        const { signal, cleanup } = createTimedAbortSignal(extra.signal, READ_MULTIPLE_TIMEOUT_MS);
         try {
-            return await handleReadMultipleFiles(args);
+            return await handleReadMultipleFiles(args, signal);
         }
-        catch (error) {
-            throw toRpcError(error, ErrorCode.E_UNKNOWN);
+        finally {
+            cleanup();
         }
-    });
+    }, (error) => buildToolErrorResponse(error, ErrorCode.E_UNKNOWN));
+    server.registerTool('read_multiple_files', READ_MULTIPLE_FILES_TOOL, handler);
 }
 //# sourceMappingURL=read-multiple-files.js.map