@itcase/config 1.6.75 → 1.6.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itcase/config",
-  "version": "1.6.75",
+  "version": "1.6.76",
   "author": "ITCase",
   "description": "ITCase Config",
   "engines": {

package/smart-commit/cli.js

@@ -24,6 +24,9 @@ const MAX_DIFF = 80_000
 const AGENT_TIMEOUT_MS = 120_000
 const AGENT_STEP_MS = 2_500
 const BANANA_FRAME_MS = 100
+const INDEX_LOCK_RETRIES = 8
+const INDEX_LOCK_WAIT_MS = 250
+const STALE_LOCK_MS = 1500
 const AGENT_WAIT_STEPS = [
   'Asking Cursor Agent',
   'Still thinking',
@@ -115,6 +118,8 @@ async function main(argv) {
     )
   }
 
+  ensureGitIndexReady(cwd)
+
   let created = 0
   for (const plan of activePlans) {
     const files = plan.files.filter((file) => fileHasChanges(cwd, file))
@@ -135,12 +140,13 @@ async function main(argv) {
       )
     }
 
-    const commit = spawnSync('git', ['commit', '-m', plan.message], {
-      cwd: cwd,
-      encoding: 'utf8',
-      stdio: ['ignore', 'inherit', 'inherit'],
-    })
-    if (commit.status) throw new Error(`git commit failed: ${plan.message}`)
+    try {
+      git(cwd, ['commit', '-m', plan.message], { inherit: true })
+    } catch (error) {
+      throw new Error(`git commit failed: ${plan.message}\n${error.message}`, {
+        cause: error,
+      })
+    }
     created++
   }
   process.stdout.write(`Created ${created} commit(s).\n`)
@@ -593,10 +599,89 @@ async function confirm(count) {
   }
 }
 
-function git(cwd, args) {
-  const result = spawnSync('git', args, { cwd: cwd, encoding: 'utf8' })
-  if (result.status) throw new Error(result.stderr || `git ${args.join(' ')}`)
-  return result
+function isIndexLockError(stderr) {
+  return /index\.lock/.test(stderr || '')
+}
+
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms)
+}
+
+function indexLockPath(cwd) {
+  const result = spawnSync('git', ['rev-parse', '--git-path', 'index.lock'], {
+    cwd: cwd,
+    encoding: 'utf8',
+  })
+  const gitPath = (result.stdout || '').trim()
+  if (!gitPath) return path.join(cwd, '.git', 'index.lock')
+  return path.resolve(cwd, gitPath)
+}
+
+function lockHolders(lockPath) {
+  const result = spawnSync('lsof', ['-t', lockPath], { encoding: 'utf8' })
+  if (result.error || result.status === 127) return null
+  return (result.stdout || '').trim().split('\n').filter(Boolean)
+}
+
+function clearStaleIndexLock(cwd) {
+  const lockPath = indexLockPath(cwd)
+  let stat
+  try {
+    stat = fs.statSync(lockPath)
+  } catch {
+    return false
+  }
+  if (Date.now() - stat.mtimeMs < STALE_LOCK_MS) return false
+  const holders = lockHolders(lockPath)
+  if (holders && holders.length) return false
+  try {
+    fs.unlinkSync(lockPath)
+    return true
+  } catch {
+    return false
+  }
+}
+
+function ensureGitIndexReady(cwd) {
+  for (let attempt = 1; attempt <= INDEX_LOCK_RETRIES; attempt++) {
+    const lockPath = indexLockPath(cwd)
+    if (!fs.existsSync(lockPath)) return
+    if (attempt === 1) {
+      process.stderr.write('Waiting for git index.lock to clear…\n')
+    }
+    clearStaleIndexLock(cwd)
+    if (!fs.existsSync(lockPath)) return
+    sleepSync(INDEX_LOCK_WAIT_MS * attempt)
+  }
+  const lockPath = indexLockPath(cwd)
+  if (!fs.existsSync(lockPath)) return
+  throw new Error(
+    `git index.lock still exists: ${lockPath}\n` +
+      'Another git process may be running. If it crashed, remove the file and retry.',
+  )
+}
+
+function git(cwd, args, option = {}) {
+  for (let attempt = 1; attempt <= INDEX_LOCK_RETRIES; attempt++) {
+    const result = spawnSync('git', args, {
+      cwd: cwd,
+      encoding: 'utf8',
+      stdio: option.inherit ? ['ignore', 'inherit', 'pipe'] : undefined,
+    })
+    if (!result.status) return result
+
+    const stderr = result.stderr || ''
+    if (!isIndexLockError(stderr) || attempt === INDEX_LOCK_RETRIES) {
+      if (option.inherit && stderr) process.stderr.write(stderr)
+      throw new Error(stderr.trim() || `git ${args.join(' ')}`)
+    }
+
+    if (attempt === 1) {
+      process.stderr.write('Waiting for git index.lock to clear…\n')
+    }
+    clearStaleIndexLock(cwd)
+    sleepSync(INDEX_LOCK_WAIT_MS * attempt)
+  }
 }
 
 function out(cwd, args) {