@searls/turbocommit 0.16.1 → 0.16.2

package/README.md

@@ -80,8 +80,14 @@ Each touched checkout:
 - Gives the configured title agent repository-specific bounded diff context.
 
 Turbocommit attempts every commit before pushing every successful commit whose
-repository has `push: true`. Failures are retained and retried on a later Stop,
-along with every transcript accumulated before the commit succeeds.
+repository has `push: true`. Staging and committing are retried a few times
+when Git is momentarily unavailable, for example while Xcode holds the index
+lock. Failures are retained and retried on a later Stop in that checkout by
+any session, along with every transcript accumulated before the commit
+succeeds, and the failed session's claims are released so they do not block
+other sessions meanwhile. Each `fail` monitor event records Git's error. A
+deletion the session already staged with `git rm` is committed with the rest
+of its paths.
 
 Separate worktrees are committed independently. Enabled submodules are
 committed and pushed before enabled parent repositories. When one turn creates

package/lib/git.js

@@ -115,12 +115,46 @@ function stageAll (cwd) {
 
 function stagePaths (cwd, filePaths) {
   const changed = changedPaths(cwd, filePaths)
-  const paths = pathspecs(cwd, changed)
-  if (paths.length === 0) return []
-  git(`add -A -- ${paths.map(quote).join(' ')}`, { cwd })
+  if (changed.length === 0) return []
+  // A deletion the session already staged (git rm) matches nothing on disk or
+  // in the index, and `git add` aborts on such a pathspec. It is already
+  // staged, so only the remaining paths are added.
+  const paths = pathspecs(cwd, changed.filter(file => existsOnDisk(file) || isIndexed(cwd, file)))
+  if (paths.length > 0) git(`add -A -- ${paths.map(quote).join(' ')}`, { cwd })
   return changed
 }
 
+function existsOnDisk (file) {
+  try {
+    fs.lstatSync(file)
+    return true
+  } catch {
+    return false
+  }
+}
+
+function isIndexed (cwd, file) {
+  const spec = pathspecs(cwd, [file])
+  if (spec.length === 0) return false
+  return git(`ls-files --cached -z -- ${quote(spec[0])}`, { cwd }) !== ''
+}
+
+/**
+ * Git refuses to work while another process holds the index (Xcode and other
+ * tools take `.git/index.lock` briefly), so a staging or commit step is tried
+ * again before its failure is allowed to strand a turn's work.
+ */
+function withGitRetry (operation, attempts = 3, delayMs = 250) {
+  for (let attempt = 1; ; attempt++) {
+    try {
+      return operation()
+    } catch (err) {
+      if (attempt >= attempts) throw err
+      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, delayMs)
+    }
+  }
+}
+
 function commitPaths (cwd, filePaths, headline, body, opts = {}) {
   if (opts.pathScoped && hasRepositoryOperation(cwd)) return null
   const changed = stagePaths(cwd, filePaths)
@@ -271,6 +305,7 @@ function hasRepositoryOperation (cwd) {
 }
 
 module.exports = {
+  withGitRetry,
   git,
   canonicalRoot,
   canonicalTrackedPath,

package/lib/run.js

@@ -4,7 +4,7 @@ const path = require('path')
 const { loadJson } = require('./io')
 const { parseTranscript, parseCodexTranscript, formatBody, formatTitleTranscript, extractHeadline, extractModel, extractCodexModel } = require('./transcript')
 const { runTitleAgent, runBodyAgent } = require('./agent')
-const { gitRoot, hasChanges, changedPaths, addAndCommit, stagePaths, commitPaths, commitStagedPaths, stagedChangeContext, currentBranch, pushClean, hasRepositoryOperation } = require('./git')
+const { withGitRetry, gitRoot, hasChanges, changedPaths, addAndCommit, stagePaths, commitPaths, commitStagedPaths, stagedChangeContext, currentBranch, pushClean, hasRepositoryOperation } = require('./git')
 const { logEvent } = require('./log')
 const { wrapText } = require('./wrap')
 const {
@@ -281,6 +281,8 @@ function runSingle (input, opts = {}) {
   const project = path.basename(root)
   const branch = currentBranch(root)
   let context = 0
+  // Work a failed commit could not land is retained for a later Stop.
+  let retained = null
   try { context = fs.statSync(transcriptPath).size } catch {}
 
   const sessionId = hookInput.sessionId
@@ -344,6 +346,7 @@ function runSingle (input, opts = {}) {
     logEvent('start', { harness: hookInput.harness, project, branch, context })
 
     const formattedTranscript = formatBody(effectivePairs)
+    if (sessionId) retained = { body: formattedTranscript, paths: ownedPaths }
 
     // Title: agent by default, transcript if opted out
     let headline
@@ -397,9 +400,9 @@ function runSingle (input, opts = {}) {
     const redactions = buildRedactions()
     const safeHeadline = redact(headline, redactions)
     const safeBody = redact(wrappedBody + tag, redactions)
-    const sha = sessionId
+    const sha = withGitRetry(() => sessionId
       ? commitPaths(root, ownedPaths, safeHeadline, safeBody)
-      : addAndCommit(root, safeHeadline, safeBody)
+      : addAndCommit(root, safeHeadline, safeBody))
     if (!sha) {
       if (sessionId) cleanupTracking(root, sessionId)
       logEvent('skip', {
@@ -432,7 +435,8 @@ function runSingle (input, opts = {}) {
     }
     cleanupStale(root)
   } catch (err) {
-    logEvent('fail', { harness: hookInput.harness, project, branch, context })
+    logEvent('fail', { harness: hookInput.harness, project, branch, context, error: failureMessage(err) })
+    if (retained) retainFailedWork(root, sessionId, retained, pairs.length)
     throw err
   }
 }
@@ -534,7 +538,7 @@ function runMulti (hookInput, anchor, currentRepos, manifest, opts = {}) {
 
     try {
       logEvent('start', { harness: hookInput.harness, project, branch, context })
-      const stagedPaths = stagePaths(root, currentPaths)
+      const stagedPaths = withGitRetry(() => stagePaths(root, currentPaths))
       if (stagedPaths.length === 0) {
         manifest.repos = manifest.repos.filter(candidate => candidate !== repo)
         logEvent('skip', { harness: hookInput.harness, project, branch, context, reason: 'no-path-changes' })
@@ -582,7 +586,7 @@ function runMulti (hookInput, anchor, currentRepos, manifest, opts = {}) {
 
       const safeHeadline = redact(headline, redactions)
       const safeBody = redact(body, redactions)
-      const sha = commitStagedPaths(root, stagedPaths, safeHeadline, safeBody)
+      const sha = withGitRetry(() => commitStagedPaths(root, stagedPaths, safeHeadline, safeBody))
       if (!sha) throw new Error('Tracked paths changed before commit')
       if (sessionId) saveMultiWatermark(root, sessionId, sha)
       if (root === anchor && sessionId) {
@@ -597,8 +601,8 @@ function runMulti (hookInput, anchor, currentRepos, manifest, opts = {}) {
         context,
         title: safeHeadline
       })
-    } catch {
-      logEvent('fail', { harness: hookInput.harness, project, branch, context })
+    } catch (err) {
+      logEvent('fail', { harness: hookInput.harness, project, branch, context, error: failureMessage(err) })
     }
   }
 
@@ -631,6 +635,30 @@ function runMulti (hookInput, anchor, currentRepos, manifest, opts = {}) {
   cleanupStale(anchor)
 }
 
+/**
+ * A single-repository commit that failed joins the retry manifest, which any
+ * later Stop in this checkout replays. The session's tracking file is
+ * released so its claims stop blocking other sessions in the meantime.
+ */
+function retainFailedWork (root, sessionId, retained, pairCount) {
+  try {
+    const manifest = loadManifest(root)
+    appendWork(manifest, root, {
+      key: cryptoKey(`${sessionId}\n${pairCount}\n${retained.body}`),
+      body: retained.body,
+      sessionIds: [],
+      paths: retained.paths
+    })
+    saveManifest(root, manifest)
+    cleanupTracking(root, sessionId)
+  } catch {}
+}
+
+function failureMessage (err) {
+  const text = err?.stderr?.toString?.().trim() || err?.message || String(err)
+  return text.split('\n')[0].slice(0, 200)
+}
+
 function transcriptSize (transcriptPath) {
   try {
     return fs.statSync(transcriptPath).size

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@searls/turbocommit",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "Auto-commit after every AI coding agent turn",
   "bin": {
     "turbocommit": "./cli.js"