clawt 3.6.1 → 3.6.2

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) {
@@ -4216,7 +4221,8 @@ function invokeClaudeForConflictResolve(prompt, cwd) {
       cwd,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
-      timeout: getConflictResolveTimeout()
+      timeout: getConflictResolveTimeout(),
+      env: getEnvWithoutNestedSessionFlag()
     });
     return output;
   } catch (error) {

package/package.json

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

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) {

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(),
   });
 }