docrev 0.11.2 → 0.11.3

package/dist/lib/input.js

@@ -0,0 +1,164 @@
+/**
+ * Input routing: read a command's `[file]` argument as CriticMarkup Markdown,
+ * transparently handling Word documents.
+ *
+ * `rev status`/`rev comments` and friends were written to `readFileSync(file,
+ * 'utf-8')` every argument and regex it for CriticMarkup. A `.docx` is a binary
+ * ZIP; decoded as UTF-8 it occasionally yields a stray `{~~..~>..~~}` byte
+ * sequence, so the tool reported a small, plausible, wrong count with no error
+ * (gcol33/docrev#8). This module is the single front door that both:
+ *
+ *   - detects a Word document by extension AND by ZIP magic + `word/document.xml`
+ *     (so a mis-extensioned `.docx` renamed to `.md`/`.txt` is still caught), and
+ *   - converts it to the same annotated Markdown `rev import` produces, so every
+ *     downstream reader (`countAnnotations`, `getComments`, ...) sees real tags.
+ *
+ * Commands that only read report through `readAnnotatedInput`; commands that
+ * edit in place call `assertEditableMarkdown` first and refuse a `.docx` with a
+ * pointer to `rev import`, since CriticMarkup cannot be written back into a
+ * binary ZIP.
+ */
+import * as fs from 'fs';
+import * as path from 'path';
+import { openDocx } from './ooxml.js';
+import { exitWithError, requireFile } from './errors.js';
+/** ZIP local-file-header magic: the first four bytes of any `.docx`. */
+const ZIP_MAGIC = Buffer.from([0x50, 0x4b, 0x03, 0x04]);
+/** OOXML Word extensions (all ZIP-backed, none Markdown). */
+const WORD_EXTENSIONS = new Set(['.docx', '.docm', '.dotx', '.dotm']);
+/**
+ * A file cannot be read as (or converted to) CriticMarkup Markdown. Carries
+ * actionable suggestions so the command layer can render a helpful error.
+ */
+export class InputError extends Error {
+    suggestions;
+    constructor(message, suggestions = []) {
+        super(message);
+        this.name = 'InputError';
+        this.suggestions = suggestions;
+    }
+}
+/** Read the first bytes of a file, or an empty buffer if unreadable. */
+function readMagic(file, length = 4) {
+    let fd;
+    try {
+        fd = fs.openSync(file, 'r');
+        const buf = Buffer.alloc(length);
+        const n = fs.readSync(fd, buf, 0, length, 0);
+        return buf.subarray(0, n);
+    }
+    catch {
+        return Buffer.alloc(0);
+    }
+    finally {
+        if (fd !== undefined)
+            fs.closeSync(fd);
+    }
+}
+/** True when the file begins with the ZIP local-file-header magic. */
+export function looksLikeZip(file) {
+    return readMagic(file).equals(ZIP_MAGIC);
+}
+/**
+ * True when `file` is a Word document: it carries a Word extension, or it is a
+ * ZIP whose package contains `word/document.xml`. The content sniff catches a
+ * `.docx` renamed to `.md`/`.txt`, so those never get regexed as CriticMarkup.
+ */
+export function isWordDocument(file) {
+    if (WORD_EXTENSIONS.has(path.extname(file).toLowerCase()))
+        return true;
+    if (!looksLikeZip(file))
+        return false;
+    try {
+        return openDocx(file).getEntry('word/document.xml') !== null;
+    }
+    catch {
+        return false;
+    }
+}
+/** A NUL byte in the head reliably marks binary; UTF-8 Markdown never has one. */
+function isBinaryBuffer(buf) {
+    if (buf.length >= 4 && buf.subarray(0, 4).equals(ZIP_MAGIC))
+        return true;
+    return buf.subarray(0, Math.min(buf.length, 8192)).includes(0x00);
+}
+/**
+ * Read a file as the CriticMarkup Markdown a command expects. A Word document
+ * is converted through the existing OOXML/pandoc reader (real insertions,
+ * deletions, substitutions, and comments); a Markdown/text file is read as
+ * UTF-8. A non-Word binary (image, PDF, unknown ZIP) is rejected rather than
+ * silently miscounted.
+ *
+ * @throws InputError if the file is a binary that is not a Word document, or a
+ *   Word document that cannot be parsed.
+ */
+export async function readAnnotatedInput(file) {
+    if (isWordDocument(file)) {
+        const { readDocxAsAnnotatedMarkdown } = await import('./import.js');
+        try {
+            return await readDocxAsAnnotatedMarkdown(file);
+        }
+        catch (err) {
+            throw new InputError(`Failed to read Word document ${path.basename(file)}: ${err.message}`, ['Run "rev import <docx>" to convert it to annotated Markdown first']);
+        }
+    }
+    const buf = fs.readFileSync(file);
+    if (isBinaryBuffer(buf)) {
+        throw new InputError(`${path.basename(file)} is not a text or Markdown file (binary content).`, [
+            'Word documents: run "rev import <docx>" first, or pass the imported .md',
+            'This command reads CriticMarkup Markdown, not binary files',
+        ]);
+    }
+    return buf.toString('utf-8');
+}
+/**
+ * Guard for commands that edit the file in place (accept/reject/resolve/reply/
+ * review). A `.docx` cannot hold CriticMarkup, so refuse it with a pointer to
+ * `rev import` instead of corrupting the document.
+ *
+ * @throws InputError if `file` is a Word document.
+ */
+export function assertEditableMarkdown(file) {
+    if (isWordDocument(file)) {
+        const base = path.basename(file);
+        throw new InputError(`${base} is a Word document; this command edits Markdown in place.`, [
+            `Run "rev import ${base}" to get an editable Markdown file, then edit that`,
+            'Read-only inspection works directly: "rev status" / "rev comments"',
+        ]);
+    }
+}
+// ---------------------------------------------------------------------------
+// Command-facing wrappers: translate InputError into the CLI's error surface.
+// ---------------------------------------------------------------------------
+/**
+ * Command front door: verify the file exists, then read it as annotated
+ * Markdown (converting a `.docx` on the way). On a bad input, print a friendly
+ * error and exit — matching how the rest of the CLI reports failures.
+ */
+export async function loadAnnotated(file, fileType = 'Markdown file') {
+    requireFile(file, fileType);
+    try {
+        return await readAnnotatedInput(file);
+    }
+    catch (err) {
+        if (err instanceof InputError)
+            exitWithError(err.message, err.suggestions);
+        throw err;
+    }
+}
+/**
+ * Command front door for editing commands: verify existence and refuse a Word
+ * document (which cannot be edited in place), printing guidance and exiting.
+ */
+export function requireEditableMarkdown(file, fileType = 'Markdown file') {
+    requireFile(file, fileType);
+    try {
+        assertEditableMarkdown(file);
+    }
+    catch (err) {
+        if (err instanceof InputError)
+            exitWithError(err.message, err.suggestions);
+        throw err;
+    }
+}
+//# sourceMappingURL=input.js.map

package/dist/lib/input.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"input.js","sourceRoot":"","sources":["../../lib/input.ts"],"names":[],"mappings":"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"}

package/dist/lib/response.d.ts

@@ -36,6 +36,6 @@ export declare function generateResponseLetter(comments: CommentWithReplies[], o
 /**
  * Collect comments from multiple files
  */
-export declare function collectComments(files: string[]): CommentWithReplies[];
+export declare function collectComments(files: string[]): Promise<CommentWithReplies[]>;
 export {};
 //# sourceMappingURL=response.d.ts.map

package/dist/lib/response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../lib/response.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,kBAAkB;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,eAAe;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,MAAW,GAAG,kBAAkB,EAAE,CAoC9F;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAYjG;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,EAAE,OAAO,GAAE,eAAoB,GAAG,MAAM,CAwF5G;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,kBAAkB,EAAE,CAYrE"}
+{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../lib/response.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,kBAAkB;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,eAAe;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,MAAW,GAAG,kBAAkB,EAAE,CAoC9F;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAYjG;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,EAAE,OAAO,GAAE,eAAoB,GAAG,MAAM,CAwF5G;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAepF"}

package/dist/lib/response.js

@@ -136,12 +136,15 @@ export function generateResponseLetter(comments, options = {}) {
 /**
  * Collect comments from multiple files
  */
-export function collectComments(files) {
+export async function collectComments(files) {
+    const { readAnnotatedInput } = await import('./input.js');
     const allComments = [];
     for (const file of files) {
         if (!fs.existsSync(file))
             continue;
-        const text = fs.readFileSync(file, 'utf-8');
+        // Route each file through the shared reader so a returned `.docx` is
+        // converted to CriticMarkup first, rather than regexing the binary ZIP.
+        const text = await readAnnotatedInput(file);
         const comments = parseCommentsWithReplies(text, path.basename(file));
         allComments.push(...comments);
     }

package/dist/lib/response.js.map

@@ -1 +1 @@
-{"version":3,"file":"response.js","sourceRoot":"","sources":["../../lib/response.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAuB7B;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAAY,EAAE,OAAe,EAAE;IACtE,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE/B,2CAA2C;IAC3C,MAAM,cAAc,GAAG,6BAA6B,CAAC;IAErD,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;QACxD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI;YAAE,SAAS;QACpB,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;QAEnD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAEnC,kDAAkD;QAClD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACjE,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEpF,wDAAwD;QACxD,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC;QACjC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAAE,SAAS;QAE/C,QAAQ,CAAC,IAAI,CAAC;YACZ,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YACvB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YACrB,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACtB,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE;gBAC1B,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE;aACzB,CAAC,CAAC;YACH,OAAO;YACP,IAAI;YACJ,IAAI,EAAE,OAAO,GAAG,CAAC;SAClB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,QAA8B;IAC5D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAgC,CAAC;IAExD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;QAChC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAA8B,EAAE,UAA2B,EAAE;IAClG,MAAM,EACJ,KAAK,GAAG,uBAAuB,EAC/B,UAAU,GAAG,QAAQ,EACrB,cAAc,GAAG,IAAI,EACrB,eAAe,GAAG,IAAI,GACvB,GAAG,OAAO,CAAC;IAEZ,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;IACzB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,wFAAwF,CAAC,CAAC;IACrG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEf,oBAAoB;IACpB,MAAM,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAE1C,+DAA+D;IAC/D,MAAM,SAAS,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAClD,4CAA4C;QAC5C,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACzD,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACzD,IAAI,WAAW,IAAI,CAAC,WAAW;YAAE,OAAO,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW,IAAI,WAAW;YAAE,OAAO,CAAC,CAAC;QAC1C,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,sDAAsD;QACtD,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,WAAW,EAAE;YAAE,SAAS;QAClE,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,QAAQ;YAAE,SAAS;QAElD,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC;QAChD,KAAK,CAAC,IAAI,CAAC,MAAM,QAAQ,EAAE,CAAC,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACjD,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,CAAC,CAAC;gBAAE,SAAS;YAEjB,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnC,IAAI,eAAe,EAAE,CAAC;gBACpB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;YACtC,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAEf,mBAAmB;YACnB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3C,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAEf,uBAAuB;YACvB,IAAI,cAAc,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;gBAChC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;gBACxC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjB,CAAC;YAED,UAAU;YACV,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAC5B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACf,KAAK,MAAM,KAAK,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;oBAC9B,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAC5B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACf,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YACvC,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACf,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;IAED,gBAAgB;IAChB,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACxC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC1C,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,WAAW,EAAE,CACpD,CAAC,MAAM,CAAC;IACT,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;IAEnE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACzB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,qBAAqB,aAAa,EAAE,CAAC,CAAC;IACjD,KAAK,CAAC,IAAI,CAAC,gBAAgB,QAAQ,EAAE,CAAC,CAAC;IACvC,KAAK,CAAC,IAAI,CAAC,cAAc,aAAa,GAAG,QAAQ,EAAE,CAAC,CAAC;IAErD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,KAAe;IAC7C,MAAM,WAAW,GAAyB,EAAE,CAAC;IAE7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,SAAS;QAEnC,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,wBAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACrE,WAAW,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"response.js","sourceRoot":"","sources":["../../lib/response.ts"],"names":[],"mappings":"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"}

package/lib/annotations.ts

@@ -124,6 +124,34 @@ function isCommentFalsePositive(commentContent: string, fullText: string, positi
 // Combined pattern for any track change (not comments)
 const TRACK_CHANGE_PATTERN = /(\{\+\+.+?\+\+\}|\{--.+?--\}|\{~~.+?~>.+?~~\})/gs;
 
+/**
+ * Reject binary content before it reaches the CriticMarkup regexes. A `.docx`
+ * is a ZIP; read as UTF-8 it starts with `PK\x03\x04` and is riddled with NUL
+ * bytes from the DEFLATE stream. Running the annotation patterns over that
+ * yields accidental byte-matches that look like a small, plausible count —
+ * silent garbage. This guard turns that whole failure class into a loud error.
+ * Callers that legitimately handle Word documents route them through
+ * `readAnnotatedInput` (lib/input.ts), which converts the docx to CriticMarkup
+ * first, so this only fires on a raw binary that reached a text-only path.
+ *
+ * UTF-8 Markdown never contains a NUL byte, so the check cannot false-positive
+ * on real input; it scans only the head to stay O(1) on large documents.
+ * @throws Error if the text is binary rather than text/Markdown.
+ */
+function assertNotBinary(text: string): void {
+  // ZIP local-file-header magic "PK\x03\x04" (docx/xlsx/pptx read as text),
+  // or any NUL byte in the head: a reliable binary marker absent from UTF-8
+  // Markdown, so this never false-positives on real input. Scans only the
+  // head to stay cheap on large documents.
+  if (text.startsWith('PK\u0003\u0004') || text.slice(0, 8192).includes('\u0000')) {
+    throw new Error(
+      'Expected text/Markdown but received binary content. If this is a Word ' +
+        'document, convert it first with "rev import <docx>" (rev status/comments ' +
+        'read .docx directly; other commands need the imported Markdown).',
+    );
+  }
+}
+
 // =============================================================================
 // Public API
 // =============================================================================
@@ -138,6 +166,7 @@ export function parseAnnotations(text: string): Annotation[] {
   if (typeof text !== 'string') {
     throw new TypeError(`text must be a string, got ${typeof text}`);
   }
+  assertNotBinary(text);
 
   const annotations: Annotation[] = [];
 
@@ -257,6 +286,7 @@ export function stripAnnotations(text: string, options: StripOptions = {}): stri
   if (typeof text !== 'string') {
     throw new TypeError(`text must be a string, got ${typeof text}`);
   }
+  assertNotBinary(text);
 
   const { keepComments = false } = options;
 
@@ -427,6 +457,7 @@ export function hasAnnotations(text: string): boolean {
   if (typeof text !== 'string') {
     throw new TypeError(`text must be a string, got ${typeof text}`);
   }
+  assertNotBinary(text);
 
   return ANNOTATION_TESTERS.some((re) => re.test(text));
 }

package/lib/commands/comments.ts

@@ -23,10 +23,31 @@ import {
   getUserName,
   exitWithError,
   getAnnotationSuggestions,
-  requireFile,
+  loadAnnotated,
+  readAnnotatedInput,
+  requireEditableMarkdown,
+  InputError,
 } from './context.js';
 import type { Comment, Annotation } from '../types.js';
 
+/**
+ * Read one file for the multi-file navigation commands (next/prev/first/last/
+ * todo). Converts a `.docx` to CriticMarkup like every other reader; on an
+ * unreadable/binary file it warns and returns null so a scan over many files
+ * is not aborted by one bad entry (and never silently under-counts).
+ */
+async function readCommentSource(f: string): Promise<string | null> {
+  try {
+    return await readAnnotatedInput(f);
+  } catch (err) {
+    if (err instanceof InputError) {
+      console.error(chalk.yellow(`  Skipping ${f}: ${err.message}`));
+      return null;
+    }
+    throw err;
+  }
+}
+
 /**
  * Add a reply after a comment
  * @param text - Full document text
@@ -170,9 +191,15 @@ export function register(program: Command): void {
     .option('-i, --interactive', 'Interactive review mode (reply, resolve, skip)')
     .option('-t, --tui', 'Visual TUI mode for comment review')
     .action(async (file: string, options: CommentsOptions) => {
-      requireFile(file, 'Markdown file');
+      // Interactive and TUI modes write replies/resolutions back to the file,
+      // so they need editable Markdown; a .docx is refused with a pointer to
+      // `rev import`. Plain listing/export is read-only and reads a .docx
+      // directly (converted to CriticMarkup first).
+      if (options.interactive || options.tui) {
+        requireEditableMarkdown(file, 'Markdown file');
+      }
 
-      const text = fs.readFileSync(file, 'utf-8');
+      const text = await loadAnnotated(file, 'Markdown file');
 
       // TUI review mode
       if (options.tui) {
@@ -314,7 +341,8 @@ export function register(program: Command): void {
     .option('-u, --unresolve', 'Mark as pending (unresolve)')
     .option('--dry-run', 'Preview without saving')
     .action((file: string, options: ResolveOptions) => {
-      requireFile(file, 'Markdown file');
+      // Writes resolved markers back to the file; refuse a .docx (see review).
+      requireEditableMarkdown(file, 'Markdown file');
 
       let text = fs.readFileSync(file, 'utf-8');
       const comments = getComments(text);
@@ -395,7 +423,7 @@ export function register(program: Command): void {
     .description('Show next pending comment')
     .argument('[file]', 'Specific file (default: all markdown files)')
     .option('-n, --number <n>', 'Skip to nth pending comment', parseInt)
-    .action((file: string | undefined, options: NextOptions) => {
+    .action(async (file: string | undefined, options: NextOptions) => {
       const files = file ? [file] : findFiles('.md');
 
       if (files.length === 0) {
@@ -407,7 +435,8 @@ export function register(program: Command): void {
       const allPending: Array<Annotation & { file: string; number: number }> = [];
       for (const f of files) {
         if (!fs.existsSync(f)) continue;
-        const text = fs.readFileSync(f, 'utf-8');
+        const text = await readCommentSource(f);
+        if (text === null) continue;
         const allComments = getComments(text);
         const pending = getComments(text, { pendingOnly: true });
 
@@ -460,7 +489,7 @@ export function register(program: Command): void {
     .description('Show previous pending comment')
     .argument('[file]', 'Specific file (default: all markdown files)')
     .option('-n, --number <n>', 'Skip to nth pending comment from end', parseInt)
-    .action((file: string | undefined, options: PrevOptions) => {
+    .action(async (file: string | undefined, options: PrevOptions) => {
       const files = file ? [file] : findFiles('.md');
 
       if (files.length === 0) {
@@ -472,7 +501,8 @@ export function register(program: Command): void {
       const allPending: Array<Annotation & { file: string; number: number }> = [];
       for (const f of files) {
         if (!fs.existsSync(f)) continue;
-        const text = fs.readFileSync(f, 'utf-8');
+        const text = await readCommentSource(f);
+        if (text === null) continue;
         const allComments = getComments(text);
         const pending = getComments(text, { pendingOnly: true });
 
@@ -527,7 +557,7 @@ export function register(program: Command): void {
     .command('first')
     .description('Show first comment')
     .argument('[section]', 'Specific file or section name (default: all markdown files)')
-    .action((section: string | undefined) => {
+    .action(async (section: string | undefined) => {
       const files = section ? findSectionFile(section) : findFiles('.md');
 
       if (files.length === 0) {
@@ -538,7 +568,8 @@ export function register(program: Command): void {
       // Find first comment across files
       for (const f of files) {
         if (!fs.existsSync(f)) continue;
-        const text = fs.readFileSync(f, 'utf-8');
+        const text = await readCommentSource(f);
+        if (text === null) continue;
         const comments = getComments(text);
 
         if (comments.length > 0) {
@@ -573,7 +604,7 @@ export function register(program: Command): void {
     .command('last')
     .description('Show last comment')
     .argument('[section]', 'Specific file or section name (default: all markdown files)')
-    .action((section: string | undefined) => {
+    .action(async (section: string | undefined) => {
       const files = section ? findSectionFile(section) : findFiles('.md').reverse();
 
       if (files.length === 0) {
@@ -584,7 +615,8 @@ export function register(program: Command): void {
       // Find last comment across files (reverse order)
       for (const f of files) {
         if (!fs.existsSync(f)) continue;
-        const text = fs.readFileSync(f, 'utf-8');
+        const text = await readCommentSource(f);
+        if (text === null) continue;
         const comments = getComments(text);
 
         if (comments.length > 0) {
@@ -622,7 +654,7 @@ export function register(program: Command): void {
     .description('List all pending comments as a checklist')
     .argument('[file]', 'Specific file (default: all markdown files)')
     .option('--by-author', 'Group by author')
-    .action((file: string | undefined, options: { byAuthor?: boolean }) => {
+    .action(async (file: string | undefined, options: { byAuthor?: boolean }) => {
       const files = file ? [file] : findFiles('.md');
 
       if (files.length === 0) {
@@ -640,7 +672,8 @@ export function register(program: Command): void {
       }> = [];
       for (const f of files) {
         if (!fs.existsSync(f)) continue;
-        const text = fs.readFileSync(f, 'utf-8');
+        const text = await readCommentSource(f);
+        if (text === null) continue;
         const allComments = getComments(text);
         const pending = allComments.filter(c => !c.resolved);
 
@@ -711,10 +744,8 @@ export function register(program: Command): void {
     .option('-a, --all', 'Accept all changes')
     .option('--dry-run', 'Preview without saving')
     .action((file: string, options: AcceptOptions) => {
-      if (!fs.existsSync(file)) {
-        console.error(chalk.red(`Error: File not found: ${file}`));
-        process.exit(1);
-      }
+      // Writes accepted text back to the file; refuse a .docx (see review).
+      requireEditableMarkdown(file, 'Markdown file');
 
       let text = fs.readFileSync(file, 'utf-8');
       const changes = getTrackChanges(text);
@@ -795,10 +826,8 @@ export function register(program: Command): void {
     .option('-a, --all', 'Reject all changes')
     .option('--dry-run', 'Preview without saving')
     .action((file: string, options: RejectOptions) => {
-      if (!fs.existsSync(file)) {
-        console.error(chalk.red(`Error: File not found: ${file}`));
-        process.exit(1);
-      }
+      // Writes reverted text back to the file; refuse a .docx (see review).
+      requireEditableMarkdown(file, 'Markdown file');
 
       let text = fs.readFileSync(file, 'utf-8');
       const changes = getTrackChanges(text);
@@ -878,10 +907,8 @@ export function register(program: Command): void {
     .option('--all', 'Reply to all pending comments with the same message (requires -m)')
     .option('--dry-run', 'Preview without saving')
     .action(async (file: string, options: ReplyOptions) => {
-      if (!fs.existsSync(file)) {
-        console.error(chalk.red(`File not found: ${file}`));
-        process.exit(1);
-      }
+      // Writes replies back to the file; refuse a .docx (see review).
+      requireEditableMarkdown(file, 'Markdown file');
 
       // Get author name
       let author = options.author || getUserName();
@@ -1001,9 +1028,9 @@ export function register(program: Command): void {
     .option('--no-context', 'Exclude commented text context')
     .option('--force', 'Overwrite existing output file')
     .action(async (file: string, options: ReplyDocOptions) => {
-      requireFile(file, 'Markdown file');
-
-      const text = fs.readFileSync(file, 'utf-8');
+      // Read-only over the input; the reply template is written to a new file,
+      // so a .docx is read directly (converted to CriticMarkup first).
+      const text = await loadAnnotated(file, 'Markdown file');
       const comments = getComments(text);
 
       if (comments.length === 0) {

package/lib/commands/context.ts

@@ -160,6 +160,15 @@ export {
   requireFile,
 } from '../errors.js';
 
+export {
+  isWordDocument,
+  readAnnotatedInput,
+  assertEditableMarkdown,
+  requireEditableMarkdown,
+  loadAnnotated,
+  InputError,
+} from '../input.js';
+
 export {
   listJournals,
   getJournalProfile,

package/lib/commands/core.ts

@@ -22,7 +22,10 @@ import {
   interactiveReview,
   exitWithError,
   getFileNotFoundSuggestions,
-  requireFile,
+  loadAnnotated,
+  readAnnotatedInput,
+  requireEditableMarkdown,
+  InputError,
 } from './context.js';
 
 interface StripOptions {
@@ -43,7 +46,9 @@ export function register(program: Command): void {
     .description('Interactively review and accept/reject track changes')
     .argument('<file>', 'Markdown file to review')
     .action(async (file: string) => {
-      requireFile(file, 'Markdown file');
+      // Review writes accepted/rejected text back to the same path; a .docx
+      // cannot hold CriticMarkup, so refuse it with a pointer to `rev import`.
+      requireEditableMarkdown(file, 'Markdown file');
 
       const text = fs.readFileSync(file, 'utf-8');
       const result = await interactiveReview(text);
@@ -78,10 +83,10 @@ export function register(program: Command): void {
     .argument('<file>', 'Markdown file to strip')
     .option('-o, --output <file>', 'Output file (default: stdout)')
     .option('-c, --keep-comments', 'Keep comment annotations')
-    .action((file: string, options: StripOptions) => {
-      requireFile(file, 'Markdown file');
-
-      const text = fs.readFileSync(file, 'utf-8');
+    .action(async (file: string, options: StripOptions) => {
+      // Reads the input (a .docx is converted to CriticMarkup first) and writes
+      // clean text to stdout or --output, never back to the input file.
+      const text = await loadAnnotated(file, 'Markdown file');
       const clean = stripAnnotations(text, { keepComments: options.keepComments });
 
       if (options.output) {
@@ -107,12 +112,26 @@ export function register(program: Command): void {
         if (!fs.existsSync(file)) {
           if (jsonMode) {
             jsonOutput({ error: `File not found: ${file}` });
-          } else {
-            exitWithError(`File not found: ${file}`, getFileNotFoundSuggestions(file));
+            return;
           }
+          exitWithError(`File not found: ${file}`, getFileNotFoundSuggestions(file));
         }
 
-        const text = fs.readFileSync(file, 'utf-8');
+        // Route .docx through the OOXML reader so real track changes and
+        // comments are counted, instead of regexing the binary ZIP (#8).
+        let text: string;
+        try {
+          text = await readAnnotatedInput(file);
+        } catch (err) {
+          if (err instanceof InputError) {
+            if (jsonMode) {
+              jsonOutput({ error: err.message });
+              return;
+            }
+            exitWithError(err.message, err.suggestions);
+          }
+          throw err;
+        }
         const counts = countAnnotations(text);
         const comments = getComments(text);
 

package/lib/commands/response.ts

@@ -75,7 +75,7 @@ export function register(program: Command): void {
 
       const spin = fmt.spinner('Collecting comments...').start();
 
-      const comments = collectComments(mdFiles);
+      const comments = await collectComments(mdFiles);
       spin.stop();
 
       if (comments.length === 0) {

package/lib/import.ts

@@ -722,6 +722,32 @@ export async function importWordWithTrackChanges(
   };
 }
 
+/**
+ * Read a `.docx` into the same CriticMarkup-annotated Markdown that
+ * `rev import` produces, for read-only inspection (`rev status`, `rev
+ * comments`, ...). Track changes become `{++..++}` / `{--..--}` / `{~~..~~}`
+ * and comments are placed at their anchors, so `countAnnotations` /
+ * `getComments` and the rest operate on it exactly as they do on imported
+ * Markdown — the numbers match a subsequent `rev import`.
+ *
+ * Side-effect free: no media is extracted, nothing is written to disk, and
+ * extraction/placement messages are discarded (the caller only wants the
+ * annotated text). Works with or without pandoc — the XML fallback emits the
+ * same CriticMarkup — so it never reads the binary ZIP as text.
+ */
+export async function readDocxAsAnnotatedMarkdown(docxPath: string): Promise<string> {
+  const extracted = await extractFromWord(docxPath, { skipMediaExtraction: true });
+  let text = extracted.text;
+  const comments = extracted.comments || [];
+  const anchors = extracted.anchors || new Map();
+
+  if (comments.length > 0) {
+    text = insertCommentsIntoMarkdown(text, comments, anchors, { quiet: true });
+  }
+
+  return cleanupAnnotations(text);
+}
+
 /**
  * Legacy import function: Word doc → annotated MD via diff
  */