clawt 3.4.5 → 3.5.0

package/src/utils/git.ts

@@ -1,521 +1,3 @@
-import { basename } from 'node:path';
-import { execSync } from 'node:child_process';
-import { execCommand, execCommandWithInput } from './shell.js';
-import { logger } from '../logger/index.js';
-
-/**
- * 获取 git common dir（用于判断是否为主 worktree）
- * @param {string} cwd - 工作目录
- * @returns {string} git common dir 路径
- */
-export function getGitCommonDir(cwd?: string): string {
-  return execCommand('git rev-parse --git-common-dir', { cwd });
-}
-
-/**
- * 获取 git 仓库根目录的绝对路径
- * @param {string} cwd - 工作目录
- * @returns {string} 仓库根目录路径
- */
-export function getGitTopLevel(cwd?: string): string {
-  return execCommand('git rev-parse --show-toplevel', { cwd });
-}
-
-/**
- * 获取项目名（仓库根目录名称）
- * @param {string} cwd - 工作目录
- * @returns {string} 项目名
- */
-export function getProjectName(cwd?: string): string {
-  const topLevel = getGitTopLevel(cwd);
-  return basename(topLevel);
-}
-
-/**
- * 检查本地分支是否存在
- * @param {string} branchName - 分支名
- * @param {string} cwd - 工作目录
- * @returns {boolean} 分支是否存在
- */
-export function checkBranchExists(branchName: string, cwd?: string): boolean {
-  try {
-    execCommand(`git show-ref --verify refs/heads/${branchName}`, { cwd });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-/**
- * 创建 worktree 并同时创建新分支
- * @param {string} branchName - 新分支名
- * @param {string} worktreePath - worktree 目录路径
- * @param {string} cwd - 工作目录
- */
-export function createWorktree(branchName: string, worktreePath: string, cwd?: string): void {
-  logger.info(`创建 worktree: ${worktreePath}`);
-  execCommand(`git worktree add -b ${branchName} "${worktreePath}"`, { cwd });
-}
-
-/**
- * 强制移除 worktree
- * @param {string} worktreePath - worktree 目录路径
- * @param {string} cwd - 工作目录
- */
-export function removeWorktreeByPath(worktreePath: string, cwd?: string): void {
-  logger.info(`移除 worktree: ${worktreePath}`);
-  execCommand(`git worktree remove -f "${worktreePath}"`, { cwd });
-}
-
-/**
- * 强制删除本地分支
- * @param {string} branchName - 分支名
- * @param {string} cwd - 工作目录
- */
-export function deleteBranch(branchName: string, cwd?: string): void {
-  logger.info(`删除分支: ${branchName}`);
-  execCommand(`git branch -D ${branchName}`, { cwd });
-}
-
-/**
- * 获取工作区状态（git status --porcelain）
- * @param {string} cwd - 工作目录
- * @returns {string} porcelain 格式输出，为空表示干净
- */
-export function getStatusPorcelain(cwd?: string): string {
-  return execCommand('git status --porcelain', { cwd });
-}
-
-/**
- * 判断工作区是否干净
- * @param {string} cwd - 工作目录
- * @returns {boolean} 是否干净
- */
-export function isWorkingDirClean(cwd?: string): boolean {
-  return getStatusPorcelain(cwd) === '';
-}
-
-/**
- * git add 所有文件
- * @param {string} cwd - 工作目录
- */
-export function gitAddAll(cwd?: string): void {
-  execCommand('git add .', { cwd });
-}
-
-/**
- * git commit
- * @param {string} message - 提交信息
- * @param {string} cwd - 工作目录
- */
-export function gitCommit(message: string, cwd?: string): void {
-  execCommand(`git commit -m '${message.replace(/'/g, "'\\''")}'`, { cwd });
-}
-
-/**
- * git merge
- * @param {string} branchName - 要合并的分支名
- * @param {string} cwd - 工作目录
- */
-export function gitMerge(branchName: string, cwd?: string): void {
-  execCommand(`git merge ${branchName}`, { cwd });
-}
-
-/**
- * 检查是否有合并冲突
- * @param {string} cwd - 工作目录
- * @returns {boolean} 是否有冲突
- */
-export function hasMergeConflict(cwd?: string): boolean {
-  const status = getStatusPorcelain(cwd);
-  // UU = 双方修改冲突, AA = 双方新增冲突, DD = 双方删除
-  return status.split('\n').some((line) => /^(UU|AA|DD|DU|UD|AU|UA)/.test(line));
-}
-
-/**
- * git pull
- * @param {string} cwd - 工作目录
- */
-export function gitPull(cwd?: string): void {
-  execCommand('git pull', { cwd });
-}
-
-/**
- * git push
- * @param {string} cwd - 工作目录
- */
-export function gitPush(cwd?: string): void {
-  execCommand('git push', { cwd });
-}
-
-/**
- * git reset --hard HEAD
- * @param {string} cwd - 工作目录
- */
-export function gitResetHard(cwd?: string): void {
-  execCommand('git reset --hard HEAD', { cwd });
-}
-
-/**
- * git clean -fd（删除未跟踪文件）
- * @param {string} cwd - 工作目录
- */
-export function gitCleanForce(cwd?: string): void {
-  execCommand('git clean -fd', { cwd });
-}
-
-/**
- * git stash push -m <message>
- * @param {string} message - stash 消息
- * @param {string} cwd - 工作目录
- */
-export function gitStashPush(message: string, cwd?: string): void {
-  execCommand(`git stash push -m "${message}"`, { cwd });
-}
-
-/**
- * git stash apply
- * @param {string} cwd - 工作目录
- */
-export function gitStashApply(cwd?: string): void {
-  execCommand('git stash apply', { cwd });
-}
-
-/**
- * git stash pop stash@{index}
- * @param {number} index - stash 索引
- * @param {string} cwd - 工作目录
- */
-export function gitStashPop(index: number = 0, cwd?: string): void {
-  execCommand(`git stash pop stash@{${index}}`, { cwd });
-}
-
-/**
- * git stash drop stash@{index}
- * @param {number} index - stash 索引
- * @param {string} [cwd] - 工作目录
- */
-export function gitStashDrop(index: number = 0, cwd?: string): void {
-  execCommand(`git stash drop stash@{${index}}`, { cwd });
-}
-
-/**
- * git stash list
- * @param {string} cwd - 工作目录
- * @returns {string} stash 列表输出
- */
-export function gitStashList(cwd?: string): string {
-  try {
-    return execCommand('git stash list', { cwd });
-  } catch {
-    return '';
-  }
-}
-
-/**
- * git restore --staged .
- * @param {string} cwd - 工作目录
- */
-export function gitRestoreStaged(cwd?: string): void {
-  execCommand('git restore --staged .', { cwd });
-}
-
-/**
- * 获取 git worktree list 的输出
- * @param {string} cwd - 工作目录
- * @returns {string} worktree 列表
- */
-export function gitWorktreeList(cwd?: string): string {
-  return execCommand('git worktree list', { cwd });
-}
-
-/**
- * 执行 git worktree prune
- * @param {string} cwd - 工作目录
- */
-export function gitWorktreePrune(cwd?: string): void {
-  execCommand('git worktree prune', { cwd });
-}
-
-/**
- * 检查目标分支相对于当前分支是否有本地提交
- * @param {string} branchName - 目标分支名
- * @param {string} cwd - 工作目录
- * @returns {boolean} 是否有本地提交
- */
-export function hasLocalCommits(branchName: string, cwd?: string): boolean {
-  try {
-    const output = execCommand(`git log HEAD..${branchName} --oneline`, { cwd });
-    return output.trim() !== '';
-  } catch {
-    return false;
-  }
-}
-
-/**
- * 获取目标分支相对于当前分支的新增提交数
- * @param {string} branchName - 目标分支名
- * @param {string} [cwd] - 工作目录
- * @returns {number} 新增提交数
- */
-export function getCommitCountAhead(branchName: string, cwd?: string): number {
-  const output = execCommand(`git rev-list --count HEAD..${branchName}`, { cwd });
-  return parseInt(output, 10) || 0;
-}
-
-/**
- * 获取目标分支落后于当前分支的提交数
- * 即当前分支有多少提交是目标分支没有的
- * @param {string} branchName - 目标分支名
- * @param {string} [cwd] - 工作目录
- * @returns {number} 落后的提交数
- */
-export function getCommitCountBehind(branchName: string, cwd?: string): number {
-  try {
-    const output = execCommand(`git rev-list --count ${branchName}..HEAD`, { cwd });
-    return parseInt(output, 10) || 0;
-  } catch {
-    return 0;
-  }
-}
-
-/**
- * 解析 git diff --shortstat 输出，提取新增行数和删除行数
- * @param {string} output - shortstat 输出字符串
- * @returns {{ insertions: number; deletions: number }} 新增和删除行数
- */
-function parseShortStat(output: string): { insertions: number; deletions: number } {
-  let insertions = 0;
-  let deletions = 0;
-
-  const insertMatch = output.match(/(\d+)\s+insertion/);
-  if (insertMatch) {
-    insertions = parseInt(insertMatch[1], 10);
-  }
-
-  const deleteMatch = output.match(/(\d+)\s+deletion/);
-  if (deleteMatch) {
-    deletions = parseInt(deleteMatch[1], 10);
-  }
-
-  return { insertions, deletions };
-}
-
-/**
- * 获取 worktree 中工作区和暂存区的变更统计
- * @param {string} worktreePath - worktree 目录路径
- * @returns {{ insertions: number; deletions: number }} 新增和删除行数
- */
-export function getDiffStat(worktreePath: string): { insertions: number; deletions: number } {
-  // 工作区和暂存区相对于 HEAD 的变更
-  const output = execCommand('git diff --shortstat HEAD', { cwd: worktreePath });
-  return parseShortStat(output);
-}
-
-/**
- * 获取暂存区相对于 HEAD 的完整 diff（含二进制文件）
- * 注意：返回原始输出不做 trim，保留 patch 格式完整性
- * @param {string} [cwd] - 工作目录
- * @returns {Buffer} diff 原始输出（Buffer 格式，保留二进制数据完整性）
- */
-export function gitDiffCachedBinary(cwd?: string): Buffer {
-  logger.debug(`执行命令: git diff --cached --binary${cwd ? ` (cwd: ${cwd})` : ''}`);
-  return execSync('git diff --cached --binary', {
-    cwd,
-    stdio: ['pipe', 'pipe', 'pipe'],
-  });
-}
-
-/**
- * 将 patch 内容通过 stdin 应用到暂存区
- * @param {Buffer} patchContent - patch 内容（Buffer 格式）
- * @param {string} [cwd] - 工作目录
- */
-export function gitApplyCachedFromStdin(patchContent: Buffer, cwd?: string): void {
-  execCommandWithInput('git', ['apply', '--cached'], { input: patchContent, cwd });
-}
-
-/**
- * 获取当前分支名
- * @param {string} [cwd] - 工作目录
- * @returns {string} 当前分支名
- */
-export function getCurrentBranch(cwd?: string): string {
-  return execCommand('git rev-parse --abbrev-ref HEAD', { cwd });
-}
-
-/**
- * 获取当前 HEAD 的 commit hash
- * @param {string} [cwd] - 工作目录
- * @returns {string} commit hash
- */
-export function getHeadCommitHash(cwd?: string): string {
-  return execCommand('git rev-parse HEAD', { cwd });
-}
-
-/**
- * 获取目标分支相对于当前分支的已提交变更（含二进制文件）
- * 使用三点 diff（HEAD...branchName）获取自分叉点以来的变更
- * @param {string} branchName - 目标分支名
- * @param {string} [cwd] - 工作目录（应在主 worktree 中执行）
- * @returns {Buffer} diff 原始输出
- */
-export function gitDiffBinaryAgainstBranch(branchName: string, cwd?: string): Buffer {
-  logger.debug(`执行命令: git diff HEAD...${branchName} --binary${cwd ? ` (cwd: ${cwd})` : ''}`);
-  return execSync(`git diff HEAD...${branchName} --binary`, {
-    cwd,
-    stdio: ['pipe', 'pipe', 'pipe'],
-  });
-}
-
-/**
- * 将 patch 内容通过 stdin 应用到工作目录（不带 --cached）
- * @param {Buffer} patchContent - patch 内容
- * @param {string} [cwd] - 工作目录
- */
-export function gitApplyFromStdin(patchContent: Buffer, cwd?: string): void {
-  execCommandWithInput('git', ['apply'], { input: patchContent, cwd });
-}
-
-/**
- * git reset --soft HEAD~<count>，撤销 commit 但保留变更在暂存区
- * @param {number} count - 撤销的 commit 数量
- * @param {string} [cwd] - 工作目录
- */
-export function gitResetSoft(count: number = 1, cwd?: string): void {
-  execCommand(`git reset --soft HEAD~${count}`, { cwd });
-}
-
-/**
- * 获取两个分支的分叉点（merge-base）
- * @param {string} branchA - 分支 A
- * @param {string} branchB - 分支 B
- * @param {string} [cwd] - 工作目录
- * @returns {string} merge-base 的 commit hash
- */
-export function gitMergeBase(branchA: string, branchB: string, cwd?: string): string {
-  return execCommand(`git merge-base ${branchA} ${branchB}`, { cwd });
-}
-
-/**
- * 检查目标分支相对于当前分支是否存在指定前缀的 commit message
- * 通过 git log HEAD..<branch> 遍历所有新增 commit 的 message
- * @param {string} branchName - 目标分支名
- * @param {string} messagePrefix - 要匹配的 commit message 前缀
- * @param {string} [cwd] - 工作目录
- * @returns {boolean} 是否存在匹配的 commit
- */
-export function hasCommitWithMessage(branchName: string, messagePrefix: string, cwd?: string): boolean {
-  try {
-    const output = execCommand(`git log HEAD..${branchName} --format=%s`, { cwd });
-    if (!output.trim()) return false;
-    return output.trim().split('\n').some((msg) => msg.startsWith(messagePrefix));
-  } catch {
-    return false;
-  }
-}
-
-/**
- * git reset --soft <commitHash>，将指定 commit 之后的所有提交撤销到暂存区
- * @param {string} commitHash - 目标 commit hash（reset 到此处）
- * @param {string} [cwd] - 工作目录
- */
-export function gitResetSoftTo(commitHash: string, cwd?: string): void {
-  execCommand(`git reset --soft ${commitHash}`, { cwd });
-}
-
-/**
- * 将当前暂存区内容写入 git tree 对象并返回其 hash
- * @param {string} [cwd] - 工作目录
- * @returns {string} tree 对象的 hash
- */
-export function gitWriteTree(cwd?: string): string {
-  return execCommand('git write-tree', { cwd });
-}
-
-/**
- * 将指定 tree 对象的内容载入暂存区（不影响工作目录）
- * @param {string} treeHash - tree 对象的 hash
- * @param {string} [cwd] - 工作目录
- */
-export function gitReadTree(treeHash: string, cwd?: string): void {
-  execCommand(`git read-tree ${treeHash}`, { cwd });
-}
-
-/**
- * 获取指定 commit 对应的 tree 对象 hash
- * @param {string} commitHash - commit hash
- * @param {string} [cwd] - 工作目录
- * @returns {string} tree 对象的 hash
- */
-export function getCommitTreeHash(commitHash: string, cwd?: string): string {
-  return execCommand(`git rev-parse ${commitHash}^{tree}`, { cwd });
-}
-
-/**
- * 获取两个 tree 对象之间的 diff（patch 格式，含二进制）
- * @param {string} baseTreeHash - 基准 tree hash
- * @param {string} targetTreeHash - 目标 tree hash
- * @param {string} [cwd] - 工作目录
- * @returns {Buffer} diff patch 内容
- */
-export function gitDiffTree(baseTreeHash: string, targetTreeHash: string, cwd?: string): Buffer {
-  logger.debug(`执行命令: git diff-tree -p --binary ${baseTreeHash} ${targetTreeHash}${cwd ? ` (cwd: ${cwd})` : ''}`);
-  return execSync(`git diff-tree -p --binary ${baseTreeHash} ${targetTreeHash}`, {
-    cwd,
-    stdio: ['pipe', 'pipe', 'pipe'],
-  });
-}
-
-/**
- * 检测 patch 能否无冲突地应用到暂存区（干运行，不实际修改）
- * @param {Buffer} patchContent - patch 内容（Buffer 格式）
- * @param {string} [cwd] - 工作目录
- * @returns {boolean} patch 能否成功应用
- */
-export function gitApplyCachedCheck(patchContent: Buffer, cwd?: string): boolean {
-  try {
-    execCommandWithInput('git', ['apply', '--cached', '--check'], { input: patchContent, cwd });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-/**
- * 获取分支的创建时间（通过 reflog 获取分支创建时的时间戳）
- * reflog 的最后一条记录即为分支创建时的记录
- * @param {string} branchName - 目标分支名
- * @param {string} [cwd] - 工作目录
- * @returns {string | null} ISO 8601 格式的时间字符串，无法获取时返回 null
- */
-export function getBranchCreatedAt(branchName: string, cwd?: string): string | null {
-  try {
-    const output = execCommand(`git reflog show ${branchName} --format=%cI`, { cwd });
-    if (!output.trim()) return null;
-    // 取最后一行，即分支创建时的 reflog 记录
-    const lines = output.trim().split('\n');
-    const lastLine = lines[lines.length - 1];
-    return lastLine || null;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * 切换到指定分支
- * @param {string} branchName - 目标分支名
- * @param {string} [cwd] - 工作目录
- */
-export function gitCheckout(branchName: string, cwd?: string): void {
-  execCommand(`git checkout ${branchName}`, { cwd });
-}
-
-/**
- * 创建本地分支（不切换）
- * @param {string} branchName - 新分支名
- * @param {string} [cwd] - 工作目录
- */
-export function createBranch(branchName: string, cwd?: string): void {
-  execCommand(`git branch ${branchName}`, { cwd });
-}
+export * from './git-core.js';
+export * from './git-branch.js';
+export * from './git-worktree.js';

package/src/utils/index.ts

@@ -54,7 +54,7 @@ export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled
 export type { PreCheckOptions } from './validation.js';
 export { createWorktrees, getProjectWorktrees, getProjectWorktreeDir, cleanupWorktrees, getWorktreeStatus, createWorktreesByBranches } from './worktree.js';
 export { loadConfig, writeDefaultConfig, writeConfig, saveConfig, getConfigValue, ensureClawtDirs, parseConcurrency } from './config.js';
-export { printSuccess, printError, printWarning, printInfo, printHint, printSeparator, printDoubleSeparator, confirmAction, confirmDestructiveAction, formatWorktreeStatus, isWorktreeIdle, formatDuration, formatRelativeTime, formatDiskSize, formatLocalISOString } from './formatter.js';
+export { printSuccess, printError, printWarning, printInfo, printHint, printSeparator, printDoubleSeparator, confirmAction, confirmDestructiveAction, formatWorktreeStatus, isWorktreeIdle, formatDuration, formatRelativeTime, formatDiskSize, formatLocalISOString, generateTaskFilename } from './formatter.js';
 export { ensureDir, removeEmptyDir, calculateDirSize } from './fs.js';
 export { multilineInput } from './prompt.js';
 export { launchInteractiveClaude, hasClaudeSessionHistory, launchInteractiveClaudeInNewTerminal } from './claude.js';

package/src/utils/interactive-panel-render.ts

@@ -6,6 +6,8 @@ import {
   UNSELECTED_INDICATOR,
   PANEL_DATE_SEPARATOR_PREFIX,
   PANEL_FIXED_ROWS,
+  PANEL_SEPARATOR_MAX_WIDTH,
+  PANEL_DATE_COLOR,
   UNKNOWN_DATE_GROUP,
   VALIDATE_BRANCH_PREFIX,
 } from '../constants/index.js';
@@ -21,6 +23,10 @@ import {
   PANEL_CONFIGURED_BRANCH_DELETED,
   PANEL_CONFIGURED_BRANCH_MISMATCH,
   PANEL_NOT_INITIALIZED,
+  PANEL_UNKNOWN_DATE,
+  PANEL_SYNCED_WITH_MAIN,
+  PANEL_COMMITS_AHEAD,
+  PANEL_COMMITS_BEHIND,
 } from '../constants/messages/index.js';
 import type { StatusResult, WorktreeDetailedStatus, MainWorktreeStatus } from '../types/index.js';
 import { formatRelativeTime, groupWorktreesByDate, formatRelativeDate } from './index.js';
@@ -43,7 +49,7 @@ export interface PanelLine {
  * @returns {string} 格式化的分隔线
  */
 function buildSeparatorWithHint(cols: number, hint: string): string {
-  const maxWidth = Math.min(cols, 60);
+  const maxWidth = Math.min(cols, PANEL_SEPARATOR_MAX_WIDTH);
   if (!hint) {
     return chalk.gray('─'.repeat(maxWidth));
   }
@@ -207,10 +213,10 @@ export function renderDateSeparator(dateKey: string): string {
   // 左侧空格与指示器 '▶ ' 等宽对齐
   const leftPad = '  ';
   if (dateKey === UNKNOWN_DATE_GROUP) {
-    return `${leftPad}${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)} ${chalk.bold.hex('#FF8C00')('未知日期')} ${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)}`;
+    return `${leftPad}${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)} ${chalk.bold.hex(PANEL_DATE_COLOR)(PANEL_UNKNOWN_DATE)} ${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)}`;
   }
   const relativeDate = formatRelativeDate(dateKey);
-  return `${leftPad}${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)} ${chalk.bold.hex('#FF8C00')(dateKey)}${chalk.hex('#FF8C00')(`（${relativeDate}）`)} ${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)}`;
+  return `${leftPad}${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)} ${chalk.bold.hex(PANEL_DATE_COLOR)(dateKey)}${chalk.hex(PANEL_DATE_COLOR)(`（${relativeDate}）`)} ${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)}`;
 }
 
 /**
@@ -239,14 +245,14 @@ export function renderWorktreeBlock(wt: WorktreeDetailedStatus, isSelected: bool
 
   // 本地提交数
   if (wt.commitsAhead > 0) {
-    lines.push(`${indent}${chalk.yellow(`${wt.commitsAhead} 个本地提交`)}`);
+    lines.push(`${indent}${chalk.yellow(PANEL_COMMITS_AHEAD(wt.commitsAhead))}`);
   }
 
   // 与主分支的同步状态
   if (wt.commitsBehind > 0) {
-    lines.push(`${indent}${chalk.yellow(`落后主分支 ${wt.commitsBehind} 个提交`)}`);
+    lines.push(`${indent}${chalk.yellow(PANEL_COMMITS_BEHIND(wt.commitsBehind))}`);
   } else {
-    lines.push(`${indent}${chalk.green('与主分支同步')}`);
+    lines.push(`${indent}${chalk.green(PANEL_SYNCED_WITH_MAIN)}`);
   }
 
   // 分支创建时间