clawt 3.9.13 → 3.10.1

package/src/commands/reset.ts

@@ -12,6 +12,7 @@ import {
   printSuccess,
   printInfo,
 } from '../utils/index.js';
+import { getCurrentLanguage } from '../utils/i18n.js';
 
 /**
  * 注册 reset 命令：重置主 worktree 工作区和暂存区
@@ -20,7 +21,7 @@ import {
 export function registerResetCommand(program: Command): void {
   program
     .command('reset')
-    .description('重置主 worktree 工作区和暂存区（保留 validate 快照）')
+    .description(getCurrentLanguage() === 'en' ? 'Reset main worktree working directory and staging area (preserves validate snapshots)' : '重置主 worktree 工作区和暂存区（保留 validate 快照）')
     .action(async () => {
       await handleReset();
     });
@@ -40,7 +41,7 @@ async function handleReset(): Promise<void> {
     if (getConfigValue('confirmDestructiveOps')) {
       const confirmed = await confirmDestructiveAction(
         'git reset --hard + git clean -fd',
-        '丢弃所有未提交的更改',
+        getCurrentLanguage() === 'en' ? 'Discard all uncommitted changes' : '丢弃所有未提交的更改',
       );
       if (!confirmed) {
         printInfo(MESSAGES.DESTRUCTIVE_OP_CANCELLED);

package/src/commands/resume.ts

@@ -23,6 +23,7 @@ import {
   executeBatchTasks,
 } from '../utils/index.js';
 import type { WorktreeMultiResolveMessages } from '../utils/index.js';
+import { getCurrentLanguage } from '../utils/i18n.js';
 
 /** resume 命令的多选分支解析消息配置 */
 const RESUME_RESOLVE_MESSAGES: WorktreeMultiResolveMessages = {
@@ -39,11 +40,11 @@ const RESUME_RESOLVE_MESSAGES: WorktreeMultiResolveMessages = {
 export function registerResumeCommand(program: Command): void {
   program
     .command('resume')
-    .description('在已有 worktree 中恢复 Claude Code 会话（支持多选批量恢复）')
-    .option('-b, --branch <branchName>', '要恢复的分支名（支持模糊匹配，不传则列出所有分支）')
-    .option('--prompt <content>', '非交互式追问（需配合 -b 指定分支）')
-    .option('-f, --file <path>', '从任务文件批量追问（通过 branch 名匹配已有 worktree）')
-    .option('-c, --concurrency <n>', '批量追问最大并发数，0 表示不限制')
+    .description(getCurrentLanguage() === 'en' ? 'Resume Claude Code sessions in existing worktrees (supports multi-select batch resume)' : '在已有 worktree 中恢复 Claude Code 会话（支持多选批量恢复）')
+    .option('-b, --branch <branchName>', getCurrentLanguage() === 'en' ? 'Branch name to resume (supports fuzzy match, lists all branches if not provided)' : '要恢复的分支名（支持模糊匹配，不传则列出所有分支）')
+    .option('--prompt <content>', getCurrentLanguage() === 'en' ? 'Non-interactive follow-up prompt (requires -b to specify branch)' : '非交互式追问（需配合 -b 指定分支）')
+    .option('-f, --file <path>', getCurrentLanguage() === 'en' ? 'Batch follow-up from task file (matches existing worktrees by branch name)' : '从任务文件批量追问（通过 branch 名匹配已有 worktree）')
+    .option('-c, --concurrency <n>', getCurrentLanguage() === 'en' ? 'Max concurrency for batch follow-ups, 0 means unlimited' : '批量追问最大并发数，0 表示不限制')
     .action(async (options: ResumeOptions) => {
       await handleResume(options);
     });
@@ -179,9 +180,11 @@ async function handleNonInteractiveBatchResume(filePath: string, options: Resume
  * @param {Map<string, boolean>} sessionMap - worktree 路径 → 是否存在历史会话的映射
  */
 function printBatchResumePreview(worktrees: WorktreeInfo[], sessionMap: Map<string, boolean>): void {
-  printInfo('即将恢复的分支：');
+  printInfo(getCurrentLanguage() === 'en' ? 'Branches to resume:' : '即将恢复的分支：');
   for (const wt of worktrees) {
-    const modeLabel = sessionMap.get(wt.path) ? '继续上次对话' : '新对话';
+    const modeLabel = sessionMap.get(wt.path)
+      ? (getCurrentLanguage() === 'en' ? 'continue' : '继续上次对话')
+      : (getCurrentLanguage() === 'en' ? 'new session' : '新对话');
     printInfo(`  - ${wt.branch} (${modeLabel})`);
   }
   printInfo('');

package/src/commands/run.ts

@@ -22,6 +22,7 @@ import {
   printDryRunPreview,
   runPostCreateHooks,
 } from '../utils/index.js';
+import { getCurrentLanguage } from '../utils/i18n.js';
 
 /**
  * 注册 run 命令：批量创建 worktree + 启动 Claude Code 执行任务（支持任务文件）
@@ -30,13 +31,13 @@ import {
 export function registerRunCommand(program: Command): void {
   program
     .command('run')
-    .description('批量创建 worktree + 启动 Claude Code 执行任务（支持任务文件）')
-    .option('-b, --branch <branchName>', '分支名')
-    .option('--tasks <task...>', '任务列表（可多次指定），不传则在 worktree 中打开 Claude Code 交互式界面')
-    .option('-c, --concurrency <n>', '最大并发数，0 表示不限制')
-    .option('-f, --file <path>', '从任务文件读取任务列表（与 --tasks 互斥）')
-    .option('--dry-run', '预览模式，仅展示任务计划不实际执行')
-    .option('--post-create', '执行 postCreate hook（默认开启，--no-post-create 跳过）', true)
+    .description(getCurrentLanguage() === 'en' ? 'Batch create worktrees + launch Claude Code to execute tasks (supports task files)' : '批量创建 worktree + 启动 Claude Code 执行任务（支持任务文件）')
+    .option('-b, --branch <branchName>', getCurrentLanguage() === 'en' ? 'Branch name' : '分支名')
+    .option('--tasks <task...>', getCurrentLanguage() === 'en' ? 'Task list (can be specified multiple times); opens Claude Code interactive UI in worktree if omitted' : '任务列表（可多次指定），不传则在 worktree 中打开 Claude Code 交互式界面')
+    .option('-c, --concurrency <n>', getCurrentLanguage() === 'en' ? 'Max concurrency, 0 means unlimited' : '最大并发数，0 表示不限制')
+    .option('-f, --file <path>', getCurrentLanguage() === 'en' ? 'Read task list from file (mutually exclusive with --tasks)' : '从任务文件读取任务列表（与 --tasks 互斥）')
+    .option('--dry-run', getCurrentLanguage() === 'en' ? 'Preview mode, show task plan without executing' : '预览模式，仅展示任务计划不实际执行')
+    .option('--post-create', getCurrentLanguage() === 'en' ? 'Execute postCreate hook (enabled by default, use --no-post-create to skip)' : '执行 postCreate hook（默认开启，--no-post-create 跳过）', true)
     .action(async (options: RunOptions) => {
       await handleRun(options);
     });

package/src/commands/status.ts

@@ -24,6 +24,7 @@ import {
   loadProjectConfig,
   checkBranchExists,
 } from '../utils/index.js';
+import { getCurrentLanguage } from '../utils/i18n.js';
 
 /**
  * 注册 status 命令：显示项目全局状态总览
@@ -32,9 +33,9 @@ import {
 export function registerStatusCommand(program: Command): void {
   program
     .command('status')
-    .description('显示项目全局状态总览（支持 --json 格式输出）')
-    .option('--json', '以 JSON 格式输出')
-    .option('-i, --interactive', '交互式面板模式')
+    .description(getCurrentLanguage() === 'en' ? 'Show project global status overview (supports --json output)' : '显示项目全局状态总览（支持 --json 格式输出）')
+    .option('--json', getCurrentLanguage() === 'en' ? 'Output in JSON format' : '以 JSON 格式输出')
+    .option('-i, --interactive', getCurrentLanguage() === 'en' ? 'Interactive panel mode' : '交互式面板模式')
     .action(async (options: StatusOptions) => {
       await handleStatus(options);
     });
@@ -291,12 +292,13 @@ function printStatusAsText(result: StatusResult): void {
  * @param {MainWorktreeStatus} main - 主 worktree 状态
  */
 function printMainSection(main: MainWorktreeStatus): void {
+  const lang = getCurrentLanguage();
   printInfo(`  ${chalk.bold('◆')} ${chalk.bold(MESSAGES.STATUS_MAIN_SECTION)}`);
-  printInfo(`    分支: ${chalk.bold(main.branch)}`);
+  printInfo(`    ${lang === 'en' ? 'Branch' : '分支'}: ${chalk.bold(main.branch)}`);
   if (main.isClean) {
-    printInfo(`    状态: ${chalk.green('✓ 干净')}`);
+    printInfo(`    ${lang === 'en' ? 'Status' : '状态'}: ${chalk.green(lang === 'en' ? '✓ Clean' : '✓ 干净')}`);
   } else {
-    printInfo(`    状态: ${chalk.yellow('✗ 有未提交修改')}`);
+    printInfo(`    ${lang === 'en' ? 'Status' : '状态'}: ${chalk.yellow(lang === 'en' ? '✗ Uncommitted changes' : '✗ 有未提交修改')}`);
   }
 
   // 配置分支信息展示
@@ -319,7 +321,8 @@ function printMainSection(main: MainWorktreeStatus): void {
  * @param {number} total - worktree 总数
  */
 function printWorktreesSection(worktrees: WorktreeDetailedStatus[], total: number): void {
-  printInfo(`  ${chalk.bold('◆')} ${chalk.bold(MESSAGES.STATUS_WORKTREES_SECTION)} (${total} 个)`);
+  const lang = getCurrentLanguage();
+  printInfo(`  ${chalk.bold('◆')} ${chalk.bold(MESSAGES.STATUS_WORKTREES_SECTION)} (${total} ${lang === 'en' ? 'items' : '个'})`);
   printInfo('');
 
   if (worktrees.length === 0) {
@@ -337,6 +340,7 @@ function printWorktreesSection(worktrees: WorktreeDetailedStatus[], total: numbe
  * @param {WorktreeDetailedStatus} wt - worktree 详细状态
  */
 function printWorktreeItem(wt: WorktreeDetailedStatus): void {
+  const lang = getCurrentLanguage();
   // 分支名 + 变更状态标签
   const statusLabel = formatChangeStatusLabel(wt.changeStatus);
   printInfo(`  ${chalk.bold('●')} ${chalk.bold(wt.branch)}   [${statusLabel}]`);
@@ -348,14 +352,14 @@ function printWorktreeItem(wt: WorktreeDetailedStatus): void {
 
   // 本地提交数
   if (wt.commitsAhead > 0) {
-    printInfo(`    ${chalk.yellow(`${wt.commitsAhead} 个本地提交`)}`);
+    printInfo(`    ${chalk.yellow(lang === 'en' ? `${wt.commitsAhead} local commit(s)` : `${wt.commitsAhead} 个本地提交`)}`);
   }
 
   // 与主分支的同步状态
   if (wt.commitsBehind > 0) {
-    printInfo(`    ${chalk.yellow(`落后主分支 ${wt.commitsBehind} 个提交`)}`);
+    printInfo(`    ${chalk.yellow(lang === 'en' ? `Behind main by ${wt.commitsBehind} commit(s)` : `落后主分支 ${wt.commitsBehind} 个提交`)}`);
   } else {
-    printInfo(`    ${chalk.green('与主分支同步')}`);
+    printInfo(`    ${chalk.green(lang === 'en' ? 'In sync with main' : '与主分支同步')}`);
   }
 
   // 分支创建时间
@@ -402,7 +406,8 @@ function formatChangeStatusLabel(status: WorktreeDetailedStatus['changeStatus'])
  * @param {SnapshotSummary} snapshots - 快照摘要信息
  */
 function printSnapshotsSection(snapshots: SnapshotSummary): void {
-  printInfo(`  ${chalk.bold('◆')} ${chalk.bold(MESSAGES.STATUS_SNAPSHOTS_SECTION)} (${snapshots.total} 个)`);
+  const lang = getCurrentLanguage();
+  printInfo(`  ${chalk.bold('◆')} ${chalk.bold(MESSAGES.STATUS_SNAPSHOTS_SECTION)} (${snapshots.total} ${lang === 'en' ? 'items' : '个'})`);
   if (snapshots.orphaned > 0) {
     printInfo(`    ${chalk.yellow(MESSAGES.STATUS_SNAPSHOT_ORPHANED(snapshots.orphaned))}`);
   }

package/src/commands/sync.ts

@@ -23,6 +23,7 @@ import {
   buildAutoSaveCommitMessage,
 } from '../utils/index.js';
 import type { WorktreeResolveMessages } from '../utils/index.js';
+import { getCurrentLanguage } from '../utils/i18n.js';
 
 /**
  * 注册 sync 命令：将主分支最新代码同步到目标 worktree（含验证分支重建）
@@ -31,8 +32,8 @@ import type { WorktreeResolveMessages } from '../utils/index.js';
 export function registerSyncCommand(program: Command): void {
   program
     .command('sync')
-    .description('将主分支最新代码同步到目标 worktree')
-    .option('-b, --branch <branchName>', '要同步的分支名（支持模糊匹配，不传则列出所有分支）')
+    .description(getCurrentLanguage() === 'en' ? 'Sync the latest code from the main branch to the target worktree' : '将主分支最新代码同步到目标 worktree')
+    .option('-b, --branch <branchName>', getCurrentLanguage() === 'en' ? 'Branch name to sync (supports fuzzy match, lists all branches if not provided)' : '要同步的分支名（支持模糊匹配，不传则列出所有分支）')
     .action(async (options: SyncOptions) => {
       await handleSync(options);
     });
@@ -75,7 +76,7 @@ function mergeMainBranch(worktreePath: string, mainBranch: string): boolean {
       return true;
     }
     // 非冲突错误则向上抛出
-    throw new ClawtError(`合并 ${mainBranch} 失败`);
+    throw new ClawtError(getCurrentLanguage() === 'en' ? `Merge of ${mainBranch} failed` : `合并 ${mainBranch} 失败`);
   }
 }
 

package/src/commands/tasks.ts

@@ -1,10 +1,12 @@
 import { resolve, dirname, join } from 'node:path';
 import { existsSync, writeFileSync } from 'node:fs';
 import type { Command } from 'commander';
-import { MESSAGES, TASK_TEMPLATE_OUTPUT_DIR, TASK_TEMPLATE_FILENAME_PREFIX, TASK_TEMPLATE_CONTENT } from '../constants/index.js';
+import { MESSAGES, TASK_TEMPLATE_OUTPUT_DIR, TASK_TEMPLATE_FILENAME_PREFIX } from '../constants/index.js';
+import { getTaskTemplateContent } from '../constants/tasks-template.js';
 import { ClawtError } from '../errors/index.js';
 import { logger } from '../logger/index.js';
 import { printSuccess, printHint, ensureDir, generateTaskFilename } from '../utils/index.js';
+import { getCurrentLanguage } from '../utils/i18n.js';
 
 /**
  * 注册 tasks 命令组及其子命令
@@ -13,12 +15,12 @@ import { printSuccess, printHint, ensureDir, generateTaskFilename } from '../uti
 export function registerTasksCommand(program: Command): void {
   const taskCmd = program
     .command('tasks')
-    .description('任务文件管理');
+    .description(getCurrentLanguage() === 'en' ? 'Task file management' : '任务文件管理');
 
   taskCmd
     .command('init')
-    .description('生成任务模板文件')
-    .argument('[path]', '输出文件路径')
+    .description(getCurrentLanguage() === 'en' ? 'Generate task template file' : '生成任务模板文件')
+    .argument('[path]', getCurrentLanguage() === 'en' ? 'Output file path' : '输出文件路径')
     .action(async (path?: string) => {
       // 未指定路径时，默认输出到 .clawt/tasks/ 目录下
       const filePath = path ?? join(TASK_TEMPLATE_OUTPUT_DIR, generateTaskFilename(TASK_TEMPLATE_FILENAME_PREFIX));
@@ -43,8 +45,8 @@ async function handleTasksInit(filePath: string): Promise<void> {
   // 确保父目录存在
   ensureDir(dirname(absolutePath));
 
-  // 写入模板内容
-  writeFileSync(absolutePath, TASK_TEMPLATE_CONTENT, 'utf-8');
+  // 写入模板内容（根据语言动态生成）
+  writeFileSync(absolutePath, getTaskTemplateContent(), 'utf-8');
 
   printSuccess(MESSAGES.TASK_INIT_SUCCESS(filePath));
   printHint(MESSAGES.TASK_INIT_HINT(filePath));

package/src/commands/validate.ts

@@ -37,6 +37,7 @@ import {
   removeExternalSymlinks,
 } from '../utils/index.js';
 import type { WorktreeResolveMessages } from '../utils/index.js';
+import { getCurrentLanguage } from '../utils/i18n.js';
 
 /** validate 命令的分支解析消息配置 */
 const VALIDATE_RESOLVE_MESSAGES: WorktreeResolveMessages = {
@@ -53,10 +54,10 @@ const VALIDATE_RESOLVE_MESSAGES: WorktreeResolveMessages = {
 export function registerValidateCommand(program: Command): void {
   program
     .command('validate')
-    .description('在主 worktree 验证某个 worktree 分支的变更（通过验证分支）')
-    .option('-b, --branch <branchName>', '要验证的分支名（支持模糊匹配，不传则列出所有分支）')
-    .option('--clean', '清理 validate 状态（重置主 worktree 并删除快照）')
-    .option('-r, --run <command>', 'validate 成功后在主 worktree 中执行的命令')
+    .description(getCurrentLanguage() === 'en' ? 'Validate a worktree branch\'s changes in the main worktree (via validation branch)' : '在主 worktree 验证某个 worktree 分支的变更（通过验证分支）')
+    .option('-b, --branch <branchName>', getCurrentLanguage() === 'en' ? 'Branch name to validate (supports fuzzy match, lists all branches if not provided)' : '要验证的分支名（支持模糊匹配，不传则列出所有分支）')
+    .option('--clean', getCurrentLanguage() === 'en' ? 'Clean validate state (reset main worktree and delete snapshot)' : '清理 validate 状态（重置主 worktree 并删除快照）')
+    .option('-r, --run <command>', getCurrentLanguage() === 'en' ? 'Command to execute in the main worktree after successful validation' : 'validate 成功后在主 worktree 中执行的命令')
     .action(async (options: ValidateOptions) => {
       await handleValidate(options);
     });
@@ -114,7 +115,7 @@ async function handleValidateClean(options: ValidateOptions): Promise<void> {
   if (getConfigValue('confirmDestructiveOps')) {
     const confirmed = await confirmDestructiveAction(
       'git reset --hard + git clean -fd',
-      `重置主 worktree 并删除分支 ${branchName} 的 validate 快照`,
+      getCurrentLanguage() === 'en' ? `Reset main worktree and delete validate snapshot for branch ${branchName}` : `重置主 worktree 并删除分支 ${branchName} 的 validate 快照`,
     );
     if (!confirmed) {
       printInfo(MESSAGES.DESTRUCTIVE_OP_CANCELLED);
@@ -212,7 +213,7 @@ async function handleIncrementalValidate(targetWorktreePath: string, mainWorktre
       try {
         gitReadTree(oldStagedTreeHash, mainWorktreePath);
       } catch (error) {
-        logger.warn(`恢复暂存区失败: ${error}`);
+        logger.warn(getCurrentLanguage() === 'en' ? `Failed to restore staging area: ${error}` : `恢复暂存区失败: ${error}`);
       }
     }
     printInfo(MESSAGES.INCREMENTAL_VALIDATE_NO_CHANGES(branchName));

package/src/constants/ai-prompts.ts

@@ -1,14 +1,14 @@
-/** Claude Code 冲突解决指令性 prompt */
-export const CONFLICT_RESOLVE_PROMPT = `你是一个 Git 合并冲突解决专家。当前仓库处于合并冲突状态。
+/** Claude Code 冲突解决指令性 prompt（始终英文，不跟随语言切换） */
+export const CONFLICT_RESOLVE_PROMPT = `You are a Git merge conflict resolution expert. The repository is currently in a merge conflict state.
 
-## 任务
+## Task
 
-1. 通过 git status 和 git diff 等命令，自行查看当前仓库的冲突文件列表及冲突内容
-2. 通过 git log 等命令，分析两个分支各自的变更意图
-3. 直接编辑每个冲突文件，移除所有冲突标记（<<<<<<<、=======、>>>>>>>）
-4. 保留双方有意义的变更，合理合并代码逻辑
-5. 如果两个分支修改了同一段代码但意图不同，优先保证代码的正确性和完整性
-6. 解决冲突后，确保代码语法正确、逻辑完整
-7. 不要添加任何注释说明你做了什么修改，只需要修改文件内容
+1. Use git status and git diff to examine the list of conflicted files and their contents
+2. Use git log to analyze the change intent of each branch
+3. Directly edit each conflicted file, removing all conflict markers (<<<<<<<, =======, >>>>>>>)
+4. Preserve meaningful changes from both sides, merging code logic appropriately
+5. If both branches modified the same section with different intents, prioritize code correctness and completeness
+6. After resolving conflicts, ensure code syntax is correct and logic is complete
+7. Do not add any comments explaining your modifications, only modify file contents
 
-请直接开始。`;
+Please begin.`;

package/src/constants/config.ts

@@ -1,5 +1,6 @@
 import type { ClawtConfig, ConfigDefinitions } from '../types/index.js';
 import { VALID_TERMINAL_APPS } from './terminal.js';
+import { getCurrentLanguage } from '../utils/i18n.js';
 
 /**
  * 通过 clawt 启动的 Claude Code 非交互式会话（claude -p）的 entrypoint 标识
@@ -12,6 +13,11 @@ export const CLAUDE_CODE_ENTRYPOINT_VALUE = 'cli';
  * 新增配置项时只需在此处维护，DEFAULT_CONFIG 和 CONFIG_DESCRIPTIONS 会自动同步
  */
 export const CONFIG_DEFINITIONS: ConfigDefinitions = {
+  language: {
+    defaultValue: 'en',
+    description: '界面语言：en（英文）、zh-CN（中文）',
+    allowedValues: ['en', 'zh-CN'] as const,
+  },
   autoDeleteBranch: {
     defaultValue: false,
     description: '移除 worktree 时是否自动删除对应本地分支',
@@ -89,3 +95,27 @@ export const DEFAULT_CONFIG: ClawtConfig = deriveDefaultConfig(CONFIG_DEFINITION
 
 /** 配置项描述映射 */
 export const CONFIG_DESCRIPTIONS: Record<keyof ClawtConfig, string> = deriveConfigDescriptions(CONFIG_DEFINITIONS);
+
+/** 配置项英文描述映射 */
+const CONFIG_DESCRIPTIONS_EN: Record<keyof ClawtConfig, string> = {
+  language: 'Interface language: en (English), zh-CN (Chinese)',
+  autoDeleteBranch: 'Whether to auto-delete the local branch when removing a worktree',
+  claudeCodeCommand: 'Claude Code CLI launch command',
+  autoPullPush: 'Whether to auto-run git pull and git push after merge',
+  confirmDestructiveOps: 'Whether to prompt for confirmation before destructive operations (reset, validate --clean)',
+  maxConcurrency: 'Default max concurrency for run command, 0 means unlimited',
+  terminalApp: 'Terminal app for batch resume: auto (auto-detect), iterm2, terminal, cmux (macOS)',
+  resumeInPlace: 'Whether to resume in current terminal (single select), false opens in new tab via terminalApp',
+  aliases: 'Command alias mapping',
+  autoUpdate: 'Whether to enable auto-update checks (every 24 hours via npm registry)',
+  conflictResolveMode: 'Merge conflict resolution mode: ask (prompt for AI), auto (auto AI resolve), manual (manual resolve)',
+  conflictResolveTimeoutMs: 'Claude Code conflict resolution timeout (ms), default 900000 (15 min)',
+};
+
+/**
+ * 获取国际化配置项描述映射
+ * @returns {Record<keyof ClawtConfig, string>} 当前语言的配置项描述映射
+ */
+export function getI18nConfigDescriptions(): Record<keyof ClawtConfig, string> {
+  return getCurrentLanguage() === 'en' ? CONFIG_DESCRIPTIONS_EN : CONFIG_DESCRIPTIONS;
+}

package/src/constants/index.ts

@@ -5,8 +5,8 @@ export { CONFIG_ALIAS_DISABLED_HINT } from './messages/index.js';
 export { UPDATE_MESSAGES, UPDATE_COMMANDS } from './messages/update.js';
 export { EXIT_CODES } from './exitCodes.js';
 export { ENABLE_BRACKETED_PASTE, DISABLE_BRACKETED_PASTE, PASTE_THRESHOLD_MS, VALID_TERMINAL_APPS, ITERM2_APP_PATH } from './terminal.js';
-export { DEFAULT_CONFIG, CONFIG_DESCRIPTIONS, CONFIG_DEFINITIONS, CLAUDE_CODE_ENTRYPOINT_VALUE } from './config.js';
-export { PROJECT_CONFIG_DEFINITIONS, PROJECT_DEFAULT_CONFIG, PROJECT_CONFIG_DESCRIPTIONS } from './project-config.js';
+export { DEFAULT_CONFIG, CONFIG_DESCRIPTIONS, CONFIG_DEFINITIONS, CLAUDE_CODE_ENTRYPOINT_VALUE, getI18nConfigDescriptions } from './config.js';
+export { PROJECT_CONFIG_DEFINITIONS, PROJECT_DEFAULT_CONFIG, PROJECT_CONFIG_DESCRIPTIONS, getI18nProjectConfigDescriptions } from './project-config.js';
 export { AUTO_SAVE_COMMIT_MESSAGE_PREFIX } from './git.js';
 export { DEBUG_LOG_PREFIX, DEBUG_TIMESTAMP_FORMAT } from './logger.js';
 export { UPDATE_CHECK_INTERVAL_MS, NPM_REGISTRY_URL, NPM_REGISTRY_TIMEOUT_MS, PACKAGE_NAME } from './update.js';
@@ -17,6 +17,7 @@ export {
   CURSOR_SHOW,
   TASK_STATUS_ICONS,
   TASK_STATUS_LABELS,
+  getTaskStatusLabels,
   ACTIVITY_TEXT_MAX_LENGTH,
   TEXT_ACTIVITY_PREFIX,
   RESULT_PREVIEW_MAX_LENGTH,

package/src/constants/messages/alias.ts

@@ -1,22 +1,52 @@
-/** alias 命令专属提示消息 */
-export const ALIAS_MESSAGES = {
+import { createMessages } from '../../utils/i18n.js';
+
+/** alias 命令专属提示消息（双语映射） */
+const ALIAS_MESSAGES_I18N = {
   /** 别名列表为空 */
-  ALIAS_LIST_EMPTY: '(无别名)',
+  ALIAS_LIST_EMPTY: {
+    en: '(No aliases)',
+    'zh-CN': '(无别名)',
+  },
   /** 别名设置成功 */
-  ALIAS_SET_SUCCESS: (alias: string, command: string) =>
-    `✓ 已设置别名: ${alias} → ${command}`,
+  ALIAS_SET_SUCCESS: {
+    en: (alias: string, command: string) =>
+      `✓ Alias set: ${alias} → ${command}`,
+    'zh-CN': (alias: string, command: string) =>
+      `✓ 已设置别名: ${alias} → ${command}`,
+  },
   /** 别名移除成功 */
-  ALIAS_REMOVE_SUCCESS: (alias: string) =>
-    `✓ 已移除别名: ${alias}`,
+  ALIAS_REMOVE_SUCCESS: {
+    en: (alias: string) =>
+      `✓ Alias removed: ${alias}`,
+    'zh-CN': (alias: string) =>
+      `✓ 已移除别名: ${alias}`,
+  },
   /** 别名不存在 */
-  ALIAS_NOT_FOUND: (alias: string) =>
-    `别名 "${alias}" 不存在`,
+  ALIAS_NOT_FOUND: {
+    en: (alias: string) =>
+      `Alias "${alias}" does not exist`,
+    'zh-CN': (alias: string) =>
+      `别名 "${alias}" 不存在`,
+  },
   /** 别名与内置命令冲突 */
-  ALIAS_CONFLICTS_BUILTIN: (alias: string) =>
-    `别名 "${alias}" 与内置命令冲突，不允许覆盖内置命令`,
+  ALIAS_CONFLICTS_BUILTIN: {
+    en: (alias: string) =>
+      `Alias "${alias}" conflicts with a built-in command. Overriding built-in commands is not allowed`,
+    'zh-CN': (alias: string) =>
+      `别名 "${alias}" 与内置命令冲突，不允许覆盖内置命令`,
+  },
   /** 目标命令不存在 */
-  ALIAS_TARGET_NOT_FOUND: (command: string) =>
-    `目标命令 "${command}" 不存在，请指定已注册的内置命令名`,
+  ALIAS_TARGET_NOT_FOUND: {
+    en: (command: string) =>
+      `Target command "${command}" does not exist. Please specify a registered built-in command name`,
+    'zh-CN': (command: string) =>
+      `目标命令 "${command}" 不存在，请指定已注册的内置命令名`,
+  },
   /** 别名列表标题 */
-  ALIAS_LIST_TITLE: '当前别名列表：',
+  ALIAS_LIST_TITLE: {
+    en: 'Current aliases:',
+    'zh-CN': '当前别名列表：',
+  },
 } as const;
+
+export const ALIAS_MESSAGES = createMessages(ALIAS_MESSAGES_I18N);

package/src/constants/messages/cli-descriptions.ts

@@ -0,0 +1,91 @@
+import { createMessages } from '../../utils/i18n.js';
+
+/** Commander description/option 文本（双语映射） */
+const CLI_DESCRIPTIONS_I18N = {
+  // 主程序
+  PROGRAM_DESC: {
+    en: 'Run multiple Claude Code Agent tasks in parallel based on Git Worktree',
+    'zh-CN': '本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具',
+  },
+  OPTION_DEBUG: {
+    en: 'Output debug information to terminal',
+    'zh-CN': '输出详细调试信息到终端',
+  },
+  OPTION_YES: {
+    en: 'Skip all interactive confirmations, suitable for scripts/CI',
+    'zh-CN': '跳过所有交互式确认，适用于脚本/CI 环境',
+  },
+  // config 命令
+  CONFIG_DESC: { en: 'Interactively view and modify global configuration', 'zh-CN': '交互式查看和修改全局配置' },
+  CONFIG_RESET_DESC: { en: 'Reset configuration to defaults', 'zh-CN': '将配置恢复为默认值' },
+  CONFIG_SET_DESC: { en: 'Set a configuration item (interactive without args)', 'zh-CN': '修改配置项（无参数进入交互式配置）' },
+  CONFIG_GET_DESC: { en: 'Get a configuration item value', 'zh-CN': '获取单个配置项的值' },
+  // init 命令
+  INIT_DESC: { en: 'Initialize project-level configuration, set main work branch', 'zh-CN': '初始化项目级配置，设置主工作分支' },
+  INIT_OPTION_BRANCH: { en: 'Specify main work branch name (defaults to current branch)', 'zh-CN': '指定主工作分支名（默认使用当前分支）' },
+  INIT_SHOW_DESC: { en: 'Interactively view and modify project configuration (supports --json)', 'zh-CN': '交互式查看和修改项目配置（支持 --json 格式输出）' },
+  INIT_OPTION_JSON: { en: 'Output in JSON format', 'zh-CN': '以 JSON 格式输出' },
+  // create 命令
+  CREATE_DESC: { en: 'Batch create worktrees and branches (with validate branches)', 'zh-CN': '批量创建 worktree 及对应分支（含验证分支）' },
+  CREATE_OPTION_NUMBER: { en: 'Number of worktrees to create', 'zh-CN': '创建数量' },
+  CREATE_OPTION_POST_CREATE: { en: 'Run postCreate hook (default on, --no-post-create to skip)', 'zh-CN': '执行 postCreate hook（默认开启，--no-post-create 跳过）' },
+  // run 命令
+  RUN_DESC: { en: 'Batch create worktrees + run Claude Code tasks (supports task files)', 'zh-CN': '批量创建 worktree + 启动 Claude Code 执行任务（支持任务文件）' },
+  RUN_OPTION_BRANCH: { en: 'Branch name', 'zh-CN': '分支名' },
+  RUN_OPTION_TASKS: { en: 'Task list (can be specified multiple times)', 'zh-CN': '任务列表（可多次指定），不传则在 worktree 中打开 Claude Code 交互式界面' },
+  RUN_OPTION_CONCURRENCY: { en: 'Max concurrency, 0 means unlimited', 'zh-CN': '最大并发数，0 表示不限制' },
+  RUN_OPTION_FILE: { en: 'Read task list from file (mutually exclusive with --tasks)', 'zh-CN': '从任务文件读取任务列表（与 --tasks 互斥）' },
+  RUN_OPTION_DRY_RUN: { en: 'Preview mode, show task plan without executing', 'zh-CN': '预览模式，仅展示任务计划不实际执行' },
+  RUN_OPTION_POST_CREATE: { en: 'Run postCreate hook (default on, --no-post-create to skip)', 'zh-CN': '执行 postCreate hook（默认开启，--no-post-create 跳过）' },
+  // validate 命令
+  VALIDATE_DESC: { en: 'Validate a worktree branch changes in the main worktree', 'zh-CN': '在主 worktree 验证某个 worktree 分支的变更（通过验证分支）' },
+  VALIDATE_OPTION_BRANCH: { en: 'Branch name to validate (supports fuzzy match)', 'zh-CN': '要验证的分支名（支持模糊匹配，不传则列出所有分支）' },
+  VALIDATE_OPTION_CLEAN: { en: 'Clean up validate state (reset main worktree and delete snapshots)', 'zh-CN': '清理 validate 状态（重置主 worktree 并删除快照）' },
+  VALIDATE_OPTION_RUN: { en: 'Command to run in main worktree after successful validation', 'zh-CN': 'validate 成功后在主 worktree 中执行的命令' },
+  // merge 命令
+  MERGE_DESC: { en: 'Merge a validated worktree branch into the main worktree', 'zh-CN': '合并某个已验证的 worktree 分支到主 worktree' },
+  MERGE_OPTION_BRANCH: { en: 'Branch to merge (supports fuzzy match)', 'zh-CN': '要合并的分支名（支持模糊匹配，不传则列出所有分支供选择）' },
+  MERGE_OPTION_MESSAGE: { en: 'Commit message (required if target worktree has modifications)', 'zh-CN': '提交信息（目标 worktree 工作区有修改时必填）' },
+  MERGE_OPTION_AUTO: { en: 'Auto-resolve conflicts with AI without asking', 'zh-CN': '遇到冲突直接调用 AI 解决，不再询问' },
+  // remove 命令
+  REMOVE_DESC: { en: 'Remove worktree (supports fuzzy match/multi-select/all)', 'zh-CN': '移除 worktree（支持模糊匹配/多选/全部）' },
+  REMOVE_OPTION_ALL: { en: 'Remove all worktrees for the current project', 'zh-CN': '移除当前项目下所有 worktree' },
+  REMOVE_OPTION_BRANCH: { en: 'Branch name (supports fuzzy match)', 'zh-CN': '指定分支名（支持模糊匹配，不传则列出所有分支）' },
+  // resume 命令
+  RESUME_DESC: { en: 'Resume a Claude Code session in an existing worktree', 'zh-CN': '在已有 worktree 中恢复 Claude Code 会话（支持多选批量恢复）' },
+  RESUME_OPTION_BRANCH: { en: 'Branch to resume (supports fuzzy match)', 'zh-CN': '要恢复的分支名（支持模糊匹配，不传则列出所有分支）' },
+  RESUME_OPTION_PROMPT: { en: 'Non-interactive follow-up (requires -b)', 'zh-CN': '非交互式追问（需配合 -b 指定分支）' },
+  RESUME_OPTION_FILE: { en: 'Batch follow-up from task file (matches by branch name)', 'zh-CN': '从任务文件批量追问（通过 branch 名匹配已有 worktree）' },
+  RESUME_OPTION_CONCURRENCY: { en: 'Max concurrency for batch follow-up, 0 means unlimited', 'zh-CN': '批量追问最大并发数，0 表示不限制' },
+  // sync 命令
+  SYNC_DESC: { en: 'Sync main branch code to target worktree', 'zh-CN': '将主分支最新代码同步到目标 worktree' },
+  SYNC_OPTION_BRANCH: { en: 'Branch to sync (supports fuzzy match)', 'zh-CN': '要同步的分支名（支持模糊匹配，不传则列出所有分支）' },
+  // status 命令
+  STATUS_DESC: { en: 'Show project status overview (supports --json)', 'zh-CN': '显示项目全局状态总览（支持 --json 格式输出）' },
+  STATUS_OPTION_JSON: { en: 'Output in JSON format', 'zh-CN': '以 JSON 格式输出' },
+  STATUS_OPTION_INTERACTIVE: { en: 'Interactive panel mode', 'zh-CN': '交互式面板模式' },
+  // list 命令
+  LIST_DESC: { en: 'List all worktrees (supports --json)', 'zh-CN': '列出当前项目所有 worktree（支持 --json 格式输出）' },
+  LIST_OPTION_JSON: { en: 'Output in JSON format', 'zh-CN': '以 JSON 格式输出' },
+  // reset 命令
+  RESET_DESC: { en: 'Reset main worktree working directory and staging area', 'zh-CN': '重置主 worktree 工作区和暂存区（保留 validate 快照）' },
+  // home 命令
+  HOME_DESC: { en: 'Switch back to the main work branch', 'zh-CN': '切换回主工作分支' },
+  // projects 命令
+  PROJECTS_DESC: { en: 'Show worktree overview across projects', 'zh-CN': '展示所有项目的 worktree 概览，或查看指定项目的 worktree 详情' },
+  PROJECTS_OPTION_JSON: { en: 'Output in JSON format', 'zh-CN': '以 JSON 格式输出' },
+  // alias 命令
+  ALIAS_DESC: { en: 'Manage command aliases (list / set / remove)', 'zh-CN': '管理命令别名（列出 / 设置 / 移除）' },
+  ALIAS_LIST_DESC: { en: 'List all aliases', 'zh-CN': '列出所有别名' },
+  ALIAS_SET_DESC: { en: 'Set a command alias', 'zh-CN': '设置命令别名' },
+  ALIAS_REMOVE_DESC: { en: 'Remove a command alias', 'zh-CN': '移除命令别名' },
+  // completion 命令
+  COMPLETION_DESC: { en: 'Internal dynamic completion method (not public)', 'zh-CN': '内部使用的动态补全方法，不对外公开' },
+  // tasks 命令
+  TASKS_DESC: { en: 'Task file management', 'zh-CN': '任务文件管理' },
+  TASKS_INIT_DESC: { en: 'Generate task template file', 'zh-CN': '生成任务模板文件' },
+  // cover 命令
+  COVER_DESC: { en: 'Cover validate branch changes back to target worktree', 'zh-CN': '将验证分支上的修改覆盖回目标 worktree（自动推导目标分支）' },
+};
+
+export const CLI_DESCRIPTIONS = createMessages(CLI_DESCRIPTIONS_I18N);