@clawos-dev/clawd 0.2.9 → 0.2.10

package/dist/cli.cjs

@@ -13048,7 +13048,7 @@ function applyCommand(state, command, deps) {
       next.pendingPermissions = {};
       if (next.procAlive) {
         next.status = "stopping";
-        effects.push({ kind: "kill", signal: "SIGTERM", graceMs: 5e3 });
+        effects.push({ kind: "kill", signal: "SIGKILL" });
       }
       return { state: next, effects };
     }
@@ -13073,7 +13073,7 @@ function applyCommand(state, command, deps) {
     case "delete": {
       next.pendingPermissions = {};
       if (next.procAlive) {
-        effects.push({ kind: "kill", signal: "SIGTERM", graceMs: 5e3 });
+        effects.push({ kind: "kill", signal: "SIGKILL" });
       }
       effects.push({ kind: "delete-file" });
       effects.push({
@@ -13091,7 +13091,7 @@ function applyCommand(state, command, deps) {
       effects.push({ kind: "persist-file", file: next.file });
       effects.push(sessionInfoFrame(next.file));
       if (runtimePatch && next.procAlive) {
-        effects.push({ kind: "kill", signal: "SIGTERM", graceMs: 5e3 });
+        effects.push({ kind: "kill", signal: "SIGKILL" });
       }
       return { state: next, effects };
     }
@@ -13105,7 +13105,7 @@ function applyCommand(state, command, deps) {
       effects.push({ kind: "persist-file", file: nextFile });
       effects.push(sessionInfoFrame(nextFile));
       if (next.procAlive) {
-        effects.push({ kind: "kill", signal: "SIGTERM", graceMs: 5e3 });
+        effects.push({ kind: "kill", signal: "SIGKILL" });
       }
       return { state: next, effects };
     }
@@ -13135,7 +13135,7 @@ function applyCommand(state, command, deps) {
       effects.push({ kind: "persist-file", file: nextFile });
       effects.push(sessionInfoFrame(nextFile));
       if (next.procAlive) {
-        effects.push({ kind: "kill", signal: "SIGTERM", graceMs: 5e3 });
+        effects.push({ kind: "kill", signal: "SIGKILL" });
       }
       return { state: next, effects };
     }
@@ -13257,6 +13257,7 @@ function reduceSession(state, input, deps) {
 
 // src/session/runner.ts
 var DEFAULT_CONTROL_REQUEST_TIMEOUT_MS = 1e4;
+var DEFAULT_WAIT_STOP_TIMEOUT_MS = 3e3;
 var SessionRunner = class {
   constructor(initial, hooks) {
     this.hooks = hooks;
@@ -13268,6 +13269,8 @@ var SessionRunner = class {
   stdoutBuf = "";
   // 未决 control_request 表；key = request_id
   pendingControlRequests = /* @__PURE__ */ new Map();
+  // waitUntilStopped 排队的 resolve 回调；reducer 把 procAlive 翻成 false 后批量触发
+  stopWaiters = [];
   getState() {
     return this.state;
   }
@@ -13284,6 +13287,40 @@ var SessionRunner = class {
     const { state, effects } = reduceSession(this.state, inputMsg, deps);
     this.state = state;
     for (const e of effects) this.applyEffect(e);
+    if (!this.state.procAlive && this.stopWaiters.length > 0) {
+      const waiters = this.stopWaiters;
+      this.stopWaiters = [];
+      for (const w of waiters) w();
+    }
+  }
+  // 等子进程退出（procAlive=false）。manager.stop 在发完 SIGTERM 后调它确保
+  // 真停下来再 ack 给前端，从而避免"删 worktree 时 CC 还活着持有文件锁"的 race。
+  // 已经停止则立即 resolve；超时（默认 3000ms）抛错由上层透传成 RPC error
+  async waitUntilStopped(timeoutMs = DEFAULT_WAIT_STOP_TIMEOUT_MS) {
+    if (!this.state.procAlive) return;
+    return new Promise((resolve, reject) => {
+      let settled = false;
+      const onStop = () => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timer);
+        resolve();
+      };
+      const timer = setTimeout(() => {
+        if (settled) return;
+        settled = true;
+        const i = this.stopWaiters.indexOf(onStop);
+        if (i >= 0) this.stopWaiters.splice(i, 1);
+        const pid = this.proc?.pid ?? "n/a";
+        reject(
+          new Error(
+            `wait stop timeout ${timeoutMs}ms: status=${this.state.status} procAlive=${this.state.procAlive} pid=${pid}`
+          )
+        );
+      }, timeoutMs);
+      timer.unref?.();
+      this.stopWaiters.push(onStop);
+    });
   }
   // 观察者 / 测试直接喂单行 stdout 进 reducer：保证 seq 分配走统一路径
   // 等价于往内部 stdout line buffer 里写完整一行
@@ -13374,7 +13411,7 @@ var SessionRunner = class {
         this.doSpawn(effect.ctx);
         break;
       case "kill":
-        this.doKill(effect.signal, effect.graceMs);
+        this.doKill(effect.signal);
         break;
       case "write-stdin":
         this.proc?.stdin?.write(effect.payload);
@@ -13431,22 +13468,16 @@ var SessionRunner = class {
       this.input({ kind: "proc-error", message: err.message });
     });
   }
-  // kill 当前 proc，graceMs 后强杀
-  doKill(signal, graceMs) {
+  // kill 当前 proc：单发 signal，没有"先 TERM 后 KILL"的兜底。
+  // reducer 推下来的 signal 是 SIGKILL（见 reducer.ts 各 kill 推送处）——选择 SIGKILL
+  // 是因为 CC 在 streaming hang / 等 control_response / API 半连接 等场景下不响应 SIGTERM，
+  // 直接 SIGKILL 一次到位。代价是 CC 来不及落盘当前轮 jsonl，但 observer 路径已经回灌过。
+  doKill(signal) {
     if (!this.proc) return;
-    const p = this.proc;
     try {
-      p.kill(signal);
+      this.proc.kill(signal);
     } catch {
     }
-    if (graceMs && graceMs > 0) {
-      setTimeout(() => {
-        try {
-          p.kill("SIGKILL");
-        } catch {
-        }
-      }, graceMs).unref();
-    }
   }
 };
 
@@ -13679,12 +13710,17 @@ var SessionManager = class {
     });
     return { response: { ok: true }, broadcast };
   }
-  stop(args) {
+  // 等子进程真退出再 ack。reducer 推 SIGKILL effect（见 reducer.ts），内核立即回收子进程，
+  // proc.on('exit') 几乎瞬时触发；waitUntilStopped 的 3s 超时只在子进程已是 zombie 或
+  // 极端 OS 异常时才会用上。这样修掉了"前端 sessionStop 还没等 CC 退就去删 worktree
+  // 撞文件锁"的 race，同时也覆盖 CC streaming hang / 幽灵进程这类 SIGTERM 杀不动的 case
+  async stop(args) {
     const runner = this.runners.get(args.sessionId);
     if (!runner) return { response: { ok: true }, broadcast: [] };
     const { broadcast } = this.withCollector(() => {
       runner.input({ kind: "command", command: { kind: "stop" } });
     });
+    await runner.waitUntilStopped();
     return { response: { ok: true }, broadcast };
   }
   // 温柔中断当前轮次：不杀进程，仅发 CC IPC `control_request.subtype=interrupt`
@@ -17246,7 +17282,7 @@ function buildSessionHandlers(deps) {
   };
   const stop = async (frame) => {
     const args = SessionIdArgs.parse(frame);
-    const { broadcast } = manager.stop(args);
+    const { broadcast } = await manager.stop(args);
     return { response: { type: "session:stop", ok: true }, broadcast };
   };
   const interrupt = async (frame) => {
@@ -17460,6 +17496,17 @@ var import_node_os10 = __toESM(require("os"), 1);
 var import_node_path15 = __toESM(require("path"), 1);
 var import_node_util = require("util");
 var pexec = (0, import_node_util.promisify)(import_node_child_process5.execFile);
+function formatChildProcessError(err) {
+  const e = err;
+  const stderrLine = (e.stderr ?? "").split("\n").map((s) => s.trim()).find((s) => s.length > 0);
+  if (stderrLine) return stderrLine;
+  const parts = [];
+  if (e.killed) parts.push("killed");
+  if (e.signal) parts.push(`signal=${e.signal}`);
+  if (e.code !== void 0 && e.code !== null) parts.push(`code=${e.code}`);
+  if (parts.length > 0) return parts.join(" ");
+  return e.message ?? "unknown error";
+}
 function normalizePath(p) {
   const resolved = import_node_path15.default.resolve(p);
   try {
@@ -17625,9 +17672,7 @@ async function createWorktree(input) {
       { timeout: 15e3 }
     );
   } catch (err) {
-    const stderr = err.stderr || err.message;
-    const firstLine = stderr.split("\n")[0].trim();
-    throw new Error(`\u521B\u5EFA worktree \u5931\u8D25\uFF1A${firstLine}`);
+    throw new Error(`\u521B\u5EFA worktree \u5931\u8D25\uFF1A${formatChildProcessError(err)}`);
   }
   return { worktreeRoot, branch, baseBranch };
 }
@@ -17656,23 +17701,21 @@ async function removeWorktree(input) {
         timeout: 1e4
       });
     } catch (err) {
-      const stderr = err.stderr || err.message;
+      const stderr = err.stderr ?? "";
       const lower = stderr.toLowerCase();
       const vanished = lower.includes("not a working tree") || lower.includes("is not a working tree") || !import_node_fs16.default.existsSync(worktreeRoot);
       if (!vanished) {
-        const firstLine = stderr.split("\n")[0].trim();
-        throw new Error(`\u6E05\u7406 worktree \u5931\u8D25\uFF1A${firstLine}`);
+        throw new Error(`\u6E05\u7406 worktree \u5931\u8D25\uFF1A${formatChildProcessError(err)}`);
       }
     }
     try {
       await pexec("git", ["-C", repoRoot, "branch", "-D", worktreeBranch], { timeout: 5e3 });
     } catch (err) {
-      const stderr = err.stderr || err.message;
+      const stderr = err.stderr ?? "";
       const lower = stderr.toLowerCase();
       const vanished = lower.includes("not found") || lower.includes("no such");
       if (!vanished) {
-        const firstLine = stderr.split("\n")[0].trim();
-        throw new Error(`\u6E05\u7406\u5206\u652F\u5931\u8D25\uFF1A${firstLine}`);
+        throw new Error(`\u6E05\u7406\u5206\u652F\u5931\u8D25\uFF1A${formatChildProcessError(err)}`);
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",