git-reviewer 2.6.0 → 2.7.0

package/README.md

@@ -3,7 +3,7 @@
 [![CI](https://github.com/dheerajjha/reviewer/actions/workflows/ci.yml/badge.svg)](https://github.com/dheerajjha/reviewer/actions/workflows/ci.yml)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Node](https://img.shields.io/badge/node-%3E%3D18-brightgreen.svg)](package.json)
-[![Tests](https://img.shields.io/badge/tests-272-brightgreen.svg)](test/)
+[![Tests](https://img.shields.io/badge/tests-281-brightgreen.svg)](test/)
 [![Dependencies](https://img.shields.io/badge/dependencies-3-brightgreen.svg)](package.json)
 
 When an agent writes the code, reading it becomes the bottleneck — and the tool
@@ -294,7 +294,7 @@ rather than a public issue.
 
 ```bash
 npm install           # 3 dependencies, no build step, ~6MB
-npm test              # 272 tests
+npm test              # 281 tests
 npm run test:watch
 npm run test:coverage
 ```

package/lib/changes.js

@@ -14,6 +14,119 @@
  * @property {'A'|'M'|'D'|'R'|'B'} status
  */
 
+/**
+ * Unquotes git's octal-escaped, C-quoted filename strings (e.g. "\"caf\\303\\251.txt\"" -> "café.txt").
+ *
+ * When core.quotePath is enabled (default in git), paths containing non-ASCII
+ * or control characters are enclosed in double quotes and byte-escaped with octal
+ * sequences.
+ *
+ * @param {string} str
+ * @returns {string}
+ */
+function unquoteGitPath(str) {
+  if (typeof str !== 'string') return str;
+  if (str.length >= 2 && str.startsWith('"') && str.endsWith('"')) {
+    const inner = str.slice(1, -1);
+    const bytes = [];
+    for (let i = 0; i < inner.length; i++) {
+      if (inner[i] === '\\' && i + 1 < inner.length) {
+        i++;
+        const next = inner[i];
+        if (next >= '0' && next <= '7') {
+          let octal = next;
+          if (i + 1 < inner.length && inner[i + 1] >= '0' && inner[i + 1] <= '7') {
+            i++;
+            octal += inner[i];
+            if (i + 1 < inner.length && inner[i + 1] >= '0' && inner[i + 1] <= '7') {
+              i++;
+              octal += inner[i];
+            }
+          }
+          bytes.push(parseInt(octal, 8));
+        } else if (next === 'a') {
+          bytes.push(0x07);
+        } else if (next === 'b') {
+          bytes.push(0x08);
+        } else if (next === 't') {
+          bytes.push(0x09);
+        } else if (next === 'n') {
+          bytes.push(0x0a);
+        } else if (next === 'v') {
+          bytes.push(0x0b);
+        } else if (next === 'f') {
+          bytes.push(0x0c);
+        } else if (next === 'r') {
+          bytes.push(0x0d);
+        } else if (next === '"') {
+          bytes.push(0x22);
+        } else if (next === '\\') {
+          bytes.push(0x5c);
+        } else {
+          const code = next.charCodeAt(0);
+          if (code >= 0xd800 && code <= 0xdbff && i + 1 < inner.length) {
+            const nextCode = inner.charCodeAt(i + 1);
+            if (nextCode >= 0xdc00 && nextCode <= 0xdfff) {
+              const pair = inner.slice(i, i + 2);
+              i++;
+              const buf = Buffer.from(pair, 'utf8');
+              for (const b of buf) bytes.push(b);
+              continue;
+            }
+          }
+          const buf = Buffer.from(next, 'utf8');
+          for (const b of buf) bytes.push(b);
+        }
+      } else {
+        const code = inner.charCodeAt(i);
+        if (code >= 0xd800 && code <= 0xdbff && i + 1 < inner.length) {
+          const nextCode = inner.charCodeAt(i + 1);
+          if (nextCode >= 0xdc00 && nextCode <= 0xdfff) {
+            const pair = inner.slice(i, i + 2);
+            i++;
+            const buf = Buffer.from(pair, 'utf8');
+            for (const b of buf) bytes.push(b);
+            continue;
+          }
+        }
+        const buf = Buffer.from(inner[i], 'utf8');
+        for (const b of buf) bytes.push(b);
+      }
+    }
+    return Buffer.from(bytes).toString('utf8');
+  }
+  return str;
+}
+
+/**
+ * Extracts the target path and whether the file entry represents a rename
+ * from git diff --stat display format (e.g. "old => new", "prefix/{old => new}.ext").
+ *
+ * @param {string} raw
+ * @returns {{ isRename: boolean, path: string }}
+ */
+function parseCommitFilePath(raw) {
+  if (typeof raw !== 'string') return { isRename: false, path: raw ?? '' };
+
+  // 1. Brace rename: prefix{old => new}suffix or {old => new}
+  const braceMatch = raw.match(/^(.*?)\{(?:.*?) => (.*?)\}(.*)$/);
+  if (braceMatch) {
+    const rawTo = braceMatch[1] + braceMatch[2] + braceMatch[3];
+    const normalized = unquoteGitPath(rawTo).replace(/\/{2,}/g, '/').replace(/^\/+/, '');
+    return { isRename: true, path: normalized };
+  }
+
+  // 2. Arrow rename: old => new (or "old" => "new")
+  const arrowMatch = raw.match(/^(?:.*?) => (.*)$/);
+  if (arrowMatch) {
+    const rawTo = arrowMatch[1].trim();
+    const normalized = unquoteGitPath(rawTo).replace(/\/{2,}/g, '/').replace(/^\/+/, '');
+    return { isRename: true, path: normalized };
+  }
+
+  return { isRename: false, path: unquoteGitPath(raw).replace(/^\/+/, '') };
+}
+
 /**
  * Collect working-directory changes from a `simple-git` status result.
  *
@@ -39,7 +152,8 @@ function collectWorkingChanges(status) {
   for (const [files, letter] of buckets) {
     for (const entry of files) {
       // `renamed` holds `{ from, to }`; every other bucket holds plain strings.
-      const filePath = typeof entry === 'string' ? entry : entry?.to;
+      const rawPath = typeof entry === 'string' ? entry : entry?.to;
+      const filePath = unquoteGitPath(rawPath);
       if (!filePath || seen.has(filePath)) continue;
       seen.set(filePath, { path: filePath, status: letter });
     }
@@ -56,9 +170,10 @@ function collectWorkingChanges(status) {
  * it deletes none.
  *
  * @param {object} file entry from `git.diffSummary()`
- * @returns {'A'|'M'|'D'|'B'}
+ * @returns {'A'|'M'|'D'|'R'|'B'}
  */
 function classifyCommitFile(file) {
+  if (file?.file && parseCommitFilePath(file.file).isRename) return 'R';
   if (file?.binary) return 'B';
 
   const insertions = file?.insertions ?? 0;
@@ -78,7 +193,17 @@ function classifyCommitFile(file) {
  */
 function collectCommitChanges(diffSummary) {
   const files = diffSummary?.files ?? [];
-  return files.map(file => ({ path: file.file, status: classifyCommitFile(file) }));
+  return files.map(file => {
+    const { path, isRename } = parseCommitFilePath(file?.file);
+    const status = isRename ? 'R' : classifyCommitFile(file);
+    return { path, status };
+  });
 }
 
-module.exports = { collectWorkingChanges, collectCommitChanges, classifyCommitFile };
+module.exports = {
+  collectWorkingChanges,
+  collectCommitChanges,
+  classifyCommitFile,
+  unquoteGitPath,
+  parseCommitFilePath
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-reviewer",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "Review your coding agent's changes like a pull request — locally, with inline comments and threaded follow-ups, then hand the marked-up review back to the agent",
   "author": "Dheeraj Jha",
   "license": "MIT",