@clawos-dev/clawd 0.2.199-beta.400.ba99f40 → 0.2.200

package/dist/cli.cjs

@@ -29030,7 +29030,7 @@ var require_websocket = __commonJS({
     var http3 = require("http");
     var net3 = require("net");
     var tls = require("tls");
-    var { randomBytes, createHash: createHash2 } = require("crypto");
+    var { randomBytes, createHash: createHash3 } = require("crypto");
     var { Duplex, Readable: Readable3 } = require("stream");
     var { URL: URL2 } = require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -29690,7 +29690,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash2("sha1").update(key + GUID).digest("base64");
+        const digest = createHash3("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -30057,7 +30057,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter3 = require("events");
     var http3 = require("http");
     var { Duplex } = require("stream");
-    var { createHash: createHash2 } = require("crypto");
+    var { createHash: createHash3 } = require("crypto");
     var extension2 = require_extension();
     var PerMessageDeflate2 = require_permessage_deflate();
     var subprotocol2 = require_subprotocol();
@@ -30358,7 +30358,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash2("sha1").update(key + GUID).digest("base64");
+        const digest = createHash3("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -40843,6 +40843,18 @@ function createLogger(opts = {}) {
   );
   return wrap(base);
 }
+function createFileOnlyLogger(opts) {
+  const level = opts.level ?? "debug";
+  try {
+    import_node_fs2.default.mkdirSync(import_node_path2.default.dirname(opts.file), { recursive: true });
+  } catch {
+  }
+  const base = (0, import_pino.default)(
+    { level, base: {} },
+    import_pino.default.destination({ dest: opts.file, mkdir: true, sync: true })
+  );
+  return wrap(base);
+}
 function pinoLevelToString(n) {
   if (typeof n !== "number") return null;
   if (n >= 50) return "error";
@@ -43008,9 +43020,18 @@ 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();
+  // 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 取代，路径即身份，
@@ -43350,6 +43371,14 @@ var SessionManager = class {
   routeFromRunner(frame, target) {
     const compressed = compressFrameForWire(frame);
     if (!compressed) return;
+    if (compressed.type === "session:status") {
+      const s = compressed;
+      this.deps.screenIdleProbeLogger?.info("session:status wire emit", {
+        sessionId: s.sessionId,
+        status: s.status,
+        target
+      });
+    }
     if (compressed.type === "session:event" || compressed.type === "session:status") {
       const sid = compressed.sessionId;
       if (sid) {
@@ -43623,7 +43652,7 @@ var SessionManager = class {
       this.runners.delete(args.sessionId);
       this.realUuidBySynth.delete(args.sessionId);
       this.lastUiSizeBySessionId.delete(args.sessionId);
-      this.lastObserverEventAt.delete(args.sessionId);
+      this.clearPendingTurnEnd(args.sessionId);
       return { response: { sessionId: args.sessionId }, broadcast };
     }
     this.deleteOwned(args.sessionId);
@@ -43653,6 +43682,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" } });
     });
@@ -43786,6 +43816,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(() => {
@@ -43886,6 +43917,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) {
@@ -44102,7 +44134,7 @@ var SessionManager = class {
       this.runners.delete(args.sessionId);
       this.realUuidBySynth.delete(args.sessionId);
       this.lastUiSizeBySessionId.delete(args.sessionId);
-      this.lastObserverEventAt.delete(args.sessionId);
+      this.clearPendingTurnEnd(args.sessionId);
       return { response: { sessionId: args.sessionId }, broadcast };
     }
     this.storeFor(args.scope).delete(args.sessionId);
@@ -44348,23 +44380,93 @@ 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 ev = this.peekTurnEvidence(runner);
-      if (!ev.turnHasContent) {
+      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);
+      this.deps.screenIdleProbeLogger?.info("turn_duration signal received", {
+        sessionId,
+        toolSessionId,
+        batchKinds: outEvents.map((e) => e.kind),
+        gateOpen,
+        hasCanAcceptGate: !!adapter.canAcceptTurnEnd
+      });
+      if (gateOpen) {
+        this.deps.screenIdleProbeLogger?.info(
+          "turn_duration \u2192 turn_end confirmed (gate open) \u2192 fed to reducer",
+          { sessionId, toolSessionId }
+        );
+      } else {
         feedEvents = outEvents.filter((e) => e.kind !== "turn_end");
-        this.deps.logger?.info("[TE-PROBE] drop spurious observer turn_end", {
-          sessionId,
-          src: "observer",
-          ...ev,
-          batchKinds: outEvents.map((e) => e.kind)
-        });
+        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 不抛
@@ -44623,70 +44725,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) 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;
-    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 守卫闸。
-   */
-  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) {
@@ -46429,6 +46467,7 @@ var CodexAdapter = class {
 };
 
 // src/tools/claude-tui.ts
+var import_node_crypto5 = require("crypto");
 var import_node_fs16 = __toESM(require("fs"), 1);
 var import_node_os7 = __toESM(require("os"), 1);
 var import_node_path14 = __toESM(require("path"), 1);
@@ -47239,22 +47278,56 @@ function observeScreenIdle(surface, opts) {
     timer = null;
     if (disposed) return;
     if (opts.getPopupVisible()) {
+      opts.probeLogger?.info("screen-idle fire suppressed: popup visible", {
+        label: opts.probeLabel
+      });
       timer = setTimeout(fire, opts.idleMs);
       return;
     }
     const obsWait = opts.getObserverWaitMs?.() ?? 0;
     if (obsWait > 0) {
+      opts.probeLogger?.info("screen-idle fire suppressed: observer not idle", {
+        label: opts.probeLabel,
+        obsWait
+      });
       timer = setTimeout(fire, Math.max(obsWait, REWAIT_MIN_MS));
       return;
     }
-    if (armed) return;
+    if (armed) {
+      opts.probeLogger?.debug("screen-idle fire noop: already armed", {
+        label: opts.probeLabel
+      });
+      return;
+    }
     armed = true;
+    opts.probeLogger?.info("screen-idle fire triggered \u2192 armed=true, calling onIdle", {
+      label: opts.probeLabel
+    });
     opts.onIdle();
   };
   const unsub = surface.onTick((lines) => {
     if (disposed) return;
     const snap = snapOf(lines);
     if (snap === lastSnap) return;
+    if (opts.probeLogger) {
+      const prev = lastSnap;
+      const meta = {
+        label: opts.probeLabel,
+        prevHash: prev === null ? null : shortHash(prev),
+        nextHash: shortHash(snap),
+        prevLen: prev?.length ?? 0,
+        nextLen: snap.length
+      };
+      if (prev !== null) {
+        const diff2 = firstLineDiff(prev, snap);
+        if (diff2) {
+          meta.diffRow = diff2.row;
+          meta.prevRow = diff2.prev;
+          meta.nextRow = diff2.next;
+        }
+      }
+      opts.probeLogger.info("screen-idle tick snap changed", meta);
+    }
     lastSnap = snap;
     armed = false;
     clear();
@@ -47265,9 +47338,38 @@ function observeScreenIdle(surface, opts) {
       disposed = true;
       unsub();
       clear();
+    },
+    isIdle() {
+      const popupVisible = opts.getPopupVisible();
+      const idle = armed && !popupVisible;
+      if (opts.probeLogger) {
+        opts.probeLogger.info("screen-idle isIdle check", {
+          label: opts.probeLabel,
+          idle,
+          armed,
+          popupVisible
+        });
+      }
+      return idle;
     }
   };
 }
+function shortHash(s) {
+  return (0, import_node_crypto5.createHash)("sha1").update(s).digest("hex").slice(0, 8);
+}
+function firstLineDiff(prev, next) {
+  const p2 = prev.split("\n");
+  const n = next.split("\n");
+  const rows = Math.max(p2.length, n.length);
+  for (let i = 0; i < rows; i++) {
+    const pl = p2[i] ?? "";
+    const nl = n[i] ?? "";
+    if (pl !== nl) {
+      return { row: i, prev: pl.slice(0, 60), next: nl.slice(0, 60) };
+    }
+  }
+  return null;
+}
 var BYPASS_SETTLE_MS = 300;
 var SCREEN_IDLE_MS = 5e3;
 function createBootGate(pty, logger) {
@@ -47342,11 +47444,42 @@ 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) {
+      this.tuiOpts.screenIdleProbeLogger?.info(
+        "canAcceptTurnEnd: no tuiState \u2192 pass (\u672A\u8DDF\u8E2A)",
+        { toolSessionId }
+      );
+      return true;
+    }
+    const result = state.screenIdle.isIdle();
+    this.tuiOpts.screenIdleProbeLogger?.info("canAcceptTurnEnd", {
+      toolSessionId,
+      result
+    });
+    return result;
+  }
   spawn(ctx) {
     const args = buildTuiSpawnArgs(ctx, jsonlExistsForCtx(ctx));
     const cmd = process.env.CLAUDE_BIN ?? "claude";
@@ -47404,18 +47537,26 @@ 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);
+        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,
-      // 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,
+        probeLabel: ctx.toolSessionId ?? "<no-tsid>"
+      } : {}
     });
     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 () => {
@@ -47461,6 +47602,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);
       }
@@ -47743,7 +47887,7 @@ async function writeInboxMcpConfig(args) {
 // src/shift/store.ts
 var import_promises = __toESM(require("fs/promises"), 1);
 var import_node_path19 = __toESM(require("path"), 1);
-var import_node_crypto5 = require("crypto");
+var import_node_crypto6 = require("crypto");
 
 // src/shift/constants.ts
 var MAX_RUNS_PER_SHIFT = 30;
@@ -47839,7 +47983,7 @@ function createShiftStore(deps) {
     const nextRunAtMs = computeNextRunAtMs(input.schedule, now) ?? void 0;
     const shift = {
       ...input,
-      id: (0, import_node_crypto5.randomUUID)(),
+      id: (0, import_node_crypto6.randomUUID)(),
       createdAtMs: now,
       updatedAtMs: now,
       state: { nextRunAtMs },
@@ -50810,7 +50954,7 @@ function lookupMime(filePathOrName) {
 }
 
 // src/attachment/sign-url.ts
-var import_node_crypto6 = __toESM(require("crypto"), 1);
+var import_node_crypto7 = __toESM(require("crypto"), 1);
 var HMAC_ALGO = "sha256";
 function base64urlEncode(buf) {
   const b2 = typeof buf === "string" ? Buffer.from(buf, "utf8") : buf;
@@ -50827,7 +50971,7 @@ function decodeAbsPathFromUrl(encoded) {
 }
 function computeSig(secret, absPath, e) {
   const msg = e === null ? absPath : `${absPath}|${e}`;
-  return import_node_crypto6.default.createHmac(HMAC_ALGO, secret).update(msg).digest();
+  return import_node_crypto7.default.createHmac(HMAC_ALGO, secret).update(msg).digest();
 }
 function signUrlParts(secret, absPath, ttlSeconds, now = Date.now) {
   const e = ttlSeconds === null ? null : Math.floor(now() / 1e3) + ttlSeconds;
@@ -50862,7 +51006,7 @@ function verifySignedUrl(secret, absPath, eRaw, s, now = Date.now) {
   if (provided.length !== expected.length) {
     return { ok: false, code: "BAD_SIG" };
   }
-  if (!import_node_crypto6.default.timingSafeEqual(provided, expected)) {
+  if (!import_node_crypto7.default.timingSafeEqual(provided, expected)) {
     return { ok: false, code: "BAD_SIG" };
   }
   if (e !== null && now() / 1e3 > e) {
@@ -50874,7 +51018,7 @@ function verifySignedUrl(secret, absPath, eRaw, s, now = Date.now) {
 // src/attachment/upload.ts
 var import_node_fs25 = __toESM(require("fs"), 1);
 var import_node_path25 = __toESM(require("path"), 1);
-var import_node_crypto7 = __toESM(require("crypto"), 1);
+var import_node_crypto8 = __toESM(require("crypto"), 1);
 var import_promises2 = require("stream/promises");
 var UploadError = class extends Error {
   constructor(code, message) {
@@ -50898,11 +51042,11 @@ async function writeUploadedAttachment(args) {
   } catch (err) {
     throw new UploadError("STORAGE_ERROR", `mkdir failed: ${err.message}`);
   }
-  const hasher = import_node_crypto7.default.createHash("sha256");
+  const hasher = import_node_crypto8.default.createHash("sha256");
   let actualSize = 0;
   const tmpPath = import_node_path25.default.join(
     attachmentsRoot,
-    `.upload-${process.pid}-${Date.now()}-${import_node_crypto7.default.randomBytes(4).toString("hex")}`
+    `.upload-${process.pid}-${Date.now()}-${import_node_crypto8.default.randomBytes(4).toString("hex")}`
   );
   try {
     await (0, import_promises2.pipeline)(
@@ -51778,7 +51922,7 @@ function runAttachmentGc(args) {
 // src/attachment/group.ts
 var import_node_fs28 = __toESM(require("fs"), 1);
 var import_node_path29 = __toESM(require("path"), 1);
-var import_node_crypto8 = __toESM(require("crypto"), 1);
+var import_node_crypto9 = __toESM(require("crypto"), 1);
 init_protocol();
 var GroupFileStore = class {
   dataDir;
@@ -51867,7 +52011,7 @@ var GroupFileStore = class {
       entries[idx] = next;
     } else {
       next = {
-        id: `gf-${import_node_crypto8.default.randomBytes(6).toString("base64url")}`,
+        id: `gf-${import_node_crypto9.default.randomBytes(6).toString("base64url")}`,
         relPath: input.relPath,
         from: input.from,
         label: input.label,
@@ -51986,7 +52130,7 @@ function readDaemonSourceFromEnv(env = process.env) {
 // src/tunnel/tunnel-manager.ts
 var import_node_fs33 = __toESM(require("fs"), 1);
 var import_node_path34 = __toESM(require("path"), 1);
-var import_node_crypto9 = __toESM(require("crypto"), 1);
+var import_node_crypto10 = __toESM(require("crypto"), 1);
 var import_node_child_process9 = require("child_process");
 
 // src/tunnel/tunnel-store.ts
@@ -52485,7 +52629,7 @@ var TunnelManager = class {
         override: this.deps.frpcBinaryOverride ?? void 0
       });
       const tomlPath = import_node_path34.default.join(this.deps.dataDir, "frpc.toml");
-      const proxyName = `clawd-${t.subdomain}-${localPort}-${import_node_crypto9.default.randomBytes(3).toString("hex")}`;
+      const proxyName = `clawd-${t.subdomain}-${localPort}-${import_node_crypto10.default.randomBytes(3).toString("hex")}`;
       const toml = buildFrpcToml({
         serverAddr: t.frpsHost,
         serverPort: t.frpsPort,
@@ -53065,7 +53209,7 @@ function readIssuedPubkey(sshdDir, deviceId) {
 // src/tunnel/device-key.ts
 var import_node_os14 = __toESM(require("os"), 1);
 var import_node_path39 = __toESM(require("path"), 1);
-var import_node_crypto10 = __toESM(require("crypto"), 1);
+var import_node_crypto11 = __toESM(require("crypto"), 1);
 var DERIVE_SALT = "clawd-tunnel-device-v1";
 function deriveStableDeviceKey(opts = {}) {
   const hostname = opts.hostname ?? import_node_os14.default.hostname();
@@ -53075,13 +53219,13 @@ function deriveStableDeviceKey(opts = {}) {
   const normalizedDataDir = opts.dataDir ? import_node_path39.default.resolve(opts.dataDir) : null;
   const isDefaultDir = normalizedDataDir == null || normalizedDataDir === defaultDataDir;
   const input = isDefaultDir ? `${hostname}::${uid}` : `${hostname}::${uid}::${normalizedDataDir}`;
-  return import_node_crypto10.default.createHmac("sha256", DERIVE_SALT).update(input).digest("hex").slice(0, 32);
+  return import_node_crypto11.default.createHmac("sha256", DERIVE_SALT).update(input).digest("hex").slice(0, 32);
 }
 
 // src/auth-store.ts
 var import_node_fs38 = __toESM(require("fs"), 1);
 var import_node_path40 = __toESM(require("path"), 1);
-var import_node_crypto11 = __toESM(require("crypto"), 1);
+var import_node_crypto12 = __toESM(require("crypto"), 1);
 var AUTH_FILE_NAME = "auth.json";
 function authFilePath(dataDir) {
   return import_node_path40.default.join(dataDir, AUTH_FILE_NAME);
@@ -53113,10 +53257,10 @@ function loadOrCreateAuthFile(opts) {
   return next;
 }
 function defaultGenerateToken() {
-  return import_node_crypto11.default.randomBytes(32).toString("base64url");
+  return import_node_crypto12.default.randomBytes(32).toString("base64url");
 }
 function defaultGenerateOwnerPrincipalId() {
-  return `owner-${import_node_crypto11.default.randomUUID()}`;
+  return `owner-${import_node_crypto12.default.randomUUID()}`;
 }
 function readAuthFile(file) {
   try {
@@ -53238,7 +53382,7 @@ var OwnerIdentityStore = class {
 };
 
 // src/feishu-auth/login-flow.ts
-var import_node_crypto12 = __toESM(require("crypto"), 1);
+var import_node_crypto13 = __toESM(require("crypto"), 1);
 var STATE_TTL_MS = 5 * 60 * 1e3;
 var LoginFlow = class {
   constructor(deps) {
@@ -53247,7 +53391,7 @@ var LoginFlow = class {
   deps;
   pendingStates = /* @__PURE__ */ new Map();
   start() {
-    const state = import_node_crypto12.default.randomBytes(16).toString("base64url");
+    const state = import_node_crypto13.default.randomBytes(16).toString("base64url");
     const now = (this.deps.now ?? Date.now)();
     this.pendingStates.set(state, now);
     this.gcExpired(now);
@@ -55249,7 +55393,7 @@ init_protocol();
 // src/extension/bundle-zip.ts
 var import_promises5 = __toESM(require("fs/promises"), 1);
 var import_node_path47 = __toESM(require("path"), 1);
-var import_node_crypto13 = __toESM(require("crypto"), 1);
+var import_node_crypto14 = __toESM(require("crypto"), 1);
 var import_jszip2 = __toESM(require_lib3(), 1);
 async function bundleExtensionDir(dir) {
   const entries = await listFilesSorted(dir);
@@ -55264,7 +55408,7 @@ async function bundleExtensionDir(dir) {
     compression: "DEFLATE",
     compressionOptions: { level: 6 }
   });
-  const sha256 = import_node_crypto13.default.createHash("sha256").update(buffer).digest("hex");
+  const sha256 = import_node_crypto14.default.createHash("sha256").update(buffer).digest("hex");
   return { buffer, sha256 };
 }
 var FIXED_DATE = /* @__PURE__ */ new Date("2020-01-01T00:00:00.000Z");
@@ -55332,7 +55476,7 @@ function computePublishCheck(args) {
 var import_promises6 = __toESM(require("fs/promises"), 1);
 var import_node_path49 = __toESM(require("path"), 1);
 var import_node_os19 = __toESM(require("os"), 1);
-var import_node_crypto14 = __toESM(require("crypto"), 1);
+var import_node_crypto15 = __toESM(require("crypto"), 1);
 var import_jszip3 = __toESM(require_lib3(), 1);
 
 // src/extension/paths.ts
@@ -55361,7 +55505,7 @@ var InstallError = class extends Error {
 };
 async function installFromChannel(args, deps) {
   const { channelRef, snapshotHash, bundleZip } = args;
-  const computed = import_node_crypto14.default.createHash("sha256").update(bundleZip).digest("hex");
+  const computed = import_node_crypto15.default.createHash("sha256").update(bundleZip).digest("hex");
   if (computed !== snapshotHash) {
     throw new InstallError(
       "HASH_MISMATCH",
@@ -55453,7 +55597,7 @@ async function installFromChannel(args, deps) {
 var import_promises7 = __toESM(require("fs/promises"), 1);
 var import_node_path50 = __toESM(require("path"), 1);
 var import_node_os20 = __toESM(require("os"), 1);
-var import_node_crypto15 = __toESM(require("crypto"), 1);
+var import_node_crypto16 = __toESM(require("crypto"), 1);
 var import_jszip4 = __toESM(require_lib3(), 1);
 var UpdateError = class extends Error {
   constructor(code, message) {
@@ -55491,7 +55635,7 @@ async function updateFromChannel(args, deps) {
     if (e instanceof UpdateError) throw e;
     throw e;
   }
-  const computed = import_node_crypto15.default.createHash("sha256").update(bundleZip).digest("hex");
+  const computed = import_node_crypto16.default.createHash("sha256").update(bundleZip).digest("hex");
   if (computed !== snapshotHash) {
     throw new UpdateError(
       "HASH_MISMATCH",
@@ -56196,7 +56340,7 @@ function listPidsOnPort(port) {
 }
 
 // src/app-builder/publish-registry.ts
-var import_node_crypto16 = require("crypto");
+var import_node_crypto17 = require("crypto");
 var PublishJobRegistry = class {
   jobs = /* @__PURE__ */ new Map();
   has(name) {
@@ -56213,7 +56357,7 @@ var PublishJobRegistry = class {
     if (this.jobs.has(args.name)) {
       throw new Error(`already publishing: ${args.name}`);
     }
-    const jobId = args.jobId ?? `job-${(0, import_node_crypto16.randomUUID)()}`;
+    const jobId = args.jobId ?? `job-${(0, import_node_crypto17.randomUUID)()}`;
     this.jobs.set(args.name, {
       jobId,
       name: args.name,
@@ -57173,7 +57317,7 @@ async function uninstall(deps) {
 }
 
 // src/handlers/index.ts
-var import_node_crypto17 = require("crypto");
+var import_node_crypto18 = require("crypto");
 function buildMethodHandlers(deps) {
   return {
     ...buildSessionHandlers({
@@ -57206,7 +57350,7 @@ function buildMethodHandlers(deps) {
           const c = deps.contactStore.get(deviceId);
           return c ? { deviceId: c.deviceId, remoteUrl: c.remoteUrl, connectToken: c.connectToken } : null;
         },
-        genId: () => (0, import_node_crypto17.randomUUID)(),
+        genId: () => (0, import_node_crypto18.randomUUID)(),
         now: () => Date.now(),
         forwardInboxPostToPeer,
         logger: deps.logger
@@ -58119,6 +58263,13 @@ async function startDaemon(config) {
     logClient
   });
   logger.info("starting clawd", { version, config: { port: config.port, host: config.host, dataDir: config.dataDir } });
+  const screenIdleProbeLogger = createFileOnlyLogger({
+    file: import_node_path60.default.join(config.dataDir, "screen-idle-probe.log"),
+    level: "debug"
+  });
+  logger.info("screen-idle probe logger enabled", {
+    file: import_node_path60.default.join(config.dataDir, "screen-idle-probe.log")
+  });
   const stateMgr = new StateFileManager({ dataDir: config.dataDir });
   const pre = stateMgr.preflight();
   if (pre.status === "active") {
@@ -58395,6 +58546,10 @@ async function startDaemon(config) {
     // 新布局派生 (sessions/* + personas/<pid>/.clawd/sessions/owner/*)
     storeFactory: sessionStoreFactory,
     logger,
+    // 取证 probe（可选，CLAWD_SCREEN_IDLE_PROBE=1 时启用）：manager turn_end 判定链
+    // 的所有决策点打到独立文件，跟 adapter 的 observeScreenIdle probe 共用同一份 file logger，
+    // 便于 grep sessionId 时 tui 层 + manager 层交叉时序都在同一文件里
+    ...screenIdleProbeLogger ? { screenIdleProbeLogger } : {},
     getAdapter,
     historyReader: history,
     dataDir: config.dataDir,
@@ -58512,10 +58667,10 @@ 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)
+    // 屏幕真稳定 5s 的一次性信号 → manager 查 pending turn_duration 并 flush 成 turn_end
+    onScreenIdle: (tsid) => manager.notifyScreenIdle(tsid),
+    // 取证 probe（默认无条件启用；见 createFileOnlyLogger）
+    screenIdleProbeLogger
   }) : new ClaudeAdapter({ logger, historyReader: new ClaudeHistoryReader() });
   registerAdapter("claude", claudeAdapter);
   registerAdapter("codex", new CodexAdapter({ logger, historyReader: new CodexHistoryReader() }));