clawt 1.0.4 → 1.0.6

package/dist/index.js

@@ -72,10 +72,16 @@ var MESSAGES = {
   INTERRUPT_CLEANED: (count) => `\u2713 \u5DF2\u6E05\u7406 ${count} \u4E2A worktree \u548C\u5BF9\u5E94\u5206\u652F`,
   /** 中断后保留 worktree */
   INTERRUPT_KEPT: "\u5DF2\u4FDD\u7559 worktree\uFF0C\u53EF\u7A0D\u540E\u4F7F\u7528 clawt remove \u624B\u52A8\u6E05\u7406",
+  /** 配置文件损坏，已重新生成默认配置 */
+  CONFIG_CORRUPTED: "\u914D\u7F6E\u6587\u4EF6\u635F\u574F\u6216\u65E0\u6CD5\u89E3\u6790\uFF0C\u5DF2\u91CD\u65B0\u751F\u6210\u9ED8\u8BA4\u914D\u7F6E",
   /** 分隔线 */
   SEPARATOR: "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
   /** 粗分隔线 */
-  DOUBLE_SEPARATOR: "\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550"
+  DOUBLE_SEPARATOR: "\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550",
+  /** 创建数量参数无效 */
+  INVALID_COUNT: (value) => `\u65E0\u6548\u7684\u521B\u5EFA\u6570\u91CF: "${value}"\uFF0C\u8BF7\u8F93\u5165\u6B63\u6574\u6570`,
+  /** worktree 状态获取失败 */
+  WORKTREE_STATUS_UNAVAILABLE: "(\u72B6\u6001\u4E0D\u53EF\u7528)"
 };
 
 // src/constants/exitCodes.ts
@@ -262,6 +268,33 @@ function hasLocalCommits(branchName, cwd) {
     return false;
   }
 }
+function getCommitCountAhead(branchName, cwd) {
+  const output = execCommand(`git rev-list --count HEAD..${branchName}`, { cwd });
+  return parseInt(output, 10) || 0;
+}
+function parseShortStat(output) {
+  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 };
+}
+function getDiffStat(branchName, worktreePath, cwd) {
+  const committedOutput = execCommand(`git diff --shortstat HEAD...${branchName}`, { cwd });
+  const committed = parseShortStat(committedOutput);
+  const uncommittedOutput = execCommand("git diff --shortstat HEAD", { cwd: worktreePath });
+  const uncommitted = parseShortStat(uncommittedOutput);
+  return {
+    insertions: committed.insertions + uncommitted.insertions,
+    deletions: committed.deletions + uncommitted.deletions
+  };
+}
 
 // src/utils/formatter.ts
 import chalk from "chalk";
@@ -296,6 +329,22 @@ function confirmAction(question) {
     });
   });
 }
+function formatWorktreeStatus(status) {
+  const parts = [];
+  parts.push(chalk.yellow(`${status.commitCount} \u4E2A\u63D0\u4EA4`));
+  if (status.insertions === 0 && status.deletions === 0) {
+    parts.push("\u65E0\u53D8\u66F4");
+  } else {
+    const diffParts = [];
+    diffParts.push(chalk.green(`+${status.insertions}`));
+    diffParts.push(chalk.red(`-${status.deletions}`));
+    parts.push(diffParts.join(" "));
+  }
+  if (status.hasDirtyFiles) {
+    parts.push(chalk.gray("(\u672A\u63D0\u4EA4\u4FEE\u6539)"));
+  }
+  return parts.join("   ");
+}
 
 // src/utils/branch.ts
 function sanitizeBranchName(branchName) {
@@ -424,15 +473,35 @@ function cleanupWorktrees(worktrees) {
   const projectDir = getProjectWorktreeDir();
   removeEmptyDir(projectDir);
 }
+function getWorktreeStatus(worktree) {
+  try {
+    const commitCount = getCommitCountAhead(worktree.branch);
+    const { insertions, deletions } = getDiffStat(worktree.branch, worktree.path);
+    const hasDirtyFiles = !isWorkingDirClean(worktree.path);
+    return { commitCount, insertions, deletions, hasDirtyFiles };
+  } catch (error) {
+    logger.error(`\u83B7\u53D6 worktree \u72B6\u6001\u5931\u8D25: ${worktree.path} - ${error}`);
+    return null;
+  }
+}
 
 // src/utils/config.ts
-import { existsSync as existsSync4, readFileSync } from "fs";
+import { existsSync as existsSync4, readFileSync, writeFileSync } from "fs";
 function loadConfig() {
   if (!existsSync4(CONFIG_PATH)) {
     return { ...DEFAULT_CONFIG };
   }
-  const raw = readFileSync(CONFIG_PATH, "utf-8");
-  return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
+  try {
+    const raw = readFileSync(CONFIG_PATH, "utf-8");
+    return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
+  } catch {
+    logger.warn(MESSAGES.CONFIG_CORRUPTED);
+    writeDefaultConfig();
+    return { ...DEFAULT_CONFIG };
+  }
+}
+function writeDefaultConfig() {
+  writeFileSync(CONFIG_PATH, JSON.stringify(DEFAULT_CONFIG, null, 2), "utf-8");
 }
 function getConfigValue(key) {
   const config = loadConfig();
@@ -448,6 +517,7 @@ function ensureClawtDirs() {
 import Enquirer from "enquirer";
 
 // src/commands/list.ts
+import chalk2 from "chalk";
 function registerListCommand(program2) {
   program2.command("list").description("\u5217\u51FA\u5F53\u524D\u9879\u76EE\u6240\u6709 worktree").action(() => {
     handleList();
@@ -465,9 +535,15 @@ function handleList() {
   } else {
     for (const wt of worktrees) {
       printInfo(`  ${wt.path}   [${wt.branch}]`);
+      const status = getWorktreeStatus(wt);
+      if (status) {
+        printInfo(`    ${formatWorktreeStatus(status)}`);
+      } else {
+        printInfo(`    ${chalk2.yellow(MESSAGES.WORKTREE_STATUS_UNAVAILABLE)}`);
+      }
+      printInfo("");
     }
-    printInfo(`
-\u5171 ${worktrees.length} \u4E2A worktree`);
+    printInfo(`\u5171 ${worktrees.length} \u4E2A worktree`);
   }
 }
 
@@ -480,6 +556,12 @@ function registerCreateCommand(program2) {
 function handleCreate(options) {
   validateMainWorktree();
   const count = Number(options.number);
+  if (!Number.isInteger(count) || count <= 0) {
+    throw new ClawtError(
+      MESSAGES.INVALID_COUNT(options.number),
+      EXIT_CODES.ARGUMENT_ERROR
+    );
+  }
   logger.info(`create \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch}\uFF0C\u6570\u91CF: ${count}`);
   const worktrees = createWorktrees(options.branch, count);
   printSuccess(MESSAGES.WORKTREE_CREATED(worktrees.length));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawt",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具",
   "type": "module",
   "main": "dist/index.js",

package/src/commands/create.ts

@@ -1,5 +1,6 @@
 import type { Command } from 'commander';
-import { MESSAGES } from '../constants/index.js';
+import { MESSAGES, EXIT_CODES } from '../constants/index.js';
+import { ClawtError } from '../errors/index.js';
 import { logger } from '../logger/index.js';
 import type { CreateOptions } from '../types/index.js';
 import {
@@ -33,6 +34,15 @@ function handleCreate(options: CreateOptions): void {
   validateMainWorktree();
 
   const count = Number(options.number);
+
+  // 校验创建数量必须为正整数
+  if (!Number.isInteger(count) || count <= 0) {
+    throw new ClawtError(
+      MESSAGES.INVALID_COUNT(options.number),
+      EXIT_CODES.ARGUMENT_ERROR,
+    );
+  }
+
   logger.info(`create 命令执行，分支: ${options.branch}，数量: ${count}`);
 
   const worktrees = createWorktrees(options.branch, count);

package/src/commands/list.ts

@@ -1,10 +1,13 @@
 import type { Command } from 'commander';
+import chalk from 'chalk';
 import { MESSAGES } from '../constants/index.js';
 import { logger } from '../logger/index.js';
 import {
   validateMainWorktree,
   getProjectName,
   getProjectWorktrees,
+  getWorktreeStatus,
+  formatWorktreeStatus,
   printInfo,
 } from '../utils/index.js';
 
@@ -39,7 +42,17 @@ function handleList(): void {
   } else {
     for (const wt of worktrees) {
       printInfo(`  ${wt.path}   [${wt.branch}]`);
+
+      // 获取并展示 worktree 变更状态
+      const status = getWorktreeStatus(wt);
+      if (status) {
+        printInfo(`    ${formatWorktreeStatus(status)}`);
+      } else {
+        printInfo(`    ${chalk.yellow(MESSAGES.WORKTREE_STATUS_UNAVAILABLE)}`);
+      }
+
+      printInfo('');
     }
-    printInfo(`\n共 ${worktrees.length} 个 worktree`);
+    printInfo(`共 ${worktrees.length} 个 worktree`);
   }
 }

package/src/constants/messages.ts

@@ -54,8 +54,14 @@ export const MESSAGES = {
   INTERRUPT_CLEANED: (count: number) => `✓ 已清理 ${count} 个 worktree 和对应分支`,
   /** 中断后保留 worktree */
   INTERRUPT_KEPT: '已保留 worktree，可稍后使用 clawt remove 手动清理',
+  /** 配置文件损坏，已重新生成默认配置 */
+  CONFIG_CORRUPTED: '配置文件损坏或无法解析，已重新生成默认配置',
   /** 分隔线 */
   SEPARATOR: '────────────────────────────────────────',
   /** 粗分隔线 */
   DOUBLE_SEPARATOR: '════════════════════════════════════════',
+  /** 创建数量参数无效 */
+  INVALID_COUNT: (value: string) => `无效的创建数量: "${value}"，请输入正整数`,
+  /** worktree 状态获取失败 */
+  WORKTREE_STATUS_UNAVAILABLE: '(状态不可用)',
 } as const;

package/src/types/command.ts

@@ -2,8 +2,8 @@
 export interface CreateOptions {
   /** 分支名 */
   branch: string;
-  /** 创建数量，默认 1 */
-  number: number;
+  /** 创建数量（Commander 传入为字符串），默认 '1' */
+  number: string;
 }
 
 /** run 命令选项 */

package/src/types/index.ts

@@ -1,5 +1,5 @@
 export type { ClawtConfig } from './config.js';
 export type { CreateOptions, RunOptions, ValidateOptions, MergeOptions, RemoveOptions } from './command.js';
-export type { WorktreeInfo } from './worktree.js';
+export type { WorktreeInfo, WorktreeStatus } from './worktree.js';
 export type { ClaudeCodeResult } from './claudeCode.js';
 export type { TaskResult, TaskSummary } from './taskResult.js';

package/src/types/worktree.ts

@@ -5,3 +5,15 @@ export interface WorktreeInfo {
   /** 分支名 */
   branch: string;
 }
+
+/** worktree 变更统计信息 */
+export interface WorktreeStatus {
+  /** 相对于主分支的新增提交数 */
+  commitCount: number;
+  /** 新增行数 */
+  insertions: number;
+  /** 删除行数 */
+  deletions: number;
+  /** 工作区是否有未提交修改 */
+  hasDirtyFiles: boolean;
+}

package/src/utils/config.ts

@@ -1,18 +1,34 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
-import { CONFIG_PATH, CLAWT_HOME, LOGS_DIR, WORKTREES_DIR, DEFAULT_CONFIG } from '../constants/index.js';
+import { CONFIG_PATH, CLAWT_HOME, LOGS_DIR, WORKTREES_DIR, DEFAULT_CONFIG, MESSAGES } from '../constants/index.js';
 import { ensureDir } from './fs.js';
+import { logger } from '../logger/index.js';
 import type { ClawtConfig } from '../types/index.js';
 
 /**
  * 加载全局配置，不存在则返回默认配置
+ * 配置文件损坏或无法解析时，视为不存在，重新生成默认配置
  * @returns {ClawtConfig} 配置对象
  */
 export function loadConfig(): ClawtConfig {
   if (!existsSync(CONFIG_PATH)) {
     return { ...DEFAULT_CONFIG };
   }
-  const raw = readFileSync(CONFIG_PATH, 'utf-8');
-  return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
+  try {
+    const raw = readFileSync(CONFIG_PATH, 'utf-8');
+    return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
+  } catch {
+    // 配置文件损坏或无法解析时，重新生成默认配置
+    logger.warn(MESSAGES.CONFIG_CORRUPTED);
+    writeDefaultConfig();
+    return { ...DEFAULT_CONFIG };
+  }
+}
+
+/**
+ * 将默认配置写入配置文件
+ */
+function writeDefaultConfig(): void {
+  writeFileSync(CONFIG_PATH, JSON.stringify(DEFAULT_CONFIG, null, 2), 'utf-8');
 }
 
 /**

package/src/utils/formatter.ts

@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import { MESSAGES } from '../constants/index.js';
 import { createInterface } from 'node:readline';
+import type { WorktreeStatus } from '../types/index.js';
 
 /**
  * 输出成功信息
@@ -65,3 +66,32 @@ export function confirmAction(question: string): Promise<boolean> {
     });
   });
 }
+
+/**
+ * 将 WorktreeStatus 格式化为带颜色的字符串
+ * @param {WorktreeStatus} status - worktree 变更统计信息
+ * @returns {string} 格式化后的状态字符串
+ */
+export function formatWorktreeStatus(status: WorktreeStatus): string {
+  const parts: string[] = [];
+
+  // 提交数（黄色）
+  parts.push(chalk.yellow(`${status.commitCount} 个提交`));
+
+  // 变更统计
+  if (status.insertions === 0 && status.deletions === 0) {
+    parts.push('无变更');
+  } else {
+    const diffParts: string[] = [];
+    diffParts.push(chalk.green(`+${status.insertions}`));
+    diffParts.push(chalk.red(`-${status.deletions}`));
+    parts.push(diffParts.join(' '));
+  }
+
+  // 未提交修改提示（灰色）
+  if (status.hasDirtyFiles) {
+    parts.push(chalk.gray('(未提交修改)'));
+  }
+
+  return parts.join('   ');
+}

package/src/utils/git.ts

@@ -241,3 +241,58 @@ export function hasLocalCommits(branchName: string, cwd?: string): boolean {
     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;
+}
+
+/**
+ * 解析 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 };
+}
+
+/**
+ * 获取目标分支的变更统计（已提交 + 未提交）
+ * @param {string} branchName - 目标分支名
+ * @param {string} worktreePath - worktree 目录路径
+ * @param {string} [cwd] - 执行 git diff HEAD...branch 的工作目录
+ * @returns {{ insertions: number; deletions: number }} 聚合后的新增和删除行数
+ */
+export function getDiffStat(branchName: string, worktreePath: string, cwd?: string): { insertions: number; deletions: number } {
+  // 已提交的变更（当前分支与目标分支的差异）
+  const committedOutput = execCommand(`git diff --shortstat HEAD...${branchName}`, { cwd });
+  const committed = parseShortStat(committedOutput);
+
+  // 未提交的变更（在 worktree 内执行）
+  const uncommittedOutput = execCommand('git diff --shortstat HEAD', { cwd: worktreePath });
+  const uncommitted = parseShortStat(uncommittedOutput);
+
+  return {
+    insertions: committed.insertions + uncommitted.insertions,
+    deletions: committed.deletions + uncommitted.deletions,
+  };
+}

package/src/utils/index.ts

@@ -25,11 +25,13 @@ export {
   gitWorktreeList,
   gitWorktreePrune,
   hasLocalCommits,
+  getCommitCountAhead,
+  getDiffStat,
 } from './git.js';
 export { sanitizeBranchName, generateBranchNames, validateBranchesNotExist } from './branch.js';
 export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled } from './validation.js';
-export { createWorktrees, getProjectWorktrees, getProjectWorktreeDir, cleanupWorktrees } from './worktree.js';
+export { createWorktrees, getProjectWorktrees, getProjectWorktreeDir, cleanupWorktrees, getWorktreeStatus } from './worktree.js';
 export { loadConfig, getConfigValue, ensureClawtDirs } from './config.js';
-export { printSuccess, printError, printWarning, printInfo, printSeparator, printDoubleSeparator, confirmAction } from './formatter.js';
+export { printSuccess, printError, printWarning, printInfo, printSeparator, printDoubleSeparator, confirmAction, formatWorktreeStatus } from './formatter.js';
 export { ensureDir, removeEmptyDir } from './fs.js';
 export { multilineInput } from './prompt.js';

package/src/utils/worktree.ts

@@ -2,10 +2,10 @@ import { join } from 'node:path';
 import { existsSync, readdirSync } from 'node:fs';
 import { WORKTREES_DIR } from '../constants/index.js';
 import { logger } from '../logger/index.js';
-import { createWorktree as gitCreateWorktree, getProjectName, gitWorktreeList, removeWorktreeByPath, deleteBranch, gitWorktreePrune } from './git.js';
+import { createWorktree as gitCreateWorktree, getProjectName, gitWorktreeList, removeWorktreeByPath, deleteBranch, gitWorktreePrune, getCommitCountAhead, getDiffStat, isWorkingDirClean } from './git.js';
 import { sanitizeBranchName, generateBranchNames, validateBranchesNotExist } from './branch.js';
 import { ensureDir, removeEmptyDir } from './fs.js';
-import type { WorktreeInfo } from '../types/index.js';
+import type { WorktreeInfo, WorktreeStatus } from '../types/index.js';
 
 /**
  * 获取当前项目的 worktree 存放目录
@@ -105,3 +105,22 @@ export function cleanupWorktrees(worktrees: WorktreeInfo[]): void {
   const projectDir = getProjectWorktreeDir();
   removeEmptyDir(projectDir);
 }
+
+/**
+ * 获取 worktree 的变更统计信息
+ * 聚合提交数、变更行数、未提交修改状态
+ * @param {WorktreeInfo} worktree - worktree 信息
+ * @returns {WorktreeStatus | null} 变更统计信息，获取失败时返回 null
+ */
+export function getWorktreeStatus(worktree: WorktreeInfo): WorktreeStatus | null {
+  try {
+    const commitCount = getCommitCountAhead(worktree.branch);
+    const { insertions, deletions } = getDiffStat(worktree.branch, worktree.path);
+    const hasDirtyFiles = !isWorkingDirClean(worktree.path);
+
+    return { commitCount, insertions, deletions, hasDirtyFiles };
+  } catch (error) {
+    logger.error(`获取 worktree 状态失败: ${worktree.path} - ${error}`);
+    return null;
+  }
+}