clawt 3.9.13 → 3.10.1

package/src/constants/messages/remove.ts

@@ -1,25 +1,60 @@
-/** remove 命令专属提示消息 */
-export const REMOVE_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** remove 命令专属提示消息（双语映射） */
+const REMOVE_MESSAGES_I18N = {
   /** remove 无可用 worktree */
-  REMOVE_NO_WORKTREES: '当前项目没有可用的 worktree，无需移除',
+  REMOVE_NO_WORKTREES: {
+    en: 'No worktrees available, nothing to remove',
+    'zh-CN': '当前项目没有可用的 worktree，无需移除',
+  },
   /** remove 多选交互提示 */
-  REMOVE_SELECT_BRANCH: '请选择要移除的分支（空格选择，回车确认）',
+  REMOVE_SELECT_BRANCH: {
+    en: 'Select branches to remove (space to select, enter to confirm)',
+    'zh-CN': '请选择要移除的分支（空格选择，回车确认）',
+  },
   /** remove 模糊匹配到多个结果提示 */
-  REMOVE_MULTIPLE_MATCHES: (name: string) => `"${name}" 匹配到多个分支，请选择要移除的（空格选择，回车确认）：`,
+  REMOVE_MULTIPLE_MATCHES: {
+    en: (name: string) => `"${name}" matched multiple branches, please select which to remove (space to select, enter to confirm):`,
+    'zh-CN': (name: string) => `"${name}" 匹配到多个分支，请选择要移除的（空格选择，回车确认）：`,
+  },
   /** remove 模糊匹配无结果，列出可用分支 */
-  REMOVE_NO_MATCH: (name: string, branches: string[]) =>
-    `未找到与 "${name}" 匹配的分支\n  可用分支：\n${branches.map((b) => `    - ${b}`).join('\n')}`,
+  REMOVE_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')}`,
+  },
   /** 批量移除部分失败 */
-  REMOVE_PARTIAL_FAILURE: (failures: Array<{ path: string; error: string }>) =>
-    `以下 worktree 移除失败：\n${failures.map((f) => `  ✗ ${f.path}: ${f.error}`).join('\n')}`,
+  REMOVE_PARTIAL_FAILURE: {
+    en: (failures: Array<{ path: string; error: string }>) =>
+      `Failed to remove the following worktrees:\n${failures.map((f) => `  ✗ ${f.path}: ${f.error}`).join('\n')}`,
+    'zh-CN': (failures: Array<{ path: string; error: string }>) =>
+      `以下 worktree 移除失败：\n${failures.map((f) => `  ✗ ${f.path}: ${f.error}`).join('\n')}`,
+  },
   /** 用户选择保留本地分支 */
-  REMOVE_BRANCHES_KEPT: '已保留本地分支，可稍后使用 git branch -D <分支名> 手动删除',
+  REMOVE_BRANCHES_KEPT: {
+    en: 'Local branches kept. You can manually delete them later with: git branch -D <branch-name>',
+    'zh-CN': '已保留本地分支，可稍后使用 git branch -D <分支名> 手动删除',
+  },
   /** 确认删除本地分支和验证分支 */
-  REMOVE_CONFIRM_DELETE_BRANCHES: '是否同时删除对应的本地分支和验证分支？',
+  REMOVE_CONFIRM_DELETE_BRANCHES: {
+    en: 'Also delete the associated local and validation branches?',
+    'zh-CN': '是否同时删除对应的本地分支和验证分支？',
+  },
   /** 待移除的 worktree 的分支是主 worktree 当前所在分支 */
-  REMOVE_BRANCH_IS_CURRENT: (branch: string) =>
-    `无法移除：分支 ${branch} 是主 worktree 当前所在分支，请先切换到其他分支后再移除`,
+  REMOVE_BRANCH_IS_CURRENT: {
+    en: (branch: string) =>
+      `Cannot remove: branch ${branch} is the current branch of the main worktree. Please switch to another branch first`,
+    'zh-CN': (branch: string) =>
+      `无法移除：分支 ${branch} 是主 worktree 当前所在分支，请先切换到其他分支后再移除`,
+  },
   /** 待移除的 worktree 对应的验证分支是主 worktree 当前所在分支 */
-  REMOVE_VALIDATE_BRANCH_IS_CURRENT: (branch: string, validateBranch: string) =>
-    `无法移除：分支 ${branch} 的验证分支 ${validateBranch} 是主 worktree 当前所在分支，请先切换到其他分支后再移除`,
+  REMOVE_VALIDATE_BRANCH_IS_CURRENT: {
+    en: (branch: string, validateBranch: string) =>
+      `Cannot remove: the validation branch ${validateBranch} of branch ${branch} is the current branch of the main worktree. Please switch to another branch first`,
+    'zh-CN': (branch: string, validateBranch: string) =>
+      `无法移除：分支 ${branch} 的验证分支 ${validateBranch} 是主 worktree 当前所在分支，请先切换到其他分支后再移除`,
+  },
 } as const;
+
+export const REMOVE_MESSAGES = createMessages(REMOVE_MESSAGES_I18N);

package/src/constants/messages/reset.ts

@@ -1,7 +1,17 @@
-/** reset 命令专属提示消息 */
-export const RESET_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** reset 命令专属提示消息（双语映射） */
+const RESET_MESSAGES_I18N = {
   /** reset 成功 */
-  RESET_SUCCESS: '✓ 主 worktree 工作区和暂存区已重置',
+  RESET_SUCCESS: {
+    en: '✓ Main worktree working directory and staging area have been reset',
+    'zh-CN': '✓ 主 worktree 工作区和暂存区已重置',
+  },
   /** reset 时工作区和暂存区已干净 */
-  RESET_ALREADY_CLEAN: '主 worktree 工作区和暂存区已是干净状态，无需重置',
+  RESET_ALREADY_CLEAN: {
+    en: 'Main worktree working directory and staging area are already clean, no reset needed',
+    'zh-CN': '主 worktree 工作区和暂存区已是干净状态，无需重置',
+  },
 } as const;
+
+export const RESET_MESSAGES = createMessages(RESET_MESSAGES_I18N);

package/src/constants/messages/resume.ts

@@ -1,31 +1,128 @@
-/** resume 命令专属提示消息 */
-export const RESUME_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** resume 命令专属提示消息（双语映射） */
+const RESUME_MESSAGES_I18N = {
   /** resume 无可用 worktree */
-  RESUME_NO_WORKTREES: '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
+  RESUME_NO_WORKTREES: {
+    en: 'No worktrees available, please create one with clawt run or clawt create first',
+    'zh-CN': '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
+  },
   /** resume 模糊匹配无结果，列出可用分支 */
-  RESUME_NO_MATCH: (name: string, branches: string[]) =>
-    `未找到与 "${name}" 匹配的分支\n  可用分支：\n${branches.map((b) => `    - ${b}`).join('\n')}`,
+  RESUME_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')}`,
+  },
   /** resume 多选交互提示 */
-  RESUME_SELECT_BRANCH: '请选择要恢复的分支（空格选择，回车确认）',
+  RESUME_SELECT_BRANCH: {
+    en: 'Select branches to resume (space to select, enter to confirm)',
+    'zh-CN': '请选择要恢复的分支（空格选择，回车确认）',
+  },
   /** resume 模糊匹配到多个结果的多选提示 */
-  RESUME_MULTIPLE_MATCHES: (keyword: string) => `"${keyword}" 匹配到多个分支，请选择要恢复的：`,
-
+  RESUME_MULTIPLE_MATCHES: {
+    en: (keyword: string) => `"${keyword}" matched multiple branches, please select which to resume:`,
+    'zh-CN': (keyword: string) => `"${keyword}" 匹配到多个分支，请选择要恢复的：`,
+  },
   /** 批量 resume 确认提示 */
-  RESUME_ALL_CONFIRM: (count: number) => `即将在 ${count} 个独立终端 Tab 中恢复 Claude Code 会话，是否继续？`,
+  RESUME_ALL_CONFIRM: {
+    en: (count: number) => `About to resume Claude Code sessions in ${count} terminal tabs, continue?`,
+    'zh-CN': (count: number) => `即将在 ${count} 个独立终端 Tab 中恢复 Claude Code 会话，是否继续？`,
+  },
   /** 批量 resume 完成提示 */
-  RESUME_ALL_SUCCESS: (count: number) => `已在 ${count} 个终端 Tab 中启动 Claude Code 会话`,
+  RESUME_ALL_SUCCESS: {
+    en: (count: number) => `Claude Code sessions started in ${count} terminal tabs`,
+    'zh-CN': (count: number) => `已在 ${count} 个终端 Tab 中启动 Claude Code 会话`,
+  },
   /** 批量 resume 非 macOS 平台提示 */
-  RESUME_ALL_PLATFORM_UNSUPPORTED: '批量 resume 目前仅支持 macOS 平台（通过 AppleScript 打开终端 Tab）',
+  RESUME_ALL_PLATFORM_UNSUPPORTED: {
+    en: 'Batch resume is only supported on macOS (via AppleScript to open terminal tabs)',
+    'zh-CN': '批量 resume 目前仅支持 macOS 平台（通过 AppleScript 打开终端 Tab）',
+  },
   /** 批量 resume 无匹配分支提示 */
-  RESUME_ALL_NO_MATCH: (keyword: string) => `未找到与 "${keyword}" 匹配的分支`,
-
+  RESUME_ALL_NO_MATCH: {
+    en: (keyword: string) => `No branch matching "${keyword}"`,
+    'zh-CN': (keyword: string) => `未找到与 "${keyword}" 匹配的分支`,
+  },
   /** --prompt 必须配合 -b 指定目标分支 */
-  RESUME_PROMPT_REQUIRES_BRANCH: '--prompt 必须配合 -b 指定目标分支',
+  RESUME_PROMPT_REQUIRES_BRANCH: {
+    en: '--prompt requires -b to specify the target branch',
+    'zh-CN': '--prompt 必须配合 -b 指定目标分支',
+  },
   /** --prompt 和 -f 不能同时使用 */
-  RESUME_PROMPT_FILE_CONFLICT: '--prompt 和 -f 不能同时使用',
+  RESUME_PROMPT_FILE_CONFLICT: {
+    en: '--prompt and -f cannot be used together',
+    'zh-CN': '--prompt 和 -f 不能同时使用',
+  },
   /** 未找到对应 worktree */
-  RESUME_WORKTREE_NOT_FOUND: (branch: string, available: string[]) =>
-    `未找到分支 "${branch}" 对应的 worktree\n  可用分支：\n${available.map((b) => `    - ${b}`).join('\n')}`,
+  RESUME_WORKTREE_NOT_FOUND: {
+    en: (branch: string, available: string[]) =>
+      `No worktree found for branch "${branch}"\n  Available branches:\n${available.map((b) => `    - ${b}`).join('\n')}`,
+    'zh-CN': (branch: string, available: string[]) =>
+      `未找到分支 "${branch}" 对应的 worktree\n  可用分支：\n${available.map((b) => `    - ${b}`).join('\n')}`,
+  },
   /** 追问文件加载完成 */
-  RESUME_FOLLOW_UP_FILE_LOADED: (count: number, path: string) => `从 ${path} 加载了 ${count} 个追问任务`,
-} as const;
+  RESUME_FOLLOW_UP_FILE_LOADED: {
+    en: (count: number, path: string) => `Loaded ${count} follow-up task(s) from ${path}`,
+    'zh-CN': (count: number, path: string) => `从 ${path} 加载了 ${count} 个追问任务`,
+  },
+  // --- 从 terminal.ts 迁移 ---
+  /** 当前不在 cmux 环境中 */
+  NOT_IN_CMUX: {
+    en: 'Not currently in a cmux environment, cannot create surface\nPlease run clawt resume from a cmux terminal, or change the terminalApp config',
+    'zh-CN': '当前不在 cmux 环境中，无法创建 surface\n请确保在 cmux 终端中执行 clawt resume 命令，或修改 terminalApp 配置',
+  },
+  /** Terminal.app 辅助功能权限提示 */
+  TERMINAL_ACCESSIBILITY_HINT: {
+    en: '\nHint: Terminal.app requires Accessibility permission. Grant it in System Settings → Privacy & Security → Accessibility',
+    'zh-CN': '\n提示：Terminal.app 需要辅助功能权限，请在「系统设置 → 隐私与安全性 → 辅助功能」中授权终端应用',
+  },
+  /** 批量 resume 仅支持 macOS */
+  BATCH_RESUME_MACOS_ONLY: {
+    en: 'Batch resume is only supported on macOS',
+    'zh-CN': '批量 resume 目前仅支持 macOS 平台',
+  },
+  // --- 从 claude.ts 迁移 ---
+  /** 正在 worktree 中启动 Claude Code 交互式界面 */
+  STARTING_CLAUDE_INTERACTIVE: {
+    en: 'Starting Claude Code interactive session in worktree...',
+    'zh-CN': '正在 worktree 中启动 Claude Code 交互式界面...',
+  },
+  /** 分支标签 */
+  BRANCH_LABEL: {
+    en: 'Branch:',
+    'zh-CN': '分支:',
+  },
+  /** 路径标签（resume 专用，与 run 中的 PATH_LABEL 区分） */
+  PATH_LABEL_RESUME: {
+    en: 'Path:',
+    'zh-CN': '路径:',
+  },
+  /** 指令标签 */
+  COMMAND_LABEL: {
+    en: 'Command:',
+    'zh-CN': '指令:',
+  },
+  /** 模式标签 */
+  MODE_LABEL: {
+    en: 'Mode:',
+    'zh-CN': '模式:',
+  },
+  /** 继续上次对话 */
+  CONTINUE_SESSION: {
+    en: 'Continue previous session',
+    'zh-CN': '继续上次对话',
+  },
+  /** 新对话 */
+  NEW_SESSION: {
+    en: 'New session',
+    'zh-CN': '新对话',
+  },
+  /** 启动 Claude Code 失败 */
+  CLAUDE_START_FAILED: {
+    en: (message: string) => `Failed to start Claude Code: ${message}`,
+    'zh-CN': (message: string) => `启动 Claude Code 失败: ${message}`,
+  },
+};
+
+export const RESUME_MESSAGES = createMessages(RESUME_MESSAGES_I18N);

package/src/constants/messages/run.ts

@@ -1,62 +1,192 @@
-/** run 命令专属提示消息 */
-export const RUN_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** run 命令专属提示消息（双语映射） */
+const RUN_MESSAGES_I18N = {
   /** 分支已存在时提示使用 resume */
-  BRANCH_EXISTS_USE_RESUME: (name: string) =>
-    `分支 ${name} 已存在，请使用 clawt resume -b ${name} 恢复会话`,
+  BRANCH_EXISTS_USE_RESUME: {
+    en: (name: string) => `Branch ${name} already exists, please use clawt resume -b ${name} to resume session`,
+    'zh-CN': (name: string) => `分支 ${name} 已存在，请使用 clawt resume -b ${name} 恢复会话`,
+  },
   /** 检测到用户中断 */
-  INTERRUPTED: '检测到退出指令，已停止 Claude Code 任务',
+  INTERRUPTED: {
+    en: 'Exit signal detected, Claude Code tasks stopped',
+    'zh-CN': '检测到退出指令，已停止 Claude Code 任务',
+  },
   /** 中断后自动清理完成 */
-  INTERRUPT_AUTO_CLEANED: (count: number) => `✓ 已自动清理 ${count} 个 worktree 和对应分支`,
+  INTERRUPT_AUTO_CLEANED: {
+    en: (count: number) => `✓ Auto-cleaned ${count} worktree(s) and corresponding branches`,
+    'zh-CN': (count: number) => `✓ 已自动清理 ${count} 个 worktree 和对应分支`,
+  },
   /** 中断后手动确认清理 */
-  INTERRUPT_CONFIRM_CLEANUP: '是否移除刚刚创建的 worktree 和对应分支？',
+  INTERRUPT_CONFIRM_CLEANUP: {
+    en: 'Remove the newly created worktrees and corresponding branches?',
+    'zh-CN': '是否移除刚刚创建的 worktree 和对应分支？',
+  },
   /** 中断后清理完成 */
-  INTERRUPT_CLEANED: (count: number) => `✓ 已清理 ${count} 个 worktree 和对应分支`,
+  INTERRUPT_CLEANED: {
+    en: (count: number) => `✓ Cleaned ${count} worktree(s) and corresponding branches`,
+    'zh-CN': (count: number) => `✓ 已清理 ${count} 个 worktree 和对应分支`,
+  },
   /** 中断后保留 worktree */
-  INTERRUPT_KEPT: '已保留 worktree，可稍后使用 clawt remove 手动清理',
+  INTERRUPT_KEPT: {
+    en: 'Worktrees kept, use clawt remove to clean up later',
+    'zh-CN': '已保留 worktree，可稍后使用 clawt remove 手动清理',
+  },
   /** 非 TTY 环境降级输出：任务启动 */
-  PROGRESS_TASK_STARTED: (index: number, total: number, branch: string, path: string) =>
-    `[${index}/${total}] ${branch} 启动  ${path}`,
+  PROGRESS_TASK_STARTED: {
+    en: (index: number, total: number, branch: string, path: string) =>
+      `[${index}/${total}] ${branch} started  ${path}`,
+    'zh-CN': (index: number, total: number, branch: string, path: string) =>
+      `[${index}/${total}] ${branch} 启动  ${path}`,
+  },
   /** 非 TTY 环境降级输出：任务完成 */
-  PROGRESS_TASK_DONE: (index: number, total: number, branch: string, duration: string, cost: string, detail: string) =>
-    `[${index}/${total}] ${branch} ✓ 完成 ${duration} ${cost}  ${detail}`,
+  PROGRESS_TASK_DONE: {
+    en: (index: number, total: number, branch: string, duration: string, cost: string, detail: string) =>
+      `[${index}/${total}] ${branch} ✓ done ${duration} ${cost}  ${detail}`,
+    'zh-CN': (index: number, total: number, branch: string, duration: string, cost: string, detail: string) =>
+      `[${index}/${total}] ${branch} ✓ 完成 ${duration} ${cost}  ${detail}`,
+  },
   /** 非 TTY 环境降级输出：任务失败 */
-  PROGRESS_TASK_FAILED: (index: number, total: number, branch: string, duration: string, detail: string) =>
-    `[${index}/${total}] ${branch} ✗ 失败 ${duration}  ${detail}`,
+  PROGRESS_TASK_FAILED: {
+    en: (index: number, total: number, branch: string, duration: string, detail: string) =>
+      `[${index}/${total}] ${branch} ✗ failed ${duration}  ${detail}`,
+    'zh-CN': (index: number, total: number, branch: string, duration: string, detail: string) =>
+      `[${index}/${total}] ${branch} ✗ 失败 ${duration}  ${detail}`,
+  },
   /** 并发限制提示 */
-  CONCURRENCY_INFO: (concurrency: number, total: number) =>
-    `并发限制: ${concurrency}，共 ${total} 个任务`,
+  CONCURRENCY_INFO: {
+    en: (concurrency: number, total: number) =>
+      `Concurrency: ${concurrency}, total tasks: ${total}`,
+    'zh-CN': (concurrency: number, total: number) =>
+      `并发限制: ${concurrency}，共 ${total} 个任务`,
+  },
   /** 并发数无效提示 */
-  CONCURRENCY_INVALID: '并发数必须为正整数',
+  CONCURRENCY_INVALID: {
+    en: 'Concurrency must be a positive integer',
+    'zh-CN': '并发数必须为正整数',
+  },
   /** 任务文件不存在 */
-  TASK_FILE_NOT_FOUND: (path: string) => `任务文件不存在: ${path}`,
+  TASK_FILE_NOT_FOUND: {
+    en: (path: string) => `Task file not found: ${path}`,
+    'zh-CN': (path: string) => `任务文件不存在: ${path}`,
+  },
   /** 任务文件中没有解析到有效任务 */
-  TASK_FILE_EMPTY: '任务文件中没有解析到有效任务',
+  TASK_FILE_EMPTY: {
+    en: 'No valid tasks found in the task file',
+    'zh-CN': '任务文件中没有解析到有效任务',
+  },
   /** 任务文件中某个任务块缺少分支名 */
-  TASK_FILE_MISSING_BRANCH: (blockIndex: number) => `任务文件第 ${blockIndex} 个任务块缺少分支名（# branch: ...）`,
+  TASK_FILE_MISSING_BRANCH: {
+    en: (blockIndex: number) => `Task block #${blockIndex} is missing branch name (# branch: ...)`,
+    'zh-CN': (blockIndex: number) => `任务文件第 ${blockIndex} 个任务块缺少分支名（# branch: ...）`,
+  },
   /** 任务文件中某个任务块缺少任务描述 */
-  TASK_FILE_MISSING_TASK: (branch: string) => `任务文件中分支 ${branch} 缺少任务描述`,
+  TASK_FILE_MISSING_TASK: {
+    en: (branch: string) => `Task file is missing task description for branch ${branch}`,
+    'zh-CN': (branch: string) => `任务文件中分支 ${branch} 缺少任务描述`,
+  },
   /** 任务文件中某个任务块缺少任务描述（无分支名时按索引定位） */
-  TASK_FILE_MISSING_TASK_BY_INDEX: (blockIndex: number) => `任务文件第 ${blockIndex} 个任务块缺少任务描述`,
+  TASK_FILE_MISSING_TASK_BY_INDEX: {
+    en: (blockIndex: number) => `Task block #${blockIndex} is missing task description`,
+    'zh-CN': (blockIndex: number) => `任务文件第 ${blockIndex} 个任务块缺少任务描述`,
+  },
   /** --file 和 --tasks 不能同时使用 */
-  FILE_AND_TASKS_CONFLICT: '--file 和 --tasks 不能同时使用',
+  FILE_AND_TASKS_CONFLICT: {
+    en: '--file and --tasks cannot be used together',
+    'zh-CN': '--file 和 --tasks 不能同时使用',
+  },
   /** 任务文件加载成功 */
-  TASK_FILE_LOADED: (count: number, path: string) => `✓ 从 ${path} 加载了 ${count} 个任务`,
+  TASK_FILE_LOADED: {
+    en: (count: number, path: string) => `✓ Loaded ${count} task(s) from ${path}`,
+    'zh-CN': (count: number, path: string) => `✓ 从 ${path} 加载了 ${count} 个任务`,
+  },
   /** 未指定 -b 或 -f */
-  BRANCH_OR_FILE_REQUIRED: '请指定 -b 分支名或 -f 任务文件',
+  BRANCH_OR_FILE_REQUIRED: {
+    en: 'Please specify -b <branch> or -f <task-file>',
+    'zh-CN': '请指定 -b 分支名或 -f 任务文件',
+  },
   /** dry-run 预览标题 */
-  DRY_RUN_TITLE: 'Dry Run 预览',
+  DRY_RUN_TITLE: {
+    en: 'Dry Run Preview',
+    'zh-CN': 'Dry Run 预览',
+  },
   /** dry-run 任务数量 */
-  DRY_RUN_TASK_COUNT: (count: number) => `任务数: ${count}`,
+  DRY_RUN_TASK_COUNT: {
+    en: (count: number) => `Tasks: ${count}`,
+    'zh-CN': (count: number) => `任务数: ${count}`,
+  },
   /** dry-run 并发数 */
-  DRY_RUN_CONCURRENCY: (concurrency: number) => `并发数: ${concurrency === 0 ? '不限制' : concurrency}`,
+  DRY_RUN_CONCURRENCY: {
+    en: (concurrency: number) => `Concurrency: ${concurrency === 0 ? 'unlimited' : concurrency}`,
+    'zh-CN': (concurrency: number) => `并发数: ${concurrency === 0 ? '不限制' : concurrency}`,
+  },
   /** dry-run worktree 目录 */
-  DRY_RUN_WORKTREE_DIR: (dir: string) => `Worktree: ${dir}`,
+  DRY_RUN_WORKTREE_DIR: {
+    en: (dir: string) => `Worktree: ${dir}`,
+    'zh-CN': (dir: string) => `Worktree: ${dir}`,
+  },
   /** dry-run 分支已存在警告 */
-  DRY_RUN_BRANCH_EXISTS_WARNING: (name: string) => `分支 ${name} 已存在`,
+  DRY_RUN_BRANCH_EXISTS_WARNING: {
+    en: (name: string) => `Branch ${name} already exists`,
+    'zh-CN': (name: string) => `分支 ${name} 已存在`,
+  },
   /** dry-run 交互式模式提示（无任务描述） */
-  DRY_RUN_INTERACTIVE_MODE: '模式: 交互式（无预设任务）',
+  DRY_RUN_INTERACTIVE_MODE: {
+    en: 'Mode: Interactive (no preset task)',
+    'zh-CN': '模式: 交互式（无预设任务）',
+  },
   /** dry-run 预览完成且无冲突 */
-  DRY_RUN_READY: '预览完成，无冲突。移除 --dry-run 即可正式执行。',
+  DRY_RUN_READY: {
+    en: 'Preview complete, no conflicts. Remove --dry-run to execute.',
+    'zh-CN': '预览完成，无冲突。移除 --dry-run 即可正式执行。',
+  },
   /** dry-run 存在分支冲突 */
-  DRY_RUN_HAS_CONFLICT: '存在分支冲突，实际执行时将会报错。请先处理冲突的分支。',
-} as const;
+  DRY_RUN_HAS_CONFLICT: {
+    en: 'Branch conflicts detected. Execution will fail. Please resolve conflicting branches first.',
+    'zh-CN': '存在分支冲突，实际执行时将会报错。请先处理冲突的分支。',
+  },
+  // --- 从 dry-run.ts 迁移 ---
+  /** 路径标签 */
+  PATH_LABEL: {
+    en: 'Path:',
+    'zh-CN': '路径:',
+  },
+  /** 任务标签 */
+  TASK_LABEL: {
+    en: 'Task:',
+    'zh-CN': '任务:',
+  },
+  // --- 从 task-executor.ts 迁移 ---
+  /** 任务执行失败 */
+  TASK_FAILED: {
+    en: 'Task execution failed',
+    'zh-CN': '任务执行失败',
+  },
+  /** 全部任务已完成 */
+  ALL_TASKS_COMPLETED: {
+    en: (total: number) => `All tasks completed (${total}/${total})`,
+    'zh-CN': (total: number) => `全部任务已完成 (${total}/${total})`,
+  },
+  /** 成功标签 */
+  SUCCESS_LABEL: {
+    en: 'Succeeded:',
+    'zh-CN': '成功:',
+  },
+  /** 失败标签 */
+  FAILURE_LABEL: {
+    en: 'Failed:',
+    'zh-CN': '失败:',
+  },
+  /** 总耗时标签 */
+  TOTAL_DURATION_LABEL: {
+    en: 'Total duration:',
+    'zh-CN': '总耗时:',
+  },
+  /** 总花费标签 */
+  TOTAL_COST_LABEL: {
+    en: 'Total cost:',
+    'zh-CN': '总花费:',
+  },
+};
+
+export const RUN_MESSAGES = createMessages(RUN_MESSAGES_I18N);

package/src/constants/messages/status.ts

@@ -1,42 +1,103 @@
-/** status 命令专属提示消息 */
-export const STATUS_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** status 命令专属提示消息（双语映射） */
+const STATUS_MESSAGES_I18N = {
   /** status 命令标题 */
-  STATUS_TITLE: (projectName: string) => `项目状态总览: ${projectName}`,
+  STATUS_TITLE: {
+    en: (projectName: string) => `Project Status Overview: ${projectName}`,
+    'zh-CN': (projectName: string) => `项目状态总览: ${projectName}`,
+  },
   /** status 主 worktree 区块标题 */
-  STATUS_MAIN_SECTION: '主 Worktree',
+  STATUS_MAIN_SECTION: {
+    en: 'Main Worktree',
+    'zh-CN': '主 Worktree',
+  },
   /** status worktrees 区块标题 */
-  STATUS_WORKTREES_SECTION: 'Worktree 列表',
+  STATUS_WORKTREES_SECTION: {
+    en: 'Worktrees',
+    'zh-CN': 'Worktree 列表',
+  },
   /** status 快照区块标题 */
-  STATUS_SNAPSHOTS_SECTION: 'Validate 快照',
+  STATUS_SNAPSHOTS_SECTION: {
+    en: 'Validate Snapshots',
+    'zh-CN': 'Validate 快照',
+  },
   /** status 无 worktree */
-  STATUS_NO_WORKTREES: '(无活跃 worktree)',
+  STATUS_NO_WORKTREES: {
+    en: '(No active worktrees)',
+    'zh-CN': '(无活跃 worktree)',
+  },
   /** status 无未清理快照 */
-  STATUS_NO_SNAPSHOTS: '(无未清理的快照)',
+  STATUS_NO_SNAPSHOTS: {
+    en: '(No pending snapshots)',
+    'zh-CN': '(无未清理的快照)',
+  },
   /** status 变更状态：已提交 */
-  STATUS_CHANGE_COMMITTED: '已提交',
+  STATUS_CHANGE_COMMITTED: {
+    en: 'Committed',
+    'zh-CN': '已提交',
+  },
   /** status 变更状态：未提交修改 */
-  STATUS_CHANGE_UNCOMMITTED: '未提交修改',
+  STATUS_CHANGE_UNCOMMITTED: {
+    en: 'Uncommitted changes',
+    'zh-CN': '未提交修改',
+  },
   /** status 变更状态：合并冲突 */
-  STATUS_CHANGE_CONFLICT: '合并冲突',
+  STATUS_CHANGE_CONFLICT: {
+    en: 'Merge conflict',
+    'zh-CN': '合并冲突',
+  },
   /** status 变更状态：无变更 */
-  STATUS_CHANGE_CLEAN: '无变更',
+  STATUS_CHANGE_CLEAN: {
+    en: 'No changes',
+    'zh-CN': '无变更',
+  },
   /** status 快照对应 worktree 已不存在 */
-  STATUS_SNAPSHOT_ORPHANED: (count: number) => `其中 ${count} 个快照对应的 worktree 已不存在`,
+  STATUS_SNAPSHOT_ORPHANED: {
+    en: (count: number) => `${count} snapshot(s) reference worktrees that no longer exist`,
+    'zh-CN': (count: number) => `其中 ${count} 个快照对应的 worktree 已不存在`,
+  },
   /** status 分支创建时间标签 */
-  STATUS_CREATED_AT: (relativeTime: string) => `创建于 ${relativeTime}`,
+  STATUS_CREATED_AT: {
+    en: (relativeTime: string) => `Created ${relativeTime}`,
+    'zh-CN': (relativeTime: string) => `创建于 ${relativeTime}`,
+  },
   /** status 分支无分叉提交时的提示 */
-  STATUS_NO_DIVERGED_COMMITS: '尚无分叉提交',
+  STATUS_NO_DIVERGED_COMMITS: {
+    en: 'No diverged commits yet',
+    'zh-CN': '尚无分叉提交',
+  },
   /** status 上次验证时间标签 */
-  STATUS_LAST_VALIDATED: (relativeTime: string) => `上次验证: ${relativeTime}`,
+  STATUS_LAST_VALIDATED: {
+    en: (relativeTime: string) => `Last validated: ${relativeTime}`,
+    'zh-CN': (relativeTime: string) => `上次验证: ${relativeTime}`,
+  },
   /** status 未验证警示 */
-  STATUS_NOT_VALIDATED: '✗ 未验证',
+  STATUS_NOT_VALIDATED: {
+    en: '✗ Not validated',
+    'zh-CN': '✗ 未验证',
+  },
   /** status 配置的主工作分支（正常状态） */
-  STATUS_CONFIGURED_BRANCH: (branchName: string) =>
-    `主工作分支: ${branchName}`,
+  STATUS_CONFIGURED_BRANCH: {
+    en: (branchName: string) =>
+      `Main work branch: ${branchName}`,
+    'zh-CN': (branchName: string) =>
+      `主工作分支: ${branchName}`,
+  },
   /** status 配置的主工作分支已不存在 */
-  STATUS_CONFIGURED_BRANCH_DELETED: (branchName: string) =>
-    `✗ 主工作分支: ${branchName}（已不存在，请执行 clawt init 重新设置）`,
+  STATUS_CONFIGURED_BRANCH_DELETED: {
+    en: (branchName: string) =>
+      `✗ Main work branch: ${branchName} (no longer exists, run clawt init to reset)`,
+    'zh-CN': (branchName: string) =>
+      `✗ 主工作分支: ${branchName}（已不存在，请执行 clawt init 重新设置）`,
+  },
   /** status 当前分支与配置的主工作分支不一致 */
-  STATUS_CONFIGURED_BRANCH_MISMATCH: (branchName: string) =>
-    `⚠ 主工作分支: ${branchName}（当前分支不一致，如需更新请执行 clawt init）`,
+  STATUS_CONFIGURED_BRANCH_MISMATCH: {
+    en: (branchName: string) =>
+      `⚠ Main work branch: ${branchName} (current branch mismatch, run clawt init to update)`,
+    'zh-CN': (branchName: string) =>
+      `⚠ 主工作分支: ${branchName}（当前分支不一致，如需更新请执行 clawt init）`,
+  },
 } as const;
+
+export const STATUS_MESSAGES = createMessages(STATUS_MESSAGES_I18N);