@clawos-dev/clawd 0.2.161 → 0.2.162

package/dist/cli.cjs

@@ -4927,6 +4927,13 @@ var init_schemas = __esm({
         toolUseId: external_exports.string(),
         questions: external_exports.array(AskQuestionItemSchema)
       }),
+      // turn_end —— 一轮 AI 响应结束。消费者：reducer pushEventToBuffer 翻 turnOpen=false；
+      // UI useChatPanelState 收 "Claude is working" spinner（lastEventKind===turn_end）。
+      // 三个产生来源：
+      //   ① SDK 模式 stream-json `result` 帧（claude.ts）—— stdout 最后一帧，可靠
+      //   ② TUI 模式 observer 读 JSONL `system/turn_duration` 行（claude-tui.ts parseLine）
+      //      ⚠️ CC 写此行早于该轮尾段正文落盘，可能被尾随 text 覆盖 lastEventKind（③ 存在的原因）
+      //   ③ TUI 模式屏幕内容静止（observeScreenIdle → manager.dispatchTurnIdle inject）—— 兜 ② 的覆盖
       external_exports.object({
         ...ParsedEventBase,
         kind: external_exports.literal("turn_end")
@@ -35008,6 +35015,21 @@ var SessionManager = class {
     if (!runner) return;
     runner.input({ kind: "ready-detected" });
   }
+  /**
+   * ClaudeTuiAdapter onTurnIdle callback：屏幕内容静止（turn 结束）时 inject 一个权威 turn_end。
+   * 修 turn_duration 写盘早于尾段正文 → observer 尾随 text 覆盖 lastEventKind → spinner 不熄。
+   * 静止触发（~1.2s）远晚于 observer poll（200ms），故此 turn_end 必排在尾随 text 之后 = buffer 最后一个。
+   * 仅 tui 模式；runner 缺失 noop。turn_end 无 uuid 不参与 dedup（放行）。
+   * 注：重复 inject（屏幕静止边缘多 fire）不产生错误状态——turnOpen 已 false、idle-kill 有
+   * running-idle guard——但仍 append buffer + 刷 updatedAt + 广播 session:info（非真 no-op，churn 可接受）。
+   */
+  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;
+    runner.input({ kind: "inject-events", events: [{ kind: "turn_end" }] });
+  }
   /** toolSessionId → sessionId 反查（遍历 runners）；session 数典型 < 10，O(n) 可接受 */
   sessionIdByToolSid(toolSessionId) {
     for (const [sid, runner] of this.runners) {
@@ -37372,7 +37394,49 @@ function observeReady(surface, opts) {
     }
   };
 }
+function observeScreenIdle(surface, opts) {
+  const visibleRows = opts.visibleRows ?? 44;
+  let lastSnap = null;
+  let armed = false;
+  let timer = null;
+  let disposed = false;
+  const snapOf = (lines) => lines.slice(-visibleRows).join("\n").replace(/[ \t]+$/gm, "");
+  const clear = () => {
+    if (timer) {
+      clearTimeout(timer);
+      timer = null;
+    }
+  };
+  const fire = () => {
+    timer = null;
+    if (disposed) return;
+    if (opts.getPopupVisible()) {
+      timer = setTimeout(fire, opts.idleMs);
+      return;
+    }
+    if (armed) return;
+    armed = true;
+    opts.onIdle();
+  };
+  const unsub = surface.onTick((lines) => {
+    if (disposed) return;
+    const snap = snapOf(lines);
+    if (snap === lastSnap) return;
+    lastSnap = snap;
+    armed = false;
+    clear();
+    timer = setTimeout(fire, opts.idleMs);
+  });
+  return {
+    dispose() {
+      disposed = true;
+      unsub();
+      clear();
+    }
+  };
+}
 var BYPASS_SETTLE_MS = 300;
+var SCREEN_IDLE_MS = 1200;
 function createBootGate(pty, logger) {
   const stripAnsi = (s) => s.replace(/\x1b\[[0-9;?]*C/g, " ").replace(/\x1b\[[0-9;?]*[a-zA-Z]/g, "").replace(/\x1b\][^\x07]*\x07/g, "").replace(/\x1b[NOPM=>78]/g, "").replace(/[\x00-\x1f\x7f]/g, " ");
   const popups = {
@@ -37504,6 +37568,15 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
       // popup_close 信号源：ready observer 扫到 ❯ + ─{20,} 输入框结构 → 输入框可见 → popup 已关
       getInputFrameVisible: () => readyObserver.inputFrameVisible
     });
+    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
+    });
     if (ctx.toolSessionId && this.tuiOpts.onSurfaceRegister) {
       this.tuiOpts.onSurfaceRegister(ctx.toolSessionId, surface);
     }
@@ -37551,6 +37624,7 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
       bootGate.dispose();
       readyObserver.dispose();
       popupObserver.dispose();
+      screenIdleObserver.dispose();
       if (ctx.toolSessionId && this.tuiOpts.onSurfaceUnregister) {
         this.tuiOpts.onSurfaceUnregister(ctx.toolSessionId);
       }
@@ -46820,7 +46894,9 @@ async function startDaemon(config) {
     onSurfaceRegister: (tsid, surface) => manager.registerSurface(tsid, surface),
     onSurfaceUnregister: (tsid) => manager.unregisterSurface(tsid),
     // ReadyGate v2：ReadyDetector emit ready 时投递 reducer 'ready-detected' input
-    onReady: (tsid) => manager.dispatchReadyDetected(tsid)
+    onReady: (tsid) => manager.dispatchReadyDetected(tsid),
+    // 屏幕静止 → 补权威 turn_end（修 turn_duration 尾随 text 覆盖 lastEventKind）
+    onTurnIdle: (tsid) => manager.dispatchTurnIdle(tsid)
   }) : new ClaudeAdapter({ logger, historyReader: new ClaudeHistoryReader() });
   registerAdapter("claude", claudeAdapter);
   registerAdapter("codex", new CodexAdapter({ logger, historyReader: new CodexHistoryReader() }));

package/package.json

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