@j0hanz/filesystem-mcp 1.17.1 → 1.19.0

package/dist/tools/read-multiple.js

@@ -1,13 +1,12 @@
 import { basename } from 'node:path';
 import { DEFAULT_SEARCH_TIMEOUT_MS } from '../lib/constants.js';
-import { ErrorCode } from '../lib/errors.js';
+import { classifyError, ErrorCode } from '../lib/errors.js';
 import { readMultipleFiles } from '../lib/file-operations/metadata.js';
 import { ReadMultipleFilesInputSchema, ReadMultipleFilesOutputSchema, } from '../schemas.js';
 import { FILE_READ_ICONS } from './icons.js';
-import { buildBatchCompletionSuffix, buildBatchPathContext, buildResourceLink, buildStructuredError, buildToolErrorResponse, buildToolResponse, createBatchProgressCallbacks, executeToolWithDiagnostics, maybeExternalizeTextContent, READ_ONLY_TOOL_ANNOTATIONS, resolveFinalProgressCurrent, } from './shared.js';
-import { registerStandardTool } from './task-support.js';
+import { buildBatchPathContext, buildResourceLink, buildStructuredError, buildToolErrorResponse, buildToolResponse, createBatchProgressCallbacks, executeToolWithDiagnostics, maybeExternalizeTextContent, READ_ONLY_TOOL_ANNOTATIONS, resolveFinalProgressCurrent, } from './shared.js';
+import { registerStandardTool, reportTaskStatus } from './task-support.js';
 const READ_MANY_TOOL_NAME = 'read_many';
-const READ_MANY_TOOL_LABEL = '🕮 read_many';
 const FULL_FILE_CONTENTS_DESCRIPTION = 'Full file contents';
 export const READ_MANY_TOOL = {
     name: READ_MANY_TOOL_NAME,
@@ -20,6 +19,7 @@ export const READ_MANY_TOOL = {
     icons: FILE_READ_ICONS,
     taskSupport: 'optional',
 };
+const READ_MANY_TOOL_LABEL = READ_MANY_TOOL.title;
 function buildReadManyResourceName(filePath) {
     return `read:${basename(filePath)}`;
 }
@@ -173,23 +173,30 @@ export function registerReadMultipleFilesTool(server, options = {}) {
             context: { path: primaryPath },
             run: async (signal) => {
                 const context = buildBatchPathContext(args.paths, 'files');
-                const { progress, onItemComplete } = createBatchProgressCallbacks(ctx, {
+                const { progress, onItemComplete: rawOnItemComplete } = createBatchProgressCallbacks(ctx, {
                     toolLabel: READ_MANY_TOOL_LABEL,
                     context,
                     totalItems: args.paths.length,
                     itemVerb: 'read',
                 });
+                let itemsDone = 0;
+                const onItemComplete = () => {
+                    rawOnItemComplete();
+                    itemsDone++;
+                    void reportTaskStatus(`${READ_MANY_TOOL_LABEL}: ${context} [${itemsDone}/${args.paths.length} read]`);
+                };
                 try {
                     const result = await handleReadMultipleFiles(args, signal, options.resourceStore, onItemComplete);
                     const sc = result.structuredContent;
-                    const suffix = buildBatchCompletionSuffix(sc.summary, 'files read', 'file read');
                     const total = sc.summary?.total ?? 0;
+                    const failed = sc.summary?.failed ?? 0;
+                    const suffix = failed ? `${failed} failed` : 'done';
                     const finalCurrent = resolveFinalProgressCurrent(progress, total);
                     progress.complete(`${READ_MANY_TOOL_LABEL}: ${context} • ${suffix}`, finalCurrent);
                     return result;
                 }
                 catch (error) {
-                    progress.fail(`${READ_MANY_TOOL_LABEL}: ${context} • failed`);
+                    progress.fail(`${READ_MANY_TOOL_LABEL}: ${context} • ${classifyError(error)}`);
                     throw error;
                 }
             },

package/dist/tools/read.js

@@ -22,7 +22,7 @@ export const READ_FILE_TOOL = {
     taskSupport: 'forbidden',
 };
 const READ_TOOL_NAME = 'read';
-const READ_TOOL_LABEL = '🕮 read';
+const READ_TOOL_LABEL = READ_FILE_TOOL.title;
 const FULL_FILE_CONTENTS_DESCRIPTION = 'Full file contents';
 function buildReadResourceName(filePath) {
     return `read:${basename(filePath)}`;
@@ -114,7 +114,7 @@ function buildReadProgressMessage(args) {
 function buildReadCompletionMessage(args, result) {
     const name = basename(args.path);
     if (result.isError)
-        return `${READ_TOOL_LABEL}: ${name} • failed`;
+        return `${READ_TOOL_LABEL}: ${name} • ${result.errorCode}`;
     const structured = result.structuredContent;
     const lines = structured.linesRead ?? structured.totalLines;
     if (structured.startLine !== undefined) {

package/dist/tools/replace-in-files.js

@@ -4,7 +4,7 @@ import { basename, relative } from 'node:path';
 import { createTwoFilesPatch } from 'diff';
 import RE2 from 're2';
 import { DEFAULT_EXCLUDE_PATTERNS, MAX_TEXT_FILE_SIZE, PARALLEL_CONCURRENCY, } from '../lib/constants.js';
-import { ErrorCode, formatUnknownErrorMessage, McpError, } from '../lib/errors.js';
+import { classifyError, ErrorCode, formatUnknownErrorMessage, McpError, } from '../lib/errors.js';
 import { globEntries } from '../lib/file-operations/traversal.js';
 import { atomicWriteFile } from '../lib/fs-helpers.js';
 import { Logger } from '../lib/logger.js';
@@ -340,12 +340,12 @@ export function registerSearchAndReplaceTool(server, options = {}) {
             const dryLabel = args.dryRun ? ' [dry run]' : '';
             const truncatedPattern = truncateProgressPattern(args.searchPattern);
             const context = `"${truncatedPattern}" in ${args.filePattern}${dryLabel}`;
-            const progress = createToolProgressSession(ctx, `🛠 replace: ${context}`);
+            const progress = createToolProgressSession(ctx, `${SEARCH_AND_REPLACE_TOOL.title}: ${context}`);
             const progressWithMessage = ({ current, total, }) => {
                 progress.update({
                     current,
                     ...(total !== undefined ? { total } : {}),
-                    message: `🛠 replace: ${truncatedPattern} [${current} files]`,
+                    message: `${SEARCH_AND_REPLACE_TOOL.title}: ${truncatedPattern} [${current} files]`,
                 });
             };
             try {
@@ -357,14 +357,14 @@ export function registerSearchAndReplaceTool(server, options = {}) {
                 let endSuffix = `${sc.matches ?? 0} ${matchWord} in ${sc.filesChanged ?? 0} ${fileWord}`;
                 if (sc.failedFiles)
                     endSuffix += `, ${sc.failedFiles} failed`;
-                progress.complete(`🛠 replace: ${context} • ${endSuffix}`, finalCurrent);
+                progress.complete(`${SEARCH_AND_REPLACE_TOOL.title}: ${context} • ${endSuffix}`, finalCurrent);
                 if (!args.dryRun) {
                     void ctx.log?.('info', `search_and_replace: ${String(sc.matches ?? 0)} matches in ${String(sc.filesChanged ?? 0)} files`);
                 }
                 return result;
             }
             catch (error) {
-                progress.fail(`🛠 replace: ${context} • failed`);
+                progress.fail(`${SEARCH_AND_REPLACE_TOOL.title}: ${context} • ${classifyError(error)}`);
                 throw error;
             }
         },

package/dist/tools/roots.js

@@ -41,13 +41,13 @@ export function registerListAllowedDirectoriesTool(server, options = {}) {
         onError: (error) => buildToolErrorResponse(error, ErrorCode.UNKNOWN),
     });
     registerStandardTool(server, LIST_ALLOWED_DIRECTORIES_TOOL, handler, options, {
-        progressMessage: () => '≣ roots',
+        progressMessage: () => LIST_ALLOWED_DIRECTORIES_TOOL.title,
         completionMessage: (_args, result) => {
             if (result.isError)
-                return `≣ roots • failed`;
+                return `${LIST_ALLOWED_DIRECTORIES_TOOL.title} • ${result.errorCode}`;
             const sc = result.structuredContent;
             const count = sc.directories?.length ?? 0;
-            return `≣ roots • ${count} ${count === 1 ? 'root' : 'roots'}`;
+            return `${LIST_ALLOWED_DIRECTORIES_TOOL.title} • ${count} ${count === 1 ? 'root' : 'roots'}`;
         },
     });
 }

package/dist/tools/search-content.js

@@ -1,13 +1,13 @@
 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 { classifyError, 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 { SEARCH_ICONS } from './icons.js';
 import { buildResourceLink, buildToolErrorResponse, buildToolResponse, createToolProgressSession, executeToolWithDiagnostics, READ_ONLY_TOOL_ANNOTATIONS, resolveFinalProgressCurrent, resolvePathOrRoot, truncateProgressPattern, } from './shared.js';
-import { registerStandardTool } from './task-support.js';
+import { registerStandardTool, reportTaskStatus } from './task-support.js';
 /**
  * Configuration constants for the Search Content tool.
  */
@@ -268,7 +268,7 @@ export function registerSearchContentTool(server, options = {}) {
         context: { path: args.path ?? '.' },
         run: async (signal) => {
             const { pattern, filePattern: scope } = args;
-            const progressLabel = `🔎︎ grep: ${truncateProgressPattern(pattern)}`;
+            const progressLabel = `${SEARCH_CONTENT_TOOL.title}: ${truncateProgressPattern(pattern)}`;
             const progress = createToolProgressSession(ctx, progressLabel);
             const progressWithMessage = ({ current, total, }) => {
                 progress.update({
@@ -276,6 +276,7 @@ export function registerSearchContentTool(server, options = {}) {
                     ...(total !== undefined ? { total } : {}),
                     message: `${progressLabel} [${current} files]`,
                 });
+                void reportTaskStatus(`${progressLabel} ${current} files`);
             };
             try {
                 const result = await handleSearchContent(args, signal, options.resourceStore, progressWithMessage);
@@ -287,7 +288,7 @@ export function registerSearchContentTool(server, options = {}) {
                 return result;
             }
             catch (error) {
-                progress.fail(`${progressLabel} • failed`);
+                progress.fail(`${progressLabel} • ${classifyError(error)}`);
                 throw error;
             }
         },

package/dist/tools/search-files.js

@@ -1,6 +1,6 @@
 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 { classifyError, 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';
@@ -126,7 +126,7 @@ export function registerSearchFilesTool(server, options = {}) {
             let progressCursor = 0;
             notifyProgress(ctx, {
                 current: 0,
-                message: `🔎︎ find: ${truncatedPattern}`,
+                message: `${SEARCH_FILES_TOOL.title}: ${truncatedPattern}`,
             });
             const baseReporter = createProgressReporter(ctx);
             const progressWithMessage = ({ current, total, }) => {
@@ -135,7 +135,7 @@ export function registerSearchFilesTool(server, options = {}) {
                 baseReporter({
                     current,
                     ...(total !== undefined ? { total } : {}),
-                    message: `🔎︎ find: ${truncatedPattern} [${current} files]`,
+                    message: `${SEARCH_FILES_TOOL.title}: ${truncatedPattern} [${current} files]`,
                 });
             };
             try {
@@ -162,7 +162,7 @@ export function registerSearchFilesTool(server, options = {}) {
                 notifyProgress(ctx, {
                     current: finalCurrent,
                     total: finalCurrent,
-                    message: `🔎︎ find: ${context} • ${suffix}`,
+                    message: `${SEARCH_FILES_TOOL.title}: ${context} • ${suffix}`,
                 });
                 return result;
             }
@@ -171,7 +171,7 @@ export function registerSearchFilesTool(server, options = {}) {
                 notifyProgress(ctx, {
                     current: finalCurrent,
                     total: finalCurrent,
-                    message: `🔎︎ find: ${context} • failed`,
+                    message: `${SEARCH_FILES_TOOL.title}: ${context} • ${classifyError(error)}`,
                 });
                 throw error;
             }

package/dist/tools/shared.d.ts

@@ -1,4 +1,4 @@
-import type { ContentBlock, Icon, LoggingLevel, ProgressNotificationParams, ServerContext } from '@modelcontextprotocol/server';
+import type { ContentBlock, Icon, LoggingLevel, Notification, RequestMeta, ServerContext } from '@modelcontextprotocol/server';
 import { z } from 'zod';
 import { ErrorCode } from '../lib/errors.js';
 import type { ResourceStore } from '../lib/resource-store.js';
@@ -56,25 +56,27 @@ export type ToolResponse<T> = ReturnType<typeof buildToolResponse<T>> & {
 interface ToolErrorResponse extends Record<string, unknown> {
     content: ContentBlock[];
     isError: true;
-    errorCode?: ErrorCode;
+    errorCode: ErrorCode;
 }
 export type ToolResult<T> = ToolResponse<T> | ToolErrorResponse;
 export declare function withValidatedArgs<Args, Result>(schema: z.ZodType<Args>, handler: (args: Args, ctx: ToolContext) => Promise<ToolResult<Result>>): (args: unknown, ctx: ToolContext | ServerContext) => Promise<ToolResult<Result>>;
-type ProgressToken = string | number;
+/**
+ * App-level tracing metadata passed through {@linkcode RequestMeta}.
+ * These fields are preserved by the SDK's loose `RequestMeta` type.
+ */
+interface TracingMeta {
+    traceparent?: string | undefined;
+    tracestate?: string | undefined;
+    baggage?: string | undefined;
+}
 export interface ToolContext {
     signal?: AbortSignal;
-    _meta?: {
-        progressToken?: ProgressToken | undefined;
-        traceparent?: string | undefined;
-        tracestate?: string | undefined;
-        baggage?: string | undefined;
-    } | undefined;
-    sendNotification?: (notification: {
-        method: 'notifications/progress';
-        params: ProgressNotificationParams;
-    }) => Promise<void>;
+    sessionId?: string;
+    _meta?: (RequestMeta & TracingMeta) | undefined;
+    sendNotification?: (notification: Notification) => Promise<void>;
     log?: (level: LoggingLevel, data: unknown, logger?: string) => Promise<void>;
 }
+export declare function toToolContext(ctx?: ToolContext | ServerContext): ToolContext;
 export interface IconInfo {
     src: string;
     mimeType: string;
@@ -168,8 +170,3 @@ 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;
-    succeeded?: number;
-} | undefined, successWord: string, singularWord?: string): string;

package/dist/tools/shared.js

@@ -3,7 +3,7 @@ import { basename } from 'node:path';
 import { z } from 'zod';
 import { createTimedAbortSignal } from '../lib/abort.js';
 import { parseTrueEnvFlag } from '../lib/constants.js';
-import { createDetailedError, ErrorCode, formatDetailedError, getSuggestion, McpError, } from '../lib/errors.js';
+import { classifyError, createDetailedError, ErrorCode, formatDetailedError, getSuggestion, McpError, } from '../lib/errors.js';
 import { Logger } from '../lib/logger.js';
 import { withToolDiagnostics, } from '../lib/observability.js';
 import { getAllowedDirectories } from '../lib/paths.js';
@@ -223,20 +223,18 @@ export function withValidatedArgs(schema, handler) {
         }
     };
 }
-function toToolContext(ctx) {
+export function toToolContext(ctx) {
     if (!ctx)
         return {};
     if ('mcpReq' in ctx) {
         return {
             signal: ctx.mcpReq.signal,
+            ...(ctx.sessionId ? { sessionId: ctx.sessionId } : {}),
             ...(ctx.mcpReq._meta
                 ? { _meta: ctx.mcpReq._meta }
                 : {}),
             sendNotification: async (notification) => ctx.mcpReq.notify(notification),
-            log: async (level, data, logger) => ctx.mcpReq.notify({
-                method: 'notifications/message',
-                params: { level, data, ...(logger ? { logger } : {}) },
-            }),
+            log: async (level, data, logger) => ctx.mcpReq.log(level, data, logger),
         };
     }
     return ctx;
@@ -509,7 +507,7 @@ async function withProgress(message, ctx, run, getCompletionMessage) {
         void reportProgress(ctx, {
             current: total,
             total,
-            message: `${message} • failed`,
+            message: `${message} • ${classifyError(error)}`,
         });
         throw error;
     }
@@ -599,13 +597,3 @@ export function truncateProgressPattern(pattern, maxLength = 40) {
     }
     return `${pattern.slice(0, maxLength)}…`;
 }
-export function buildBatchCompletionSuffix(summary, successWord, singularWord) {
-    const total = summary?.total ?? 0;
-    const failed = summary?.failed ?? 0;
-    const succeeded = summary?.succeeded ?? 0;
-    if (failed) {
-        return `${succeeded}/${total} ${successWord}, ${failed} failed`;
-    }
-    const word = total === 1 && singularWord ? singularWord : successWord;
-    return `${total} ${word}`;
-}

package/dist/tools/stat-many.js

@@ -1,10 +1,10 @@
 import { DEFAULT_SEARCH_TIMEOUT_MS } from '../lib/constants.js';
-import { ErrorCode } from '../lib/errors.js';
+import { classifyError, ErrorCode } from '../lib/errors.js';
 import { getMultipleFileInfo } from '../lib/file-operations/metadata.js';
 import { formatBytes, joinLines } from '../config.js';
 import { GetMultipleFileInfoInputSchema, GetMultipleFileInfoOutputSchema, } from '../schemas.js';
 import { FILE_READ_ICONS } from './icons.js';
-import { buildBatchCompletionSuffix, buildBatchPathContext, buildFileInfoPayload, buildStructuredError, buildToolErrorResponse, buildToolResponse, createBatchProgressCallbacks, executeToolWithDiagnostics, READ_ONLY_TOOL_ANNOTATIONS, resolveFinalProgressCurrent, } from './shared.js';
+import { buildBatchPathContext, buildFileInfoPayload, buildStructuredError, buildToolErrorResponse, buildToolResponse, createBatchProgressCallbacks, executeToolWithDiagnostics, READ_ONLY_TOOL_ANNOTATIONS, resolveFinalProgressCurrent, } from './shared.js';
 import { registerStandardTool } from './task-support.js';
 export const GET_MULTIPLE_FILE_INFO_TOOL = {
     name: 'stat_many',
@@ -77,7 +77,7 @@ export function registerGetMultipleFileInfoTool(server, options = {}) {
             run: async (signal) => {
                 const context = buildBatchPathContext(args.paths);
                 const { progress, onItemComplete } = createBatchProgressCallbacks(ctx, {
-                    toolLabel: '🕮 stat_many',
+                    toolLabel: GET_MULTIPLE_FILE_INFO_TOOL.title,
                     context,
                     totalItems: args.paths.length,
                     itemVerb: 'done',
@@ -85,14 +85,15 @@ export function registerGetMultipleFileInfoTool(server, options = {}) {
                 try {
                     const result = await handleGetMultipleFileInfo(args, signal, onItemComplete);
                     const sc = result.structuredContent;
-                    const suffix = buildBatchCompletionSuffix(sc.summary, 'OK');
                     const total = sc.summary?.total ?? 0;
+                    const failed = sc.summary?.failed ?? 0;
+                    const suffix = failed ? `${failed} failed` : 'done';
                     const finalCurrent = resolveFinalProgressCurrent(progress, total);
-                    progress.complete(`🕮 stat_many: ${context} • ${suffix}`, finalCurrent);
+                    progress.complete(`${GET_MULTIPLE_FILE_INFO_TOOL.title}: ${context} • ${suffix}`, finalCurrent);
                     return result;
                 }
                 catch (error) {
-                    progress.fail(`🕮 stat_many: ${context} • failed`);
+                    progress.fail(`${GET_MULTIPLE_FILE_INFO_TOOL.title}: ${context} • ${classifyError(error)}`);
                     throw error;
                 }
             },

package/dist/tools/stat.js

@@ -53,15 +53,15 @@ export function registerGetFileInfoTool(server, options = {}) {
         onError: (error) => buildToolErrorResponse(error, ErrorCode.NOT_FOUND, args.path),
     });
     registerStandardTool(server, GET_FILE_INFO_TOOL, handler, options, {
-        progressMessage: (args) => `🕮 stat: ${basename(args.path)}`,
+        progressMessage: (args) => `${GET_FILE_INFO_TOOL.title}: ${basename(args.path)}`,
         completionMessage: (args, result) => {
             const name = basename(args.path);
             if (result.isError)
-                return `🕮 stat: ${name} • failed`;
+                return `${GET_FILE_INFO_TOOL.title}: ${name} • ${result.errorCode}`;
             const sc = result.structuredContent;
             if (!sc.info)
-                return `🕮 stat: ${name} • failed`;
-            return `🕮 stat: ${sc.info.name} • ${sc.info.type}, ${formatBytes(sc.info.size)}`;
+                return `${GET_FILE_INFO_TOOL.title}: ${name} • failed`;
+            return `${GET_FILE_INFO_TOOL.title}: ${sc.info.name} • ${formatBytes(sc.info.size)}`;
         },
     });
 }

package/dist/tools/task-support.d.ts

@@ -1,5 +1,10 @@
 import { type McpServer, type RequestTaskStore, type StandardSchemaWithJSON, type ToolTaskHandler } from '@modelcontextprotocol/server';
 import { type IconInfo, type ToolContext, type ToolContract, type ToolRegistrationOptions, type ToolResult } from './shared.js';
+/**
+ * Report an intermediate 'working' status update for the current task.
+ * No-op when called outside of a task context.
+ */
+export declare function reportTaskStatus(statusMessage: string): Promise<void>;
 type TaskToolContext = ToolContext & {
     taskId?: string;
     taskStore?: RequestTaskStore;