@wonderwhy-er/desktop-commander 0.2.43 → 0.2.45

package/dist/tools/edit.js

@@ -82,7 +82,7 @@ function getCharacterCodeData(expected, actual) {
         diffLength: fullDiff.length
     };
 }
-export async function performSearchReplace(filePath, block, expectedReplacements = 1) {
+export async function performSearchReplace(filePath, block, expectedReplacements = 1, origin) {
     // Get file extension for telemetry using path module
     const fileExtension = path.extname(filePath).toLowerCase();
     // Capture file extension and string sizes in telemetry without capturing the file path
@@ -176,13 +176,18 @@ RECOMMENDATION: For large search/replace operations, consider breaking them into
                     type: "text",
                     text: `${statusLine}${previewContent}`
                 }],
-            structuredContent: {
-                fileName: path.basename(resolvedEditPath),
-                filePath: resolvedEditPath,
-                fileType: resolvePreviewFileType(resolvedEditPath),
-                sourceTool: 'edit_block',
-                ...await getDefaultEditorMetadata(resolvedEditPath),
-            },
+            // structuredContent only travels on widget-initiated calls: it is the
+            // widget's save-success signal (assertSuccessfulEditBlockResult) and
+            // metadata source. LLM-facing responses don't need it — nothing there
+            // consumes it, and the widget re-reads by path instead.
+            ...(origin === 'ui' ? {
+                structuredContent: {
+                    fileName: path.basename(resolvedEditPath),
+                    filePath: resolvedEditPath,
+                    fileType: resolvePreviewFileType(resolvedEditPath),
+                    ...await getDefaultEditorMetadata(resolvedEditPath),
+                },
+            } : {}),
         };
     }
     // If exact match found but count doesn't match expected, inform the user
@@ -367,13 +372,14 @@ export async function handleEditBlock(args) {
                             type: "text",
                             text: `Successfully updated range ${parsed.range} in ${parsed.file_path}`
                         }],
-                    structuredContent: {
-                        fileName: path.basename(resolvedRangePath),
-                        filePath: resolvedRangePath,
-                        fileType: resolvePreviewFileType(resolvedRangePath),
-                        sourceTool: 'edit_block',
-                        ...await getDefaultEditorMetadata(resolvedRangePath),
-                    },
+                    ...(parsed.origin === 'ui' ? {
+                        structuredContent: {
+                            fileName: path.basename(resolvedRangePath),
+                            filePath: resolvedRangePath,
+                            fileType: resolvePreviewFileType(resolvedRangePath),
+                            ...await getDefaultEditorMetadata(resolvedRangePath),
+                        },
+                    } : {}),
                 };
             }
             catch (error) {
@@ -404,13 +410,14 @@ export async function handleEditBlock(args) {
                             type: "text",
                             text: `Successfully applied ${result.editsApplied} edit(s) to ${parsed.file_path}`
                         }],
-                    structuredContent: {
-                        fileName: path.basename(resolvedEditRangePath),
-                        filePath: resolvedEditRangePath,
-                        fileType: resolvePreviewFileType(resolvedEditRangePath),
-                        sourceTool: 'edit_block',
-                        ...await getDefaultEditorMetadata(resolvedEditRangePath),
-                    },
+                    ...(parsed.origin === 'ui' ? {
+                        structuredContent: {
+                            fileName: path.basename(resolvedEditRangePath),
+                            filePath: resolvedEditRangePath,
+                            fileType: resolvePreviewFileType(resolvedEditRangePath),
+                            ...await getDefaultEditorMetadata(resolvedEditRangePath),
+                        },
+                    } : {}),
                 };
             }
             const errorMsg = result.errors?.map(e => e.error).join('; ') || 'Unknown error';
@@ -424,5 +431,5 @@ export async function handleEditBlock(args) {
     return performSearchReplace(parsed.file_path, {
         search: parsed.old_string,
         replace: parsed.new_string
-    }, parsed.expected_replacements);
+    }, parsed.expected_replacements, parsed.origin);
 }

package/dist/tools/filesystem.d.ts

@@ -1,5 +1,6 @@
 import type { ReadOptions, FileResult, PdfPageItem } from '../utils/files/base.js';
 import { PdfOperations, PdfMetadata } from './pdf/index.js';
+export declare const READ_OPERATION_TIMEOUT_MS: number;
 /**
  * Validates a path to ensure it can be accessed or created.
  * For existing paths, returns the real path (resolving symlinks).

package/dist/tools/filesystem.js

@@ -5,7 +5,7 @@ import fetch from 'cross-fetch';
 import { execFile } from 'child_process';
 import { promisify } from 'util';
 import { capture } from '../utils/capture.js';
-import { withTimeout } from '../utils/withTimeout.js';
+import { withTimeout, runWithAbortableTimeout } from '../utils/withTimeout.js';
 import { configManager } from '../config-manager.js';
 import { getFileHandler, TextFileHandler } from '../utils/files/index.js';
 import { isPdfFile } from "./mime-types.js";
@@ -16,6 +16,13 @@ const FILE_OPERATION_TIMEOUTS = {
     URL_FETCH: 30000, // 30 seconds
     FILE_READ: 30000, // 30 seconds
 };
+// Cap file read operations at 3 minutes. The MCP client's hard per-call limit
+// is ~4 minutes; timing out at 3m lets us abort the underlying fs op and return
+// a useful error (e.g. the cloud-storage guidance in buildPermissionError)
+// BEFORE the client gives up with an opaque "No result received after 4
+// minutes". Paired with runWithAbortableTimeout so the read is actually
+// cancelled (fd/thread released), not just abandoned.
+export const READ_OPERATION_TIMEOUT_MS = 3 * 60 * 1000; // 3 minutes
 const FILE_SIZE_LIMITS = {
     LINE_COUNT_LIMIT: 10 * 1024 * 1024, // 10MB for line counting
 };
@@ -426,8 +433,9 @@ export async function readFileFromDisk(filePath, options) {
         capture('server_read_file_error', { error: errorMessage, fileExtension: fileExtension });
         // If we can't stat the file, continue anyway and let the read operation handle errors
     }
-    // Use withTimeout to handle potential hangs
-    const readOperation = async () => {
+    // Read under an abortable timeout so a hung/stalled read is cancelled
+    // (fd/thread freed) rather than leaked until the OS call returns.
+    const readOperation = async (signal) => {
         // Get appropriate handler for this file type (async - includes binary detection)
         const handler = await getFileHandler(validPath);
         // Use handler to read the file
@@ -436,7 +444,8 @@ export async function readFileFromDisk(filePath, options) {
             length,
             sheet,
             range,
-            includeStatusMessage: true
+            includeStatusMessage: true,
+            signal
         });
         // Return with content as string
         // For images: content is already base64-encoded string from handler
@@ -458,18 +467,17 @@ export async function readFileFromDisk(filePath, options) {
             metadata: result.metadata
         };
     };
-    // Execute with timeout
+    // Execute with a 3-minute, cancellable timeout
     let result;
     try {
-        result = await withTimeout(readOperation(), FILE_OPERATION_TIMEOUTS.FILE_READ, `Read file operation for ${filePath}`, null);
+        result = await runWithAbortableTimeout((signal) => readOperation(signal), READ_OPERATION_TIMEOUT_MS, `Read file operation for ${filePath}`);
     }
     catch (error) {
         const err = error;
-        // withTimeout rejects with a plain string "__ERROR__: ... timed out after N seconds"
-        // when defaultValue is null — it has no .code property, so check for that too.
-        const isWithTimeoutString = typeof error === 'string' && error.startsWith('__ERROR__:');
-        if (isWithTimeoutString || err.code === 'EPERM' || err.code === 'EACCES' || err.code === 'ETIMEDOUT') {
-            throw buildPermissionError(filePath, isWithTimeoutString ? 'ETIMEDOUT' : err.code);
+        // runWithAbortableTimeout rejects with an Error whose .code is 'ETIMEDOUT'
+        // on timeout; fs rejects with EPERM/EACCES. Map all to the guidance error.
+        if (err.code === 'EPERM' || err.code === 'EACCES' || err.code === 'ETIMEDOUT') {
+            throw buildPermissionError(filePath, err.code);
         }
         throw error;
     }
@@ -515,8 +523,10 @@ export async function readFileInternal(filePath, offset = 0, length) {
     // IMPORTANT: For internal operations (especially edit operations), we must
     // preserve exact file content including original line endings.
     // We cannot use readline-based reading as it strips line endings.
-    // Read entire file content preserving line endings
-    const content = await fs.readFile(validPath, 'utf8');
+    // Read entire file content preserving line endings, under a 3-minute,
+    // cancellable timeout so an edit on a stalled/cloud path can't hang forever
+    // (previously this read had no timeout at all).
+    const content = await runWithAbortableTimeout((signal) => fs.readFile(validPath, { encoding: 'utf8', signal }), READ_OPERATION_TIMEOUT_MS, `Internal read for ${filePath}`);
     // If we need to apply offset/length, do it while preserving line endings
     if (offset === 0 && length >= Number.MAX_SAFE_INTEGER) {
         // Most common case for edit operations: read entire file

package/dist/tools/schemas.d.ts

@@ -1,5 +1,11 @@
 import { z } from "zod";
-export declare const GetConfigArgsSchema: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
+export declare const GetConfigArgsSchema: z.ZodObject<{
+    origin: z.ZodOptional<z.ZodEnum<["ui", "llm"]>>;
+}, "strip", z.ZodTypeAny, {
+    origin?: "ui" | "llm" | undefined;
+}, {
+    origin?: "ui" | "llm" | undefined;
+}>;
 export declare const SetConfigValueArgsSchema: z.ZodObject<{
     key: z.ZodString;
     value: z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodString, "many">, z.ZodNull]>;
@@ -19,14 +25,17 @@ export declare const StartProcessArgsSchema: z.ZodObject<{
     timeout_ms: z.ZodNumber;
     shell: z.ZodOptional<z.ZodString>;
     verbose_timing: z.ZodOptional<z.ZodBoolean>;
+    origin: z.ZodOptional<z.ZodEnum<["ui", "llm"]>>;
 }, "strip", z.ZodTypeAny, {
     command: string;
     timeout_ms: number;
+    origin?: "ui" | "llm" | undefined;
     shell?: string | undefined;
     verbose_timing?: boolean | undefined;
 }, {
     command: string;
     timeout_ms: number;
+    origin?: "ui" | "llm" | undefined;
     shell?: string | undefined;
     verbose_timing?: boolean | undefined;
 }>;
@@ -78,15 +87,15 @@ export declare const ReadFileArgsSchema: z.ZodObject<{
     path: string;
     offset: number;
     isUrl: boolean;
-    options?: Record<string, any> | undefined;
     origin?: "ui" | "llm" | undefined;
+    options?: Record<string, any> | undefined;
     sheet?: string | undefined;
     range?: string | undefined;
 }, {
     path: string;
     length?: number | undefined;
-    options?: Record<string, any> | undefined;
     origin?: "ui" | "llm" | undefined;
+    options?: Record<string, any> | undefined;
     offset?: number | undefined;
     isUrl?: boolean | undefined;
     sheet?: string | undefined;
@@ -282,16 +291,16 @@ export declare const EditBlockArgsSchema: z.ZodEffects<z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     file_path: string;
     expected_replacements: number;
-    options?: Record<string, any> | undefined;
     origin?: "ui" | "llm" | undefined;
+    options?: Record<string, any> | undefined;
     range?: string | undefined;
     content?: any;
     old_string?: string | undefined;
     new_string?: string | undefined;
 }, {
     file_path: string;
-    options?: Record<string, any> | undefined;
     origin?: "ui" | "llm" | undefined;
+    options?: Record<string, any> | undefined;
     range?: string | undefined;
     content?: any;
     old_string?: string | undefined;
@@ -300,16 +309,16 @@ export declare const EditBlockArgsSchema: z.ZodEffects<z.ZodObject<{
 }>, {
     file_path: string;
     expected_replacements: number;
-    options?: Record<string, any> | undefined;
     origin?: "ui" | "llm" | undefined;
+    options?: Record<string, any> | undefined;
     range?: string | undefined;
     content?: any;
     old_string?: string | undefined;
     new_string?: string | undefined;
 }, {
     file_path: string;
-    options?: Record<string, any> | undefined;
     origin?: "ui" | "llm" | undefined;
+    options?: Record<string, any> | undefined;
     range?: string | undefined;
     content?: any;
     old_string?: string | undefined;
@@ -349,6 +358,7 @@ export declare const StartSearchArgsSchema: z.ZodObject<{
     timeout_ms: z.ZodOptional<z.ZodNumber>;
     earlyTermination: z.ZodOptional<z.ZodBoolean>;
     literalSearch: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    origin: z.ZodOptional<z.ZodEnum<["ui", "llm"]>>;
 }, "strip", z.ZodTypeAny, {
     path: string;
     pattern: string;
@@ -357,6 +367,7 @@ export declare const StartSearchArgsSchema: z.ZodObject<{
     includeHidden: boolean;
     contextLines: number;
     literalSearch: boolean;
+    origin?: "ui" | "llm" | undefined;
     timeout_ms?: number | undefined;
     filePattern?: string | undefined;
     maxResults?: number | undefined;
@@ -364,6 +375,7 @@ export declare const StartSearchArgsSchema: z.ZodObject<{
 }, {
     path: string;
     pattern: string;
+    origin?: "ui" | "llm" | undefined;
     timeout_ms?: number | undefined;
     searchType?: "content" | "files" | undefined;
     filePattern?: string | undefined;

package/dist/tools/schemas.js

@@ -1,6 +1,10 @@
 import { z } from "zod";
 // Config tools schemas
-export const GetConfigArgsSchema = z.object({});
+export const GetConfigArgsSchema = z.object({
+    // 'ui' marks calls the config-editor widget fires programmatically; they are
+    // excluded from tool-call telemetry (see isUiOriginCall in server.ts).
+    origin: z.enum(['ui', 'llm']).optional(),
+});
 export const SetConfigValueArgsSchema = z.object({
     key: z.string(),
     value: z.union([
@@ -10,6 +14,7 @@ export const SetConfigValueArgsSchema = z.object({
         z.array(z.string()),
         z.null(),
     ]),
+    // 'ui' marks widget-fired calls; excluded from tool-call telemetry.
     origin: z.enum(['ui', 'llm']).optional(),
 });
 // Empty schemas
@@ -20,6 +25,9 @@ export const StartProcessArgsSchema = z.object({
     timeout_ms: z.number(),
     shell: z.string().optional(),
     verbose_timing: z.boolean().optional(),
+    // 'ui' marks widget-fired calls (e.g. open-in-folder/editor buttons);
+    // excluded from tool-call telemetry (see isUiOriginCall in server.ts).
+    origin: z.enum(['ui', 'llm']).optional(),
 });
 export const ReadProcessOutputArgsSchema = z.object({
     pid: z.number(),
@@ -45,7 +53,8 @@ export const ReadFileArgsSchema = z.object({
     range: z.string().optional(),
     options: z.record(z.any()).optional(),
     // Whether the call came from the file-preview UI (refresh/navigation) or the
-    // LLM. Used only for telemetry attribution; see call_origin in server.ts.
+    // LLM. 'ui' calls are excluded from tool-call telemetry; see isUiOriginCall
+    // in server.ts.
     origin: z.enum(['ui', 'llm']).optional(),
 });
 export const ReadMultipleFilesArgsSchema = z.object({
@@ -55,7 +64,8 @@ export const WriteFileArgsSchema = z.object({
     path: z.string(),
     content: z.string(),
     mode: z.enum(['rewrite', 'append']).default('rewrite'),
-    // Telemetry attribution: 'ui' when fired by the file-preview UI, else 'llm'.
+    // 'ui' when fired by the file-preview UI, else 'llm'. 'ui' calls are
+    // excluded from tool-call telemetry; see isUiOriginCall in server.ts.
     origin: z.enum(['ui', 'llm']).optional(),
 });
 // PDF modification schemas - exported for reuse
@@ -97,7 +107,8 @@ export const CreateDirectoryArgsSchema = z.object({
 export const ListDirectoryArgsSchema = z.object({
     path: z.string(),
     depth: z.number().optional().default(2),
-    // Telemetry attribution: 'ui' when fired by the file-preview UI, else 'llm'.
+    // 'ui' when fired by the file-preview UI, else 'llm'. 'ui' calls are
+    // excluded from tool-call telemetry; see isUiOriginCall in server.ts.
     origin: z.enum(['ui', 'llm']).optional(),
 });
 export const MoveFileArgsSchema = z.object({
@@ -122,7 +133,8 @@ export const EditBlockArgsSchema = z.object({
     range: z.string().optional(),
     content: z.any().optional(),
     options: z.record(z.any()).optional(),
-    // Telemetry attribution: 'ui' when fired by the file-preview UI, else 'llm'.
+    // 'ui' when fired by the file-preview UI, else 'llm'. 'ui' calls are
+    // excluded from tool-call telemetry; see isUiOriginCall in server.ts.
     origin: z.enum(['ui', 'llm']).optional(),
 }).refine(data => {
     // Helper to check if value is actually provided (not undefined, not empty string)
@@ -162,6 +174,9 @@ export const StartSearchArgsSchema = z.object({
     timeout_ms: z.number().optional(), // Match process naming convention
     earlyTermination: z.boolean().optional(), // Stop search early when exact filename match is found (default: true for files, false for content)
     literalSearch: z.boolean().optional().default(false), // Force literal string matching (-F flag) instead of regex
+    // 'ui' marks widget-fired calls (e.g. markdown link-target search);
+    // excluded from tool-call telemetry (see isUiOriginCall in server.ts).
+    origin: z.enum(['ui', 'llm']).optional(),
 });
 export const GetMoreSearchResultsArgsSchema = z.object({
     sessionId: z.string(),