clawt 3.9.13 → 3.10.1

package/src/hooks/post-create.ts

@@ -6,6 +6,7 @@ import { MESSAGES } from '../constants/index.js';
 import { loadProjectConfig } from '../utils/project-config.js';
 import { getMainWorktreePath } from '../utils/git.js';
 import { printInfo, printSuccess, printWarning } from '../utils/formatter.js';
+import { getCurrentLanguage } from '../utils/i18n.js';
 import type { WorktreeInfo, ResolvedHook, PostCreateHookResult } from '../types/index.js';
 
 /** 项目仓库中的 postCreate 脚本相对路径 */
@@ -86,7 +87,9 @@ export function resolvePostCreateHook(): ResolvedHook | null {
  * @returns {string} 来源描述文本
  */
 function getSourceLabel(hook: ResolvedHook): string {
-  return hook.source === 'projectConfig' ? '项目配置 (postCreate)' : '.clawt/postCreate.sh';
+  return hook.source === 'projectConfig'
+    ? (getCurrentLanguage() === 'en' ? 'Project config (postCreate)' : '项目配置 (postCreate)')
+    : '.clawt/postCreate.sh';
 }
 
 /**
@@ -122,7 +125,7 @@ function executeOneHook(worktree: WorktreeInfo, hook: ResolvedHook): Promise<Pos
       child.on('close', (code) => {
         if (code !== null && code !== 0) {
           result.success = false;
-          result.error = `命令退出码: ${code}`;
+          result.error = getCurrentLanguage() === 'en' ? `Command exit code: ${code}` : `命令退出码: ${code}`;
           logger.error(`postCreate hook 失败: ${hook.command} (退出码: ${code}) @ ${worktree.path}`);
         } else {
           logger.info(`postCreate hook 成功: ${hook.command} @ ${worktree.path}`);

package/src/index.ts

@@ -4,6 +4,7 @@ import { ClawtError } from './errors/index.js';
 import { logger, enableConsoleTransport } from './logger/index.js';
 import { EXIT_CODES } from './constants/index.js';
 import { printError, ensureClawtDirs, loadConfig, applyAliases, checkForUpdates, setNonInteractive } from './utils/index.js';
+import { getCurrentLanguage } from './utils/i18n.js';
 import { registerListCommand } from './commands/list.js';
 import { registerCreateCommand } from './commands/create.js';
 import { registerRemoveCommand } from './commands/remove.js';
@@ -34,10 +35,10 @@ const program = new Command();
 
 program
   .name('clawt')
-  .description('本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具')
+  .description(getCurrentLanguage() === 'en' ? 'Run multiple Claude Code Agent tasks in parallel — a CLI tool integrating Git Worktree with Claude Code CLI' : '本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具')
   .version(version)
-  .option('--debug', '输出详细调试信息到终端')
-  .option('-y, --yes', '跳过所有交互式确认，适用于脚本/CI 环境');
+  .option('--debug', getCurrentLanguage() === 'en' ? 'Output detailed debug information to terminal' : '输出详细调试信息到终端')
+  .option('-y, --yes', getCurrentLanguage() === 'en' ? 'Skip all interactive confirmations, suitable for scripts/CI environments' : '跳过所有交互式确认，适用于脚本/CI 环境');
 
 // 在子命令 action 执行前检查 --debug 选项，按需启用控制台日志
 program.hook('preAction', (thisCommand) => {
@@ -81,7 +82,7 @@ process.on('uncaughtException', (error) => {
     logger.error(error.message);
     process.exit(error.exitCode);
   }
-  printError(error.message || '未知错误');
+  printError(error.message || (getCurrentLanguage() === 'en' ? 'Unknown error' : '未知错误'));
   logger.error(`未捕获异常: ${error.message}\n${error.stack}`);
   process.exit(EXIT_CODES.ERROR);
 });
@@ -93,7 +94,7 @@ process.on('unhandledRejection', (reason) => {
     logger.error(error.message);
     process.exit(error.exitCode);
   }
-  printError(error.message || '未知错误');
+  printError(error.message || (getCurrentLanguage() === 'en' ? 'Unknown error' : '未知错误'));
   logger.error(`未处理的 Promise 拒绝: ${error.message}`);
   process.exit(EXIT_CODES.ERROR);
 });

package/src/types/config.ts

@@ -1,5 +1,7 @@
 /** clawt 全局配置 */
 export interface ClawtConfig {
+  /** 界面语言：en（英文）、zh-CN（中文） */
+  language: 'en' | 'zh-CN';
   /** 移除 worktree 时是否自动删除对应本地分支 */
   autoDeleteBranch: boolean;
   /** Claude Code CLI 启动指令（不传 --tasks 时在 worktree 中直接打开交互式界面） */

package/src/utils/alias.ts

@@ -1,6 +1,7 @@
 import type { Command } from 'commander';
 import type { ClawtConfig } from '../types/index.js';
 import { logger } from '../logger/index.js';
+import { getCurrentLanguage } from './i18n.js';
 
 /**
  * 根据配置中的别名映射，为已注册的命令添加 Commander.js 别名
@@ -14,7 +15,7 @@ export function applyAliases(program: Command, aliases: ClawtConfig['aliases']):
       targetCmd.alias(alias);
       logger.debug(`已注册别名: ${alias} → ${commandName}`);
     } else {
-      logger.warn(`别名 "${alias}" 的目标命令 "${commandName}" 不存在，已跳过`);
+      logger.warn(getCurrentLanguage() === 'en' ? `Alias "${alias}" targets non-existent command "${commandName}", skipped` : `别名 "${alias}" 的目标命令 "${commandName}" 不存在，已跳过`);
     }
   }
 }

package/src/utils/claude.ts

@@ -2,10 +2,11 @@ import { spawnSync } from 'node:child_process';
 import { existsSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { ClawtError } from '../errors/index.js';
-import { CLAUDE_PROJECTS_DIR } from '../constants/index.js';
+import { CLAUDE_PROJECTS_DIR, MESSAGES } from '../constants/index.js';
 import { resolveClaudeCodeCommand } from './project-config.js';
 import { printInfo, printWarning } from './formatter.js';
 import { openCommandInNewTerminalTab } from './terminal.js';
+import { getCurrentLanguage } from './i18n.js';
 import type { WorktreeInfo } from '../types/index.js';
 
 /**
@@ -64,12 +65,12 @@ export function launchInteractiveClaude(worktree: WorktreeInfo, options: LaunchC
     args.push('--continue');
   }
 
-  printInfo(`正在 worktree 中启动 Claude Code 交互式界面...`);
-  printInfo(`  分支: ${worktree.branch}`);
-  printInfo(`  路径: ${worktree.path}`);
-  printInfo(`  指令: ${commandStr}`);
+  printInfo(MESSAGES.STARTING_CLAUDE_INTERACTIVE);
+  printInfo(`  ${MESSAGES.BRANCH_LABEL} ${worktree.branch}`);
+  printInfo(`  ${MESSAGES.PATH_LABEL_RESUME} ${worktree.path}`);
+  printInfo(`  ${MESSAGES.COMMAND_LABEL} ${commandStr}`);
   if (options.autoContinue) {
-    printInfo(`  模式: ${hasPreviousSession ? '继续上次对话' : '新对话'}`);
+    printInfo(`  ${MESSAGES.MODE_LABEL} ${hasPreviousSession ? MESSAGES.CONTINUE_SESSION : MESSAGES.NEW_SESSION}`);
   }
   printInfo('');
 
@@ -79,11 +80,11 @@ export function launchInteractiveClaude(worktree: WorktreeInfo, options: LaunchC
   });
 
   if (result.error) {
-    throw new ClawtError(`启动 Claude Code 失败: ${result.error.message}`);
+    throw new ClawtError(MESSAGES.CLAUDE_START_FAILED(result.error.message));
   }
 
   if (result.status !== null && result.status !== 0) {
-    printWarning(`Claude Code 退出码: ${result.status}`);
+    printWarning(getCurrentLanguage() === 'en' ? `Claude Code exit code: ${result.status}` : `Claude Code 退出码: ${result.status}`);
   }
 }
 
@@ -121,7 +122,7 @@ export function buildClaudeCommand(worktree: WorktreeInfo, hasPreviousSession: b
  */
 export function launchInteractiveClaudeInNewTerminal(worktree: WorktreeInfo, hasPreviousSession: boolean): void {
   const command = buildClaudeCommand(worktree, hasPreviousSession);
-  const modeLabel = hasPreviousSession ? '继续' : '新对话';
+  const modeLabel = hasPreviousSession ? MESSAGES.CONTINUE_SESSION : MESSAGES.NEW_SESSION;
   const tabTitle = `clawt: ${worktree.branch}`;
 
   openCommandInNewTerminalTab(command, tabTitle);

package/src/utils/config-strategy.ts

@@ -112,7 +112,7 @@ export async function promptConfigValue(
  */
 export function formatConfigValue(value: unknown): string {
   if (value === undefined || value === null) {
-    return chalk.dim('(未设置)');
+    return chalk.dim(MESSAGES.NOT_SET);
   }
   if (typeof value === 'boolean') {
     return value ? chalk.green('true') : chalk.yellow('false');
@@ -136,7 +136,7 @@ export async function interactiveConfigEditor<T extends object>(
 ): Promise<{ key: keyof T; newValue: unknown }> {
   // 非交互模式下无法进行配置编辑，引导使用 config set 命令
   if (isNonInteractive()) {
-    throw new ClawtError('非交互模式下无法使用交互式配置编辑器，请使用 clawt config set <key> <value>');
+    throw new ClawtError(MESSAGES.NON_INTERACTIVE_CONFIG_EDITOR);
   }
 
   const keys = Object.keys(definitions);
@@ -203,7 +203,7 @@ async function promptNumberValue(key: string, currentValue: number): Promise<num
     message: MESSAGES.CONFIG_INPUT_PROMPT(key),
     initial: String(currentValue),
     validate: (val: string) => {
-      if (Number.isNaN(Number(val))) return '请输入有效的数字';
+      if (Number.isNaN(Number(val))) return MESSAGES.INVALID_NUMBER_PROMPT;
       return true;
     },
   }).run();

package/src/utils/dry-run.ts

@@ -69,11 +69,11 @@ export function printDryRunPreview(branchNames: string[], tasks: string[], concu
     }
 
     // 路径行（2空格缩进）
-    printInfo(`  ${chalk.gray('路径:')} ${worktreePath}`);
+    printInfo(`  ${chalk.gray(MESSAGES.PATH_LABEL)} ${worktreePath}`);
 
     // 任务描述行（2空格缩进，非交互式模式）
     if (!isInteractive) {
-      printInfo(`  ${chalk.gray('任务:')} ${truncateTaskDesc(tasks[i])}`);
+      printInfo(`  ${chalk.gray(MESSAGES.TASK_LABEL)} ${truncateTaskDesc(tasks[i])}`);
     }
 
     printInfo('');

package/src/utils/formatter.ts

@@ -3,6 +3,7 @@ import { MESSAGES } from '../constants/index.js';
 import { createInterface } from 'node:readline';
 import type { WorktreeStatus } from '../types/index.js';
 import { isNonInteractive } from './interactive.js';
+import { getCurrentLanguage } from './i18n.js';
 
 /**
  * 输出成功信息
@@ -89,8 +90,11 @@ export function confirmAction(question: string, nonInteractiveDefault: boolean =
  * @returns {Promise<boolean>} 用户是否确认
  */
 export function confirmDestructiveAction(dangerousCommand: string, description: string): Promise<boolean> {
-  printWarning(`即将执行 ${chalk.red.bold(dangerousCommand)}，${description}`);
-  return confirmAction('是否继续？');
+  const lang = getCurrentLanguage();
+  const continuePrompt = lang === 'en' ? 'Continue?' : '是否继续？';
+  const warningPrefix = lang === 'en' ? `About to execute ${chalk.red.bold(dangerousCommand)}, ` : `即将执行 ${chalk.red.bold(dangerousCommand)}，`;
+  printWarning(`${warningPrefix}${description}`);
+  return confirmAction(continuePrompt);
 }
 
 /**
@@ -111,14 +115,16 @@ export function isWorktreeIdle(status: WorktreeStatus): boolean {
  * @returns {string} 格式化后的状态字符串
  */
 export function formatWorktreeStatus(status: WorktreeStatus): string {
+  const lang = getCurrentLanguage();
   const parts: string[] = [];
 
   // 提交数（黄色）
-  parts.push(chalk.yellow(`${status.commitCount} 个提交`));
+  const commitLabel = lang === 'en' ? `${status.commitCount} commit${status.commitCount !== 1 ? 's' : ''}` : `${status.commitCount} 个提交`;
+  parts.push(chalk.yellow(commitLabel));
 
   // 变更统计
   if (status.insertions === 0 && status.deletions === 0) {
-    parts.push('无变更');
+    parts.push(lang === 'en' ? 'No changes' : '无变更');
   } else {
     const diffParts: string[] = [];
     diffParts.push(chalk.green(`+${status.insertions}`));
@@ -128,7 +134,7 @@ export function formatWorktreeStatus(status: WorktreeStatus): string {
 
   // 未提交修改提示（灰色）
   if (status.hasDirtyFiles) {
-    parts.push(chalk.gray('(未提交修改)'));
+    parts.push(chalk.gray(lang === 'en' ? '(uncommitted changes)' : '(未提交修改)'));
   }
 
   return parts.join('   ');
@@ -157,6 +163,7 @@ export function formatDuration(ms: number): string {
  * @returns {string | null} 中文相对时间描述，无效日期时返回 null
  */
 export function formatRelativeTime(isoDateString: string): string | null {
+  const lang = getCurrentLanguage();
   const date = new Date(isoDateString);
   const now = new Date();
   const diffMs = now.getTime() - date.getTime();
@@ -168,7 +175,7 @@ export function formatRelativeTime(isoDateString: string): string | null {
 
   // 未来时间或不到 1 分钟
   if (diffMs < 0 || diffMs < 60 * 1000) {
-    return '刚刚';
+    return lang === 'en' ? 'just now' : '刚刚';
   }
 
   const diffMinutes = Math.floor(diffMs / (1000 * 60));
@@ -176,20 +183,20 @@ export function formatRelativeTime(isoDateString: string): string | null {
   const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24));
 
   if (diffHours < 1) {
-    return `${diffMinutes} 分钟前`;
+    return lang === 'en' ? `${diffMinutes} min ago` : `${diffMinutes} 分钟前`;
   }
   if (diffDays < 1) {
-    return `${diffHours} 小时前`;
+    return lang === 'en' ? `${diffHours} hr ago` : `${diffHours} 小时前`;
   }
   if (diffDays < 30) {
-    return `${diffDays} 天前`;
+    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/src/utils/i18n.ts

@@ -0,0 +1,63 @@
+import { loadConfig } from './config.js';
+
+/** 支持的语言类型 */
+export type Language = 'en' | 'zh-CN';
+
+/** 当前语言缓存 */
+let currentLanguage: Language | null = null;
+
+/**
+ * 获取当前语言配置
+ * 优先使用缓存，缓存不存在时从配置文件读取
+ * @returns {Language} 当前语言
+ */
+export function getCurrentLanguage(): Language {
+  if (currentLanguage !== null) {
+    return currentLanguage;
+  }
+  try {
+    const config = loadConfig();
+    currentLanguage = (config.language as Language) || 'en';
+  } catch {
+    currentLanguage = 'en';
+  }
+  return currentLanguage;
+}
+
+/**
+ * 设置当前语言（用于测试和 CLI 初始化时）
+ * @param {Language} lang - 语言代码
+ */
+export function setCurrentLanguage(lang: Language): void {
+  currentLanguage = lang;
+}
+
+/**
+ * 重置语言缓存（配置变更后调用，使下次读取时重新加载）
+ */
+export function resetLanguageCache(): void {
+  currentLanguage = null;
+}
+
+/**
+ * 从 i18n 双语映射条目中提取当前语言对应的值类型
+ */
+type ExtractLang<T> = T extends { en: infer V; 'zh-CN': infer V } ? V : never;
+
+/**
+ * 创建国际化消息对象
+ * 根据当前语言从双语映射中选择对应的文本或函数
+ * 保留精确的键名和值类型，确保合并后的 MESSAGES 对象类型正确
+ * @param {T} i18nMap - 双语消息映射，每个键包含 en 和 zh-CN 两个版本
+ * @returns {{ [K in keyof T]: ExtractLang<T[K]> }} 当前语言的消息对象，键名和值类型与原始映射一致
+ */
+export function createMessages<T extends Record<string, { en: any; 'zh-CN': any }>>(
+  i18nMap: T
+): { [K in keyof T]: ExtractLang<T[K]> } {
+  const lang = getCurrentLanguage();
+  const result: any = {};
+  for (const key of Object.keys(i18nMap)) {
+    result[key] = i18nMap[key][lang];
+  }
+  return result;
+}

package/src/utils/index.ts

@@ -98,4 +98,6 @@ export { buildPanelFrame, buildGroupedWorktreeLines, buildDisplayOrder, renderDa
 export type { PanelLine } from './interactive-panel-render.js';
 export { buildConflictResolvePrompt, invokeClaudeForConflictResolve, resolveConflictsWithAI, determineConflictResolveMode, handleMergeConflict } from './conflict-resolver.js';
 export { resolvePostCreateHook, executePostCreateHooks, runPostCreateHooks } from '../hooks/index.js';
+export { getCurrentLanguage, setCurrentLanguage, resetLanguageCache, createMessages } from './i18n.js';
+export type { Language } from './i18n.js';
 

package/src/utils/interactive-panel-render.ts

@@ -11,6 +11,7 @@ import {
   UNKNOWN_DATE_GROUP,
   VALIDATE_BRANCH_PREFIX,
 } from '../constants/index.js';
+import { getCurrentLanguage } from './i18n.js';
 import {
   PANEL_FOOTER_SHORTCUTS,
   PANEL_FOOTER_COUNTDOWN,
@@ -218,7 +219,8 @@ export function renderDateSeparator(dateKey: string): string {
     return `${leftPad}${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)} ${chalk.bold.hex(PANEL_DATE_COLOR)(PANEL_UNKNOWN_DATE)} ${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)}`;
   }
   const relativeDate = formatRelativeDate(dateKey);
-  return `${leftPad}${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)} ${chalk.bold.hex(PANEL_DATE_COLOR)(dateKey)}${chalk.hex(PANEL_DATE_COLOR)(`（${relativeDate}）`)} ${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)}`;
+  const relativeDateText = getCurrentLanguage() === 'en' ? `(${relativeDate})` : `（${relativeDate}）`;
+  return `${leftPad}${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)} ${chalk.bold.hex(PANEL_DATE_COLOR)(dateKey)}${chalk.hex(PANEL_DATE_COLOR)(relativeDateText)} ${chalk.gray(PANEL_DATE_SEPARATOR_PREFIX)}`;
 }
 
 /**
@@ -324,12 +326,13 @@ function renderConfiguredBranchLine(main: MainWorktreeStatus): string {
  * @returns {string} 格式化的 diff 信息
  */
 function renderMainBranchDiff(main: MainWorktreeStatus): string {
+  const workingDirLabel = getCurrentLanguage() === 'en' ? 'Working dir:' : '工作区:';
   if (main.insertions === 0 && main.deletions === 0) {
-    return `工作区: ${chalk.green(MESSAGES.STATUS_CHANGE_CLEAN)}`;
+    return `${workingDirLabel} ${chalk.green(MESSAGES.STATUS_CHANGE_CLEAN)}`;
   }
   const insertText = chalk.green(`+${main.insertions}`);
   const deleteText = chalk.red(`-${main.deletions}`);
-  return `工作区: ${insertText} ${deleteText}`;
+  return `${workingDirLabel} ${insertText} ${deleteText}`;
 }
 
 /**

package/src/utils/progress-render.ts

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import stringWidth from 'string-width';
-import { TASK_STATUS_ICONS, TASK_STATUS_LABELS } from '../constants/index.js';
+import { TASK_STATUS_ICONS, getTaskStatusLabels } from '../constants/index.js';
 import { formatDuration } from './formatter.js';
 
 /** ANSI 颜色/样式转义序列的匹配正则 */
@@ -106,27 +106,28 @@ export function getMaxPathWidth(tasks: TaskProgress[]): number {
 export function renderTaskLine(task: TaskProgress, total: number, maxPathWidth: number, spinnerChar: string): string {
   const indexStr = `[${task.index}/${total}]`;
   const pathStr = task.path.padEnd(maxPathWidth);
+  const labels = getTaskStatusLabels();
 
   switch (task.status) {
     case 'pending': {
-      return `${indexStr} ${pathStr}  ${chalk.gray(TASK_STATUS_ICONS.PENDING)} ${chalk.gray(TASK_STATUS_LABELS.PENDING)}`;
+      return `${indexStr} ${pathStr}  ${chalk.gray(TASK_STATUS_ICONS.PENDING)} ${chalk.gray(labels.PENDING)}`;
     }
     case 'running': {
       const elapsed = formatDuration(Date.now() - task.startedAt);
       // 仅显示活动信息，不显示路径（路径已在第二列显示）
       const detail = task.activity ? `  ${chalk.dim(task.activity)}` : '';
-      return `${indexStr} ${pathStr}  ${chalk.cyan(spinnerChar)} ${chalk.cyan(TASK_STATUS_LABELS.RUNNING)} ${chalk.gray(elapsed)}${detail}`;
+      return `${indexStr} ${pathStr}  ${chalk.cyan(spinnerChar)} ${chalk.cyan(labels.RUNNING)} ${chalk.gray(elapsed)}${detail}`;
     }
     case 'done': {
       const duration = task.durationMs != null ? formatDuration(task.durationMs) : 'N/A';
       const cost = task.costUsd != null ? `$${task.costUsd.toFixed(2)}` : '';
       const preview = task.resultPreview ? `  ${chalk.dim(task.resultPreview)}` : '';
-      return `${indexStr} ${pathStr}  ${chalk.green(TASK_STATUS_ICONS.DONE)} ${chalk.green(TASK_STATUS_LABELS.DONE)}   ${chalk.gray(duration)}  ${chalk.yellow(cost)}${preview}`;
+      return `${indexStr} ${pathStr}  ${chalk.green(TASK_STATUS_ICONS.DONE)} ${chalk.green(labels.DONE)}   ${chalk.gray(duration)}  ${chalk.yellow(cost)}${preview}`;
     }
     case 'failed': {
       const duration = task.durationMs != null ? formatDuration(task.durationMs) : 'N/A';
       const preview = task.resultPreview ? `  ${chalk.dim(task.resultPreview)}` : '';
-      return `${indexStr} ${pathStr}  ${chalk.red(TASK_STATUS_ICONS.FAILED)} ${chalk.red(TASK_STATUS_LABELS.FAILED)}   ${chalk.gray(duration)}${preview}`;
+      return `${indexStr} ${pathStr}  ${chalk.red(TASK_STATUS_ICONS.FAILED)} ${chalk.red(labels.FAILED)}   ${chalk.gray(duration)}${preview}`;
     }
   }
 }
@@ -143,12 +144,13 @@ export function renderSummaryLine(tasks: TaskProgress[], total: number): string
   const done = tasks.filter((t) => t.status === 'done').length;
   const failed = tasks.filter((t) => t.status === 'failed').length;
   const pending = tasks.filter((t) => t.status === 'pending').length;
+  const labels = getTaskStatusLabels();
 
   const parts: string[] = [];
-  if (running > 0) parts.push(chalk.cyan(`${running}/${total} ${TASK_STATUS_LABELS.RUNNING}`));
-  if (done > 0) parts.push(chalk.green(`${done}/${total} ${TASK_STATUS_LABELS.DONE}`));
-  if (failed > 0) parts.push(chalk.red(`${failed}/${total} ${TASK_STATUS_LABELS.FAILED}`));
-  if (pending > 0) parts.push(chalk.gray(`${pending}/${total} ${TASK_STATUS_LABELS.PENDING}`));
+  if (running > 0) parts.push(chalk.cyan(`${running}/${total} ${labels.RUNNING}`));
+  if (done > 0) parts.push(chalk.green(`${done}/${total} ${labels.DONE}`));
+  if (failed > 0) parts.push(chalk.red(`${failed}/${total} ${labels.FAILED}`));
+  if (pending > 0) parts.push(chalk.gray(`${pending}/${total} ${labels.PENDING}`));
 
   return `[${parts.join(', ')}]`;
 }

package/src/utils/prompt.ts

@@ -1,6 +1,7 @@
 import Enquirer from 'enquirer';
 import { isNonInteractive } from './interactive.js';
 import { ClawtError } from '../errors/index.js';
+import { MESSAGES } from '../constants/index.js';
 
 /**
  * 多行交互式输入框
@@ -45,7 +46,7 @@ export async function promptCommitMessage(
 
   // 空输入视为无效
   if (!result.trim()) {
-    throw new ClawtError('提交信息不能为空');
+    throw new ClawtError(MESSAGES.COMMIT_MESSAGE_NOT_EMPTY);
   }
 
   return result.trim();

package/src/utils/task-executor.ts

@@ -3,6 +3,7 @@ import { logger } from '../logger/index.js';
 import { MESSAGES } from '../constants/index.js';
 import type { ClaudeCodeResult, TaskResult, TaskSummary, WorktreeInfo } from '../types/index.js';
 import { spawnProcess, killAllChildProcesses } from './shell.js';
+import { getCurrentLanguage } from './i18n.js';
 import { cleanupWorktrees } from './worktree.js';
 import { getConfigValue } from './config.js';
 import { printSuccess, printWarning, printInfo, printDoubleSeparator, confirmAction } from './formatter.js';
@@ -107,7 +108,7 @@ function executeClaudeTask(worktree: WorktreeInfo, task: string, onActivity?: Ac
         worktreePath: worktree.path,
         success,
         result: finalResult,
-        error: success ? undefined : stderr || '任务执行失败',
+        error: success ? undefined : stderr || MESSAGES.TASK_FAILED,
       });
     });
 
@@ -132,11 +133,11 @@ function executeClaudeTask(worktree: WorktreeInfo, task: string, onActivity?: Ac
  */
 function printTaskSummary(summary: TaskSummary): void {
   printDoubleSeparator();
-  printInfo(`全部任务已完成 (${summary.total}/${summary.total})`);
-  printInfo(`  成功: ${summary.succeeded}`);
-  printInfo(`  失败: ${summary.failed}`);
-  printInfo(`  总耗时: ${(summary.totalDurationMs / 1000).toFixed(1)}s`);
-  printInfo(`  总花费: $${summary.totalCostUsd.toFixed(2)}`);
+  printInfo(MESSAGES.ALL_TASKS_COMPLETED(summary.total));
+  printInfo(`  ${MESSAGES.SUCCESS_LABEL} ${summary.succeeded}`);
+  printInfo(`  ${MESSAGES.FAILURE_LABEL} ${summary.failed}`);
+  printInfo(`  ${MESSAGES.TOTAL_DURATION_LABEL} ${(summary.totalDurationMs / 1000).toFixed(1)}s`);
+  printInfo(`  ${MESSAGES.TOTAL_COST_LABEL} $${summary.totalCostUsd.toFixed(2)}`);
   printDoubleSeparator();
 }
 
@@ -342,7 +343,9 @@ export async function executeBatchTasks(
   // 校验 continueFlags 长度与 worktrees 一致，防止调用方传入不匹配的数组
   if (continueFlags && continueFlags.length !== count) {
     throw new ClawtError(
-      `continueFlags 长度 (${continueFlags.length}) 与任务数 (${count}) 不一致`,
+      getCurrentLanguage() === 'en'
+        ? `continueFlags length (${continueFlags.length}) does not match task count (${count})`
+        : `continueFlags 长度 (${continueFlags.length}) 与任务数 (${count}) 不一致`,
     );
   }
 

package/src/utils/task-file.ts

@@ -2,6 +2,7 @@ import { resolve } from 'node:path';
 import { existsSync, readFileSync } from 'node:fs';
 import { ClawtError } from '../errors/index.js';
 import { MESSAGES } from '../constants/index.js';
+import { getCurrentLanguage } from './i18n.js';
 import type { TaskFileEntry, ParseTaskFileOptions } from '../types/index.js';
 
 /** 匹配任务块的正则：<!-- CLAWT-TASKS:START --> ... <!-- CLAWT-TASKS:END --> */
@@ -11,7 +12,7 @@ const TASK_BLOCK_REGEX = /<!-- CLAWT-TASKS:START -->([\s\S]*?)<!-- CLAWT-TASKS:E
 const BRANCH_LINE_REGEX = /^#\s*branch:\s*(.+)$/;
 
 /** 任务列表为空时的错误提示 */
-const EMPTY_TASKS_MESSAGE = '任务列表不能为空';
+const EMPTY_TASKS_MESSAGE = getCurrentLanguage() === 'en' ? 'Task list cannot be empty' : '任务列表不能为空';
 
 /**
  * 从命令行 --tasks 选项中解析出有效的任务列表

package/src/utils/terminal.ts

@@ -2,8 +2,9 @@ import { execFileSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { ClawtError } from '../errors/index.js';
 import { logger } from '../logger/index.js';
-import { VALID_TERMINAL_APPS, ITERM2_APP_PATH } from '../constants/index.js';
+import { VALID_TERMINAL_APPS, ITERM2_APP_PATH, MESSAGES } from '../constants/index.js';
 import { getConfigValue } from './config.js';
+import { getCurrentLanguage } from './i18n.js';
 
 /** 终端应用类型 */
 type TerminalApp = 'iterm2' | 'terminal' | 'cmux';
@@ -124,8 +125,7 @@ function openCommandInCmuxSurface(command: string, title: string): void {
   // 环境检查：只需要检查 WORKSPACE_ID
   if (!isCmuxEnvironment()) {
     throw new ClawtError(
-      '当前不在 cmux 环境中，无法创建 surface\n' +
-      '请确保在 cmux 终端中执行 clawt resume 命令，或修改 terminalApp 配置'
+      MESSAGES.NOT_IN_CMUX
     );
   }
 
@@ -152,7 +152,7 @@ function openCommandInCmuxSurface(command: string, title: string): void {
     // 需要灵活匹配
     const match = newSurfaceResult.match(/(?:OK\s+)?(surface:\d+)/i);
     if (!match) {
-      throw new Error(`无法解析 cmux new-split 输出: ${newSurfaceResult}`);
+      throw new Error(getCurrentLanguage() === 'en' ? `Failed to parse cmux new-split output: ${newSurfaceResult}` : `无法解析 cmux new-split 输出: ${newSurfaceResult}`);
     }
     const surfaceRef = match[1];
 
@@ -173,7 +173,7 @@ function openCommandInCmuxSurface(command: string, title: string): void {
 
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw new ClawtError(`在 cmux 中创建 surface 失败: ${message}`);
+    throw new ClawtError(getCurrentLanguage() === 'en' ? `Failed to create surface in cmux: ${message}` : `在 cmux 中创建 surface 失败: ${message}`);
   }
 }
 
@@ -195,9 +195,9 @@ function executeAppleScript(script: string, terminalApp: 'iterm2' | 'terminal'):
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     const accessibilityHint = terminalApp === 'terminal'
-      ? '\n提示：Terminal.app 需要辅助功能权限，请在「系统设置 → 隐私与安全性 → 辅助功能」中授权终端应用'
+      ? MESSAGES.TERMINAL_ACCESSIBILITY_HINT
       : '';
-    throw new ClawtError(`打开终端 Tab 失败: ${message}${accessibilityHint}`);
+    throw new ClawtError(getCurrentLanguage() === 'en' ? `Failed to open terminal tab: ${message}${accessibilityHint}` : `打开终端 Tab 失败: ${message}${accessibilityHint}`);
   }
 }
 
@@ -212,7 +212,7 @@ function executeAppleScript(script: string, terminalApp: 'iterm2' | 'terminal'):
  */
 export function openCommandInNewTerminalTab(command: string, tabTitle: string): void {
   if (process.platform !== 'darwin') {
-    throw new ClawtError('批量 resume 目前仅支持 macOS 平台');
+    throw new ClawtError(MESSAGES.BATCH_RESUME_MACOS_ONLY);
   }
 
   const terminalApp = detectTerminalApp();
@@ -230,6 +230,6 @@ export function openCommandInNewTerminalTab(command: string, tabTitle: string):
       executeAppleScript(terminalScript, 'terminal');
       break;
     default:
-      throw new ClawtError(`不支持的终端类型: ${terminalApp}`);
+      throw new ClawtError(getCurrentLanguage() === 'en' ? `Unsupported terminal type: ${terminalApp}` : `不支持的终端类型: ${terminalApp}`);
   }
 }

package/src/utils/ui-prompts.ts

@@ -5,6 +5,7 @@ import {
 } from '../constants/index.js';
 import type { WorktreeInfo } from '../types/index.js';
 import { groupWorktreesByDate, buildGroupedChoices, buildGroupMembershipMap } from './worktree-matcher.js';
+import { getCurrentLanguage } from './i18n.js';
 import { isNonInteractive } from './interactive.js';
 import { ClawtError } from '../errors/index.js';
 
@@ -45,7 +46,7 @@ export type GroupedChoice = { name: string; message: string } | MultiSelectSepar
 export async function promptSelectBranch(worktrees: WorktreeInfo[], message: string): Promise<WorktreeInfo> {
   // 非交互模式下无法进行交互选择，要求用户通过 -b 精确指定
   if (isNonInteractive()) {
-    throw new ClawtError('非交互模式下无法进行分支选择，请通过 -b 参数精确指定分支名');
+    throw new ClawtError(getCurrentLanguage() === 'en' ? 'Non-interactive mode cannot select branch, please specify branch name via -b' : '非交互模式下无法进行分支选择，请通过 -b 参数精确指定分支名');
   }
   // @ts-expect-error enquirer 类型声明未导出 Select 类，但运行时存在
   const selectedBranch: string = await new Enquirer.Select({
@@ -70,7 +71,7 @@ export async function promptSelectBranch(worktrees: WorktreeInfo[], message: str
 export async function promptMultiSelectBranches(worktrees: WorktreeInfo[], message: string): Promise<WorktreeInfo[]> {
   // 非交互模式下无法进行交互多选，要求用户通过 -b 精确指定
   if (isNonInteractive()) {
-    throw new ClawtError('非交互模式下无法进行分支多选，请通过 -b 参数精确指定分支名');
+    throw new ClawtError(getCurrentLanguage() === 'en' ? 'Non-interactive mode cannot multi-select branches, please specify branch name via -b' : '非交互模式下无法进行分支多选，请通过 -b 参数精确指定分支名');
   }
   // 构建 choices 列表，顶部插入全选选项
   const branchChoices = worktrees.map((wt) => ({
@@ -143,7 +144,7 @@ export async function promptGroupedMultiSelectBranches(
 ): Promise<WorktreeInfo[]> {
   // 非交互模式下无法进行交互多选，要求用户通过 -b 精确指定
   if (isNonInteractive()) {
-    throw new ClawtError('非交互模式下无法进行分支多选，请通过 -b 参数精确指定分支名');
+    throw new ClawtError(getCurrentLanguage() === 'en' ? 'Non-interactive mode cannot multi-select branches, please specify branch name via -b' : '非交互模式下无法进行分支多选，请通过 -b 参数精确指定分支名');
   }
   const groups = groupWorktreesByDate(worktrees);
   const choices = buildGroupedChoices(groups);

package/src/utils/update-checker.ts

@@ -144,7 +144,7 @@ function printUpdateNotification(currentVersion: string, latestVersion: string):
     chalk.green(latestVersion),
   );
   const pm = detectPackageManager();
-  const updateCommand = UPDATE_COMMANDS[pm] || UPDATE_COMMANDS.npm;
+  const updateCommand = (UPDATE_COMMANDS as Record<string, string>)[pm] || UPDATE_COMMANDS.npm;
   const commandText = UPDATE_MESSAGES.UPDATE_HINT(chalk.cyan(updateCommand));
 
   const updateTextWidth = stringWidth(updateText);