@icode-js/icode 3.2.0 → 3.4.0

package/src/core/tools/theme.js

@@ -0,0 +1,228 @@
+// 终端配色与排版工具。所有命令的输出都走这里，保证风格一致。
+// 规则：FORCE_COLOR 强制开启；NO_COLOR 关闭；否则只在 TTY 中显示颜色。
+
+const CODES = {
+  reset: 0,
+  bold: 1,
+  dim: 2,
+  italic: 3,
+  underline: 4,
+  red: 31,
+  green: 32,
+  yellow: 33,
+  blue: 34,
+  magenta: 35,
+  cyan: 36,
+  gray: 90,
+  brightRed: 91,
+  brightGreen: 92,
+  brightYellow: 93,
+  brightBlue: 94,
+  brightMagenta: 95,
+  brightCyan: 96
+}
+
+const CLOSE = {
+  bold: 22,
+  dim: 22,
+  italic: 23,
+  underline: 24
+}
+
+let forcedStream = null
+
+// 把家目录前缀显示成 ~，路径更短。
+export function shortenHome(value) {
+  const text = String(value ?? '')
+  const home = process.env.HOME || process.env.USERPROFILE || ''
+  return home && text.startsWith(home) ? `~${text.slice(home.length)}` : text
+}
+
+// JSON 模式下普通日志走 stderr，颜色判断也要看 stderr。
+export function setColorStream(stream) {
+  forcedStream = stream
+}
+
+export function colorEnabled(stream = forcedStream || process.stdout) {
+  const force = process.env.FORCE_COLOR
+  if (force != null && force !== '' && force !== '0' && force !== 'false') {
+    return true
+  }
+  if (process.env.NO_COLOR != null && process.env.NO_COLOR !== '') {
+    return false
+  }
+  if (force === '0' || force === 'false') {
+    return false
+  }
+  return Boolean(stream?.isTTY)
+}
+
+function paint(name, text) {
+  const value = String(text ?? '')
+  if (!colorEnabled() || !CODES[name]) {
+    return value
+  }
+  const close = CLOSE[name] || 39
+  return `\x1b[${CODES[name]}m${value}\x1b[${close}m`
+}
+
+// 去掉 ANSI 颜色，用来计算显示宽度。
+export function stripAnsi(text) {
+  return String(text ?? '').replace(/\x1b\[[0-9;]*m/g, '')
+}
+
+// 估算显示宽度：中日韩全角字符按 2 计算。
+export function displayWidth(text) {
+  let width = 0
+  for (const char of stripAnsi(text)) {
+    const code = char.codePointAt(0)
+    width += (code >= 0x1100 && (code <= 0x115f || (code >= 0x2e80 && code <= 0xa4cf) || (code >= 0xac00 && code <= 0xd7a3) ||
+      (code >= 0xf900 && code <= 0xfaff) || (code >= 0xfe30 && code <= 0xfe4f) || (code >= 0xff00 && code <= 0xff60) ||
+      (code >= 0xffe0 && code <= 0xffe6) || (code >= 0x1f300 && code <= 0x1faff))) ? 2 : 1
+  }
+  return width
+}
+
+export function pad(text, width) {
+  const value = String(text ?? '')
+  const gap = width - displayWidth(value)
+  return gap > 0 ? `${value}${' '.repeat(gap)}` : value
+}
+
+// 超出宽度时截断并加省略号。
+export function truncate(text, width) {
+  const value = String(text ?? '')
+  if (displayWidth(value) <= width) {
+    return value
+  }
+  let result = ''
+  for (const char of stripAnsi(value)) {
+    if (displayWidth(`${result}${char}…`) > width) {
+      break
+    }
+    result += char
+  }
+  return `${result}…`
+}
+
+export const c = Object.fromEntries(Object.keys(CODES).filter((key) => key !== 'reset').map((key) => [key, (text) => paint(key, text)]))
+
+export const icons = {
+  get success() { return c.green('✔') },
+  get error() { return c.red('✖') },
+  get warn() { return c.yellow('▲') },
+  get info() { return c.cyan('●') },
+  get arrow() { return c.cyan('›') },
+  get pointer() { return c.cyan('❯') },
+  get dot() { return c.gray('·') }
+}
+
+// 语义化着色：同一类信息在所有命令里颜色一致。
+export const ui = {
+  branch: (name) => c.magenta(name),
+  remote: (name) => c.blue(name),
+  hash: (sha) => c.yellow(String(sha || '').slice(0, 8)),
+  tag: (name) => c.brightYellow(name),
+  path: (value) => c.cyan(shortenHome(value)),
+  url: (value) => c.underline(c.blue(value)),
+  time: (value) => c.gray(value),
+  author: (value) => c.green(value),
+  dim: (value) => c.gray(value),
+  strong: (value) => c.bold(value),
+  ok: (value) => c.green(value),
+  bad: (value) => c.red(value),
+  warn: (value) => c.yellow(value),
+  key: (value) => c.gray(value),
+  code: (value) => c.cyan(value),
+
+  // ahead/behind 显示为 ↑2 ↓1。
+  sync(ahead = 0, behind = 0) {
+    const parts = []
+    if (ahead) {
+      parts.push(c.green(`↑${ahead}`))
+    }
+    if (behind) {
+      parts.push(c.red(`↓${behind}`))
+    }
+    return parts.join(' ')
+  },
+
+  // 检查项状态徽标。
+  status(status) {
+    if (status === 'pass' || status === 'ok') {
+      return c.green('✔ 通过')
+    }
+    if (status === 'warn') {
+      return c.yellow('▲ 注意')
+    }
+    if (status === 'fail' || status === 'error') {
+      return c.red('✖ 失败')
+    }
+    return c.gray(status)
+  },
+
+  // Conventional Commit 标题着色：类型和 scope 高亮。
+  subject(subject) {
+    const match = String(subject || '').match(/^(\w+)(\([^)]*\))?(!)?:\s*(.*)$/)
+    if (!match) {
+      return String(subject || '')
+    }
+    const typeColors = { feat: 'green', fix: 'red', perf: 'magenta', refactor: 'blue', docs: 'cyan', test: 'yellow', chore: 'gray', ci: 'gray', build: 'gray', style: 'gray', revert: 'brightRed' }
+    const color = typeColors[match[1].toLowerCase()] || 'cyan'
+    return `${c[color](match[1])}${match[2] ? c.gray(match[2]) : ''}${match[3] ? c.red('!') : ''}: ${match[4]}`
+  }
+}
+
+/**
+ * 渲染标题行：`━━ 标题 ━━━━`。
+ */
+export function title(text) {
+  const label = ` ${text} `
+  const width = Math.max(10, Math.min(60, (process.stdout.columns || 80) - 2) - displayWidth(label) - 2)
+  return `${c.cyan('━━')}${c.bold(label)}${c.cyan('━'.repeat(width))}`
+}
+
+/**
+ * 渲染键值对，key 列对齐。rows: [[key, value], ...]，value 为空的行会跳过。
+ */
+export function keyValues(rows, options = {}) {
+  const visible = rows.filter(([, value]) => value !== undefined && value !== null && value !== '')
+  const keyWidth = Math.max(0, ...visible.map(([key]) => displayWidth(key)))
+  const indent = ' '.repeat(options.indent ?? 2)
+  return visible.map(([key, value]) => `${indent}${c.gray(pad(key, keyWidth))}  ${value}`).join('\n')
+}
+
+/**
+ * 渲染表格。columns: [{ key, label, width?, align?, format? }]，rows 为对象数组。
+ * 列宽自动取内容最大宽度（受 maxWidth 限制）。
+ */
+export function table(rows, columns, options = {}) {
+  const indent = ' '.repeat(options.indent ?? 2)
+  const cells = rows.map((row) => columns.map((column) => {
+    // 先截断原始值再上色，避免截断时丢失颜色。
+    let value = row[column.key]
+    if (column.maxWidth && typeof value === 'string') {
+      value = truncate(value, column.maxWidth)
+    }
+    const raw = column.format ? column.format(value, row) : value
+    return String(raw ?? '')
+  }))
+  const widths = columns.map((column, index) => Math.max(
+    options.header === false ? 0 : displayWidth(column.label || ''),
+    ...cells.map((line) => displayWidth(line[index]))
+  ))
+
+  const lines = []
+  if (options.header !== false) {
+    lines.push(indent + columns.map((column, index) => c.gray(pad(column.label || '', widths[index]))).join('  ').trimEnd())
+  }
+  for (const line of cells) {
+    lines.push(indent + line.map((cell, index) => (index === line.length - 1 ? cell : pad(cell, widths[index]))).join('  ').trimEnd())
+  }
+  return lines.join('\n')
+}
+
+// 打印到 stdout（JSON 模式下 logger 会改走 stderr，这里统一跟随）。
+export function print(text = '') {
+  ;(forcedStream || process.stdout).write(`${text}\n`)
+}

package/src/workflows/ai-commit-workflow.js

@@ -4,7 +4,8 @@ import { buildLimitedDiffPrompt, formatDiffCoverage, summarizeDiffCoverage } fro
 import { resolveGitContext } from '../core/git/context.js'
 import { scanCommitConventions } from '../core/git/commit-conventions.js'
 import { GitService } from '../core/git/service.js'
-import { confirm } from '../core/tools/interactive.js'
+import { chooseOne, input, isInteractiveTerminal } from '../core/tools/interactive.js'
+import { c, print, ui, shortenHome } from '../core/tools/theme.js'
 import { logger } from '../core/tools/logger.js'
 
 function normalizeCommitType(value) {
@@ -51,11 +52,14 @@ export async function runAiCommitWorkflow(options) {
   const git = new GitService(context)
 
   if (!options.silentContextLog) {
-    logger.info(`仓库根目录: ${context.topLevelPath}`)
+    logger.hint(`仓库 ${shortenHome(context.topLevelPath)}`)
   }
 
-  const stagedDiff = await git.diffStaged()
-  const workingDiff = await git.diffWorkingTree()
+  // scope 控制 AI 看到的改动范围：stagedOnly 只看暂存区；paths 只看指定路径。
+  const scopePaths = Array.isArray(options.paths) ? options.paths.filter(Boolean) : []
+  const stagedOnly = options.stagedOnly === true
+  const stagedDiff = await git.diffStaged(scopePaths)
+  const workingDiff = stagedOnly ? '' : await git.diffWorkingTree(scopePaths)
   const hasStagedDiff = Boolean(stagedDiff.trim())
   const hasWorkingDiff = Boolean(workingDiff.trim())
   const diff = joinDiffSections([
@@ -89,19 +93,23 @@ export async function runAiCommitWorkflow(options) {
     logger.info(`检测到提交规范配置，AI 将优先参考: ${conventionContext.sources.join(', ')}`)
   }
 
-  const { parsed, text } = await askAiJson(
-    {
-      systemPrompt: `You are a senior software engineer. Generate a concise Conventional Commit message. Output JSON only. Language: ${language}.`,
-      userPrompt: `${conventionPrompt}Based on the following git diff, return JSON with fields:\n{\"type\":\"feat|fix|docs|style|refactor|perf|test|chore|build|ci|revert\",\"scope\":\"optional\",\"subject\":\"required one-line summary\",\"body\":\"optional details\"}\n\nDiff Source: ${diffSource}\n\n${formatDiffCoverage(limitedDiff.coverage)}\n\nDiff:\n${limitedDiff.diff}`
-    },
-    {
-      profile: options.profile
-    }
-  )
+  const generate = async () => {
+    const { parsed, text } = await askAiJson(
+      {
+        systemPrompt: `You are a senior software engineer. Generate a concise Conventional Commit message. Output JSON only. Language: ${language}.`,
+        userPrompt: `${conventionPrompt}Based on the following git diff, return JSON with fields:\n{\"type\":\"feat|fix|docs|style|refactor|perf|test|chore|build|ci|revert\",\"scope\":\"optional\",\"subject\":\"required one-line summary\",\"body\":\"optional details\"}\n\nDiff Source: ${diffSource}\n\n${formatDiffCoverage(limitedDiff.coverage)}\n\nDiff:\n${limitedDiff.diff}`
+      },
+      {
+        profile: options.profile
+      }
+    )
+    return { commitMessage: buildCommitMessage(parsed), text }
+  }
 
-  const commitMessage = buildCommitMessage(parsed)
+  let { commitMessage, text } = await generate()
+  const interactiveReview = options.apply && !options.yes && isInteractiveTerminal()
 
-  if (!options.silentResultLog) {
+  if (!options.silentResultLog && !interactiveReview) {
     logger.success(`AI 建议提交信息:\n${commitMessage}`)
   }
 
@@ -114,9 +122,24 @@ export async function runAiCommitWorkflow(options) {
     }
   }
 
-  if (!options.yes) {
-    const accepted = await confirm('是否应用该提交信息并执行 commit ?', true)
-    if (!accepted) {
+  // 交互终端里让用户选择：直接用 / 改一下标题 / 重新生成 / 取消，不需要重写整条信息。
+  while (interactiveReview) {
+    const [subjectLine, ...bodyLines] = commitMessage.split('\n')
+    print('')
+    print(`  ${c.magenta('AI 建议')}  ${c.bold(ui.subject(subjectLine))}`)
+    bodyLines.filter((line) => line.trim()).forEach((line) => print(`  ${c.gray(line)}`))
+    print('')
+    const action = await chooseOne('使用这条提交信息？', [
+      { value: 'use', label: '使用并提交' },
+      { value: 'edit', label: '修改标题后提交', hint: '在原标题基础上改' },
+      { value: 'regenerate', label: '重新生成' },
+      { value: 'cancel', label: '取消' }
+    ], 0, { filter: false })
+
+    if (action === 'use') {
+      break
+    }
+    if (action === 'cancel') {
       return {
         applied: false,
         commitMessage,
@@ -125,15 +148,24 @@ export async function runAiCommitWorkflow(options) {
         canceled: true
       }
     }
+    if (action === 'edit') {
+      const edited = await input('标题', subjectLine)
+      commitMessage = [edited, ...bodyLines].join('\n')
+      break
+    }
+    ;({ commitMessage, text } = await generate())
   }
 
-  if (hasWorkingDiff) {
+  if (scopePaths.length) {
+    await git.stagePaths(scopePaths)
+  } else if (hasWorkingDiff) {
     // 统一暂存工作区改动，确保未暂存修改和新文件与 AI 看到的 diff 保持一致。
     await git.stageAll()
   }
 
   await git.commit(commitMessage, {
-    noVerify: options.noVerify
+    noVerify: options.noVerify,
+    paths: scopePaths
   })
 
   const commitId = await git.revParseShort('HEAD')

package/src/workflows/checkout-workflow.js

@@ -1,4 +1,6 @@
 import { IcodeError } from '../core/errors.js'
+import { ui, shortenHome } from '../core/tools/theme.js'
+import { withAutoStash } from '../core/git/autostash.js'
 import { resolveGitContext } from '../core/git/context.js'
 import {
   assertCleanWorktree,
@@ -23,7 +25,8 @@ export async function runCheckoutWorkflow(input) {
 
   const context = await resolveGitContext({
     cwd: input.cwd,
-    repoMode: input.repoMode
+    repoMode: input.repoMode,
+    remote: input.remote
   })
 
   const git = new GitService(context)
@@ -32,9 +35,18 @@ export async function runCheckoutWorkflow(input) {
   const safetyState = await readGitSafetyState(git)
   assertNoPendingOperation(safetyState.operation, 'checkout', 'CHECKOUT_GIT_OPERATION_IN_PROGRESS')
   assertNoConflictedFiles(safetyState.changes, 'checkout', 'CHECKOUT_CONFLICTED_FILES')
-  assertCleanWorktree(safetyState.changes, 'checkout', 'CHECKOUT_DIRTY_WORKTREE')
+  if (!input.autostash) {
+    assertCleanWorktree(safetyState.changes, 'checkout', 'CHECKOUT_DIRTY_WORKTREE')
+  }
+
+  return withAutoStash(git, input.autostash === true, `checkout ${branchName}`, () =>
+    switchToBranch(git, context, input, branchName, baseBranchName)
+  )
+}
+
+async function switchToBranch(git, context, input, branchName, baseBranchName) {
 
-  logger.info(`仓库根目录: ${context.topLevelPath}`)
+  logger.hint(`仓库 ${shortenHome(context.topLevelPath)}`)
   if (context.inheritedFromParent) {
     logger.warn('当前目录继承了父级 Git 仓库，命令将基于父仓库根目录执行。')
   }
@@ -45,10 +57,10 @@ export async function runCheckoutWorkflow(input) {
   const remoteExists = await git.branchExistsRemote(branchName)
 
   if (localExists) {
-    logger.info(`切换本地分支: ${branchName}`)
+    logger.info(`切换本地分支: ${ui.branch(branchName)}`)
     await git.checkout(branchName)
   } else if (remoteExists) {
-    logger.info(`创建并跟踪远程分支: ${branchName}`)
+    logger.info(`创建并跟踪远程分支: ${ui.branch(branchName)}`)
     await git.checkoutTracking(branchName)
   } else {
     const baseLocalExists = await git.branchExistsLocal(baseBranchName)
@@ -61,27 +73,27 @@ export async function runCheckoutWorkflow(input) {
       })
     }
 
-    const fromRef = baseLocalExists ? baseBranchName : `origin/${baseBranchName}`
-    logger.info(`从 ${fromRef} 新建分支: ${branchName}`)
+    const fromRef = baseLocalExists ? baseBranchName : git.remoteRef(baseBranchName)
+    logger.info(`从 ${fromRef} 新建分支: ${ui.branch(branchName)}`)
     await git.checkoutNewBranch(branchName, fromRef)
   }
 
   if (input.pullMain && context.defaultBranch !== branchName) {
-    logger.info(`同步主分支到当前分支: ${context.defaultBranch}`)
+    logger.info(`同步主分支到当前分支: ${ui.branch(context.defaultBranch)}`)
     await git.pull(context.defaultBranch, {
       noRebase: true
     })
   }
 
   if (remoteExists) {
-    logger.info(`拉取远程分支: ${branchName}`)
+    logger.info(`拉取远程分支: ${ui.branch(branchName)}`)
     await git.pull(branchName, {
       noRebase: true
     })
   }
 
   if (input.pushOrigin && !remoteExists) {
-    logger.info(`推送新分支到远程: ${branchName}`)
+    logger.info(`推送新分支到远程: ${ui.branch(branchName)}`)
     await git.push(branchName, {
       setUpstream: true,
       noVerify: input.noVerify
@@ -91,6 +103,8 @@ export async function runCheckoutWorkflow(input) {
   return {
     branchName,
     baseBranchName,
+    mode: localExists ? 'local' : remoteExists ? 'tracking' : 'created',
+    remote: git.remote,
     remoteExists,
     repoRoot: context.topLevelPath
   }