clawt 3.9.1 → 3.9.3

package/dist/index.js

@@ -649,13 +649,6 @@ var PANEL_FOOTER_SHORTCUTS = Object.entries(SHORTCUT_LABELS).map(([key, label])
 var PANEL_FOOTER_COUNTDOWN = (seconds) => chalk.gray(`(${seconds}s \u540E\u5237\u65B0)`);
 var PANEL_OVERFLOW_DOWN_HINT = chalk.gray("\u2193 \u66F4\u591A worktree...");
 var PANEL_OVERFLOW_UP_HINT = chalk.gray("\u2191 \u66F4\u591A worktree...");
-var PANEL_SNAPSHOT_SUMMARY = (total, orphaned) => {
-  const base = `\u5FEB\u7167: ${total} \u4E2A`;
-  if (orphaned > 0) {
-    return `${base}\uFF08${chalk.yellow(`${orphaned} \u4E2A\u5B64\u7ACB`)}\uFF09`;
-  }
-  return base;
-};
 var PANEL_NO_WORKTREES = "(\u65E0\u6D3B\u8DC3 worktree)";
 var PANEL_PRESS_ENTER_TO_RETURN = chalk.gray("\n\u6309 Enter \u8FD4\u56DE\u9762\u677F...");
 var PANEL_NOT_TTY = "\u4EA4\u4E92\u5F0F\u9762\u677F\u9700\u8981 TTY \u7EC8\u7AEF\u73AF\u5883\uFF0C\u8BF7\u76F4\u63A5\u5728\u7EC8\u7AEF\u4E2D\u8FD0\u884C clawt status -i";
@@ -1006,9 +999,14 @@ import { execSync as execSync2, execFileSync, spawn, spawnSync } from "child_pro
 import { join as join2, isAbsolute } from "path";
 import { execSync } from "child_process";
 var INDEX_LOCK_ERROR_PATTERNS = [
+  // 英文错误消息
   /Unable to write.*index/i,
   /index\.lock/i,
-  /Unable to create.*index/i
+  /Unable to create.*index/i,
+  // 中文错误消息（Git 本地化）
+  /不能写入索引/,
+  /无法写入.*索引/,
+  /无法创建.*index/i
 ];
 var INDEX_LOCK_PATH_EXTRACT_PATTERN = /'([^']*index\.lock)'/;
 function isGitIndexLockError(errorMessage) {
@@ -3761,7 +3759,7 @@ function buildPanelFrame(statusResult, selectedIndex, scrollOffset, rows, cols,
   const lines = [];
   lines.push(PANEL_TITLE(statusResult.main.projectName));
   lines.push(renderConfiguredBranchLine(statusResult.main));
-  lines.push(renderSnapshotSummary(statusResult.snapshots.total, statusResult.snapshots.orphaned));
+  lines.push(renderMainBranchDiff(statusResult.main));
   const visibleRows = calculateVisibleRows(rows);
   if (statusResult.worktrees.length === 0) {
     lines.push(buildSeparatorWithHint(cols, ""));
@@ -3896,8 +3894,13 @@ function renderConfiguredBranchLine(main2) {
   }
   return PANEL_CONFIGURED_BRANCH(main2.configuredMainBranch);
 }
-function renderSnapshotSummary(total, orphaned) {
-  return PANEL_SNAPSHOT_SUMMARY(total, orphaned);
+function renderMainBranchDiff(main2) {
+  if (main2.insertions === 0 && main2.deletions === 0) {
+    return `\u5DE5\u4F5C\u533A: ${chalk9.green(MESSAGES.STATUS_CHANGE_CLEAN)}`;
+  }
+  const insertText = chalk9.green(`+${main2.insertions}`);
+  const deleteText = chalk9.red(`-${main2.deletions}`);
+  return `\u5DE5\u4F5C\u533A: ${insertText} ${deleteText}`;
 }
 function renderFooter(countdown) {
   return `${PANEL_FOOTER_SHORTCUTS}  ${PANEL_FOOTER_COUNTDOWN(countdown)}`;
@@ -5479,12 +5482,15 @@ function collectStatus() {
   const projectConfig = loadProjectConfig();
   const configuredMainBranch = projectConfig?.clawtMainWorkBranch || null;
   const configuredBranchExists = configuredMainBranch ? checkBranchExists(configuredMainBranch) : null;
+  const { insertions, deletions } = countDiffStat(process.cwd());
   const main2 = {
     branch: currentBranch,
     isClean,
     projectName,
     configuredMainBranch,
-    configuredBranchExists
+    configuredBranchExists,
+    insertions,
+    deletions
   };
   const worktrees = getProjectWorktrees();
   const worktreeStatuses = worktrees.map((wt) => collectWorktreeDetailedStatus(wt, projectName));

package/docs/status.md

@@ -131,7 +131,9 @@ clawt status [--json] [-i | --interactive]
     "isClean": true,
     "projectName": "main-project",
     "configuredMainBranch": "main",
-    "configuredBranchExists": true
+    "configuredBranchExists": true,
+    "insertions": 185,
+    "deletions": 42
   },
   "worktrees": [
     {
@@ -163,10 +165,12 @@ clawt status [--json] [-i | --interactive]
 | `projectName`           | `string`          | 项目名                                       |
 | `configuredMainBranch`  | `string \| null`  | 配置的主工作分支名（项目未初始化时为 null）     |
 | `configuredBranchExists`| `boolean \| null` | 配置的主工作分支是否存在（项目未初始化时为 null）|
+| `insertions`            | `number`          | 工作区和暂存区的新增行数                      |
+| `deletions`             | `number`          | 工作区和暂存区的删除行数                      |
 
 **实现要点：**
 
-- 类型定义在 `src/types/status.ts`：`WorktreeDetailedStatus`（`snapshotTime: string | null`、`createdAt: string | null`）、`MainWorktreeStatus`（包含 `configuredMainBranch` 和 `configuredBranchExists`）、`SnapshotInfo`、`SnapshotSummary`（包含 `total` 和 `orphaned`）、`StatusResult`（`snapshots` 为 `SnapshotSummary` 类型）
+- 类型定义在 `src/types/status.ts`：`WorktreeDetailedStatus`（`snapshotTime: string | null`、`createdAt: string | null`）、`MainWorktreeStatus`（包含 `configuredMainBranch`、`configuredBranchExists`、`insertions`、`deletions`）、`SnapshotInfo`、`SnapshotSummary`（包含 `total` 和 `orphaned`）、`StatusResult`（`snapshots` 为 `SnapshotSummary` 类型）
 - 消息常量在 `MESSAGES.STATUS_*` 系列：
   - `STATUS_TITLE(projectName)`：标题文本
   - `STATUS_MAIN_SECTION`：主 worktree 区块标题
@@ -202,7 +206,7 @@ clawt status [--json] [-i | --interactive]
 ```
 项目状态总览: my-project
 主工作分支: main
-快照: 3 个（1 个孤立）
+工作区: +185 -42
 ──────── ↑ 更多 worktree... ────────
   ════ 2026-03-01（2 天前） ════
 
@@ -239,7 +243,7 @@ clawt status [--json] [-i | --interactive]
    - 分支已删除（红色）：`✗ 主工作分支: <branchName>（已不存在）`
    - 分支不一致（黄色）：`⚠ 主工作分支: <branchName>（不一致）`
    - 未初始化（灰色）：`未初始化（执行 clawt init 设置主工作分支）`
-3. **快照摘要行**：显示快照总数和孤立快照数
+3. **工作区 diff 信息行**：显示主工作分支的工作区 diff 统计，有变更时格式为 `工作区: +N -M`（新增行数绿色，删除行数红色），无变更时显示 `工作区: 无变更`（绿色）
 4. **顶部分隔线**：当存在向上溢出时，分隔线中间嵌入 `↑ 更多 worktree...` 提示
 5. **Worktree 滚动区域**：按日期分组显示 worktree 列表，支持上下滚动
 6. **底部分隔线**：当存在向下溢出时，分隔线中间嵌入 `↓ 更多 worktree...` 提示

package/package.json

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

package/src/commands/status.ts

@@ -81,6 +81,9 @@ export function collectStatus(): StatusResult {
   const configuredMainBranch = projectConfig?.clawtMainWorkBranch || null;
   const configuredBranchExists = configuredMainBranch ? checkBranchExists(configuredMainBranch) : null;
 
+  // 主 worktree 的 diff 统计
+  const { insertions, deletions } = countDiffStat(process.cwd());
+
   // 主 worktree 状态
   const main: MainWorktreeStatus = {
     branch: currentBranch,
@@ -88,6 +91,8 @@ export function collectStatus(): StatusResult {
     projectName,
     configuredMainBranch,
     configuredBranchExists,
+    insertions,
+    deletions,
   };
 
   // 各 worktree 详细状态

package/src/types/status.ts

@@ -32,6 +32,10 @@ export interface MainWorktreeStatus {
   configuredMainBranch: string | null;
   /** 配置的主工作分支是否存在（项目未初始化时为 null） */
   configuredBranchExists: boolean | null;
+  /** 工作区和暂存区的新增行数 */
+  insertions: number;
+  /** 工作区和暂存区的删除行数 */
+  deletions: number;
 }
 
 /** validate 快照信息 */

package/src/utils/git-lock.ts

@@ -7,11 +7,17 @@ import { MESSAGES } from '../constants/index.js';
 /**
  * index.lock 错误的关键词匹配模式
  * 每个模式同时要求包含 index 关键词，避免 "Unable to write" 单独匹配导致误报
+ * 同时支持英文和中文（Git 本地化）错误消息
  */
 const INDEX_LOCK_ERROR_PATTERNS = [
+  // 英文错误消息
   /Unable to write.*index/i,
   /index\.lock/i,
   /Unable to create.*index/i,
+  // 中文错误消息（Git 本地化）
+  /不能写入索引/,
+  /无法写入.*索引/,
+  /无法创建.*index/i,
 ];
 
 /** 从 Git 错误消息中提取 index.lock 文件路径的正则（路径被 ASCII 单引号包裹） */

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

@@ -87,8 +87,8 @@ export function buildPanelFrame(
   // 配置分支信息行
   lines.push(renderConfiguredBranchLine(statusResult.main));
 
-  // 快照摘要行
-  lines.push(renderSnapshotSummary(statusResult.snapshots.total, statusResult.snapshots.orphaned));
+  // 主工作分支 diff 信息行
+  lines.push(renderMainBranchDiff(statusResult.main));
 
   // 计算可用的 worktree 显示区域行数
   const visibleRows = calculateVisibleRows(rows);
@@ -315,6 +315,21 @@ function renderConfiguredBranchLine(main: MainWorktreeStatus): string {
   return PANEL_CONFIGURED_BRANCH(main.configuredMainBranch);
 }
 
+/**
+ * 渲染主工作分支的 diff 信息行
+ * 格式：工作区: +N -M（绿色新增，红色删除）或 工作区: 无变更（绿色）
+ * @param {MainWorktreeStatus} main - 主 worktree 状态
+ * @returns {string} 格式化的 diff 信息
+ */
+function renderMainBranchDiff(main: MainWorktreeStatus): string {
+  if (main.insertions === 0 && main.deletions === 0) {
+    return `工作区: ${chalk.green(MESSAGES.STATUS_CHANGE_CLEAN)}`;
+  }
+  const insertText = chalk.green(`+${main.insertions}`);
+  const deleteText = chalk.red(`-${main.deletions}`);
+  return `工作区: ${insertText} ${deleteText}`;
+}
+
 /**
  * 渲染快照摘要行
  * @param {number} total - 快照总数

package/tests/unit/commands/status.test.ts

@@ -340,4 +340,41 @@ describe('handleStatus', () => {
     const unverifiedLine = printedLines.find((line) => line.includes('未验证'));
     expect(unverifiedLine).toBeUndefined();
   });
+
+  it('主 worktree diff 统计包含在 JSON 输出中', async () => {
+    // 模拟主 worktree 有变更
+    mockedGetDiffStat.mockReturnValue({ insertions: 185, deletions: 42 });
+
+    const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+
+    const program = new Command();
+    program.exitOverride();
+    registerStatusCommand(program);
+    await program.parseAsync(['status', '--json'], { from: 'user' });
+
+    const jsonCall = consoleSpy.mock.calls.find((call) => {
+      try { JSON.parse(call[0]); return true; } catch { return false; }
+    });
+    const parsed = JSON.parse(jsonCall![0]);
+    expect(parsed.main.insertions).toBe(185);
+    expect(parsed.main.deletions).toBe(42);
+  });
+
+  it('主 worktree 无变更时 diff 统计为 0', async () => {
+    mockedGetDiffStat.mockReturnValue({ insertions: 0, deletions: 0 });
+
+    const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+
+    const program = new Command();
+    program.exitOverride();
+    registerStatusCommand(program);
+    await program.parseAsync(['status', '--json'], { from: 'user' });
+
+    const jsonCall = consoleSpy.mock.calls.find((call) => {
+      try { JSON.parse(call[0]); return true; } catch { return false; }
+    });
+    const parsed = JSON.parse(jsonCall![0]);
+    expect(parsed.main.insertions).toBe(0);
+    expect(parsed.main.deletions).toBe(0);
+  });
 });

package/tests/unit/utils/git-lock.test.ts

@@ -76,6 +76,18 @@ describe('isGitIndexLockError', () => {
   it('大小写不敏感匹配 "unable to write"', () => {
     expect(isGitIndexLockError('FATAL: UNABLE TO WRITE INDEX.')).toBe(true);
   });
+
+  it('检测中文 "不能写入索引" 错误', () => {
+    expect(isGitIndexLockError('致命错误：不能写入索引。')).toBe(true);
+  });
+
+  it('检测中文 "无法写入索引" 错误', () => {
+    expect(isGitIndexLockError('致命错误：无法写入新索引文件')).toBe(true);
+  });
+
+  it('检测中文 "无法创建 index.lock" 错误', () => {
+    expect(isGitIndexLockError("致命错误：无法创建 '/repo/.git/index.lock'：文件已存在")).toBe(true);
+  });
 });
 
 describe('findGitIndexLockPath', () => {