@clawos-dev/clawd 0.2.680 → 0.2.682

package/dist/cli.cjs

@@ -47952,7 +47952,6 @@ function cloneState(s2) {
     bufferStartSeq: s2.bufferStartSeq,
     turnOpen: s2.turnOpen,
     turnStartedAt: s2.turnStartedAt,
-    turnSelfWoke: s2.turnSelfWoke,
     pendingPermissions: s2.pendingPermissions,
     pendingQuestions: s2.pendingQuestions,
     freshSpawn: s2.freshSpawn,
@@ -47975,14 +47974,6 @@ function idleKillDelayOf(state) {
   const ms = state.subSessionMeta?.idleKillDelayMs;
   return ms !== void 0 && ms > 0 ? ms : void 0;
 }
-var STALE_TURN_END_TOLERANCE_MS = 2e3;
-function isLateTurnEnd(event, turnStartedAt, now) {
-  if (event.kind !== "turn_end") return false;
-  const durationMs = event.durationMs;
-  if (typeof durationMs !== "number" || typeof turnStartedAt !== "number") return false;
-  const elapsed = now - turnStartedAt;
-  return durationMs > elapsed + STALE_TURN_END_TOLERANCE_MS;
-}
 function tryFlushPending(state, deps) {
   if (!state.readyForSend || state.pendingSend.length === 0) return [];
   const text = state.pendingSend.shift();
@@ -48350,9 +48341,6 @@ function pushEventToBufferInPlace(next, event, deps) {
       next.pendingBgTasks = [...pending, bg.agentId];
     }
   }
-  if (isTurnEnd && next.turnOpen && !next.turnSelfWoke && isLateTurnEnd(withSeq, next.turnStartedAt, deps.now())) {
-    return [emitSessionEvent(next.file.sessionId, withSeq)];
-  }
   if (isTurnEnd) {
     const te2 = withSeq;
     if (te2.durationMs === void 0 && typeof next.turnStartedAt === "number") {
@@ -48363,7 +48351,6 @@ function pushEventToBufferInPlace(next, event, deps) {
   } else if (!isBackgroundEvent && !isSessionInit && !next.turnOpen) {
     next.turnOpen = true;
     next.turnStartedAt = deps.now();
-    next.turnSelfWoke = next.status === "running-idle";
   }
   if (!next.turnOpen && next.buffer.length > deps.bufferCap) {
     const remove = next.buffer.length - deps.bufferCap;
@@ -48431,7 +48418,7 @@ function pushEventToBufferInPlace(next, event, deps) {
       next.stdinClosed = true;
       effects.push({ kind: "close-stdin" });
     } else if (isRpcAgentTool(tool) && !isCloudTool(tool)) {
-      if (tool === PI_TOOL_ID) next.stdinClosed = true;
+      next.stdinClosed = true;
       effects.push({ kind: "kill", signal: "SIGTERM" });
     } else {
       const idleKillMs = idleKillDelayOf(next);
@@ -49183,6 +49170,7 @@ var SessionRunner = class {
   // JSON-RPC 类 agent(codex app-server) 的 per-session 驱动器；非 null 时 runner 不用 spawn()/ChildProcess，
   // effect 路由到 session 一等方法（startTurn/respondPermission/answerQuestion/interrupt/stop）。claude 恒 null。
   session = null;
+  sessionGeneration = 0;
   stdoutBuf = "";
   // 未决 control_request 表；key = request_id
   pendingControlRequests = /* @__PURE__ */ new Map();
@@ -49229,6 +49217,7 @@ var SessionRunner = class {
     };
     const { state, effects } = reduceSession(this.state, inputMsg, deps);
     this.state = state;
+    if (this.session && effects.some((effect) => effect.kind === "spawn")) this.sessionGeneration++;
     for (const e of effects) this.applyEffect(e, inputMsg);
     if (!this.state.procAlive && this.stopWaiters.length > 0) {
       const waiters = this.stopWaiters;
@@ -49594,25 +49583,35 @@ var SessionRunner = class {
       return;
     }
     if (this.hooks.adapter.createSession) {
-      this.session = this.hooks.adapter.createSession(ctx, {
+      const generation = ++this.sessionGeneration;
+      const isCurrent = () => this.sessionGeneration === generation;
+      const session = this.hooks.adapter.createSession(ctx, {
         pushEvents: (events) => {
-          if (events.length === 0) return;
+          if (!isCurrent() || events.length === 0) return;
           const uuid = (this.hooks.genUuid ?? import_node_crypto4.randomUUID)();
           this.input({ kind: "inject-events", events: events.map((e) => e.uuid ? e : { ...e, uuid }) });
         },
         onExit: (code) => {
+          if (!isCurrent()) return;
+          this.sessionGeneration++;
           this.session = null;
           this.clearIdleKillTimers();
           this.input({ kind: "proc-exit", code });
         },
-        onError: (message) => this.input({ kind: "proc-error", message }),
-        onHistoryGap: (synchronized) => this.hooks.broadcastFrame({
-          type: "session:control",
-          sessionId: this.state.file.sessionId,
-          kind: CLOUD_HISTORY_REFRESH_KIND,
-          synchronized
-        }, "broadcast"),
+        onError: (message) => {
+          if (isCurrent()) this.input({ kind: "proc-error", message });
+        },
+        onHistoryGap: (synchronized) => {
+          if (!isCurrent()) return;
+          this.hooks.broadcastFrame({
+            type: "session:control",
+            sessionId: this.state.file.sessionId,
+            kind: CLOUD_HISTORY_REFRESH_KIND,
+            synchronized
+          }, "broadcast");
+        },
         onCommandPrepared: (commandId, text, prepared) => {
+          if (!isCurrent()) return false;
           const pending = this.state.file.cloudPendingTurns?.find((turn) => turn.id === commandId) ?? this.state.file.cloudPendingCommand;
           if (!pending || pending.id !== commandId) return false;
           if (!prepared && pending !== this.state.file.cloudPendingCommand) {
@@ -49620,8 +49619,11 @@ var SessionRunner = class {
           }
           return true;
         },
-        onCloudTurnTerminal: (turnId) => this.input({ kind: "cloud-turn-terminal", turnId })
+        onCloudTurnTerminal: (turnId) => {
+          if (isCurrent()) this.input({ kind: "cloud-turn-terminal", turnId });
+        }
       });
+      if (isCurrent()) this.session = session;
       return;
     }
     const proc = this.hooks.spawnOverride ? this.hooks.spawnOverride(ctx) : this.hooks.adapter.spawn(ctx);
@@ -75336,7 +75338,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.680".length > 0 ? "0.2.680" : "dev";
+var version = "0.2.682".length > 0 ? "0.2.682" : "dev";
 
 // src/cli-probe/probe.ts
 var fs86 = __toESM(require("fs"), 1);

package/package.json

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