clawt 1.0.5 → 1.1.0

package/.claude/agent-memory/docs-sync-updater/MEMORY.md

@@ -4,9 +4,10 @@
 
 ### docs/spec.md
 - 完整的软件规格说明，包含 7 大章节
-- 命令流程在 `5. 需求场景详细设计` 下，每个命令一个子章节（5.1-5.8）
+- 命令流程在 `5. 需求场景详细设计` 下，每个命令一个子章节（5.1-5.10）
 - run 命令对应 `5.2 批量创建 Worktree + 执行 Claude Code 任务`，流程按步骤编号描述
 - merge 命令对应 `5.6 合并验证过的分支`，流程按步骤编号描述
+- config 命令对应 `5.10 查看全局配置`，只读展示配置
 - 配置项说明在 `5.7 默认配置文件` 章节的表格中
 - 更新模式：新增步骤时追加编号，配置项影响范围变化时更新说明列
 
@@ -34,15 +35,26 @@
 ## 配置项同步检查点
 
 配置项变更时需在以下 5 处保持一致：
-1. `src/constants/config.ts` — DEFAULT_CONFIG 对象
+1. `src/constants/config.ts` — CONFIG_DEFINITIONS 对象（单一数据源，包含 defaultValue + description）
 2. `src/types/config.ts` — ClawtConfig 接口
 3. `docs/spec.md` — 5.7 默认配置文件章节（JSON 示例 + 配置项表格）
 4. `CLAUDE.md` — 关键约定段落中的配置描述
 5. `README.md` — 配置文件章节（JSON 示例 + 配置项表格）
 
+## 配置架构
+
+- `CONFIG_DEFINITIONS` 是配置项的单一数据源，定义在 `src/constants/config.ts`
+- `DEFAULT_CONFIG` 和 `CONFIG_DESCRIPTIONS` 均从 `CONFIG_DEFINITIONS` 派生
+- 新增配置项时只需在 `CONFIG_DEFINITIONS` 中维护，派生值自动同步
+- 类型：`ConfigItemDefinition<T>` 和 `ConfigDefinitions` 定义在 `src/types/config.ts`
+
 ## run 命令双模式
 
 run 命令有两种模式（自 claudeCodeCommand 特性后）：
 - 不传 `--tasks`：交互式界面模式（单 worktree + `launchInteractiveClaude` + spawnSync）
 - 传 `--tasks`：并行任务模式（多 worktree + `executeClaudeTask` + spawnProcess）
 - CLAUDE.md 中的核心流程按模式分段描述
+
+## 命令清单（7 个）
+
+`create`、`run`、`list`、`remove`、`validate`、`merge`、`config`

package/CLAUDE.md

@@ -24,7 +24,7 @@ npm i -g .        # 本地全局安装进行测试
 
 每个命令为独立文件 `src/commands/<name>.ts`，导出 `registerXxxCommand(program)` 函数，在 `src/index.ts` 中统一注册到 Commander。命令内部逻辑封装在对应的 `handleXxx` 函数中。
 
-六个命令：`create`、`run`、`list`、`remove`、`validate`、`merge`。
+七个命令：`create`、`run`、`list`、`remove`、`validate`、`merge`、`config`。
 
 ### 核心流程（run 命令）
 
@@ -65,7 +65,7 @@ run 命令有两种模式：
 
 - 所有命令执行前都会调用 `validateMainWorktree()` 确保在主 worktree 根目录（`git rev-parse --git-common-dir === ".git"`）
 - Worktree 统一存放在 `~/.clawt/worktrees/<projectName>/` 下
-- 全局配置文件 `~/.clawt/config.json`，postinstall 时自动创建/合并，包含 `autoDeleteBranch`（是否自动删除分支）和 `claudeCodeCommand`（Claude Code CLI 启动指令）两个配置项
+- 全局配置文件 `~/.clawt/config.json`，postinstall 时自动创建/合并，包含 `autoDeleteBranch`（是否自动删除分支）、`claudeCodeCommand`（Claude Code CLI 启动指令）、`autoPullPush`（merge 后是否自动 pull/push）三个配置项。配置项以 `CONFIG_DEFINITIONS` 为单一数据源，`DEFAULT_CONFIG` 和 `CONFIG_DESCRIPTIONS` 均从中派生
 - shell 命令执行有同步（`execCommand` → `execSync`）和异步（`spawnProcess` → `spawn`）两种方式
 - 项目为纯 ESM（`"type": "module"`），模块导入需带 `.js` 后缀
 - 分支名特殊字符会被 `sanitizeBranchName()` 自动清理

package/README.md

@@ -139,6 +139,14 @@ clawt list
 
 列出当前项目在 `~/.clawt/worktrees/` 下的所有 worktree 及对应分支。
 
+### `clawt config` — 查看全局配置
+
+```bash
+clawt config
+```
+
+读取并展示全局配置文件 `~/.clawt/config.json` 中的所有配置项，包括每项的当前值和描述说明。编辑配置需直接修改配置文件。
+
 ## 配置文件
 
 安装后会自动在 `~/.clawt/config.json` 生成全局配置文件：
@@ -146,7 +154,8 @@ clawt list
 ```json
 {
   "autoDeleteBranch": false,
-  "claudeCodeCommand": "claude"
+  "claudeCodeCommand": "claude",
+  "autoPullPush": false
 }
 ```
 
@@ -154,6 +163,7 @@ clawt list
 | ------ | ---- | ------ | ---- |
 | `autoDeleteBranch` | `boolean` | `false` | 移除 worktree 时自动删除对应本地分支；merge 成功后自动清理 worktree 和分支；run 中断后自动清理本次创建的 worktree 和分支 |
 | `claudeCodeCommand` | `string` | `"claude"` | Claude Code CLI 启动指令，用于 `clawt run` 不传 `--tasks` 时在 worktree 中打开交互式界面 |
+| `autoPullPush` | `boolean` | `false` | merge 成功后是否自动执行 git pull 和 git push |
 
 ## 分支名规则
 

package/dist/index.js

@@ -79,7 +79,9 @@ var MESSAGES = {
   /** 粗分隔线 */
   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`
+  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
@@ -94,13 +96,34 @@ var EXIT_CODES = {
 
 // src/constants/config.ts
 var APPEND_SYSTEM_PROMPT = "After the code execution is completed, it is prohibited to build the project for verification.";
-var DEFAULT_CONFIG = {
-  autoDeleteBranch: false,
-  /** 默认 Claude Code CLI 启动指令，用于不传 --tasks 时在 worktree 中打开交互式界面 */
-  claudeCodeCommand: "claude",
-  /** 默认不自动执行 git pull 和 git push，需用户手动操作 */
-  autoPullPush: false
+var CONFIG_DEFINITIONS = {
+  autoDeleteBranch: {
+    defaultValue: false,
+    description: "\u79FB\u9664 worktree \u65F6\u662F\u5426\u81EA\u52A8\u5220\u9664\u5BF9\u5E94\u672C\u5730\u5206\u652F"
+  },
+  claudeCodeCommand: {
+    defaultValue: "claude",
+    description: "Claude Code CLI \u542F\u52A8\u6307\u4EE4"
+  },
+  autoPullPush: {
+    defaultValue: false,
+    description: "merge \u6210\u529F\u540E\u662F\u5426\u81EA\u52A8\u6267\u884C git pull \u548C git push"
+  }
 };
+function deriveDefaultConfig(definitions) {
+  const entries = Object.entries(definitions).map(
+    ([key, def]) => [key, def.defaultValue]
+  );
+  return Object.fromEntries(entries);
+}
+function deriveConfigDescriptions(definitions) {
+  const entries = Object.entries(definitions).map(
+    ([key, def]) => [key, def.description]
+  );
+  return Object.fromEntries(entries);
+}
+var DEFAULT_CONFIG = deriveDefaultConfig(CONFIG_DEFINITIONS);
+var CONFIG_DESCRIPTIONS = deriveConfigDescriptions(CONFIG_DEFINITIONS);
 
 // src/errors/index.ts
 var ClawtError = class extends Error {
@@ -266,6 +289,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";
@@ -300,6 +350,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) {
@@ -428,6 +494,17 @@ 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, writeFileSync } from "fs";
@@ -461,6 +538,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();
@@ -478,9 +556,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`);
   }
 }
 
@@ -918,6 +1002,38 @@ async function handleMerge(options) {
   }
 }
 
+// src/commands/config.ts
+import chalk3 from "chalk";
+function registerConfigCommand(program2) {
+  program2.command("config").description("\u67E5\u770B\u5168\u5C40\u914D\u7F6E").action(() => {
+    handleConfig();
+  });
+}
+function handleConfig() {
+  const config = loadConfig();
+  logger.info("config \u547D\u4EE4\u6267\u884C\uFF0C\u5C55\u793A\u5168\u5C40\u914D\u7F6E");
+  printInfo(`
+${chalk3.dim("\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84:")} ${CONFIG_PATH}
+`);
+  printSeparator();
+  const keys = Object.keys(DEFAULT_CONFIG);
+  for (const key of keys) {
+    const value = config[key];
+    const description = CONFIG_DESCRIPTIONS[key];
+    const formattedValue = formatConfigValue(value);
+    printInfo(`  ${chalk3.bold(key)}: ${formattedValue}`);
+    printInfo(`  ${chalk3.dim(description)}
+`);
+  }
+  printSeparator();
+}
+function formatConfigValue(value) {
+  if (typeof value === "boolean") {
+    return value ? chalk3.green("true") : chalk3.yellow("false");
+  }
+  return chalk3.cyan(String(value));
+}
+
 // src/index.ts
 var require2 = createRequire(import.meta.url);
 var { version } = require2("../package.json");
@@ -930,6 +1046,7 @@ registerRemoveCommand(program);
 registerRunCommand(program);
 registerValidateCommand(program);
 registerMergeCommand(program);
+registerConfigCommand(program);
 process.on("uncaughtException", (error) => {
   if (error instanceof ClawtError) {
     printError(error.message);

package/dist/postinstall.js

@@ -12,13 +12,34 @@ var LOGS_DIR = join(CLAWT_HOME, "logs");
 var WORKTREES_DIR = join(CLAWT_HOME, "worktrees");
 
 // src/constants/config.ts
-var DEFAULT_CONFIG = {
-  autoDeleteBranch: false,
-  /** 默认 Claude Code CLI 启动指令，用于不传 --tasks 时在 worktree 中打开交互式界面 */
-  claudeCodeCommand: "claude",
-  /** 默认不自动执行 git pull 和 git push，需用户手动操作 */
-  autoPullPush: false
+var CONFIG_DEFINITIONS = {
+  autoDeleteBranch: {
+    defaultValue: false,
+    description: "\u79FB\u9664 worktree \u65F6\u662F\u5426\u81EA\u52A8\u5220\u9664\u5BF9\u5E94\u672C\u5730\u5206\u652F"
+  },
+  claudeCodeCommand: {
+    defaultValue: "claude",
+    description: "Claude Code CLI \u542F\u52A8\u6307\u4EE4"
+  },
+  autoPullPush: {
+    defaultValue: false,
+    description: "merge \u6210\u529F\u540E\u662F\u5426\u81EA\u52A8\u6267\u884C git pull \u548C git push"
+  }
 };
+function deriveDefaultConfig(definitions) {
+  const entries = Object.entries(definitions).map(
+    ([key, def]) => [key, def.defaultValue]
+  );
+  return Object.fromEntries(entries);
+}
+function deriveConfigDescriptions(definitions) {
+  const entries = Object.entries(definitions).map(
+    ([key, def]) => [key, def.description]
+  );
+  return Object.fromEntries(entries);
+}
+var DEFAULT_CONFIG = deriveDefaultConfig(CONFIG_DEFINITIONS);
+var CONFIG_DESCRIPTIONS = deriveConfigDescriptions(CONFIG_DEFINITIONS);
 
 // scripts/postinstall.ts
 var CLAWT_HOME2 = join2(homedir2(), ".clawt");

package/docs/spec.md

@@ -21,6 +21,7 @@
   - [5.7 默认配置文件](#57-默认配置文件)
   - [5.8 获取当前项目所有 Worktree](#58-获取当前项目所有-worktree)
   - [5.9 日志系统](#59-日志系统)
+  - [5.10 查看全局配置](#510-查看全局配置)
 - [6. 错误处理规范](#6-错误处理规范)
 - [7. 非功能性需求](#7-非功能性需求)
 
@@ -157,6 +158,7 @@ git show-ref --verify refs/heads/<branchName> 2>/dev/null
 | `clawt merge`         | 合并某个已验证的 worktree 分支到主 worktree       | 5.6      |
 | `clawt remove`        | 移除 worktree（支持单个/批量/全部）               | 5.5      |
 | `clawt list`          | 列出当前项目所有 worktree                        | 5.8      |
+| `clawt config`        | 查看全局配置                                     | 5.10     |
 
 所有命令执行前，都必须先执行**主 worktree 校验**（见 [2.1](#21-主-worktree-的定义与定位规则)）。
 
@@ -580,7 +582,8 @@ clawt merge -b <branchName> [-m <commitMessage>]
 ```json
 {
   "autoDeleteBranch": false,
-  "claudeCodeCommand": "claude"
+  "claudeCodeCommand": "claude",
+  "autoPullPush": false
 }
 ```
 
@@ -590,6 +593,7 @@ clawt merge -b <branchName> [-m <commitMessage>]
 | ------------------ | --------- | --------- | -------------------------------------------------- |
 | `autoDeleteBranch` | `boolean` | `false`   | 移除 worktree 时是否自动删除对应本地分支（无需每次确认）；merge 成功后是否自动清理 worktree 和分支；run 任务被中断（Ctrl+C）后是否自动清理本次创建的 worktree 和分支 |
 | `claudeCodeCommand` | `string` | `"claude"` | Claude Code CLI 启动指令，用于 `clawt run` 不传 `--tasks` 时在 worktree 中打开交互式界面 |
+| `autoPullPush` | `boolean` | `false` | merge 成功后是否自动执行 git pull 和 git push |
 
 ---
 
@@ -665,6 +669,43 @@ clawt list
 
 ---
 
+### 5.10 查看全局配置
+
+**命令：**
+
+```bash
+clawt config
+```
+
+**运行流程：**
+
+1. 读取全局配置文件 `~/.clawt/config.json`
+2. 遍历所有配置项（以 `CONFIG_DEFINITIONS` 为单一数据源），逐项展示：
+   - 配置项名称（粗体）
+   - 当前值（布尔值绿色/黄色，字符串青色）
+   - 配置项描述（灰色）
+3. 输出配置文件路径，提示用户可直接编辑
+
+**输出格式：**
+
+```
+配置文件路径: ~/.clawt/config.json
+────────────────────────────────────────
+  autoDeleteBranch: false
+  移除 worktree 时是否自动删除对应本地分支
+
+  claudeCodeCommand: claude
+  Claude Code CLI 启动指令
+
+  autoPullPush: false
+  merge 成功后是否自动执行 git pull 和 git push
+
+────────────────────────────────────────
+
+```
+
+---
+
 ## 6. 错误处理规范
 
 ### 6.1 通用错误处理

package/package.json

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

package/src/commands/config.ts

@@ -0,0 +1,56 @@
+import type { Command } from 'commander';
+import chalk from 'chalk';
+import { CONFIG_PATH, DEFAULT_CONFIG, CONFIG_DESCRIPTIONS } from '../constants/index.js';
+import { logger } from '../logger/index.js';
+import { loadConfig, printInfo, printSeparator } from '../utils/index.js';
+import type { ClawtConfig } from '../types/index.js';
+
+/**
+ * 注册 config 命令：查看全局配置
+ * @param {Command} program - Commander 实例
+ */
+export function registerConfigCommand(program: Command): void {
+  program
+    .command('config')
+    .description('查看全局配置')
+    .action(() => {
+      handleConfig();
+    });
+}
+
+/**
+ * 执行 config 命令的核心逻辑，读取并展示配置列表
+ */
+function handleConfig(): void {
+  const config = loadConfig();
+
+  logger.info('config 命令执行，展示全局配置');
+
+  printInfo(`\n${chalk.dim('配置文件路径:')} ${CONFIG_PATH}\n`);
+  printSeparator();
+
+  const keys = Object.keys(DEFAULT_CONFIG) as Array<keyof ClawtConfig>;
+
+  for (const key of keys) {
+    const value = config[key];
+    const description = CONFIG_DESCRIPTIONS[key];
+    const formattedValue = formatConfigValue(value);
+
+    printInfo(`  ${chalk.bold(key)}: ${formattedValue}`);
+    printInfo(`  ${chalk.dim(description)}\n`);
+  }
+
+  printSeparator();
+}
+
+/**
+ * 格式化配置值的显示样式
+ * @param {ClawtConfig[keyof ClawtConfig]} value - 配置值
+ * @returns {string} 格式化后的字符串
+ */
+function formatConfigValue(value: ClawtConfig[keyof ClawtConfig]): string {
+  if (typeof value === 'boolean') {
+    return value ? chalk.green('true') : chalk.yellow('false');
+  }
+  return chalk.cyan(String(value));
+}

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/config.ts

@@ -1,14 +1,54 @@
-import type { ClawtConfig } from '../types/index.js';
+import type { ClawtConfig, ConfigDefinitions } from '../types/index.js';
 
 /** Claude Code 系统约束提示，禁止代码执行完成后构建项目验证 */
 export const APPEND_SYSTEM_PROMPT =
   'After the code execution is completed, it is prohibited to build the project for verification.';
 
-/** 默认配置 */
-export const DEFAULT_CONFIG: ClawtConfig = {
-  autoDeleteBranch: false,
-  /** 默认 Claude Code CLI 启动指令，用于不传 --tasks 时在 worktree 中打开交互式界面 */
-  claudeCodeCommand: 'claude',
-  /** 默认不自动执行 git pull 和 git push，需用户手动操作 */
-  autoPullPush: false,
+/**
+ * 配置项完整定义（单一数据源）
+ * 新增配置项时只需在此处维护，DEFAULT_CONFIG 和 CONFIG_DESCRIPTIONS 会自动同步
+ */
+export const CONFIG_DEFINITIONS: ConfigDefinitions = {
+  autoDeleteBranch: {
+    defaultValue: false,
+    description: '移除 worktree 时是否自动删除对应本地分支',
+  },
+  claudeCodeCommand: {
+    defaultValue: 'claude',
+    description: 'Claude Code CLI 启动指令',
+  },
+  autoPullPush: {
+    defaultValue: false,
+    description: 'merge 成功后是否自动执行 git pull 和 git push',
+  },
 };
+
+/**
+ * 从 CONFIG_DEFINITIONS 派生默认配置
+ * @param {ConfigDefinitions} definitions - 配置项完整定义
+ * @returns {ClawtConfig} 默认配置对象
+ */
+function deriveDefaultConfig(definitions: ConfigDefinitions): ClawtConfig {
+  const entries = Object.entries(definitions).map(
+    ([key, def]) => [key, def.defaultValue],
+  );
+  return Object.fromEntries(entries) as ClawtConfig;
+}
+
+/**
+ * 从 CONFIG_DEFINITIONS 派生配置项描述映射
+ * @param {ConfigDefinitions} definitions - 配置项完整定义
+ * @returns {Record<keyof ClawtConfig, string>} 配置项描述映射
+ */
+function deriveConfigDescriptions(definitions: ConfigDefinitions): Record<keyof ClawtConfig, string> {
+  const entries = Object.entries(definitions).map(
+    ([key, def]) => [key, def.description],
+  );
+  return Object.fromEntries(entries) as Record<keyof ClawtConfig, string>;
+}
+
+/** 默认配置 */
+export const DEFAULT_CONFIG: ClawtConfig = deriveDefaultConfig(CONFIG_DEFINITIONS);
+
+/** 配置项描述映射 */
+export const CONFIG_DESCRIPTIONS: Record<keyof ClawtConfig, string> = deriveConfigDescriptions(CONFIG_DEFINITIONS);

package/src/constants/index.ts

@@ -3,4 +3,4 @@ export { INVALID_BRANCH_CHARS } from './branch.js';
 export { MESSAGES } from './messages.js';
 export { EXIT_CODES } from './exitCodes.js';
 export { ENABLE_BRACKETED_PASTE, DISABLE_BRACKETED_PASTE, PASTE_THRESHOLD_MS } from './terminal.js';
-export { DEFAULT_CONFIG, APPEND_SYSTEM_PROMPT } from './config.js';
+export { DEFAULT_CONFIG, CONFIG_DESCRIPTIONS, APPEND_SYSTEM_PROMPT } from './config.js';

package/src/constants/messages.ts

@@ -62,4 +62,6 @@ export const MESSAGES = {
   DOUBLE_SEPARATOR: '════════════════════════════════════════',
   /** 创建数量参数无效 */
   INVALID_COUNT: (value: string) => `无效的创建数量: "${value}"，请输入正整数`,
+  /** worktree 状态获取失败 */
+  WORKTREE_STATUS_UNAVAILABLE: '(状态不可用)',
 } as const;

package/src/index.ts

@@ -10,6 +10,7 @@ import { registerRemoveCommand } from './commands/remove.js';
 import { registerRunCommand } from './commands/run.js';
 import { registerValidateCommand } from './commands/validate.js';
 import { registerMergeCommand } from './commands/merge.js';
+import { registerConfigCommand } from './commands/config.js';
 
 // 从 package.json 读取版本号，避免硬编码
 const require = createRequire(import.meta.url);
@@ -32,6 +33,7 @@ registerRemoveCommand(program);
 registerRunCommand(program);
 registerValidateCommand(program);
 registerMergeCommand(program);
+registerConfigCommand(program);
 
 // 全局未捕获异常处理
 process.on('uncaughtException', (error) => {

package/src/types/config.ts

@@ -7,3 +7,16 @@ export interface ClawtConfig {
   /** merge 成功后是否自动执行 git pull 和 git push */
   autoPullPush: boolean;
 }
+
+/** 单个配置项的完整定义（默认值 + 描述） */
+export interface ConfigItemDefinition<T> {
+  /** 默认值 */
+  defaultValue: T;
+  /** 配置项描述，用于 config 命令展示 */
+  description: string;
+}
+
+/** 所有配置项的完整定义映射 */
+export type ConfigDefinitions = {
+  [K in keyof ClawtConfig]: ConfigItemDefinition<ClawtConfig[K]>;
+};

package/src/types/index.ts

@@ -1,5 +1,5 @@
-export type { ClawtConfig } from './config.js';
+export type { ClawtConfig, ConfigItemDefinition, ConfigDefinitions } 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/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;
+  }
+}