@itcase/config 1.7.25 → 1.7.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itcase/config",
-  "version": "1.7.25",
+  "version": "1.7.27",
   "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.9.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/semantic-release/androidAppPrepare.js

@@ -0,0 +1,161 @@
+import { execFileSync } from 'node:child_process'
+import { readFileSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+const MAILRU_WEBDAV_BASE = 'https://webdav.cloud.mail.ru'
+
+/**
+ * Prepare: bump Android → make APK → Mail.ru (если GIT_WORKFLOW=true).
+ *
+ * Env: SKIP_APK_BUILD, RELEASE_APK_TARGETS (stage,prod),
+ * MAILRU_USER, MAILRU_APP_PASSWORD, MAILRU_PUBLIC_URL.
+ *
+ * @param {{ apkPrefix: string, mailruDir: string }} options
+ */
+function createAndroidAppPreparePlugin({ apkPrefix, mailruDir }) {
+  if (!apkPrefix) {
+    throw new Error('createAndroidAppPreparePlugin: apkPrefix is required')
+  }
+  if (!mailruDir) {
+    throw new Error('createAndroidAppPreparePlugin: mailruDir is required')
+  }
+
+  const uploadDir = mailruDir.replace(/^\/+|\/+$/g, '')
+
+  return {
+    prepare: async (_pluginConfig, context) => {
+      const { logger, nextRelease, options } = context
+      const version = nextRelease.version
+
+      bumpAndroidVersion(version, logger)
+
+      if (options.dryRun || process.env.SKIP_APK_BUILD === '1') {
+        logger.log('Skip APK build (dry-run or SKIP_APK_BUILD=1)')
+        return
+      }
+
+      const apks = resolveApks(apkPrefix, version)
+      for (const apk of apks) {
+        logger.log(`make ${apk.make}`)
+        execFileSync('make', [apk.make], { stdio: 'inherit' })
+      }
+
+      uploadApks(apks, uploadDir, logger)
+    },
+  }
+}
+
+function bumpAndroidVersion(version, logger) {
+  if (!/^\d+\.\d+\.\d+(-[\w.-]+)?$/.test(version)) {
+    throw new Error(`Unsupported version format: "${version}"`)
+  }
+
+  const gradlePath = join(process.cwd(), 'android/app/build.gradle')
+  const content = readFileSync(gradlePath, 'utf8')
+  const vNameMatch = content.match(/def vName = "([^"]+)"/)
+  const vCodeMatch = content.match(/def vCode = (\d+)/)
+
+  if (!vNameMatch || !vCodeMatch) {
+    throw new Error('Could not find version in build.gradle')
+  }
+
+  if (vNameMatch[1] === version) {
+    logger.log(`Android vName already ${version}, skip bump`)
+    return
+  }
+
+  const newCode = Number(vCodeMatch[1]) + 1
+  writeFileSync(
+    gradlePath,
+    content
+      .replace(/def vName = "[^"]+"/, `def vName = "${version}"`)
+      .replace(/def vCode = \d+/, `def vCode = ${newCode}`),
+  )
+  logger.log(`Android vName = ${version}, vCode = ${newCode}`)
+}
+
+/** @returns {{ make: string, name: string, fileName: string }[]} */
+function resolveApks(apkPrefix, version) {
+  const defs = {
+    prod: {
+      name: 'PROD',
+      fileName: `${apkPrefix}-v${version}.apk`,
+      make: 'android-apk-prod',
+    },
+    stage: {
+      name: 'STAGE',
+      fileName: `${apkPrefix}-v${version}-STAGE.apk`,
+      make: 'android-apk-stage',
+    },
+  }
+
+  const keys = (process.env.RELEASE_APK_TARGETS || 'stage,prod')
+    .split(',')
+    .map((part) => part.trim())
+    .filter(Boolean)
+
+  if (keys.length === 0) {
+    throw new Error('RELEASE_APK_TARGETS is empty')
+  }
+
+  return keys.map((key) => {
+    const apk = defs[key]
+    if (!apk) {
+      throw new Error(
+        `Unknown RELEASE_APK_TARGETS entry: "${key}". Use stage, prod`,
+      )
+    }
+    return apk
+  })
+}
+
+function uploadApks(apks, uploadDir, logger) {
+  if (process.env.GIT_WORKFLOW !== 'true') {
+    logger.log('Skip Mail.ru upload (not CI)')
+    return
+  }
+
+  const user = process.env.MAILRU_USER
+  const password = process.env.MAILRU_APP_PASSWORD
+  const publicUrl = (process.env.MAILRU_PUBLIC_URL || '').replace(/\/$/, '')
+
+  if (!user || !password || !publicUrl) {
+    throw new Error(
+      'MAILRU_USER, MAILRU_APP_PASSWORD and MAILRU_PUBLIC_URL are required',
+    )
+  }
+
+  const uploadBase = `${MAILRU_WEBDAV_BASE}/${uploadDir}`
+  const downloads = []
+
+  for (const apk of apks) {
+    logger.log(`Upload ${apk.fileName} to ${uploadBase}/`)
+    execFileSync(
+      'curl',
+      [
+        '--fail',
+        '--silent',
+        '--show-error',
+        '--retry',
+        '2',
+        '--retry-delay',
+        '2',
+        '-T',
+        join(process.cwd(), 'builds', apk.fileName),
+        '--user',
+        `${user}:${password}`,
+        `${uploadBase}/${apk.fileName}`,
+      ],
+      { stdio: 'inherit' },
+    )
+    downloads.push({ name: apk.name, url: `${publicUrl}/${apk.fileName}` })
+  }
+
+  writeFileSync(
+    join(process.cwd(), 'builds', 'mailru-downloads.json'),
+    JSON.stringify(downloads),
+  )
+  logger.log('APK upload finished — Mail.ru links saved')
+}
+
+export { createAndroidAppPreparePlugin }

package/semantic-release/index.js

@@ -1,7 +1,4 @@
-import {
-  createSemanticReleaseApp,
-  semanticReleaseApp,
-} from './semanticReleaseApp.js'
+import { semanticReleaseApp } from './semanticReleaseApp.js'
 import { semanticReleaseBot } from './semanticReleaseBot.js'
 import { semanticReleaseDoc } from './semanticReleaseDoc.js'
 import { semanticReleaseMonorepo } from './semanticReleaseMonorepo.js'
@@ -10,7 +7,6 @@ import { semanticReleaseProject } from './semanticReleaseProject.js'
 import { semanticReleaseVSMarketplace } from './semanticReleaseVSMarketplace.js'
 
 export {
-  createSemanticReleaseApp,
   semanticReleaseApp,
   semanticReleaseBot,
   semanticReleaseDoc,

package/semantic-release/semanticReleaseApp.js

@@ -1,3 +1,4 @@
+import { createAndroidAppPreparePlugin } from './androidAppPrepare.js'
 import {
   createSemanticReleaseConfig,
   releaseNotesFromIssuesPlugin,
@@ -17,27 +18,44 @@ const DEFAULT_RELEASE_ASSETS = ['builds/*.apk']
  *
  * - Не публикует в npm
  * - Коммитит package + Android version-файлы
- * - Прикрепляет к GitHub release APK из `builds/` (если есть; отсутствующие пропускаются)
- * - Заметки релиза: сначала задачи из releaseNotesFromIssues.js, если они есть, потом обычные коммиты
+ * - Прикрепляет к GitHub release APK из `builds/`
+ * - Заметки релиза: сначала задачи, потом коммиты
  *
- * Сборку APK делайте в prepare проекта или отдельным CI job до publish.
+ * Если передан `apk`, в prepare: bump → make → Mail.ru (GIT_WORKFLOW=true).
  *
  * @param {Object} [options]
  * @param {string|string[]} [options.branches=['master']]
- * @param {string[]} [options.versionAssets] - файлы для @semantic-release/git
- * @param {string[]|Object[]} [options.releaseAssets] - assets для @semantic-release/github
- * @param {Array} [options.preparePlugins] - плагины после npm (например bump Android version + build APK)
- * @param {Object} [options.githubConfig] - доп. опции github-плагина
- * @param {Object} [options.gitConfig] - доп. опции git-плагина (мержатся поверх message/assets)
+ * @param {Object} [options.apk]
+ * @param {string} options.apk.prefix - agro-pps → builds/agro-pps-v*.apk
+ * @param {string} options.apk.mailruDir - папка WebDAV, напр. APK
+ * @param {string[]} [options.versionAssets]
+ * @param {string[]|Object[]} [options.releaseAssets] - по умолчанию builds/{prefix}-v*.apk
+ * @param {Array} [options.preparePlugins]
+ * @param {Object} [options.githubConfig]
+ * @param {Object} [options.gitConfig]
  */
-function createSemanticReleaseApp({
+function semanticReleaseApp({
+  apk,
   branches = ['master'],
   gitConfig = {},
   githubConfig = {},
   preparePlugins = [],
-  releaseAssets = DEFAULT_RELEASE_ASSETS,
+  releaseAssets,
   versionAssets = DEFAULT_VERSION_ASSETS,
 } = {}) {
+  const androidPrepare = apk
+    ? [
+        createAndroidAppPreparePlugin({
+          apkPrefix: apk.prefix,
+          mailruDir: apk.mailruDir,
+        }),
+      ]
+    : []
+
+  const githubAssets =
+    releaseAssets ??
+    (apk?.prefix ? [`builds/${apk.prefix}-v*.apk`] : DEFAULT_RELEASE_ASSETS)
+
   return createSemanticReleaseConfig({
     additionalPlugins: [releaseNotesFromIssuesPlugin],
     branches: branches,
@@ -48,16 +66,14 @@ function createSemanticReleaseApp({
       ...gitConfig,
     },
     githubConfig: {
-      assets: releaseAssets,
+      assets: githubAssets,
       ...githubConfig,
     },
     npmConfig: {
       npmPublish: false,
     },
-    preparePlugins: preparePlugins,
+    preparePlugins: [...androidPrepare, ...preparePlugins],
   })
 }
 
-const semanticReleaseApp = createSemanticReleaseApp()
-
-export { createSemanticReleaseApp, semanticReleaseApp }
+export { semanticReleaseApp }

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',
@@ -608,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"]}]}
@@ -622,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) => {
@@ -644,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) {
@@ -654,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)
@@ -669,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 ''