@icode-js/icode 3.2.0 → 3.4.0

package/src/core/cli/render.js

@@ -0,0 +1,121 @@
+import { c, displayWidth, keyValues, pad, print, table, title, truncate, ui } from '../tools/theme.js'
+
+// 各命令共用的“视图”渲染函数，保证输出风格一致。
+
+export { print, title, keyValues, table, ui, c }
+
+/**
+ * 渲染检查项列表（ready / doctor）。
+ * checks: [{ status, title, detail, nextStep?, suggestion? }]
+ */
+export function renderChecks(checks = []) {
+  const icon = { pass: c.green('✔'), warn: c.yellow('▲'), fail: c.red('✖') }
+  const titleWidth = Math.min(28, Math.max(0, ...checks.map((check) => displayWidth(check.title))))
+  for (const check of checks) {
+    const mark = icon[check.status] || c.gray('·')
+    const name = check.status === 'pass' ? check.title : check.status === 'fail' ? c.red(check.title) : c.yellow(check.title)
+    print(`  ${mark} ${pad(name, titleWidth)}  ${c.gray(check.detail || '')}`)
+    const next = check.nextStep || check.suggestion
+    if (next && check.status !== 'pass') {
+      print(`      ${c.cyan('→')} ${next}`)
+    }
+  }
+}
+
+/**
+ * 渲染整体状态行。status: pass | warn | fail
+ */
+export function renderOverallStatus(status, counts = {}) {
+  const label = {
+    pass: c.green(c.bold('✔ 一切就绪')),
+    warn: c.yellow(c.bold('▲ 可以继续，但有需要注意的地方')),
+    fail: c.red(c.bold('✖ 需要先处理以下问题'))
+  }[status] || status
+  const detail = Object.entries(counts)
+    .filter(([, value]) => value)
+    .map(([key, value]) => `${key} ${value}`)
+    .join(c.gray(' · '))
+  print(`\n${label}${detail ? `  ${c.gray(detail)}` : ''}`)
+}
+
+/**
+ * 工作区改动统计，例如：已暂存 2 · 未暂存 1 · 未跟踪 3。
+ */
+export function formatChanges(changes = {}) {
+  const parts = [
+    changes.staged ? c.green(`已暂存 ${changes.staged}`) : '',
+    changes.unstaged ? c.yellow(`未暂存 ${changes.unstaged}`) : '',
+    changes.untracked ? c.cyan(`未跟踪 ${changes.untracked}`) : '',
+    changes.conflicted ? c.red(`冲突 ${changes.conflicted}`) : ''
+  ].filter(Boolean)
+  return parts.length ? parts.join(c.gray(' · ')) : c.gray('工作区干净')
+}
+
+/**
+ * 提交列表：hash 时间 作者 标题 (refs)。
+ */
+export function renderCommits(commits = [], options = {}) {
+  const width = process.stdout.columns || 100
+  const authorWidth = Math.min(14, Math.max(4, ...commits.map((item) => String(item.author || '').length)))
+  for (const item of commits) {
+    const refs = item.refs?.length ? ` ${c.yellow(`(${item.refs.join(', ')})`)}` : ''
+    const subject = truncate(item.subject, Math.max(20, width - authorWidth - 40))
+    const parts = [
+      ui.hash(item.shortHash || item.hash).padEnd(options.hashWidth || 0),
+      ui.time(pad(item.relativeDate || '', 12)),
+      options.hideAuthor ? '' : ui.author(pad(truncate(item.author || '', authorWidth), authorWidth)),
+      `${ui.subject(subject)}${refs}`
+    ].filter(Boolean)
+    print(`  ${parts.join('  ')}`)
+  }
+}
+
+/**
+ * 分支结果汇总（push / sync / clean 等）。
+ * items: [{ branch, status, reason? }]，labels: status -> 中文
+ */
+export function renderBranchResults(items = [], labels = {}) {
+  const goodStatuses = new Set(['pushed', 'merged-and-pushed', 'remote-merged-and-pushed', 'force-pushed', 'synced', 'synced-and-pushed', 'deleted'])
+  const skipStatuses = new Set(['skipped-protected', 'skipped-missing-remote', 'missing'])
+  const width = Math.max(0, ...items.map((item) => String(item.branch).length))
+  for (const item of items) {
+    const mark = goodStatuses.has(item.status) ? c.green('✔') : skipStatuses.has(item.status) ? c.gray('○') : c.red('✖')
+    const label = labels[item.status] || item.status
+    const reason = item.reason ? c.gray(` ${item.reason}`) : ''
+    const url = item.mergeRequestUrl ? `  ${ui.url(item.mergeRequestUrl)}` : ''
+    print(`  ${mark} ${ui.branch(pad(item.branch, width))}  ${goodStatuses.has(item.status) ? label : c.yellow(label)}${reason}${url}`)
+  }
+}
+
+/**
+ * 下一步建议列表。
+ */
+export function renderNextSteps(steps = []) {
+  const list = steps.filter(Boolean)
+  if (!list.length) {
+    return
+  }
+  print(c.gray('\n  下一步:'))
+  for (const step of list) {
+    print(`    ${c.cyan('›')} ${step}`)
+  }
+}
+
+// 简单渲染 changelog markdown：标题加粗、列表符号着色。
+export function renderMarkdown(text) {
+  return String(text || '')
+    .split('\n')
+    .map((line) => {
+      if (line.startsWith('## ')) {
+        return `  ${c.bold(c.cyan(line.slice(3)))}`
+      }
+      if (line.startsWith('### ')) {
+        return `  ${c.bold(line.slice(4))}`
+      }
+      if (line.startsWith('- ')) {
+        return `    ${c.cyan('•')} ${line.slice(2).replace(/\*\*([^*]+)\*\*/g, (_, scope) => c.gray(scope))}`
+      }
+      return line ? `  ${line}` : ''
+    })
+    .join('\n')
+}

package/src/core/commands/shell.js

@@ -30,14 +30,22 @@ function formatFailureMessage(command, args, result) {
  */
 export async function runCommand(command, args = [], options = {}) {
   const { cwd = process.cwd(), env = process.env, allowFailure = false } = options
+  const hasInput = typeof options.input === 'string'
 
   return new Promise((resolve, reject) => {
     const child = spawn(command, args, {
       cwd,
       env,
-      stdio: ['ignore', 'pipe', 'pipe']
+      stdio: [hasInput ? 'pipe' : 'ignore', 'pipe', 'pipe']
     })
 
+    if (hasInput) {
+      child.stdin.on('error', () => {
+        // 子进程提前退出时忽略写入错误，结果以退出码为准。
+      })
+      child.stdin.end(options.input)
+    }
+
     let stdout = ''
     let stderr = ''
 

package/src/core/config/repo-config.js

@@ -0,0 +1,93 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import { IcodeError } from '../errors.js'
+
+// 仓库级配置文件名，按顺序查找第一个存在的文件。可以提交进仓库供团队共享。
+export const REPO_CONFIG_FILE_NAMES = ['.icoderc.json', '.icoderc']
+
+const DEFAULT_REPO_CONFIG = {
+  remote: '',
+  defaultBranch: '',
+  protectedBranches: [],
+  save: {
+    maxFileSizeMB: 5,
+    sensitivePatterns: [],
+    allowPatterns: []
+  }
+}
+
+function cloneDefault() {
+  return JSON.parse(JSON.stringify(DEFAULT_REPO_CONFIG))
+}
+
+/**
+ * 查找仓库级配置文件。
+ * 输入为仓库根目录，输出文件绝对路径；不存在时返回空串。
+ */
+export function findRepoConfigFile(repoRoot) {
+  if (!repoRoot) {
+    return ''
+  }
+
+  for (const fileName of REPO_CONFIG_FILE_NAMES) {
+    const filePath = path.resolve(repoRoot, fileName)
+    if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
+      return filePath
+    }
+  }
+
+  return ''
+}
+
+function normalizeStringList(value) {
+  if (!Array.isArray(value)) {
+    return []
+  }
+  return value.map((item) => String(item || '').trim()).filter(Boolean)
+}
+
+/**
+ * 读取仓库级配置（.icoderc.json / .icoderc，JSON 格式）。
+ * 输入为仓库根目录，输出合并默认值后的配置；文件不存在时返回默认值。
+ */
+export function readRepoConfig(repoRoot) {
+  const filePath = findRepoConfigFile(repoRoot)
+  const config = cloneDefault()
+  if (!filePath) {
+    return { ...config, filePath: '' }
+  }
+
+  let parsed
+  try {
+    const content = fs.readFileSync(filePath, 'utf8')
+    parsed = content.trim() ? JSON.parse(content) : {}
+  } catch (error) {
+    throw new IcodeError(`仓库配置文件解析失败: ${filePath}（需要 JSON 格式）`, {
+      code: 'REPO_CONFIG_PARSE_ERROR',
+      exitCode: 2,
+      cause: error
+    })
+  }
+
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    throw new IcodeError(`仓库配置文件必须是 JSON 对象: ${filePath}`, {
+      code: 'REPO_CONFIG_INVALID',
+      exitCode: 2
+    })
+  }
+
+  const save = parsed.save && typeof parsed.save === 'object' ? parsed.save : {}
+  const maxFileSizeMB = Number(save.maxFileSizeMB)
+
+  return {
+    remote: typeof parsed.remote === 'string' ? parsed.remote.trim() : '',
+    defaultBranch: typeof parsed.defaultBranch === 'string' ? parsed.defaultBranch.trim() : '',
+    protectedBranches: normalizeStringList(parsed.protectedBranches),
+    save: {
+      maxFileSizeMB: Number.isFinite(maxFileSizeMB) && maxFileSizeMB > 0 ? maxFileSizeMB : config.save.maxFileSizeMB,
+      sensitivePatterns: normalizeStringList(save.sensitivePatterns),
+      allowPatterns: normalizeStringList(save.allowPatterns)
+    },
+    filePath
+  }
+}

package/src/core/config/store.js

@@ -49,6 +49,45 @@ function ensureDirectory(filePath) {
   }
 }
 
+function secureConfigFile(filePath) {
+  try {
+    fs.chmodSync(filePath, 0o600)
+  } catch (error) {
+    throw new IcodeError(`无法设置配置文件权限: ${filePath}`, {
+      code: 'CONFIG_PERMISSION_ERROR',
+      cause: error
+    })
+  }
+}
+
+function writeConfigFile(filePath, config) {
+  ensureDirectory(filePath)
+  const tempPath = `${filePath}.${process.pid}.${Date.now()}.tmp`
+
+  try {
+    fs.writeFileSync(tempPath, JSON.stringify(config, null, 2), {
+      encoding: 'utf8',
+      mode: 0o600
+    })
+    fs.renameSync(tempPath, filePath)
+    secureConfigFile(filePath)
+  } catch (error) {
+    try {
+      fs.rmSync(tempPath, { force: true })
+    } catch {
+      // 保留原始写入异常。
+    }
+
+    if (error instanceof IcodeError) {
+      throw error
+    }
+    throw new IcodeError(`配置文件写入失败: ${filePath}`, {
+      code: 'CONFIG_WRITE_ERROR',
+      cause: error
+    })
+  }
+}
+
 function cloneDefault() {
   return JSON.parse(JSON.stringify(DEFAULT_CONFIG))
 }
@@ -59,15 +98,16 @@ export function readConfig() {
 
   if (!fs.existsSync(configPath)) {
     const initial = cloneDefault()
-    fs.writeFileSync(configPath, JSON.stringify(initial, null, 2), 'utf8')
+    writeConfigFile(configPath, initial)
     return initial
   }
 
   try {
+    secureConfigFile(configPath)
     const content = fs.readFileSync(configPath, 'utf8')
     if (!content.trim()) {
       const initial = cloneDefault()
-      fs.writeFileSync(configPath, JSON.stringify(initial, null, 2), 'utf8')
+      writeConfigFile(configPath, initial)
       return initial
     }
 
@@ -113,16 +153,26 @@ export function readConfig() {
 }
 
 export function writeConfig(nextConfig) {
-  const configPath = getConfigFilePath()
-  ensureDirectory(configPath)
-  fs.writeFileSync(configPath, JSON.stringify(nextConfig, null, 2), 'utf8')
+  writeConfigFile(getConfigFilePath(), nextConfig)
 }
 
-function splitPathSegments(pathExpression) {
-  return pathExpression
-    .split('.')
-    .map((segment) => segment.trim())
-    .filter(Boolean)
+/**
+ * 解析配置路径。支持点号和方括号两种写法，方括号里可以包含点：
+ *   platforms.tokens.github
+ *   platforms.hosts[git.company.com]
+ *   platforms.hosts["git.company.com"]
+ */
+export function splitPathSegments(pathExpression) {
+  const segments = []
+  const pattern = /\[\s*(?:"([^"]*)"|'([^']*)'|([^\]]*))\s*\]|([^.[\]]+)/g
+  let match
+  while ((match = pattern.exec(String(pathExpression || ''))) !== null) {
+    const segment = (match[1] ?? match[2] ?? match[3] ?? match[4] ?? '').trim()
+    if (segment) {
+      segments.push(segment)
+    }
+  }
+  return segments
 }
 
 export function getValue(pathExpression) {

package/src/core/git/autostash.js

@@ -0,0 +1,46 @@
+import { logger } from '../tools/logger.js'
+
+/**
+ * 在执行 fn 前自动 stash 未提交改动（含未跟踪文件），结束后自动恢复。
+ * 输入为 GitService、是否启用、操作名和回调，输出回调的返回值。
+ * 关键假设：恢复冲突时不丢数据，改动会留在 stash 里并提示用户处理。
+ */
+export async function withAutoStash(git, enabled, label, fn) {
+  if (!enabled) {
+    return fn({ stashed: false })
+  }
+
+  const changes = await git.getStatusSummary()
+  if (changes.clean) {
+    return fn({ stashed: false })
+  }
+
+  const message = `icode autostash: ${label}`
+  await git.stashPush({ message, includeUntracked: true })
+  const stashSha = await git.revParse('stash@{0}')
+  logger.info(`已自动暂存未提交改动（${message}）`)
+
+  let restored = false
+  try {
+    return await fn({ stashed: true, stashSha })
+  } finally {
+    const entry = (await git.stashList()).find((item) => item.hash === stashSha)
+    // 操作因冲突暂停时不要把改动倒回冲突现场，留在 stash 里等用户处理完再取回。
+    if (entry && (await git.getInProgressOperation())) {
+      logger.warn(`未提交的改动保存在 ${entry.ref}，处理完冲突（icode continue）后执行 \`icode stash pop\` 取回。`)
+      return
+    }
+    if (entry) {
+      try {
+        await git.stashApply(entry.ref, { pop: true })
+        restored = true
+      } catch (error) {
+        logger.warn(`自动恢复改动时发生冲突，改动仍保存在 ${entry.ref}。解决冲突后可执行 \`icode stash drop ${entry.ref}\`。`)
+        logger.debug(error.message)
+      }
+    }
+    if (restored) {
+      logger.info('已恢复自动暂存的改动。')
+    }
+  }
+}

package/src/core/git/backup.js

@@ -0,0 +1,170 @@
+import { logger } from '../tools/logger.js'
+
+// 所有备份都放在这个命名空间下，不会出现在 git branch / git tag 里，也不会被 push。
+export const BACKUP_REF_PREFIX = 'refs/icode/backup'
+const DEFAULT_KEEP_GROUPS = 50
+const WORKTREE_ENTRY = '_worktree'
+
+function pad(value, length = 2) {
+  return String(value).padStart(length, '0')
+}
+
+/**
+ * 生成备份组 id，格式 YYYYMMDD-HHMMSS-mmm，可按字典序排序。
+ * 输入为 Date，输出字符串。
+ */
+export function buildBackupId(date = new Date()) {
+  return [
+    `${date.getFullYear()}${pad(date.getMonth() + 1)}${pad(date.getDate())}`,
+    `${pad(date.getHours())}${pad(date.getMinutes())}${pad(date.getSeconds())}`,
+    pad(date.getMilliseconds(), 3)
+  ].join('-')
+}
+
+// 分支名里的 / 在 ref 里合法，但为了一层目录好解析，统一编码成 __。
+function encodeBranch(branchName) {
+  return String(branchName).replace(/\//g, '__')
+}
+
+function decodeBranch(entryName) {
+  return String(entryName).replace(/__/g, '/')
+}
+
+/**
+ * 创建一个备份组：记录指定分支（默认当前 HEAD）的提交，可选记录未提交改动。
+ * 输入为 GitService 与 { reason, branches, includeWorktree, remoteBranches }，
+ * 输出 { id, reason, entries }；没有任何可备份内容时 entries 为空。
+ * 关键假设：备份失败不应阻断主流程，只输出警告。
+ */
+export async function createBackup(git, options = {}) {
+  const id = buildBackupId(options.date)
+  const reason = String(options.reason || 'manual').replace(/\s+/g, ' ').trim()
+  const entries = []
+  const branches = Array.isArray(options.branches) && options.branches.length ? options.branches : [null]
+
+  try {
+    for (const branchName of branches) {
+      const ref = branchName || 'HEAD'
+      const sha = await git.revParse(ref)
+      if (!sha) {
+        continue
+      }
+      const label = branchName || (await git.getCurrentBranch()) || 'HEAD'
+      const refName = `${BACKUP_REF_PREFIX}/${id}/${encodeBranch(label)}`
+      await git.updateRef(refName, sha, `icode backup: ${reason}`)
+      entries.push({ ref: refName, branch: label, sha })
+    }
+
+    for (const branchName of options.remoteBranches || []) {
+      const sha = await git.getRemoteBranchSha(branchName)
+      if (!sha) {
+        continue
+      }
+      const label = `remote-${git.remote}-${branchName}`
+      const refName = `${BACKUP_REF_PREFIX}/${id}/${encodeBranch(label)}`
+      await git.updateRef(refName, sha, `icode backup: ${reason}`)
+      entries.push({ ref: refName, branch: `${git.remote}/${branchName}`, sha })
+    }
+
+    if (options.includeWorktree) {
+      // stash create 只生成提交对象，不改动工作区；未跟踪文件不包含在内。
+      const stashSha = await git.stashCreate(`icode backup: ${reason}`)
+      if (stashSha) {
+        const refName = `${BACKUP_REF_PREFIX}/${id}/${WORKTREE_ENTRY}`
+        await git.updateRef(refName, stashSha, `icode backup: ${reason}`)
+        entries.push({ ref: refName, branch: '(未提交改动)', sha: stashSha, worktree: true })
+      }
+    }
+
+    if (entries.length) {
+      // 用一个 note ref 记录原因，方便 rescue list 展示。
+      await writeBackupReason(git, id, reason)
+      await pruneBackups(git, { keep: options.keep || DEFAULT_KEEP_GROUPS })
+      if (!options.silent) {
+        logger.info(`已创建恢复点 ${logger.color('green', id)}（${reason}），可用 \`icode rescue\` 找回。`)
+      }
+    }
+  } catch (error) {
+    logger.warn(`创建恢复点失败（不影响本次操作）: ${error.message}`)
+  }
+
+  return { id, reason, entries }
+}
+
+// 原因写成一个 blob 对象挂在 _meta ref 上，不依赖额外文件。
+async function writeBackupReason(git, id, reason) {
+  const result = await git.exec(['hash-object', '-w', '--stdin'], {
+    allowFailure: true,
+    input: reason
+  })
+  const blobSha = String(result.stdout || '').trim()
+  if (result.exitCode === 0 && blobSha) {
+    await git.exec(['update-ref', `${BACKUP_REF_PREFIX}/${id}/_meta`, blobSha], { allowFailure: true })
+  }
+}
+
+/**
+ * 列出备份组，按时间倒序。
+ * 输出 [{ id, reason, entries: [{ ref, branch, sha, worktree }] }]。
+ */
+export async function listBackups(git) {
+  const lines = await git.listRefs(BACKUP_REF_PREFIX, '%(refname)%09%(objectname)%09%(objecttype)')
+  const groups = new Map()
+
+  for (const line of lines) {
+    const [refName = '', sha = '', type = ''] = line.split('\t')
+    const rest = refName.slice(BACKUP_REF_PREFIX.length + 1)
+    const slashIndex = rest.indexOf('/')
+    if (slashIndex === -1) {
+      continue
+    }
+    const id = rest.slice(0, slashIndex)
+    const entryName = rest.slice(slashIndex + 1)
+    if (!groups.has(id)) {
+      groups.set(id, { id, reason: '', entries: [] })
+    }
+    const group = groups.get(id)
+
+    if (entryName === '_meta') {
+      if (type === 'blob') {
+        const content = await git.exec(['cat-file', '-p', sha], { allowFailure: true })
+        group.reason = String(content.stdout || '').trim()
+      }
+      continue
+    }
+
+    group.entries.push({
+      ref: refName,
+      branch: entryName === WORKTREE_ENTRY ? '(未提交改动)' : decodeBranch(entryName),
+      sha,
+      shortSha: sha.slice(0, 8),
+      worktree: entryName === WORKTREE_ENTRY
+    })
+  }
+
+  return [...groups.values()]
+    .filter((group) => group.entries.length)
+    .sort((a, b) => (a.id < b.id ? 1 : -1))
+}
+
+/**
+ * 删除旧备份，只保留最近 keep 组。
+ * 输入为 GitService 与 { keep }，输出删除的组 id 列表。
+ */
+export async function pruneBackups(git, options = {}) {
+  const keep = Number.isInteger(options.keep) && options.keep >= 0 ? options.keep : DEFAULT_KEEP_GROUPS
+  const lines = await git.listRefs(BACKUP_REF_PREFIX, '%(refname)')
+  const ids = [...new Set(lines.map((refName) => refName.slice(BACKUP_REF_PREFIX.length + 1).split('/')[0]).filter(Boolean))]
+    .sort()
+    .reverse()
+  const removed = ids.slice(keep)
+
+  for (const refName of lines) {
+    const id = refName.slice(BACKUP_REF_PREFIX.length + 1).split('/')[0]
+    if (removed.includes(id)) {
+      await git.deleteRef(refName)
+    }
+  }
+
+  return removed
+}

package/src/core/git/conflicts.js

@@ -0,0 +1,58 @@
+import fs from 'node:fs'
+import path from 'node:path'
+
+// 只认 <<<<<<< 和 >>>>>>>：单独的 ======= 在 Markdown 等文件里可能是正常内容。
+const MARKER_PATTERN = /^(<{7}|>{7})(?: |$)/
+
+/**
+ * 找出文件中残留的冲突标记所在行号（从 1 开始）。
+ * 输入为文件绝对路径，输出行号数组；文件不存在（被删除）时返回空数组。
+ */
+export function findConflictMarkers(filePath) {
+  let content
+  try {
+    content = fs.readFileSync(filePath, 'utf8')
+  } catch {
+    return []
+  }
+  const lines = []
+  content.split('\n').forEach((line, index) => {
+    if (MARKER_PATTERN.test(line)) {
+      lines.push(index + 1)
+    }
+  })
+  return lines
+}
+
+/**
+ * 检查当前的冲突文件：已经没有冲突标记的视为已解决，还有标记的列出行号。
+ * 输入为 GitService，输出 { resolved: [path], unresolved: [{ file, lines }] }。
+ */
+export async function inspectConflicts(git) {
+  const conflicted = await git.listConflictedFiles()
+  const resolved = []
+  const unresolved = []
+  for (const file of conflicted) {
+    const lines = findConflictMarkers(path.resolve(git.cwd, file))
+    if (lines.length) {
+      unresolved.push({ file, lines })
+    } else {
+      resolved.push(file)
+    }
+  }
+  return { resolved, unresolved }
+}
+
+/**
+ * 把已解决（没有冲突标记）的文件自动 git add，省去手动暂存。
+ * 被删除的冲突文件用 git rm 标记。输出已暂存的文件列表。
+ */
+export async function stageResolvedConflicts(git, files) {
+  const staged = []
+  for (const file of files) {
+    const exists = fs.existsSync(path.resolve(git.cwd, file))
+    await git.exec(exists ? ['add', '--', file] : ['rm', '--quiet', '--', file])
+    staged.push(file)
+  }
+  return staged
+}