@clawos-dev/clawd 0.2.414 → 0.2.415

package/dist/cli.cjs

@@ -45085,6 +45085,9 @@ function cloneState(s) {
     procAlive: s.procAlive,
     seenUuids: s.seenUuids,
     subSessionMeta: s.subSessionMeta,
+    // 浅拷贝：下方 trackBackgroundTask 在 next 上原地增删，不能共享调用方数组（纯函数契约）
+    pendingBgTasks: s.pendingBgTasks ? s.pendingBgTasks.slice() : void 0,
+    stdinClosed: s.stdinClosed,
     // ReadyGate v2：readyForSend 是基础类型直接复制；pendingSend 必须浅拷贝防止
     // reduce 内 push/shift 在调用方原 state 上副作用（reducer 纯函数契约）
     readyForSend: s.readyForSend,
@@ -45372,6 +45375,16 @@ function pushEventToBufferInPlace(next, event, deps) {
   const isTurnEnd = withSeq.kind === "turn_end";
   const isUserText = withSeq.kind === "user_text";
   const isBackgroundEvent = withSeq.kind === "subagent_progress";
+  if (isBackgroundEvent) {
+    const bg = withSeq;
+    const done = bg.status === "completed" || bg.status === "failed";
+    const pending = next.pendingBgTasks ?? [];
+    if (done) {
+      next.pendingBgTasks = pending.filter((id) => id !== bg.agentId);
+    } else if (bg.agentId && !pending.includes(bg.agentId)) {
+      next.pendingBgTasks = [...pending, bg.agentId];
+    }
+  }
   if (isTurnEnd && next.turnOpen && isLateTurnEnd(withSeq, next.turnStartedAt, deps.now())) {
     return [emitSessionEvent(next.file.sessionId, withSeq)];
   }
@@ -45427,13 +45440,22 @@ function pushEventToBufferInPlace(next, event, deps) {
         status: "running-idle"
       }
     });
-    const idleKillMs = idleKillDelayOf(next);
-    if (idleKillMs !== void 0) {
-      effects.push({
-        kind: "schedule-idle-kill",
-        sessionId: next.file.sessionId,
-        ms: idleKillMs
-      });
+    const tool = next.file.tool ?? "claude";
+    const canCloseStdin = tool === "claude" && deps.mode !== "tui" && (next.pendingBgTasks?.length ?? 0) === 0;
+    if (canCloseStdin) {
+      next.stdinClosed = true;
+      effects.push({ kind: "close-stdin" });
+    } else if (tool === "codex") {
+      effects.push({ kind: "kill", signal: "SIGTERM" });
+    } else {
+      const idleKillMs = idleKillDelayOf(next);
+      if (idleKillMs !== void 0) {
+        effects.push({
+          kind: "schedule-idle-kill",
+          sessionId: next.file.sessionId,
+          ms: idleKillMs
+        });
+      }
     }
   }
   return effects;
@@ -45468,12 +45490,16 @@ function applyCommand(state, command, deps) {
           });
         }
       }
+      if (next.procAlive && next.stdinClosed) {
+        effects.push({ kind: "kill", signal: "SIGKILL" });
+        next.procAlive = false;
+        next.stdinClosed = false;
+      }
       if (!next.procAlive) {
         next.procAlive = true;
         next.freshSpawn = true;
+        next.stdinClosed = false;
         next.buffer = [];
-        next.bufferStartSeq = 0;
-        next.nextSeq = 0;
         next.turnOpen = false;
         next.turnStartedAt = null;
         next.status = "running";
@@ -45559,8 +45585,6 @@ function applyCommand(state, command, deps) {
       next.procAlive = true;
       next.freshSpawn = true;
       next.buffer = [];
-      next.bufferStartSeq = 0;
-      next.nextSeq = 0;
       next.turnOpen = false;
       next.turnStartedAt = null;
       next.status = "running";
@@ -45741,6 +45765,8 @@ function reduceSessionInner(state, input, deps) {
       const next = cloneState(state);
       next.procAlive = false;
       next.status = "stopped";
+      next.stdinClosed = false;
+      next.pendingBgTasks = [];
       const interruptEffects = next.turnOpen ? pushEventToBufferInPlace(next, { kind: "turn_end", reason: "interrupted" }, deps) : [];
       resetReadyGate(next);
       const sessionId = next.file.sessionId;
@@ -46234,8 +46260,7 @@ var SessionRunner = class {
       timer.unref?.();
       this.pendingControlRequests.set(requestId, { resolve: resolve9, reject, timer });
       try {
-        proc.stdin?.write(payload);
-        this.recorder?.tapStdinWrite(payload);
+        if (!this.writeStdin(payload)) throw new Error(`stdin closed: ${subtype}`);
       } catch (err) {
         clearTimeout(timer);
         this.pendingControlRequests.delete(requestId);
@@ -46293,6 +46318,9 @@ var SessionRunner = class {
         }
         this.doKill(effect.signal);
         break;
+      case "close-stdin":
+        this.proc?.stdin?.end();
+        break;
       case "write-stdin":
         if (this.session) {
           this.session.startTurn(effect.payload);
@@ -46304,8 +46332,7 @@ var SessionRunner = class {
           len: effect.payload.length,
           preview: effect.payload.replace(/\x1b\[20[01]~/g, "\xB7paste\xB7").slice(0, 60)
         });
-        this.proc?.stdin?.write(effect.payload);
-        this.recorder?.tapStdinWrite(effect.payload);
+        this.writeStdin(effect.payload);
         break;
       case "respond-permission": {
         if (this.session) {
@@ -46313,14 +46340,12 @@ var SessionRunner = class {
           break;
         }
         const payload = encodePermissionResponse(effect.requestId, effect.allow, effect.input, effect.message);
-        this.proc?.stdin?.write(payload);
-        this.recorder?.tapStdinWrite(payload);
+        this.writeStdin(payload);
         break;
       }
       case "send-control-response-allow-with-input": {
         const payload = encodeAllowWithInputControlResponse(effect.requestId, effect.updatedInput);
-        this.proc?.stdin?.write(payload);
-        this.recorder?.tapStdinWrite(payload);
+        this.writeStdin(payload);
         break;
       }
       case "persist-file":
@@ -46427,6 +46452,7 @@ var SessionRunner = class {
       now: this.hooks.now
     });
     proc.stdout?.on("data", (chunk) => {
+      if (this.proc !== proc) return;
       const { newBuf, lines } = splitStdoutChunk(this.stdoutBuf, chunk);
       this.stdoutBuf = newBuf;
       for (const line of lines) {
@@ -46435,10 +46461,21 @@ var SessionRunner = class {
       }
     });
     proc.stderr?.on("data", (chunk) => {
+      if (this.proc !== proc) return;
       const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
       this.hooks.logger?.warn("tool stderr", { line: text.slice(0, 500) });
     });
+    const stdin = proc.stdin;
+    if (stdin && typeof stdin.on === "function") {
+      stdin.on("error", (err) => {
+        this.hooks.logger?.warn("stdin error (write dropped)", {
+          sessionId: this.state.file.sessionId,
+          message: err.message
+        });
+      });
+    }
     proc.on("exit", (code) => {
+      if (this.proc !== proc) return;
       this.proc = null;
       this.recorder = null;
       this.rejectAllPending(new Error("session gone"));
@@ -46446,11 +46483,33 @@ var SessionRunner = class {
       this.input({ kind: "proc-exit", code });
     });
     proc.on("error", (err) => {
+      if (this.proc !== proc) return;
       const message = err.message;
       this.hooks.logger?.error("claude spawn failed", { message });
       this.input({ kind: "proc-error", message });
     });
   }
+  /**
+   * stdin 唯一写入口。stdin 已 EOF（close-stdin 收进程收尾中）时丢弃并告警——写进已关闭的
+   * 管道会抛 EPIPE 把 daemon 打崩。reducer 侧保证正常路径不会撞上（send 遇 stdinClosed 先
+   * kill 再 spawn），这道闸兜的是 permission / 问答回写等异步路径：它们的 effect 可能在
+   * turn_end 关 stdin 之后才被执行。
+   *
+   * recorder tap 收在这里，保证"写成功才录"，录制流与真实字节流不分叉。
+   */
+  writeStdin(payload) {
+    const stdin = this.proc?.stdin;
+    if (!stdin || stdin.writableEnded) {
+      this.hooks.logger?.warn("stdin write dropped: pipe already closed", {
+        sessionId: this.state.file.sessionId,
+        len: payload.length
+      });
+      return false;
+    }
+    stdin.write(payload);
+    this.recorder?.tapStdinWrite(payload);
+    return true;
+  }
   // kill 当前 proc：单发 signal，没有"先 TERM 后 KILL"的兜底。
   // reducer 推下来的 signal 是 SIGKILL（见 reducer.ts 各 kill 推送处）——选择 SIGKILL
   // 是因为 CC 在 streaming hang / 等 control_response / API 半连接 等场景下不响应 SIGTERM，
@@ -46550,6 +46609,9 @@ function makeInitialState(file, subSessionMeta) {
     procAlive: false,
     seenUuids: [],
     subSessionMeta,
+    // 后台任务台账（close-stdin 判据）；由 subagent_progress 事件流维护，spawn 时天然为空
+    pendingBgTasks: [],
+    stdinClosed: false,
     // ReadyGate v2：默认值兼容 SDK happy path（直写 stdin，不走队列）。
     // TUI 模式由 reducer send 分支按 deps.mode='tui' 主动翻 readyForSend=false
     readyForSend: true,
@@ -62216,7 +62278,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.414".length > 0 ? "0.2.414" : "dev";
+var version = "0.2.415".length > 0 ? "0.2.415" : "dev";
 
 // src/cli-probe/probe.ts
 var fs65 = __toESM(require("fs"), 1);

package/package.json

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