clawt 3.9.13 → 3.10.0

package/tests/unit/constants/messages.test.ts

@@ -1,4 +1,19 @@
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+// mock i18n 模块，使 getCurrentLanguage 返回 'zh-CN' 以匹配中文断言
+vi.mock('../../../src/utils/i18n.js', () => ({
+  getCurrentLanguage: vi.fn().mockReturnValue('zh-CN'),
+  resetLanguageCache: vi.fn(),
+  setCurrentLanguage: vi.fn(),
+  createMessages: vi.fn((i18nMap: Record<string, { en: any; 'zh-CN': any }>) => {
+    const result: any = {};
+    for (const key of Object.keys(i18nMap)) {
+      result[key] = i18nMap[key]['zh-CN'];
+    }
+    return result;
+  }),
+}));
+
 import { MESSAGES } from '../../../src/constants/messages/index.js';
 
 describe('MESSAGES', () => {
@@ -271,3 +286,72 @@ describe('MESSAGES', () => {
     });
   });
 });
+
+/**
+ * 英文版消息测试
+ * 使用 vi.resetModules + vi.doMock 动态切换语言为 en，
+ * 然后重新加载 MESSAGES 模块验证英文版消息内容
+ */
+describe('MESSAGES — 英文版', () => {
+  beforeEach(() => {
+    vi.resetModules();
+  });
+
+  it('纯字符串消息在英文版下返回英文文本', async () => {
+    vi.doMock('../../../src/utils/i18n.js', () => ({
+      getCurrentLanguage: () => 'en',
+      resetLanguageCache: vi.fn(),
+      setCurrentLanguage: vi.fn(),
+      createMessages: (i18nMap: Record<string, { en: any; 'zh-CN': any }>) => {
+        const result: any = {};
+        for (const key of Object.keys(i18nMap)) {
+          result[key] = i18nMap[key]['en'];
+        }
+        return result;
+      },
+    }));
+
+    const { MESSAGES: EN_MESSAGES } = await import('../../../src/constants/messages/index.js');
+
+    // 验证部分关键纯字符串消息是英文而非中文
+    expect(EN_MESSAGES.NO_WORKTREES).toBe('(No worktrees)');
+    expect(EN_MESSAGES.MAIN_WORKTREE_DIRTY).toBe('Main worktree has uncommitted changes. Please resolve first');
+    expect(EN_MESSAGES.MERGE_CONFLICT).toContain('Merge has conflicts');
+    expect(EN_MESSAGES.DESTRUCTIVE_OP_CANCELLED).toBe('Operation cancelled');
+    expect(EN_MESSAGES.CONFIG_CORRUPTED).toContain('Config file corrupted');
+    expect(EN_MESSAGES.PULL_CONFLICT).toContain('Conflict during auto-pull');
+    expect(EN_MESSAGES.PUSH_FAILED).toContain('Auto-push failed');
+    expect(EN_MESSAGES.ALIAS_LIST_EMPTY).toBe('(No aliases)');
+    expect(EN_MESSAGES.ALIAS_LIST_TITLE).toBe('Current aliases:');
+  });
+
+  it('模板函数消息在英文版下返回英文文本', async () => {
+    vi.doMock('../../../src/utils/i18n.js', () => ({
+      getCurrentLanguage: () => 'en',
+      resetLanguageCache: vi.fn(),
+      setCurrentLanguage: vi.fn(),
+      createMessages: (i18nMap: Record<string, { en: any; 'zh-CN': any }>) => {
+        const result: any = {};
+        for (const key of Object.keys(i18nMap)) {
+          result[key] = i18nMap[key]['en'];
+        }
+        return result;
+      },
+    }));
+
+    const { MESSAGES: EN_MESSAGES } = await import('../../../src/constants/messages/index.js');
+
+    // MERGE_SUCCESS 英文版用 "Pushed to remote" 而非 "已推送"
+    expect(EN_MESSAGES.MERGE_SUCCESS('feat-a', 'fix bug', true)).toContain('Pushed to remote');
+    expect(EN_MESSAGES.MERGE_SUCCESS('feat-a', 'fix bug', false)).not.toContain('Pushed to remote');
+
+    // BRANCH_EXISTS 英文版包含 "already exists"
+    expect(EN_MESSAGES.BRANCH_EXISTS('feature-a')).toContain('already exists');
+
+    // WORKTREE_CREATED 英文版用 "Created" 而非 "已创建"
+    expect(EN_MESSAGES.WORKTREE_CREATED(3)).toContain('Created');
+
+    // ALIAS_SET_SUCCESS 英文版用 "Alias set" 而非 "已设置别名"
+    expect(EN_MESSAGES.ALIAS_SET_SUCCESS('ls', 'list')).toContain('Alias set');
+  });
+});

package/tests/unit/hooks/post-create.test.ts

@@ -5,6 +5,38 @@ vi.mock('../../../src/logger/index.js', () => ({
   logger: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() },
 }));
 
+// mock i18n 模块，使 getCurrentLanguage 返回 'zh-CN' 以匹配中文断言
+// 同时导出 createMessages 供 constants 模块使用
+vi.mock('../../../src/utils/i18n.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/utils/i18n.js')>();
+  return {
+    ...actual,
+    getCurrentLanguage: vi.fn().mockReturnValue('zh-CN'),
+    resetLanguageCache: vi.fn(),
+  };
+});
+
+// mock constants 消息（post-create.ts 通过 MESSAGES 使用了 i18n 消息）
+vi.mock('../../../src/constants/index.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/constants/index.js')>();
+  return {
+    ...actual,
+    MESSAGES: {
+      ...actual.MESSAGES,
+      // 覆盖 post-create 相关的 MESSAGES，确保中文输出
+      POST_CREATE_SCRIPT_AUTO_CHMOD: (path: string) =>
+        `${path} 不可执行，已自动添加执行权限`,
+      POST_CREATE_SCRIPT_NOT_EXECUTABLE: (path: string) =>
+        `检测到 ${path} 但不可执行，自动添加权限失败，请手动执行 chmod +x ${path}`,
+      HOOK_SKIPPED: '已跳过 postCreate hook（--no-post-create）',
+      HOOK_NOT_CONFIGURED: '未配置 postCreate hook，跳过',
+      HOOK_SOURCE_INFO: (source: string) => `postCreate hook 来源: ${source}`,
+      HOOK_BACKGROUND_START: (count: number, command: string) =>
+        `postCreate hook 正在后台执行 (${count} 个 worktree): ${command}`,
+    },
+  };
+});
+
 // mock node:fs
 vi.mock('node:fs', () => ({
   existsSync: vi.fn(),

package/tests/unit/utils/alias.test.ts

@@ -5,6 +5,20 @@ vi.mock('../../../src/logger/index.js', () => ({
   logger: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() },
 }));
 
+// mock i18n 模块，避免循环依赖导致 currentLanguage 未初始化
+vi.mock('../../../src/utils/i18n.js', () => ({
+  getCurrentLanguage: vi.fn().mockReturnValue('zh-CN'),
+  resetLanguageCache: vi.fn(),
+  setCurrentLanguage: vi.fn(),
+  createMessages: vi.fn((i18nMap: Record<string, { en: any; 'zh-CN': any }>) => {
+    const result: any = {};
+    for (const key of Object.keys(i18nMap)) {
+      result[key] = i18nMap[key]['zh-CN'];
+    }
+    return result;
+  }),
+}));
+
 import { applyAliases } from '../../../src/utils/alias.js';
 
 describe('applyAliases', () => {

package/tests/unit/utils/claude.test.ts

@@ -1,5 +1,25 @@
 import { describe, it, expect, vi } from 'vitest';
 
+// mock i18n 模块，使 getCurrentLanguage 返回 'en' 以匹配英文断言
+// 同时重写 createMessages 使其直接选择 'en' 分支，确保 constants 模块加载时生成英文消息
+vi.mock('../../../src/utils/i18n.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/utils/i18n.js')>();
+  return {
+    ...actual,
+    getCurrentLanguage: vi.fn().mockReturnValue('en'),
+    resetLanguageCache: vi.fn(),
+    createMessages: <T extends Record<string, { en: any; 'zh-CN': any }>>(
+      i18nMap: T,
+    ) => {
+      const result: any = {};
+      for (const key of Object.keys(i18nMap)) {
+        result[key] = i18nMap[key]['en'];
+      }
+      return result;
+    },
+  };
+});
+
 // mock logger（避免测试时写日志文件）
 vi.mock('../../../src/logger/index.js', () => ({
   logger: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() },
@@ -177,7 +197,7 @@ describe('launchInteractiveClaude', () => {
     });
 
     expect(() => launchInteractiveClaude(worktree)).toThrow(ClawtError);
-    expect(() => launchInteractiveClaude(worktree)).toThrow('启动 Claude Code 失败');
+    expect(() => launchInteractiveClaude(worktree)).toThrow('Failed to start Claude Code');
   });
 
   it('非零退出码时调用 printWarning', () => {
@@ -195,7 +215,7 @@ describe('launchInteractiveClaude', () => {
 
     launchInteractiveClaude(worktree);
 
-    expect(mockedPrintWarning).toHaveBeenCalledWith(expect.stringContaining('退出码: 1'));
+    expect(mockedPrintWarning).toHaveBeenCalledWith(expect.stringContaining('exit code: 1'));
   });
 
   it('退出码为 null 时不调用 printWarning', () => {
@@ -252,7 +272,7 @@ describe('launchInteractiveClaude', () => {
 
     const callArgs = mockedSpawnSync.mock.calls[0][1] as string[];
     expect(callArgs).toContain('--continue');
-    expect(mockedPrintInfo).toHaveBeenCalledWith(expect.stringContaining('继续上次对话'));
+    expect(mockedPrintInfo).toHaveBeenCalledWith(expect.stringContaining('Continue previous session'));
   });
 
   it('autoContinue 启用但无会话历史时不追加 --continue 参数', () => {
@@ -272,7 +292,7 @@ describe('launchInteractiveClaude', () => {
 
     const callArgs = mockedSpawnSync.mock.calls[0][1] as string[];
     expect(callArgs).not.toContain('--continue');
-    expect(mockedPrintInfo).toHaveBeenCalledWith(expect.stringContaining('新对话'));
+    expect(mockedPrintInfo).toHaveBeenCalledWith(expect.stringContaining('New session'));
   });
 
   it('不传 autoContinue 时即使有会话历史也不追加 --continue', () => {

package/tests/unit/utils/config-strategy.test.ts

@@ -1,5 +1,25 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 
+// mock i18n 模块，使 getCurrentLanguage 返回 'zh-CN' 以匹配中文断言
+// 同时重写 createMessages 使其直接选择 'zh-CN' 分支，确保 constants 模块加载时生成中文消息
+vi.mock('../../../src/utils/i18n.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/utils/i18n.js')>();
+  return {
+    ...actual,
+    getCurrentLanguage: vi.fn().mockReturnValue('zh-CN'),
+    resetLanguageCache: vi.fn(),
+    createMessages: <T extends Record<string, { en: any; 'zh-CN': any }>>(
+      i18nMap: T,
+    ) => {
+      const result: any = {};
+      for (const key of Object.keys(i18nMap)) {
+        result[key] = i18nMap[key]['zh-CN'];
+      }
+      return result;
+    },
+  };
+});
+
 // mock enquirer（必须在所有 import 之前）
 const { mockSelectRun, mockInputRun } = vi.hoisted(() => {
   const mockSelectRun = vi.fn();
@@ -49,6 +69,7 @@ vi.mock('../../../src/constants/index.js', async (importOriginal) => {
         `配置项 ${key} 仅接受以下值: ${validValues.join(', ')}`,
       CONFIG_INPUT_PROMPT: (key: string) => `输入 ${key} 的新值`,
       CONFIG_SELECT_PROMPT: '选择要修改的配置项',
+      NOT_SET: '(未设置)',
     },
   };
 });

package/tests/unit/utils/conflict-resolver.test.ts

@@ -1,5 +1,25 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 
+// mock i18n 模块，使 getCurrentLanguage 返回 'zh-CN' 以匹配中文断言
+// 同时重写 createMessages 使其直接选择 'zh-CN' 分支，确保 constants 模块加载时生成中文消息
+vi.mock('../../../src/utils/i18n.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/utils/i18n.js')>();
+  return {
+    ...actual,
+    getCurrentLanguage: vi.fn().mockReturnValue('zh-CN'),
+    resetLanguageCache: vi.fn(),
+    createMessages: <T extends Record<string, { en: any; 'zh-CN': any }>>(
+      i18nMap: T,
+    ) => {
+      const result: any = {};
+      for (const key of Object.keys(i18nMap)) {
+        result[key] = i18nMap[key]['zh-CN'];
+      }
+      return result;
+    },
+  };
+});
+
 // mock logger
 vi.mock('../../../src/logger/index.js', () => ({
   logger: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() },
@@ -97,12 +117,12 @@ beforeEach(() => {
 describe('buildConflictResolvePrompt', () => {
   it('生成纯指令性 prompt（无参数）', () => {
     const prompt = buildConflictResolvePrompt();
-
-    expect(prompt).toContain('Git 合并冲突解决专家');
+    // CONFLICT_RESOLVE_PROMPT 始终为英文，不跟随语言切换
+    expect(prompt).toContain('Git merge conflict resolution expert');
     expect(prompt).toContain('git status');
     expect(prompt).toContain('git log');
-    expect(prompt).toContain('冲突标记');
-    expect(prompt).toContain('请直接开始');
+    expect(prompt).toContain('conflict markers');
+    expect(prompt).toContain('Please begin.');
   });
 });
 

package/tests/unit/utils/formatter.test.ts

@@ -1,4 +1,25 @@
 import { describe, it, expect, vi } from 'vitest';
+
+// mock i18n 模块，使 getCurrentLanguage 返回 'zh-CN' 以匹配中文断言
+// 同时重写 createMessages 使其直接选择 'zh-CN' 分支，确保 constants 模块加载时生成中文消息
+vi.mock('../../../src/utils/i18n.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/utils/i18n.js')>();
+  return {
+    ...actual,
+    getCurrentLanguage: vi.fn().mockReturnValue('zh-CN'),
+    resetLanguageCache: vi.fn(),
+    createMessages: <T extends Record<string, { en: any; 'zh-CN': any }>>(
+      i18nMap: T,
+    ) => {
+      const result: any = {};
+      for (const key of Object.keys(i18nMap)) {
+        result[key] = i18nMap[key]['zh-CN'];
+      }
+      return result;
+    },
+  };
+});
+
 import { formatWorktreeStatus, printSuccess, printError, printWarning, printInfo, printSeparator, printDoubleSeparator, isWorktreeIdle, formatDuration, formatRelativeTime, formatDiskSize, formatLocalISOString, generateTaskFilename } from '../../../src/utils/formatter.js';
 import { createWorktreeStatus } from '../../helpers/fixtures.js';
 

package/tests/unit/utils/i18n.test.ts

@@ -0,0 +1,91 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+describe('i18n', () => {
+  beforeEach(() => {
+    vi.resetModules();
+  });
+
+  describe('getCurrentLanguage', () => {
+    it('should return en when config has language: en', async () => {
+      vi.doMock('../../../src/utils/config.js', () => ({
+        loadConfig: () => ({ language: 'en' }),
+      }));
+      const { getCurrentLanguage } = await import('../../../src/utils/i18n.js');
+      expect(getCurrentLanguage()).toBe('en');
+    });
+
+    it('should return zh-CN when config has language: zh-CN', async () => {
+      vi.doMock('../../../src/utils/config.js', () => ({
+        loadConfig: () => ({ language: 'zh-CN' }),
+      }));
+      const { getCurrentLanguage } = await import('../../../src/utils/i18n.js');
+      expect(getCurrentLanguage()).toBe('zh-CN');
+    });
+
+    it('should default to en when language is not set', async () => {
+      vi.doMock('../../../src/utils/config.js', () => ({
+        loadConfig: () => ({}),
+      }));
+      const { getCurrentLanguage } = await import('../../../src/utils/i18n.js');
+      expect(getCurrentLanguage()).toBe('en');
+    });
+
+    it('should default to en when loadConfig throws', async () => {
+      vi.doMock('../../../src/utils/config.js', () => ({
+        loadConfig: () => { throw new Error('file not found'); },
+      }));
+      const { getCurrentLanguage } = await import('../../../src/utils/i18n.js');
+      expect(getCurrentLanguage()).toBe('en');
+    });
+  });
+
+  describe('setCurrentLanguage / resetLanguageCache', () => {
+    it('should use cached language after setCurrentLanguage', async () => {
+      vi.doMock('../../../src/utils/config.js', () => ({
+        loadConfig: () => ({ language: 'zh-CN' }),
+      }));
+      const { getCurrentLanguage, setCurrentLanguage } = await import('../../../src/utils/i18n.js');
+      setCurrentLanguage('en');
+      expect(getCurrentLanguage()).toBe('en');
+    });
+
+    it('should reload from config after resetLanguageCache', async () => {
+      vi.doMock('../../../src/utils/config.js', () => ({
+        loadConfig: () => ({ language: 'zh-CN' }),
+      }));
+      const { getCurrentLanguage, setCurrentLanguage, resetLanguageCache } = await import('../../../src/utils/i18n.js');
+      setCurrentLanguage('en');
+      expect(getCurrentLanguage()).toBe('en');
+      resetLanguageCache();
+      expect(getCurrentLanguage()).toBe('zh-CN');
+    });
+  });
+
+  describe('createMessages', () => {
+    it('should return en messages when language is en', async () => {
+      vi.doMock('../../../src/utils/config.js', () => ({
+        loadConfig: () => ({ language: 'en' }),
+      }));
+      const { createMessages } = await import('../../../src/utils/i18n.js');
+      const messages = createMessages({
+        FOO: { en: 'Hello', 'zh-CN': '你好' },
+        BAR: { en: (n: number) => `${n} items`, 'zh-CN': (n: number) => `${n} 个` },
+      });
+      expect(messages.FOO).toBe('Hello');
+      expect(messages.BAR(3)).toBe('3 items');
+    });
+
+    it('should return zh-CN messages when language is zh-CN', async () => {
+      vi.doMock('../../../src/utils/config.js', () => ({
+        loadConfig: () => ({ language: 'zh-CN' }),
+      }));
+      const { createMessages } = await import('../../../src/utils/i18n.js');
+      const messages = createMessages({
+        FOO: { en: 'Hello', 'zh-CN': '你好' },
+        BAR: { en: (n: number) => `${n} items`, 'zh-CN': (n: number) => `${n} 个` },
+      });
+      expect(messages.FOO).toBe('你好');
+      expect(messages.BAR(3)).toBe('3 个');
+    });
+  });
+});

package/tests/unit/utils/progress.test.ts

@@ -1,4 +1,25 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+
+// mock i18n 模块，使 getCurrentLanguage 返回 'en' 以匹配英文断言
+// 同时重写 createMessages 使其直接选择 'en' 分支，确保 constants 模块加载时生成英文消息
+vi.mock('../../../src/utils/i18n.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/utils/i18n.js')>();
+  return {
+    ...actual,
+    getCurrentLanguage: vi.fn().mockReturnValue('en'),
+    resetLanguageCache: vi.fn(),
+    createMessages: <T extends Record<string, { en: any; 'zh-CN': any }>>(
+      i18nMap: T,
+    ) => {
+      const result: any = {};
+      for (const key of Object.keys(i18nMap)) {
+        result[key] = i18nMap[key]['en'];
+      }
+      return result;
+    },
+  };
+});
+
 import { ProgressRenderer } from '../../../src/utils/progress.js';
 
 describe('ProgressRenderer', () => {
@@ -66,7 +87,7 @@ describe('ProgressRenderer', () => {
       // 第二列应显示路径
       expect(allOutput).toContain('/path/feat-1');
       expect(allOutput).toContain('/path/feat-2');
-      expect(allOutput).toContain('运行中');
+      expect(allOutput).toContain('Running');
       // running 状态下不显示额外路径信息
 
       renderer.stop();
@@ -82,7 +103,7 @@ describe('ProgressRenderer', () => {
 
       const allOutput = writeSpy.mock.calls.map((c) => c[0]).join('');
       expect(allOutput).toContain('✓');
-      expect(allOutput).toContain('完成');
+      expect(allOutput).toContain('Done');
       expect(allOutput).toContain('5.0s');
       expect(allOutput).toContain('$0.05');
       // 第二列显示路径
@@ -101,7 +122,7 @@ describe('ProgressRenderer', () => {
 
       const allOutput = writeSpy.mock.calls.map((c) => c[0]).join('');
       expect(allOutput).toContain('✓');
-      expect(allOutput).toContain('完成');
+      expect(allOutput).toContain('Done');
       expect(allOutput).toContain('5.0s');
       expect(allOutput).toContain('$0.05');
       // 第二列仍显示路径
@@ -118,7 +139,7 @@ describe('ProgressRenderer', () => {
 
       const allOutput = writeSpy.mock.calls.map((c) => c[0]).join('');
       expect(allOutput).toContain('✗');
-      expect(allOutput).toContain('失败');
+      expect(allOutput).toContain('Failed');
       expect(allOutput).toContain('3.0s');
       // 第二列显示路径
       expect(allOutput).toContain('/path/feat-1');
@@ -136,7 +157,7 @@ describe('ProgressRenderer', () => {
 
       const allOutput = writeSpy.mock.calls.map((c) => c[0]).join('');
       expect(allOutput).toContain('✗');
-      expect(allOutput).toContain('失败');
+      expect(allOutput).toContain('Failed');
       expect(allOutput).toContain('3.0s');
       // 第二列仍显示路径
       expect(allOutput).toContain('/path/feat-1');
@@ -161,7 +182,7 @@ describe('ProgressRenderer', () => {
 
       const allOutput = writeSpy.mock.calls.map((c) => c[0]).join('');
       expect(allOutput).toContain('◦');
-      expect(allOutput).toContain('排队中');
+      expect(allOutput).toContain('Pending');
 
       renderer.stop();
     });
@@ -175,9 +196,9 @@ describe('ProgressRenderer', () => {
       renderer.stop();
 
       const allOutput = writeSpy.mock.calls.map((c) => c[0]).join('');
-      expect(allOutput).toContain('运行中');
+      expect(allOutput).toContain('Running');
       // 第二个任务仍为排队中
-      expect(allOutput).toContain('排队中');
+      expect(allOutput).toContain('Pending');
     });
 
     it('allRunning=false 时面板包含汇总行', () => {
@@ -187,7 +208,7 @@ describe('ProgressRenderer', () => {
       const allOutput = writeSpy.mock.calls.map((c) => c[0]).join('');
       // 汇总行应包含排队中的计数
       expect(allOutput).toContain('3/3');
-      expect(allOutput).toContain('排队中');
+      expect(allOutput).toContain('Pending');
 
       renderer.stop();
     });
@@ -230,7 +251,7 @@ describe('ProgressRenderer', () => {
       const allOutput = writeSpy.mock.calls.map((c) => c[0]).join('');
       // 第二列显示路径
       expect(allOutput).toContain('/path/feat-1');
-      expect(allOutput).toContain('运行中');
+      expect(allOutput).toContain('Running');
     });
 
     it('任务完成后活动文本不再显示', () => {
@@ -269,7 +290,7 @@ describe('ProgressRenderer', () => {
       const allOutput = writeSpy.mock.calls.map((c) => c[0]).join('');
       // pending 状态第二列应显示路径，末尾无额外路径
       expect(allOutput).toContain('/path/feat-1');
-      expect(allOutput).toContain('排队中');
+      expect(allOutput).toContain('Pending');
 
       renderer.stop();
     });
@@ -336,7 +357,7 @@ describe('ProgressRenderer', () => {
 
       expect(logSpy).toHaveBeenCalledTimes(2);
       expect(logSpy.mock.calls[0][0]).toContain('feat-1');
-      expect(logSpy.mock.calls[0][0]).toContain('启动');
+      expect(logSpy.mock.calls[0][0]).toContain('started');
       expect(logSpy.mock.calls[1][0]).toContain('feat-2');
 
       renderer.stop();
@@ -351,7 +372,7 @@ describe('ProgressRenderer', () => {
 
       expect(logSpy).toHaveBeenCalledTimes(1);
       expect(logSpy.mock.calls[0][0]).toContain('✓');
-      expect(logSpy.mock.calls[0][0]).toContain('完成');
+      expect(logSpy.mock.calls[0][0]).toContain('done');
       expect(logSpy.mock.calls[0][0]).toContain('5.0s');
       expect(logSpy.mock.calls[0][0]).toContain('$0.05');
       // 末尾显示结果预览
@@ -369,7 +390,7 @@ describe('ProgressRenderer', () => {
 
       expect(logSpy).toHaveBeenCalledTimes(1);
       expect(logSpy.mock.calls[0][0]).toContain('✓');
-      expect(logSpy.mock.calls[0][0]).toContain('完成');
+      expect(logSpy.mock.calls[0][0]).toContain('done');
       // 无 resultPreview 时回退到 path
       expect(logSpy.mock.calls[0][0]).toContain('/path/feat-1');
 
@@ -385,7 +406,7 @@ describe('ProgressRenderer', () => {
 
       expect(logSpy).toHaveBeenCalledTimes(1);
       expect(logSpy.mock.calls[0][0]).toContain('✗');
-      expect(logSpy.mock.calls[0][0]).toContain('失败');
+      expect(logSpy.mock.calls[0][0]).toContain('failed');
       expect(logSpy.mock.calls[0][0]).toContain('3.0s');
       // 末尾显示结果预览
       expect(logSpy.mock.calls[0][0]).toContain('执行过程中发生错误');
@@ -402,7 +423,7 @@ describe('ProgressRenderer', () => {
 
       expect(logSpy).toHaveBeenCalledTimes(1);
       expect(logSpy.mock.calls[0][0]).toContain('✗');
-      expect(logSpy.mock.calls[0][0]).toContain('失败');
+      expect(logSpy.mock.calls[0][0]).toContain('failed');
       expect(logSpy.mock.calls[0][0]).toContain('3.0s');
       // 无 resultPreview 时回退到 path
       expect(logSpy.mock.calls[0][0]).toContain('/path/feat-1');
@@ -438,7 +459,7 @@ describe('ProgressRenderer', () => {
 
       expect(logSpy).toHaveBeenCalledTimes(1);
       expect(logSpy.mock.calls[0][0]).toContain('feat-1');
-      expect(logSpy.mock.calls[0][0]).toContain('启动');
+      expect(logSpy.mock.calls[0][0]).toContain('started');
 
       renderer.stop();
     });
@@ -528,7 +549,7 @@ describe('ProgressRenderer', () => {
       // ALT_SCREEN_LEAVE 之后应有面板最终状态输出
       const afterLeave = allCalls.slice(leaveIndex + 1).join('');
       expect(afterLeave).toContain('✓');
-      expect(afterLeave).toContain('完成');
+      expect(afterLeave).toContain('Done');
       expect(afterLeave).toContain('/path/feat-1');
       expect(afterLeave).toContain('代码审查完成');
     });

package/tests/unit/utils/prompt.test.ts

@@ -1,5 +1,28 @@
 import { describe, it, expect, vi } from 'vitest';
 
+// mock i18n 模块，使 getCurrentLanguage 返回 'en' 以匹配英文断言
+// 需要同时提供 createMessages 的真实实现，以便 constants 模块加载时能正确生成英文消息
+vi.mock('../../../src/utils/i18n.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/utils/i18n.js')>();
+  // 在 createMessages 调用前就 mock getCurrentLanguage
+  const mockGetCurrentLanguage = vi.fn().mockReturnValue('en');
+  return {
+    ...actual,
+    getCurrentLanguage: mockGetCurrentLanguage,
+    resetLanguageCache: vi.fn(),
+    // 重写 createMessages 使其使用 mock 的 getCurrentLanguage
+    createMessages: <T extends Record<string, { en: any; 'zh-CN': any }>>(
+      i18nMap: T,
+    ) => {
+      const result: any = {};
+      for (const key of Object.keys(i18nMap)) {
+        result[key] = i18nMap[key]['en'];
+      }
+      return result;
+    },
+  };
+});
+
 // mock 非交互模式判断函数
 const { mockIsNonInteractive } = vi.hoisted(() => {
   return { mockIsNonInteractive: vi.fn().mockReturnValue(false) };
@@ -95,7 +118,7 @@ describe('promptCommitMessage', () => {
 
     await expect(
       promptCommitMessage('请输入提交信息', '非交互模式错误'),
-    ).rejects.toThrow('提交信息不能为空');
+    ).rejects.toThrow('Commit message cannot be empty');
   });
 
   it('用户输入仅空白字符时抛出 ClawtError', async () => {
@@ -104,7 +127,7 @@ describe('promptCommitMessage', () => {
 
     await expect(
       promptCommitMessage('请输入提交信息', '非交互模式错误'),
-    ).rejects.toThrow('提交信息不能为空');
+    ).rejects.toThrow('Commit message cannot be empty');
   });
 
   it('返回 trim 后的用户输入', async () => {