clawt 3.9.12 → 3.10.0

package/src/constants/messages/interactive-panel.ts

@@ -1,8 +1,21 @@
 import chalk from 'chalk';
 import { PANEL_SHORTCUT_KEYS } from '../interactive-panel.js';
+import { createMessages } from '../../utils/i18n.js';
+
+/** 快捷键标签映射 - 英文版 */
+const SHORTCUT_LABELS_EN: Record<keyof typeof PANEL_SHORTCUT_KEYS, string> = {
+  VALIDATE: 'Validate',
+  MERGE: 'Merge',
+  DELETE: 'Delete',
+  RESUME: 'Resume',
+  SYNC: 'Sync',
+  COVER: 'Cover',
+  REFRESH: 'Refresh',
+  QUIT: 'Quit',
+};
 
-/** 快捷键标签映射（键名 → 中文标签） */
-const SHORTCUT_LABELS: Record<keyof typeof PANEL_SHORTCUT_KEYS, string> = {
+/** 快捷键标签映射 - 中文版 */
+const SHORTCUT_LABELS_ZH: Record<keyof typeof PANEL_SHORTCUT_KEYS, string> = {
   VALIDATE: '验证',
   MERGE: '合并',
   DELETE: '删除',
@@ -13,23 +26,77 @@ const SHORTCUT_LABELS: Record<keyof typeof PANEL_SHORTCUT_KEYS, string> = {
   QUIT: '退出',
 };
 
+/** 底栏快捷键提示文本（双语映射） */
+const PANEL_FOOTER_SHORTCUTS_I18N = {
+  PANEL_FOOTER_SHORTCUTS: {
+    en: Object.entries(SHORTCUT_LABELS_EN)
+      .map(([key, label]) => `[${chalk.cyan(PANEL_SHORTCUT_KEYS[key as keyof typeof PANEL_SHORTCUT_KEYS])}]${label}`)
+      .join('  '),
+    'zh-CN': Object.entries(SHORTCUT_LABELS_ZH)
+      .map(([key, label]) => `[${chalk.cyan(PANEL_SHORTCUT_KEYS[key as keyof typeof PANEL_SHORTCUT_KEYS])}]${label}`)
+      .join('  '),
+  },
+};
+
 /** 底栏快捷键提示文本（从 PANEL_SHORTCUT_KEYS 自动生成） */
-export const PANEL_FOOTER_SHORTCUTS = Object.entries(SHORTCUT_LABELS)
-  .map(([key, label]) => `[${chalk.cyan(PANEL_SHORTCUT_KEYS[key as keyof typeof PANEL_SHORTCUT_KEYS])}]${label}`)
-  .join('  ');
+export const PANEL_FOOTER_SHORTCUTS = createMessages(PANEL_FOOTER_SHORTCUTS_I18N).PANEL_FOOTER_SHORTCUTS;
+
+/** 底栏倒计时文本（双语映射） */
+const PANEL_FOOTER_COUNTDOWN_I18N = {
+  PANEL_FOOTER_COUNTDOWN: {
+    en: (seconds: number): string => chalk.gray(`(refresh in ${seconds}s)`),
+    'zh-CN': (seconds: number): string => chalk.gray(`(${seconds}s 后刷新)`),
+  },
+};
 
 /**
  * 底栏倒计时文本
  * @param {number} seconds - 剩余秒数
  * @returns {string} 格式化的倒计时文本
  */
-export const PANEL_FOOTER_COUNTDOWN = (seconds: number): string => chalk.gray(`(${seconds}s 后刷新)`);
+export const PANEL_FOOTER_COUNTDOWN = createMessages(PANEL_FOOTER_COUNTDOWN_I18N).PANEL_FOOTER_COUNTDOWN;
+
+/** 向下溢出提示（双语映射） */
+const PANEL_OVERFLOW_DOWN_HINT_I18N = {
+  PANEL_OVERFLOW_DOWN_HINT: {
+    en: chalk.gray('↓ more worktrees...'),
+    'zh-CN': chalk.gray('↓ 更多 worktree...'),
+  },
+};
 
 /** 向下溢出提示 */
-export const PANEL_OVERFLOW_DOWN_HINT = chalk.gray('↓ 更多 worktree...');
+export const PANEL_OVERFLOW_DOWN_HINT = createMessages(PANEL_OVERFLOW_DOWN_HINT_I18N).PANEL_OVERFLOW_DOWN_HINT;
+
+/** 向上溢出提示（双语映射） */
+const PANEL_OVERFLOW_UP_HINT_I18N = {
+  PANEL_OVERFLOW_UP_HINT: {
+    en: chalk.gray('↑ more worktrees...'),
+    'zh-CN': chalk.gray('↑ 更多 worktree...'),
+  },
+};
 
 /** 向上溢出提示 */
-export const PANEL_OVERFLOW_UP_HINT = chalk.gray('↑ 更多 worktree...');
+export const PANEL_OVERFLOW_UP_HINT = createMessages(PANEL_OVERFLOW_UP_HINT_I18N).PANEL_OVERFLOW_UP_HINT;
+
+/** 快照摘要文本（双语映射） */
+const PANEL_SNAPSHOT_SUMMARY_I18N = {
+  PANEL_SNAPSHOT_SUMMARY: {
+    en: (total: number, orphaned: number): string => {
+      const base = `Snapshots: ${total}`;
+      if (orphaned > 0) {
+        return `${base} (${chalk.yellow(`${orphaned} orphaned`)})`;
+      }
+      return base;
+    },
+    'zh-CN': (total: number, orphaned: number): string => {
+      const base = `快照: ${total} 个`;
+      if (orphaned > 0) {
+        return `${base}（${chalk.yellow(`${orphaned} 个孤立`)}）`;
+      }
+      return base;
+    },
+  },
+};
 
 /**
  * 快照摘要文本
@@ -37,65 +104,152 @@ export const PANEL_OVERFLOW_UP_HINT = chalk.gray('↑ 更多 worktree...');
  * @param {number} orphaned - 孤立快照数
  * @returns {string} 格式化的快照摘要
  */
-export const PANEL_SNAPSHOT_SUMMARY = (total: number, orphaned: number): string => {
-  const base = `快照: ${total} 个`;
-  if (orphaned > 0) {
-    return `${base}（${chalk.yellow(`${orphaned} 个孤立`)}）`;
-  }
-  return base;
+export const PANEL_SNAPSHOT_SUMMARY = createMessages(PANEL_SNAPSHOT_SUMMARY_I18N).PANEL_SNAPSHOT_SUMMARY;
+
+/** 无 worktree 提示（双语映射） */
+const PANEL_NO_WORKTREES_I18N = {
+  PANEL_NO_WORKTREES: {
+    en: '(No active worktrees)',
+    'zh-CN': '(无活跃 worktree)',
+  },
 };
 
 /** 无 worktree 提示 */
-export const PANEL_NO_WORKTREES = '(无活跃 worktree)';
+export const PANEL_NO_WORKTREES = createMessages(PANEL_NO_WORKTREES_I18N).PANEL_NO_WORKTREES;
+
+/** 操作后返回提示（双语映射） */
+const PANEL_PRESS_ENTER_TO_RETURN_I18N = {
+  PANEL_PRESS_ENTER_TO_RETURN: {
+    en: chalk.gray('\nPress Enter to return to panel...'),
+    'zh-CN': chalk.gray('\n按 Enter 返回面板...'),
+  },
+};
 
 /** 操作后返回提示 */
-export const PANEL_PRESS_ENTER_TO_RETURN = chalk.gray('\n按 Enter 返回面板...');
+export const PANEL_PRESS_ENTER_TO_RETURN = createMessages(PANEL_PRESS_ENTER_TO_RETURN_I18N).PANEL_PRESS_ENTER_TO_RETURN;
+
+/** 非 TTY 降级提示（双语映射） */
+const PANEL_NOT_TTY_I18N = {
+  PANEL_NOT_TTY: {
+    en: 'Interactive panel requires a TTY terminal. Please run clawt status -i directly in a terminal',
+    'zh-CN': '交互式面板需要 TTY 终端环境，请直接在终端中运行 clawt status -i',
+  },
+};
 
 /** 非 TTY 降级提示 */
-export const PANEL_NOT_TTY = '交互式面板需要 TTY 终端环境，请直接在终端中运行 clawt status -i';
+export const PANEL_NOT_TTY = createMessages(PANEL_NOT_TTY_I18N).PANEL_NOT_TTY;
+
+/** 面板标题（双语映射） */
+const PANEL_TITLE_I18N = {
+  PANEL_TITLE: {
+    en: (projectName: string): string => chalk.bold.cyan(`Project Status: ${projectName}`),
+    'zh-CN': (projectName: string): string => chalk.bold.cyan(`项目状态总览: ${projectName}`),
+  },
+};
 
 /**
  * 面板标题
  * @param {string} projectName - 项目名
  * @returns {string} 格式化的标题
  */
-export const PANEL_TITLE = (projectName: string): string => chalk.bold.cyan(`项目状态总览: ${projectName}`);
+export const PANEL_TITLE = createMessages(PANEL_TITLE_I18N).PANEL_TITLE;
+
+/** 面板配置分支信息（正常）（双语映射） */
+const PANEL_CONFIGURED_BRANCH_I18N = {
+  PANEL_CONFIGURED_BRANCH: {
+    en: (branchName: string): string => chalk.gray(`Main work branch: ${branchName}`),
+    'zh-CN': (branchName: string): string => chalk.gray(`主工作分支: ${branchName}`),
+  },
+};
 
 /**
  * 面板配置分支信息（正常）
  * @param {string} branchName - 分支名
  * @returns {string} 格式化的分支信息
  */
-export const PANEL_CONFIGURED_BRANCH = (branchName: string): string =>
-  chalk.gray(`主工作分支: ${branchName}`);
+export const PANEL_CONFIGURED_BRANCH = createMessages(PANEL_CONFIGURED_BRANCH_I18N).PANEL_CONFIGURED_BRANCH;
+
+/** 面板配置分支信息（分支已删除）（双语映射） */
+const PANEL_CONFIGURED_BRANCH_DELETED_I18N = {
+  PANEL_CONFIGURED_BRANCH_DELETED: {
+    en: (branchName: string): string => chalk.red(`✗ Main work branch: ${branchName} (deleted)`),
+    'zh-CN': (branchName: string): string => chalk.red(`✗ 主工作分支: ${branchName}（已不存在）`),
+  },
+};
 
 /**
  * 面板配置分支信息（分支已删除）
  * @param {string} branchName - 分支名
  * @returns {string} 格式化的分支信息
  */
-export const PANEL_CONFIGURED_BRANCH_DELETED = (branchName: string): string =>
-  chalk.red(`✗ 主工作分支: ${branchName}（已不存在）`);
+export const PANEL_CONFIGURED_BRANCH_DELETED = createMessages(PANEL_CONFIGURED_BRANCH_DELETED_I18N).PANEL_CONFIGURED_BRANCH_DELETED;
+
+/** 面板配置分支信息（分支不一致）（双语映射） */
+const PANEL_CONFIGURED_BRANCH_MISMATCH_I18N = {
+  PANEL_CONFIGURED_BRANCH_MISMATCH: {
+    en: (branchName: string): string => chalk.red(`⚠ Main work branch: ${branchName} (mismatch)`),
+    'zh-CN': (branchName: string): string => chalk.red(`⚠ 主工作分支: ${branchName}（不一致）`),
+  },
+};
 
 /**
  * 面板配置分支信息（分支不一致）
  * @param {string} branchName - 分支名
  * @returns {string} 格式化的分支信息
  */
-export const PANEL_CONFIGURED_BRANCH_MISMATCH = (branchName: string): string =>
-  chalk.red(`⚠ 主工作分支: ${branchName}（不一致）`);
+export const PANEL_CONFIGURED_BRANCH_MISMATCH = createMessages(PANEL_CONFIGURED_BRANCH_MISMATCH_I18N).PANEL_CONFIGURED_BRANCH_MISMATCH;
+
+/** 面板配置分支信息（未初始化）（双语映射） */
+const PANEL_NOT_INITIALIZED_I18N = {
+  PANEL_NOT_INITIALIZED: {
+    en: chalk.gray('Not initialized (run clawt init to set main work branch)'),
+    'zh-CN': chalk.gray('未初始化（执行 clawt init 设置主工作分支）'),
+  },
+};
 
 /** 面板配置分支信息（未初始化） */
-export const PANEL_NOT_INITIALIZED = chalk.gray('未初始化（执行 clawt init 设置主工作分支）');
+export const PANEL_NOT_INITIALIZED = createMessages(PANEL_NOT_INITIALIZED_I18N).PANEL_NOT_INITIALIZED;
+
+/** 交互面板日期分隔线：未知日期文案（双语映射） */
+const PANEL_UNKNOWN_DATE_I18N = {
+  PANEL_UNKNOWN_DATE: {
+    en: 'Unknown date',
+    'zh-CN': '未知日期',
+  },
+};
 
 /** 交互面板日期分隔线：未知日期文案 */
-export const PANEL_UNKNOWN_DATE = '未知日期';
+export const PANEL_UNKNOWN_DATE = createMessages(PANEL_UNKNOWN_DATE_I18N).PANEL_UNKNOWN_DATE;
+
+/** 交互面板：与主分支同步（双语映射） */
+const PANEL_SYNCED_WITH_MAIN_I18N = {
+  PANEL_SYNCED_WITH_MAIN: {
+    en: 'Synced with main branch',
+    'zh-CN': '与主分支同步',
+  },
+};
 
 /** 交互面板：与主分支同步 */
-export const PANEL_SYNCED_WITH_MAIN = '与主分支同步';
+export const PANEL_SYNCED_WITH_MAIN = createMessages(PANEL_SYNCED_WITH_MAIN_I18N).PANEL_SYNCED_WITH_MAIN;
+
+/** 交互面板：本地提交数量提示（双语映射） */
+const PANEL_COMMITS_AHEAD_I18N = {
+  PANEL_COMMITS_AHEAD: {
+    en: (count: number): string => `${count} local commit(s)`,
+    'zh-CN': (count: number): string => `${count} 个本地提交`,
+  },
+};
 
 /** 交互面板：本地提交数量提示 */
-export const PANEL_COMMITS_AHEAD = (count: number): string => `${count} 个本地提交`;
+export const PANEL_COMMITS_AHEAD = createMessages(PANEL_COMMITS_AHEAD_I18N).PANEL_COMMITS_AHEAD;
+
+/** 交互面板：落后主分支提交数量提示（双语映射） */
+const PANEL_COMMITS_BEHIND_I18N = {
+  PANEL_COMMITS_BEHIND: {
+    en: (count: number): string => `${count} commit(s) behind main`,
+    'zh-CN': (count: number): string => `落后主分支 ${count} 个提交`,
+  },
+};
 
 /** 交互面板：落后主分支提交数量提示 */
-export const PANEL_COMMITS_BEHIND = (count: number): string => `落后主分支 ${count} 个提交`;
+export const PANEL_COMMITS_BEHIND = createMessages(PANEL_COMMITS_BEHIND_I18N).PANEL_COMMITS_BEHIND;

package/src/constants/messages/merge.ts

@@ -1,62 +1,164 @@
-/** merge 命令专属提示消息 */
-export const MERGE_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** merge 命令专属提示消息（双语映射） */
+const MERGE_MESSAGES_I18N = {
   /** merge 成功 */
-  MERGE_SUCCESS: (branch: string, message: string, pushed: boolean) =>
-    `✓ 分支 ${branch} 已成功合并到当前分支\n  提交信息: ${message}${pushed ? '\n  已推送到远程仓库' : ''}`,
+  MERGE_SUCCESS: {
+    en: (branch: string, message: string, pushed: boolean) =>
+      `✓ Branch ${branch} successfully merged into current branch\n  Commit message: ${message}${pushed ? '\n  Pushed to remote' : ''}`,
+    'zh-CN': (branch: string, message: string, pushed: boolean) =>
+      `✓ 分支 ${branch} 已成功合并到当前分支\n  提交信息: ${message}${pushed ? '\n  已推送到远程仓库' : ''}`,
+  },
   /** merge 成功（无提交信息，目标 worktree 已提交过） */
-  MERGE_SUCCESS_NO_MESSAGE: (branch: string, pushed: boolean) =>
-    `✓ 分支 ${branch} 已成功合并到当前分支${pushed ? '\n  已推送到远程仓库' : ''}`,
+  MERGE_SUCCESS_NO_MESSAGE: {
+    en: (branch: string, pushed: boolean) =>
+      `✓ Branch ${branch} successfully merged into current branch${pushed ? '\n  Pushed to remote' : ''}`,
+    'zh-CN': (branch: string, pushed: boolean) =>
+      `✓ 分支 ${branch} 已成功合并到当前分支${pushed ? '\n  已推送到远程仓库' : ''}`,
+  },
   /** merge 冲突 */
-  MERGE_CONFLICT: '合并存在冲突，请手动处理：\n  解决冲突后执行 git add . && git merge --continue',
+  MERGE_CONFLICT: {
+    en: 'Merge has conflicts, please resolve manually:\n  After resolving, run git add . && git merge --continue',
+    'zh-CN': '合并存在冲突，请手动处理：\n  解决冲突后执行 git add . && git merge --continue',
+  },
   /** merge 后清理 worktree 和分支成功 */
-  WORKTREE_CLEANED: (branch: string) => `✓ 已清理 worktree 和分支: ${branch}`,
+  WORKTREE_CLEANED: {
+    en: (branch: string) => `✓ Cleaned worktree and branch: ${branch}`,
+    'zh-CN': (branch: string) => `✓ 已清理 worktree 和分支: ${branch}`,
+  },
   /** 目标 worktree 有未提交修改但未指定 -m */
-  TARGET_WORKTREE_DIRTY_NO_MESSAGE: (worktreePath: string) =>
-    `${worktreePath} 有未提交的修改，请通过 -m 参数提供提交信息`,
+  TARGET_WORKTREE_DIRTY_NO_MESSAGE: {
+    en: (worktreePath: string) =>
+      `${worktreePath} has uncommitted changes, please provide a commit message via -m option`,
+    'zh-CN': (worktreePath: string) =>
+      `${worktreePath} 有未提交的修改，请通过 -m 参数提供提交信息`,
+  },
   /** 目标 worktree 既干净又无本地提交 */
-  TARGET_WORKTREE_NO_CHANGES: '目标 worktree 没有任何可合并的变更（工作区干净且无本地提交）',
+  TARGET_WORKTREE_NO_CHANGES: {
+    en: 'Target worktree has no changes to merge (working directory clean and no local commits)',
+    'zh-CN': '目标 worktree 没有任何可合并的变更（工作区干净且无本地提交）',
+  },
   /** merge 命令检测到 validate 状态的提示 */
-  MERGE_VALIDATE_STATE_HINT: (branch: string) =>
-    `主 worktree 可能存在 validate 残留状态，可先执行 clawt validate -b ${branch} --clean 清理`,
+  MERGE_VALIDATE_STATE_HINT: {
+    en: (branch: string) =>
+      `Main worktree may have residual validate state, run clawt validate -b ${branch} --clean first`,
+    'zh-CN': (branch: string) =>
+      `主 worktree 可能存在 validate 残留状态，可先执行 clawt validate -b ${branch} --clean 清理`,
+  },
   /** merge 检测到 auto-save 提交，提示用户是否压缩 */
-  MERGE_SQUASH_PROMPT: '检测到 sync 产生的临时提交，是否将所有提交压缩为一个？\n  压缩后变更将保留在目标worktree的暂存区，需要重新提交（可使用 Claude Code Cli或其他工具生成提交信息）',
+  MERGE_SQUASH_PROMPT: {
+    en: 'Detected temporary commits from sync, squash all commits into one?\n  After squashing, changes will remain in the target worktree staging area and need to be re-committed (you can use Claude Code CLI or other tools to generate the commit message)',
+    'zh-CN': '检测到 sync 产生的临时提交，是否将所有提交压缩为一个？\n  压缩后变更将保留在目标worktree的暂存区，需要重新提交（可使用 Claude Code Cli或其他工具生成提交信息）',
+  },
   /** squash 完成且通过 -m 直接提交后的提示 */
-  MERGE_SQUASH_COMMITTED: (branch: string) =>
-    `✓ 已将分支 ${branch} 的所有提交压缩为一个`,
+  MERGE_SQUASH_COMMITTED: {
+    en: (branch: string) =>
+      `✓ All commits from branch ${branch} squashed into one`,
+    'zh-CN': (branch: string) =>
+      `✓ 已将分支 ${branch} 的所有提交压缩为一个`,
+  },
   /** squash 完成但未提供 -m，提示用户自行提交 */
-  MERGE_SQUASH_PENDING: (worktreePath: string, branch: string) =>
-    `✓ 已将所有提交压缩到暂存区\n  请在目标 worktree 中提交后重新执行 merge：\n  cd ${worktreePath}\n  提交完成后执行：clawt merge -b ${branch}`,
+  MERGE_SQUASH_PENDING: {
+    en: (worktreePath: string, branch: string) =>
+      `✓ All commits squashed into staging area\n  Please commit in the target worktree, then re-run merge:\n  cd ${worktreePath}\n  After committing, run: clawt merge -b ${branch}`,
+    'zh-CN': (worktreePath: string, branch: string) =>
+      `✓ 已将所有提交压缩到暂存区\n  请在目标 worktree 中提交后重新执行 merge：\n  cd ${worktreePath}\n  提交完成后执行：clawt merge -b ${branch}`,
+  },
   /** merge 后 pull 冲突 */
-  PULL_CONFLICT:
-    '自动 pull 时发生冲突，merge 已完成但远程同步失败\n  请手动解决冲突：\n  解决冲突后执行 git add . && git commit\n  然后执行 git push 推送到远程',
+  PULL_CONFLICT: {
+    en: 'Conflict during auto-pull, merge completed but remote sync failed\n  Please resolve manually:\n  After resolving, run git add . && git commit\n  Then run git push to push to remote',
+    'zh-CN': '自动 pull 时发生冲突，merge 已完成但远程同步失败\n  请手动解决冲突：\n  解决冲突后执行 git add . && git commit\n  然后执行 git push 推送到远程',
+  },
   /** push 失败 */
-  PUSH_FAILED: '自动 push 失败，merge 和 pull 已完成\n  请手动执行 git push',
+  PUSH_FAILED: {
+    en: 'Auto-push failed, merge and pull completed\n  Please run git push manually',
+    'zh-CN': '自动 push 失败，merge 和 pull 已完成\n  请手动执行 git push',
+  },
   /** merge 无可用 worktree */
-  MERGE_NO_WORKTREES: '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
+  MERGE_NO_WORKTREES: {
+    en: 'No worktrees available, please create one with clawt run or clawt create first',
+    'zh-CN': '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
+  },
   /** merge 模糊匹配无结果，列出可用分支 */
-  MERGE_NO_MATCH: (name: string, branches: string[]) =>
-    `未找到与 "${name}" 匹配的分支\n  可用分支：\n${branches.map((b) => `    - ${b}`).join('\n')}`,
+  MERGE_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')}`,
+  },
   /** merge 交互选择提示 */
-  MERGE_SELECT_BRANCH: '请选择要合并的分支',
+  MERGE_SELECT_BRANCH: {
+    en: 'Select a branch to merge',
+    'zh-CN': '请选择要合并的分支',
+  },
   /** merge 模糊匹配到多个结果提示 */
-  MERGE_MULTIPLE_MATCHES: (name: string) => `"${name}" 匹配到多个分支，请选择：`,
+  MERGE_MULTIPLE_MATCHES: {
+    en: (name: string) => `"${name}" matched multiple branches, please select:`,
+    'zh-CN': (name: string) => `"${name}" 匹配到多个分支，请选择：`,
+  },
   /** 询问是否使用 AI 辅助解决冲突 */
-  MERGE_CONFLICT_ASK_AI: '检测到合并冲突，是否使用 Claude Code 自动解决？',
+  MERGE_CONFLICT_ASK_AI: {
+    en: 'Merge conflict detected, use Claude Code to auto-resolve?',
+    'zh-CN': '检测到合并冲突，是否使用 Claude Code 自动解决？',
+  },
   /** AI 冲突解决开始 */
-  MERGE_CONFLICT_AI_START: (fileCount: number) =>
-    `正在使用 Claude Code 分析并解决 ${fileCount} 个冲突文件...`,
+  MERGE_CONFLICT_AI_START: {
+    en: (fileCount: number) =>
+      `Using Claude Code to analyze and resolve ${fileCount} conflicting file(s)...`,
+    'zh-CN': (fileCount: number) =>
+      `正在使用 Claude Code 分析并解决 ${fileCount} 个冲突文件...`,
+  },
   /** AI 冲突解决成功 */
-  MERGE_CONFLICT_AI_SUCCESS: '✓ Claude Code 已成功解决所有冲突',
+  MERGE_CONFLICT_AI_SUCCESS: {
+    en: '✓ Claude Code successfully resolved all conflicts',
+    'zh-CN': '✓ Claude Code 已成功解决所有冲突',
+  },
   /** AI 冲突解决后仍有未解决的冲突 */
-  MERGE_CONFLICT_AI_PARTIAL: (remaining: number) =>
-    `Claude Code 已处理冲突文件，但仍有 ${remaining} 个文件存在冲突\n  请手动处理剩余冲突后执行 git add . && git merge --continue`,
+  MERGE_CONFLICT_AI_PARTIAL: {
+    en: (remaining: number) =>
+      `Claude Code processed conflicts, but ${remaining} file(s) still have conflicts\n  Please resolve remaining conflicts manually, then run git add . && git merge --continue`,
+    'zh-CN': (remaining: number) =>
+      `Claude Code 已处理冲突文件，但仍有 ${remaining} 个文件存在冲突\n  请手动处理剩余冲突后执行 git add . && git merge --continue`,
+  },
   /** AI 冲突解决失败 */
-  MERGE_CONFLICT_AI_FAILED: (errorMsg: string) =>
-    `Claude Code 解决冲突失败: ${errorMsg}\n  请手动处理：\n  解决冲突后执行 git add . && git merge --continue`,
+  MERGE_CONFLICT_AI_FAILED: {
+    en: (errorMsg: string) =>
+      `Claude Code failed to resolve conflicts: ${errorMsg}\n  Please resolve manually:\n  After resolving, run git add . && git merge --continue`,
+    'zh-CN': (errorMsg: string) =>
+      `Claude Code 解决冲突失败: ${errorMsg}\n  请手动处理：\n  解决冲突后执行 git add . && git merge --continue`,
+  },
   /** --auto 模式下的冲突手动解决（配置为 manual） */
-  MERGE_CONFLICT_MANUAL: '合并存在冲突，请手动处理：\n  解决冲突后执行 git add . && git merge --continue',
+  MERGE_CONFLICT_MANUAL: {
+    en: 'Merge has conflicts, please resolve manually:\n  After resolving, run git add . && git merge --continue',
+    'zh-CN': '合并存在冲突，请手动处理：\n  解决冲突后执行 git add . && git merge --continue',
+  },
   /** 目标 worktree 有未提交修改时的交互式提交信息提示 */
-  MERGE_PROMPT_COMMIT_MESSAGE: '目标 worktree 有未提交的修改，请输入提交信息',
+  MERGE_PROMPT_COMMIT_MESSAGE: {
+    en: 'Target worktree has uncommitted changes, please enter a commit message',
+    'zh-CN': '目标 worktree 有未提交的修改，请输入提交信息',
+  },
   /** squash 后的交互式提交信息提示 */
-  MERGE_SQUASH_PROMPT_COMMIT_MESSAGE: '请输入 squash 后的提交信息',
-} as const;
+  MERGE_SQUASH_PROMPT_COMMIT_MESSAGE: {
+    en: 'Enter commit message after squash',
+    'zh-CN': '请输入 squash 后的提交信息',
+  },
+  // --- 从 prompt.ts 迁移 ---
+  /** 提交信息不能为空 */
+  COMMIT_MESSAGE_NOT_EMPTY: {
+    en: 'Commit message cannot be empty',
+    'zh-CN': '提交信息不能为空',
+  },
+  // --- 从 commands/merge.ts 迁移 ---
+  /** 已配置自动删除 */
+  AUTO_DELETE_CONFIGURED: {
+    en: (branch: string) => `Auto-delete configured, worktree and branch will be cleaned up after merge: ${branch}`,
+    'zh-CN': (branch: string) => `已配置自动删除，merge 成功后将自动清理 worktree 和分支: ${branch}`,
+  },
+  /** 是否删除对应的 worktree 和分支 */
+  CONFIRM_DELETE_WORKTREE_BRANCH: {
+    en: (branch: string) => `Delete the corresponding worktree and branch (${branch})?`,
+    'zh-CN': (branch: string) => `是否删除对应的 worktree 和分支 (${branch})？`,
+  },
+};
+
+export const MERGE_MESSAGES = createMessages(MERGE_MESSAGES_I18N);

package/src/constants/messages/post-create.ts

@@ -1,29 +1,69 @@
-/** postCreate hook 相关提示消息 */
-export const POST_CREATE_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** postCreate hook 相关提示消息（双语映射） */
+const POST_CREATE_MESSAGES_I18N = {
   /** hook 执行跳过（--no-post-create） */
-  HOOK_SKIPPED: '已跳过 postCreate hook（--no-post-create）',
+  HOOK_SKIPPED: {
+    en: 'Skipped postCreate hook (--no-post-create)',
+    'zh-CN': '已跳过 postCreate hook（--no-post-create）',
+  },
   /** 无 hook 配置 */
-  HOOK_NOT_CONFIGURED: '未配置 postCreate hook，跳过',
+  HOOK_NOT_CONFIGURED: {
+    en: 'postCreate hook not configured, skipping',
+    'zh-CN': '未配置 postCreate hook，跳过',
+  },
   /** hook 来源提示 */
-  HOOK_SOURCE_INFO: (source: string) => `postCreate hook 来源: ${source}`,
+  HOOK_SOURCE_INFO: {
+    en: (source: string) => `postCreate hook source: ${source}`,
+    'zh-CN': (source: string) => `postCreate hook 来源: ${source}`,
+  },
   /** hook 开始执行 */
-  HOOK_EXECUTING: (branch: string, command: string) =>
-    `[${branch}] 正在执行 postCreate hook: ${command}`,
+  HOOK_EXECUTING: {
+    en: (branch: string, command: string) =>
+      `[${branch}] Executing postCreate hook: ${command}`,
+    'zh-CN': (branch: string, command: string) =>
+      `[${branch}] 正在执行 postCreate hook: ${command}`,
+  },
   /** hook 执行成功 */
-  HOOK_SUCCESS: (branch: string) => `[${branch}] postCreate hook 执行成功`,
+  HOOK_SUCCESS: {
+    en: (branch: string) => `[${branch}] postCreate hook executed successfully`,
+    'zh-CN': (branch: string) => `[${branch}] postCreate hook 执行成功`,
+  },
   /** hook 执行失败 */
-  HOOK_FAILED: (branch: string, error: string) =>
-    `[${branch}] postCreate hook 执行失败: ${error}`,
+  HOOK_FAILED: {
+    en: (branch: string, error: string) =>
+      `[${branch}] postCreate hook execution failed: ${error}`,
+    'zh-CN': (branch: string, error: string) =>
+      `[${branch}] postCreate hook 执行失败: ${error}`,
+  },
   /** hook 执行汇总 */
-  HOOK_SUMMARY: (succeeded: number, failed: number) =>
-    `postCreate hook 执行完成: ${succeeded} 成功, ${failed} 失败`,
+  HOOK_SUMMARY: {
+    en: (succeeded: number, failed: number) =>
+      `postCreate hook completed: ${succeeded} succeeded, ${failed} failed`,
+    'zh-CN': (succeeded: number, failed: number) =>
+      `postCreate hook 执行完成: ${succeeded} 成功, ${failed} 失败`,
+  },
   /** hook 后台执行中提示 */
-  HOOK_BACKGROUND_START: (count: number, command: string) =>
-    `postCreate hook 正在后台执行 (${count} 个 worktree): ${command}`,
+  HOOK_BACKGROUND_START: {
+    en: (count: number, command: string) =>
+      `postCreate hook running in background (${count} worktree(s)): ${command}`,
+    'zh-CN': (count: number, command: string) =>
+      `postCreate hook 正在后台执行 (${count} 个 worktree): ${command}`,
+  },
   /** postCreate.sh 自动添加执行权限 */
-  POST_CREATE_SCRIPT_AUTO_CHMOD: (path: string) =>
-    `${path} 不可执行，已自动添加执行权限`,
+  POST_CREATE_SCRIPT_AUTO_CHMOD: {
+    en: (path: string) =>
+      `${path} is not executable, auto-added execute permission`,
+    'zh-CN': (path: string) =>
+      `${path} 不可执行，已自动添加执行权限`,
+  },
   /** postCreate.sh 不可执行（自动 chmod 失败时降级提示） */
-  POST_CREATE_SCRIPT_NOT_EXECUTABLE: (path: string) =>
-    `检测到 ${path} 但不可执行，自动添加权限失败，请手动执行 chmod +x ${path}`,
-} as const;
+  POST_CREATE_SCRIPT_NOT_EXECUTABLE: {
+    en: (path: string) =>
+      `Detected ${path} but not executable, auto-chmod failed. Please run chmod +x ${path} manually`,
+    'zh-CN': (path: string) =>
+      `检测到 ${path} 但不可执行，自动添加权限失败，请手动执行 chmod +x ${path}`,
+  },
+};
+
+export const POST_CREATE_MESSAGES = createMessages(POST_CREATE_MESSAGES_I18N);

package/src/constants/messages/projects.ts

@@ -1,25 +1,62 @@
-/** projects 命令专属提示消息 */
-export const PROJECTS_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** projects 命令专属提示消息（双语映射） */
+const PROJECTS_MESSAGES_I18N = {
   /** projects 命令全局概览标题 */
-  PROJECTS_OVERVIEW_TITLE: '项目概览',
+  PROJECTS_OVERVIEW_TITLE: {
+    en: 'Project Overview',
+    'zh-CN': '项目概览',
+  },
   /** projects 命令指定项目详情标题 */
-  PROJECTS_DETAIL_TITLE: (projectName: string) => `项目详情: ${projectName}`,
+  PROJECTS_DETAIL_TITLE: {
+    en: (projectName: string) => `Project Details: ${projectName}`,
+    'zh-CN': (projectName: string) => `项目详情: ${projectName}`,
+  },
   /** 无项目提示 */
-  PROJECTS_NO_PROJECTS: '(暂无项目，worktrees 目录为空)',
+  PROJECTS_NO_PROJECTS: {
+    en: '(No projects, worktrees directory is empty)',
+    'zh-CN': '(暂无项目，worktrees 目录为空)',
+  },
   /** 项目不存在提示 */
-  PROJECTS_NOT_FOUND: (name: string) => `项目 ${name} 不存在`,
+  PROJECTS_NOT_FOUND: {
+    en: (name: string) => `Project ${name} does not exist`,
+    'zh-CN': (name: string) => `项目 ${name} 不存在`,
+  },
   /** worktree 数量标签 */
-  PROJECTS_WORKTREE_COUNT: (count: number) => `${count} 个 worktree`,
+  PROJECTS_WORKTREE_COUNT: {
+    en: (count: number) => `${count} worktree(s)`,
+    'zh-CN': (count: number) => `${count} 个 worktree`,
+  },
   /** 最近活跃时间标签 */
-  PROJECTS_LAST_ACTIVE: (relativeTime: string) => `最近活跃: ${relativeTime}`,
+  PROJECTS_LAST_ACTIVE: {
+    en: (relativeTime: string) => `Last active: ${relativeTime}`,
+    'zh-CN': (relativeTime: string) => `最近活跃: ${relativeTime}`,
+  },
   /** 磁盘占用标签 */
-  PROJECTS_DISK_USAGE: (size: string) => `磁盘占用: ${size}`,
+  PROJECTS_DISK_USAGE: {
+    en: (size: string) => `Disk usage: ${size}`,
+    'zh-CN': (size: string) => `磁盘占用: ${size}`,
+  },
   /** 总磁盘占用标签 */
-  PROJECTS_TOTAL_DISK_USAGE: (size: string) => `总占用: ${size}`,
+  PROJECTS_TOTAL_DISK_USAGE: {
+    en: (size: string) => `Total: ${size}`,
+    'zh-CN': (size: string) => `总占用: ${size}`,
+  },
   /** projects 详情无 worktree */
-  PROJECTS_DETAIL_NO_WORKTREES: '(该项目下无 worktree)',
+  PROJECTS_DETAIL_NO_WORKTREES: {
+    en: '(No worktrees in this project)',
+    'zh-CN': '(该项目下无 worktree)',
+  },
   /** 路径标签 */
-  PROJECTS_PATH: (path: string) => `路径: ${path}`,
+  PROJECTS_PATH: {
+    en: (path: string) => `Path: ${path}`,
+    'zh-CN': (path: string) => `路径: ${path}`,
+  },
   /** 最后修改时间标签 */
-  PROJECTS_LAST_MODIFIED: (relativeTime: string) => `最后修改: ${relativeTime}`,
-} as const;
+  PROJECTS_LAST_MODIFIED: {
+    en: (relativeTime: string) => `Last modified: ${relativeTime}`,
+    'zh-CN': (relativeTime: string) => `最后修改: ${relativeTime}`,
+  },
+};
+
+export const PROJECTS_MESSAGES = createMessages(PROJECTS_MESSAGES_I18N);