clawt 3.4.6 → 3.5.1

package/dist/index.js

@@ -173,7 +173,22 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   /** merge 交互选择提示 */
   MERGE_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u5408\u5E76\u7684\u5206\u652F",
   /** merge 模糊匹配到多个结果提示 */
-  MERGE_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`
+  MERGE_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`,
+  /** 询问是否使用 AI 辅助解决冲突 */
+  MERGE_CONFLICT_ASK_AI: "\u68C0\u6D4B\u5230\u5408\u5E76\u51B2\u7A81\uFF0C\u662F\u5426\u4F7F\u7528 Claude Code \u81EA\u52A8\u89E3\u51B3\uFF1F",
+  /** AI 冲突解决开始 */
+  MERGE_CONFLICT_AI_START: (fileCount) => `\u6B63\u5728\u4F7F\u7528 Claude Code \u5206\u6790\u5E76\u89E3\u51B3 ${fileCount} \u4E2A\u51B2\u7A81\u6587\u4EF6...`,
+  /** AI 冲突解决成功 */
+  MERGE_CONFLICT_AI_SUCCESS: "\u2713 Claude Code \u5DF2\u6210\u529F\u89E3\u51B3\u6240\u6709\u51B2\u7A81",
+  /** AI 冲突解决后仍有未解决的冲突 */
+  MERGE_CONFLICT_AI_PARTIAL: (remaining) => `Claude Code \u5DF2\u5904\u7406\u51B2\u7A81\u6587\u4EF6\uFF0C\u4F46\u4ECD\u6709 ${remaining} \u4E2A\u6587\u4EF6\u5B58\u5728\u51B2\u7A81
+  \u8BF7\u624B\u52A8\u5904\u7406\u5269\u4F59\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue`,
+  /** AI 冲突解决失败 */
+  MERGE_CONFLICT_AI_FAILED: (errorMsg) => `Claude Code \u89E3\u51B3\u51B2\u7A81\u5931\u8D25: ${errorMsg}
+  \u8BF7\u624B\u52A8\u5904\u7406\uFF1A
+  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue`,
+  /** --auto 模式下的冲突手动解决（配置为 manual） */
+  MERGE_CONFLICT_MANUAL: "\u5408\u5E76\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u624B\u52A8\u5904\u7406\uFF1A\n  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue"
 };
 
 // src/constants/messages/validate.ts
@@ -513,6 +528,16 @@ var HOME_MESSAGES = {
   HOME_SWITCH_SUCCESS: (from, to) => `\u2713 \u5DF2\u4ECE ${from} \u5207\u6362\u5230\u4E3B\u5DE5\u4F5C\u5206\u652F ${to}`
 };
 
+// src/constants/messages/tasks.ts
+var TASKS_CMD_MESSAGES = {
+  /** 任务模板文件已存在 */
+  TASK_INIT_FILE_EXISTS: (path2) => `\u6587\u4EF6\u5DF2\u5B58\u5728: ${path2}\uFF0C\u5982\u9700\u8986\u76D6\u8BF7\u5148\u5220\u9664`,
+  /** 任务模板生成成功 */
+  TASK_INIT_SUCCESS: (path2) => `\u2713 \u4EFB\u52A1\u6A21\u677F\u5DF2\u751F\u6210: ${path2}`,
+  /** 任务模板使用提示 */
+  TASK_INIT_HINT: (path2) => `\u4F7F\u7528 clawt run -f ${path2} \u6267\u884C\u4EFB\u52A1`
+};
+
 // src/constants/messages/interactive-panel.ts
 import chalk from "chalk";
 
@@ -544,6 +569,8 @@ var PANEL_SHORTCUT_KEYS = {
 };
 var PANEL_DATE_SEPARATOR_PREFIX = "\u2550\u2550\u2550\u2550";
 var PANEL_FIXED_ROWS = 5;
+var PANEL_SEPARATOR_MAX_WIDTH = 60;
+var PANEL_DATE_COLOR = "#FF8C00";
 
 // src/constants/messages/interactive-panel.ts
 var SHORTCUT_LABELS = {
@@ -575,6 +602,10 @@ var PANEL_CONFIGURED_BRANCH = (branchName) => chalk.gray(`\u4E3B\u5DE5\u4F5C\u52
 var PANEL_CONFIGURED_BRANCH_DELETED = (branchName) => chalk.red(`\u2717 \u4E3B\u5DE5\u4F5C\u5206\u652F: ${branchName}\uFF08\u5DF2\u4E0D\u5B58\u5728\uFF09`);
 var PANEL_CONFIGURED_BRANCH_MISMATCH = (branchName) => chalk.yellow(`\u26A0 \u4E3B\u5DE5\u4F5C\u5206\u652F: ${branchName}\uFF08\u4E0D\u4E00\u81F4\uFF09`);
 var PANEL_NOT_INITIALIZED = chalk.gray("\u672A\u521D\u59CB\u5316\uFF08\u6267\u884C clawt init \u8BBE\u7F6E\u4E3B\u5DE5\u4F5C\u5206\u652F\uFF09");
+var PANEL_UNKNOWN_DATE = "\u672A\u77E5\u65E5\u671F";
+var PANEL_SYNCED_WITH_MAIN = "\u4E0E\u4E3B\u5206\u652F\u540C\u6B65";
+var PANEL_COMMITS_AHEAD = (count) => `${count} \u4E2A\u672C\u5730\u63D0\u4EA4`;
+var PANEL_COMMITS_BEHIND = (count) => `\u843D\u540E\u4E3B\u5206\u652F ${count} \u4E2A\u63D0\u4EA4`;
 
 // src/constants/messages/index.ts
 var MESSAGES = {
@@ -594,7 +625,8 @@ var MESSAGES = {
   ...COMPLETION_MESSAGES,
   ...INIT_MESSAGES,
   ...COVER_VALIDATE_MESSAGES,
-  ...HOME_MESSAGES
+  ...HOME_MESSAGES,
+  ...TASKS_CMD_MESSAGES
 };
 
 // src/constants/exitCodes.ts
@@ -650,6 +682,15 @@ var CONFIG_DEFINITIONS = {
   autoUpdate: {
     defaultValue: true,
     description: "\u662F\u5426\u542F\u7528\u81EA\u52A8\u66F4\u65B0\u68C0\u67E5\uFF08\u6BCF 24 \u5C0F\u65F6\u68C0\u67E5\u4E00\u6B21 npm registry\uFF09"
+  },
+  conflictResolveMode: {
+    defaultValue: "ask",
+    description: "merge \u51B2\u7A81\u65F6\u7684\u89E3\u51B3\u6A21\u5F0F\uFF1Aask\uFF08\u8BE2\u95EE\u662F\u5426\u4F7F\u7528 AI\uFF09\u3001auto\uFF08\u81EA\u52A8 AI \u89E3\u51B3\uFF09\u3001manual\uFF08\u624B\u52A8\u89E3\u51B3\uFF09",
+    allowedValues: ["ask", "auto", "manual"]
+  },
+  conflictResolveTimeoutMs: {
+    defaultValue: 3e5,
+    description: "Claude Code \u51B2\u7A81\u89E3\u51B3\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u9ED8\u8BA4 300000\uFF085 \u5206\u949F\uFF09"
   }
 };
 function deriveDefaultConfig(definitions) {
@@ -751,6 +792,21 @@ var GROUP_SEPARATOR_LABEL = (dateLabel, relativeTime) => `\u2550\u2550\u2550\u25
 var UNKNOWN_DATE_GROUP = "\u672A\u77E5\u65E5\u671F";
 var UNKNOWN_DATE_SEPARATOR_LABEL = `\u2550\u2550\u2550\u2550 ${chalk2.bold.hex("#FF8C00")("\u672A\u77E5\u65E5\u671F")} \u2550\u2550\u2550\u2550`;
 
+// src/constants/ai-prompts.ts
+var CONFLICT_RESOLVE_PROMPT = `\u4F60\u662F\u4E00\u4E2A Git \u5408\u5E76\u51B2\u7A81\u89E3\u51B3\u4E13\u5BB6\u3002\u5F53\u524D\u4ED3\u5E93\u5904\u4E8E\u5408\u5E76\u51B2\u7A81\u72B6\u6001\u3002
+
+## \u4EFB\u52A1
+
+1. \u901A\u8FC7 git status \u548C git diff \u7B49\u547D\u4EE4\uFF0C\u81EA\u884C\u67E5\u770B\u5F53\u524D\u4ED3\u5E93\u7684\u51B2\u7A81\u6587\u4EF6\u5217\u8868\u53CA\u51B2\u7A81\u5185\u5BB9
+2. \u901A\u8FC7 git log \u7B49\u547D\u4EE4\uFF0C\u5206\u6790\u4E24\u4E2A\u5206\u652F\u5404\u81EA\u7684\u53D8\u66F4\u610F\u56FE
+3. \u76F4\u63A5\u7F16\u8F91\u6BCF\u4E2A\u51B2\u7A81\u6587\u4EF6\uFF0C\u79FB\u9664\u6240\u6709\u51B2\u7A81\u6807\u8BB0\uFF08<<<<<<<\u3001=======\u3001>>>>>>>\uFF09
+4. \u4FDD\u7559\u53CC\u65B9\u6709\u610F\u4E49\u7684\u53D8\u66F4\uFF0C\u5408\u7406\u5408\u5E76\u4EE3\u7801\u903B\u8F91
+5. \u5982\u679C\u4E24\u4E2A\u5206\u652F\u4FEE\u6539\u4E86\u540C\u4E00\u6BB5\u4EE3\u7801\u4F46\u610F\u56FE\u4E0D\u540C\uFF0C\u4F18\u5148\u4FDD\u8BC1\u4EE3\u7801\u7684\u6B63\u786E\u6027\u548C\u5B8C\u6574\u6027
+6. \u89E3\u51B3\u51B2\u7A81\u540E\uFF0C\u786E\u4FDD\u4EE3\u7801\u8BED\u6CD5\u6B63\u786E\u3001\u903B\u8F91\u5B8C\u6574
+7. \u4E0D\u8981\u6DFB\u52A0\u4EFB\u4F55\u6CE8\u91CA\u8BF4\u660E\u4F60\u505A\u4E86\u4EC0\u4E48\u4FEE\u6539\uFF0C\u53EA\u9700\u8981\u4FEE\u6539\u6587\u4EF6\u5185\u5BB9
+
+\u8BF7\u76F4\u63A5\u5F00\u59CB\u3002`;
+
 // src/constants/pre-checks.ts
 var PRE_CHECK_CREATE = {
   requireMainWorktree: true,
@@ -777,6 +833,31 @@ var PRE_CHECK_RESUME = {
   requireClaudeCode: true
 };
 
+// src/constants/tasks-template.ts
+var TASK_TEMPLATE_OUTPUT_DIR = "clawt/tasks";
+var TASK_TEMPLATE_FILENAME_PREFIX = "clawt-tasks";
+var TASK_TEMPLATE_CONTENT = `# Clawt \u4EFB\u52A1\u6587\u4EF6
+#
+# \u4F7F\u7528\u65B9\u6CD5: clawt run -f tasks.md
+# \u683C\u5F0F\u8BF4\u660E: \u6807\u7B7E\u5916\u7684\u6587\u672C\u4F1A\u88AB\u5FFD\u7565\uFF0C\u6BCF\u4E2A\u4EFB\u52A1\u7528 START/END \u6807\u7B7E\u5305\u88F9
+#
+# \u89C4\u5219:
+#   1. \u6BCF\u4E2A\u4EFB\u52A1\u5757\u7528 <!-- CLAWT-TASKS:START --> \u548C <!-- CLAWT-TASKS:END --> \u5305\u88F9
+#   2. \u5757\u5185 # branch: <\u5206\u652F\u540D> \u58F0\u660E\u5206\u652F\u540D\uFF08\u4F7F\u7528 -b \u53C2\u6570\u65F6\u53EF\u7701\u7565\uFF09
+#   3. \u5757\u5185\u5176\u4F59\u884C\u4E3A\u4EFB\u52A1\u63CF\u8FF0\uFF08\u652F\u6301\u591A\u884C\uFF09
+
+<!-- CLAWT-TASKS:START -->
+# branch: feat-example-1
+\u5728\u8FD9\u91CC\u5199\u7B2C\u4E00\u4E2A\u4EFB\u52A1\u7684\u63CF\u8FF0
+<!-- CLAWT-TASKS:END -->
+
+<!-- CLAWT-TASKS:START -->
+# branch: feat-example-2
+\u5728\u8FD9\u91CC\u5199\u7B2C\u4E8C\u4E2A\u4EFB\u52A1\u7684\u63CF\u8FF0
+\u652F\u6301\u591A\u884C\u63CF\u8FF0
+<!-- CLAWT-TASKS:END -->
+`;
+
 // src/errors/index.ts
 var ClawtError = class extends Error {
   /** 退出码 */
@@ -900,7 +981,7 @@ function parseParallelCommands(commandString) {
 }
 function runParallelCommands(commands, options) {
   const promises = commands.map((command) => {
-    return new Promise((resolve3) => {
+    return new Promise((resolve4) => {
       logger.debug(`\u5E76\u884C\u542F\u52A8\u547D\u4EE4: ${command}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
       const child = spawn(command, {
         cwd: options?.cwd,
@@ -908,19 +989,19 @@ function runParallelCommands(commands, options) {
         shell: true
       });
       child.on("error", (err) => {
-        resolve3({ command, exitCode: 1, error: err.message });
+        resolve4({ command, exitCode: 1, error: err.message });
       });
       child.on("close", (code) => {
-        resolve3({ command, exitCode: code ?? 1 });
+        resolve4({ command, exitCode: code ?? 1 });
       });
     });
   });
   return Promise.all(promises);
 }
 
-// src/utils/git.ts
+// src/utils/git-core.ts
 import { basename } from "path";
-import { execSync as execSync2 } from "child_process";
+import { execSync as execSync2, execFileSync as execFileSync2 } from "child_process";
 function getGitCommonDir(cwd) {
   return execCommand("git rev-parse --git-common-dir", { cwd });
 }
@@ -931,26 +1012,6 @@ function getProjectName(cwd) {
   const topLevel = getGitTopLevel(cwd);
   return basename(topLevel);
 }
-function checkBranchExists(branchName, cwd) {
-  try {
-    execCommand(`git show-ref --verify refs/heads/${branchName}`, { cwd });
-    return true;
-  } catch {
-    return false;
-  }
-}
-function createWorktree(branchName, worktreePath, cwd) {
-  logger.info(`\u521B\u5EFA worktree: ${worktreePath}`);
-  execCommand(`git worktree add -b ${branchName} "${worktreePath}"`, { cwd });
-}
-function removeWorktreeByPath(worktreePath, cwd) {
-  logger.info(`\u79FB\u9664 worktree: ${worktreePath}`);
-  execCommand(`git worktree remove -f "${worktreePath}"`, { cwd });
-}
-function deleteBranch(branchName, cwd) {
-  logger.info(`\u5220\u9664\u5206\u652F: ${branchName}`);
-  execCommand(`git branch -D ${branchName}`, { cwd });
-}
 function getStatusPorcelain(cwd) {
   return execCommand("git status --porcelain", { cwd });
 }
@@ -988,32 +1049,6 @@ function gitStashPush(message, cwd) {
 function gitRestoreStaged(cwd) {
   execCommand("git restore --staged .", { cwd });
 }
-function gitWorktreeList(cwd) {
-  return execCommand("git worktree list", { cwd });
-}
-function gitWorktreePrune(cwd) {
-  execCommand("git worktree prune", { cwd });
-}
-function hasLocalCommits(branchName, cwd) {
-  try {
-    const output = execCommand(`git log HEAD..${branchName} --oneline`, { cwd });
-    return output.trim() !== "";
-  } catch {
-    return false;
-  }
-}
-function getCommitCountAhead(branchName, cwd) {
-  const output = execCommand(`git rev-list --count HEAD..${branchName}`, { cwd });
-  return parseInt(output, 10) || 0;
-}
-function getCommitCountBehind(branchName, cwd) {
-  try {
-    const output = execCommand(`git rev-list --count ${branchName}..HEAD`, { cwd });
-    return parseInt(output, 10) || 0;
-  } catch {
-    return 0;
-  }
-}
 function parseShortStat(output) {
   let insertions = 0;
   let deletions = 0;
@@ -1034,9 +1069,6 @@ function getDiffStat(worktreePath) {
 function gitApplyCachedFromStdin(patchContent, cwd) {
   execCommandWithInput("git", ["apply", "--cached"], { input: patchContent, cwd });
 }
-function getCurrentBranch(cwd) {
-  return execCommand("git rev-parse --abbrev-ref HEAD", { cwd });
-}
 function getHeadCommitHash(cwd) {
   return execCommand("git rev-parse HEAD", { cwd });
 }
@@ -1092,6 +1124,61 @@ function gitApplyCachedCheck(patchContent, cwd) {
     return false;
   }
 }
+function getConflictFiles(cwd) {
+  const status = getStatusPorcelain(cwd);
+  if (!status) return [];
+  return status.split("\n").filter((line) => /^(UU|AA|DD|DU|UD|AU|UA)/.test(line)).map((line) => line.slice(3));
+}
+function gitAddFiles(files, cwd) {
+  if (files.length === 0) return;
+  const args = ["add", "--", ...files];
+  logger.debug(`\u6267\u884C\u547D\u4EE4: git ${args.join(" ")}${cwd ? ` (cwd: ${cwd})` : ""}`);
+  execFileSync2("git", args, {
+    cwd,
+    encoding: "utf-8",
+    stdio: ["pipe", "pipe", "pipe"]
+  });
+}
+function gitMergeContinue(cwd) {
+  execCommand("GIT_EDITOR=true git merge --continue", { cwd });
+}
+
+// src/utils/git-branch.ts
+function checkBranchExists(branchName, cwd) {
+  try {
+    execCommand(`git show-ref --verify refs/heads/${branchName}`, { cwd });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function deleteBranch(branchName, cwd) {
+  logger.info(`\u5220\u9664\u5206\u652F: ${branchName}`);
+  execCommand(`git branch -D ${branchName}`, { cwd });
+}
+function hasLocalCommits(branchName, cwd) {
+  try {
+    const output = execCommand(`git log HEAD..${branchName} --oneline`, { cwd });
+    return output.trim() !== "";
+  } catch {
+    return false;
+  }
+}
+function getCommitCountAhead(branchName, cwd) {
+  const output = execCommand(`git rev-list --count HEAD..${branchName}`, { cwd });
+  return parseInt(output, 10) || 0;
+}
+function getCommitCountBehind(branchName, cwd) {
+  try {
+    const output = execCommand(`git rev-list --count ${branchName}..HEAD`, { cwd });
+    return parseInt(output, 10) || 0;
+  } catch {
+    return 0;
+  }
+}
+function getCurrentBranch(cwd) {
+  return execCommand("git rev-parse --abbrev-ref HEAD", { cwd });
+}
 function gitCheckout(branchName, cwd) {
   execCommand(`git checkout ${branchName}`, { cwd });
 }
@@ -1099,6 +1186,22 @@ function createBranch(branchName, cwd) {
   execCommand(`git branch ${branchName}`, { cwd });
 }
 
+// src/utils/git-worktree.ts
+function createWorktree(branchName, worktreePath, cwd) {
+  logger.info(`\u521B\u5EFA worktree: ${worktreePath}`);
+  execCommand(`git worktree add -b ${branchName} "${worktreePath}"`, { cwd });
+}
+function removeWorktreeByPath(worktreePath, cwd) {
+  logger.info(`\u79FB\u9664 worktree: ${worktreePath}`);
+  execCommand(`git worktree remove -f "${worktreePath}"`, { cwd });
+}
+function gitWorktreeList(cwd) {
+  return execCommand("git worktree list", { cwd });
+}
+function gitWorktreePrune(cwd) {
+  execCommand("git worktree prune", { cwd });
+}
+
 // src/utils/formatter.ts
 import chalk4 from "chalk";
 import { createInterface } from "readline";
@@ -1124,14 +1227,14 @@ function printDoubleSeparator() {
   console.log(MESSAGES.DOUBLE_SEPARATOR);
 }
 function confirmAction(question) {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const rl = createInterface({
       input: process.stdin,
       output: process.stdout
     });
     rl.question(`${question} (y/N) `, (answer) => {
       rl.close();
-      resolve3(answer.toLowerCase() === "y");
+      resolve4(answer.toLowerCase() === "y");
     });
   });
 }
@@ -1222,6 +1325,19 @@ function formatLocalISOString(date) {
   const minutes = String(absMinutes % 60).padStart(2, "0");
   return `${iso}${sign}${hours}:${minutes}`;
 }
+function generateTaskFilename(prefix) {
+  const now = /* @__PURE__ */ new Date();
+  const pad = (n) => String(n).padStart(2, "0");
+  const timestamp = [
+    now.getFullYear(),
+    pad(now.getMonth() + 1),
+    pad(now.getDate()),
+    pad(now.getHours()),
+    pad(now.getMinutes()),
+    pad(now.getSeconds())
+  ].join("-");
+  return `${prefix}-${timestamp}.md`;
+}
 
 // src/utils/branch.ts
 function sanitizeBranchName(branchName) {
@@ -1646,7 +1762,7 @@ import { existsSync as existsSync7, readdirSync as readdirSync3 } from "fs";
 import { join as join5 } from "path";
 
 // src/utils/terminal.ts
-import { execFileSync as execFileSync2 } from "child_process";
+import { execFileSync as execFileSync3 } from "child_process";
 import { existsSync as existsSync6 } from "fs";
 function isITerm2Installed() {
   return existsSync6(ITERM2_APP_PATH);
@@ -1705,7 +1821,7 @@ function openCommandInNewTerminalTab(command, tabTitle) {
   logger.debug(`\u6253\u5F00\u7EC8\u7AEF Tab [${terminalApp}]: ${tabTitle}`);
   logger.debug(`\u6267\u884C\u547D\u4EE4: ${command}`);
   try {
-    execFileSync2("osascript", ["-e", script], {
+    execFileSync3("osascript", ["-e", script], {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -1865,15 +1981,10 @@ function removeProjectSnapshots(projectName) {
 }
 
 // src/utils/worktree-matcher.ts
-import Enquirer3 from "enquirer";
 import { statSync as statSync3 } from "fs";
-function findExactMatch(worktrees, branchName) {
-  return worktrees.find((wt) => wt.branch === branchName);
-}
-function findFuzzyMatches(worktrees, keyword) {
-  const lowerKeyword = keyword.toLowerCase();
-  return worktrees.filter((wt) => wt.branch.toLowerCase().includes(lowerKeyword));
-}
+
+// src/utils/ui-prompts.ts
+import Enquirer3 from "enquirer";
 async function promptSelectBranch(worktrees, message) {
   const selectedBranch = await new Enquirer3.Select({
     message,
@@ -1923,6 +2034,77 @@ async function promptMultiSelectBranches(worktrees, message) {
   }).run();
   return worktrees.filter((wt) => selectedBranches.includes(wt.branch));
 }
+async function promptGroupedMultiSelectBranches(worktrees, message) {
+  const groups = groupWorktreesByDate(worktrees);
+  const choices = buildGroupedChoices(groups);
+  const groupMembershipMap = buildGroupMembershipMap(groups);
+  const groupSelectAllNames = new Set(groupMembershipMap.keys());
+  const allBranchNames = new Set(worktrees.map((wt) => wt.branch));
+  const MultiSelect = Enquirer3.MultiSelect;
+  class MultiSelectWithGroupSelectAll extends MultiSelect {
+    space() {
+      if (!this.focused) return;
+      const focusedName = this.focused.name;
+      if (focusedName === SELECT_ALL_NAME) {
+        const willEnable = !this.focused.enabled;
+        for (const ch of this.choices) {
+          ch.enabled = willEnable;
+        }
+        return this.render();
+      }
+      if (groupSelectAllNames.has(focusedName)) {
+        const willEnable = !this.focused.enabled;
+        const memberNames = groupMembershipMap.get(focusedName);
+        this.focused.enabled = willEnable;
+        for (const ch of this.choices) {
+          if (memberNames.includes(ch.name)) {
+            ch.enabled = willEnable;
+          }
+        }
+        syncGlobalSelectAll(this.choices);
+        return this.render();
+      }
+      this.toggle(this.focused);
+      syncGroupSelectAll(this.choices, focusedName);
+      syncGlobalSelectAll(this.choices);
+      return this.render();
+    }
+  }
+  function syncGlobalSelectAll(choiceList) {
+    const selectAllChoice = choiceList.find((ch) => ch.name === SELECT_ALL_NAME);
+    if (!selectAllChoice) return;
+    const branchItems = choiceList.filter((ch) => allBranchNames.has(ch.name));
+    selectAllChoice.enabled = branchItems.length > 0 && branchItems.every((ch) => ch.enabled);
+  }
+  function syncGroupSelectAll(choiceList, branchName) {
+    for (const [groupName, memberNames] of groupMembershipMap) {
+      if (!memberNames.includes(branchName)) continue;
+      const groupChoice = choiceList.find((ch) => ch.name === groupName);
+      if (!groupChoice) continue;
+      const memberChoices = choiceList.filter((ch) => memberNames.includes(ch.name));
+      groupChoice.enabled = memberChoices.length > 0 && memberChoices.every((ch) => ch.enabled);
+      break;
+    }
+  }
+  const selectedBranches = await new MultiSelectWithGroupSelectAll({
+    message,
+    choices,
+    // 使用空心圆/实心圆作为选中指示符
+    symbols: {
+      indicator: { on: "\u25CF", off: "\u25CB" }
+    }
+  }).run();
+  return worktrees.filter((wt) => selectedBranches.includes(wt.branch));
+}
+
+// src/utils/worktree-matcher.ts
+function findExactMatch(worktrees, branchName) {
+  return worktrees.find((wt) => wt.branch === branchName);
+}
+function findFuzzyMatches(worktrees, keyword) {
+  const lowerKeyword = keyword.toLowerCase();
+  return worktrees.filter((wt) => wt.branch.toLowerCase().includes(lowerKeyword));
+}
 async function resolveTargetWorktrees(worktrees, messages, branchName) {
   if (worktrees.length === 0) {
     throw new ClawtError(messages.noWorktrees);
@@ -2050,68 +2232,6 @@ function buildGroupMembershipMap(groups) {
   }
   return map;
 }
-async function promptGroupedMultiSelectBranches(worktrees, message) {
-  const groups = groupWorktreesByDate(worktrees);
-  const choices = buildGroupedChoices(groups);
-  const groupMembershipMap = buildGroupMembershipMap(groups);
-  const groupSelectAllNames = new Set(groupMembershipMap.keys());
-  const allBranchNames = new Set(worktrees.map((wt) => wt.branch));
-  const MultiSelect = Enquirer3.MultiSelect;
-  class MultiSelectWithGroupSelectAll extends MultiSelect {
-    space() {
-      if (!this.focused) return;
-      const focusedName = this.focused.name;
-      if (focusedName === SELECT_ALL_NAME) {
-        const willEnable = !this.focused.enabled;
-        for (const ch of this.choices) {
-          ch.enabled = willEnable;
-        }
-        return this.render();
-      }
-      if (groupSelectAllNames.has(focusedName)) {
-        const willEnable = !this.focused.enabled;
-        const memberNames = groupMembershipMap.get(focusedName);
-        this.focused.enabled = willEnable;
-        for (const ch of this.choices) {
-          if (memberNames.includes(ch.name)) {
-            ch.enabled = willEnable;
-          }
-        }
-        syncGlobalSelectAll(this.choices);
-        return this.render();
-      }
-      this.toggle(this.focused);
-      syncGroupSelectAll(this.choices, focusedName);
-      syncGlobalSelectAll(this.choices);
-      return this.render();
-    }
-  }
-  function syncGlobalSelectAll(choiceList) {
-    const selectAllChoice = choiceList.find((ch) => ch.name === SELECT_ALL_NAME);
-    if (!selectAllChoice) return;
-    const branchItems = choiceList.filter((ch) => allBranchNames.has(ch.name));
-    selectAllChoice.enabled = branchItems.length > 0 && branchItems.every((ch) => ch.enabled);
-  }
-  function syncGroupSelectAll(choiceList, branchName) {
-    for (const [groupName, memberNames] of groupMembershipMap) {
-      if (!memberNames.includes(branchName)) continue;
-      const groupChoice = choiceList.find((ch) => ch.name === groupName);
-      if (!groupChoice) continue;
-      const memberChoices = choiceList.filter((ch) => memberNames.includes(ch.name));
-      groupChoice.enabled = memberChoices.length > 0 && memberChoices.every((ch) => ch.enabled);
-      break;
-    }
-  }
-  const selectedBranches = await new MultiSelectWithGroupSelectAll({
-    message,
-    choices,
-    // 使用空心圆/实心圆作为选中指示符
-    symbols: {
-      indicator: { on: "\u25CF", off: "\u25CB" }
-    }
-  }).run();
-  return worktrees.filter((wt) => selectedBranches.includes(wt.branch));
-}
 
 // src/utils/progress-render.ts
 import chalk5 from "chalk";
@@ -2586,7 +2706,7 @@ function executeClaudeTask(worktree, task, onActivity) {
       stdio: ["ignore", "pipe", "pipe"]
     }
   );
-  const promise = new Promise((resolve3) => {
+  const promise = new Promise((resolve4) => {
     let stderr = "";
     let finalResult = null;
     const lineBuffer = createLineBuffer();
@@ -2622,7 +2742,7 @@ function executeClaudeTask(worktree, task, onActivity) {
       if (finalResult) {
         success = !finalResult.is_error;
       }
-      resolve3({
+      resolve4({
         task,
         branch: worktree.branch,
         worktreePath: worktree.path,
@@ -2632,7 +2752,7 @@ function executeClaudeTask(worktree, task, onActivity) {
       });
     });
     child.on("error", (err) => {
-      resolve3({
+      resolve4({
         task,
         branch: worktree.branch,
         worktreePath: worktree.path,
@@ -2691,7 +2811,7 @@ async function executeWithConcurrency(worktrees, tasks, concurrency, renderer, s
   const results = new Array(total);
   let nextIndex = 0;
   let completedCount = 0;
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     function launchNext() {
       if (nextIndex >= total || isInterrupted()) return;
       const index = nextIndex;
@@ -2712,7 +2832,7 @@ async function executeWithConcurrency(worktrees, tasks, concurrency, renderer, s
         }
         launchNext();
         if (completedCount === total) {
-          resolve3(results);
+          resolve4(results);
         }
       });
     }
@@ -2767,11 +2887,11 @@ async function executeBatchTasks(worktrees, tasks, concurrency) {
     printWarning(MESSAGES.INTERRUPTED);
     killAllChildProcesses(childProcesses);
     await Promise.allSettled(childProcesses.map(
-      (cp) => new Promise((resolve3) => {
+      (cp) => new Promise((resolve4) => {
         if (cp.exitCode !== null) {
-          resolve3();
+          resolve4();
         } else {
-          cp.on("close", () => resolve3());
+          cp.on("close", () => resolve4());
         }
       })
     ));
@@ -3013,7 +3133,7 @@ function isNewerVersion(latest, current) {
   return false;
 }
 function fetchLatestVersion() {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const req = request(NPM_REGISTRY_URL, { timeout: NPM_REGISTRY_TIMEOUT_MS }, (res) => {
       let data = "";
       res.on("data", (chunk) => {
@@ -3022,16 +3142,16 @@ function fetchLatestVersion() {
       res.on("end", () => {
         try {
           const parsed = JSON.parse(data);
-          resolve3(parsed.version ?? null);
+          resolve4(parsed.version ?? null);
         } catch {
-          resolve3(null);
+          resolve4(null);
         }
       });
     });
-    req.on("error", () => resolve3(null));
+    req.on("error", () => resolve4(null));
     req.on("timeout", () => {
       req.destroy();
-      resolve3(null);
+      resolve4(null);
     });
     req.end();
   });
@@ -3252,7 +3372,7 @@ import { createInterface as createInterface2 } from "readline";
 import chalk9 from "chalk";
 import stringWidth3 from "string-width";
 function buildSeparatorWithHint(cols, hint) {
-  const maxWidth = Math.min(cols, 60);
+  const maxWidth = Math.min(cols, PANEL_SEPARATOR_MAX_WIDTH);
   if (!hint) {
     return chalk9.gray("\u2500".repeat(maxWidth));
   }
@@ -3337,10 +3457,10 @@ function buildGroupedWorktreeLines(worktrees, selectedIndex) {
 function renderDateSeparator(dateKey) {
   const leftPad = "  ";
   if (dateKey === UNKNOWN_DATE_GROUP) {
-    return `${leftPad}${chalk9.gray(PANEL_DATE_SEPARATOR_PREFIX)} ${chalk9.bold.hex("#FF8C00")("\u672A\u77E5\u65E5\u671F")} ${chalk9.gray(PANEL_DATE_SEPARATOR_PREFIX)}`;
+    return `${leftPad}${chalk9.gray(PANEL_DATE_SEPARATOR_PREFIX)} ${chalk9.bold.hex(PANEL_DATE_COLOR)(PANEL_UNKNOWN_DATE)} ${chalk9.gray(PANEL_DATE_SEPARATOR_PREFIX)}`;
   }
   const relativeDate = formatRelativeDate(dateKey);
-  return `${leftPad}${chalk9.gray(PANEL_DATE_SEPARATOR_PREFIX)} ${chalk9.bold.hex("#FF8C00")(dateKey)}${chalk9.hex("#FF8C00")(`\uFF08${relativeDate}\uFF09`)} ${chalk9.gray(PANEL_DATE_SEPARATOR_PREFIX)}`;
+  return `${leftPad}${chalk9.gray(PANEL_DATE_SEPARATOR_PREFIX)} ${chalk9.bold.hex(PANEL_DATE_COLOR)(dateKey)}${chalk9.hex(PANEL_DATE_COLOR)(`\uFF08${relativeDate}\uFF09`)} ${chalk9.gray(PANEL_DATE_SEPARATOR_PREFIX)}`;
 }
 function renderWorktreeBlock(wt, isSelected) {
   const lines = [];
@@ -3353,12 +3473,12 @@ function renderWorktreeBlock(wt, isSelected) {
     lines.push(`${indent}${chalk9.green(`+${wt.insertions}`)} ${chalk9.red(`-${wt.deletions}`)}`);
   }
   if (wt.commitsAhead > 0) {
-    lines.push(`${indent}${chalk9.yellow(`${wt.commitsAhead} \u4E2A\u672C\u5730\u63D0\u4EA4`)}`);
+    lines.push(`${indent}${chalk9.yellow(PANEL_COMMITS_AHEAD(wt.commitsAhead))}`);
   }
   if (wt.commitsBehind > 0) {
-    lines.push(`${indent}${chalk9.yellow(`\u843D\u540E\u4E3B\u5206\u652F ${wt.commitsBehind} \u4E2A\u63D0\u4EA4`)}`);
+    lines.push(`${indent}${chalk9.yellow(PANEL_COMMITS_BEHIND(wt.commitsBehind))}`);
   } else {
-    lines.push(`${indent}${chalk9.green("\u4E0E\u4E3B\u5206\u652F\u540C\u6B65")}`);
+    lines.push(`${indent}${chalk9.green(PANEL_SYNCED_WITH_MAIN)}`);
   }
   if (wt.createdAt) {
     const relativeTime = formatRelativeTime(wt.createdAt);
@@ -3412,16 +3532,166 @@ function calculateVisibleRows(terminalRows) {
   return Math.max(terminalRows - fixedRows, 3);
 }
 
-// src/utils/interactive-panel.ts
-var InteractivePanel = class {
+// src/utils/keyboard-controller.ts
+var KeyboardController = class {
+  /** stdin 数据处理器引用（用于清理） */
+  stdinDataHandler = null;
+  /** 按键回调函数 */
+  onKeypress;
+  /**
+   * 创建键盘事件控制器
+   * @param {(data: Buffer) => void} onKeypress - 按键回调函数
+   */
+  constructor(onKeypress) {
+    this.onKeypress = onKeypress;
+  }
+  /**
+   * 启动键盘监听
+   * 将 stdin 设为 raw 模式以捕获每个按键
+   */
+  start() {
+    if (process.stdin.isTTY) {
+      process.stdin.setRawMode(true);
+    }
+    process.stdin.resume();
+    this.stdinDataHandler = (data) => {
+      this.onKeypress(data);
+    };
+    process.stdin.on("data", this.stdinDataHandler);
+  }
+  /**
+   * 停止键盘监听，恢复 stdin 状态
+   */
+  stop() {
+    if (this.stdinDataHandler) {
+      process.stdin.removeListener("data", this.stdinDataHandler);
+      this.stdinDataHandler = null;
+    }
+    if (process.stdin.isTTY) {
+      process.stdin.setRawMode(false);
+    }
+    process.stdin.pause();
+  }
+};
+
+// src/utils/interactive-panel-state.ts
+var PanelStateManager = class {
   /** 当前状态数据 */
-  statusResult;
+  statusResult = null;
   /** 当前选中的显示位置索引（对应 displayOrder 数组的下标） */
-  selectedDisplayIndex;
+  selectedDisplayIndex = 0;
   /** 显示顺序到原始索引的映射（按日期分组后的排列顺序） */
-  displayOrder;
+  displayOrder = [];
   /** 滚动偏移（基于行数） */
-  scrollOffset;
+  scrollOffset = 0;
+  /**
+   * 更新状态数据
+   * @param {StatusResult} newStatus - 新的状态数据
+   * @param {string} [previousBranch] - 刷新前选中的分支名
+   */
+  updateData(newStatus, previousBranch) {
+    this.statusResult = newStatus;
+    this.displayOrder = buildDisplayOrder(this.statusResult.worktrees);
+    if (previousBranch && this.displayOrder.length > 0) {
+      const newDisplayIndex = this.displayOrder.findIndex(
+        (origIdx) => this.statusResult.worktrees[origIdx]?.branch === previousBranch
+      );
+      if (newDisplayIndex >= 0) {
+        this.selectedDisplayIndex = newDisplayIndex;
+      } else {
+        this.selectedDisplayIndex = Math.min(this.selectedDisplayIndex, Math.max(0, this.displayOrder.length - 1));
+      }
+    } else {
+      this.selectedDisplayIndex = 0;
+    }
+  }
+  /** 获取当前状态数据 */
+  getStatusResult() {
+    return this.statusResult;
+  }
+  /** 获取当前选中的原始索引 */
+  getSelectedOriginalIndex() {
+    return this.displayOrder[this.selectedDisplayIndex] ?? -1;
+  }
+  /** 获取当前滚动偏移 */
+  getScrollOffset() {
+    return this.scrollOffset;
+  }
+  /**
+   * 向上导航
+   * @returns {boolean} 是否发生变化
+   */
+  navigateUp() {
+    if (!this.statusResult || this.displayOrder.length === 0) return false;
+    if (this.selectedDisplayIndex > 0) {
+      this.selectedDisplayIndex--;
+      this.adjustScrollForSelection();
+      return true;
+    }
+    return false;
+  }
+  /**
+   * 向下导航
+   * @returns {boolean} 是否发生变化
+   */
+  navigateDown() {
+    if (!this.statusResult || this.displayOrder.length === 0) return false;
+    if (this.selectedDisplayIndex < this.displayOrder.length - 1) {
+      this.selectedDisplayIndex++;
+      this.adjustScrollForSelection();
+      return true;
+    }
+    return false;
+  }
+  /**
+   * 获取当前选中的分支名
+   * @returns {string | null} 分支名
+   */
+  getSelectedBranch() {
+    const originalIndex = this.getSelectedOriginalIndex();
+    if (originalIndex === -1 || !this.statusResult) return null;
+    return this.statusResult.worktrees[originalIndex]?.branch || null;
+  }
+  /**
+   * 调整滚动位置以确保选中项在可见区域内
+   */
+  adjustScrollForSelection() {
+    if (!this.statusResult || this.displayOrder.length === 0) return;
+    const originalIndex = this.getSelectedOriginalIndex();
+    const rows = process.stdout.rows || 24;
+    const visibleRows = calculateVisibleRows(rows);
+    const panelLines = buildGroupedWorktreeLines(this.statusResult.worktrees, originalIndex);
+    let firstLine = -1;
+    let lastLine = -1;
+    for (let i = 0; i < panelLines.length; i++) {
+      if (panelLines[i].worktreeIndex === originalIndex) {
+        if (firstLine === -1) firstLine = i;
+        lastLine = i;
+      }
+    }
+    if (firstLine === -1) return;
+    let groupStart = firstLine;
+    while (groupStart > 0 && panelLines[groupStart - 1].type === "separator") {
+      groupStart--;
+    }
+    if (groupStart < this.scrollOffset) {
+      this.scrollOffset = groupStart;
+    }
+    if (lastLine >= this.scrollOffset + visibleRows) {
+      this.scrollOffset = lastLine - visibleRows + 1;
+    }
+    if (this.scrollOffset > groupStart) {
+      this.scrollOffset = groupStart;
+    }
+  }
+};
+
+// src/utils/interactive-panel.ts
+var InteractivePanel = class {
+  /** 状态管理器 */
+  stateManager;
+  /** 键盘控制器 */
+  keyboardController;
   /** 数据刷新定时器引用 */
   refreshTimer;
   /** 倒计时定时器引用 */
@@ -3436,8 +3706,6 @@ var InteractivePanel = class {
   resizeHandler;
   /** exit 兜底处理器 */
   exitHandler;
-  /** stdin 数据处理器引用（用于清理） */
-  stdinDataHandler;
   /** 操作锁（防止操作期间响应按键） */
   isOperating;
   /** Promise resolve 函数（stop 时调用以完成 start 返回的 Promise） */
@@ -3449,10 +3717,8 @@ var InteractivePanel = class {
    * @param {() => StatusResult} collectStatusFn - 数据收集函数
    */
   constructor(collectStatusFn) {
-    this.statusResult = null;
-    this.selectedDisplayIndex = 0;
-    this.displayOrder = [];
-    this.scrollOffset = 0;
+    this.stateManager = new PanelStateManager();
+    this.keyboardController = new KeyboardController(this.handleKeypress.bind(this));
     this.refreshTimer = null;
     this.countdownTimer = null;
     this.refreshCountdown = PANEL_REFRESH_INTERVAL_MS / 1e3;
@@ -3460,7 +3726,6 @@ var InteractivePanel = class {
     this.isTTY = !!process.stdout.isTTY;
     this.resizeHandler = null;
     this.exitHandler = null;
-    this.stdinDataHandler = null;
     this.isOperating = false;
     this.resolveStart = null;
     this.collectStatusFn = collectStatusFn;
@@ -3475,12 +3740,11 @@ var InteractivePanel = class {
       console.log(PANEL_NOT_TTY);
       return Promise.resolve();
     }
-    return new Promise((resolve3) => {
-      this.resolveStart = resolve3;
-      this.statusResult = this.collectStatusFn();
-      this.displayOrder = buildDisplayOrder(this.statusResult.worktrees);
+    return new Promise((resolve4) => {
+      this.resolveStart = resolve4;
+      this.stateManager.updateData(this.collectStatusFn());
       this.initTerminal();
-      this.startKeyboardListener();
+      this.keyboardController.start();
       this.startAutoRefresh();
       this.render();
     });
@@ -3492,7 +3756,7 @@ var InteractivePanel = class {
     if (this.stopped) return;
     this.stopped = true;
     this.clearTimers();
-    this.stopKeyboardListener();
+    this.keyboardController.stop();
     this.restoreTerminal();
     if (this.resizeHandler) {
       process.stdout.removeListener("resize", this.resizeHandler);
@@ -3516,6 +3780,7 @@ var InteractivePanel = class {
     process.stdout.write(LINE_WRAP_DISABLE);
     this.resizeHandler = () => {
       if (!this.stopped && !this.isOperating) {
+        this.stateManager.adjustScrollForSelection();
         this.render();
       }
     };
@@ -3535,33 +3800,6 @@ var InteractivePanel = class {
     process.stdout.write(CURSOR_SHOW);
     process.stdout.write(ALT_SCREEN_LEAVE);
   }
-  /**
-   * 启动键盘监听
-   * 将 stdin 设为 raw 模式以捕获每个按键
-   */
-  startKeyboardListener() {
-    if (process.stdin.isTTY) {
-      process.stdin.setRawMode(true);
-    }
-    process.stdin.resume();
-    this.stdinDataHandler = (data) => {
-      this.handleKeypress(data);
-    };
-    process.stdin.on("data", this.stdinDataHandler);
-  }
-  /**
-   * 停止键盘监听，恢复 stdin 状态
-   */
-  stopKeyboardListener() {
-    if (this.stdinDataHandler) {
-      process.stdin.removeListener("data", this.stdinDataHandler);
-      this.stdinDataHandler = null;
-    }
-    if (process.stdin.isTTY) {
-      process.stdin.setRawMode(false);
-    }
-    process.stdin.pause();
-  }
   /**
    * 处理键盘输入
    * @param {Buffer} data - 按键数据
@@ -3574,11 +3812,15 @@ var InteractivePanel = class {
       return;
     }
     if (str === KEY_ARROW_UP) {
-      this.navigateUp();
+      if (this.stateManager.navigateUp()) {
+        this.render();
+      }
       return;
     }
     if (str === KEY_ARROW_DOWN) {
-      this.navigateDown();
+      if (this.stateManager.navigateDown()) {
+        this.render();
+      }
       return;
     }
     const key = str.toLowerCase();
@@ -3615,67 +3857,6 @@ var InteractivePanel = class {
       return;
     }
   }
-  /**
-   * 向上导航，选中显示顺序中的上一个 worktree
-   */
-  navigateUp() {
-    if (!this.statusResult || this.displayOrder.length === 0) return;
-    if (this.selectedDisplayIndex > 0) {
-      this.selectedDisplayIndex--;
-      this.adjustScrollForSelection();
-      this.render();
-    }
-  }
-  /**
-   * 向下导航，选中显示顺序中的下一个 worktree
-   */
-  navigateDown() {
-    if (!this.statusResult || this.displayOrder.length === 0) return;
-    if (this.selectedDisplayIndex < this.displayOrder.length - 1) {
-      this.selectedDisplayIndex++;
-      this.adjustScrollForSelection();
-      this.render();
-    }
-  }
-  /**
-   * 获取当前选中的原始 worktree 索引
-   * @returns {number} 原始 worktrees 数组中的索引
-   */
-  getSelectedOriginalIndex() {
-    return this.displayOrder[this.selectedDisplayIndex];
-  }
-  /**
-   * 调整滚动偏移以确保选中项在可见区域内
-   */
-  adjustScrollForSelection() {
-    if (!this.statusResult || this.displayOrder.length === 0) return;
-    const originalIndex = this.getSelectedOriginalIndex();
-    const rows = process.stdout.rows || 24;
-    const visibleRows = calculateVisibleRows(rows);
-    const panelLines = buildGroupedWorktreeLines(this.statusResult.worktrees, originalIndex);
-    let firstLine = -1;
-    let lastLine = -1;
-    for (let i = 0; i < panelLines.length; i++) {
-      if (panelLines[i].worktreeIndex === originalIndex) {
-        if (firstLine === -1) firstLine = i;
-        lastLine = i;
-      }
-    }
-    if (firstLine === -1) return;
-    let groupStart = firstLine;
-    while (groupStart > 0 && panelLines[groupStart - 1].type === "separator") {
-      groupStart--;
-    }
-    if (groupStart < this.scrollOffset) {
-      this.scrollOffset = groupStart;
-    }
-    if (lastLine >= this.scrollOffset + visibleRows) {
-      this.scrollOffset = lastLine - visibleRows + 1;
-    }
-    if (this.scrollOffset > groupStart) {
-      this.scrollOffset = groupStart;
-    }
-  }
   /**
    * 启动自动刷新：数据刷新定时器 + 倒计时定时器
    */
@@ -3711,45 +3892,25 @@ var InteractivePanel = class {
    */
   refreshData() {
     if (this.stopped || this.isOperating) return;
-    const originalIndex = this.displayOrder[this.selectedDisplayIndex];
-    const previousBranch = this.statusResult?.worktrees[originalIndex]?.branch;
-    this.statusResult = this.collectStatusFn();
-    this.displayOrder = buildDisplayOrder(this.statusResult.worktrees);
-    this.restoreSelection(previousBranch);
+    const previousBranch = this.stateManager.getSelectedBranch();
+    this.stateManager.updateData(this.collectStatusFn(), previousBranch || void 0);
+    this.stateManager.adjustScrollForSelection();
     this.refreshCountdown = PANEL_REFRESH_INTERVAL_MS / 1e3;
     this.render();
   }
-  /**
-   * 按分支名恢复选中位置（基于显示顺序）
-   * @param {string | undefined} previousBranch - 之前选中的分支名
-   */
-  restoreSelection(previousBranch) {
-    if (!this.statusResult || !previousBranch || this.displayOrder.length === 0) {
-      this.selectedDisplayIndex = 0;
-      return;
-    }
-    const newDisplayIndex = this.displayOrder.findIndex(
-      (origIdx) => this.statusResult.worktrees[origIdx]?.branch === previousBranch
-    );
-    if (newDisplayIndex >= 0) {
-      this.selectedDisplayIndex = newDisplayIndex;
-    } else {
-      this.selectedDisplayIndex = Math.min(this.selectedDisplayIndex, Math.max(0, this.displayOrder.length - 1));
-    }
-    this.adjustScrollForSelection();
-  }
   /**
    * 渲染一帧面板内容
    * 使用同步输出防止闪烁
    */
   render() {
-    if (this.stopped || this.isOperating || !this.statusResult) return;
+    const statusResult = this.stateManager.getStatusResult();
+    if (this.stopped || this.isOperating || !statusResult) return;
     const cols = process.stdout.columns || DEFAULT_TERMINAL_COLUMNS;
     const rows = process.stdout.rows || 24;
     const frameLines = buildPanelFrame(
-      this.statusResult,
-      this.getSelectedOriginalIndex(),
-      this.scrollOffset,
+      statusResult,
+      this.stateManager.getSelectedOriginalIndex(),
+      this.stateManager.getScrollOffset(),
       rows,
       cols,
       this.refreshCountdown
@@ -3768,63 +3929,56 @@ var InteractivePanel = class {
    * @param {() => void} action - 要执行的操作
    */
   async executeOperation(action) {
-    if (!this.statusResult || this.displayOrder.length === 0) return;
+    const statusResult = this.stateManager.getStatusResult();
+    if (!statusResult || this.stateManager.getSelectedOriginalIndex() === -1) return;
     this.isOperating = true;
     this.clearTimers();
     this.restoreTerminal();
-    this.stopKeyboardListener();
+    this.keyboardController.stop();
     action();
     console.log(PANEL_PRESS_ENTER_TO_RETURN);
     await this.waitForEnter();
     this.initTerminal();
-    this.startKeyboardListener();
+    this.keyboardController.start();
     this.isOperating = false;
     this.refreshData();
     this.startAutoRefresh();
     this.render();
   }
-  /**
-   * 获取当前选中的分支名
-   * @returns {string} 当前选中的分支名
-   */
-  getSelectedBranch() {
-    const originalIndex = this.getSelectedOriginalIndex();
-    return this.statusResult.worktrees[originalIndex].branch;
-  }
   /**
    * 执行验证操作
    */
   handleValidate() {
-    const branch = this.getSelectedBranch();
-    runCommandInherited(`clawt validate -b ${branch}`);
+    const branch = this.stateManager.getSelectedBranch();
+    if (branch) runCommandInherited(`clawt validate -b ${branch}`);
   }
   /**
    * 执行合并操作
    */
   handleMerge() {
-    const branch = this.getSelectedBranch();
-    runCommandInherited(`clawt merge -b ${branch}`);
+    const branch = this.stateManager.getSelectedBranch();
+    if (branch) runCommandInherited(`clawt merge -b ${branch}`);
   }
   /**
    * 执行删除操作
    */
   handleDelete() {
-    const branch = this.getSelectedBranch();
-    runCommandInherited(`clawt remove -b ${branch}`);
+    const branch = this.stateManager.getSelectedBranch();
+    if (branch) runCommandInherited(`clawt remove -b ${branch}`);
   }
   /**
    * 执行恢复操作
    */
   handleResume() {
-    const branch = this.getSelectedBranch();
-    runCommandInherited(`clawt resume -b ${branch}`);
+    const branch = this.stateManager.getSelectedBranch();
+    if (branch) runCommandInherited(`clawt resume -b ${branch}`);
   }
   /**
    * 执行同步操作
    */
   handleSync() {
-    const branch = this.getSelectedBranch();
-    runCommandInherited(`clawt sync -b ${branch}`);
+    const branch = this.stateManager.getSelectedBranch();
+    if (branch) runCommandInherited(`clawt sync -b ${branch}`);
   }
   /**
    * 执行覆盖操作
@@ -3838,19 +3992,102 @@ var InteractivePanel = class {
    * @returns {Promise<void>} 用户按回车时 resolve
    */
   waitForEnter() {
-    return new Promise((resolve3) => {
+    return new Promise((resolve4) => {
       const rl = createInterface2({
         input: process.stdin,
         output: process.stdout
       });
       rl.once("line", () => {
         rl.close();
-        resolve3();
+        resolve4();
       });
     });
   }
 };
 
+// src/utils/conflict-resolver.ts
+import { execFileSync as execFileSync4 } from "child_process";
+var DEFAULT_CONFLICT_RESOLVE_TIMEOUT_MS = 3e5;
+function buildConflictResolvePrompt() {
+  return CONFLICT_RESOLVE_PROMPT;
+}
+function getConflictResolveTimeout() {
+  const configValue = getConfigValue("conflictResolveTimeoutMs");
+  if (typeof configValue === "number" && configValue > 0) {
+    return configValue;
+  }
+  return DEFAULT_CONFLICT_RESOLVE_TIMEOUT_MS;
+}
+function invokeClaudeForConflictResolve(prompt, cwd) {
+  const args = ["-p", prompt, "--permission-mode", "bypassPermissions"];
+  logger.info(`\u8C03\u7528 Claude Code \u89E3\u51B3\u51B2\u7A81\uFF0C\u547D\u4EE4: claude -p "..." --permission-mode bypassPermissions`);
+  try {
+    const output = execFileSync4("claude", args, {
+      cwd,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: getConflictResolveTimeout()
+    });
+    return output;
+  } catch (error) {
+    const errMsg = error instanceof Error ? error.message : String(error);
+    logger.error(`Claude Code \u51B2\u7A81\u89E3\u51B3\u5931\u8D25: ${errMsg}`);
+    throw new ClawtError(MESSAGES.MERGE_CONFLICT_AI_FAILED(errMsg));
+  }
+}
+function resolveConflictsWithAI(currentBranch, incomingBranch, cwd) {
+  const conflictFiles = getConflictFiles(cwd);
+  if (conflictFiles.length === 0) {
+    return true;
+  }
+  printInfo(MESSAGES.MERGE_CONFLICT_AI_START(conflictFiles.length));
+  const prompt = buildConflictResolvePrompt();
+  try {
+    invokeClaudeForConflictResolve(prompt, cwd);
+  } catch (error) {
+    const errMsg = error instanceof ClawtError ? error.message : String(error);
+    printWarning(errMsg);
+    return false;
+  }
+  const remainingConflicts = getConflictFiles(cwd);
+  if (remainingConflicts.length === 0) {
+    gitAddFiles(conflictFiles, cwd);
+    gitMergeContinue(cwd);
+    printSuccess(MESSAGES.MERGE_CONFLICT_AI_SUCCESS);
+    return true;
+  }
+  const resolvedFiles = conflictFiles.filter((f) => !remainingConflicts.includes(f));
+  if (resolvedFiles.length > 0) {
+    gitAddFiles(resolvedFiles, cwd);
+  }
+  printWarning(MESSAGES.MERGE_CONFLICT_AI_PARTIAL(remainingConflicts.length));
+  return false;
+}
+function determineConflictResolveMode(autoFlag) {
+  if (autoFlag === true) {
+    return "auto";
+  }
+  const configMode = getConfigValue("conflictResolveMode");
+  if (configMode === "auto" || configMode === "manual") {
+    return configMode;
+  }
+  return "ask";
+}
+async function handleMergeConflict(currentBranch, incomingBranch, cwd, autoFlag) {
+  const mode = determineConflictResolveMode(autoFlag);
+  if (mode === "manual") {
+    throw new ClawtError(MESSAGES.MERGE_CONFLICT_MANUAL);
+  }
+  if (mode === "auto") {
+    return resolveConflictsWithAI(currentBranch, incomingBranch, cwd);
+  }
+  const shouldUseAI = await confirmAction(MESSAGES.MERGE_CONFLICT_ASK_AI);
+  if (!shouldUseAI) {
+    throw new ClawtError(MESSAGES.MERGE_CONFLICT_MANUAL);
+  }
+  return resolveConflictsWithAI(currentBranch, incomingBranch, cwd);
+}
+
 // src/commands/list.ts
 import chalk10 from "chalk";
 function registerListCommand(program2) {
@@ -4430,7 +4667,7 @@ async function handleCoverValidate() {
 
 // src/commands/merge.ts
 function registerMergeCommand(program2) {
-  program2.command("merge").description("\u5408\u5E76\u67D0\u4E2A\u5DF2\u9A8C\u8BC1\u7684 worktree \u5206\u652F\u5230\u4E3B worktree").option("-b, --branch <branchName>", "\u8981\u5408\u5E76\u7684\u5206\u652F\u540D\uFF08\u652F\u6301\u6A21\u7CCA\u5339\u914D\uFF0C\u4E0D\u4F20\u5219\u5217\u51FA\u6240\u6709\u5206\u652F\u4F9B\u9009\u62E9\uFF09").option("-m, --message <commitMessage>", "\u63D0\u4EA4\u4FE1\u606F\uFF08\u76EE\u6807 worktree \u5DE5\u4F5C\u533A\u6709\u4FEE\u6539\u65F6\u5FC5\u586B\uFF09").action(async (options) => {
+  program2.command("merge").description("\u5408\u5E76\u67D0\u4E2A\u5DF2\u9A8C\u8BC1\u7684 worktree \u5206\u652F\u5230\u4E3B worktree").option("-b, --branch <branchName>", "\u8981\u5408\u5E76\u7684\u5206\u652F\u540D\uFF08\u652F\u6301\u6A21\u7CCA\u5339\u914D\uFF0C\u4E0D\u4F20\u5219\u5217\u51FA\u6240\u6709\u5206\u652F\u4F9B\u9009\u62E9\uFF09").option("-m, --message <commitMessage>", "\u63D0\u4EA4\u4FE1\u606F\uFF08\u76EE\u6807 worktree \u5DE5\u4F5C\u533A\u6709\u4FEE\u6539\u65F6\u5FC5\u586B\uFF09").option("--auto", "\u9047\u5230\u51B2\u7A81\u76F4\u63A5\u8C03\u7528 AI \u89E3\u51B3\uFF0C\u4E0D\u518D\u8BE2\u95EE").action(async (options) => {
     await handleMerge(options);
   });
 }
@@ -4502,16 +4739,25 @@ async function handleMerge(options) {
       throw new ClawtError(MESSAGES.TARGET_WORKTREE_NO_CHANGES);
     }
   }
+  let mergeHadConflict = false;
   try {
     gitMerge(branch, mainWorktreePath);
   } catch (error) {
     if (hasMergeConflict(mainWorktreePath)) {
-      throw new ClawtError(MESSAGES.MERGE_CONFLICT);
+      mergeHadConflict = true;
+    } else {
+      throw error;
     }
-    throw error;
   }
-  if (hasMergeConflict(mainWorktreePath)) {
-    throw new ClawtError(MESSAGES.MERGE_CONFLICT);
+  if (!mergeHadConflict && hasMergeConflict(mainWorktreePath)) {
+    mergeHadConflict = true;
+  }
+  if (mergeHadConflict) {
+    const currentBranch = getCurrentBranch(mainWorktreePath);
+    const resolved = await handleMergeConflict(currentBranch, branch, mainWorktreePath, options.auto);
+    if (!resolved) {
+      return;
+    }
   }
   const autoPullPush = getConfigValue("autoPullPush");
   if (autoPullPush) {
@@ -5386,6 +5632,28 @@ async function handleHome() {
   printSuccess(MESSAGES.HOME_SWITCH_SUCCESS(currentBranch, mainBranch));
 }
 
+// src/commands/tasks.ts
+import { resolve as resolve3, dirname as dirname2, join as join10 } from "path";
+import { existsSync as existsSync13, writeFileSync as writeFileSync6 } from "fs";
+function registerTasksCommand(program2) {
+  const taskCmd = program2.command("tasks").description("\u4EFB\u52A1\u6587\u4EF6\u7BA1\u7406");
+  taskCmd.command("init").description("\u751F\u6210\u4EFB\u52A1\u6A21\u677F\u6587\u4EF6").argument("[path]", "\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84").action(async (path2) => {
+    const filePath = path2 ?? join10(TASK_TEMPLATE_OUTPUT_DIR, generateTaskFilename(TASK_TEMPLATE_FILENAME_PREFIX));
+    await handleTasksInit(filePath);
+  });
+}
+async function handleTasksInit(filePath) {
+  const absolutePath = resolve3(filePath);
+  logger.info(`tasks init \u547D\u4EE4\u6267\u884C\uFF0C\u76EE\u6807\u6587\u4EF6: ${absolutePath}`);
+  if (existsSync13(absolutePath)) {
+    throw new ClawtError(MESSAGES.TASK_INIT_FILE_EXISTS(filePath));
+  }
+  ensureDir(dirname2(absolutePath));
+  writeFileSync6(absolutePath, TASK_TEMPLATE_CONTENT, "utf-8");
+  printSuccess(MESSAGES.TASK_INIT_SUCCESS(filePath));
+  printHint(MESSAGES.TASK_INIT_HINT(filePath));
+}
+
 // src/index.ts
 var require2 = createRequire(import.meta.url);
 var { version } = require2("../package.json");
@@ -5414,6 +5682,7 @@ registerProjectsCommand(program);
 registerCompletionCommand(program);
 registerInitCommand(program);
 registerHomeCommand(program);
+registerTasksCommand(program);
 var config = loadConfig();
 applyAliases(program, config.aliases);
 process.on("uncaughtException", (error) => {