@itcase/config 1.6.76 → 1.6.78

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.76",
+  "version": "1.6.78",
   "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,6 +24,7 @@ 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
@@ -33,10 +35,13 @@ const AGENT_WAIT_STEPS = [
   '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.
 
@@ -66,15 +71,19 @@ async function main(argv) {
   const cwd = process.cwd()
   assertItcaseConfigPackage(cwd)
   const { scopes, types } = await loadCommitlintConfig(cwd)
-  const files = listFiles(cwd, option)
-  if (!files.length) {
+  const changedFiles = listFiles(cwd, option)
+  if (!changedFiles.length) {
     process.stdout.write('No changes to commit.\n')
     return
   }
 
-  const prompt = buildPrompt(scopes, types, files, cwd, option.type)
+  const prompt = buildPrompt(scopes, types, changedFiles, cwd, option.type)
   const raw = await withAgentProgress(
-    { fileCount: files.length, verbose: option.verbose },
+    {
+      fileCount: changedFiles.length,
+      sprite: pickSprite(option.sprite),
+      verbose: option.verbose,
+    },
     (progress) =>
       askAgent(
         cwd,
@@ -84,7 +93,8 @@ async function main(argv) {
         progress.onAgentActivity,
       ),
   )
-  const plans = parsePlan(raw, files)
+  let plans = parsePlan(raw, changedFiles)
+  plans = assignOmittedFiles(plans, changedFiles)
   await validateAndNormalizePlans(cwd, plans)
 
   process.stdout.write('\nCommits:\n')
@@ -122,21 +132,21 @@ async function main(argv) {
 
   let created = 0
   for (const plan of activePlans) {
-    const files = plan.files.filter((file) => fileHasChanges(cwd, file))
-    if (!files.length) {
+    const planFiles = plan.files.filter((file) => fileHasChanges(cwd, file))
+    if (!planFiles.length) {
       process.stdout.write(`Skipping empty commit: ${plan.message}\n`)
       continue
     }
 
     // Drop leftover index entries so only this plan's files are committed.
     git(cwd, ['reset', '-q', 'HEAD'])
-    git(cwd, ['add', '--', ...files])
+    stageFiles(cwd, planFiles)
     const staged = lines(cwd, ['diff', '--cached', '--name-only'])
-    const stagedForPlan = files.filter((file) => staged.includes(file))
+    const stagedForPlan = planFiles.filter((file) => staged.includes(file))
     if (!stagedForPlan.length) {
       throw new Error(
         `Nothing staged for commit: ${plan.message}\n` +
-          `Files: ${files.join(', ')}`,
+          `Files: ${planFiles.join(', ')}`,
       )
     }
 
@@ -150,6 +160,14 @@ async function main(argv) {
     created++
   }
   process.stdout.write(`Created ${created} commit(s).\n`)
+
+  const remaining = changedFiles.filter((file) => fileHasChanges(cwd, file))
+  if (remaining.length) {
+    process.stdout.write(
+      `\nUncommitted changes (${remaining.length}):\n` +
+        `${remaining.map((file) => `  ${file}`).join('\n')}\n`,
+    )
+  }
 }
 
 function parseArgs(argv) {
@@ -157,6 +175,7 @@ function parseArgs(argv) {
     type: '',
     dryRun: false,
     model: '',
+    sprite: '',
     staged: false,
     verbose: false,
     yes: false,
@@ -167,6 +186,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)
@@ -176,6 +197,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)
 
@@ -289,15 +315,17 @@ function readReleaseBranches(cwd) {
 }
 
 function listFiles(cwd, option) {
-  const staged = lines(cwd, [
-    'diff',
-    '--cached',
-    '--name-only',
-    '--diff-filter=ACDMR',
-  ])
-  if (option.staged || staged.length) return staged
+  if (option.staged) {
+    return lines(cwd, [
+      'diff',
+      '--cached',
+      '--name-only',
+      '--diff-filter=ACDMR',
+    ])
+  }
   return [
     ...new Set([
+      ...lines(cwd, ['diff', '--cached', '--name-only', '--diff-filter=ACDMR']),
       ...lines(cwd, ['diff', '--name-only', '--diff-filter=ACDMR']),
       ...lines(cwd, ['ls-files', '--others', '--exclude-standard']),
     ]),
@@ -305,10 +333,14 @@ function listFiles(cwd, option) {
 }
 
 function buildPrompt(scopes, types, files, cwd, type) {
-  let diff = [
-    out(cwd, ['diff', '--cached', '--', ...files]),
-    out(cwd, ['diff', '--', ...files]),
-  ]
+  const statusByFile = new Map(
+    lines(cwd, ['status', '--short', '--porcelain', '--', ...files]).map(
+      (line) => [line.slice(3), line.slice(0, 2).trim()],
+    ),
+  )
+
+  let diff = files
+    .map((file) => buildFileDiff(cwd, file))
     .filter(Boolean)
     .join('\n\n')
   if (diff.length > MAX_DIFF) diff = `${diff.slice(0, MAX_DIFF)}\n…truncated`
@@ -320,11 +352,17 @@ Scopes (exact): ${buildScopeEnum(scopes).join(', ')}
 Subject rules:
 ${promptSubjectRules.map((rule) => `- ${rule}`).join('\n')}
 Prefer one commit when changes belong to the same feature.
-Split by scope. Each listed file in exactly one commit.
+Split by scope. Each listed file in exactly one commit — including new/untracked files (??).
 Do not add Co-authored-by or Made-with trailers.
 ${type ? `Prefer type "${type}".\n` : ''}SCOPES: ${JSON.stringify(scopes)}
 Files:
-${files.map((file) => `- ${file}`).join('\n')}
+${files
+  .map((file) => {
+    const status =
+      statusByFile.get(file) || (isUntracked(cwd, file) ? '??' : ' M')
+    return `- ${file} (${status})`
+  })
+  .join('\n')}
 status:
 ${out(cwd, ['status', '--short', '--', ...files]) || '(empty)'}
 diff:
@@ -332,6 +370,31 @@ ${diff || '(none)'}
 `
 }
 
+function buildFileDiff(cwd, file) {
+  const filePath = path.join(cwd, file)
+  if (!fs.existsSync(filePath)) {
+    return (
+      out(cwd, ['diff', '--cached', '--', file]) ||
+      out(cwd, ['diff', '--', file])
+    )
+  }
+
+  if (isUntracked(cwd, file)) {
+    const nullPath = process.platform === 'win32' ? 'NUL' : '/dev/null'
+    const untrackedDiff = out(cwd, ['diff', '--no-index', nullPath, file])
+    return untrackedDiff
+      ? `new file ${file}:\n${untrackedDiff}`
+      : `new file ${file}: (empty)`
+  }
+
+  return [
+    out(cwd, ['diff', '--cached', '--', file]),
+    out(cwd, ['diff', '--', file]),
+  ]
+    .filter(Boolean)
+    .join('\n')
+}
+
 function buildAgentProgressSteps(fileCount) {
   const fileLabel =
     fileCount === 1 ? '1 changed file' : `${fileCount} changed files`
@@ -381,13 +444,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) {
@@ -401,11 +472,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')
   }
 }
 
@@ -528,12 +601,60 @@ function parsePlan(raw, allowedFiles) {
   }
 
   if (!plans.length) throw new Error(`Empty commit plan:\n${raw}`)
-  const missing = allowedFiles.filter((file) => !seen.has(file))
-  if (missing.length)
-    throw new Error(`Cursor omitted files:\n${missing.join('\n')}`)
   return plans
 }
 
+function assignOmittedFiles(plans, allowedFiles) {
+  const assigned = new Set(plans.flatMap((plan) => plan.files))
+  const missing = allowedFiles.filter((file) => !assigned.has(file))
+  if (!missing.length) return plans
+
+  for (const file of missing) {
+    const target = findBestCommitForFile(plans, file)
+    target.files.push(file)
+    process.stderr.write(
+      `Auto-assigned omitted file to commit: ${file} → ${target.message}\n`,
+    )
+  }
+  return plans
+}
+
+function findBestCommitForFile(plans, file) {
+  const fileDir = path.dirname(file)
+
+  const sameDir = plans.find((plan) =>
+    plan.files.some((candidate) => path.dirname(candidate) === fileDir),
+  )
+  if (sameDir) return sameDir
+
+  let best = plans[0]
+  let bestScore = -1
+  for (const plan of plans) {
+    for (const candidate of plan.files) {
+      const score = commonPathPrefixLength(candidate, file)
+      if (score > bestScore) {
+        bestScore = score
+        best = plan
+      }
+    }
+  }
+  return best
+}
+
+function commonPathPrefixLength(left, right) {
+  const leftParts = left.split('/')
+  const rightParts = right.split('/')
+  let index = 0
+  while (
+    index < leftParts.length &&
+    index < rightParts.length &&
+    leftParts[index] === rightParts[index]
+  ) {
+    index++
+  }
+  return index
+}
+
 function normalizeCommitMessage(message) {
   const lines = String(message || '')
     .split('\n')
@@ -568,17 +689,25 @@ async function validateAndNormalizePlans(cwd, plans) {
   }
 }
 
-function fileHasChanges(cwd, file) {
-  const filePath = path.join(cwd, file)
-  if (!fs.existsSync(filePath)) return false
-
-  const tracked =
+function isTracked(cwd, file) {
+  return (
     spawnSync('git', ['ls-files', '--error-unmatch', '--', file], {
       cwd: cwd,
       encoding: 'utf8',
     }).status === 0
+  )
+}
 
-  if (!tracked) return true
+function isUntracked(cwd, file) {
+  return !isTracked(cwd, file) && fs.existsSync(path.join(cwd, file))
+}
+
+function fileHasChanges(cwd, file) {
+  const filePath = path.join(cwd, file)
+  const tracked = isTracked(cwd, file)
+
+  if (!tracked) return fs.existsSync(filePath)
+  if (!fs.existsSync(filePath)) return true
 
   return (
     spawnSync('git', ['diff', '--quiet', 'HEAD', '--', file], {
@@ -588,6 +717,11 @@ function fileHasChanges(cwd, file) {
   )
 }
 
+function stageFiles(cwd, files) {
+  if (!files.length) return
+  git(cwd, ['add', '-A', '--', ...files])
+}
+
 async function confirm(count) {
   if (!input.isTTY) throw new Error('No TTY — use --yes or --dry-run')
   const rl = readline.createInterface({ input, output })