@wonderwhy-er/desktop-commander 0.2.35 → 0.2.36

package/dist/utils/files/docx.js

@@ -1,14 +1,13 @@
 /**
  * DOCX File Handler
- * Implements FileHandler interface for Microsoft Word documents
+ * Implements FileHandler interface for DOCX documents
+ * Handles reading, writing, and modifying DOCX files while preserving formatting
  */
 import fs from 'fs/promises';
-import path from 'path';
-import { parseDocxToHtml, createDocxFromHtml, editDocxWithOperations, DocxError } from '../../tools/docx/index.js';
-import { convertToHtmlIfNeeded, generateOutputPath } from '../../tools/docx/utils/index.js';
+import { readDocx, getDocxMetadata, modifyDocxContent } from '../../tools/docx/index.js';
 /**
  * File handler for DOCX documents
- * Extracts text as markdown with embedded images
+ * Extracts text and metadata, supports paragraph-based pagination
  */
 export class DocxFileHandler {
     constructor() {
@@ -22,54 +21,30 @@ export class DocxFileHandler {
         return this.extensions.some(e => ext.endsWith(e));
     }
     /**
-     * Read DOCX content — extracts text as styled HTML (with embedded images).
-     * Uses direct DOCX XML parsing for style preservation, with mammoth.js fallback.
+     * Read DOCX content - returns body XML for LLM modification
      */
     async read(path, options) {
+        const { offset = 0, length } = options ?? {};
         try {
-            const docxResult = await parseDocxToHtml(path, {
-                includeImages: true,
-                preserveFormatting: true
+            const result = await readDocx(path, {
+                offset,
+                length
             });
-            // Format the content for MCP response
-            let content = docxResult.html;
-            // Add status message if requested (default: true)
-            const includeStatusMessage = options?.includeStatusMessage !== false;
-            if (includeStatusMessage) {
-                const statusParts = [];
-                if (docxResult.metadata.title) {
-                    statusParts.push(`Title: "${docxResult.metadata.title}"`);
-                }
-                if (docxResult.metadata.author) {
-                    statusParts.push(`Author: ${docxResult.metadata.author}`);
-                }
-                if (docxResult.images.length > 0) {
-                    statusParts.push(`${docxResult.images.length} embedded images`);
-                }
-                if (docxResult.sections) {
-                    const headings = docxResult.sections.filter(s => s.type === 'heading').length;
-                    statusParts.push(`${headings} headings`);
-                }
-                if (statusParts.length > 0) {
-                    content = `[DOCX: ${statusParts.join(', ')}]\n\n${content}`;
-                }
-            }
+            // Return body XML as content - LLMs can modify this and write it back
             return {
-                content,
-                mimeType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                content: result.bodyXml,
+                mimeType: 'application/xml',
                 metadata: {
                     isDocx: true,
-                    title: docxResult.metadata.title,
-                    author: docxResult.metadata.author,
-                    subject: docxResult.metadata.subject,
-                    description: docxResult.metadata.description,
-                    creationDate: docxResult.metadata.creationDate,
-                    modificationDate: docxResult.metadata.modificationDate,
-                    lastModifiedBy: docxResult.metadata.lastModifiedBy,
-                    revision: docxResult.metadata.revision,
-                    fileSize: docxResult.metadata.fileSize,
-                    images: docxResult.images,
-                    sections: docxResult.sections
+                    author: result.metadata.author,
+                    title: result.metadata.title,
+                    subject: result.metadata.subject,
+                    creator: result.metadata.creator,
+                    paragraphCount: result.metadata.paragraphCount,
+                    wordCount: result.metadata.wordCount,
+                    paragraphs: result.paragraphs,
+                    // Include extracted text for reference
+                    extractedText: result.text
                 }
             };
         }
@@ -86,98 +61,42 @@ export class DocxFileHandler {
         }
     }
     /**
-     * Write DOCX file.
-     *
-     * - String content + 'rewrite': create new DOCX from HTML/markdown.
-     * - String content + 'append': append to existing DOCX → writes to {name}_v1.docx.
-     * - Array content: apply DocxOperation[] edits → writes to {name}_v1.docx.
-     * Original file is always preserved.
+     * Write DOCX - NOT SUPPORTED via write_file
+     * Use write_docx tool instead to preserve styles
      */
-    async write(path, content, mode = 'rewrite') {
-        const baseDir = path ? this.getBaseDir(path) : process.cwd();
-        // String content → treat as HTML (or markdown which will be converted)
-        if (typeof content === 'string') {
-            if (mode === 'append') {
-                // Append HTML/markdown — write to _v1 file, preserve original
-                const targetPath = await generateOutputPath(path);
-                const operations = [{
-                        type: 'appendMarkdown',
-                        markdown: content
-                    }];
-                const buffer = await editDocxWithOperations(path, operations, { baseDir });
-                await fs.writeFile(targetPath, buffer);
-            }
-            else {
-                const html = convertToHtmlIfNeeded(content);
-                const buffer = await createDocxFromHtml(html, { baseDir });
-                await fs.writeFile(path, buffer);
-            }
-            return;
-        }
-        // Array content → treat as DocxOperation[], write to _v1 file, preserve original
-        if (Array.isArray(content)) {
-            try {
-                await fs.access(path);
-            }
-            catch {
-                throw new Error(`Cannot modify DOCX: source file does not exist: ${path}. Use string content to create a new DOCX file.`);
-            }
-            const targetPath = await generateOutputPath(path);
-            const operations = content;
-            const buffer = await editDocxWithOperations(path, operations, { baseDir });
-            await fs.writeFile(targetPath, buffer);
-            return;
-        }
-        throw new Error('Unsupported content type for DOCX write. Expected HTML/markdown string or array of operations.');
+    async write(path, content, mode) {
+        throw new Error('DOCX files cannot be written using write_file tool. ' +
+            'Use write_docx tool instead to create or modify DOCX files while preserving styles and formatting.');
     }
     /**
-     * Edit DOCX by applying high-level operations.
-     * Writes to {name}_v1.docx unless `options.outputPath` is provided.
+     * Edit DOCX by applying modifications
      */
     async editRange(path, range, content, options) {
-        const baseDir = this.getBaseDir(path);
-        // Use provided outputPath, otherwise write to _v1 file
-        const outputPath = options?.outputPath ?? await generateOutputPath(path);
-        try {
-            await fs.access(path);
-        }
-        catch {
-            return {
-                success: false,
-                editsApplied: 0,
-                errors: [{
-                        location: range,
-                        error: `Cannot edit DOCX: source file does not exist: ${path}`
-                    }]
-            };
-        }
-        let operations;
-        if (typeof content === 'string') {
-            // Treat string content as HTML/markdown to append (will be converted to HTML internally)
-            operations = [{
-                    type: 'appendMarkdown',
-                    markdown: content
-                }];
-        }
-        else if (Array.isArray(content)) {
-            operations = content;
-        }
-        else {
-            return {
-                success: false,
-                editsApplied: 0,
-                errors: [{
-                        location: range,
-                        error: 'Unsupported content type for DOCX edit. Expected HTML/markdown string or array of operations.'
-                    }]
-            };
-        }
         try {
-            const buffer = await editDocxWithOperations(path, operations, { baseDir, outputPath });
-            await fs.writeFile(outputPath, buffer);
+            // Parse content as modifications
+            let modifications = [];
+            if (Array.isArray(content)) {
+                modifications = content;
+            }
+            else if (typeof content === 'string') {
+                // Try to parse as JSON
+                try {
+                    modifications = JSON.parse(content);
+                }
+                catch {
+                    // If not JSON, treat as single replace operation
+                    modifications = [{
+                            type: 'replace',
+                            findText: range,
+                            replaceText: content
+                        }];
+                }
+            }
+            const outputPath = options?.outputPath || path;
+            await modifyDocxContent(path, outputPath, modifications);
             return {
                 success: true,
-                editsApplied: operations.length
+                editsApplied: modifications.length
             };
         }
         catch (error) {
@@ -185,61 +104,42 @@ export class DocxFileHandler {
             return {
                 success: false,
                 editsApplied: 0,
-                errors: [{
-                        location: range,
-                        error: errorMessage
-                    }]
+                errors: [{ location: range, error: errorMessage }]
             };
         }
     }
     /**
-     * Get DOCX file information including metadata.
+     * Get DOCX file information
      */
     async getInfo(path) {
+        const stats = await fs.stat(path);
+        // Get DOCX metadata
+        let metadata = { isDocx: true };
         try {
-            const stats = await fs.stat(path);
-            let metadata = { isDocx: true };
-            try {
-                const docxResult = await parseDocxToHtml(path, {
-                    includeImages: false,
-                    preserveFormatting: false,
-                });
-                metadata = {
-                    isDocx: true,
-                    title: docxResult.metadata.title,
-                    author: docxResult.metadata.author,
-                    subject: docxResult.metadata.subject,
-                    description: docxResult.metadata.description,
-                    creationDate: docxResult.metadata.creationDate,
-                    modificationDate: docxResult.metadata.modificationDate,
-                    lastModifiedBy: docxResult.metadata.lastModifiedBy,
-                    revision: docxResult.metadata.revision,
-                    imageCount: docxResult.images.length,
-                    sectionCount: docxResult.sections?.length,
-                };
-            }
-            catch {
-                // Non-critical — return basic info if parsing fails
-            }
-            return {
-                size: stats.size,
-                created: stats.birthtime,
-                modified: stats.mtime,
-                accessed: stats.atime,
-                isDirectory: false,
-                isFile: true,
-                permissions: (stats.mode & 0o777).toString(8),
-                fileType: 'binary',
-                metadata
+            const docxMetadata = await getDocxMetadata(path);
+            metadata = {
+                isDocx: true,
+                title: docxMetadata.title,
+                author: docxMetadata.author,
+                subject: docxMetadata.subject,
+                creator: docxMetadata.creator,
+                paragraphCount: docxMetadata.paragraphCount,
+                wordCount: docxMetadata.wordCount
             };
         }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new DocxError(`Failed to get DOCX file info: ${message}`, 'GET_INFO_FAILED', { path });
+        catch {
+            // If we can't parse, just return basic info
         }
-    }
-    /** Get base directory for resolving relative image paths. */
-    getBaseDir(docxPath) {
-        return docxPath ? path.dirname(docxPath) : process.cwd();
+        return {
+            size: stats.size,
+            created: stats.birthtime,
+            modified: stats.mtime,
+            accessed: stats.atime,
+            isDirectory: false,
+            isFile: true,
+            permissions: (stats.mode & 0o777).toString(8),
+            fileType: 'binary',
+            metadata
+        };
     }
 }

package/dist/utils/files/text.js

@@ -87,7 +87,15 @@ export class TextFileHandler {
      * Made static and public for use by other modules (e.g., writeFile telemetry in filesystem.ts)
      */
     static countLines(content) {
-        return content.split('\n').length;
+        if (content === '')
+            return 0;
+        // A file with N lines has N-1 newline characters.
+        // If the file ends with a trailing newline, don't count the empty string after it.
+        const lines = content.split('\n');
+        if (lines[lines.length - 1] === '') {
+            return lines.length - 1;
+        }
+        return lines.length;
     }
     /**
      * Get file line count (for files under size limit)

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.2.35";
+export declare const VERSION = "0.2.36";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.2.35';
+export const VERSION = '0.2.36';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wonderwhy-er/desktop-commander",
-  "version": "0.2.35",
+  "version": "0.2.36",
   "description": "MCP server for terminal operations and file editing",
   "mcpName": "io.github.wonderwhy-er/desktop-commander",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "bump": "node scripts/sync-version.js --bump",
     "bump:minor": "node scripts/sync-version.js --bump --minor",
     "bump:major": "node scripts/sync-version.js --bump --major",
-    "build": "tsc && shx cp setup-claude-server.js uninstall-claude-server.js track-installation.js dist/ && shx chmod +x dist/*.js && shx mkdir -p dist/data && shx cp src/data/onboarding-prompts.json dist/data/ && shx mkdir -p dist/remote-device/scripts && shx cp src/remote-device/scripts/blocking-offline-update.js dist/remote-device/scripts/",
+    "build": "tsc && shx cp setup-claude-server.js uninstall-claude-server.js track-installation.js dist/ && shx chmod +x dist/*.js && shx mkdir -p dist/data && shx cp src/data/onboarding-prompts.json dist/data/ && shx mkdir -p dist/remote-device/scripts && shx cp src/remote-device/scripts/blocking-offline-update.js dist/remote-device/scripts/ && node scripts/build-ui-runtime.cjs file-preview",
     "watch": "tsc --watch",
     "start": "node dist/index.js",
     "start:debug": "node --inspect-brk=9229 dist/index.js",
@@ -90,7 +90,9 @@
     "fastest-levenshtein": "^1.0.16",
     "file-type": "^21.1.1",
     "glob": "^10.3.10",
+    "highlight.js": "^11.11.1",
     "isbinaryfile": "^5.0.4",
+    "markdown-it": "^14.1.0",
     "md-to-pdf": "^5.2.5",
     "open": "^10.2.0",
     "pdf-lib": "^1.17.1",
@@ -110,6 +112,7 @@
     "@anthropic-ai/mcpb": "^1.2.0",
     "@types/node": "^20.17.24",
     "commander": "^13.1.0",
+    "esbuild": "^0.27.2",
     "nexe": "^5.0.0-beta.4",
     "nodemon": "^3.0.2",
     "shx": "^0.3.4",