@j0hanz/filesystem-mcp 1.13.1 → 1.14.0

package/dist/tools/search-content.js

@@ -1,12 +1,11 @@
 import * as path from 'node:path';
-import { performance } from 'node:perf_hooks';
 import RE2 from 're2';
 import { DEFAULT_EXCLUDE_PATTERNS } from '../lib/constants.js';
 import { ErrorCode, formatUnknownErrorMessage, McpError, } from '../lib/errors.js';
 import { searchContent } from '../lib/file-operations/search.js';
 import { formatOperationSummary } from '../config.js';
 import { SearchContentInputSchema, SearchContentOutputSchema, } from '../schemas.js';
-import { buildResourceLink, buildToolErrorResponse, buildToolResponse, createToolProgressSession, executeToolWithDiagnostics, READ_ONLY_TOOL_ANNOTATIONS, resolveFinalProgressCurrent, resolvePathOrRoot, withDefaultIcons, withValidatedArgs, wrapToolHandler, } from './shared.js';
+import { buildResourceLink, buildToolErrorResponse, buildToolResponse, createToolProgressSession, executeToolWithDiagnostics, READ_ONLY_TOOL_ANNOTATIONS, resolveFinalProgressCurrent, resolvePathOrRoot, truncateProgressPattern, withDefaultIcons, withValidatedArgs, wrapToolHandler, } from './shared.js';
 import { registerToolTaskIfAvailable } from './task-support.js';
 /**
  * Configuration constants for the Search Content tool.
@@ -19,13 +18,11 @@ const CONFIG = {
         maxFiles: 'max files',
     },
 };
-let searchMetricSequence = 0;
 const TRUTHY_SUMMARY_FIELDS = [
     'filesMatched',
     'skippedTooLarge',
     'skippedBinary',
     'skippedInaccessible',
-    'linesSkippedDueToRegexTimeout',
 ];
 function buildStructuredSummaryFields(summary) {
     const result = {};
@@ -53,15 +50,6 @@ function buildCompletionSuffix(count, filesMatched, scope, stoppedReason) {
         : '';
     return `${count} ${matchWord} in ${filesMatched} ${fileWord}${reasonSuffix}`;
 }
-function createSearchMetricNames() {
-    searchMetricSequence += 1;
-    const metricSuffix = `${Date.now()}_${searchMetricSequence}`;
-    return {
-        timerStartName: `searchContentStart_${metricSuffix}`,
-        timerEndName: `searchContentEnd_${metricSuffix}`,
-        metricName: `searchContent_${metricSuffix}`,
-    };
-}
 function compareNormalizedMatches(left, right) {
     const fileCompare = left.relativeFile.localeCompare(right.relativeFile);
     if (fileCompare !== 0)
@@ -80,7 +68,7 @@ function buildSearchPreviewState(matches, payloads) {
         needsExternalize,
         visibleMatches,
         visiblePayloads: payloads.slice(0, visibleCount),
-        heading: SearchResponseBuilder.buildHeading(matches.length, visibleMatches.length),
+        heading: buildHeading(matches.length, visibleMatches.length),
     };
 }
 export const SEARCH_CONTENT_TOOL = {
@@ -94,187 +82,164 @@ export const SEARCH_CONTENT_TOOL = {
     annotations: READ_ONLY_TOOL_ANNOTATIONS,
     nuances: [
         'Inline results capped at 50 matches; full results via `resourceUri`.',
-        'Skips binary and oversized files.',
     ],
     gotchas: [
         'Skips binary/oversized files silently — verify with `stat` if no matches.',
     ],
     taskSupport: 'optional',
 };
-/**
- * Handles formatting and building the search response.
- */
-const SearchResponseBuilder = {
-    buildHeading(totalMatches, visibleMatches) {
-        if (visibleMatches >= totalMatches) {
-            return `Found ${totalMatches}:`;
-        }
-        return `Found ${totalMatches} (showing first ${visibleMatches}):`;
-    },
-    buildText(heading, matches, summary) {
-        if (matches.length === 0)
-            return 'No matches';
-        const text = this.buildMatchList(heading, matches);
-        if (!summary)
-            return text;
-        const summaryOpts = {
-            truncated: summary.truncated,
-            ...(summary.truncated
-                ? { truncatedReason: this.resolveTruncatedReason(summary) }
-                : {}),
-        };
-        return text + formatOperationSummary(summaryOpts);
-    },
-    buildStructured(summary, matches, options) {
+function buildHeading(totalMatches, visibleMatches) {
+    if (visibleMatches >= totalMatches) {
+        return `Found ${totalMatches}:`;
+    }
+    return `Found ${totalMatches} (showing first ${visibleMatches}):`;
+}
+function buildSearchText(heading, matches, summary) {
+    if (matches.length === 0)
+        return 'No matches';
+    const text = buildMatchList(heading, matches);
+    if (!summary)
+        return text;
+    const summaryOpts = {
+        truncated: summary.truncated,
+        ...(summary.truncated
+            ? { truncatedReason: resolveTruncatedReason(summary) }
+            : {}),
+    };
+    return text + formatOperationSummary(summaryOpts);
+}
+function buildSearchStructured(summary, matches) {
+    return {
+        ok: true,
+        matches,
+        totalMatches: summary.matches,
+        filesScanned: summary.filesScanned,
+        ...buildStructuredSummaryFields(summary),
+    };
+}
+function normalizeMatches(result) {
+    const relativeByFile = new Map();
+    const getRelativeFile = (file) => {
+        const cached = relativeByFile.get(file);
+        if (cached !== undefined)
+            return cached;
+        const relative = path.relative(result.basePath, file);
+        relativeByFile.set(file, relative);
+        return relative;
+    };
+    return result.matches
+        .map((match, index) => ({
+        ...match,
+        relativeFile: getRelativeFile(match.file),
+        index,
+    }))
+        .sort(compareNormalizedMatches);
+}
+function buildMatchPayloads(matches, context) {
+    return matches.map((match) => {
+        const column = findColumnOffset(match.content, context);
         return {
-            ok: true,
-            patternType: options.patternType,
-            caseSensitive: options.caseSensitive,
-            matches,
-            totalMatches: summary.matches,
-            filesScanned: summary.filesScanned,
-            ...buildStructuredSummaryFields(summary),
-        };
-    },
-    normalizeMatches(result) {
-        const relativeByFile = new Map();
-        const getRelativeFile = (file) => {
-            const cached = relativeByFile.get(file);
-            if (cached !== undefined)
-                return cached;
-            const relative = path.relative(result.basePath, file);
-            relativeByFile.set(file, relative);
-            return relative;
+            file: match.relativeFile,
+            line: match.line,
+            ...(column !== undefined ? { column } : {}),
+            content: match.content,
+            matchCount: match.matchCount,
+            ...(match.contextBefore
+                ? { contextBefore: [...match.contextBefore] }
+                : {}),
+            ...(match.contextAfter ? { contextAfter: [...match.contextAfter] } : {}),
         };
-        return result.matches
-            .map((match, index) => ({
-            ...match,
-            relativeFile: getRelativeFile(match.file),
-            index,
-        }))
-            .sort(compareNormalizedMatches);
-    },
-    buildMatchPayloads(matches, context) {
-        return matches.map((match) => {
-            const column = this.findColumnOffset(match.content, context);
-            return {
-                file: match.relativeFile,
-                line: match.line,
-                ...(column !== undefined ? { column } : {}),
-                content: match.content,
-                matchCount: match.matchCount,
-                ...(match.contextBefore
-                    ? { contextBefore: [...match.contextBefore] }
-                    : {}),
-                ...(match.contextAfter
-                    ? { contextAfter: [...match.contextAfter] }
-                    : {}),
-            };
-        });
-    },
-    buildMatchList(heading, matches) {
-        if (matches.length === 0)
-            return heading;
-        const parts = [heading];
-        for (const match of matches) {
-            parts.push(`\n  ${match.relativeFile}:${String(match.line).padStart(4)}: ${match.content}`);
-        }
-        return parts.join('');
-    },
-    resolveTruncatedReason(summary) {
-        if (summary.stoppedReason === 'timeout')
-            return 'timeout';
-        if (summary.stoppedReason === 'maxFiles') {
-            return `max files (${summary.filesScanned})`;
+    });
+}
+function buildMatchList(heading, matches) {
+    if (matches.length === 0)
+        return heading;
+    const parts = [heading];
+    for (const match of matches) {
+        parts.push(`\n  ${match.relativeFile}:${String(match.line).padStart(4)}: ${match.content}`);
+    }
+    return parts.join('');
+}
+function resolveTruncatedReason(summary) {
+    if (summary.stoppedReason === 'timeout')
+        return 'timeout';
+    if (summary.stoppedReason === 'maxFiles') {
+        return `max files (${summary.filesScanned})`;
+    }
+    return `max results (${summary.matches})`;
+}
+function findColumnOffset(content, context) {
+    try {
+        if (context.matcher) {
+            context.matcher.lastIndex = 0;
+            const match = context.matcher.exec(content);
+            return match ? match.index : undefined;
         }
-        return `max results (${summary.matches})`;
-    },
-    findColumnOffset(content, context) {
-        try {
-            if (context.matcher) {
-                context.matcher.lastIndex = 0;
-                const match = context.matcher.exec(content);
-                return match ? match.index : undefined;
-            }
-            if (context.caseSensitive) {
-                const idx = content.indexOf(context.pattern);
-                return idx >= 0 ? idx : undefined;
-            }
-            // Case-insensitive literal search
-            const idx = content.toLowerCase().indexOf(context.foldedPattern ?? '');
+        if (context.caseSensitive) {
+            const idx = content.indexOf(context.pattern);
             return idx >= 0 ? idx : undefined;
         }
-        catch {
-            return undefined;
-        }
-    },
-};
-const SearchExecutor = {
-    async run(args, basePath, signal, onProgress) {
-        const excludePatterns = args.includeIgnored ? [] : DEFAULT_EXCLUDE_PATTERNS;
-        const { timerStartName, timerEndName, metricName } = createSearchMetricNames();
-        const options = {
-            includeHidden: args.includeHidden,
-            excludePatterns,
-            filePattern: args.filePattern,
-            caseSensitive: args.caseSensitive,
-            wholeWord: args.wholeWord,
-            contextLines: args.contextLines,
-            maxResults: args.maxResults,
-            isLiteral: !args.isRegex,
-            multiline: args.multiline,
-            ...(signal ? { signal } : {}),
-            ...(onProgress ? { onProgress } : {}),
-        };
-        performance.mark(timerStartName);
-        try {
-            return await searchContent(basePath, args.pattern, options);
-        }
-        catch (error) {
-            if (error instanceof Error && /regular expression/i.test(error.message)) {
-                throw new McpError(ErrorCode.E_INVALID_PATTERN, error.message);
-            }
-            throw error;
-        }
-        finally {
-            performance.mark(timerEndName);
-            performance.measure(metricName, timerStartName, timerEndName);
-            performance.clearMarks(timerStartName);
-            performance.clearMarks(timerEndName);
-            performance.clearMeasures(metricName);
-        }
-    },
-    createMatcher(args) {
-        if (!args.isRegex)
-            return undefined;
-        try {
-            const flags = (args.caseSensitive ? '' : 'i') + (args.multiline ? 'm' : '');
-            return new RE2(args.pattern, flags);
-        }
-        catch (error) {
-            throw new McpError(ErrorCode.E_INVALID_PATTERN, `Invalid regex pattern: ${formatUnknownErrorMessage(error)}`);
+        // Case-insensitive literal search
+        const idx = content.toLowerCase().indexOf(context.foldedPattern ?? '');
+        return idx >= 0 ? idx : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+async function executeSearch(args, basePath, signal, onProgress) {
+    const excludePatterns = args.includeIgnored ? [] : DEFAULT_EXCLUDE_PATTERNS;
+    const options = {
+        includeHidden: args.includeHidden,
+        excludePatterns,
+        filePattern: args.filePattern,
+        caseSensitive: args.caseSensitive,
+        wholeWord: args.wholeWord,
+        contextLines: args.contextLines,
+        maxResults: args.maxResults,
+        isLiteral: !args.isRegex,
+        ...(signal ? { signal } : {}),
+        ...(onProgress ? { onProgress } : {}),
+    };
+    try {
+        return await searchContent(basePath, args.pattern, options);
+    }
+    catch (error) {
+        if (error instanceof Error && /regular expression/i.test(error.message)) {
+            throw new McpError(ErrorCode.E_INVALID_PATTERN, error.message);
         }
-    },
-    createSearchContext(args, matcher) {
-        return {
-            pattern: args.pattern,
-            caseSensitive: args.caseSensitive,
-            ...(matcher ? { matcher } : {}),
-            ...(!args.isRegex && !args.caseSensitive
-                ? { foldedPattern: args.pattern.toLowerCase() }
-                : {}),
-        };
-    },
-};
+        throw error;
+    }
+}
+function createSearchMatcher(args) {
+    if (!args.isRegex)
+        return undefined;
+    try {
+        const flags = args.caseSensitive ? '' : 'i';
+        return new RE2(args.pattern, flags);
+    }
+    catch (error) {
+        throw new McpError(ErrorCode.E_INVALID_PATTERN, `Invalid regex pattern: ${formatUnknownErrorMessage(error)}`);
+    }
+}
+function createSearchContext(args, matcher) {
+    return {
+        pattern: args.pattern,
+        caseSensitive: args.caseSensitive,
+        ...(matcher ? { matcher } : {}),
+        ...(!args.isRegex && !args.caseSensitive
+            ? { foldedPattern: args.pattern.toLowerCase() }
+            : {}),
+    };
+}
 async function handleSearchContent(args, signal, resourceStore, onProgress) {
     const basePath = resolvePathOrRoot(args.path);
-    const patternType = args.isRegex ? 'regex' : 'literal';
-    const regexMatcher = SearchExecutor.createMatcher(args);
-    const result = await SearchExecutor.run(args, basePath, signal, onProgress);
-    const normalizedMatches = SearchResponseBuilder.normalizeMatches(result);
-    const searchContext = SearchExecutor.createSearchContext(args, regexMatcher);
-    const matchPayloads = SearchResponseBuilder.buildMatchPayloads(normalizedMatches, searchContext);
-    const fullStructured = SearchResponseBuilder.buildStructured(result.summary, matchPayloads, { patternType, caseSensitive: args.caseSensitive });
+    const regexMatcher = createSearchMatcher(args);
+    const result = await executeSearch(args, basePath, signal, onProgress);
+    const normalizedMatches = normalizeMatches(result);
+    const searchContext = createSearchContext(args, regexMatcher);
+    const matchPayloads = buildMatchPayloads(normalizedMatches, searchContext);
+    const fullStructured = buildSearchStructured(result.summary, matchPayloads);
     const preview = buildSearchPreviewState(normalizedMatches, matchPayloads);
     if (resourceStore && preview.needsExternalize) {
         const previewStructured = {
@@ -288,7 +253,7 @@ async function handleSearchContent(args, signal, resourceStore, onProgress) {
             text: JSON.stringify(fullStructured),
         });
         previewStructured.resourceUri = entry.uri;
-        const text = SearchResponseBuilder.buildText(preview.heading, preview.visibleMatches);
+        const text = buildSearchText(preview.heading, preview.visibleMatches);
         return buildToolResponse(text, previewStructured, [
             buildResourceLink({
                 uri: entry.uri,
@@ -299,17 +264,18 @@ async function handleSearchContent(args, signal, resourceStore, onProgress) {
             }),
         ]);
     }
-    const text = SearchResponseBuilder.buildText(preview.heading, preview.visibleMatches, result.summary);
+    const text = buildSearchText(preview.heading, preview.visibleMatches, result.summary);
     return buildToolResponse(text, fullStructured);
 }
 export function registerSearchContentTool(server, options = {}) {
     const handler = (args, extra) => executeToolWithDiagnostics({
         toolName: 'grep',
         extra,
+        outputSchema: SearchContentOutputSchema,
         context: { path: args.path ?? '.' },
         run: async (signal) => {
             const { pattern, filePattern: scope } = args;
-            const progressLabel = `🔎︎ grep: ${pattern}`;
+            const progressLabel = `🔎︎ grep: ${truncateProgressPattern(pattern)}`;
             const progress = createToolProgressSession(extra, progressLabel);
             const progressWithMessage = ({ current, total, }) => {
                 progress.update({
@@ -321,10 +287,8 @@ export function registerSearchContentTool(server, options = {}) {
             try {
                 const result = await handleSearchContent(args, signal, options.resourceStore, progressWithMessage);
                 const sc = result.structuredContent;
-                const count = sc.ok && sc.totalMatches ? sc.totalMatches : 0;
-                const filesMatched = sc.ok ? (sc.filesMatched ?? 0) : 0;
-                const stoppedReason = sc.ok ? sc.stoppedReason : undefined;
-                const suffix = buildCompletionSuffix(count, filesMatched, scope, stoppedReason);
+                const { totalMatches = 0, filesMatched = 0, stoppedReason } = sc;
+                const suffix = buildCompletionSuffix(totalMatches, filesMatched, scope, stoppedReason);
                 const finalCurrent = resolveFinalProgressCurrent(progress, (sc.filesScanned ?? 0) + 1);
                 progress.complete(`${progressLabel} • ${suffix}`, finalCurrent);
                 return result;

package/dist/tools/search-files.js

@@ -4,7 +4,7 @@ import { ErrorCode } from '../lib/errors.js';
 import { searchFiles } from '../lib/file-operations/search.js';
 import { formatOperationSummary, joinLines } from '../config.js';
 import { SearchFilesInputSchema, SearchFilesOutputSchema } from '../schemas.js';
-import { buildToolErrorResponse, buildToolResponse, createProgressReporter, decodeOffsetCursor, encodeOffsetCursor, executeToolWithDiagnostics, notifyProgress, READ_ONLY_TOOL_ANNOTATIONS, resolvePathOrRoot, withDefaultIcons, withValidatedArgs, wrapToolHandler, } from './shared.js';
+import { buildToolErrorResponse, buildToolResponse, createProgressReporter, decodeOffsetCursor, encodeOffsetCursor, executeToolWithDiagnostics, notifyProgress, READ_ONLY_TOOL_ANNOTATIONS, resolvePathOrRoot, truncateProgressPattern, withDefaultIcons, withValidatedArgs, wrapToolHandler, } from './shared.js';
 import { registerToolTaskIfAvailable } from './task-support.js';
 export const SEARCH_FILES_TOOL = {
     name: 'find',
@@ -14,10 +14,7 @@ export const SEARCH_FILES_TOOL = {
     inputSchema: SearchFilesInputSchema,
     outputSchema: SearchFilesOutputSchema,
     annotations: READ_ONLY_TOOL_ANNOTATIONS,
-    nuances: [
-        'Respects `.gitignore` unless `includeIgnored=true`.',
-        'Returns relative paths plus metadata; may truncate.',
-    ],
+    nuances: ['Respects `.gitignore` unless `includeIgnored=true`.'],
     taskSupport: 'optional',
 };
 async function handleSearchFiles(args, signal, onProgress) {
@@ -52,7 +49,6 @@ async function handleSearchFiles(args, signal, onProgress) {
     const structured = {
         ok: true,
         root: basePath,
-        pattern: args.pattern,
         results: relativeResults,
         totalMatches: result.summary.matched,
         filesScanned: result.summary.filesScanned,
@@ -103,17 +99,19 @@ export function registerSearchFilesTool(server, options = {}) {
     const handler = (args, extra) => executeToolWithDiagnostics({
         toolName: 'find',
         extra,
+        outputSchema: SearchFilesOutputSchema,
         timedSignal: { timeoutMs: DEFAULT_SEARCH_TIMEOUT_MS },
         context: { path: args.path ?? '.' },
         run: async (signal) => {
             const rawScopeLabel = args.path ? path.basename(args.path) : '.';
             const scopeLabel = rawScopeLabel || '.';
             const { pattern } = args;
-            const context = `${pattern} in ${scopeLabel}`;
+            const truncatedPattern = truncateProgressPattern(pattern);
+            const context = `${truncatedPattern} in ${scopeLabel}`;
             let progressCursor = 0;
             notifyProgress(extra, {
                 current: 0,
-                message: `🔎︎ find: ${pattern}`,
+                message: `🔎︎ find: ${truncatedPattern}`,
             });
             const baseReporter = createProgressReporter(extra);
             const progressWithMessage = ({ current, total, }) => {
@@ -122,20 +120,19 @@ export function registerSearchFilesTool(server, options = {}) {
                 baseReporter({
                     current,
                     ...(total !== undefined ? { total } : {}),
-                    message: `🔎︎ find: ${pattern} [${current} files]`,
+                    message: `🔎︎ find: ${truncatedPattern} [${current} files]`,
                 });
             };
             try {
                 const result = await handleSearchFiles(args, signal, progressWithMessage);
                 const sc = result.structuredContent;
-                const count = sc.ok ? (sc.totalMatches ?? 0) : 0;
-                const stoppedReason = sc.ok ? sc.stoppedReason : undefined;
+                const { totalMatches = 0, stoppedReason } = sc;
                 let suffix;
-                if (count === 0) {
+                if (totalMatches === 0) {
                     suffix = 'No matches';
                 }
                 else {
-                    suffix = `${count} ${count === 1 ? 'match' : 'matches'}`;
+                    suffix = `${totalMatches} ${totalMatches === 1 ? 'match' : 'matches'}`;
                     if (stoppedReason === 'timeout') {
                         suffix += ' [timeout]';
                     }

package/dist/tools/shared.d.ts

@@ -22,7 +22,6 @@ export declare const IDEMPOTENT_WRITE_TOOL_ANNOTATIONS: {
     readonly destructiveHint: false;
     readonly openWorldHint: false;
 };
-export declare function shouldStripStructuredOutput(): boolean;
 export declare function maybeStripStructuredContentFromResult<T extends object>(result: T): T;
 type ResourceEntry = ReturnType<ResourceStore['putText']>;
 export declare function maybeExternalizeTextContent(resourceStore: ResourceStore | undefined, content: string, params: {
@@ -39,6 +38,12 @@ export declare function buildResourceLink(params: {
     description?: string;
     expiresAt?: string;
 }): ContentBlock;
+export declare function buildStructuredError(error: unknown, defaultCode: ErrorCode, path?: string): {
+    code: ErrorCode;
+    message: string;
+    path?: string;
+    suggestion?: string;
+};
 export declare function buildToolResponse<T>(text: string, structuredContent: T, extraContent?: ContentBlock[]): {
     content: ContentBlock[];
     structuredContent: T;
@@ -95,6 +100,7 @@ export declare function buildFileInfoPayload(info: FileInfo): FileInfoPayload;
 interface ToolExecutionOptions<T> {
     toolName: string;
     extra: ToolExtra;
+    outputSchema?: z.ZodType<T>;
     run: (signal: AbortSignal | undefined) => ToolResponse<T> | Promise<ToolResponse<T>>;
     onError: (error: unknown) => ToolResult<T>;
     context?: Record<string, unknown>;
@@ -114,7 +120,7 @@ export declare function notifyProgress(extra: ToolExtra, progress: {
     total?: number;
     message?: string;
 }): void;
-export interface ToolProgressSession {
+interface ToolProgressSession {
     update: (progress: {
         current: number;
         total?: number;
@@ -125,7 +131,7 @@ export interface ToolProgressSession {
     fail: (message: string, minimumCurrent?: number) => void;
     getCurrent: () => number;
 }
-export interface BatchProgressCallbacks {
+interface BatchProgressCallbacks {
     progress: ToolProgressSession;
     onItemComplete: () => void;
 }
@@ -155,6 +161,7 @@ export declare function resolvePathOrRoot(pathValue: string | undefined): string
 export declare function encodeOffsetCursor(offset: number): string;
 export declare function decodeOffsetCursor(cursor: string): number;
 export declare function buildBatchPathContext(paths: readonly string[], unitLabel?: string): string;
+export declare function truncateProgressPattern(pattern: string, maxLength?: number): string;
 export declare function buildBatchCompletionSuffix(summary: {
     total?: number;
     failed?: number;