clawt 3.9.13 → 3.10.1

package/src/utils/validate-branch.ts

@@ -5,6 +5,7 @@ import { checkBranchExists, createBranch, deleteBranch, getCurrentBranch, gitChe
 import { getMainWorkBranch } from './project-config.js';
 import { printWarning, confirmAction } from './formatter.js';
 import { ClawtError } from '../errors/index.js';
+import { getCurrentLanguage } from './i18n.js';
 import { isNonInteractive } from './interactive.js';
 
 /**
@@ -94,35 +95,41 @@ export async function handleDirtyWorkingDir(cwd?: string): Promise<void> {
     gitAddAll(cwd);
     gitStashPush('clawt:auto-stash', cwd);
     if (!isWorkingDirClean(cwd)) {
-      throw new ClawtError('工作区仍然不干净，请手动处理');
+      throw new ClawtError(MESSAGES.WORKSPACE_STILL_DIRTY);
     }
     return;
   }
 
-  printWarning('当前分支有未提交的更改，请选择处理方式：\n');
+  printWarning(MESSAGES.UNCOMMITTED_CHANGES_ON_BRANCH);
 
   // @ts-expect-error enquirer 类型声明未导出 Select 类，但运行时存在
   const choice = await new Enquirer.Select({
-    message: '选择处理方式',
+    message: MESSAGES.SELECT_ACTION,
     choices: [
       {
         name: 'reset',
-        message: 'reset        - 丢弃所有更改 (git reset --hard HEAD && git clean -fd)',
+        message: getCurrentLanguage() === 'en'
+          ? 'reset        - Discard all changes (git reset --hard HEAD && git clean -fd)'
+          : 'reset        - 丢弃所有更改 (git reset --hard HEAD && git clean -fd)',
       },
       {
         name: 'stash',
-        message: 'stash        - 暂存更改 (git add . && git stash)',
+        message: getCurrentLanguage() === 'en'
+          ? 'stash        - Stash changes (git add . && git stash)'
+          : 'stash        - 暂存更改 (git add . && git stash)',
       },
       {
         name: 'exit',
-        message: 'exit         - 退出，手动处理',
+        message: getCurrentLanguage() === 'en'
+          ? 'exit         - Exit, handle manually'
+          : 'exit         - 退出，手动处理',
       },
     ],
     initial: 0,
   }).run();
 
   if (choice === 'exit') {
-    throw new ClawtError('用户选择退出，请手动处理工作区更改后重试');
+    throw new ClawtError(MESSAGES.USER_CHOSE_EXIT);
   }
 
   if (choice === 'reset') {
@@ -135,7 +142,7 @@ export async function handleDirtyWorkingDir(cwd?: string): Promise<void> {
 
   // 再次检查是否干净
   if (!isWorkingDirClean(cwd)) {
-    throw new ClawtError('工作区仍然不干净，请手动处理');
+    throw new ClawtError(MESSAGES.WORKSPACE_STILL_DIRTY);
   }
 }
 
@@ -171,7 +178,7 @@ export async function ensureOnMainWorkBranch(cwd?: string): Promise<void> {
   // 当前在其他分支上，警告并确认后处理脏工作区再切换
   printWarning(MESSAGES.GUARD_BRANCH_MISMATCH(mainBranch, currentBranch));
   // 非交互模式下自动确认继续
-  const confirmed = isNonInteractive() ? true : await confirmAction('是否继续执行？');
+  const confirmed = isNonInteractive() ? true : await confirmAction(MESSAGES.CONFIRM_CONTINUE_VALIDATE);
   if (!confirmed) {
     throw new ClawtError(MESSAGES.DESTRUCTIVE_OP_CANCELLED);
   }

package/src/utils/validate-core.ts

@@ -1,6 +1,7 @@
 import { logger } from '../logger/index.js';
 import { ClawtError } from '../errors/index.js';
 import { MESSAGES } from '../constants/index.js';
+import { getCurrentLanguage } from './i18n.js';
 import {
   gitAddAll,
   gitCommit,
@@ -137,7 +138,7 @@ export function loadOldSnapshotToStage(oldTreeHash: string, oldHeadCommitHash: s
         return { success: true, stagedTreeHash };
       } else if (oldChangePatch.length > 0) {
         // 有冲突：降级为全量模式（暂存区保持为空）
-        logger.warn('旧变更 patch 与当前 HEAD 冲突，降级为全量模式');
+        logger.warn(getCurrentLanguage() === 'en' ? 'Old changes patch conflicts with current HEAD, falling back to full mode' : '旧变更 patch 与当前 HEAD 冲突，降级为全量模式');
         return { success: false, stagedTreeHash: '' };
       }
       // oldChangePatch 为空表示旧变更为空，暂存区保持干净即可

package/src/utils/validate-runner.ts

@@ -36,7 +36,7 @@ function buildSingleErrorClipboard(command: string, stderr: string, exitCode: nu
   if (stderr.trim()) {
     return MESSAGES.VALIDATE_CLIPBOARD_SINGLE_ERROR(command, stderr.trim());
   }
-  return `${command} 指令执行出错，退出码: ${exitCode}`;
+  return MESSAGES.COMMAND_EXEC_ERROR(command, exitCode);
 }
 
 /**
@@ -94,7 +94,7 @@ function reportParallelResults(results: ParallelCommandResultWithStderr[]): void
       // 收集错误信息用于剪贴板
       const errorContent = result.stderr.trim()
         ? result.stderr.trim()
-        : `退出码: ${result.exitCode}`;
+        : MESSAGES.EXIT_CODE_LABEL(result.exitCode);
       errorClipboardParts.push(
         MESSAGES.VALIDATE_CLIPBOARD_PARALLEL_ERROR(result.command, errorContent),
       );

package/src/utils/worktree-matcher.ts

@@ -12,6 +12,7 @@ import {
 import type { WorktreeInfo } from '../types/index.js';
 import { promptSelectBranch, promptGroupedMultiSelectBranches } from './ui-prompts.js';
 import type { GroupedChoice } from './ui-prompts.js';
+import { getCurrentLanguage } from './i18n.js';
 
 /**
  * 分支解析时使用的消息文案配置
@@ -213,26 +214,27 @@ export function getWorktreeCreatedTime(dirPath: string): string | null {
 }
 
 /**
- * 将 YYYY-MM-DD 日期字符串格式化为中文相对日期描述
+ * 将 YYYY-MM-DD 日期字符串格式化为相对日期描述
  * 基于自然日计算，适用于日期分组场景
  * @param {string} dateStr - YYYY-MM-DD 格式的日期字符串
- * @returns {string} 中文相对日期描述，如"今天"、"昨天"、"3 天前"
+ * @returns {string} 相对日期描述，如"今天"/"Today"、"昨天"/"Yesterday"、"3 天前"/"3 days ago"
  */
 export function formatRelativeDate(dateStr: string): string {
+  const lang = getCurrentLanguage();
   const today = formatLocalDate(new Date());
   const todayMs = new Date(today).getTime();
   const targetMs = new Date(dateStr).getTime();
   const diffDays = Math.round((todayMs - targetMs) / (1000 * 60 * 60 * 24));
 
-  if (diffDays === 0) return '今天';
-  if (diffDays === 1) return '昨天';
-  if (diffDays < 30) return `${diffDays} 天前`;
+  if (diffDays === 0) return lang === 'en' ? 'Today' : '今天';
+  if (diffDays === 1) return lang === 'en' ? 'Yesterday' : '昨天';
+  if (diffDays < 30) return lang === 'en' ? `${diffDays} day${diffDays > 1 ? 's' : ''} ago` : `${diffDays} 天前`;
   if (diffDays < 365) {
     const months = Math.floor(diffDays / 30);
-    return `${months} 个月前`;
+    return lang === 'en' ? `${months} month${months > 1 ? 's' : ''} ago` : `${months} 个月前`;
   }
   const years = Math.floor(diffDays / 365);
-  return `${years} 年前`;
+  return lang === 'en' ? `${years} year${years > 1 ? 's' : ''} ago` : `${years} 年前`;
 }
 
 /**

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

@@ -43,14 +43,18 @@ beforeEach(() => {
 /** 构造默认配置 mock 数据 */
 function mockDefaultConfig(aliases: Record<string, string> = {}) {
   return {
+    language: 'en' as const,
     autoDeleteBranch: false,
     claudeCodeCommand: 'claude',
     autoPullPush: false,
     confirmDestructiveOps: true,
     maxConcurrency: 0,
     terminalApp: 'auto',
+    resumeInPlace: false,
     aliases,
     autoUpdate: true,
+    conflictResolveMode: 'ask' as const,
+    conflictResolveTimeoutMs: 900000,
   };
 }
 

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

@@ -28,6 +28,20 @@ vi.mock('../../../src/logger/index.js', () => ({
 }));
 vi.mock('../../../src/utils/fs.js', () => ({}));
 
+// mock i18n 模块，避免循环依赖导致 currentLanguage 未初始化
+vi.mock('../../../src/utils/i18n.js', () => ({
+  getCurrentLanguage: vi.fn().mockReturnValue('en'),
+  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]['en'];
+    }
+    return result;
+  }),
+}));
+
 /**
  * 创建 statSync 的 mock 返回值
  * @param {boolean} isDir - 是否为目录

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

@@ -45,52 +45,81 @@ vi.mock('../../../src/utils/index.js', async (importOriginal) => {
 vi.mock('../../../src/constants/index.js', () => ({
   CONFIG_PATH: '/mock/.clawt/config.json',
   DEFAULT_CONFIG: {
+    language: 'en',
     autoDeleteBranch: false,
     claudeCodeCommand: 'claude',
     autoPullPush: false,
     confirmDestructiveOps: true,
     maxConcurrency: 0,
     terminalApp: 'auto',
+    resumeInPlace: false,
     aliases: {},
     autoUpdate: true,
+    conflictResolveMode: 'ask',
+    conflictResolveTimeoutMs: 900000,
   },
   CONFIG_DESCRIPTIONS: {
-    autoDeleteBranch: '自动删除分支',
-    claudeCodeCommand: 'Claude Code CLI 命令',
-    autoPullPush: '自动 pull/push',
-    confirmDestructiveOps: '破坏性操作确认',
-    maxConcurrency: '最大并发数',
-    terminalApp: '终端应用',
-    aliases: '命令别名映射',
-    autoUpdate: '自动更新',
+    language: 'Interface language',
+    autoDeleteBranch: 'Whether to auto-delete the local branch when removing a worktree',
+    claudeCodeCommand: 'Claude Code CLI launch command',
+    autoPullPush: 'Whether to auto-run git pull and git push after merge',
+    confirmDestructiveOps: 'Whether to prompt for confirmation before destructive operations',
+    maxConcurrency: 'Default max concurrency for run command, 0 means unlimited',
+    terminalApp: 'Terminal app for batch resume',
+    resumeInPlace: 'Whether to resume in current terminal',
+    aliases: 'Command alias mapping',
+    autoUpdate: 'Whether to enable auto-update checks',
+    conflictResolveMode: 'Merge conflict resolution mode',
+    conflictResolveTimeoutMs: 'Claude Code conflict resolution timeout',
   },
   CONFIG_DEFINITIONS: {
-    autoDeleteBranch: { defaultValue: false, description: '自动删除分支' },
-    claudeCodeCommand: { defaultValue: 'claude', description: 'Claude Code CLI 命令' },
-    autoPullPush: { defaultValue: false, description: '自动 pull/push' },
-    confirmDestructiveOps: { defaultValue: true, description: '破坏性操作确认' },
-    maxConcurrency: { defaultValue: 0, description: '最大并发数' },
-    terminalApp: { defaultValue: 'auto', description: '终端应用', allowedValues: ['auto', 'iterm2', 'terminal'] },
-    aliases: { defaultValue: {}, description: '命令别名映射' },
-    autoUpdate: { defaultValue: true, description: '自动更新' },
+    language: { defaultValue: 'en', description: 'Interface language', allowedValues: ['en', 'zh-CN'] },
+    autoDeleteBranch: { defaultValue: false, description: 'Whether to auto-delete the local branch when removing a worktree' },
+    claudeCodeCommand: { defaultValue: 'claude', description: 'Claude Code CLI launch command' },
+    autoPullPush: { defaultValue: false, description: 'Whether to auto-run git pull and git push after merge' },
+    confirmDestructiveOps: { defaultValue: true, description: 'Whether to prompt for confirmation before destructive operations' },
+    maxConcurrency: { defaultValue: 0, description: 'Default max concurrency for run command, 0 means unlimited' },
+    terminalApp: { defaultValue: 'auto', description: 'Terminal app for batch resume', allowedValues: ['auto', 'iterm2', 'terminal'] },
+    resumeInPlace: { defaultValue: false, description: 'Whether to resume in current terminal' },
+    aliases: { defaultValue: {}, description: 'Command alias mapping' },
+    autoUpdate: { defaultValue: true, description: 'Whether to enable auto-update checks' },
+    conflictResolveMode: { defaultValue: 'ask', description: 'Merge conflict resolution mode', allowedValues: ['ask', 'auto', 'manual'] },
+    conflictResolveTimeoutMs: { defaultValue: 900000, description: 'Claude Code conflict resolution timeout' },
   },
-  CONFIG_ALIAS_DISABLED_HINT: '(通过 clawt alias 命令管理)',
+  CONFIG_ALIAS_DISABLED_HINT: '(Manage via clawt alias command)',
+  getI18nConfigDescriptions: () => ({
+    autoDeleteBranch: 'Whether to auto-delete the local branch when removing a worktree',
+    claudeCodeCommand: 'Claude Code CLI launch command',
+    autoPullPush: 'Whether to auto-run git pull and git push after merge',
+    confirmDestructiveOps: 'Whether to prompt for confirmation before destructive operations',
+    maxConcurrency: 'Default max concurrency for run command, 0 means unlimited',
+    terminalApp: 'Terminal app for batch resume',
+    aliases: 'Command alias mapping',
+    autoUpdate: 'Whether to enable auto-update checks',
+    resumeInPlace: 'Whether to resume in current terminal',
+    conflictResolveMode: 'Merge conflict resolution mode',
+    conflictResolveTimeoutMs: 'Claude Code conflict resolution timeout',
+    language: 'Interface language',
+  }),
   MESSAGES: {
-    CONFIG_RESET_SUCCESS: '配置已恢复为默认值',
-    DESTRUCTIVE_OP_CANCELLED: '已取消操作',
-    CONFIG_SET_SUCCESS: (key: string, value: string) => `✓ ${key} 已设置为 ${value}`,
+    CONFIG_RESET_SUCCESS: 'Configuration reset to defaults',
+    DESTRUCTIVE_OP_CANCELLED: 'Operation cancelled',
+    CONFIG_SET_SUCCESS: (key: string, value: string) => `✓ ${key} set to ${value}`,
     CONFIG_GET_VALUE: (key: string, value: string) => `${key} = ${value}`,
     CONFIG_INVALID_KEY: (key: string, validKeys: string[]) =>
-      `无效的配置项: ${key}\n可用的配置项: ${validKeys.join(', ')}`,
+      `Invalid config key: ${key}\nAvailable keys: ${validKeys.join(', ')}`,
     CONFIG_INVALID_BOOLEAN: (key: string) =>
-      `配置项 ${key} 为布尔类型，仅接受 true 或 false`,
+      `Config key ${key} is boolean, only true or false accepted`,
     CONFIG_INVALID_NUMBER: (key: string) =>
-      `配置项 ${key} 为数字类型，请输入有效的数字`,
+      `Config key ${key} is number, please enter a valid number`,
     CONFIG_INVALID_ENUM: (key: string, validValues: readonly string[]) =>
-      `配置项 ${key} 仅接受以下值: ${validValues.join(', ')}`,
-    CONFIG_SELECT_PROMPT: '选择要修改的配置项',
-    CONFIG_INPUT_PROMPT: (key: string) => `输入 ${key} 的新值`,
-    CONFIG_MISSING_VALUE: (key: string) => `缺少配置值，用法: clawt config set ${key} <value>`,
+      `Config key ${key} only accepts: ${validValues.join(', ')}`,
+    CONFIG_SELECT_PROMPT: 'Select a config key to modify',
+    CONFIG_INPUT_PROMPT: (key: string) => `Enter new value for ${key}`,
+    CONFIG_MISSING_VALUE: (key: string) => `Missing value, usage: clawt config set ${key} <value>`,
+    CONFIG_RESET_WARNING: 'This will reset all configuration to defaults',
+    NON_INTERACTIVE_CONFIG_EDITOR: 'Cannot edit config in non-interactive mode',
+    NOT_SET: '(not set)',
   },
 }));
 
@@ -108,14 +137,18 @@ const mockedConfirmDestructiveAction = vi.mocked(confirmDestructiveAction);
 /** 创建默认配置对象用于 mock */
 function createMockConfig() {
   return {
+    language: 'en' as const,
     autoDeleteBranch: false,
     claudeCodeCommand: 'claude',
     autoPullPush: false,
     confirmDestructiveOps: true,
     maxConcurrency: 0,
     terminalApp: 'auto',
+    resumeInPlace: false,
     aliases: {},
     autoUpdate: true,
+    conflictResolveMode: 'ask' as const,
+    conflictResolveTimeoutMs: 900000,
   };
 }
 
@@ -403,7 +436,7 @@ describe('handleConfigSet — 交互模式', () => {
     const selectOpts = mockSelectConstructorArgs[0] as { choices: Array<{ name: string; disabled?: string }> };
     const aliasesChoice = selectOpts.choices.find((c) => c.name === 'aliases');
     expect(aliasesChoice).toBeDefined();
-    expect(aliasesChoice!.disabled).toBe('(通过 clawt alias 命令管理)');
+    expect(aliasesChoice!.disabled).toBe('(Manage via clawt alias command)');
 
     // 普通配置项不应有 disabled 属性
     const normalChoice = selectOpts.choices.find((c) => c.name === 'autoDeleteBranch');

package/tests/unit/commands/cover-validate.test.ts

@@ -5,6 +5,17 @@ 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(),
+  };
+});
+
 vi.mock('../../../src/errors/index.js', () => ({
   ClawtError: class ClawtError extends Error {
     exitCode: number;
@@ -37,7 +48,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   getProjectWorktrees: vi.fn().mockReturnValue([{ path: '/path/feature', branch: 'feature' }]),
   findExactMatch: vi.fn().mockReturnValue({ path: '/path/feature', branch: 'feature' }),
   hasSnapshot: vi.fn().mockReturnValue(true),
-  readSnapshot: vi.fn().mockReturnValue({ treeHash: 'snapshot-tree-hash' }),
+  readSnapshot: vi.fn().mockReturnValue({ treeHash: 'snapshot-tree-hash', headCommitHash: '', stagedTreeHash: '' }),
   writeSnapshot: vi.fn(),
   gitAddAll: vi.fn(),
   gitWriteTree: vi.fn().mockReturnValue('current-tree-hash'),
@@ -95,7 +106,7 @@ beforeEach(() => {
   mockedGetProjectWorktrees.mockReturnValue([{ path: '/path/feature', branch: 'feature' }]);
   mockedFindExactMatch.mockReturnValue({ path: '/path/feature', branch: 'feature' });
   mockedHasSnapshot.mockReturnValue(true);
-  mockedReadSnapshot.mockReturnValue({ treeHash: 'snapshot-tree-hash' });
+  mockedReadSnapshot.mockReturnValue({ treeHash: 'snapshot-tree-hash', headCommitHash: '', stagedTreeHash: '' });
   mockedIsWorkingDirClean.mockReturnValue(false);
   mockedConfirmAction.mockResolvedValue(true);
   mockedGitWriteTree.mockReturnValue('current-tree-hash');

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

@@ -16,9 +16,13 @@ vi.mock('../../../src/constants/index.js', () => ({
     INIT_SET_SUCCESS: (key: string, value: string) => `✓ 项目配置 ${key} 已设置为 ${value}`,
   },
   PROJECT_CONFIG_DEFINITIONS: {
-    clawtMainWorkBranch: { defaultValue: '', description: '主 worktree 的工作分支名' },
-    validateRunCommand: { defaultValue: undefined, description: 'validate 成功后自动执行的命令' },
+    clawtMainWorkBranch: { defaultValue: '', description: 'Main worktree branch name' },
+    validateRunCommand: { defaultValue: undefined, description: 'Command to auto-run after validate succeeds' },
   },
+  getI18nProjectConfigDescriptions: () => ({
+    clawtMainWorkBranch: 'Main worktree branch name',
+    validateRunCommand: 'Command to auto-run after validate succeeds',
+  }),
 }));
 
 vi.mock('../../../src/utils/index.js', () => ({

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

@@ -5,6 +5,17 @@ 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(),
+  };
+});
+
 vi.mock('../../../src/errors/index.js', () => ({
   ClawtError: class ClawtError extends Error {
     exitCode: number;
@@ -40,6 +51,9 @@ vi.mock('../../../src/constants/index.js', async (importOriginal) => {
       MERGE_SUCCESS: (branch: string, message: string, autoPullPush: boolean) => `合并成功: ${branch}`,
       MERGE_SUCCESS_NO_MESSAGE: (branch: string, autoPullPush: boolean) => `合并成功: ${branch}`,
       WORKTREE_CLEANED: (branch: string) => `已清理: ${branch}`,
+      // i18n 新增的消息键（merge.ts shouldCleanupAfterMerge 中使用）
+      AUTO_DELETE_CONFIGURED: (branch: string) => `已配置自动删除，merge 成功后将自动清理 worktree 和分支: ${branch}`,
+      CONFIRM_DELETE_WORKTREE_BRANCH: (branch: string) => `是否删除对应的 worktree 和分支 (${branch})？`,
     },
     AUTO_SAVE_COMMIT_MESSAGE_PREFIX: 'clawt: auto-save before merging',
   };

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

@@ -6,6 +6,17 @@ 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(),
+  };
+});
+
 vi.mock('../../../src/errors/index.js', () => ({
   ClawtError: class ClawtError extends Error {
     exitCode: number;
@@ -42,6 +53,12 @@ vi.mock('../../../src/constants/index.js', async (importOriginal) => {
       DRY_RUN_INTERACTIVE_MODE: '模式: 交互式（无预设任务）',
       DRY_RUN_READY: '预览完成，无冲突。移除 --dry-run 即可正式执行。',
       DRY_RUN_HAS_CONFLICT: '存在分支冲突，实际执行时将会报错。请先处理冲突的分支。',
+      // i18n 新增的消息键（task-executor.ts 中使用）
+      ALL_TASKS_COMPLETED: (total: number) => `全部任务已完成 (${total}/${total})`,
+      SUCCESS_LABEL: '成功:',
+      FAILURE_LABEL: '失败:',
+      TOTAL_DURATION_LABEL: '总耗时:',
+      TOTAL_COST_LABEL: '总花费:',
     },
   };
 });

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

@@ -1,19 +1,49 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { Command } from 'commander';
 
+// mock i18n 模块，使 getCurrentLanguage 返回 'en' 以匹配英文断言
+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;
+    },
+  };
+});
+
 vi.mock('../../../src/logger/index.js', () => ({
   logger: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() },
 }));
 
-vi.mock('../../../src/constants/index.js', () => ({
-  MESSAGES: {
-    TASK_INIT_FILE_EXISTS: (path: string) => `文件已存在: ${path}，如需覆盖请先删除`,
-    TASK_INIT_SUCCESS: (path: string) => `✓ 任务模板已生成: ${path}`,
-    TASK_INIT_HINT: (path: string) => `使用 clawt run -f ${path} 执行任务`,
-  },
+vi.mock('../../../src/constants/index.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/constants/index.js')>();
+  return {
+    ...actual,
+    MESSAGES: {
+      ...actual.MESSAGES,
+      TASK_INIT_FILE_EXISTS: (path: string) => `File already exists: ${path}, delete it first to overwrite`,
+      TASK_INIT_SUCCESS: (path: string) => `✓ Task template generated: ${path}`,
+      TASK_INIT_HINT: (path: string) =>
+        `Run task:\n  clawt run -f ${path}     # Create worktree and execute\n  clawt resume -f ${path}  # Resume in existing worktree`,
+    },
+  };
+});
+
+// mock tasks-template 模块，使 getTaskTemplateContent 返回英文模板
+vi.mock('../../../src/constants/tasks-template.js', () => ({
+  getTaskTemplateContent: vi.fn().mockReturnValue('# Template content'),
+  TASK_TEMPLATE_CONTENT: '# Template content',
   TASK_TEMPLATE_OUTPUT_DIR: '.clawt/tasks',
   TASK_TEMPLATE_FILENAME_PREFIX: 'clawt-tasks',
-  TASK_TEMPLATE_CONTENT: '# 模板内容',
 }));
 
 const mockExistsSync = vi.fn();
@@ -93,7 +123,7 @@ describe('handleTasksInit', () => {
     // 默认路径应输出到 .clawt/tasks/ 目录下
     expect(mockWriteFileSync).toHaveBeenCalledWith(
       expect.stringContaining('.clawt/tasks/clawt-tasks-2026-01-01-00-00-00.md'),
-      '# 模板内容',
+      '# Template content',
       'utf-8',
     );
     expect(mockedPrintSuccess).toHaveBeenCalledWith(
@@ -115,7 +145,7 @@ describe('handleTasksInit', () => {
     expect(mockGenerateTaskFilename).not.toHaveBeenCalled();
     expect(mockWriteFileSync).toHaveBeenCalledWith(
       expect.stringContaining('my-tasks.md'),
-      '# 模板内容',
+      '# Template content',
       'utf-8',
     );
     expect(mockedPrintSuccess).toHaveBeenCalledWith(

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

@@ -1,4 +1,19 @@
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, vi } from 'vitest';
+
+// 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 { CONFIG_DEFINITIONS, DEFAULT_CONFIG, CONFIG_DESCRIPTIONS } from '../../../src/constants/config.js';
 import { VALID_TERMINAL_APPS } from '../../../src/constants/terminal.js';
 

package/tests/unit/constants/messages-post-create.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 { POST_CREATE_MESSAGES } from '../../../src/constants/messages/post-create.js';
 
 describe('POST_CREATE_MESSAGES', () => {
@@ -110,3 +125,80 @@ describe('POST_CREATE_MESSAGES', () => {
     });
   });
 });
+
+/**
+ * 英文版 post-create 消息测试
+ * 使用 vi.resetModules + vi.doMock 动态切换语言为 en，
+ * 然后重新加载 POST_CREATE_MESSAGES 模块验证英文版消息内容
+ */
+describe('POST_CREATE_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 { POST_CREATE_MESSAGES: EN_MSGS } = await import('../../../src/constants/messages/post-create.js');
+
+    // HOOK_SKIPPED 英文版包含 Skipped
+    expect(EN_MSGS.HOOK_SKIPPED).toContain('Skipped');
+
+    // HOOK_NOT_CONFIGURED 英文版包含 "not configured" 和 "skipping"
+    expect(EN_MSGS.HOOK_NOT_CONFIGURED).toContain('not configured');
+    expect(EN_MSGS.HOOK_NOT_CONFIGURED).toContain('skipping');
+  });
+
+  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 { POST_CREATE_MESSAGES: EN_MSGS } = await import('../../../src/constants/messages/post-create.js');
+
+    // HOOK_SOURCE_INFO 英文版包含 "postCreate hook source"
+    expect(EN_MSGS.HOOK_SOURCE_INFO('project config')).toContain('postCreate hook source');
+
+    // HOOK_SUCCESS 英文版包含 "successfully" 而非 "成功"
+    expect(EN_MSGS.HOOK_SUCCESS('feat-login')).toContain('successfully');
+    expect(EN_MSGS.HOOK_SUCCESS('feat-login')).not.toContain('成功');
+
+    // HOOK_FAILED 英文版包含 "failed" 而非 "失败"
+    expect(EN_MSGS.HOOK_FAILED('feat-login', 'error')).toContain('failed');
+    expect(EN_MSGS.HOOK_FAILED('feat-login', 'error')).not.toContain('失败');
+
+    // HOOK_SUMMARY 英文版包含 "succeeded"/"failed" 而非 "成功"/"失败"
+    const summary = EN_MSGS.HOOK_SUMMARY(5, 0);
+    expect(summary).toContain('5 succeeded');
+    expect(summary).toContain('0 failed');
+
+    // POST_CREATE_SCRIPT_NOT_EXECUTABLE 英文版包含 "not executable"
+    expect(EN_MSGS.POST_CREATE_SCRIPT_NOT_EXECUTABLE('/repo/.clawt/postCreate.sh')).toContain('not executable');
+
+    // POST_CREATE_SCRIPT_AUTO_CHMOD 英文版包含 "auto-added execute permission"
+    expect(EN_MSGS.POST_CREATE_SCRIPT_AUTO_CHMOD('/repo/.clawt/postCreate.sh')).toContain('auto-added execute permission');
+
+    // HOOK_BACKGROUND_START 英文版包含 "running in background"
+    expect(EN_MSGS.HOOK_BACKGROUND_START(3, 'npm install')).toContain('running in background');
+  });
+});