gitdone-agent 0.7.1 → 0.7.3

package/index.js

@@ -561,6 +561,28 @@ function gitTry(cmd, cwd) {
   }
 }
 
+// Like gitTry(), but hands git an ARGV array instead of a shell command string,
+// so git.exe runs directly with no shell in between. A shell string goes through
+// cmd.exe on Windows, which (a) mangles Cyrillic and (b) treats &, |, %, ^, <, >
+// as operators — so a Bulgarian commit message, or a path containing such a
+// character, silently corrupted the command and the commit failed. The old
+// commit path swallowed that via git() + `|| 'committed'` and reported a fake
+// success while nothing was committed (gd-445). gitDiffUntracked() already uses
+// execFileSync for the same reason. Local calls get 2 min; pass net for 5.
+function gitArgs(args, cwd, { net = false } = {}) {
+  try {
+    const out = execFileSync('git', args, {
+      cwd, encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'],
+      maxBuffer: GIT_MAX_BUFFER, timeout: net ? GIT_NET_TIMEOUT_MS : GIT_TIMEOUT_MS, env: GIT_ENV,
+    }).trim()
+    return { ok: true, out }
+  } catch (err) {
+    const timedOut = err.signal === 'SIGTERM' && err.code == null
+    const out = (err.stderr || err.stdout || (timedOut ? `git не отговори и беше прекратен` : err.message) || '').toString().trim()
+    return { ok: false, out }
+  }
+}
+
 // Never let a token reach the log file or the server's command-result.
 function redact(text, token) {
   if (!text || !token) return text
@@ -762,7 +784,18 @@ function getSnapshot(repoPath) {
   // -uall lists every untracked file individually instead of collapsing a new
   // directory into a single `dir/` entry — so the change list matches what
   // GitHub Desktop shows, file-for-file (gd-369).
-  const statusLines = git('git status --porcelain -uall', repoPath).split('\n').filter(Boolean)
+  // Read the status RAW (not via git(), which .trim()s the whole output). The
+  // porcelain format is fixed-width — 2 status columns, a space, then the path —
+  // and the first line of a worktree-only change starts with a space (e.g.
+  // " M .env.example"). git().trim() ate that leading space on the FIRST line
+  // only, shifting its columns so the path lost its first character (".env.example"
+  // → "env.example"); the mangled path then failed `git add` (or, before gd-445,
+  // failed silently). Strip only a trailing \r per line, never leading spaces (gd-446).
+  const statusLines = gitRaw('git status --porcelain -uall', repoPath)
+    .toString('utf8')
+    .split('\n')
+    .map((l) => l.replace(/\r$/, ''))
+    .filter(Boolean)
   const modified = []
   const staged = []
   const statuses = {}
@@ -1700,20 +1733,32 @@ async function executeCommand(cfg, cmd, repoPath) {
   const auth = cfg.auth?.[repoPath] ?? null
   try {
     if (cmd.type === 'commit') {
-      const msg = (cmd.payload?.message ?? 'commit').replace(/"/g, '\\"')
+      // Everything here goes through gitArgs (argv, no shell): the message and the
+      // paths are user/Cyrillic data that cmd.exe would corrupt, which used to make
+      // the commit fail silently while the console showed a fake ✓ (gd-445).
+      const msg = (cmd.payload?.message ?? '').trim() || 'commit'
       // When the UI sends a list of selected files, stage ONLY those so the
       // resulting commit (and the push that follows) contains just the checked
       // files. No list → stage everything (old behaviour / older UIs).
       const files = Array.isArray(cmd.payload?.files)
         ? cmd.payload.files.filter((f) => typeof f === 'string' && f.trim())
         : []
-      if (files.length) {
-        const quoted = files.map((f) => `"${f.replace(/"/g, '\\"')}"`).join(' ')
-        git(`git add -- ${quoted}`, repoPath)
+      const add = files.length
+        ? gitArgs(['add', '--', ...files], repoPath)
+        : gitArgs(['add', '-A'], repoPath)
+      if (!add.ok) throw new Error(`git add се провали: ${add.out}`)
+      const commit = gitArgs(['commit', '-m', msg], repoPath)
+      if (commit.ok) {
+        result = commit.out || 'committed'
+      } else if (/nothing to commit|no changes added|working tree clean/i.test(commit.out)) {
+        // Benign: the checked files carried no staged change (already committed or
+        // whitespace-only). Say so plainly instead of faking success.
+        result = 'няма промени за commit'
       } else {
-        git('git add -A', repoPath)
+        // Real failure (hook, identity, lock, corrupt path…) — surface it so the
+        // console shows the reason instead of the old silent fake ✓.
+        throw new Error(commit.out || 'git commit се провали')
       }
-      result = git(`git commit -m "${msg}"`, repoPath) || 'committed'
     } else if (cmd.type === 'push' || cmd.type === 'pull') {
       result = pushOrPull(cmd.type, repoPath, auth)
     } else if (cmd.type === 'discard') {

package/package.json

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