@itcase/config 1.6.75 → 1.6.77

package/README.md

@@ -87,7 +87,7 @@ npm install --save-dev commitizen @commitlint/cz-commitlint
 
 ## Smart commit
 
-`smart-commit` — Cursor Agent (`ask`) планирует коммиты по `SCOPES`, печатает сообщения, спрашивает `[y/N]`.
+`smart-commit` — Cursor Agent (`ask`) планирует коммиты по `SCOPES`, печатает сообщения, спрашивает `[y/N]`. Перед коммитом ждёт и снимает устаревший `.git/index.lock`, если его никто не держит.
 
 ```text
 [yellow pixel banana animation]
@@ -146,7 +146,7 @@ CLI ставится в `~/.local/bin`. Логин в Cursor IDE этот CLI н
 
 Обновление CLI: `agent update`.
 
-Пока Agent думает, в терминале крутится pixel-анимация dancing banana + статус `(Ns)` на одной области экрана (`log-update`). Для полного лога: `npm run smart-commit -- --verbose --dry-run`.
+Пока Agent думает, в терминале крутится pixel-анимация (случайно nyan cat или dancing banana) + статус `(Ns)` на одной области экрана (`log-update`). Принудительно: `--cat` / `--banana`. Для полного лога: `npm run smart-commit -- --verbose --dry-run`.
 
 > **Важно:** в npm есть одноимённый пакет `smart-commit`. Используйте `npm run smart-commit` из проекта с `@itcase/config` — bin берётся из `node_modules`. `npx smart-commit` без локальной установки может подтянуть чужой пакет; CLI перед запуском проверяет, что выполняется именно `@itcase/config`.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itcase/config",
-  "version": "1.6.75",
+  "version": "1.6.77",
   "author": "ITCase",
   "description": "ITCase Config",
   "engines": {
@@ -67,8 +67,8 @@
     "chokidar-cli": "^3.0.0",
     "commitizen": "^4.3.2",
     "conventional-changelog-conventionalcommits": "9.3.1",
-    "cssnano": "^9.0.1",
-    "cssnano-preset-default": "^9.0.1",
+    "cssnano": "^9.0.2",
+    "cssnano-preset-default": "^9.0.2",
     "inquirer": "^14.2.0",
     "log-update": "^8.0.0",
     "postcss": "^8.5.26",
@@ -79,7 +79,7 @@
     "postcss-combine-duplicated-selectors": "^10.0.3",
     "postcss-convert-unit": "^0.1.3",
     "postcss-dark-theme-class": "^2.0.0",
-    "postcss-discard-duplicates": "^9.0.0",
+    "postcss-discard-duplicates": "^9.0.1",
     "postcss-each": "^1.1.0",
     "postcss-easings": "^4.0.0",
     "postcss-extend-rule": "^4.0.0",

package/smart-commit/cli.js

@@ -16,6 +16,7 @@ import {
   promptSubjectRules,
 } from '../commitlint/commitlintCommon.js'
 import { getBananaFrame } from './dancing-banana.js'
+import { getNyanFrame } from './nyan-cat.js'
 
 const PACKAGE_NAME = '@itcase/config'
 const CLI_RELATIVE = 'smart-commit/cli.js'
@@ -23,17 +24,24 @@ const CLI_RELATIVE = 'smart-commit/cli.js'
 const MAX_DIFF = 80_000
 const AGENT_TIMEOUT_MS = 120_000
 const AGENT_STEP_MS = 2_500
+const NYAN_FRAME_MS = 90
 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',
   'Waiting for response',
 ]
 const HELP = `smart-commit [--dry-run] [--yes|-y] [--type t] [--model id] [--verbose]
+             [--cat|--nyan] [--banana]
 
 Cursor Agent → commit messages by SCOPES → [y/N] → git commit
 Run via: npm exec smart-commit (from project with @itcase/config)
 Needs: agent login (or CURSOR_API_KEY) + commitlint.config.* with SCOPES
+
+Progress sprite is random (nyan cat or banana). Force with --cat or --banana.
 `
 const AGENT_MISSING = `Cursor Agent CLI not found — smart-commit cannot run.
 
@@ -71,7 +79,11 @@ async function main(argv) {
 
   const prompt = buildPrompt(scopes, types, files, cwd, option.type)
   const raw = await withAgentProgress(
-    { fileCount: files.length, verbose: option.verbose },
+    {
+      fileCount: files.length,
+      sprite: pickSprite(option.sprite),
+      verbose: option.verbose,
+    },
     (progress) =>
       askAgent(
         cwd,
@@ -115,6 +127,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 +149,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`)
@@ -151,6 +166,7 @@ function parseArgs(argv) {
     type: '',
     dryRun: false,
     model: '',
+    sprite: '',
     staged: false,
     verbose: false,
     yes: false,
@@ -161,6 +177,8 @@ function parseArgs(argv) {
     else if (arg === '--yes' || arg === '-y') option.yes = true
     else if (arg === '--verbose') option.verbose = true
     else if (arg === '--staged') option.staged = true
+    else if (arg === '--cat' || arg === '--nyan') option.sprite = 'cat'
+    else if (arg === '--banana') option.sprite = 'banana'
     else if (arg === '--type') option.type = argv[++i] || ''
     else if (arg === '--model') option.model = argv[++i] || ''
     else if (arg.startsWith('--type=')) option.type = arg.slice(7)
@@ -170,6 +188,11 @@ function parseArgs(argv) {
   return option
 }
 
+function pickSprite(forced) {
+  if (forced === 'cat' || forced === 'banana') return forced
+  return Math.random() < 0.5 ? 'cat' : 'banana'
+}
+
 function assertItcaseConfigPackage(cwd) {
   const scriptPath = fileURLToPath(import.meta.url)
 
@@ -375,13 +398,21 @@ async function withAgentProgress(context, callback) {
     return callback({ onAgentActivity })
   }
 
+  const columns = process.stderr.columns || process.stdout.columns || 80
+  const rows = process.stderr.rows || process.stdout.rows || 24
+  const getFrame =
+    context.sprite === 'cat'
+      ? (index) => getNyanFrame(index, columns)
+      : (index) => getBananaFrame(index, columns, rows)
+  const frameMs = context.sprite === 'cat' ? NYAN_FRAME_MS : BANANA_FRAME_MS
+  process.stderr.write('\x1b[?7l')
+
   const render = () => {
-    logUpdateStderr(`${getBananaFrame(frameIndex)}\n${formatText()}`)
+    logUpdateStderr(`${getFrame(frameIndex)}\n${formatText()}`)
     frameIndex++
   }
 
-  render()
-  const frameTimer = setInterval(render, BANANA_FRAME_MS)
+  const frameTimer = setInterval(render, frameMs)
   const stepTimer = setInterval(() => {
     if (phase === 'early') {
       if (earlyStepIndex < earlySteps.length - 1) {
@@ -395,11 +426,13 @@ async function withAgentProgress(context, callback) {
   }, AGENT_STEP_MS)
 
   try {
+    render()
     return await callback({ onAgentActivity })
   } finally {
     clearInterval(frameTimer)
     clearInterval(stepTimer)
     logUpdateStderr.clear()
+    process.stderr.write('\x1b[?7h')
   }
 }
 
@@ -593,10 +626,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) {