@clawos-dev/clawd 0.2.197-beta.396.cf8bb30 → 0.2.198-beta.397.035eade

package/dist/cli.cjs

@@ -42956,9 +42956,6 @@ var SessionManager = class {
   // 由 observer 监听 jsonl user 行后调 recordRealUserUuid 建立映射；rewind 系列 RPC 在
   // 入参 / 出参做转译，保证 UI 看到的 uuid 始终是 events 流里的 synth uuid
   realUuidBySynth = /* @__PURE__ */ new Map();
-  // observeScreenIdle 复合条件闸用：sessionId → observer 上次喂出业务事件的时刻（deps.now()）。
-  // observerIdleWaitMs 据此判 observer 是否也静止 ≥ idleMs（屏幕静止 AND observer 静止才补 turn_end）。
-  lastObserverEventAt = /* @__PURE__ */ new Map();
   // SessionStore 按 scope 派生（root = <dataDir>/sessions/<scopeSubPath>/）。
   // default scope 直接复用 deps.store；persona scope（owner / listener）第一次访问时按需创建并缓存。
   // 取代旧的 storesByAgent —— agentId 概念由 SessionScope 取代，路径即身份，
@@ -43579,7 +43576,6 @@ var SessionManager = class {
       this.runners.delete(args.sessionId);
       this.realUuidBySynth.delete(args.sessionId);
       this.lastUiSizeBySessionId.delete(args.sessionId);
-      this.lastObserverEventAt.delete(args.sessionId);
       return { response: { sessionId: args.sessionId }, broadcast };
     }
     this.deleteOwned(args.sessionId);
@@ -44058,7 +44054,6 @@ var SessionManager = class {
       this.runners.delete(args.sessionId);
       this.realUuidBySynth.delete(args.sessionId);
       this.lastUiSizeBySessionId.delete(args.sessionId);
-      this.lastObserverEventAt.delete(args.sessionId);
       return { response: { sessionId: args.sessionId }, broadcast };
     }
     this.storeFor(args.scope).delete(args.sessionId);
@@ -44304,7 +44299,6 @@ var SessionManager = class {
         return;
       }
     }
-    this.lastObserverEventAt.set(sessionId, (this.deps.now ?? Date.now)());
     let feedEvents = outEvents;
     if (outEvents.some((e) => e.kind === "turn_end")) {
       const runnerState = runner.getState();
@@ -44331,27 +44325,10 @@ var SessionManager = class {
         });
         feedEvents = outEvents.filter((e) => e.kind !== "turn_end");
       } else {
-        const ev = this.peekTurnEvidence(runner);
-        if (!ev.turnHasContent) {
-          this.deps.logger?.info("drop turn_end (empty turn, observer replay)", {
-            sessionId,
-            ...ev,
-            batchKinds: outEvents.map((e) => e.kind)
-          });
-          this.deps.screenIdleProbeLogger?.info("drop turn_end: empty turn (Fix B)", {
-            sessionId,
-            toolSessionId,
-            ...ev,
-            batchKinds: outEvents.map((e) => e.kind)
-          });
-          feedEvents = outEvents.filter((e) => e.kind !== "turn_end");
-        } else {
-          this.deps.screenIdleProbeLogger?.info("turn_end passed all filters \u2192 fed to reducer", {
-            sessionId,
-            toolSessionId,
-            ...ev
-          });
-        }
+        this.deps.screenIdleProbeLogger?.info("turn_end passed gate \u2192 fed to reducer", {
+          sessionId,
+          toolSessionId
+        });
       }
     }
     if (feedEvents.length === 0) return;
@@ -44615,87 +44592,6 @@ var SessionManager = class {
     if (!runner) return;
     runner.input({ kind: "ready-detected" });
   }
-  /**
-   * ClaudeTuiAdapter onTurnIdle callback：屏幕内容静止时**复发**本轮已出现过的权威 turn_end。
-   * 本意：turn_duration 写盘早于尾段正文 → observer 把尾随 text 推进 buffer 盖掉 lastEventKind →
-   * spinner 不熄；屏幕静止时再补一条 turn_end 排到尾随 text 之后。
-   *
-   * Fix A（修 bug1 "UI 还在变却显示结束" / bug2 "发消息后无 spinner"）：补偿**只复发不 originate**——
-   * 仅当本轮已出现过 turn_end（turnEndSeenThisTurn，即真有过尾随 text 覆盖场景）才补。turnEndSeenThisTurn
-   * ===false 说明本轮 CC 从未结束过（仍在工作 / 刚发消息没产出 / 漏检弹框等用户），屏幕静止 ≠ turn 结束，
-   * 凭空 inject turn_end 会误灭 spinner——故跳过，让真正的 turn_duration 来时再正常收。
-   * 仅 tui 模式；runner 缺失 noop。turn_end 无 uuid 不参与 dedup。
-   */
-  dispatchTurnIdle(toolSessionId) {
-    if (this.deps.mode !== "tui") return;
-    const sid = this.sessionIdByToolSid(toolSessionId);
-    const runner = sid ? this.runners.get(sid) : void 0;
-    if (!runner) {
-      this.deps.screenIdleProbeLogger?.warn("dispatchTurnIdle: no runner for toolSessionId", {
-        toolSessionId
-      });
-      return;
-    }
-    const ev = this.peekTurnEvidence(runner);
-    if (!ev.turnEndSeenThisTurn) {
-      this.deps.logger?.debug("screen-idle compensation skipped (no prior turn_end this turn)", {
-        sessionId: sid,
-        ...ev
-      });
-      this.deps.screenIdleProbeLogger?.info("dispatchTurnIdle skip: no prior turn_end this turn", {
-        sessionId: sid,
-        toolSessionId,
-        ...ev
-      });
-      return;
-    }
-    this.deps.screenIdleProbeLogger?.info("dispatchTurnIdle inject turn_end (screen-idle compensation)", {
-      sessionId: sid,
-      toolSessionId,
-      ...ev
-    });
-    runner.input({ kind: "inject-events", events: [{ kind: "turn_end" }] });
-  }
-  /**
-   * 读 runner 当前 turn 态快照，供 turn_end 判定使用：
-   *   `turnEndSeenThisTurn`：从 buffer 末尾回扫到最近 user_text 期间是否已出现过 turn_end
-   *     （已出现=本轮真结束过、合法尾随；未出现=本轮还没结束过）→ 屏幕静止补偿的复发闸
-   *     （`dispatchTurnIdle`）。
-   *   `turnHasContent`：末条是否 assistant 产出（非 user_text/turn_end/空）→ observer 回灌
-   *     turn_end 的空 turn 守卫闸（`feedObserverEvents`）。
-   * 权威 gate（TUI 屏幕是否 idle + 弹框态）在 `adapter.canAcceptTurnEnd` 里，这两条只覆盖
-   * "buffer 完整性"独立维度。
-   */
-  peekTurnEvidence(runner) {
-    const st = runner.getState();
-    const buf = st.buffer;
-    const lastEventKindBefore = buf.length > 0 ? buf[buf.length - 1].event.kind : null;
-    let turnEndSeenThisTurn = false;
-    for (let i = buf.length - 1; i >= 0; i--) {
-      const k2 = buf[i].event.kind;
-      if (k2 === "user_text") break;
-      if (k2 === "turn_end") {
-        turnEndSeenThisTurn = true;
-        break;
-      }
-    }
-    const turnHasContent = lastEventKindBefore !== null && lastEventKindBefore !== "user_text" && lastEventKindBefore !== "turn_end";
-    return { turnOpenBefore: st.turnOpen, lastEventKindBefore, turnEndSeenThisTurn, turnHasContent };
-  }
-  /**
-   * observer 还需静止多久（ms）才满 idleMs，0 = 已满。observeScreenIdle 复合条件闸：屏幕静止后
-   * 精确等这段剩余再补 turn_end —— turn_duration 写盘早于尾段正文，observer 把尾随 text poll 落盘
-   * 期间屏幕可能已静止，仅看屏幕会早 fire（补的 turn_end 盖不到尾随 text 之后）。
-   * 找不到 runner / 从无事件 → 0（不阻塞 fire）。idleMs 由装配处传 SCREEN_IDLE_MS。
-   */
-  observerIdleWaitMs(toolSessionId, idleMs) {
-    const sid = this.sessionIdByToolSid(toolSessionId);
-    if (!sid) return 0;
-    const last = this.lastObserverEventAt.get(sid);
-    if (last === void 0) return 0;
-    const elapsed = (this.deps.now ?? Date.now)() - last;
-    return Math.max(0, idleMs - elapsed);
-  }
   /** toolSessionId → sessionId 反查（遍历 runners）；session 数典型 < 10，O(n) 可接受 */
   sessionIdByToolSid(toolSessionId) {
     for (const [sid, runner] of this.runners) {
@@ -47312,15 +47208,13 @@ function observeScreenIdle(surface, opts) {
     },
     isIdle() {
       const popupVisible = opts.getPopupVisible();
-      const obsWait = opts.getObserverWaitMs?.() ?? 0;
-      const idle = armed && !popupVisible && obsWait <= 0;
+      const idle = armed && !popupVisible;
       if (opts.probeLogger) {
         opts.probeLogger.info("screen-idle isIdle check", {
           label: opts.probeLabel,
           idle,
           armed,
-          popupVisible,
-          obsWait
+          popupVisible
         });
       }
       return idle;
@@ -47510,14 +47404,8 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
     const screenIdleObserver = observeScreenIdle(surface, {
       idleMs: SCREEN_IDLE_MS,
       onIdle: () => {
-        if (!ctx.toolSessionId || !this.tuiOpts.onTurnIdle) return;
-        this.tuiLogger?.debug("screen-idle \u2192 turn_end", { toolSessionId: ctx.toolSessionId });
-        this.tuiOpts.onTurnIdle(ctx.toolSessionId);
       },
       getPopupVisible: () => popupObserver.visibleKind !== null,
-      // observer 还需静止多久才满 SCREEN_IDLE_MS（复合条件 AND）：屏幕静止后精确等这段剩余再补
-      // turn_end，确保它排在尾段 text + turn_duration 全部 poll 落盘之后 = buffer 末条。
-      getObserverWaitMs: () => ctx.toolSessionId ? this.tuiOpts.getObserverWaitMs?.(ctx.toolSessionId, SCREEN_IDLE_MS) ?? 0 : 0,
       // 取证 probe（可选，装配处传独立 file-only logger，跟主 daemon.log 解耦）
       ...this.tuiOpts.screenIdleProbeLogger ? {
         probeLogger: this.tuiOpts.screenIdleProbeLogger,
@@ -58008,12 +57896,8 @@ async function startDaemon(config) {
     onSurfaceUnregister: (tsid) => manager.unregisterSurface(tsid),
     // ReadyGate v2：ReadyDetector emit ready 时投递 reducer 'ready-detected' input
     onReady: (tsid) => manager.dispatchReadyDetected(tsid),
-    // 屏幕静止 → 补权威 turn_end（修 turn_duration 尾随 text 覆盖 lastEventKind）
-    onTurnIdle: (tsid) => manager.dispatchTurnIdle(tsid),
-    // 复合条件闸：observer 还需静止多久才满 idleMs（屏幕静止后精确等这段剩余再补 turn_end）
-    getObserverWaitMs: (tsid, idleMs) => manager.observerIdleWaitMs(tsid, idleMs),
-    // 取证 probe（可选，CLAWD_SCREEN_IDLE_PROBE=1 时启用；生产默认 undefined 不打）
-    ...screenIdleProbeLogger ? { screenIdleProbeLogger } : {}
+    // 取证 probe（默认无条件启用；见 createFileOnlyLogger）
+    screenIdleProbeLogger
   }) : new ClaudeAdapter({ logger, historyReader: new ClaudeHistoryReader() });
   registerAdapter("claude", claudeAdapter);
   registerAdapter("codex", new CodexAdapter({ logger, historyReader: new CodexHistoryReader() }));