gitdone-agent 0.6.5 → 0.6.6

package/index.js

@@ -27,7 +27,7 @@ import { randomUUID } from 'node:crypto'
 // Reported to the server on every sync so the web UI can flag outdated agents.
 // Keep in lockstep with packages/agent/package.json "version" AND
 // src/lib/agentVersion.ts LATEST_AGENT_VERSION.
-const AGENT_VERSION = '0.6.5'
+const AGENT_VERSION = '0.6.6'
 
 const AGENT_DIR = join(homedir(), '.gitdone-agent')
 const CONFIG_PATH = join(AGENT_DIR, 'config.json')
@@ -403,6 +403,42 @@ function decodeDiffText(buf) {
   }
 }
 
+// Git C-quotes paths with spaces / special chars / non-ASCII bytes, wrapping them
+// in double quotes with backslash escapes (`"export coca_cola/x.cs"`, octal `\NNN`
+// for raw bytes). Both `git status --porcelain` and the `diff --git` header do it.
+// Left unhandled, files with spaces (or Cyrillic) got mis-keyed and their diff was
+// dropped (gd-321). This reverses it back to a plain path so the diff key matches
+// the file name shown in the list.
+function unquoteGitPath(s) {
+  if (typeof s !== 'string' || s.length < 2 || s[0] !== '"' || s[s.length - 1] !== '"') return s
+  const body = s.slice(1, -1)
+  const bytes = []
+  for (let i = 0; i < body.length; i++) {
+    if (body[i] === '\\' && i + 1 < body.length) {
+      const n = body[i + 1]
+      if (n === 'n') { bytes.push(10); i++ }
+      else if (n === 't') { bytes.push(9); i++ }
+      else if (n === 'r') { bytes.push(13); i++ }
+      else if (n === '"') { bytes.push(34); i++ }
+      else if (n === '\\') { bytes.push(92); i++ }
+      else if (n >= '0' && n <= '7') { bytes.push(parseInt(body.substr(i + 1, 3), 8) & 0xff); i += 3 }
+      else { bytes.push(body.charCodeAt(i)) }
+    } else {
+      bytes.push(body.charCodeAt(i) & 0xff)
+    }
+  }
+  return Buffer.from(bytes).toString('utf8')
+}
+
+// Read the b-side path from a `diff --git` header line, handling git's quoting
+// of paths with spaces / special chars (gd-321).
+function diffHeaderPath(hdr) {
+  const q = hdr.match(/ ("b\/.*")$/) // quoted:  "a/x" "b/x"
+  if (q) return unquoteGitPath(q[1]).replace(/^b\//, '')
+  const u = hdr.match(/ b\/(.*)$/) //  plain:   a/x b/x
+  return u ? u[1] : null
+}
+
 function parseDiffByFile(diffBuf) {
   const files = {}
   if (!diffBuf || diffBuf.length === 0) return files
@@ -413,10 +449,11 @@ function parseDiffByFile(diffBuf) {
   for (const section of sections) {
     if (!section.trim()) continue
     // Decode THIS file's bytes on their own (UTF-8 or CP1251), then read the
-    // filename from the decoded header.
+    // filename from the decoded header (quoted or not).
     const text = decodeDiffText(Buffer.from(section, 'latin1'))
-    const match = text.match(/^diff --git a\/.+ b\/(.+)$/m)
-    if (match) files[match[1]] = text
+    const hdr = text.match(/^diff --git (.+)$/m)
+    const name = hdr ? diffHeaderPath(hdr[1]) : null
+    if (name) files[name] = text
   }
   return files
 }
@@ -430,7 +467,7 @@ function getSnapshot(repoPath) {
   const statuses = {}
   for (const line of statusLines) {
     const xy = line.slice(0, 2)
-    const file = line.slice(3)
+    const file = unquoteGitPath(line.slice(3))
     statuses[file] = xy
     if (xy[0] !== ' ' && xy[0] !== '?') staged.push(file)
     if (xy[1] !== ' ') modified.push(file)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "gitdone-agent",
-    "version":  "0.6.5",
+    "version":  "0.6.6",
     "description":  "Local git agent for gitdone — watches a local repo and sends snapshots to gitdone.eu",
     "type":  "module",
     "bin":  {