@itcase/config 1.6.81 → 1.6.82

package/husky-hooks/_lib.sh

@@ -48,10 +48,11 @@ itcase_conflict_marker_files() {
 }
 
 itcase_run_lint_staged() {
+  # ACMR drops deletions; include D so removed files stay in the commit.
   if [ -f "./node_modules/lint-staged/bin/lint-staged.js" ]; then
-    node ./node_modules/lint-staged/bin/lint-staged.js
+    node ./node_modules/lint-staged/bin/lint-staged.js --diff-filter=ACDMR
     return $?
   fi
 
-  npx lint-staged
+  npx lint-staged --diff-filter=ACDMR
 }

package/lint-staged/index.js

@@ -2,10 +2,21 @@ import { existsSync } from 'node:fs'
 import { resolve } from 'node:path'
 
 export default {
-  '*.(js|jsx|ts|tsx)': (files) => `npx eslint --fix --color ${files.join(' ')}`,
-  '*.css': (files) =>
-    `npx stylelint --fix --color --formatter verbose ${files.join(' ')}`,
-  '*.mdx': (files) => `npx eslint --fix --color ${files.join(' ')}`,
+  '*.(js|jsx|ts|tsx)': (files) => {
+    const existing = files.filter((file) => existsSync(file))
+    if (!existing.length) return 'true'
+    return `npx eslint --fix --color ${existing.join(' ')}`
+  },
+  '*.css': (files) => {
+    const existing = files.filter((file) => existsSync(file))
+    if (!existing.length) return 'true'
+    return `npx stylelint --fix --color --formatter verbose ${existing.join(' ')}`
+  },
+  '*.mdx': (files) => {
+    const existing = files.filter((file) => existsSync(file))
+    if (!existing.length) return 'true'
+    return `npx eslint --fix --color ${existing.join(' ')}`
+  },
   'package.json': (files) => {
     // Проверяем, есть ли package.json в корне репозитория
     const rootPackageJson = resolve(process.cwd(), 'package.json')

package/lint-staged-ts/index.js

@@ -3,17 +3,27 @@ import { resolve } from 'node:path'
 
 export default {
   '*.(ts|tsx)': (files) => {
-    const tsFiles = files.filter((f) => /\.(ts|tsx)$/.test(f))
+    const existing = files.filter((file) => existsSync(file))
+    const tsFiles = existing.filter((file) => /\.(ts|tsx)$/.test(file))
     const commands = []
     if (tsFiles.length > 0) {
       commands.push('tsc --noEmit --pretty')
     }
-    commands.push(`npx eslint --fix ${files.join(' ')}`)
-    return commands
+    if (existing.length > 0) {
+      commands.push(`npx eslint --fix ${existing.join(' ')}`)
+    }
+    return commands.length ? commands : 'true'
+  },
+  '*.css': (files) => {
+    const existing = files.filter((file) => existsSync(file))
+    if (!existing.length) return 'true'
+    return `npx stylelint --fix --color --formatter verbose ${existing.join(' ')}`
+  },
+  '*.mdx': (files) => {
+    const existing = files.filter((file) => existsSync(file))
+    if (!existing.length) return 'true'
+    return `npx eslint --fix ${existing.join(' ')}`
   },
-  '*.css': (files) =>
-    `npx stylelint --fix --color --formatter verbose ${files.join(' ')}`,
-  '*.mdx': (files) => `npx eslint --fix ${files.join(' ')}`,
   'package.json': (files) => {
     // Проверяем, есть ли package.json в корне репозитория
     const rootPackageJson = resolve(process.cwd(), 'package.json')

package/package.json

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

package/smart-commit/cli.js

@@ -22,6 +22,8 @@ import { getUpyachkaFrame } from './upyachka.js'
 
 const PACKAGE_NAME = '@itcase/config'
 const CLI_RELATIVE = 'smart-commit/cli.js'
+// Cheap Cursor Models pool — commit messages do not need Auto / frontier models.
+const DEFAULT_MODEL = 'composer-2.5'
 
 const MAX_DIFF = 80_000
 const LOCKFILE_NAMES = new Set([
@@ -54,6 +56,7 @@ const HELP = `smart-commit [--dry-run] [--yes|-y] [--type t] [--model id] [--ver
 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
+Default model: ${DEFAULT_MODEL} (override with --model / SMART_COMMIT_MODEL).
 
 Progress sprite is random (nyan cat, banana, upyachka, or Pac-Man).
 Force with --cat, --banana, --upyachka, or --pacman. Agent log is below.
@@ -104,7 +107,7 @@ async function main(argv) {
       (progress) =>
         askAgent(
           cwd,
-          option.model || process.env.SMART_COMMIT_MODEL || '',
+          option.model || process.env.SMART_COMMIT_MODEL || DEFAULT_MODEL,
           prompt,
           option.verbose,
           progress.onAgentActivity,
@@ -362,6 +365,7 @@ function listFiles(cwd, option) {
     ...new Set([
       ...lines(cwd, ['diff', '--cached', '--name-only', '--diff-filter=ACDMR']),
       ...lines(cwd, ['diff', '--name-only', '--diff-filter=ACDMR']),
+      ...lines(cwd, ['ls-files', '--deleted']),
       ...lines(cwd, ['ls-files', '--others', '--exclude-standard']),
     ]),
   ]
@@ -395,14 +399,15 @@ 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 — including new/untracked files (??).
+Split by scope. Each listed file in exactly one commit — including deleted files (D) and new/untracked files (??).
 Put each lockfile in the same commit as its sibling package.json. Do not make a lockfile-only commit.
 Do not add Co-authored-by or Made-with trailers.
 ${type ? `Prefer type "${type}".\n` : ''}Files:
 ${files
   .map((file) => {
     const status =
-      statusByFile.get(file) || (isUntracked(cwd, file) ? '??' : ' M')
+      statusByFile.get(file) ||
+      (isUntracked(cwd, file) ? '??' : isOnDisk(cwd, file) ? ' M' : 'D')
     const lockNote = isLockfile(file) ? ', lockfile' : ''
     return `- ${file} (${status}${lockNote})`
   })
@@ -1128,6 +1133,10 @@ async function validateAndNormalizePlans(cwd, plans) {
   }
 }
 
+function isOnDisk(cwd, file) {
+  return fs.existsSync(path.join(cwd, file))
+}
+
 function isTracked(cwd, file) {
   return (
     spawnSync('git', ['ls-files', '--error-unmatch', '--', file], {
@@ -1137,16 +1146,25 @@ function isTracked(cwd, file) {
   )
 }
 
+function isInHead(cwd, file) {
+  return (
+    spawnSync('git', ['cat-file', '-e', `HEAD:${file}`], {
+      cwd: cwd,
+      encoding: 'utf8',
+    }).status === 0
+  )
+}
+
 function isUntracked(cwd, file) {
-  return !isTracked(cwd, file) && fs.existsSync(path.join(cwd, file))
+  return !isTracked(cwd, file) && isOnDisk(cwd, file)
 }
 
 function fileHasChanges(cwd, file) {
-  const filePath = path.join(cwd, file)
+  const exists = isOnDisk(cwd, file)
   const tracked = isTracked(cwd, file)
 
-  if (!tracked) return fs.existsSync(filePath)
-  if (!fs.existsSync(filePath)) return true
+  if (!exists && (tracked || isInHead(cwd, file))) return true
+  if (!tracked) return exists
 
   return (
     spawnSync('git', ['diff', '--quiet', 'HEAD', '--', file], {
@@ -1158,7 +1176,20 @@ function fileHasChanges(cwd, file) {
 
 function stageFiles(cwd, files) {
   if (!files.length) return
-  git(cwd, ['add', '-A', '--', ...files])
+
+  const existing = []
+  const removed = []
+  for (const file of files) {
+    if (isOnDisk(cwd, file)) existing.push(file)
+    else removed.push(file)
+  }
+
+  // `git add -A -- deleted/path` warns or misses the deletion when the
+  // parent directory is already gone. `git rm` stages the index removal.
+  if (existing.length) git(cwd, ['add', '-A', '--', ...existing])
+  if (removed.length) {
+    git(cwd, ['rm', '--ignore-unmatch', '-q', '--', ...removed])
+  }
 }
 
 async function confirm(count) {