@clawos-dev/clawd 0.2.195-beta.393.e8d2aa5 → 0.2.196-beta.394.2f2689d

package/dist/cli.cjs

@@ -44287,15 +44287,27 @@ var SessionManager = class {
     this.lastObserverEventAt.set(sessionId, (this.deps.now ?? Date.now)());
     let feedEvents = outEvents;
     if (outEvents.some((e) => e.kind === "turn_end")) {
-      const ev = this.peekTurnEvidence(runner);
-      if (!ev.turnHasContent) {
-        feedEvents = outEvents.filter((e) => e.kind !== "turn_end");
-        this.deps.logger?.info("[TE-PROBE] drop spurious observer turn_end", {
+      const runnerState = runner.getState();
+      const toolSessionId = runnerState.file.toolSessionId;
+      const adapter = this.deps.getAdapter(runnerState.file.tool ?? "claude");
+      const gateOpen = !adapter.canAcceptTurnEnd || !toolSessionId ? true : adapter.canAcceptTurnEnd(toolSessionId);
+      if (!gateOpen) {
+        this.deps.logger?.info("drop turn_end (adapter gate closed)", {
           sessionId,
-          src: "observer",
-          ...ev,
-          batchKinds: outEvents.map((e) => e.kind)
+          toolSessionId,
+          reason: "tui-screen-not-idle"
         });
+        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)
+          });
+          feedEvents = outEvents.filter((e) => e.kind !== "turn_end");
+        }
       }
     }
     if (feedEvents.length === 0) return;
@@ -44576,22 +44588,24 @@ var SessionManager = class {
     const runner = sid ? this.runners.get(sid) : void 0;
     if (!runner) return;
     const ev = this.peekTurnEvidence(runner);
-    const willInject = ev.turnEndSeenThisTurn;
-    this.deps.logger?.info("[TE-PROBE] screen-idle compensation", {
-      sessionId: sid,
-      src: "screen-idle",
-      willInject,
-      ...ev
-    });
-    if (!willInject) return;
+    if (!ev.turnEndSeenThisTurn) {
+      this.deps.logger?.debug("screen-idle compensation skipped (no prior turn_end this turn)", {
+        sessionId: sid,
+        ...ev
+      });
+      return;
+    }
     runner.input({ kind: "inject-events", events: [{ kind: "turn_end" }] });
   }
   /**
-   * 读 runner 当前 turn 态快照，供两个 turn_end 注入源（屏幕静止补偿 / observer turn_duration）
-   * 判断误发 + 打 [TE-PROBE] 日志。
-   *   turnEndSeenThisTurn：从 buffer 末尾回扫到最近 user_text 期间是否已出现过 turn_end
-   *     （已出现=本轮真结束过、合法尾随；未出现=本轮还没结束过）→ Fix A 复发闸。
-   *   turnHasContent：末条是否 assistant 产出（非 user_text/turn_end/空）→ Fix B 空 turn 守卫闸。
+   * 读 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();
@@ -47201,6 +47215,12 @@ function observeScreenIdle(surface, opts) {
       disposed = true;
       unsub();
       clear();
+    },
+    isIdle() {
+      if (!armed) return false;
+      if (opts.getPopupVisible()) return false;
+      const obsWait = opts.getObserverWaitMs?.() ?? 0;
+      return obsWait <= 0;
     }
   };
 }
@@ -47278,11 +47298,31 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
   // 用于 spawn / PtyChildProcess 链路打日志
   tuiLogger;
   tuiOpts;
+  /**
+   * per-toolSessionId 的 tui 观察者句柄，仅用于 turn_end gate 查询（`canAcceptTurnEnd`）。
+   * onIdle / onPopupTransition 等回调仍走原有闭包（不复用这份 map），本 map 只承担
+   * "manager 需要跨模块查屏幕/弹框状态"这单一职责。
+   */
+  tuiStates = /* @__PURE__ */ new Map();
   constructor(opts = {}) {
     super(opts);
     this.tuiLogger = opts.logger;
     this.tuiOpts = opts;
   }
+  /**
+   * TUI adapter 的 turn_end 权威判定：屏幕已 idle 且非弹框态才放行。
+   *
+   * `feedObserverEvents` 收到 observer 回灌 `turn_end` 时调用。屏幕仍在变（如后台 agent 在跑）
+   * 时 drop 掉 turn_end，避免 `system/turn_duration` JSONL 帧误触发 running-idle 状态转换。
+   *
+   * 未跟踪的 toolSessionId（spawn 前 / spawn 失败 / 已 dispose）视为 pass —— gate 只 drop
+   * "有证据判定为伪信号"的场景，不做 unknown → block。
+   */
+  canAcceptTurnEnd(toolSessionId) {
+    const state = this.tuiStates.get(toolSessionId);
+    if (!state) return true;
+    return state.screenIdle.isIdle();
+  }
   spawn(ctx) {
     const args = buildTuiSpawnArgs(ctx, jsonlExistsForCtx(ctx));
     const cmd = process.env.CLAUDE_BIN ?? "claude";
@@ -47352,6 +47392,12 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
     if (ctx.toolSessionId && this.tuiOpts.onSurfaceRegister) {
       this.tuiOpts.onSurfaceRegister(ctx.toolSessionId, surface);
     }
+    if (ctx.toolSessionId) {
+      this.tuiStates.set(ctx.toolSessionId, {
+        screenIdle: screenIdleObserver,
+        popup: popupObserver
+      });
+    }
     let chunkSeq = 0;
     if (ctx.toolSessionId && this.tuiOpts.onPtyReplayRegister) {
       this.tuiOpts.onPtyReplayRegister(ctx.toolSessionId, async () => {
@@ -47397,6 +47443,9 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
       readyObserver.dispose();
       popupObserver.dispose();
       screenIdleObserver.dispose();
+      if (ctx.toolSessionId) {
+        this.tuiStates.delete(ctx.toolSessionId);
+      }
       if (ctx.toolSessionId && this.tuiOpts.onSurfaceUnregister) {
         this.tuiOpts.onSurfaceUnregister(ctx.toolSessionId);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.195-beta.393.e8d2aa5",
+  "version": "0.2.196-beta.394.2f2689d",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",