@wonderwhy-er/desktop-commander 0.2.40 → 0.2.41

package/dist/ui/file-preview/src/app.js

@@ -548,11 +548,6 @@ export function bootstrapApp() {
         onConnected: () => {
             currentHostContext = app.getHostContext();
             pendingCachedPayload = widgetState.read() ?? undefined;
-            window.setTimeout(() => {
-                if (!initialStateResolved) {
-                    resolveInitialState(undefined, 'Preview unavailable after page refresh. Switch threads or re-run the tool.');
-                }
-            }, 8000);
         },
     }).catch(() => {
         renderStatusState(container, 'Failed to connect to host.');

package/dist/ui/file-preview/src/directory-controller.js

@@ -5,7 +5,7 @@ function parseDirectoryEntries(content) {
     const hintLines = [];
     const entryLines = [];
     for (const line of lines) {
-        if (/^\[(DIR|FILE|DENIED|WARNING)\]/.test(line.trim())) {
+        if (/^\[(DIR|FILE|DENIED|NOT_FOUND|WARNING)\]/.test(line.trim())) {
             entryLines.push(line.trim());
         }
         else if (entryLines.length === 0) {
@@ -25,6 +25,7 @@ function parseDirectoryEntries(content) {
                 fullPath: dirName,
                 isDir: false,
                 isDenied: false,
+                isNotFound: false,
                 isWarning: true,
                 warningText: msg,
                 depth: parts.length,
@@ -33,13 +34,15 @@ function parseDirectoryEntries(content) {
         }
         const isDir = line.startsWith('[DIR]');
         const isDenied = line.startsWith('[DENIED]');
-        const name = line.replace(/^\[(DIR|FILE|DENIED)\]\s*/, '');
+        const isNotFound = line.startsWith('[NOT_FOUND]');
+        const name = line.replace(/^\[(DIR|FILE|DENIED|NOT_FOUND)\]\s*/, '');
         const parts = name.replace(/\\/g, '/').split('/');
         flat.push({
             name,
             fullPath: name,
             isDir,
             isDenied,
+            isNotFound,
             isWarning: false,
             warningText: '',
             depth: parts.length - 1,
@@ -53,6 +56,7 @@ function parseDirectoryEntries(content) {
             name: baseName,
             isDir: item.isDir,
             isDenied: item.isDenied,
+            isNotFound: item.isNotFound,
             isWarning: item.isWarning,
             warningText: item.warningText,
             children: [],
@@ -85,6 +89,9 @@ function renderDirTree(entries, rootPath) {
             if (item.isDenied) {
                 return `<div class="dir-entry"><span class="dir-icon">🚫</span> <span class="dir-name-denied">${escapeHtml(item.name)}</span></div>`;
             }
+            if (item.isNotFound) {
+                return `<div class="dir-entry"><span class="dir-icon">❓</span> <span class="dir-name-denied">${escapeHtml(item.name)}</span></div>`;
+            }
             if (item.isDir) {
                 const hasChildren = item.children.length > 0;
                 const chevron = `<span class="dir-chevron${hasChildren ? ' expanded' : ''}">${hasChildren ? '▼' : '▶'}</span>`;

package/dist/ui/file-preview/src/file-type-handlers.js

@@ -74,15 +74,26 @@ const handlerRegistry = {
         },
     },
     unsupported: {
-        getCapabilities: () => ({
-            supportsPreview: false,
-            canCopy: false,
-            canOpenInFolder: true,
-        }),
-        renderBody: () => ({
-            notice: 'Preview is not available for this file type.',
-            html: '<div class="panel-content source-content"></div>',
-        }),
+        getCapabilities: (payload) => {
+            const hasRawContent = stripReadStatusLine(payload.content).trim().length > 0;
+            return {
+                supportsPreview: hasRawContent,
+                canCopy: hasRawContent,
+                canOpenInFolder: !isLikelyUrl(payload.filePath),
+            };
+        },
+        renderBody: ({ payload }) => {
+            const rawContent = stripReadStatusLine(payload.content);
+            if (rawContent.trim().length === 0) {
+                return {
+                    notice: 'Preview is not available for this file type.',
+                    html: '<div class="panel-content source-content"></div>',
+                };
+            }
+            return {
+                html: `<div class="panel-content source-content">${renderRawFallback(rawContent)}</div>`,
+            };
+        },
     },
 };
 export function getFileTypeCapabilities(payload) {

package/dist/ui/file-preview/src/payload-utils.js

@@ -41,6 +41,12 @@ export function extractToolText(value) {
     }
     return undefined;
 }
+function extractStructuredContentText(value) {
+    if (!isObjectRecord(value)) {
+        return undefined;
+    }
+    return typeof value.content === 'string' ? value.content : undefined;
+}
 export function extractRenderPayload(value) {
     if (!isObjectRecord(value)) {
         return undefined;
@@ -52,7 +58,10 @@ export function extractRenderPayload(value) {
             : null;
     if (!meta)
         return undefined;
-    const text = extractToolText(value) ?? extractToolText(value.structuredContent) ?? '';
+    const text = extractStructuredContentText(value.structuredContent)
+        ?? extractToolText(value)
+        ?? extractToolText(value.structuredContent)
+        ?? '';
     return buildRenderPayload(meta, text);
 }
 export function assertSuccessfulEditBlockResult(result) {

package/dist/utils/feature-flags.d.ts

@@ -33,6 +33,9 @@ declare class FeatureFlagManager {
      * Wait for fresh flags to be fetched from network.
      * Use this when you need to ensure flags are loaded before making decisions
      * (e.g., A/B test assignments for new users who don't have a cache yet)
+     *
+     * Has a hard timeout to prevent blocking MCP startup if the fetch hangs.
+     * See: https://github.com/wonderwhy-er/DesktopCommanderMCP/issues/465
      */
     waitForFreshFlags(): Promise<void>;
     /**

package/dist/utils/feature-flags.js

@@ -93,10 +93,24 @@ class FeatureFlagManager {
      * Wait for fresh flags to be fetched from network.
      * Use this when you need to ensure flags are loaded before making decisions
      * (e.g., A/B test assignments for new users who don't have a cache yet)
+     *
+     * Has a hard timeout to prevent blocking MCP startup if the fetch hangs.
+     * See: https://github.com/wonderwhy-er/DesktopCommanderMCP/issues/465
      */
     async waitForFreshFlags() {
         if (this.freshFetchPromise) {
-            await this.freshFetchPromise;
+            let safetyTimeoutHandle;
+            try {
+                const safetyTimeout = new Promise((resolve) => {
+                    safetyTimeoutHandle = setTimeout(resolve, 5000);
+                });
+                await Promise.race([this.freshFetchPromise, safetyTimeout]);
+            }
+            finally {
+                if (safetyTimeoutHandle) {
+                    clearTimeout(safetyTimeoutHandle);
+                }
+            }
         }
     }
     /**
@@ -127,17 +141,26 @@ class FeatureFlagManager {
      * Fetch flags from remote URL
      */
     async fetchFlags() {
+        const FETCH_TIMEOUT_MS = 3000;
+        const controller = new AbortController();
+        const abortTimeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+        let hardTimeoutHandle;
         try {
             // Don't log here - runs async and can interfere with MCP clients
-            const controller = new AbortController();
-            const timeout = setTimeout(() => controller.abort(), 5000);
-            const response = await fetch(this.flagUrl, {
+            // Use Promise.race as a hard timeout safety net.
+            // On some platforms (Windows + Node 24 / undici 7.x), AbortController.abort()
+            // fails to interrupt an in-progress TCP connect — the fetch hangs until the
+            // OS-level TCP timeout (~30s on Windows). Promise.race guarantees we reject
+            // at the JS level regardless of AbortController behavior.
+            // See: https://github.com/wonderwhy-er/DesktopCommanderMCP/issues/465
+            const fetchPromise = fetch(this.flagUrl, {
                 signal: controller.signal,
                 headers: {
                     'Cache-Control': 'no-cache',
                 }
             });
-            clearTimeout(timeout);
+            const hardTimeout = new Promise((_, reject) => hardTimeoutHandle = setTimeout(() => reject(new Error('Feature flags fetch timed out')), FETCH_TIMEOUT_MS));
+            const response = await Promise.race([fetchPromise, hardTimeout]);
             if (!response.ok) {
                 throw new Error(`HTTP ${response.status}: ${response.statusText}`);
             }
@@ -155,6 +178,12 @@ class FeatureFlagManager {
             logger.debug('Failed to fetch feature flags:', error.message);
             // Continue with cached values
         }
+        finally {
+            clearTimeout(abortTimeout);
+            if (hardTimeoutHandle) {
+                clearTimeout(hardTimeoutHandle);
+            }
+        }
     }
     /**
      * Save flags to local cache

package/dist/utils/files/excel.js

@@ -25,8 +25,10 @@ export class ExcelFileHandler {
         const paginationInfo = totalRows > returnedRows
             ? `\n[Showing rows ${(options?.offset || 0) + 1}-${(options?.offset || 0) + returnedRows} of ${totalRows} total. Use offset/length to paginate.]`
             : '';
+        const sheetHasSpace = /\s/.test(sheetName);
+        const exampleSheet = sheetHasSpace ? sheetName : 'Sheet1';
         const content = `[Sheet: '${sheetName}' from ${path}]${paginationInfo}
-[To MODIFY cells: use edit_block with range param, e.g., edit_block(path, {range: "Sheet1!E5", content: [[newValue]]})]
+[To MODIFY cells: use edit_block with range param, e.g., edit_block(path, {range: "${exampleSheet}!E5", content: [[newValue]]}). read_file accepts the same range form, or pass sheet + range separately.]
 
 ${JSON.stringify(data)}`;
         return {
@@ -260,6 +262,17 @@ ${JSON.stringify(data)}`;
         if (workbook.worksheets.length === 0) {
             return { sheetName: '', data: [], totalRows: 0, returnedRows: 0 };
         }
+        // Accept range with embedded sheet prefix (parity with edit_block).
+        // E.g. range:"Sheet1!A1:B2" or "'My Sheet'!A1" — strip the sheet
+        // prefix and, when the caller did not pass an explicit sheet, use it.
+        let cellRangeOnly = range;
+        if (range && range.includes('!')) {
+            const [sheetFromRange, cellsFromRange] = this.parseRange(range);
+            cellRangeOnly = cellsFromRange ?? undefined;
+            if (sheetRef === undefined && sheetFromRange) {
+                sheetRef = sheetFromRange;
+            }
+        }
         // Find target worksheet
         let worksheet;
         let sheetName;
@@ -287,8 +300,8 @@ ${JSON.stringify(data)}`;
         let endRow = worksheet.actualRowCount || 1;
         let startCol = 1;
         let endCol = worksheet.actualColumnCount || 1;
-        if (range) {
-            const parsed = this.parseCellRange(range);
+        if (cellRangeOnly) {
+            const parsed = this.parseCellRange(cellRangeOnly);
             startRow = parsed.startRow;
             startCol = parsed.startCol;
             if (parsed.endRow)
@@ -386,7 +399,14 @@ ${JSON.stringify(data)}`;
     }
     parseRange(range) {
         if (range.includes('!')) {
-            const [sheetName, cellRange] = range.split('!');
+            const idx = range.indexOf('!');
+            let sheetName = range.slice(0, idx);
+            const cellRange = range.slice(idx + 1);
+            // Strip Excel-native single quotes around sheet names with spaces:
+            // 'My Sheet'!A1 → My Sheet, A1
+            if (sheetName.length >= 2 && sheetName.startsWith("'") && sheetName.endsWith("'")) {
+                sheetName = sheetName.slice(1, -1).replace(/''/g, "'");
+            }
             return [sheetName, cellRange];
         }
         return [range, null];
@@ -395,7 +415,8 @@ ${JSON.stringify(data)}`;
         // Parse A1 or A1:C10 format
         const match = range.match(/^([A-Z]+)(\d+)(?::([A-Z]+)(\d+))?$/i);
         if (!match) {
-            throw new Error(`Invalid cell range: ${range}`);
+            throw new Error(`Invalid cell range: "${range}". Expected forms: "A1", "A1:C10", or "SheetName!A1:C10" ` +
+                `(single-quote sheet names containing spaces: "'My Sheet'!A1:C10").`);
         }
         const startCol = this.columnToNumber(match[1]);
         const startRow = parseInt(match[2], 10);

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.2.40";
+export declare const VERSION = "0.2.41";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.2.40';
+export const VERSION = '0.2.41';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wonderwhy-er/desktop-commander",
-  "version": "0.2.40",
+  "version": "0.2.41",
   "description": "MCP server for terminal operations and file editing",
   "mcpName": "io.github.wonderwhy-er/desktop-commander",
   "license": "MIT",