clawt 3.6.1 → 3.7.0

package/dist/index.js

@@ -958,6 +958,10 @@ function enableConsoleTransport() {
 
 // src/utils/shell.ts
 import { execSync, execFileSync, spawn, spawnSync } from "child_process";
+function getEnvWithoutNestedSessionFlag() {
+  const { CLAUDECODE: _, ...env } = process.env;
+  return env;
+}
 function execCommand(command, options) {
   logger.debug(`\u6267\u884C\u547D\u4EE4: ${command}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
   const result = execSync(command, {
@@ -971,7 +975,8 @@ function spawnProcess(command, args, options) {
   logger.debug(`\u542F\u52A8\u5B50\u8FDB\u7A0B: ${command} ${args.join(" ")}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
   return spawn(command, args, {
     cwd: options?.cwd,
-    stdio: options?.stdio ?? ["pipe", "pipe", "pipe"]
+    stdio: options?.stdio ?? ["pipe", "pipe", "pipe"],
+    env: getEnvWithoutNestedSessionFlag()
   });
 }
 function killAllChildProcesses(children) {
@@ -1308,6 +1313,20 @@ function gitWorktreePrune(cwd) {
 // src/utils/formatter.ts
 import chalk4 from "chalk";
 import { createInterface } from "readline";
+
+// src/utils/interactive.ts
+var nonInteractiveFlag = false;
+function setNonInteractive(value) {
+  nonInteractiveFlag = value;
+}
+function isNonInteractive() {
+  if (nonInteractiveFlag) return true;
+  if (process.env.CI === "true" || process.env.CI === "1") return true;
+  if (process.env.CLAWT_NON_INTERACTIVE === "true" || process.env.CLAWT_NON_INTERACTIVE === "1") return true;
+  return false;
+}
+
+// src/utils/formatter.ts
 function printSuccess(message) {
   console.log(chalk4.green(message));
 }
@@ -1329,7 +1348,10 @@ function printSeparator() {
 function printDoubleSeparator() {
   console.log(MESSAGES.DOUBLE_SEPARATOR);
 }
-function confirmAction(question) {
+function confirmAction(question, nonInteractiveDefault = true) {
+  if (isNonInteractive()) {
+    return Promise.resolve(nonInteractiveDefault);
+  }
   return new Promise((resolve4) => {
     const rl = createInterface({
       input: process.stdin,
@@ -1605,6 +1627,14 @@ async function rebuildValidateBranch(branchName, cwd) {
   logger.info(`\u9A8C\u8BC1\u5206\u652F\u5DF2\u91CD\u5EFA: ${getValidateBranchName(branchName)}`);
 }
 async function handleDirtyWorkingDir(cwd) {
+  if (isNonInteractive()) {
+    gitAddAll(cwd);
+    gitStashPush("clawt:auto-stash", cwd);
+    if (!isWorkingDirClean(cwd)) {
+      throw new ClawtError("\u5DE5\u4F5C\u533A\u4ECD\u7136\u4E0D\u5E72\u51C0\uFF0C\u8BF7\u624B\u52A8\u5904\u7406");
+    }
+    return;
+  }
   printWarning("\u5F53\u524D\u5206\u652F\u6709\u672A\u63D0\u4EA4\u7684\u66F4\u6539\uFF0C\u8BF7\u9009\u62E9\u5904\u7406\u65B9\u5F0F\uFF1A\n");
   const choice = await new Enquirer.Select({
     message: "\u9009\u62E9\u5904\u7406\u65B9\u5F0F",
@@ -1654,7 +1684,7 @@ async function ensureOnMainWorkBranch(cwd) {
     return;
   }
   printWarning(MESSAGES.GUARD_BRANCH_MISMATCH(mainBranch, currentBranch));
-  const confirmed = await confirmAction("\u662F\u5426\u7EE7\u7EED\u6267\u884C\uFF1F");
+  const confirmed = isNonInteractive() ? true : await confirmAction("\u662F\u5426\u7EE7\u7EED\u6267\u884C\uFF1F");
   if (!confirmed) {
     throw new ClawtError(MESSAGES.DESTRUCTIVE_OP_CANCELLED);
   }
@@ -2089,6 +2119,9 @@ import { statSync as statSync3 } from "fs";
 // src/utils/ui-prompts.ts
 import Enquirer3 from "enquirer";
 async function promptSelectBranch(worktrees, message) {
+  if (isNonInteractive()) {
+    throw new ClawtError("\u975E\u4EA4\u4E92\u6A21\u5F0F\u4E0B\u65E0\u6CD5\u8FDB\u884C\u5206\u652F\u9009\u62E9\uFF0C\u8BF7\u901A\u8FC7 -b \u53C2\u6570\u7CBE\u786E\u6307\u5B9A\u5206\u652F\u540D");
+  }
   const selectedBranch = await new Enquirer3.Select({
     message,
     choices: worktrees.map((wt) => ({
@@ -2099,6 +2132,9 @@ async function promptSelectBranch(worktrees, message) {
   return worktrees.find((wt) => wt.branch === selectedBranch);
 }
 async function promptMultiSelectBranches(worktrees, message) {
+  if (isNonInteractive()) {
+    throw new ClawtError("\u975E\u4EA4\u4E92\u6A21\u5F0F\u4E0B\u65E0\u6CD5\u8FDB\u884C\u5206\u652F\u591A\u9009\uFF0C\u8BF7\u901A\u8FC7 -b \u53C2\u6570\u7CBE\u786E\u6307\u5B9A\u5206\u652F\u540D");
+  }
   const branchChoices = worktrees.map((wt) => ({
     name: wt.branch,
     message: wt.branch
@@ -2138,6 +2174,9 @@ async function promptMultiSelectBranches(worktrees, message) {
   return worktrees.filter((wt) => selectedBranches.includes(wt.branch));
 }
 async function promptGroupedMultiSelectBranches(worktrees, message) {
+  if (isNonInteractive()) {
+    throw new ClawtError("\u975E\u4EA4\u4E92\u6A21\u5F0F\u4E0B\u65E0\u6CD5\u8FDB\u884C\u5206\u652F\u591A\u9009\uFF0C\u8BF7\u901A\u8FC7 -b \u53C2\u6570\u7CBE\u786E\u6307\u5B9A\u5206\u652F\u540D");
+  }
   const groups = groupWorktreesByDate(worktrees);
   const choices = buildGroupedChoices(groups);
   const groupMembershipMap = buildGroupMembershipMap(groups);
@@ -3145,6 +3184,9 @@ function formatConfigValue(value) {
   return chalk7.cyan(String(value));
 }
 async function interactiveConfigEditor(config2, definitions, options) {
+  if (isNonInteractive()) {
+    throw new ClawtError("\u975E\u4EA4\u4E92\u6A21\u5F0F\u4E0B\u65E0\u6CD5\u4F7F\u7528\u4EA4\u4E92\u5F0F\u914D\u7F6E\u7F16\u8F91\u5668\uFF0C\u8BF7\u4F7F\u7528 clawt config set <key> <value>");
+  }
   const keys = Object.keys(definitions);
   const disabledKeys = options?.disabledKeys ?? {};
   const configRecord = config2;
@@ -4216,7 +4258,8 @@ function invokeClaudeForConflictResolve(prompt, cwd) {
       cwd,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
-      timeout: getConflictResolveTimeout()
+      timeout: getConflictResolveTimeout(),
+      env: getEnvWithoutNestedSessionFlag()
     });
     return output;
   } catch (error) {
@@ -4914,7 +4957,7 @@ async function handleSquashIfNeeded(targetWorktreePath, mainWorktreePath, branch
   if (!hasCommitWithMessage(branchName, AUTO_SAVE_COMMIT_MESSAGE, mainWorktreePath)) {
     return false;
   }
-  const shouldSquash = await confirmAction(MESSAGES.MERGE_SQUASH_PROMPT);
+  const shouldSquash = await confirmAction(MESSAGES.MERGE_SQUASH_PROMPT, false);
   if (!shouldSquash) {
     return false;
   }
@@ -4936,7 +4979,7 @@ async function shouldCleanupAfterMerge(branchName) {
     printInfo(`\u5DF2\u914D\u7F6E\u81EA\u52A8\u5220\u9664\uFF0Cmerge \u6210\u529F\u540E\u5C06\u81EA\u52A8\u6E05\u7406 worktree \u548C\u5206\u652F: ${branchName}`);
     return true;
   }
-  return confirmAction(`\u662F\u5426\u5220\u9664\u5BF9\u5E94\u7684 worktree \u548C\u5206\u652F (${branchName})\uFF1F`);
+  return confirmAction(`\u662F\u5426\u5220\u9664\u5BF9\u5E94\u7684 worktree \u548C\u5206\u652F (${branchName})\uFF1F`, true);
 }
 function cleanupWorktreeAndBranch(worktreePath, branchName) {
   cleanupWorktrees([{ path: worktreePath, branch: branchName }]);
@@ -5908,11 +5951,14 @@ var require2 = createRequire(import.meta.url);
 var { version } = require2("../package.json");
 ensureClawtDirs();
 var program = new Command();
-program.name("clawt").description("\u672C\u5730\u5E76\u884C\u6267\u884C\u591A\u4E2AClaude Code Agent\u4EFB\u52A1\uFF0C\u878D\u5408 Git Worktree \u4E0E Claude Code CLI \u7684\u547D\u4EE4\u884C\u5DE5\u5177").version(version).option("--debug", "\u8F93\u51FA\u8BE6\u7EC6\u8C03\u8BD5\u4FE1\u606F\u5230\u7EC8\u7AEF");
+program.name("clawt").description("\u672C\u5730\u5E76\u884C\u6267\u884C\u591A\u4E2AClaude Code Agent\u4EFB\u52A1\uFF0C\u878D\u5408 Git Worktree \u4E0E Claude Code CLI \u7684\u547D\u4EE4\u884C\u5DE5\u5177").version(version).option("--debug", "\u8F93\u51FA\u8BE6\u7EC6\u8C03\u8BD5\u4FE1\u606F\u5230\u7EC8\u7AEF").option("-y, --yes", "\u8DF3\u8FC7\u6240\u6709\u4EA4\u4E92\u5F0F\u786E\u8BA4\uFF0C\u9002\u7528\u4E8E\u811A\u672C/CI \u73AF\u5883");
 program.hook("preAction", (thisCommand) => {
   if (thisCommand.opts().debug) {
     enableConsoleTransport();
   }
+  if (thisCommand.opts().yes) {
+    setNonInteractive(true);
+  }
 });
 registerListCommand(program);
 registerCreateCommand(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawt",
-  "version": "3.6.1",
+  "version": "3.7.0",
   "description": "本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具",
   "type": "module",
   "main": "dist/index.js",

package/src/commands/merge.ts

@@ -82,8 +82,8 @@ async function handleSquashIfNeeded(
     return false;
   }
 
-  // 提示用户是否压缩
-  const shouldSquash = await confirmAction(MESSAGES.MERGE_SQUASH_PROMPT);
+  // 提示用户是否压缩（非交互模式下默认跳过，保留原始提交）
+  const shouldSquash = await confirmAction(MESSAGES.MERGE_SQUASH_PROMPT, false);
   if (!shouldSquash) {
     return false;
   }
@@ -120,7 +120,8 @@ async function shouldCleanupAfterMerge(branchName: string): Promise<boolean> {
     printInfo(`已配置自动删除，merge 成功后将自动清理 worktree 和分支: ${branchName}`);
     return true;
   }
-  return confirmAction(`是否删除对应的 worktree 和分支 (${branchName})？`);
+  // 非交互模式下自动删除
+  return confirmAction(`是否删除对应的 worktree 和分支 (${branchName})？`, true);
 }
 
 /**

package/src/commands/remove.ts

@@ -100,6 +100,7 @@ async function handleRemove(options: RemoveOptions): Promise<void> {
   let shouldDeleteBranch = autoDelete;
 
   if (!autoDelete) {
+    // 非交互模式下默认删除分支（删除 worktree 时分支通常也不再需要）
     shouldDeleteBranch = await confirmAction(MESSAGES.REMOVE_CONFIRM_DELETE_BRANCHES);
     if (!shouldDeleteBranch) {
       printHint(MESSAGES.REMOVE_BRANCHES_KEPT);

package/src/index.ts

@@ -3,7 +3,7 @@ import { Command } from 'commander';
 import { ClawtError } from './errors/index.js';
 import { logger, enableConsoleTransport } from './logger/index.js';
 import { EXIT_CODES } from './constants/index.js';
-import { printError, ensureClawtDirs, loadConfig, applyAliases, checkForUpdates } from './utils/index.js';
+import { printError, ensureClawtDirs, loadConfig, applyAliases, checkForUpdates, setNonInteractive } from './utils/index.js';
 import { registerListCommand } from './commands/list.js';
 import { registerCreateCommand } from './commands/create.js';
 import { registerRemoveCommand } from './commands/remove.js';
@@ -36,13 +36,18 @@ program
   .name('clawt')
   .description('本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具')
   .version(version)
-  .option('--debug', '输出详细调试信息到终端');
+  .option('--debug', '输出详细调试信息到终端')
+  .option('-y, --yes', '跳过所有交互式确认，适用于脚本/CI 环境');
 
 // 在子命令 action 执行前检查 --debug 选项，按需启用控制台日志
 program.hook('preAction', (thisCommand) => {
   if (thisCommand.opts().debug) {
     enableConsoleTransport();
   }
+  // 检测 --yes 选项，启用非交互模式
+  if (thisCommand.opts().yes) {
+    setNonInteractive(true);
+  }
 });
 
 // 注册所有命令

package/src/utils/config-strategy.ts

@@ -2,6 +2,8 @@ import chalk from 'chalk';
 import Enquirer from 'enquirer';
 import { DEFAULT_CONFIG, CONFIG_DEFINITIONS, MESSAGES } from '../constants/index.js';
 import type { ClawtConfig } from '../types/index.js';
+import { isNonInteractive } from './interactive.js';
+import { ClawtError } from '../errors/index.js';
 
 /**
  * 校验 key 是否为有效的配置项名称
@@ -132,6 +134,11 @@ export async function interactiveConfigEditor<T extends object>(
   definitions: Record<string, { description: string; allowedValues?: readonly string[] }>,
   options?: { selectPrompt?: string; disabledKeys?: Record<string, string> },
 ): Promise<{ key: keyof T; newValue: unknown }> {
+  // 非交互模式下无法进行配置编辑，引导使用 config set 命令
+  if (isNonInteractive()) {
+    throw new ClawtError('非交互模式下无法使用交互式配置编辑器，请使用 clawt config set <key> <value>');
+  }
+
   const keys = Object.keys(definitions);
   const disabledKeys = options?.disabledKeys ?? {};
   const configRecord = config as Record<string, unknown>;

package/src/utils/conflict-resolver.ts

@@ -7,6 +7,7 @@ import { printInfo, printSuccess, printWarning } from './formatter.js';
 import { confirmAction } from './formatter.js';
 import { MESSAGES } from '../constants/index.js';
 import { CONFLICT_RESOLVE_PROMPT } from '../constants/ai-prompts.js';
+import { getEnvWithoutNestedSessionFlag } from './shell.js';
 
 /** 默认 Claude Code 冲突解决超时时间（毫秒） */
 const DEFAULT_CONFLICT_RESOLVE_TIMEOUT_MS = 300000;
@@ -51,6 +52,7 @@ export function invokeClaudeForConflictResolve(prompt: string, cwd: string): str
       encoding: 'utf-8',
       stdio: ['pipe', 'pipe', 'pipe'],
       timeout: getConflictResolveTimeout(),
+      env: getEnvWithoutNestedSessionFlag(),
     });
     return output;
   } catch (error: unknown) {
@@ -160,7 +162,7 @@ export async function handleMergeConflict(
     return resolveConflictsWithAI(currentBranch, incomingBranch, cwd);
   }
 
-  // mode === 'ask'
+  // mode === 'ask'（非交互模式下默认使用 AI 解决，因为无法手动解决）
   const shouldUseAI = await confirmAction(MESSAGES.MERGE_CONFLICT_ASK_AI);
   if (!shouldUseAI) {
     throw new ClawtError(MESSAGES.MERGE_CONFLICT_MANUAL);

package/src/utils/formatter.ts

@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import { MESSAGES } from '../constants/index.js';
 import { createInterface } from 'node:readline';
 import type { WorktreeStatus } from '../types/index.js';
+import { isNonInteractive } from './interactive.js';
 
 /**
  * 输出成功信息
@@ -58,11 +59,17 @@ export function printDoubleSeparator(): void {
 }
 
 /**
- * 简易 yes/no 确认（非交互式场景使用）
+ * 简易 yes/no 确认
+ * 非交互模式下根据 nonInteractiveDefault 参数自动返回默认值
  * @param {string} question - 确认问题
+ * @param {boolean} [nonInteractiveDefault=true] - 非交互模式下的默认返回值，true 表示自动确认，false 表示自动拒绝
  * @returns {Promise<boolean>} 用户是否确认
  */
-export function confirmAction(question: string): Promise<boolean> {
+export function confirmAction(question: string, nonInteractiveDefault: boolean = true): Promise<boolean> {
+  // 非交互模式下返回调用方声明的默认值
+  if (isNonInteractive()) {
+    return Promise.resolve(nonInteractiveDefault);
+  }
   return new Promise((resolve) => {
     const rl = createInterface({
       input: process.stdin,

package/src/utils/index.ts

@@ -82,6 +82,7 @@ export { checkForUpdates } from './update-checker.js';
 export { getProjectConfigPath, loadProjectConfig, saveProjectConfig, requireProjectConfig, getMainWorkBranch, guardMainWorkBranchExists, getValidateRunCommand } from './project-config.js';
 export { getValidateBranchName, createValidateBranch, deleteValidateBranch, rebuildValidateBranch, ensureOnMainWorkBranch, handleDirtyWorkingDir } from './validate-branch.js';
 export { safeStringify } from './json.js';
+export { isNonInteractive, setNonInteractive } from './interactive.js';
 export { executeRunCommand } from './validate-runner.js';
 export { migrateChangesViaPatch, computeCurrentTreeHash, saveCurrentSnapshotTree, loadOldSnapshotToStage, switchToValidateBranch } from './validate-core.js';
 export { InteractivePanel } from './interactive-panel.js';

package/src/utils/interactive.ts

@@ -0,0 +1,27 @@
+/**
+ * 非交互模式判断工具
+ * 优先级：CLI --yes > 环境变量 CI / CLAWT_NON_INTERACTIVE > 默认交互模式
+ */
+
+/** 运行时标志，由 --yes 全局选项在 preAction hook 中设置 */
+let nonInteractiveFlag = false;
+
+/**
+ * 设置非交互模式运行时标志
+ * @param {boolean} value - 是否启用非交互模式
+ */
+export function setNonInteractive(value: boolean): void {
+  nonInteractiveFlag = value;
+}
+
+/**
+ * 判断当前是否处于非交互模式
+ * 检查顺序：运行时标志（--yes）→ CI 环境变量 → CLAWT_NON_INTERACTIVE 环境变量
+ * @returns {boolean} 是否为非交互模式
+ */
+export function isNonInteractive(): boolean {
+  if (nonInteractiveFlag) return true;
+  if (process.env.CI === 'true' || process.env.CI === '1') return true;
+  if (process.env.CLAWT_NON_INTERACTIVE === 'true' || process.env.CLAWT_NON_INTERACTIVE === '1') return true;
+  return false;
+}

package/src/utils/shell.ts

@@ -1,6 +1,17 @@
 import { execSync, execFileSync, spawn, spawnSync, type ChildProcess, type SpawnSyncReturns, type StdioOptions } from 'node:child_process';
 import { logger } from '../logger/index.js';
 
+/**
+ * 获取移除了 CLAUDECODE 嵌套会话标记的环境变量副本
+ * 仅用于 claude -p 等非交互式子进程，避免被 Claude Code 误判为嵌套会话而拒绝启动
+ * 不适用于交互式启动 Claude Code（如 clawt resume），交互式场景应保留原始环境变量
+ * @returns {NodeJS.ProcessEnv} 移除 CLAUDECODE 后的环境变量
+ */
+export function getEnvWithoutNestedSessionFlag(): NodeJS.ProcessEnv {
+  const { CLAUDECODE: _, ...env } = process.env;
+  return env;
+}
+
 /** 并行命令执行的单个结果 */
 export interface ParallelCommandResult {
   /** 执行的命令字符串 */
@@ -63,6 +74,7 @@ export function spawnProcess(
   return spawn(command, args, {
     cwd: options?.cwd,
     stdio: options?.stdio ?? ['pipe', 'pipe', 'pipe'],
+    env: getEnvWithoutNestedSessionFlag(),
   });
 }
 

package/src/utils/ui-prompts.ts

@@ -5,6 +5,8 @@ import {
 } from '../constants/index.js';
 import type { WorktreeInfo } from '../types/index.js';
 import { groupWorktreesByDate, buildGroupedChoices, buildGroupMembershipMap } from './worktree-matcher.js';
+import { isNonInteractive } from './interactive.js';
+import { ClawtError } from '../errors/index.js';
 
 /** enquirer MultiSelect 选项条目的运行时结构 */
 export interface MultiSelectChoice {
@@ -41,6 +43,10 @@ export type GroupedChoice = { name: string; message: string } | MultiSelectSepar
  * @returns {Promise<WorktreeInfo>} 用户选择的 worktree
  */
 export async function promptSelectBranch(worktrees: WorktreeInfo[], message: string): Promise<WorktreeInfo> {
+  // 非交互模式下无法进行交互选择，要求用户通过 -b 精确指定
+  if (isNonInteractive()) {
+    throw new ClawtError('非交互模式下无法进行分支选择，请通过 -b 参数精确指定分支名');
+  }
   // @ts-expect-error enquirer 类型声明未导出 Select 类，但运行时存在
   const selectedBranch: string = await new Enquirer.Select({
     message,
@@ -62,6 +68,10 @@ export async function promptSelectBranch(worktrees: WorktreeInfo[], message: str
  * @returns {Promise<WorktreeInfo[]>} 用户选择的 worktree 列表
  */
 export async function promptMultiSelectBranches(worktrees: WorktreeInfo[], message: string): Promise<WorktreeInfo[]> {
+  // 非交互模式下无法进行交互多选，要求用户通过 -b 精确指定
+  if (isNonInteractive()) {
+    throw new ClawtError('非交互模式下无法进行分支多选，请通过 -b 参数精确指定分支名');
+  }
   // 构建 choices 列表，顶部插入全选选项
   const branchChoices = worktrees.map((wt) => ({
     name: wt.branch,
@@ -131,6 +141,10 @@ export async function promptGroupedMultiSelectBranches(
   worktrees: WorktreeInfo[],
   message: string,
 ): Promise<WorktreeInfo[]> {
+  // 非交互模式下无法进行交互多选，要求用户通过 -b 精确指定
+  if (isNonInteractive()) {
+    throw new ClawtError('非交互模式下无法进行分支多选，请通过 -b 参数精确指定分支名');
+  }
   const groups = groupWorktreesByDate(worktrees);
   const choices = buildGroupedChoices(groups);
   const groupMembershipMap = buildGroupMembershipMap(groups);

package/src/utils/validate-branch.ts

@@ -5,6 +5,7 @@ import { checkBranchExists, createBranch, deleteBranch, getCurrentBranch, gitChe
 import { getMainWorkBranch } from './project-config.js';
 import { printWarning, confirmAction } from './formatter.js';
 import { ClawtError } from '../errors/index.js';
+import { isNonInteractive } from './interactive.js';
 
 /**
  * 生成验证分支名
@@ -88,6 +89,16 @@ export async function rebuildValidateBranch(branchName: string, cwd?: string): P
  * @param {string} [cwd] - 工作目录
  */
 export async function handleDirtyWorkingDir(cwd?: string): Promise<void> {
+  // 非交互模式下默认执行 stash（安全策略，不丢弃代码）
+  if (isNonInteractive()) {
+    gitAddAll(cwd);
+    gitStashPush('clawt:auto-stash', cwd);
+    if (!isWorkingDirClean(cwd)) {
+      throw new ClawtError('工作区仍然不干净，请手动处理');
+    }
+    return;
+  }
+
   printWarning('当前分支有未提交的更改，请选择处理方式：\n');
 
   // @ts-expect-error enquirer 类型声明未导出 Select 类，但运行时存在
@@ -159,7 +170,8 @@ export async function ensureOnMainWorkBranch(cwd?: string): Promise<void> {
 
   // 当前在其他分支上，警告并确认后处理脏工作区再切换
   printWarning(MESSAGES.GUARD_BRANCH_MISMATCH(mainBranch, currentBranch));
-  const confirmed = await confirmAction('是否继续执行？');
+  // 非交互模式下自动确认继续
+  const confirmed = isNonInteractive() ? true : await confirmAction('是否继续执行？');
   if (!confirmed) {
     throw new ClawtError(MESSAGES.DESTRUCTIVE_OP_CANCELLED);
   }

package/tests/unit/commands/cover-validate.test.ts

@@ -50,6 +50,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   confirmAction: vi.fn().mockResolvedValue(true),
   guardMainWorkBranch: vi.fn().mockResolvedValue(undefined),
   guardMainWorkBranchExists: vi.fn(),
+  isNonInteractive: vi.fn().mockReturnValue(false),
 }));
 
 import { registerCoverValidateCommand, extractTargetBranchName, findTargetWorktreePath, computeIncrementalPatch } from '../../../src/commands/cover-validate.js';

package/tests/unit/commands/merge.test.ts

@@ -78,6 +78,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   guardMainWorkBranch: vi.fn().mockResolvedValue(undefined),
   guardMainWorkBranchExists: vi.fn(),
   handleMergeConflict: vi.fn(),
+  isNonInteractive: vi.fn().mockReturnValue(false),
 }));
 
 import { registerMergeCommand } from '../../../src/commands/merge.js';

package/tests/unit/commands/remove.test.ts

@@ -56,6 +56,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   getCurrentBranch: vi.fn(),
   guardMainWorkBranch: vi.fn().mockResolvedValue(undefined),
   guardMainWorkBranchExists: vi.fn(),
+  isNonInteractive: vi.fn().mockReturnValue(false),
 }));
 
 import { registerRemoveCommand } from '../../../src/commands/remove.js';