@clawos-dev/clawd 0.2.681 → 0.2.683

package/dist/cli.cjs

@@ -48418,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);
@@ -49158,6 +49158,14 @@ function encodeAllowWithInputControlResponse(requestId, updatedInput) {
 }
 var DEFAULT_WAIT_STOP_TIMEOUT_MS = 3e3;
 var SUBAGENT_ACTIVE_WINDOW_MS = 3e5;
+function latestTurnId(state) {
+  for (let index = state.buffer.length - 1; index >= 0; index--) {
+    const event = state.buffer[index].event;
+    if (event.turnId) return event.turnId;
+    if (event.kind === "user_text") return void 0;
+  }
+  return void 0;
+}
 var SessionRunner = class {
   constructor(initial, hooks) {
     this.hooks = hooks;
@@ -49170,6 +49178,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();
@@ -49216,6 +49225,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;
@@ -49408,20 +49418,11 @@ var SessionRunner = class {
   }
   lifecycleMetadata() {
     const state = this.state;
-    let turnId;
-    for (let index = state.buffer.length - 1; index >= 0; index--) {
-      const event = state.buffer[index].event;
-      if (event.turnId) {
-        turnId = event.turnId;
-        break;
-      }
-      if (event.kind === "user_text") break;
-    }
     return {
       sessionId: state.file.sessionId,
       tool: state.file.tool,
       toolSessionId: state.file.toolSessionId,
-      turnId,
+      turnId: latestTurnId(state),
       status: state.status,
       turnOpen: state.turnOpen,
       procAlive: state.procAlive
@@ -49581,25 +49582,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) {
@@ -49607,8 +49618,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);
@@ -50745,6 +50759,11 @@ var SessionManager = class {
     const runner = this.runners.get(sessionId);
     return runner?.getState() ?? null;
   }
+  /** Native id of the turn this daemon is running right now; null when no foreground turn is open. */
+  openTurnId(sessionId) {
+    const state = this.runners.get(sessionId)?.getState();
+    return state?.turnOpen ? latestTurnId(state) ?? null : null;
+  }
   // 等真实 proc-exit 再 ack，避免调用方开始删除 worktree 时进程仍持文件锁；超时向上报错。
   async stop(args) {
     const file = this.findOwnedSession(args.sessionId);
@@ -73480,6 +73499,13 @@ function slimHistoryMessages(messages) {
     return out;
   });
 }
+function markOpenTurnInProgress(page, openTurnId) {
+  if (page.view !== "turns" || !openTurnId) return page;
+  return {
+    ...page,
+    data: page.data.map((turn) => turn.id === openTurnId && turn.status === "interrupted" ? { ...turn, status: "inProgress" } : turn)
+  };
+}
 function assertGuestPath(ctx, absPath, personaRoot, method, usersRoot) {
   if (!ctx || ctx.principal.kind !== "guest" || !personaRoot) return;
   const userWorkDir = usersRoot ? deriveUserWorkDir(ctx.principal.id, usersRoot) : void 0;
@@ -73548,6 +73574,7 @@ function buildHistoryHandlers(deps) {
     if (args.view) {
       const reader = getHistoryReader(f2.tool ?? "claude", f2.cloudEnvironment);
       if (!reader.readPage) throw new Error("This engine does not support turn history paging");
+      const openTurnId = manager.openTurnId(args.sessionId);
       const page = await reader.readPage({
         cwd: f2.cwd,
         toolSessionId: f2.toolSessionId,
@@ -73557,7 +73584,7 @@ function buildHistoryHandlers(deps) {
         turnId: args.turnId,
         snapshotId: args.snapshotId
       });
-      return { response: { type: "history:read", ...page } };
+      return { response: { type: "history:read", ...markOpenTurnInProgress(page, openTurnId) } };
     }
     let res;
     try {
@@ -75323,7 +75350,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.681".length > 0 ? "0.2.681" : "dev";
+var version = "0.2.683".length > 0 ? "0.2.683" : "dev";
 
 // src/cli-probe/probe.ts
 var fs86 = __toESM(require("fs"), 1);