clawt 3.9.13 → 3.10.1

package/src/constants/messages/sync.ts

@@ -1,27 +1,64 @@
-/** sync 命令专属提示消息 */
-export const SYNC_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** sync 命令专属提示消息（双语映射） */
+const SYNC_MESSAGES_I18N = {
   /** sync 自动保存未提交变更 */
-  SYNC_AUTO_COMMITTED: (branch: string) =>
-    `已自动保存 ${branch} 分支的未提交变更`,
+  SYNC_AUTO_COMMITTED: {
+    en: (branch: string) =>
+      `Auto-saved uncommitted changes on branch ${branch}`,
+    'zh-CN': (branch: string) =>
+      `已自动保存 ${branch} 分支的未提交变更`,
+  },
   /** sync 开始合并 */
-  SYNC_MERGING: (targetBranch: string, mainBranch: string) =>
-    `正在将 ${mainBranch} 合并到 ${targetBranch} ...`,
+  SYNC_MERGING: {
+    en: (targetBranch: string, mainBranch: string) =>
+      `Merging ${mainBranch} into ${targetBranch} ...`,
+    'zh-CN': (targetBranch: string, mainBranch: string) =>
+      `正在将 ${mainBranch} 合并到 ${targetBranch} ...`,
+  },
   /** sync 成功 */
-  SYNC_SUCCESS: (targetBranch: string, mainBranch: string) =>
-    `✓ 已将 ${mainBranch} 的最新代码同步到 ${targetBranch}`,
+  SYNC_SUCCESS: {
+    en: (targetBranch: string, mainBranch: string) =>
+      `✓ Synced latest code from ${mainBranch} to ${targetBranch}`,
+    'zh-CN': (targetBranch: string, mainBranch: string) =>
+      `✓ 已将 ${mainBranch} 的最新代码同步到 ${targetBranch}`,
+  },
   /** sync 冲突 */
-  SYNC_CONFLICT: (worktreePath: string) =>
-    `合并存在冲突，请进入目标 worktree 手动解决：\n  cd ${worktreePath}\n  解决冲突后执行 git add . && git merge --continue\n  clawt validate -b <branch> 验证变更`,
+  SYNC_CONFLICT: {
+    en: (worktreePath: string) =>
+      `Merge conflicts detected. Please resolve them in the target worktree:\n  cd ${worktreePath}\n  After resolving conflicts, run: git add . && git merge --continue\n  Then validate changes with: clawt validate -b <branch>`,
+    'zh-CN': (worktreePath: string) =>
+      `合并存在冲突，请进入目标 worktree 手动解决：\n  cd ${worktreePath}\n  解决冲突后执行 git add . && git merge --continue\n  clawt validate -b <branch> 验证变更`,
+  },
   /** sync 无可用 worktree */
-  SYNC_NO_WORKTREES: '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
+  SYNC_NO_WORKTREES: {
+    en: 'No worktrees available. Please create one with: clawt run or clawt create',
+    'zh-CN': '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
+  },
   /** sync 模糊匹配无结果，列出可用分支 */
-  SYNC_NO_MATCH: (name: string, branches: string[]) =>
-    `未找到与 "${name}" 匹配的分支\n  可用分支：\n${branches.map((b) => `    - ${b}`).join('\n')}`,
+  SYNC_NO_MATCH: {
+    en: (name: string, branches: string[]) =>
+      `No branches matching "${name}"\n  Available branches:\n${branches.map((b) => `    - ${b}`).join('\n')}`,
+    'zh-CN': (name: string, branches: string[]) =>
+      `未找到与 "${name}" 匹配的分支\n  可用分支：\n${branches.map((b) => `    - ${b}`).join('\n')}`,
+  },
   /** sync 交互选择提示 */
-  SYNC_SELECT_BRANCH: '请选择要同步的分支',
+  SYNC_SELECT_BRANCH: {
+    en: 'Select branches to sync',
+    'zh-CN': '请选择要同步的分支',
+  },
   /** sync 模糊匹配到多个结果提示 */
-  SYNC_MULTIPLE_MATCHES: (name: string) => `"${name}" 匹配到多个分支，请选择：`,
+  SYNC_MULTIPLE_MATCHES: {
+    en: (name: string) => `"${name}" matched multiple branches, please select:`,
+    'zh-CN': (name: string) => `"${name}" 匹配到多个分支，请选择：`,
+  },
   /** sync 后验证分支已重建提示 */
-  SYNC_VALIDATE_BRANCH_REBUILT: (validateBranch: string) =>
-    `验证分支 ${validateBranch} 已重建`,
+  SYNC_VALIDATE_BRANCH_REBUILT: {
+    en: (validateBranch: string) =>
+      `Validation branch ${validateBranch} has been rebuilt`,
+    'zh-CN': (validateBranch: string) =>
+      `验证分支 ${validateBranch} 已重建`,
+  },
 } as const;
+
+export const SYNC_MESSAGES = createMessages(SYNC_MESSAGES_I18N);

package/src/constants/messages/tasks.ts

@@ -1,10 +1,24 @@
-/** tasks 命令相关提示消息 */
-export const TASKS_CMD_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** tasks 命令相关提示消息（双语映射） */
+const TASKS_CMD_MESSAGES_I18N = {
   /** 任务模板文件已存在 */
-  TASK_INIT_FILE_EXISTS: (path: string) => `文件已存在: ${path}，如需覆盖请先删除`,
+  TASK_INIT_FILE_EXISTS: {
+    en: (path: string) => `File already exists: ${path}, delete it first to overwrite`,
+    'zh-CN': (path: string) => `文件已存在: ${path}，如需覆盖请先删除`,
+  },
   /** 任务模板生成成功 */
-  TASK_INIT_SUCCESS: (path: string) => `✓ 任务模板已生成: ${path}`,
+  TASK_INIT_SUCCESS: {
+    en: (path: string) => `✓ Task template generated: ${path}`,
+    'zh-CN': (path: string) => `✓ 任务模板已生成: ${path}`,
+  },
   /** 任务模板使用提示（分行列出 run 和 resume 两种用法） */
-  TASK_INIT_HINT: (path: string) =>
-    `执行任务:\n  clawt run -f ${path}     # 创建 worktree 并执行（分支名需不存在）\n  clawt resume -f ${path}  # 在已有 worktree 中追问（分支名需已存在）`,
-} as const;
+  TASK_INIT_HINT: {
+    en: (path: string) =>
+      `Run task:\n  clawt run -f ${path}     # Create worktree and execute (branch name must not exist)\n  clawt resume -f ${path}  # Resume in existing worktree (branch name must exist)`,
+    'zh-CN': (path: string) =>
+      `执行任务:\n  clawt run -f ${path}     # 创建 worktree 并执行（分支名需不存在）\n  clawt resume -f ${path}  # 在已有 worktree 中追问（分支名需已存在）`,
+  },
+};
+
+export const TASKS_CMD_MESSAGES = createMessages(TASKS_CMD_MESSAGES_I18N);

package/src/constants/messages/update.ts

@@ -1,15 +1,39 @@
+import { createMessages } from '../../utils/i18n.js';
+
+/** 各包管理器对应的全局安装命令（双语映射，命令本身不需要翻译） */
+const UPDATE_COMMANDS_I18N = {
+  npm: {
+    en: 'npm i -g clawt',
+    'zh-CN': 'npm i -g clawt',
+  },
+  pnpm: {
+    en: 'pnpm add -g clawt',
+    'zh-CN': 'pnpm add -g clawt',
+  },
+  yarn: {
+    en: 'yarn global add clawt',
+    'zh-CN': 'yarn global add clawt',
+  },
+};
+
 /** 各包管理器对应的全局安装命令 */
-export const UPDATE_COMMANDS: Record<string, string> = {
-  npm: 'npm i -g clawt',
-  pnpm: 'pnpm add -g clawt',
-  yarn: 'yarn global add clawt',
-} as const;
+export const UPDATE_COMMANDS = createMessages(UPDATE_COMMANDS_I18N);
 
-/** 更新检查相关提示消息 */
-export const UPDATE_MESSAGES = {
+/** 更新检查相关提示消息（双语映射） */
+const UPDATE_MESSAGES_I18N = {
   /** 版本更新提示 */
-  UPDATE_AVAILABLE: (currentVersion: string, latestVersion: string) =>
-    `clawt 有新版本可用: ${currentVersion} → ${latestVersion}`,
+  UPDATE_AVAILABLE: {
+    en: (currentVersion: string, latestVersion: string) =>
+      `clawt update available: ${currentVersion} → ${latestVersion}`,
+    'zh-CN': (currentVersion: string, latestVersion: string) =>
+      `clawt 有新版本可用: ${currentVersion} → ${latestVersion}`,
+  },
   /** 更新操作提示 */
-  UPDATE_HINT: (command: string) => `执行 ${command} 进行更新`,
-} as const;
+  UPDATE_HINT: {
+    en: (command: string) => `Run ${command} to update`,
+    'zh-CN': (command: string) => `执行 ${command} 进行更新`,
+  },
+};
+
+/** 更新检查相关提示消息 */
+export const UPDATE_MESSAGES = createMessages(UPDATE_MESSAGES_I18N);

package/src/constants/messages/validate.ts

@@ -1,89 +1,250 @@
-/** validate 命令专属提示消息 */
-export const VALIDATE_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** validate 命令专属提示消息（双语映射） */
+const VALIDATE_MESSAGES_I18N = {
   /** validate 成功 */
-  VALIDATE_SUCCESS: (branch: string) =>
-    `✓ 已将分支 ${branch} 的变更应用到主 worktree\n  可以开始验证了`,
+  VALIDATE_SUCCESS: {
+    en: (branch: string) =>
+      `✓ Changes from branch ${branch} applied to main worktree\n  Ready for validation`,
+    'zh-CN': (branch: string) =>
+      `✓ 已将分支 ${branch} 的变更应用到主 worktree\n  可以开始验证了`,
+  },
   /** 增量 validate 成功提示 */
-  INCREMENTAL_VALIDATE_SUCCESS: (branch: string) =>
-    `✓ 已将分支 ${branch} 的最新变更应用到主 worktree（增量模式）\n  暂存区 = 上次快照，工作目录 = 最新变更`,
+  INCREMENTAL_VALIDATE_SUCCESS: {
+    en: (branch: string) =>
+      `✓ Latest changes from branch ${branch} applied to main worktree (incremental mode)\n  Staging area = last snapshot, Working directory = latest changes`,
+    'zh-CN': (branch: string) =>
+      `✓ 已将分支 ${branch} 的最新变更应用到主 worktree（增量模式）\n  暂存区 = 上次快照，工作目录 = 最新变更`,
+  },
   /** 增量 validate 降级为全量模式提示 */
-  INCREMENTAL_VALIDATE_FALLBACK: '增量对比失败，已降级为全量模式',
+  INCREMENTAL_VALIDATE_FALLBACK: {
+    en: 'Incremental comparison failed, fell back to full mode',
+    'zh-CN': '增量对比失败，已降级为全量模式',
+  },
   /** 增量 validate 检测到目标 worktree 无新变更 */
-  INCREMENTAL_VALIDATE_NO_CHANGES: (branch: string) =>
-    `分支 ${branch} 自上次 validate 以来没有新的变更，已恢复到上次验证状态`,
+  INCREMENTAL_VALIDATE_NO_CHANGES: {
+    en: (branch: string) =>
+      `Branch ${branch} has no new changes since last validate, restored to previous validation state`,
+    'zh-CN': (branch: string) =>
+      `分支 ${branch} 自上次 validate 以来没有新的变更，已恢复到上次验证状态`,
+  },
   /** validate 状态已清理 */
-  VALIDATE_CLEANED: (branch: string) => `✓ 分支 ${branch} 的 validate 状态已清理`,
+  VALIDATE_CLEANED: {
+    en: (branch: string) => `✓ Validate state for branch ${branch} cleaned`,
+    'zh-CN': (branch: string) => `✓ 分支 ${branch} 的 validate 状态已清理`,
+  },
   /** validate patch apply 失败，提示用户同步主分支 */
-  VALIDATE_PATCH_APPLY_FAILED: (branch: string) =>
-    `变更迁移失败：目标分支与主分支差异过大\n  请先执行 clawt sync -b ${branch} 同步主分支后重试`,
+  VALIDATE_PATCH_APPLY_FAILED: {
+    en: (branch: string) =>
+      `Change migration failed: target branch has diverged too far from main\n  Please run clawt sync -b ${branch} first, then retry`,
+    'zh-CN': (branch: string) =>
+      `变更迁移失败：目标分支与主分支差异过大\n  请先执行 clawt sync -b ${branch} 同步主分支后重试`,
+  },
   /** validate 无可用 worktree */
-  VALIDATE_NO_WORKTREES: '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
+  VALIDATE_NO_WORKTREES: {
+    en: 'No worktrees available, please create one with clawt run or clawt create first',
+    'zh-CN': '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
+  },
   /** validate 模糊匹配无结果，列出可用分支 */
-  VALIDATE_NO_MATCH: (name: string, branches: string[]) =>
-    `未找到与 "${name}" 匹配的分支\n  可用分支：\n${branches.map((b) => `    - ${b}`).join('\n')}`,
+  VALIDATE_NO_MATCH: {
+    en: (name: string, branches: string[]) =>
+      `No branch matching "${name}"\n  Available branches:\n${branches.map((b) => `    - ${b}`).join('\n')}`,
+    'zh-CN': (name: string, branches: string[]) =>
+      `未找到与 "${name}" 匹配的分支\n  可用分支：\n${branches.map((b) => `    - ${b}`).join('\n')}`,
+  },
   /** validate 交互选择提示 */
-  VALIDATE_SELECT_BRANCH: '请选择要验证的分支',
+  VALIDATE_SELECT_BRANCH: {
+    en: 'Select a branch to validate',
+    'zh-CN': '请选择要验证的分支',
+  },
   /** validate 模糊匹配到多个结果提示 */
-  VALIDATE_MULTIPLE_MATCHES: (name: string) => `"${name}" 匹配到多个分支，请选择：`,
+  VALIDATE_MULTIPLE_MATCHES: {
+    en: (name: string) => `"${name}" matched multiple branches, please select:`,
+    'zh-CN': (name: string) => `"${name}" 匹配到多个分支，请选择：`,
+  },
   /** --run 命令开始执行提示 */
-  VALIDATE_RUN_START: (command: string) => `正在主 worktree 中执行命令: ${command}`,
+  VALIDATE_RUN_START: {
+    en: (command: string) => `Running command in main worktree: ${command}`,
+    'zh-CN': (command: string) => `正在主 worktree 中执行命令: ${command}`,
+  },
   /** --run 命令执行成功（退出码 0） */
-  VALIDATE_RUN_SUCCESS: (command: string) => `✓ 命令执行完成: ${command}，退出码: 0`,
+  VALIDATE_RUN_SUCCESS: {
+    en: (command: string) => `✓ Command completed: ${command}, exit code: 0`,
+    'zh-CN': (command: string) => `✓ 命令执行完成: ${command}，退出码: 0`,
+  },
   /** --run 命令执行失败（退出码非 0） */
-  VALIDATE_RUN_FAILED: (command: string, exitCode: number) =>
-    `✗ 命令执行完成: ${command}，退出码: ${exitCode}`,
+  VALIDATE_RUN_FAILED: {
+    en: (command: string, exitCode: number) =>
+      `✗ Command completed: ${command}, exit code: ${exitCode}`,
+    'zh-CN': (command: string, exitCode: number) =>
+      `✗ 命令执行完成: ${command}，退出码: ${exitCode}`,
+  },
   /** --run 命令执行异常（进程启动失败等） */
-  VALIDATE_RUN_ERROR: (command: string, errorMessage: string) =>
-    `✗ 命令执行出错: ${errorMessage}`,
+  VALIDATE_RUN_ERROR: {
+    en: (command: string, errorMessage: string) =>
+      `✗ Command execution error: ${errorMessage}`,
+    'zh-CN': (command: string, errorMessage: string) =>
+      `✗ 命令执行出错: ${errorMessage}`,
+  },
   /** 并行命令开始执行提示 */
-  VALIDATE_PARALLEL_RUN_START: (count: number) =>
-    `正在并行执行 ${count} 个命令...`,
+  VALIDATE_PARALLEL_RUN_START: {
+    en: (count: number) =>
+      `Running ${count} command(s) in parallel...`,
+    'zh-CN': (count: number) =>
+      `正在并行执行 ${count} 个命令...`,
+  },
   /** 并行执行中单个命令开始提示（带序号） */
-  VALIDATE_PARALLEL_CMD_START: (index: number, total: number, command: string) =>
-    `[${index}/${total}] ${command}`,
+  VALIDATE_PARALLEL_CMD_START: {
+    en: (index: number, total: number, command: string) =>
+      `[${index}/${total}] ${command}`,
+    'zh-CN': (index: number, total: number, command: string) =>
+      `[${index}/${total}] ${command}`,
+  },
   /** 并行执行全部成功汇总提示 */
-  VALIDATE_PARALLEL_RUN_ALL_SUCCESS: (count: number) =>
-    `✓ 全部 ${count} 个命令执行成功`,
+  VALIDATE_PARALLEL_RUN_ALL_SUCCESS: {
+    en: (count: number) =>
+      `✓ All ${count} command(s) completed successfully`,
+    'zh-CN': (count: number) =>
+      `✓ 全部 ${count} 个命令执行成功`,
+  },
   /** 并行执行部分失败汇总提示 */
-  VALIDATE_PARALLEL_RUN_SUMMARY: (successCount: number, failedCount: number) =>
-    `共 ${successCount + failedCount} 个命令，${successCount} 个成功，${failedCount} 个失败`,
+  VALIDATE_PARALLEL_RUN_SUMMARY: {
+    en: (successCount: number, failedCount: number) =>
+      `${successCount + failedCount} command(s), ${successCount} succeeded, ${failedCount} failed`,
+    'zh-CN': (successCount: number, failedCount: number) =>
+      `共 ${successCount + failedCount} 个命令，${successCount} 个成功，${failedCount} 个失败`,
+  },
   /** 并行执行中单个命令成功 */
-  VALIDATE_PARALLEL_CMD_SUCCESS: (command: string) =>
-    `  ✓ ${command}`,
+  VALIDATE_PARALLEL_CMD_SUCCESS: {
+    en: (command: string) =>
+      `  ✓ ${command}`,
+    'zh-CN': (command: string) =>
+      `  ✓ ${command}`,
+  },
   /** 并行执行中单个命令失败 */
-  VALIDATE_PARALLEL_CMD_FAILED: (command: string, exitCode: number) =>
-    `  ✗ ${command}（退出码: ${exitCode}）`,
+  VALIDATE_PARALLEL_CMD_FAILED: {
+    en: (command: string, exitCode: number) =>
+      `  ✗ ${command} (exit code: ${exitCode})`,
+    'zh-CN': (command: string, exitCode: number) =>
+      `  ✗ ${command}（退出码: ${exitCode}）`,
+  },
   /** 并行执行中单个命令启动失败 */
-  VALIDATE_PARALLEL_CMD_ERROR: (command: string, errorMessage: string) =>
-    `  ✗ ${command}（错误: ${errorMessage}）`,
+  VALIDATE_PARALLEL_CMD_ERROR: {
+    en: (command: string, errorMessage: string) =>
+      `  ✗ ${command} (error: ${errorMessage})`,
+    'zh-CN': (command: string, errorMessage: string) =>
+      `  ✗ ${command}（错误: ${errorMessage}）`,
+  },
   /** patch apply 失败后询问用户是否执行 sync */
-  VALIDATE_CONFIRM_AUTO_SYNC: (branch: string) =>
-    `是否立即执行 sync 同步主分支到 ${branch}？`,
+  VALIDATE_CONFIRM_AUTO_SYNC: {
+    en: (branch: string) =>
+      `Run sync now to sync main branch to ${branch}?`,
+    'zh-CN': (branch: string) =>
+      `是否立即执行 sync 同步主分支到 ${branch}？`,
+  },
   /** 自动 sync 开始提示 */
-  VALIDATE_AUTO_SYNC_START: (branch: string) =>
-    `正在自动同步主分支到 ${branch} ...`,
+  VALIDATE_AUTO_SYNC_START: {
+    en: (branch: string) =>
+      `Auto-syncing main branch to ${branch} ...`,
+    'zh-CN': (branch: string) =>
+      `正在自动同步主分支到 ${branch} ...`,
+  },
   /** 用户拒绝自动 sync */
-  VALIDATE_AUTO_SYNC_DECLINED: (branch: string) =>
-    `请手动执行 clawt sync -b ${branch} 同步主分支后重试`,
+  VALIDATE_AUTO_SYNC_DECLINED: {
+    en: (branch: string) =>
+      `Please run clawt sync -b ${branch} manually, then retry`,
+    'zh-CN': (branch: string) =>
+      `请手动执行 clawt sync -b ${branch} 同步主分支后重试`,
+  },
   /** 验证分支不存在 */
-  VALIDATE_BRANCH_NOT_FOUND: (validateBranch: string, branch: string) =>
-    `验证分支 ${validateBranch} 不存在，请先执行 clawt create 或 clawt run 创建分支 ${branch}`,
+  VALIDATE_BRANCH_NOT_FOUND: {
+    en: (validateBranch: string, branch: string) =>
+      `Validation branch ${validateBranch} does not exist, please run clawt create or clawt run to create branch ${branch} first`,
+    'zh-CN': (validateBranch: string, branch: string) =>
+      `验证分支 ${validateBranch} 不存在，请先执行 clawt create 或 clawt run 创建分支 ${branch}`,
+  },
   /** validate 成功（含验证分支信息） */
-  VALIDATE_SUCCESS_WITH_BRANCH: (branch: string, validateBranch: string) =>
-    `✓ 已切换到验证分支 ${validateBranch} 并应用分支 ${branch} 的变更\n  可以开始验证了`,
+  VALIDATE_SUCCESS_WITH_BRANCH: {
+    en: (branch: string, validateBranch: string) =>
+      `✓ Switched to validation branch ${validateBranch} and applied changes from branch ${branch}\n  Ready for validation`,
+    'zh-CN': (branch: string, validateBranch: string) =>
+      `✓ 已切换到验证分支 ${validateBranch} 并应用分支 ${branch} 的变更\n  可以开始验证了`,
+  },
   /** 错误信息已复制到剪贴板提示 */
-  VALIDATE_RUN_ERROR_COPIED: '✂ 错误信息已复制到剪贴板',
+  VALIDATE_RUN_ERROR_COPIED: {
+    en: '✂ Error information copied to clipboard',
+    'zh-CN': '✂ 错误信息已复制到剪贴板',
+  },
   /** 剪贴板复制失败提示 */
-  VALIDATE_RUN_ERROR_COPY_FAILED: '⚠ 错误信息复制到剪贴板失败',
+  VALIDATE_RUN_ERROR_COPY_FAILED: {
+    en: '⚠ Failed to copy error information to clipboard',
+    'zh-CN': '⚠ 错误信息复制到剪贴板失败',
+  },
   /** 检测到外部软链接警告 */
-  VALIDATE_EXTERNAL_SYMLINKS_FOUND: (count: number) =>
-    `⚠ 检测到 ${count} 个指向 worktree 外部的软链接（可能由 AI Agent 创建），已自动移除`,
+  VALIDATE_EXTERNAL_SYMLINKS_FOUND: {
+    en: (count: number) =>
+      `⚠ Detected ${count} symlink(s) pointing outside the worktree (possibly created by AI Agent), auto-removed`,
+    'zh-CN': (count: number) =>
+      `⚠ 检测到 ${count} 个指向 worktree 外部的软链接（可能由 AI Agent 创建），已自动移除`,
+  },
   /** 单命令（含 && 链）剪贴板错误格式 */
-  VALIDATE_CLIPBOARD_SINGLE_ERROR: (command: string, stderr: string) =>
-    `${command} 指令执行出错，错误信息：\n${stderr}`,
+  VALIDATE_CLIPBOARD_SINGLE_ERROR: {
+    en: (command: string, stderr: string) =>
+      `${command} command error:\n${stderr}`,
+    'zh-CN': (command: string, stderr: string) =>
+      `${command} 指令执行出错，错误信息：\n${stderr}`,
+  },
   /** 并行命令中单个命令的剪贴板错误格式 */
-  VALIDATE_CLIPBOARD_PARALLEL_ERROR: (command: string, stderr: string) =>
-    `${command} 指令执行出错，错误信息：\n${stderr}`,
+  VALIDATE_CLIPBOARD_PARALLEL_ERROR: {
+    en: (command: string, stderr: string) =>
+      `${command} command error:\n${stderr}`,
+    'zh-CN': (command: string, stderr: string) =>
+      `${command} 指令执行出错，错误信息：\n${stderr}`,
+  },
   /** 多个错误之间的分隔符 */
-  VALIDATE_CLIPBOARD_SEPARATOR: '\n\n---\n\n',
-} as const;
+  VALIDATE_CLIPBOARD_SEPARATOR: {
+    en: '\n\n---\n\n',
+    'zh-CN': '\n\n---\n\n',
+  },
+  // --- 从 validate-branch.ts 迁移 ---
+  /** 工作区仍然不干净 */
+  WORKSPACE_STILL_DIRTY: {
+    en: 'Workspace is still dirty, please resolve manually',
+    'zh-CN': '工作区仍然不干净，请手动处理',
+  },
+  /** 当前分支有未提交的更改 */
+  UNCOMMITTED_CHANGES_ON_BRANCH: {
+    en: 'Current branch has uncommitted changes, please choose how to handle:\n',
+    'zh-CN': '当前分支有未提交的更改，请选择处理方式：\n',
+  },
+  /** 选择处理方式 */
+  SELECT_ACTION: {
+    en: 'Select action',
+    'zh-CN': '选择处理方式',
+  },
+  /** 是否继续执行？ */
+  CONFIRM_CONTINUE_VALIDATE: {
+    en: 'Continue?',
+    'zh-CN': '是否继续执行？',
+  },
+  /** 用户选择退出 */
+  USER_CHOSE_EXIT: {
+    en: 'User chose to exit, please resolve workspace changes manually and retry',
+    'zh-CN': '用户选择退出，请手动处理工作区更改后重试',
+  },
+  // --- 从 validate-runner.ts 迁移 ---
+  /** 指令执行出错，退出码 */
+  COMMAND_EXEC_ERROR: {
+    en: (command: string, exitCode: number) =>
+      `${command} command error, exit code: ${exitCode}`,
+    'zh-CN': (command: string, exitCode: number) =>
+      `${command} 指令执行出错，退出码: ${exitCode}`,
+  },
+  /** 退出码标签 */
+  EXIT_CODE_LABEL: {
+    en: (exitCode: number) => `Exit code: ${exitCode}`,
+    'zh-CN': (exitCode: number) => `退出码: ${exitCode}`,
+  },
+};
+
+export const VALIDATE_MESSAGES = createMessages(VALIDATE_MESSAGES_I18N);

package/src/constants/progress.ts

@@ -1,3 +1,5 @@
+import { getCurrentLanguage } from '../utils/i18n.js';
+
 /** Braille spinner 帧序列 */
 export const SPINNER_FRAMES: readonly string[] = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 
@@ -20,22 +22,31 @@ export const TASK_STATUS_ICONS = {
   FAILED: '✗',
 } as const;
 
-/** 任务状态标签 */
+/** 任务状态标签（根据语言返回） */
+export function getTaskStatusLabels() {
+  const lang = getCurrentLanguage();
+  return lang === 'en'
+    ? { PENDING: 'Pending', RUNNING: 'Running', DONE: 'Done', FAILED: 'Failed' }
+    : { PENDING: '排队中', RUNNING: '运行中', DONE: '完成', FAILED: '失败' };
+}
+
+/** 兼容旧代码：保留静态常量，默认中文（仅用于非动态场景） */
 export const TASK_STATUS_LABELS = {
-  /** 排队中 */
   PENDING: '排队中',
-  /** 运行中 */
   RUNNING: '运行中',
-  /** 完成 */
   DONE: '完成',
-  /** 失败 */
   FAILED: '失败',
 } as const;
 
 /** 活动描述文本的最大字符数 */
 export const ACTIVITY_TEXT_MAX_LENGTH = 30;
 
-/** 文本类型活动的前缀 */
+/** 文本类型活动的前缀（根据语言返回） */
+export function getTextActivityPrefix() {
+  return getCurrentLanguage() === 'en' ? 'Thinking' : '思考中';
+}
+
+/** 兼容旧代码：保留静态常量 */
 export const TEXT_ACTIVITY_PREFIX = '思考中';
 
 /** 结果预览文本的最大字符数 */

package/src/constants/project-config.ts

@@ -1,4 +1,5 @@
 import type { ProjectConfig, ProjectConfigDefinitions } from '../types/index.js';
+import { getCurrentLanguage } from '../utils/i18n.js';
 
 /**
  * 项目级配置项完整定义（单一数据源）
@@ -52,3 +53,19 @@ export const PROJECT_DEFAULT_CONFIG: Required<ProjectConfig> = deriveDefaultConf
 
 /** 项目配置项描述映射 */
 export const PROJECT_CONFIG_DESCRIPTIONS: Record<keyof Required<ProjectConfig>, string> = deriveConfigDescriptions(PROJECT_CONFIG_DEFINITIONS);
+
+/** 项目配置项英文描述映射 */
+const PROJECT_CONFIG_DESCRIPTIONS_EN: Record<keyof Required<ProjectConfig>, string> = {
+  clawtMainWorkBranch: 'Main worktree branch name',
+  validateRunCommand: 'Command to auto-run after validate success (default for -r)',
+  postCreate: 'Command to auto-run after worktree creation (e.g. install dependencies)',
+  claudeCodeCommand: 'Claude Code CLI launch command (falls back to global config if unset)',
+};
+
+/**
+ * 获取国际化项目配置项描述映射
+ * @returns {Record<keyof Required<ProjectConfig>, string>} 当前语言的配置项描述映射
+ */
+export function getI18nProjectConfigDescriptions(): Record<keyof Required<ProjectConfig>, string> {
+  return getCurrentLanguage() === 'en' ? PROJECT_CONFIG_DESCRIPTIONS_EN : PROJECT_CONFIG_DESCRIPTIONS;
+}

package/src/constants/prompt.ts

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import { getCurrentLanguage } from '../utils/i18n.js';
 
 /** 多选列表中全选选项的标识名称 */
 export const SELECT_ALL_NAME = '__select_all__';
@@ -23,11 +24,26 @@ export const GROUP_SELECT_ALL_LABEL = (dateLabel: string): string => `[select-al
  * @param {string} relativeTime - 相对时间描述
  * @returns {string} 格式化的分隔线文本
  */
-export const GROUP_SEPARATOR_LABEL = (dateLabel: string, relativeTime: string): string =>
-  `════ ${chalk.bold.hex('#FF8C00')(dateLabel)}（${chalk.hex('#FF8C00')(relativeTime)}） ════`;
+export const GROUP_SEPARATOR_LABEL = (dateLabel: string, relativeTime: string): string => {
+  const lang = getCurrentLanguage();
+  const separator = lang === 'en' ? `════ ${chalk.bold.hex('#FF8C00')(dateLabel)} (${chalk.hex('#FF8C00')(relativeTime)}) ════` : `════ ${chalk.bold.hex('#FF8C00')(dateLabel)}（${chalk.hex('#FF8C00')(relativeTime)}） ════`;
+  return separator;
+};
 
 /** 无法获取创建日期时的默认分组名称 */
+export function getUnknownDateGroup(): string {
+  return getCurrentLanguage() === 'en' ? 'Unknown date' : '未知日期';
+}
+
+/** 兼容旧代码：保留静态常量 */
 export const UNKNOWN_DATE_GROUP = '未知日期';
 
 /** 未知日期分组的分隔线显示文本 */
+export function getUnknownDateSeparatorLabel(): string {
+  const lang = getCurrentLanguage();
+  const label = lang === 'en' ? 'Unknown date' : '未知日期';
+  return `════ ${chalk.bold.hex('#FF8C00')(label)} ════`;
+}
+
+/** 兼容旧代码：保留静态常量 */
 export const UNKNOWN_DATE_SEPARATOR_LABEL = `════ ${chalk.bold.hex('#FF8C00')('未知日期')} ════`;

package/src/constants/tasks-template.ts

@@ -1,11 +1,41 @@
+import { getCurrentLanguage } from '../utils/i18n.js';
+
 /** 任务模板默认输出目录 */
 export const TASK_TEMPLATE_OUTPUT_DIR = '.clawt/tasks';
 
 /** 任务模板文件名前缀 */
 export const TASK_TEMPLATE_FILENAME_PREFIX = 'clawt-tasks';
 
-/** 任务模板文件内容 */
-export const TASK_TEMPLATE_CONTENT = `# Clawt 任务文件
+/**
+ * 获取任务模板文件内容（根据语言返回）
+ * @returns {string} 任务模板内容
+ */
+export function getTaskTemplateContent(): string {
+  const lang = getCurrentLanguage();
+  if (lang === 'en') {
+    return `# Clawt Task File
+#
+# Usage: clawt run -f tasks.md
+# Format: Text outside tags is ignored, each task is wrapped in START/END tags
+#
+# Rules:
+#   1. Each task block is wrapped with <START> and <END> tags (see example below)
+#   2. Use # branch: <branch-name> inside the block to declare branch name (can be omitted with -b)
+#   3. Other lines inside the block are the task description (supports multi-line)
+
+<!-- CLAWT-TASKS:START -->
+# branch: feat-example-1
+Write your first task description here
+<!-- CLAWT-TASKS:END -->
+
+<!-- CLAWT-TASKS:START -->
+# branch: feat-example-2
+Write your second task description here
+Multi-line descriptions are supported
+<!-- CLAWT-TASKS:END -->
+`;
+  }
+  return `# Clawt 任务文件
 #
 # 使用方法: clawt run -f tasks.md
 # 格式说明: 标签外的文本会被忽略，每个任务用 START/END 标签包裹
@@ -26,3 +56,27 @@ export const TASK_TEMPLATE_CONTENT = `# Clawt 任务文件
 支持多行描述
 <!-- CLAWT-TASKS:END -->
 `;
+}
+
+/** 兼容旧代码：保留静态常量（默认中文） */
+export const TASK_TEMPLATE_CONTENT = `# Clawt 任务文件
+#
+# 使用方法: clawt run -f tasks.md
+# 格式说明: 标签外的文本会被忽略，每个任务用 START/END 标签包裹
+#
+# 规则:
+#   1. 每个任务块用 <START> 和 <END> 标签包裹（实际标签见下方示例）
+#   2. 块内 # branch: <分支名> 声明分支名（使用 -b 参数时可省略）
+#   3. 块内其余行为任务描述（支持多行）
+
+<!-- CLAWT-TASKS:START -->
+# branch: feat-example-1
+在这里写第一个任务的描述
+<!-- CLAWT-TASKS:END -->
+
+<!-- CLAWT-TASKS:START -->
+# branch: feat-example-2
+在这里写第二个任务的描述
+支持多行描述
+<!-- CLAWT-TASKS:END -->
+`;