clawt 2.16.3 → 2.16.5

package/dist/index.js

@@ -36,7 +36,7 @@ var COMMON_MESSAGES = {
   /** worktree 创建成功 */
   WORKTREE_CREATED: (count) => `\u2713 \u5DF2\u521B\u5EFA ${count} \u4E2A worktree`,
   /** worktree 移除成功 */
-  WORKTREE_REMOVED: (path) => `\u2713 \u5DF2\u79FB\u9664 worktree: ${path}`,
+  WORKTREE_REMOVED: (path2) => `\u2713 \u5DF2\u79FB\u9664 worktree: ${path2}`,
   /** 没有 worktree */
   NO_WORKTREES: "(\u65E0 worktree)",
   /** 目标 worktree 不存在 */
@@ -74,17 +74,17 @@ var RUN_MESSAGES = {
   /** 中断后保留 worktree */
   INTERRUPT_KEPT: "\u5DF2\u4FDD\u7559 worktree\uFF0C\u53EF\u7A0D\u540E\u4F7F\u7528 clawt remove \u624B\u52A8\u6E05\u7406",
   /** 非 TTY 环境降级输出：任务启动 */
-  PROGRESS_TASK_STARTED: (index, total, branch, path) => `[${index}/${total}] ${branch} \u542F\u52A8  ${path}`,
+  PROGRESS_TASK_STARTED: (index, total, branch, path2) => `[${index}/${total}] ${branch} \u542F\u52A8  ${path2}`,
   /** 非 TTY 环境降级输出：任务完成 */
-  PROGRESS_TASK_DONE: (index, total, branch, duration, cost, path) => `[${index}/${total}] ${branch} \u2713 \u5B8C\u6210 ${duration} ${cost}  ${path}`,
+  PROGRESS_TASK_DONE: (index, total, branch, duration, cost, detail) => `[${index}/${total}] ${branch} \u2713 \u5B8C\u6210 ${duration} ${cost}  ${detail}`,
   /** 非 TTY 环境降级输出：任务失败 */
-  PROGRESS_TASK_FAILED: (index, total, branch, duration, path) => `[${index}/${total}] ${branch} \u2717 \u5931\u8D25 ${duration}  ${path}`,
+  PROGRESS_TASK_FAILED: (index, total, branch, duration, detail) => `[${index}/${total}] ${branch} \u2717 \u5931\u8D25 ${duration}  ${detail}`,
   /** 并发限制提示 */
   CONCURRENCY_INFO: (concurrency, total) => `\u5E76\u53D1\u9650\u5236: ${concurrency}\uFF0C\u5171 ${total} \u4E2A\u4EFB\u52A1`,
   /** 并发数无效提示 */
   CONCURRENCY_INVALID: "\u5E76\u53D1\u6570\u5FC5\u987B\u4E3A\u6B63\u6574\u6570",
   /** 任务文件不存在 */
-  TASK_FILE_NOT_FOUND: (path) => `\u4EFB\u52A1\u6587\u4EF6\u4E0D\u5B58\u5728: ${path}`,
+  TASK_FILE_NOT_FOUND: (path2) => `\u4EFB\u52A1\u6587\u4EF6\u4E0D\u5B58\u5728: ${path2}`,
   /** 任务文件中没有解析到有效任务 */
   TASK_FILE_EMPTY: "\u4EFB\u52A1\u6587\u4EF6\u4E2D\u6CA1\u6709\u89E3\u6790\u5230\u6709\u6548\u4EFB\u52A1",
   /** 任务文件中某个任务块缺少分支名 */
@@ -96,7 +96,7 @@ var RUN_MESSAGES = {
   /** --file 和 --tasks 不能同时使用 */
   FILE_AND_TASKS_CONFLICT: "--file \u548C --tasks \u4E0D\u80FD\u540C\u65F6\u4F7F\u7528",
   /** 任务文件加载成功 */
-  TASK_FILE_LOADED: (count, path) => `\u2713 \u4ECE ${path} \u52A0\u8F7D\u4E86 ${count} \u4E2A\u4EFB\u52A1`,
+  TASK_FILE_LOADED: (count, path2) => `\u2713 \u4ECE ${path2} \u52A0\u8F7D\u4E86 ${count} \u4E2A\u4EFB\u52A1`,
   /** 未指定 -b 或 -f */
   BRANCH_OR_FILE_REQUIRED: "\u8BF7\u6307\u5B9A -b \u5206\u652F\u540D\u6216 -f \u4EFB\u52A1\u6587\u4EF6",
   /** dry-run 预览标题 */
@@ -211,7 +211,16 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   /** 并行执行中单个命令失败 */
   VALIDATE_PARALLEL_CMD_FAILED: (command, exitCode) => `  \u2717 ${command}\uFF08\u9000\u51FA\u7801: ${exitCode}\uFF09`,
   /** 并行执行中单个命令启动失败 */
-  VALIDATE_PARALLEL_CMD_ERROR: (command, errorMessage) => `  \u2717 ${command}\uFF08\u9519\u8BEF: ${errorMessage}\uFF09`
+  VALIDATE_PARALLEL_CMD_ERROR: (command, errorMessage) => `  \u2717 ${command}\uFF08\u9519\u8BEF: ${errorMessage}\uFF09`,
+  /** patch apply 失败后询问用户是否执行 sync */
+  VALIDATE_CONFIRM_AUTO_SYNC: (branch) => `\u662F\u5426\u7ACB\u5373\u6267\u884C sync \u540C\u6B65\u4E3B\u5206\u652F\u5230 ${branch}\uFF1F`,
+  /** 自动 sync 开始提示 */
+  VALIDATE_AUTO_SYNC_START: (branch) => `\u6B63\u5728\u81EA\u52A8\u540C\u6B65\u4E3B\u5206\u652F\u5230 ${branch} ...`,
+  /** 自动 sync 存在冲突，无法重试 */
+  VALIDATE_AUTO_SYNC_CONFLICT: (worktreePath) => `\u540C\u6B65\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u8FDB\u5165\u76EE\u6807 worktree \u624B\u52A8\u89E3\u51B3\u51B2\u7A81\u540E\u91CD\u8BD5
+  cd ${worktreePath}`,
+  /** 用户拒绝自动 sync */
+  VALIDATE_AUTO_SYNC_DECLINED: (branch) => `\u8BF7\u624B\u52A8\u6267\u884C clawt sync -b ${branch} \u540C\u6B65\u4E3B\u5206\u652F\u540E\u91CD\u8BD5`
 };
 
 // src/constants/messages/sync.ts
@@ -453,8 +462,6 @@ var DEBUG_TIMESTAMP_FORMAT = "HH:mm:ss.SSS";
 // src/constants/progress.ts
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 var SPINNER_INTERVAL_MS = 100;
-var CURSOR_UP = (n) => `\x1B[${n}A`;
-var CLEAR_LINE = "\x1B[0K";
 var CURSOR_HIDE = "\x1B[?25l";
 var CURSOR_SHOW = "\x1B[?25h";
 var TASK_STATUS_ICONS = {
@@ -475,6 +482,18 @@ var TASK_STATUS_LABELS = {
   /** 失败 */
   FAILED: "\u5931\u8D25"
 };
+var ACTIVITY_TEXT_MAX_LENGTH = 30;
+var TEXT_ACTIVITY_PREFIX = "\u601D\u8003\u4E2D";
+var RESULT_PREVIEW_MAX_LENGTH = 40;
+var DEFAULT_TERMINAL_COLUMNS = 80;
+var LINE_WRAP_DISABLE = "\x1B[?7l";
+var LINE_WRAP_ENABLE = "\x1B[?7h";
+var SYNC_OUTPUT_START = "\x1B[?2026h";
+var SYNC_OUTPUT_END = "\x1B[?2026l";
+var ALT_SCREEN_ENTER = "\x1B[?1049h";
+var ALT_SCREEN_LEAVE = "\x1B[?1049l";
+var CLEAR_SCREEN = "\x1B[2J";
+var CURSOR_HOME = "\x1B[H";
 
 // src/constants/prompt.ts
 var SELECT_ALL_NAME = "__select_all__";
@@ -1425,28 +1444,59 @@ async function resolveTargetWorktree(worktrees, messages, branchName) {
 
 // src/utils/progress-render.ts
 import chalk3 from "chalk";
-function getMaxBranchWidth(tasks) {
-  return Math.max(...tasks.map((t) => t.branch.length));
+import stringWidth from "string-width";
+var ANSI_RESET = "\x1B[0m";
+function truncateToTerminalWidth(text, maxWidth) {
+  if (stringWidth(text) <= maxWidth) {
+    return text;
+  }
+  let visibleWidth = 0;
+  let result = "";
+  let i = 0;
+  while (i < text.length) {
+    if (text[i] === "\x1B" && text[i + 1] === "[") {
+      const match = text.slice(i).match(/^\x1B\[[0-9;]*m/);
+      if (match) {
+        result += match[0];
+        i += match[0].length;
+        continue;
+      }
+    }
+    const charWidth = stringWidth(text[i]);
+    if (visibleWidth + charWidth > maxWidth) {
+      break;
+    }
+    result += text[i];
+    visibleWidth += charWidth;
+    i++;
+  }
+  return result + ANSI_RESET;
+}
+function getMaxPathWidth(tasks) {
+  return Math.max(...tasks.map((t) => t.path.length));
 }
-function renderTaskLine(task, total, maxBranchWidth, spinnerChar) {
+function renderTaskLine(task, total, maxPathWidth, spinnerChar) {
   const indexStr = `[${task.index}/${total}]`;
-  const branchStr = task.branch.padEnd(maxBranchWidth);
+  const pathStr = task.path.padEnd(maxPathWidth);
   switch (task.status) {
     case "pending": {
-      return `${indexStr} ${branchStr}  ${chalk3.gray(TASK_STATUS_ICONS.PENDING)} ${chalk3.gray(TASK_STATUS_LABELS.PENDING)}  ${chalk3.dim(task.path)}`;
+      return `${indexStr} ${pathStr}  ${chalk3.gray(TASK_STATUS_ICONS.PENDING)} ${chalk3.gray(TASK_STATUS_LABELS.PENDING)}`;
     }
     case "running": {
       const elapsed = formatDuration(Date.now() - task.startedAt);
-      return `${indexStr} ${branchStr}  ${chalk3.cyan(spinnerChar)} ${chalk3.cyan(TASK_STATUS_LABELS.RUNNING)} ${chalk3.gray(elapsed)}  ${chalk3.dim(task.path)}`;
+      const detail = task.activity ? `  ${chalk3.dim(task.activity)}` : "";
+      return `${indexStr} ${pathStr}  ${chalk3.cyan(spinnerChar)} ${chalk3.cyan(TASK_STATUS_LABELS.RUNNING)} ${chalk3.gray(elapsed)}${detail}`;
     }
     case "done": {
       const duration = task.durationMs != null ? formatDuration(task.durationMs) : "N/A";
       const cost = task.costUsd != null ? `$${task.costUsd.toFixed(2)}` : "";
-      return `${indexStr} ${branchStr}  ${chalk3.green(TASK_STATUS_ICONS.DONE)} ${chalk3.green(TASK_STATUS_LABELS.DONE)}   ${chalk3.gray(duration)}  ${chalk3.yellow(cost)}  ${chalk3.dim(task.path)}`;
+      const preview = task.resultPreview ? `  ${chalk3.dim(task.resultPreview)}` : "";
+      return `${indexStr} ${pathStr}  ${chalk3.green(TASK_STATUS_ICONS.DONE)} ${chalk3.green(TASK_STATUS_LABELS.DONE)}   ${chalk3.gray(duration)}  ${chalk3.yellow(cost)}${preview}`;
     }
     case "failed": {
       const duration = task.durationMs != null ? formatDuration(task.durationMs) : "N/A";
-      return `${indexStr} ${branchStr}  ${chalk3.red(TASK_STATUS_ICONS.FAILED)} ${chalk3.red(TASK_STATUS_LABELS.FAILED)}   ${chalk3.gray(duration)}  ${chalk3.dim(task.path)}`;
+      const preview = task.resultPreview ? `  ${chalk3.dim(task.resultPreview)}` : "";
+      return `${indexStr} ${pathStr}  ${chalk3.red(TASK_STATUS_ICONS.FAILED)} ${chalk3.red(TASK_STATUS_LABELS.FAILED)}   ${chalk3.gray(duration)}${preview}`;
     }
   }
 }
@@ -1475,10 +1525,12 @@ var ProgressRenderer = class {
   timer;
   /** 是否为 TTY 环境 */
   isTTY;
-  /** 已渲染的行数（用于回退光标） */
-  renderedLineCount;
+  /** resize 事件处理器引用（用于 stop 时移除监听） */
+  resizeHandler;
   /** 是否已停止 */
   stopped;
+  /** exit 兜底处理器（确保异常退出时终端状态被恢复） */
+  exitHandler;
   /** 是否存在排队任务（启用汇总行渲染） */
   hasPendingTasks;
   /**
@@ -1493,8 +1545,9 @@ var ProgressRenderer = class {
     this.frameIndex = 0;
     this.timer = null;
     this.isTTY = !!process.stdout.isTTY;
-    this.renderedLineCount = 0;
+    this.resizeHandler = null;
     this.stopped = false;
+    this.exitHandler = null;
     this.hasPendingTasks = !allRunning;
     this.tasks = branches.map((branch, i) => ({
       index: i + 1,
@@ -1505,7 +1558,9 @@ var ProgressRenderer = class {
       finishedAt: null,
       lastActiveAt: allRunning ? now : 0,
       durationMs: null,
-      costUsd: null
+      costUsd: null,
+      activity: null,
+      resultPreview: null
     }));
   }
   /**
@@ -1523,7 +1578,9 @@ var ProgressRenderer = class {
       }
       return;
     }
+    process.stdout.write(ALT_SCREEN_ENTER);
     process.stdout.write(CURSOR_HIDE);
+    process.stdout.write(LINE_WRAP_DISABLE);
     this.render();
     this.timer = setInterval(() => {
       this.frameIndex = (this.frameIndex + 1) % SPINNER_FRAMES.length;
@@ -1532,6 +1589,18 @@ var ProgressRenderer = class {
     if (this.timer.unref) {
       this.timer.unref();
     }
+    this.resizeHandler = () => {
+      if (!this.stopped) {
+        this.render();
+      }
+    };
+    process.stdout.on("resize", this.resizeHandler);
+    this.exitHandler = () => {
+      process.stdout.write(LINE_WRAP_ENABLE);
+      process.stdout.write(CURSOR_SHOW);
+      process.stdout.write(ALT_SCREEN_LEAVE);
+    };
+    process.on("exit", this.exitHandler);
   }
   /**
    * 更新指定任务的最后活动时间戳
@@ -1541,6 +1610,17 @@ var ProgressRenderer = class {
   updateActivity(index) {
     this.tasks[index].lastActiveAt = Date.now();
   }
+  /**
+   * 更新指定任务的活动描述文本
+   * 同时更新 lastActiveAt 时间戳
+   * @param {number} index - 任务索引（从 0 开始）
+   * @param {string} text - 活动描述文本
+   */
+  updateActivityText(index, text) {
+    const task = this.tasks[index];
+    task.activity = text;
+    task.lastActiveAt = Date.now();
+  }
   /**
    * 标记指定任务为运行中状态
    * 将 pending 任务标记为 running 并设置启动时间戳
@@ -1561,32 +1641,36 @@ var ProgressRenderer = class {
    * @param {number} index - 任务索引（从 0 开始）
    * @param {number} durationMs - 耗时（毫秒）
    * @param {number} costUsd - 费用（美元）
+   * @param {string} [resultPreview] - 结果预览文本（可选）
    */
-  markDone(index, durationMs, costUsd) {
+  markDone(index, durationMs, costUsd, resultPreview) {
     const task = this.tasks[index];
     task.status = "done";
     task.finishedAt = Date.now();
     task.durationMs = durationMs;
     task.costUsd = costUsd;
+    task.resultPreview = resultPreview ?? null;
     if (!this.isTTY) {
       const duration = formatDuration(durationMs);
       const cost = `$${costUsd.toFixed(2)}`;
-      console.log(MESSAGES.PROGRESS_TASK_DONE(task.index, this.total, task.branch, duration, cost, task.path));
+      console.log(MESSAGES.PROGRESS_TASK_DONE(task.index, this.total, task.branch, duration, cost, task.resultPreview ?? task.path));
     }
   }
   /**
    * 标记指定任务为失败状态
    * @param {number} index - 任务索引（从 0 开始）
    * @param {number} durationMs - 耗时（毫秒）
+   * @param {string} [resultPreview] - 结果预览文本（可选）
    */
-  markFailed(index, durationMs) {
+  markFailed(index, durationMs, resultPreview) {
     const task = this.tasks[index];
     task.status = "failed";
     task.finishedAt = Date.now();
     task.durationMs = durationMs;
+    task.resultPreview = resultPreview ?? null;
     if (!this.isTTY) {
       const duration = formatDuration(durationMs);
-      console.log(MESSAGES.PROGRESS_TASK_FAILED(task.index, this.total, task.branch, duration, task.path));
+      console.log(MESSAGES.PROGRESS_TASK_FAILED(task.index, this.total, task.branch, duration, task.resultPreview ?? task.path));
     }
   }
   /**
@@ -1600,30 +1684,58 @@ var ProgressRenderer = class {
       clearInterval(this.timer);
       this.timer = null;
     }
+    if (this.resizeHandler) {
+      process.stdout.removeListener("resize", this.resizeHandler);
+      this.resizeHandler = null;
+    }
     if (this.isTTY) {
       this.render();
+      process.stdout.write(LINE_WRAP_ENABLE);
       process.stdout.write(CURSOR_SHOW);
+      process.stdout.write(ALT_SCREEN_LEAVE);
+      const cols = process.stdout.columns || DEFAULT_TERMINAL_COLUMNS;
+      const finalLines = this.buildLines(cols);
+      for (const line of finalLines) {
+        process.stdout.write(`${line}
+`);
+      }
+    }
+    if (this.exitHandler) {
+      process.removeListener("exit", this.exitHandler);
+      this.exitHandler = null;
     }
   }
   /**
-   * 执行一次完整的面板渲染
-   * 先回退光标到面板起始位置，再逐行输出
+   * 构建当前帧的面板行内容
+   * @param {number} cols - 终端列数
+   * @returns {string[]} 截断后的面板行数组
    */
-  render() {
-    const maxBranchWidth = getMaxBranchWidth(this.tasks);
+  buildLines(cols) {
+    const maxPathWidth = getMaxPathWidth(this.tasks);
     const spinnerChar = SPINNER_FRAMES[this.frameIndex];
-    const lines = this.tasks.map((task) => renderTaskLine(task, this.total, maxBranchWidth, spinnerChar));
+    const lines = this.tasks.map((task) => renderTaskLine(task, this.total, maxPathWidth, spinnerChar));
     if (this.hasPendingTasks) {
       lines.push(renderSummaryLine(this.tasks, this.total));
     }
-    if (this.renderedLineCount > 0) {
-      process.stdout.write(CURSOR_UP(this.renderedLineCount));
-    }
+    return lines.map((line) => truncateToTerminalWidth(line, cols));
+  }
+  /**
+   * 执行一次完整的面板渲染
+   * 在备选屏幕缓冲区中，每次清屏+归位后完全重绘
+   * 无需计算 CURSOR_UP 回退量，不受终端 reflow 影响
+   * 使用 Synchronized Output 防止多行写入时的闪烁
+   */
+  render() {
+    const cols = process.stdout.columns || DEFAULT_TERMINAL_COLUMNS;
+    const lines = this.buildLines(cols);
+    process.stdout.write(SYNC_OUTPUT_START);
+    process.stdout.write(CLEAR_SCREEN);
+    process.stdout.write(CURSOR_HOME);
     for (const line of lines) {
-      process.stdout.write(`${line}${CLEAR_LINE}
+      process.stdout.write(`${line}
 `);
     }
-    this.renderedLineCount = lines.length;
+    process.stdout.write(SYNC_OUTPUT_END);
   }
 };
 
@@ -1686,11 +1798,114 @@ function loadTaskFile(filePath, options) {
   return entries;
 }
 
+// src/utils/stream-parser.ts
+import path from "path";
+function createLineBuffer() {
+  let buffer = "";
+  return {
+    push(chunk) {
+      buffer += chunk;
+      const lines = buffer.split("\n");
+      buffer = lines.pop() ?? "";
+      return lines;
+    },
+    flush() {
+      const remaining = buffer;
+      buffer = "";
+      return remaining || null;
+    }
+  };
+}
+function parseStreamLine(line) {
+  const trimmed = line.trim();
+  if (!trimmed) return null;
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    return null;
+  }
+}
+function truncateText(text, maxLength) {
+  if (text.length <= maxLength) return text;
+  return text.substring(0, maxLength - 1) + "\u2026";
+}
+function formatActivityText(kind, toolName, input, text) {
+  let raw = "";
+  if (kind === "tool_use" && toolName) {
+    const filePath = input?.file_path;
+    const command = input?.command;
+    if (filePath) {
+      const basename2 = path.basename(filePath);
+      raw = `${toolName} ${basename2}`;
+    } else if (command) {
+      const cleaned = command.replace(/[\n\r\t]+/g, " ").trim();
+      raw = `${toolName} ${cleaned}`;
+    } else {
+      raw = toolName;
+    }
+  } else if (kind === "text" && text) {
+    const cleaned = text.replace(/[\n\r\t]/g, " ").trim();
+    if (!cleaned) return "";
+    raw = `${TEXT_ACTIVITY_PREFIX}: ${cleaned}`;
+  }
+  if (!raw) return "";
+  return truncateText(raw, ACTIVITY_TEXT_MAX_LENGTH);
+}
+function parseStreamEvent(event) {
+  if (event.type === "result") {
+    const result = {
+      type: event.type,
+      subtype: event.subtype ?? "",
+      is_error: event.is_error ?? false,
+      duration_ms: event.duration_ms ?? 0,
+      duration_api_ms: event.duration_api_ms ?? 0,
+      num_turns: event.num_turns ?? 0,
+      result: event.result ?? "",
+      stop_reason: event.stop_reason ?? "",
+      session_id: event.session_id ?? "",
+      total_cost_usd: event.total_cost_usd ?? 0,
+      usage: event.usage ?? {}
+    };
+    return { kind: "result", activityText: "", result };
+  }
+  if (event.type === "assistant") {
+    const content = event.message?.content;
+    if (!content || content.length === 0) return null;
+    let lastToolUse = null;
+    let lastText = null;
+    for (const block of content) {
+      if (block.type === "tool_use") {
+        lastToolUse = block;
+      } else if (block.type === "text") {
+        lastText = block;
+      }
+    }
+    if (lastToolUse) {
+      const activityText = formatActivityText(
+        "tool_use",
+        lastToolUse.name,
+        lastToolUse.input
+      );
+      if (activityText) {
+        return { kind: "tool_use", activityText };
+      }
+    }
+    if (lastText?.text) {
+      const activityText = formatActivityText("text", void 0, void 0, lastText.text);
+      if (activityText) {
+        return { kind: "text", activityText };
+      }
+    }
+    return null;
+  }
+  return null;
+}
+
 // src/utils/task-executor.ts
-function executeClaudeTask(worktree, task) {
+function executeClaudeTask(worktree, task, onActivity) {
   const child = spawnProcess(
     "claude",
-    ["-p", task, "--output-format", "json", "--permission-mode", "bypassPermissions"],
+    ["-p", task, "--output-format", "stream-json", "--verbose", "--permission-mode", "bypassPermissions"],
     {
       cwd: worktree.path,
       // stdin 必须设置为 'ignore'，不能用 'pipe'
@@ -1701,31 +1916,47 @@ function executeClaudeTask(worktree, task) {
     }
   );
   const promise = new Promise((resolve2) => {
-    let stdout = "";
     let stderr = "";
+    let finalResult = null;
+    const lineBuffer = createLineBuffer();
     child.stdout?.on("data", (data) => {
-      stdout += data.toString();
+      const lines = lineBuffer.push(data.toString());
+      for (const line of lines) {
+        const event = parseStreamLine(line);
+        if (!event) continue;
+        const parsed = parseStreamEvent(event);
+        if (!parsed) continue;
+        if (parsed.kind === "result") {
+          finalResult = parsed.result ?? null;
+        } else if (parsed.activityText && onActivity) {
+          onActivity(parsed.activityText);
+        }
+      }
     });
     child.stderr?.on("data", (data) => {
       stderr += data.toString();
     });
     child.on("close", (code) => {
-      let result = null;
-      let success = code === 0;
-      try {
-        if (stdout.trim()) {
-          result = JSON.parse(stdout.trim());
-          success = !result.is_error;
+      const remaining = lineBuffer.flush();
+      if (remaining) {
+        const event = parseStreamLine(remaining);
+        if (event) {
+          const parsed = parseStreamEvent(event);
+          if (parsed?.kind === "result") {
+            finalResult = parsed.result ?? null;
+          }
         }
-      } catch {
-        logger.warn(`\u89E3\u6790 Claude Code \u8F93\u51FA\u5931\u8D25: ${stdout.substring(0, 200)}`);
+      }
+      let success = code === 0;
+      if (finalResult) {
+        success = !finalResult.is_error;
       }
       resolve2({
         task,
         branch: worktree.branch,
         worktreePath: worktree.path,
         success,
-        result,
+        result: finalResult,
         error: success ? void 0 : stderr || "\u4EFB\u52A1\u6267\u884C\u5931\u8D25"
       });
     });
@@ -1767,16 +1998,20 @@ async function handleInterruptCleanup(worktrees) {
   }
 }
 function updateRendererStatus(renderer, index, result, startTime) {
+  const rawResultText = result.result?.result;
+  const resultPreview = rawResultText ? truncateText(rawResultText.replace(/[\n\r\t]+/g, " ").trim(), RESULT_PREVIEW_MAX_LENGTH) : void 0;
   if (result.success) {
     renderer.markDone(
       index,
       result.result?.duration_ms ?? Date.now() - startTime,
-      result.result?.total_cost_usd ?? 0
+      result.result?.total_cost_usd ?? 0,
+      resultPreview
     );
   } else {
     renderer.markFailed(
       index,
-      result.result?.duration_ms ?? Date.now() - startTime
+      result.result?.duration_ms ?? Date.now() - startTime,
+      resultPreview
     );
   }
 }
@@ -1794,11 +2029,10 @@ async function executeWithConcurrency(worktrees, tasks, concurrency, renderer, s
       const task = tasks[index];
       logger.info(`\u542F\u52A8\u4EFB\u52A1 ${index + 1}: ${task} (worktree: ${wt.path})`);
       renderer.markRunning(index);
-      const handle = executeClaudeTask(wt, task);
-      childProcesses.push(handle.child);
-      handle.child.stderr?.on("data", () => {
-        renderer.updateActivity(index);
+      const handle = executeClaudeTask(wt, task, (activityText) => {
+        renderer.updateActivityText(index, activityText);
       });
+      childProcesses.push(handle.child);
       handle.promise.then((result) => {
         results[index] = result;
         completedCount++;
@@ -1821,11 +2055,10 @@ async function executeAllParallel(worktrees, tasks, renderer, startTime, isInter
   const handles = worktrees.map((wt, index) => {
     const task = tasks[index];
     logger.info(`\u542F\u52A8\u4EFB\u52A1 ${index + 1}: ${task} (worktree: ${wt.path})`);
-    const handle = executeClaudeTask(wt, task);
-    childProcesses.push(handle.child);
-    handle.child.stderr?.on("data", () => {
-      renderer.updateActivity(index);
+    const handle = executeClaudeTask(wt, task, (activityText) => {
+      renderer.updateActivityText(index, activityText);
     });
+    childProcesses.push(handle.child);
     return handle;
   });
   const results = await Promise.all(
@@ -2337,6 +2570,66 @@ async function handleBatchResume(worktrees) {
 
 // src/commands/validate.ts
 import Enquirer4 from "enquirer";
+
+// src/commands/sync.ts
+function registerSyncCommand(program2) {
+  program2.command("sync").description("\u5C06\u4E3B\u5206\u652F\u6700\u65B0\u4EE3\u7801\u540C\u6B65\u5230\u76EE\u6807 worktree").option("-b, --branch <branchName>", "\u8981\u540C\u6B65\u7684\u5206\u652F\u540D\uFF08\u652F\u6301\u6A21\u7CCA\u5339\u914D\uFF0C\u4E0D\u4F20\u5219\u5217\u51FA\u6240\u6709\u5206\u652F\uFF09").action(async (options) => {
+    await handleSync(options);
+  });
+}
+var SYNC_RESOLVE_MESSAGES = {
+  noWorktrees: MESSAGES.SYNC_NO_WORKTREES,
+  selectBranch: MESSAGES.SYNC_SELECT_BRANCH,
+  multipleMatches: MESSAGES.SYNC_MULTIPLE_MATCHES,
+  noMatch: MESSAGES.SYNC_NO_MATCH
+};
+function autoSaveChanges(worktreePath, branch) {
+  gitAddAll(worktreePath);
+  gitCommit(AUTO_SAVE_COMMIT_MESSAGE, worktreePath);
+  printInfo(MESSAGES.SYNC_AUTO_COMMITTED(branch));
+  logger.info(`\u5DF2\u81EA\u52A8\u4FDD\u5B58 ${branch} \u5206\u652F\u7684\u672A\u63D0\u4EA4\u53D8\u66F4`);
+}
+function mergeMainBranch(worktreePath, mainBranch) {
+  try {
+    gitMerge(mainBranch, worktreePath);
+    return false;
+  } catch {
+    if (hasMergeConflict(worktreePath)) {
+      return true;
+    }
+    throw new ClawtError(`\u5408\u5E76 ${mainBranch} \u5931\u8D25`);
+  }
+}
+function executeSyncForBranch(targetWorktreePath, branch) {
+  const mainWorktreePath = getGitTopLevel();
+  const mainBranch = getCurrentBranch(mainWorktreePath);
+  if (!isWorkingDirClean(targetWorktreePath)) {
+    autoSaveChanges(targetWorktreePath, branch);
+  }
+  printInfo(MESSAGES.SYNC_MERGING(branch, mainBranch));
+  const hasConflict = mergeMainBranch(targetWorktreePath, mainBranch);
+  if (hasConflict) {
+    printWarning(MESSAGES.SYNC_CONFLICT(targetWorktreePath));
+    return { success: false, hasConflict: true };
+  }
+  const projectName = getProjectName();
+  if (hasSnapshot(projectName, branch)) {
+    removeSnapshot(projectName, branch);
+    logger.info(`\u5DF2\u6E05\u9664\u5206\u652F ${branch} \u7684 validate \u5FEB\u7167`);
+  }
+  printSuccess(MESSAGES.SYNC_SUCCESS(branch, mainBranch));
+  return { success: true, hasConflict: false };
+}
+async function handleSync(options) {
+  validateMainWorktree();
+  logger.info(`sync \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch ?? "(\u672A\u6307\u5B9A)"}`);
+  const worktrees = getProjectWorktrees();
+  const worktree = await resolveTargetWorktree(worktrees, SYNC_RESOLVE_MESSAGES, options.branch);
+  const { path: targetWorktreePath, branch } = worktree;
+  executeSyncForBranch(targetWorktreePath, branch);
+}
+
+// src/commands/validate.ts
 var VALIDATE_RESOLVE_MESSAGES = {
   noWorktrees: MESSAGES.VALIDATE_NO_WORKTREES,
   selectBranch: MESSAGES.VALIDATE_SELECT_BRANCH,
@@ -2397,9 +2690,10 @@ function migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName
       } catch (error) {
         logger.warn(`patch apply \u5931\u8D25: ${error}`);
         printWarning(MESSAGES.VALIDATE_PATCH_APPLY_FAILED(branchName));
-        throw error;
+        return { success: false };
       }
     }
+    return { success: true };
   } finally {
     if (didTempCommit) {
       try {
@@ -2415,6 +2709,18 @@ function migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName
     }
   }
 }
+async function handlePatchApplyFailure(targetWorktreePath, branchName) {
+  const confirmed = await confirmAction(MESSAGES.VALIDATE_CONFIRM_AUTO_SYNC(branchName));
+  if (!confirmed) {
+    printWarning(MESSAGES.VALIDATE_AUTO_SYNC_DECLINED(branchName));
+    return;
+  }
+  printInfo(MESSAGES.VALIDATE_AUTO_SYNC_START(branchName));
+  const syncResult = executeSyncForBranch(targetWorktreePath, branchName);
+  if (syncResult.hasConflict) {
+    printWarning(MESSAGES.VALIDATE_AUTO_SYNC_CONFLICT(targetWorktreePath));
+  }
+}
 function saveCurrentSnapshotTree(mainWorktreePath, projectName, branchName) {
   gitAddAll(mainWorktreePath);
   const treeHash = gitWriteTree(mainWorktreePath);
@@ -2448,18 +2754,26 @@ async function handleValidateClean(options) {
   removeSnapshot(projectName, branchName);
   printSuccess(MESSAGES.VALIDATE_CLEANED(branchName));
 }
-function handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted) {
-  migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName, hasUncommitted);
+async function handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted) {
+  const result = migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName, hasUncommitted);
+  if (!result.success) {
+    await handlePatchApplyFailure(targetWorktreePath, branchName);
+    return;
+  }
   saveCurrentSnapshotTree(mainWorktreePath, projectName, branchName);
   printSuccess(MESSAGES.VALIDATE_SUCCESS(branchName));
 }
-function handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted) {
+async function handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted) {
   const { treeHash: oldTreeHash, headCommitHash: oldHeadCommitHash } = readSnapshot(projectName, branchName);
   if (!isWorkingDirClean(mainWorktreePath)) {
     gitResetHard(mainWorktreePath);
     gitCleanForce(mainWorktreePath);
   }
-  migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName, hasUncommitted);
+  const result = migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName, hasUncommitted);
+  if (!result.success) {
+    await handlePatchApplyFailure(targetWorktreePath, branchName);
+    return;
+  }
   saveCurrentSnapshotTree(mainWorktreePath, projectName, branchName);
   try {
     const currentHeadCommitHash = getHeadCommitHash(mainWorktreePath);
@@ -2562,12 +2876,12 @@ async function handleValidate(options) {
     if (!isWorkingDirClean(mainWorktreePath)) {
       await handleDirtyMainWorktree(mainWorktreePath);
     }
-    handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted);
+    await handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted);
   } else {
     if (!isWorkingDirClean(mainWorktreePath)) {
       await handleDirtyMainWorktree(mainWorktreePath);
     }
-    handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted);
+    await handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted);
   }
   if (options.run) {
     await executeRunCommand(options.run, mainWorktreePath);
@@ -2780,60 +3094,6 @@ function handleConfigGet(key) {
   printInfo(MESSAGES.CONFIG_GET_VALUE(key, String(value)));
 }
 
-// src/commands/sync.ts
-function registerSyncCommand(program2) {
-  program2.command("sync").description("\u5C06\u4E3B\u5206\u652F\u6700\u65B0\u4EE3\u7801\u540C\u6B65\u5230\u76EE\u6807 worktree").option("-b, --branch <branchName>", "\u8981\u540C\u6B65\u7684\u5206\u652F\u540D\uFF08\u652F\u6301\u6A21\u7CCA\u5339\u914D\uFF0C\u4E0D\u4F20\u5219\u5217\u51FA\u6240\u6709\u5206\u652F\uFF09").action(async (options) => {
-    await handleSync(options);
-  });
-}
-var SYNC_RESOLVE_MESSAGES = {
-  noWorktrees: MESSAGES.SYNC_NO_WORKTREES,
-  selectBranch: MESSAGES.SYNC_SELECT_BRANCH,
-  multipleMatches: MESSAGES.SYNC_MULTIPLE_MATCHES,
-  noMatch: MESSAGES.SYNC_NO_MATCH
-};
-function autoSaveChanges(worktreePath, branch) {
-  gitAddAll(worktreePath);
-  gitCommit(AUTO_SAVE_COMMIT_MESSAGE, worktreePath);
-  printInfo(MESSAGES.SYNC_AUTO_COMMITTED(branch));
-  logger.info(`\u5DF2\u81EA\u52A8\u4FDD\u5B58 ${branch} \u5206\u652F\u7684\u672A\u63D0\u4EA4\u53D8\u66F4`);
-}
-function mergeMainBranch(worktreePath, mainBranch) {
-  try {
-    gitMerge(mainBranch, worktreePath);
-    return false;
-  } catch {
-    if (hasMergeConflict(worktreePath)) {
-      return true;
-    }
-    throw new ClawtError(`\u5408\u5E76 ${mainBranch} \u5931\u8D25`);
-  }
-}
-async function handleSync(options) {
-  validateMainWorktree();
-  logger.info(`sync \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch ?? "(\u672A\u6307\u5B9A)"}`);
-  const worktrees = getProjectWorktrees();
-  const worktree = await resolveTargetWorktree(worktrees, SYNC_RESOLVE_MESSAGES, options.branch);
-  const { path: targetWorktreePath, branch } = worktree;
-  const mainWorktreePath = getGitTopLevel();
-  const mainBranch = getCurrentBranch(mainWorktreePath);
-  if (!isWorkingDirClean(targetWorktreePath)) {
-    autoSaveChanges(targetWorktreePath, branch);
-  }
-  printInfo(MESSAGES.SYNC_MERGING(branch, mainBranch));
-  const hasConflict = mergeMainBranch(targetWorktreePath, mainBranch);
-  if (hasConflict) {
-    printWarning(MESSAGES.SYNC_CONFLICT(targetWorktreePath));
-    return;
-  }
-  const projectName = getProjectName();
-  if (hasSnapshot(projectName, branch)) {
-    removeSnapshot(projectName, branch);
-    logger.info(`\u5DF2\u6E05\u9664\u5206\u652F ${branch} \u7684 validate \u5FEB\u7167`);
-  }
-  printSuccess(MESSAGES.SYNC_SUCCESS(branch, mainBranch));
-}
-
 // src/commands/reset.ts
 function registerResetCommand(program2) {
   program2.command("reset").description("\u91CD\u7F6E\u4E3B worktree \u5DE5\u4F5C\u533A\u548C\u6682\u5B58\u533A\uFF08\u4FDD\u7559 validate \u5FEB\u7167\uFF09").action(async () => {