@clawos-dev/clawd 0.2.198 → 0.2.199-beta.399.3cb813c

package/dist/cli.cjs

@@ -42956,6 +42956,18 @@ var SessionManager = class {
   // 由 observer 监听 jsonl user 行后调 recordRealUserUuid 建立映射；rewind 系列 RPC 在
   // 入参 / 出参做转译，保证 UI 看到的 uuid 始终是 events 流里的 synth uuid
   realUuidBySynth = /* @__PURE__ */ new Map();
+  // observer 收到 `turn_duration` 信号但屏幕还没稳定 5s → 挂进 pending，等 `notifyScreenIdle`
+  // （屏幕 armed=true 触发点）flush 成真正的 turn_end 进 reducer。
+  //
+  // 语义澄清：`turn_duration` 是 CC 报的原始信号（"本轮 API 调用完了"），**不代表 turn 真的结束**
+  //（背景 agent 可能还在跑）。屏幕 5s 稳定 + 无 popup 才是"确认信号"。
+  // 两者 AND 后 daemon 才产生真正的 `turn_end` 事件送给 reducer。
+  //
+  // pending 不设截止时间：屏幕稳定的时机由 CC UI 决定，可能几秒也可能几分钟。观察者以
+  // "屏幕真的稳定"作为触发点，signal-driven 而非 timer-driven。
+  //
+  // 清理点：newSession / stop / session-delete / stopAll。
+  pendingTurnDurationSignals = /* @__PURE__ */ new Set();
   // SessionStore 按 scope 派生（root = <dataDir>/sessions/<scopeSubPath>/）。
   // default scope 直接复用 deps.store；persona scope（owner / listener）第一次访问时按需创建并缓存。
   // 取代旧的 storesByAgent —— agentId 概念由 SessionScope 取代，路径即身份，
@@ -43576,6 +43588,7 @@ var SessionManager = class {
       this.runners.delete(args.sessionId);
       this.realUuidBySynth.delete(args.sessionId);
       this.lastUiSizeBySessionId.delete(args.sessionId);
+      this.clearPendingTurnEnd(args.sessionId);
       return { response: { sessionId: args.sessionId }, broadcast };
     }
     this.deleteOwned(args.sessionId);
@@ -43605,6 +43618,7 @@ var SessionManager = class {
   async stop(args) {
     const runner = this.runners.get(args.sessionId);
     if (!runner) return { response: { ok: true }, broadcast: [] };
+    this.clearPendingTurnEnd(args.sessionId);
     const { broadcast } = this.withCollector(() => {
       runner.input({ kind: "command", command: { kind: "stop" } });
     });
@@ -43738,6 +43752,7 @@ var SessionManager = class {
   newSession(args) {
     const existingFile = this.getFile(args.sessionId);
     const nextToolSessionId = this.deps.mode === "tui" && (existingFile.tool ?? "claude") === "claude" ? v4_default() : void 0;
+    this.clearPendingTurnEnd(args.sessionId);
     const runner = this.runners.get(args.sessionId);
     if (runner) {
       const { value, broadcast } = this.withCollector(() => {
@@ -43838,6 +43853,7 @@ var SessionManager = class {
     for (const r of this.runners.values()) {
       r.input({ kind: "command", command: { kind: "stop" } });
     }
+    this.pendingTurnDurationSignals.clear();
   }
   // 给 observer 用：拿已存在的 runner
   getActive(sessionId) {
@@ -44054,6 +44070,7 @@ var SessionManager = class {
       this.runners.delete(args.sessionId);
       this.realUuidBySynth.delete(args.sessionId);
       this.lastUiSizeBySessionId.delete(args.sessionId);
+      this.clearPendingTurnEnd(args.sessionId);
       return { response: { sessionId: args.sessionId }, broadcast };
     }
     this.storeFor(args.scope).delete(args.sessionId);
@@ -44305,35 +44322,87 @@ var SessionManager = class {
       const toolSessionId = runnerState.file.toolSessionId;
       const adapter = this.deps.getAdapter(runnerState.file.tool ?? "claude");
       const gateOpen = !adapter.canAcceptTurnEnd || !toolSessionId ? true : adapter.canAcceptTurnEnd(toolSessionId);
-      this.deps.screenIdleProbeLogger?.info("feedObserverEvents turn_end batch received", {
+      this.deps.screenIdleProbeLogger?.info("turn_duration signal received", {
         sessionId,
         toolSessionId,
         batchKinds: outEvents.map((e) => e.kind),
         gateOpen,
         hasCanAcceptGate: !!adapter.canAcceptTurnEnd
       });
-      if (!gateOpen) {
-        this.deps.logger?.info("drop turn_end (adapter gate closed)", {
-          sessionId,
-          toolSessionId,
-          reason: "tui-screen-not-idle"
-        });
-        this.deps.screenIdleProbeLogger?.info("drop turn_end: adapter gate closed", {
-          sessionId,
-          toolSessionId,
-          reason: "tui-screen-not-idle"
-        });
-        feedEvents = outEvents.filter((e) => e.kind !== "turn_end");
+      if (gateOpen) {
+        this.deps.screenIdleProbeLogger?.info(
+          "turn_duration \u2192 turn_end confirmed (gate open) \u2192 fed to reducer",
+          { sessionId, toolSessionId }
+        );
       } else {
-        this.deps.screenIdleProbeLogger?.info("turn_end passed gate \u2192 fed to reducer", {
-          sessionId,
-          toolSessionId
-        });
+        feedEvents = outEvents.filter((e) => e.kind !== "turn_end");
+        if (this.pendingTurnDurationSignals.has(sessionId)) {
+          this.deps.screenIdleProbeLogger?.info(
+            "turn_duration dedup: pending already set (repeated observer signal)",
+            { sessionId, toolSessionId }
+          );
+        } else {
+          this.pendingTurnDurationSignals.add(sessionId);
+          this.deps.screenIdleProbeLogger?.info(
+            "turn_duration pending: gate closed \u2192 waiting for screen-idle signal",
+            { sessionId, toolSessionId }
+          );
+        }
       }
     }
     if (feedEvents.length === 0) return;
     runner.feedObserverEvents(feedEvents);
   }
+  /**
+   * `ClaudeTuiAdapter.observeScreenIdle` fire triggered → armed=true 时调用（一次性触发点）。
+   *
+   * 语义：屏幕真的稳定了 5s。查有没有 pending 的 turn_duration 信号：
+   *   - 有 → 之前收到的 turn_duration 被屏幕稳定**确认**了，flush 成 turn_end 进 reducer
+   *   - 无 → 屏幕稳定但从没收到 turn_duration → noop（不生成 turn_end；补偿路径的错误做法）
+   *
+   * pending 集合是**必要前提**：turn_end 只能来自"observer 收 turn_duration + 屏幕后续稳定"
+   * 双源确认，任何一个缺少都不能 emit。这跟 PR #962 拆掉的 dispatchTurnIdle "屏幕静止就补
+   * turn_end" 语义不同。
+   *
+   * 仅 TUI 模式；SDK / codex 没有屏幕信号也就不会触发本方法。
+   */
+  notifyScreenIdle(toolSessionId) {
+    if (this.deps.mode !== "tui") return;
+    const sid = this.sessionIdByToolSid(toolSessionId);
+    if (!sid) {
+      this.deps.screenIdleProbeLogger?.warn("notifyScreenIdle: no session for toolSessionId", {
+        toolSessionId
+      });
+      return;
+    }
+    if (!this.pendingTurnDurationSignals.has(sid)) {
+      this.deps.screenIdleProbeLogger?.info(
+        "notifyScreenIdle: no pending turn_duration \u2192 noop",
+        { sessionId: sid, toolSessionId }
+      );
+      return;
+    }
+    const runner = this.runners.get(sid);
+    if (!runner) {
+      this.pendingTurnDurationSignals.delete(sid);
+      this.deps.screenIdleProbeLogger?.warn(
+        "notifyScreenIdle: pending but no runner \u2192 cleared without inject",
+        { sessionId: sid, toolSessionId }
+      );
+      return;
+    }
+    this.pendingTurnDurationSignals.delete(sid);
+    this.deps.screenIdleProbeLogger?.info(
+      "notifyScreenIdle: pending turn_duration + screen idle confirmed \u2192 inject turn_end",
+      { sessionId: sid, toolSessionId }
+    );
+    runner.input({ kind: "inject-events", events: [{ kind: "turn_end" }] });
+  }
+  clearPendingTurnEnd(sessionId) {
+    if (this.pendingTurnDurationSignals.delete(sessionId)) {
+      this.deps.screenIdleProbeLogger?.info("pending turn_duration cleared", { sessionId });
+    }
+  }
   // AskUserQuestion 表单回写（plan: clawd-ask-user-question）：UI 答完所有 question 后调用。
   // - session 不存在 / 无 runner → noop 幂等返回 ok（first-decider-wins）
   // - reducer noop（toolUseId 不存在或已答过）也保持幂等返回，handler 不抛
@@ -47404,6 +47473,9 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
     const screenIdleObserver = observeScreenIdle(surface, {
       idleMs: SCREEN_IDLE_MS,
       onIdle: () => {
+        if (!ctx.toolSessionId || !this.tuiOpts.onScreenIdle) return;
+        this.tuiLogger?.debug("screen-idle \u2192 notifyScreenIdle", { toolSessionId: ctx.toolSessionId });
+        this.tuiOpts.onScreenIdle(ctx.toolSessionId);
       },
       getPopupVisible: () => popupObserver.visibleKind !== null,
       // 取证 probe（可选，装配处传独立 file-only logger，跟主 daemon.log 解耦）
@@ -57896,6 +57968,8 @@ async function startDaemon(config) {
     onSurfaceUnregister: (tsid) => manager.unregisterSurface(tsid),
     // ReadyGate v2：ReadyDetector emit ready 时投递 reducer 'ready-detected' input
     onReady: (tsid) => manager.dispatchReadyDetected(tsid),
+    // 屏幕真稳定 5s 的一次性信号 → manager 查 pending turn_duration 并 flush 成 turn_end
+    onScreenIdle: (tsid) => manager.notifyScreenIdle(tsid),
     // 取证 probe（默认无条件启用；见 createFileOnlyLogger）
     screenIdleProbeLogger
   }) : new ClaudeAdapter({ logger, historyReader: new ClaudeHistoryReader() });

package/package.json

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