@j0hanz/filesystem-mcp 1.13.2 → 1.14.1

package/dist/tools/search-content.js

@@ -1,9 +1,8 @@
-import * as path from 'node:path';
-import { performance } from 'node:perf_hooks';
+import { relative } from 'node:path';
 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 { 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, truncateProgressPattern, withDefaultIcons, withValidatedArgs, wrapToolHandler, } from './shared.js';
@@ -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,34 +50,15 @@ 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)
-        return fileCompare;
-    if (left.line !== right.line)
-        return left.line - right.line;
-    return left.index - right.index;
-}
-function buildSearchPreviewState(matches, payloads) {
-    const needsExternalize = matches.length > CONFIG.MAX_INLINE_MATCHES;
+function buildSearchPreviewState(payloads) {
+    const needsExternalize = payloads.length > CONFIG.MAX_INLINE_MATCHES;
     const visibleCount = needsExternalize
         ? CONFIG.MAX_INLINE_MATCHES
-        : matches.length;
-    const visibleMatches = matches.slice(0, visibleCount);
+        : payloads.length;
     return {
         needsExternalize,
-        visibleMatches,
         visiblePayloads: payloads.slice(0, visibleCount),
-        heading: SearchResponseBuilder.buildHeading(matches.length, visibleMatches.length),
+        heading: buildHeading(payloads.length, visibleCount),
     };
 }
 export const SEARCH_CONTENT_TOOL = {
@@ -94,188 +72,166 @@ 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) }
+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 buildSortedPayloads(result, context) {
+    const relativeByFile = new Map();
+    const getRelativeFile = (file) => {
+        const cached = relativeByFile.get(file);
+        if (cached !== undefined)
+            return cached;
+        const rel = relative(result.basePath, file);
+        relativeByFile.set(file, rel);
+        return rel;
+    };
+    const payloads = result.matches.map((match, originalIndex) => {
+        const relFile = getRelativeFile(match.file);
+        const column = findColumnOffset(match.content, context);
+        const payload = {
+            file: relFile,
+            line: match.line,
+            ...(column !== undefined ? { column } : {}),
+            content: match.content,
+            matchCount: match.matchCount,
+            ...(match.contextBefore
+                ? { contextBefore: [...match.contextBefore] }
                 : {}),
+            ...(match.contextAfter ? { contextAfter: [...match.contextAfter] } : {}),
         };
-        return text + formatOperationSummary(summaryOpts);
-    },
-    buildStructured(summary, matches, options) {
-        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;
-        };
-        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})`;
+        return { payload, originalIndex };
+    });
+    payloads.sort((left, right) => {
+        const fileCompare = left.payload.file.localeCompare(right.payload.file);
+        if (fileCompare !== 0)
+            return fileCompare;
+        if (left.payload.line !== right.payload.line)
+            return left.payload.line - right.payload.line;
+        return left.originalIndex - right.originalIndex;
+    });
+    return payloads.map((p) => p.payload);
+}
+function buildMatchList(heading, matches) {
+    if (matches.length === 0)
+        return heading;
+    const parts = [heading];
+    for (const match of matches) {
+        parts.push(`\n  ${match.file}:${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.INVALID_PATTERN, `Invalid regex pattern: ${formatUnknownErrorMessage(error)} (RE2: no lookahead/lookbehind/backrefs)`);
         }
-    },
-    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.INVALID_PATTERN, `Invalid regex pattern: ${formatUnknownErrorMessage(error)} (RE2: no lookahead/lookbehind/backrefs)`);
+    }
+}
+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 preview = buildSearchPreviewState(normalizedMatches, matchPayloads);
+    const regexMatcher = createSearchMatcher(args);
+    const result = await executeSearch(args, basePath, signal, onProgress);
+    const searchContext = createSearchContext(args, regexMatcher);
+    const matchPayloads = buildSortedPayloads(result, searchContext);
+    const fullStructured = buildSearchStructured(result.summary, matchPayloads);
+    const preview = buildSearchPreviewState(matchPayloads);
     if (resourceStore && preview.needsExternalize) {
         const previewStructured = {
             ...fullStructured,
@@ -288,7 +244,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.visiblePayloads);
         return buildToolResponse(text, previewStructured, [
             buildResourceLink({
                 uri: entry.uri,
@@ -299,13 +255,14 @@ async function handleSearchContent(args, signal, resourceStore, onProgress) {
             }),
         ]);
     }
-    const text = SearchResponseBuilder.buildText(preview.heading, preview.visibleMatches, result.summary);
+    const text = buildSearchText(preview.heading, preview.visiblePayloads, 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;
@@ -321,10 +278,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;
@@ -334,7 +289,7 @@ export function registerSearchContentTool(server, options = {}) {
                 throw error;
             }
         },
-        onError: (error) => buildToolErrorResponse(error, ErrorCode.E_UNKNOWN, args.path ?? '.'),
+        onError: (error) => buildToolErrorResponse(error, ErrorCode.UNKNOWN, args.path ?? '.'),
     });
     const { isInitialized } = options;
     const wrappedHandler = wrapToolHandler(handler, {

package/dist/tools/search-files.js

@@ -1,4 +1,4 @@
-import * as path from 'node:path';
+import { basename, relative } from 'node:path';
 import { DEFAULT_EXCLUDE_PATTERNS, DEFAULT_SEARCH_TIMEOUT_MS, } from '../lib/constants.js';
 import { ErrorCode } from '../lib/errors.js';
 import { searchFiles } from '../lib/file-operations/search.js';
@@ -14,12 +14,45 @@ 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',
 };
+function buildTruncatedReason(summary) {
+    if (!summary.truncated)
+        return undefined;
+    if (summary.stoppedReason === 'timeout')
+        return 'timeout';
+    if (summary.stoppedReason === 'maxFiles')
+        return `max files (${summary.filesScanned})`;
+    return `max results (${summary.matched})`;
+}
+function buildRelativeResults(basePath, displayResults) {
+    const relativeResults = [];
+    for (const entry of displayResults) {
+        relativeResults.push({
+            path: relative(basePath, entry.path),
+            size: entry.size,
+            modified: entry.modified?.toISOString(),
+        });
+    }
+    return relativeResults;
+}
+function computeNextCursor(summary, displayResultsCount, cursorOffset) {
+    if (summary.truncated && displayResultsCount > 0) {
+        return encodeOffsetCursor(cursorOffset + displayResultsCount);
+    }
+    return undefined;
+}
+function applySummaryFields(structured, summary, nextCursor) {
+    if (summary.truncated)
+        structured.truncated = true;
+    if (summary.skippedInaccessible)
+        structured.skippedInaccessible = summary.skippedInaccessible;
+    if (summary.stoppedReason)
+        structured.stoppedReason = summary.stoppedReason;
+    if (nextCursor !== undefined)
+        structured.nextCursor = nextCursor;
+}
 async function handleSearchFiles(args, signal, onProgress) {
     const basePath = resolvePathOrRoot(args.path);
     const excludePatterns = args.includeIgnored ? [] : DEFAULT_EXCLUDE_PATTERNS;
@@ -31,58 +64,34 @@ async function handleSearchFiles(args, signal, onProgress) {
         includeHidden: args.includeHidden,
         sortBy: args.sortBy,
         respectGitignore: !args.includeIgnored,
-        ...(args.maxDepth !== undefined ? { maxDepth: args.maxDepth } : {}),
-        ...(onProgress ? { onProgress } : {}),
-        ...(signal ? { signal } : {}),
     };
+    if (args.maxDepth !== undefined)
+        searchOptions.maxDepth = args.maxDepth;
+    if (onProgress)
+        searchOptions.onProgress = onProgress;
+    if (signal)
+        searchOptions.signal = signal;
     const result = await searchFiles(basePath, args.pattern, excludePatterns, searchOptions);
     const allResults = result.results;
-    const displayResults = cursorOffset > 0 ? allResults.slice(cursorOffset) : allResults;
-    const nextCursor = result.summary.truncated && displayResults.length > 0
-        ? encodeOffsetCursor(cursorOffset + displayResults.length)
-        : undefined;
-    const relativeResults = [];
-    for (const entry of displayResults) {
-        relativeResults.push({
-            path: path.relative(result.basePath, entry.path),
-            size: entry.size,
-            modified: entry.modified?.toISOString(),
-        });
-    }
+    let displayResults = allResults;
+    if (cursorOffset > 0)
+        displayResults = allResults.slice(cursorOffset);
+    const nextCursor = computeNextCursor(result.summary, displayResults.length, cursorOffset);
+    const relativeResults = buildRelativeResults(result.basePath, displayResults);
     const structured = {
         ok: true,
         root: basePath,
-        pattern: args.pattern,
         results: relativeResults,
         totalMatches: result.summary.matched,
         filesScanned: result.summary.filesScanned,
-        ...(result.summary.truncated
-            ? { truncated: result.summary.truncated }
-            : {}),
-        ...(result.summary.skippedInaccessible
-            ? { skippedInaccessible: result.summary.skippedInaccessible }
-            : {}),
-        ...(result.summary.stoppedReason
-            ? { stoppedReason: result.summary.stoppedReason }
-            : {}),
-        ...(nextCursor !== undefined ? { nextCursor } : {}),
     };
-    let truncatedReason;
-    if (result.summary.truncated) {
-        if (result.summary.stoppedReason === 'timeout') {
-            truncatedReason = 'timeout';
-        }
-        else if (result.summary.stoppedReason === 'maxFiles') {
-            truncatedReason = `max files (${result.summary.filesScanned})`;
-        }
-        else {
-            truncatedReason = `max results (${result.summary.matched})`;
-        }
-    }
+    applySummaryFields(structured, result.summary, nextCursor);
+    const truncatedReason = buildTruncatedReason(result.summary);
     const summaryOptions = {
         truncated: result.summary.truncated,
-        ...(truncatedReason ? { truncatedReason } : {}),
     };
+    if (truncatedReason)
+        summaryOptions.truncatedReason = truncatedReason;
     const textLines = [];
     if (relativeResults.length === 0) {
         textLines.push('No matches');
@@ -103,10 +112,11 @@ 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 rawScopeLabel = args.path ? basename(args.path) : '.';
             const scopeLabel = rawScopeLabel || '.';
             const { pattern } = args;
             const truncatedPattern = truncateProgressPattern(pattern);
@@ -129,14 +139,13 @@ export function registerSearchFilesTool(server, options = {}) {
             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]';
                     }
@@ -165,7 +174,7 @@ export function registerSearchFilesTool(server, options = {}) {
                 throw error;
             }
         },
-        onError: (error) => buildToolErrorResponse(error, ErrorCode.E_UNKNOWN, args.path),
+        onError: (error) => buildToolErrorResponse(error, ErrorCode.UNKNOWN, args.path),
     });
     const { isInitialized } = options;
     const wrappedHandler = wrapToolHandler(handler, {

package/dist/tools/shared.d.ts

@@ -38,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;
@@ -57,6 +63,9 @@ export interface ToolExtra {
     signal?: AbortSignal;
     _meta?: {
         progressToken?: ProgressToken | undefined;
+        traceparent?: string | undefined;
+        tracestate?: string | undefined;
+        baggage?: string | undefined;
     };
     sendNotification?: (notification: {
         method: 'notifications/progress';
@@ -94,6 +103,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>;