@itcase/config 1.7.24 → 1.7.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itcase/config",
-  "version": "1.7.24",
+  "version": "1.7.26",
   "author": "ITCase",
   "description": "ITCase Config",
   "engines": {
@@ -43,11 +43,11 @@
     "@commitlint/config-conventional": "^21.2.3",
     "@commitlint/cz-commitlint": "^21.2.3",
     "@lehoczky/postcss-fluid": "^1.0.3",
-    "@lerna-lite/cli": "^5.6.2",
-    "@lerna-lite/exec": "^5.6.2",
-    "@lerna-lite/list": "^5.6.2",
-    "@lerna-lite/run": "^5.6.2",
-    "@lerna-lite/watch": "^5.6.2",
+    "@lerna-lite/cli": "^5.6.3",
+    "@lerna-lite/exec": "^5.6.3",
+    "@lerna-lite/list": "^5.6.3",
+    "@lerna-lite/run": "^5.6.3",
+    "@lerna-lite/watch": "^5.6.3",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "^7.1.0",
     "@rollup/plugin-commonjs": "^29.0.3",
@@ -68,11 +68,11 @@
     "commitizen": "^4.3.2",
     "conventional-changelog-conventionalcommits": "9.3.1",
     "conventional-changelog-writer": "9.3.0",
-    "cssnano": "^9.3.2",
-    "cssnano-preset-default": "^9.3.2",
+    "cssnano": "^9.8.0",
+    "cssnano-preset-default": "^9.8.0",
     "inquirer": "^14.2.3",
     "log-update": "^8.0.0",
-    "postcss": "^8.5.29",
+    "postcss": "^8.5.30",
     "postcss-aspect-ratio-polyfill": "^2.0.0",
     "postcss-clamp": "^4.1.0",
     "postcss-cli": "^12.0.0",
@@ -80,19 +80,19 @@
     "postcss-combine-duplicated-selectors": "^11.0.0",
     "postcss-convert-unit": "^0.1.3",
     "postcss-dark-theme-class": "^2.0.0",
-    "postcss-discard-duplicates": "^9.0.5",
+    "postcss-discard-duplicates": "^9.0.7",
     "postcss-each": "^1.1.0",
     "postcss-easings": "^4.0.0",
     "postcss-extend-rule": "^4.0.0",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-hexrgba": "^2.1.0",
-    "postcss-import": "^17.0.0",
+    "postcss-import": "^17.0.1",
     "postcss-import-ext-glob": "^2.1.1",
     "postcss-loader": "^8.2.1",
     "postcss-merge-at-rules": "^2.0.1",
     "postcss-mixins": "^12.1.2",
     "postcss-mq-extract": "^1.0.0",
-    "postcss-nested": "^8.0.1",
+    "postcss-nested": "^9.0.0",
     "postcss-nested-ancestors": "^3.0.0",
     "postcss-normalize": "^13.0.1",
     "postcss-prepend-imports": "^1.0.1",
@@ -110,17 +110,17 @@
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "rollup-preserve-directives": "^1.1.3",
     "semantic-release": "^25.0.9",
-    "semantic-release-lerna": "^3.6.5"
+    "semantic-release-lerna": "^3.6.7"
   },
   "devDependencies": {
     "@itcase/agent-skills": "^1.0.13",
-    "@itcase/lint": "^1.1.126",
+    "@itcase/lint": "^1.1.130",
     "eslint": "9.39.2",
     "husky": "^9.1.7",
     "inquirer": "^14.2.3",
     "lint-staged": "^17.6.0",
-    "prettier": "^3.9.9",
-    "storybook": "^10.6.1",
+    "prettier": "^3.9.10",
+    "storybook": "^10.6.2",
     "stylelint": "^17.16.0",
     "typescript": "^6.0.3"
   }

package/smart-commit/cli.js

@@ -24,10 +24,18 @@ 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
+// A small change set still sends the patch. A large tree used to be many
+// agent calls with up to 80k chars of diff each. Compact numstat keeps that
+// to one call.
+const MAX_DIFF = 20_000
+const COMPACT_SUMMARY_MAX = 12_000
+const SMALL_PLAN_FILES = 12
+const PER_FILE_EXCERPT = 500
+const EXCERPT_SKIP_LINES = 400
+const EXCERPT_MAX_BYTES = 256 * 1024
 const GIT_MAX_BUFFER = 32 * 1024 * 1024
 const GIT_PATH_BATCH = 40
-const PLAN_FILE_BATCH = 40
+const PLAN_FILE_BATCH = 250
 const ARG_SAFE = 100_000
 const LOCKFILE_NAMES = new Set([
   'package-lock.json',
@@ -221,10 +229,17 @@ async function main(argv) {
 
     // Drop leftover index entries so only this plan's files are committed.
     git(cwd, ['reset', '-q', 'HEAD'])
-    stageFiles(cwd, filesToStage)
+    const skippedOnStage = stageFiles(cwd, filesToStage)
     const staged = lines(cwd, ['diff', '--cached', '--name-only'])
     const stagedForPlan = filesToStage.filter((file) => staged.includes(file))
     if (!stagedForPlan.length) {
+      const skipped = new Set(skippedOnStage)
+      // Ignored paths were not staged on purpose. Stop this commit and keep
+      // going — one ignored directory must not drop the rest of the run.
+      if (filesToStage.every((file) => skipped.has(file))) {
+        process.stdout.write(`${dim(`      skip ignored: ${plan.message}`)}\n`)
+        continue
+      }
       throw new Error(
         `Nothing staged for commit: ${plan.message}\n` +
           `Files: ${filesToStage.join(', ')}`,
@@ -601,8 +616,10 @@ function buildPrompt(scopes, types, files, cwd, type) {
 
   const sourceFiles = files.filter((file) => !isLockfile(file))
   const lockFiles = files.filter((file) => isLockfile(file))
+  const diffLimit =
+    sourceFiles.length > SMALL_PLAN_FILES ? COMPACT_SUMMARY_MAX : MAX_DIFF
   let diff = buildSourceDiff(cwd, sourceFiles)
-  if (diff.length > MAX_DIFF) diff = `${diff.slice(0, MAX_DIFF)}\n…truncated`
+  if (diff.length > diffLimit) diff = `${diff.slice(0, diffLimit)}\n…truncated`
 
   return `Plan git commits. Do not edit files or run git commit.
 Return ONLY JSON: {"commits":[{"message":"type(scope): subject","files":["a.ts"]}]}
@@ -615,6 +632,7 @@ Prefer one commit when changes belong to the same feature.
 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.
+Do not use tools or read files. The file list and diff below are the only source.
 ${type ? `Prefer type "${type}".\n` : ''}Files:
 ${files
   .map((file) => {
@@ -637,6 +655,11 @@ ${diff || '(none)'}
 }
 
 function buildSourceDiff(cwd, files) {
+  if (files.length > SMALL_PLAN_FILES) return buildCompactSourceDiff(cwd, files)
+  return buildFullSourceDiff(cwd, files, MAX_DIFF)
+}
+
+function buildFullSourceDiff(cwd, files, limit) {
   const tracked = []
   const untracked = []
   for (const file of files) {
@@ -647,13 +670,13 @@ function buildSourceDiff(cwd, files) {
   const parts = []
   let used = 0
   const pushLimited = (text) => {
-    if (used >= MAX_DIFF) return false
+    if (used >= limit) return false
     // Empty batch (no changes / ENOBUFS skip) — keep scanning remaining files.
     if (!text) return true
-    const room = MAX_DIFF - used
+    const room = limit - used
     if (text.length > room) {
       parts.push(`${text.slice(0, room)}\n…truncated`)
-      used = MAX_DIFF
+      used = limit
       return false
     }
     parts.push(text)
@@ -662,17 +685,120 @@ function buildSourceDiff(cwd, files) {
   }
 
   forEachBatch(tracked, (batch) => {
-    if (used >= MAX_DIFF) return false
+    if (used >= limit) return false
     return pushLimited(tryOut(cwd, ['diff', 'HEAD', '--', ...batch]))
   })
   for (const file of untracked) {
-    if (used >= MAX_DIFF) break
+    if (used >= limit) break
     const piece = buildUntrackedDiff(cwd, file)
     if (!pushLimited(piece)) break
   }
   return parts.join('\n\n')
 }
 
+function buildCompactSourceDiff(cwd, files) {
+  const tracked = []
+  const untracked = new Set()
+  for (const file of files) {
+    if (isUntracked(cwd, file)) untracked.add(file)
+    else tracked.push(file)
+  }
+
+  const statLines = []
+  forEachBatch(tracked, (batch) => {
+    const text = tryOut(cwd, ['diff', '--numstat', 'HEAD', '--', ...batch])
+    if (text) statLines.push(...text.split('\n').filter(Boolean))
+  })
+  for (const file of untracked) statLines.push(untrackedNumstatLine(cwd, file))
+
+  const weightByFile = new Map()
+  for (const line of statLines) {
+    const file = line.split('\t').slice(2).join('\t')
+    weightByFile.set(file, parseNumstatWeight(line))
+  }
+
+  const header = `numstat (added, removed, path):\n${statLines.join('\n')}`
+  if (header.length >= COMPACT_SUMMARY_MAX) {
+    return `${header.slice(0, COMPACT_SUMMARY_MAX)}\n…truncated`
+  }
+
+  const ranked = [...files].sort((left, right) => {
+    const leftWeight = weightByFile.get(left)
+    const rightWeight = weightByFile.get(right)
+    return (rightWeight ?? -1) - (leftWeight ?? -1)
+  })
+
+  const excerptHeader = '\n\nchanged lines:\n'
+  let room = COMPACT_SUMMARY_MAX - header.length - excerptHeader.length
+  const excerpts = []
+  for (const file of ranked) {
+    if (room < 40) break
+    const weight = weightByFile.get(file)
+    if (weight == null || weight > EXCERPT_SKIP_LINES) continue
+    if (weight === 0 && !untracked.has(file)) continue
+    const excerpt = changedLineExcerpt(
+      cwd,
+      file,
+      untracked.has(file),
+      Math.min(PER_FILE_EXCERPT, room),
+    )
+    if (!excerpt) continue
+    excerpts.push(excerpt)
+    room -= excerpt.length + 1
+  }
+
+  if (!excerpts.length) return header
+  return `${header}${excerptHeader}${excerpts.join('\n')}`
+}
+
+function parseNumstatWeight(line) {
+  const [added, removed] = line.split('\t')
+  if (added === '-' || removed === '-') return null
+  return (Number(added) || 0) + (Number(removed) || 0)
+}
+
+function untrackedNumstatLine(cwd, file) {
+  const text = readTextFileHead(cwd, file)
+  if (text == null) return `-\t-\t${file}`
+  const lines = text ? text.split('\n').length : 0
+  return `${lines}\t0\t${file}`
+}
+
+function readTextFileHead(cwd, file) {
+  const filePath = path.join(cwd, file)
+  let stat
+  try {
+    stat = fs.statSync(filePath)
+  } catch {
+    return null
+  }
+  if (!stat.isFile() || stat.size > EXCERPT_MAX_BYTES) return null
+  const buffer = fs.readFileSync(filePath)
+  if (buffer.includes(0)) return null
+  return buffer.toString('utf8')
+}
+
+function changedLineExcerpt(cwd, file, untracked, cap) {
+  if (untracked) {
+    const text = readTextFileHead(cwd, file)
+    if (!text) return ''
+    const body = text.length > cap ? `${text.slice(0, cap)}…` : text
+    return `${file}:\n${body}`
+  }
+
+  const raw = tryOut(cwd, ['diff', '-U0', '--no-color', 'HEAD', '--', file])
+  if (!raw) return ''
+  const lines = []
+  for (const line of raw.split('\n')) {
+    if (line.startsWith('+++') || line.startsWith('---')) continue
+    if (line.startsWith('+') || line.startsWith('-')) lines.push(line)
+  }
+  if (!lines.length) return ''
+  let body = lines.join('\n')
+  if (body.length > cap) body = `${body.slice(0, cap)}…`
+  return `${file}:\n${body}`
+}
+
 function buildUntrackedDiff(cwd, file) {
   const filePath = path.join(cwd, file)
   if (!fs.existsSync(filePath)) return ''
@@ -1548,13 +1674,28 @@ function isOnDisk(cwd, file) {
 function gitIgnoredFiles(cwd, files) {
   if (!files.length) return []
 
-  const result = spawnSync('git', ['check-ignore', '-z', '--stdin'], {
+  // Without --no-index, check-ignore hides tracked files that match
+  // gitignore. Those still stage, unless a parent directory is ignored:
+  // `git add` then exits 1 and names the directory, not the file.
+  const direct = pathsIgnoredByGit(cwd, files)
+  const underIgnoredDirectory = filesUnderIgnoredDirectory(cwd, files)
+  return [...new Set([...direct, ...underIgnoredDirectory])]
+}
+
+function pathsIgnoredByGit(cwd, paths, option = {}) {
+  if (!paths.length) return []
+
+  const args = ['check-ignore', '-z', '--stdin']
+  if (option.noIndex) args.push('--no-index')
+  const result = spawnSync('git', args, {
+    maxBuffer: GIT_MAX_BUFFER,
     cwd: cwd,
     encoding: 'utf8',
-    input: `${files.join('\0')}\0`,
+    input: `${paths.join('\0')}\0`,
     stdio: ['pipe', 'pipe', 'pipe'],
   })
-  // 0 — at least one path is ignored, 1 — none.
+  // 0 — at least one path is ignored, 1 — none. Any other status is a
+  // fatal; treat it as "nothing ignored" and let git add surface it.
   if (result.status !== 0) return []
 
   const ignored = new Set(
@@ -1562,7 +1703,67 @@ function gitIgnoredFiles(cwd, files) {
       .split('\0')
       .filter(Boolean),
   )
-  return files.filter((file) => ignored.has(file))
+  return paths.filter((file) => ignored.has(file))
+}
+
+function ancestorDirectories(file) {
+  const ancestors = []
+  let directory = path.posix.dirname(file)
+  while (directory && directory !== '.') {
+    ancestors.push(directory)
+    directory = path.posix.dirname(directory)
+  }
+  return ancestors
+}
+
+function filesUnderIgnoredDirectory(cwd, files) {
+  const ancestorsByFile = new Map()
+  const uniqueAncestors = []
+  const seen = new Set()
+  for (const file of files) {
+    const ancestors = ancestorDirectories(file)
+    ancestorsByFile.set(file, ancestors)
+    for (const ancestor of ancestors) {
+      if (seen.has(ancestor)) continue
+      seen.add(ancestor)
+      uniqueAncestors.push(ancestor)
+    }
+  }
+
+  const ignoredAncestors = new Set(
+    pathsIgnoredByGit(cwd, uniqueAncestors, { noIndex: true }),
+  )
+  if (!ignoredAncestors.size) return []
+
+  return files.filter((file) =>
+    ancestorsByFile
+      .get(file)
+      .some((ancestor) => ignoredAncestors.has(ancestor)),
+  )
+}
+
+function pathMatchesIgnored(file, ignoredPaths) {
+  return ignoredPaths.some(
+    (ignored) => file === ignored || file.startsWith(`${ignored}/`),
+  )
+}
+
+function ignoredPathsFromGitAdd(stderr) {
+  const header =
+    'The following paths are ignored by one of your .gitignore files:'
+  const start = String(stderr || '').indexOf(header)
+  if (start < 0) return []
+
+  const paths = []
+  for (const line of String(stderr)
+    .slice(start + header.length)
+    .split('\n')) {
+    const trimmed = line.trim().replace(/\/+$/, '')
+    if (!trimmed) continue
+    if (trimmed.startsWith('hint:')) break
+    paths.push(trimmed)
+  }
+  return paths
 }
 
 function isTracked(cwd, file) {
@@ -1631,14 +1832,17 @@ function includeHookLockfiles(cwd, planFiles, dirtyBefore) {
 }
 
 function stageFiles(cwd, files) {
-  if (!files.length) return
+  if (!files.length) return []
 
-  // `git add -- ignored/path` exits 1 and abandons the rest of the batch.
-  // Tracked files that also match gitignore still stage; check-ignore
-  // omits them unless --no-index is passed.
+  // `git add -- path/inside/ignored-dir` exits 1 and names the directory,
+  // after it has already updated the index. Drop those paths first. If git
+  // add still reports an ignored directory, take those paths back out and
+  // keep the rest of the batch. Tracked files that match gitignore but do
+  // not sit inside an ignored directory still stage.
   const ignored = new Set(gitIgnoredFiles(cwd, files))
   const stageableFiles = files.filter((file) => !ignored.has(file))
-  if (!stageableFiles.length) return
+  const skipped = [...ignored]
+  if (!stageableFiles.length) return skipped
 
   const existing = []
   const removed = []
@@ -1650,11 +1854,33 @@ function stageFiles(cwd, files) {
   // `git add -A -- deleted/path` warns or misses the deletion when the
   // parent directory is already gone. `git rm` stages the index removal.
   forEachBatch(existing, (batch) => {
-    git(cwd, ['add', '-A', '--', ...batch])
+    const result = git(cwd, ['add', '-A', '--', ...batch], {
+      allowIgnored: true,
+    })
+    if (!result.status) return
+
+    const ignoredPaths = ignoredPathsFromGitAdd(result.stderr || '')
+    const blocked = batch.filter((file) =>
+      pathMatchesIgnored(file, ignoredPaths),
+    )
+    if (!blocked.length) {
+      throw new Error(
+        (result.stderr || '').trim() || `git add -A -- ${batch.join(' ')}`,
+      )
+    }
+
+    // git add writes the index before returning 1, including tracked files
+    // under the ignored directory. Take those back out of this commit.
+    git(cwd, ['reset', '-q', 'HEAD', '--', ...blocked])
+    skipped.push(...blocked)
+    process.stdout.write(
+      `${dim(`      skipped (gitignore): ${blocked.join(', ')}`)}\n`,
+    )
   })
   forEachBatch(removed, (batch) => {
     git(cwd, ['rm', '--ignore-unmatch', '-q', '--', ...batch])
   })
+  return skipped
 }
 
 async function confirm(count) {
@@ -1899,6 +2125,9 @@ function git(cwd, args, option = {}) {
 
     const stderr = result.stderr || ''
     if (!retryIndexLock(cwd, attempt, stderr)) {
+      if (option.allowIgnored && ignoredPathsFromGitAdd(stderr).length) {
+        return result
+      }
       if (option.inherit && stderr) process.stderr.write(stderr)
       throw new Error(stderr.trim() || `git ${args.join(' ')}`)
     }