@clawos-dev/clawd 0.2.103-beta.198.c756b33 → 0.2.103

package/dist/cli.cjs

@@ -32580,11 +32580,12 @@ var SessionManager = class {
   // 新 client 通过 session:subscribe 接入时由 onSubscribe hook 取 getPtyReplay(sessionId)
   // 把屏幕快照定向 emit，解决"刷新页面 / 第二个 tab 接入时 xterm 白屏"
   ptyReplaysByToolSid = /* @__PURE__ */ new Map();
-  // TUI 模式：toolSessionId → @xterm/headless PopupDetector。
-  // ClaudeTuiAdapter spawn 时通过 onDetectorRegister callback 写入；exit 时 onDetectorUnregister 清理。
-  // manager.resizePty 用此映射把 UI 的 session:pty:resize 同步到 detector 内部 buffer，
+  // TUI 模式：toolSessionId → @xterm/headless TerminalSurface（单一虚拟终端，popup / ready
+  // observer 都从这一份 buffer 派生状态）。ClaudeTuiAdapter spawn 时通过 onSurfaceRegister
+  // callback 写入；exit 时 onSurfaceUnregister 清理。
+  // manager.resizePty 用此映射把 UI 的 session:pty:resize 同步到 surface 内部 buffer，
   // 保证 snapshot serialize 时 cursor positioning 与 UI xterm 实际尺寸一致。
-  detectorsByToolSid = /* @__PURE__ */ new Map();
+  surfacesByToolSid = /* @__PURE__ */ new Map();
   // 仅 mode='tui' 需要：index.ts 装配阶段在 observer 构造后注入。
   // observer.onEvent 要回灌 manager.feedObserverEvents，所以 observer 必须晚于 manager
   // 构造；反过来 manager 又要在 mode='tui' 下 spawn session 时 attach observer。setter 解循环
@@ -33858,18 +33859,18 @@ var SessionManager = class {
     if (!tsid) return void 0;
     return this.ptyTransports.get(tsid);
   }
-  /** ClaudeTuiAdapter spawn 时注册 detector ref；同一 tsid 重 spawn 会覆盖 */
-  registerDetector(toolSessionId, detector) {
-    this.detectorsByToolSid.set(toolSessionId, detector);
+  /** ClaudeTuiAdapter spawn 时注册 surface ref；同一 tsid 重 spawn 会覆盖 */
+  registerSurface(toolSessionId, surface) {
+    this.surfacesByToolSid.set(toolSessionId, surface);
   }
   /** spawn 进程 exit 时清理 */
-  unregisterDetector(toolSessionId) {
-    this.detectorsByToolSid.delete(toolSessionId);
+  unregisterSurface(toolSessionId) {
+    this.surfacesByToolSid.delete(toolSessionId);
   }
   /**
-   * 同时 resize pty 子进程和 detector buffer：UI session:pty:resize 入口走这个。
-   * 顺序：pty.resize 在前，detector.resize 在后 —— pty 是真正的 CC 子进程视图，必须先成功；
-   * detector 只是 daemon 端镜像，任一步失败都返 false。
+   * 同时 resize pty 子进程和 surface buffer：UI session:pty:resize 入口走这个。
+   * 顺序：pty.resize 在前，surface.resize 在后 —— pty 是真正的 CC 子进程视图，必须先成功；
+   * surface 只是 daemon 端镜像，任一步失败都返 false。
    * 找不到 runner / toolSessionId / pty 任一缺失 → 返 false，handler 静默给 UI 报 ok=false 不抛错。
    */
   resizePty(sessionId, cols, rows) {
@@ -33884,8 +33885,8 @@ var SessionManager = class {
     } catch {
       return false;
     }
-    const detector = this.detectorsByToolSid.get(tsid);
-    if (detector) detector.resize(cols, rows);
+    const surface = this.surfacesByToolSid.get(tsid);
+    if (surface) surface.resize(cols, rows);
     return true;
   }
   /**
@@ -35183,59 +35184,30 @@ var POPUP_FOOTER_PATTERNS = [
   { kind: "permission", regex: /Tab to amend|Do you want to proceed/i },
   { kind: "question", regex: /Enter to select|↑\/↓ to navigate/i }
 ];
-function createPopupDetector(opts) {
+function createTerminalSurface(opts) {
   const term = new Terminal({
-    cols: opts.cols ?? 120,
-    rows: opts.rows ?? 40,
-    scrollback: 1e3,
+    cols: opts?.cols ?? 120,
+    rows: opts?.rows ?? 40,
+    scrollback: opts?.scrollback ?? 1e3,
     allowProposedApi: true
   });
   const serializeAddon = new D();
   term.loadAddon(serializeAddon);
-  let visible = null;
-  let pendingClear = null;
   let parseSeq = 0;
   let pendingParse = 0;
   let drainWaiters = [];
   let disposed = false;
-  const scanFooter = () => {
+  const observers = [];
+  const collectLines = () => {
     const buf = term.buffer.active;
+    const lines = new Array(buf.length);
     for (let i = 0; i < buf.length; i++) {
       const line = buf.getLine(i);
-      if (!line) continue;
-      const text = line.translateToString(true);
-      if (!text) continue;
-      for (const p2 of POPUP_FOOTER_PATTERNS) {
-        if (p2.regex.test(text)) return p2.kind;
-      }
-    }
-    return null;
-  };
-  const tick = () => {
-    const matched = scanFooter();
-    if (matched && visible === null) {
-      visible = matched;
-      opts.onTransition(matched, true);
-    } else if (matched && visible !== null) {
-      if (pendingClear) {
-        clearTimeout(pendingClear);
-        pendingClear = null;
-      }
-    } else if (!matched && visible !== null && !pendingClear) {
-      const toClear = visible;
-      pendingClear = setTimeout(() => {
-        pendingClear = null;
-        if (visible === toClear) {
-          visible = null;
-          opts.onTransition(toClear, false);
-        }
-      }, opts.clearQuietMs);
+      lines[i] = line ? line.translateToString(true) : "";
     }
+    return lines;
   };
   return {
-    get visibleKind() {
-      return visible;
-    },
     get parseSeq() {
       return parseSeq;
     },
@@ -35249,7 +35221,10 @@ function createPopupDetector(opts) {
           }
           if (typeof seq === "number" && seq > parseSeq) parseSeq = seq;
           pendingParse--;
-          tick();
+          if (observers.length > 0) {
+            const lines = collectLines();
+            for (const cb of [...observers]) cb(lines);
+          }
           if (pendingParse === 0 && drainWaiters.length > 0) {
             const waiters = drainWaiters;
             drainWaiters = [];
@@ -35271,42 +35246,93 @@ function createPopupDetector(opts) {
       } catch {
       }
     },
+    serialize() {
+      return serializeAddon.serialize({ scrollback: 1e3 });
+    },
     dispose() {
       disposed = true;
-      if (pendingClear) {
-        clearTimeout(pendingClear);
-        pendingClear = null;
-      }
+      pendingParse = 0;
       const waiters = drainWaiters;
       drainWaiters = [];
       for (const w2 of waiters) w2();
+      observers.length = 0;
       serializeAddon.dispose();
       term.dispose();
     },
-    serialize() {
-      return serializeAddon.serialize({ scrollback: 1e3 });
+    onTick(cb) {
+      observers.push(cb);
+      return () => {
+        const i = observers.indexOf(cb);
+        if (i >= 0) observers.splice(i, 1);
+      };
     }
   };
 }
-function createReadyDetector(opts) {
-  const term = new Terminal({
-    cols: opts.cols ?? 120,
-    rows: opts.rows ?? 40,
-    scrollback: 200,
-    allowProposedApi: true
+function observePopup(surface, opts) {
+  let visible = null;
+  let pendingClear = null;
+  const scanFooter = (lines) => {
+    for (const text of lines) {
+      if (!text) continue;
+      for (const p2 of POPUP_FOOTER_PATTERNS) {
+        if (p2.regex.test(text)) return p2.kind;
+      }
+    }
+    return null;
+  };
+  const unsubscribe = surface.onTick((lines) => {
+    const matched = scanFooter(lines);
+    const inputFrameVisible = opts.getInputFrameVisible();
+    if (visible === null) {
+      if (matched && !inputFrameVisible) {
+        visible = matched;
+        opts.onTransition(matched, true);
+      }
+      return;
+    }
+    if (!inputFrameVisible) {
+      if (pendingClear) {
+        clearTimeout(pendingClear);
+        pendingClear = null;
+      }
+      return;
+    }
+    if (!pendingClear) {
+      const toClear = visible;
+      pendingClear = setTimeout(() => {
+        pendingClear = null;
+        if (visible === toClear) {
+          visible = null;
+          opts.onTransition(toClear, false);
+        }
+      }, opts.clearQuietMs);
+    }
   });
+  return {
+    get visibleKind() {
+      return visible;
+    },
+    dispose() {
+      unsubscribe();
+      if (pendingClear) {
+        clearTimeout(pendingClear);
+        pendingClear = null;
+      }
+    }
+  };
+}
+function observeReady(surface, opts) {
+  let prevReady = false;
   let quietTimer = null;
-  let disposed = false;
-  const scanReadyFrame = () => {
-    const buf = term.buffer.active;
+  let unsubscribed = false;
+  let latestLines = [];
+  const scanReadyFrame = (lines) => {
     let prevHasDivider = false;
-    for (let i = 0; i < buf.length; i++) {
-      const line = buf.getLine(i);
-      if (!line) {
+    for (const text of lines) {
+      if (!text) {
         prevHasDivider = false;
         continue;
       }
-      const text = line.translateToString(true);
       const hasPrompt = /^❯/.test(text);
       const hasDivider = /─{20,}/.test(text);
       if (hasPrompt && prevHasDivider) return true;
@@ -35329,18 +35355,18 @@ function createReadyDetector(opts) {
   };
   const quietFire = () => {
     quietTimer = null;
-    if (disposed) return;
-    if (!scanReadyFrame()) {
+    if (unsubscribed) return;
+    if (!scanReadyFrame(latestLines)) {
       dbg({ event: "quiet-fire-but-not-ready-anymore" });
       return;
     }
     dbg({ event: "quiet-fire \u2192 onReady" });
     opts.onReady();
   };
-  let prevReady = false;
-  const tick = () => {
-    if (disposed) return;
-    const ready = scanReadyFrame();
+  const unsubscribe = surface.onTick((lines) => {
+    if (unsubscribed) return;
+    latestLines = lines;
+    const ready = scanReadyFrame(lines);
     if (!ready) {
       clearQuiet();
       if (prevReady) {
@@ -35355,19 +35381,15 @@ function createReadyDetector(opts) {
     }
     clearQuiet();
     quietTimer = setTimeout(quietFire, opts.quietMs);
-  };
+  });
   return {
-    writeBytes(data) {
-      if (disposed) return;
-      term.write(data, () => {
-        if (disposed) return;
-        tick();
-      });
+    get inputFrameVisible() {
+      return prevReady;
     },
     dispose() {
-      disposed = true;
+      unsubscribed = true;
+      unsubscribe();
       clearQuiet();
-      term.dispose();
     }
   };
 }
@@ -35449,7 +35471,18 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
       tag: ctx.toolSessionId ?? "no-tsid"
     });
     const bootGate = createBootGate(pty, this.tuiLogger);
-    const detector = createPopupDetector({
+    const surface = createTerminalSurface();
+    const readyObserver = observeReady(surface, {
+      quietMs: 500,
+      onReady: () => {
+        if (!ctx.toolSessionId || !this.tuiOpts.onReady) return;
+        this.tuiLogger?.debug("ready-detected", { toolSessionId: ctx.toolSessionId });
+        this.tuiOpts.onReady(ctx.toolSessionId);
+      },
+      // [RG-DBG] 排查 ReadyGate 偶现卡输入用；定位完跟所有 [RG] 日志一起删
+      logger: this.tuiLogger
+    });
+    const popupObserver = observePopup(surface, {
       clearQuietMs: 200,
       onTransition: (kind, visible) => {
         if (!ctx.toolSessionId || !this.tuiOpts.onPopupTransition) return;
@@ -35459,29 +35492,21 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
           visible
         });
         this.tuiOpts.onPopupTransition(ctx.toolSessionId, kind, visible);
-      }
-    });
-    const readyDetector = createReadyDetector({
-      quietMs: 500,
-      onReady: () => {
-        if (!ctx.toolSessionId || !this.tuiOpts.onReady) return;
-        this.tuiLogger?.debug("ready-detected", { toolSessionId: ctx.toolSessionId });
-        this.tuiOpts.onReady(ctx.toolSessionId);
       },
-      // [RG-DBG] 排查 ReadyGate 偶现卡输入用；定位完跟所有 [RG] 日志一起删
-      logger: this.tuiLogger
+      // popup_close 信号源：ready observer 扫到 ❯ + ─{20,} 输入框结构 → 输入框可见 → popup 已关
+      getInputFrameVisible: () => readyObserver.inputFrameVisible
     });
-    if (ctx.toolSessionId && this.tuiOpts.onDetectorRegister) {
-      this.tuiOpts.onDetectorRegister(ctx.toolSessionId, detector);
+    if (ctx.toolSessionId && this.tuiOpts.onSurfaceRegister) {
+      this.tuiOpts.onSurfaceRegister(ctx.toolSessionId, surface);
     }
     let chunkSeq = 0;
     if (ctx.toolSessionId && this.tuiOpts.onPtyReplayRegister) {
       this.tuiOpts.onPtyReplayRegister(ctx.toolSessionId, async () => {
-        await detector.drain();
+        await surface.drain();
         return {
-          data: detector.serialize(),
-          popupKind: detector.visibleKind,
-          atSeq: detector.parseSeq
+          data: surface.serialize(),
+          popupKind: popupObserver.visibleKind,
+          atSeq: surface.parseSeq
         };
       });
     }
@@ -35498,8 +35523,7 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
         this.tuiOpts.onPtyData(ctx.toolSessionId, merged.toString("base64"), seq);
       }
       bootGate.feedBytes(merged);
-      void detector.writeBytes(merged.toString("utf8"), seq);
-      readyDetector.writeBytes(merged.toString("utf8"));
+      void surface.writeBytes(merged.toString("utf8"), seq);
       if (ctx.toolSessionId) {
         probePtyDataThrottled(ctx.toolSessionId, merged.length, merged);
       }
@@ -35517,14 +35541,15 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
         flushCoalesced();
       }
       bootGate.dispose();
-      readyDetector.dispose();
-      if (ctx.toolSessionId && this.tuiOpts.onDetectorUnregister) {
-        this.tuiOpts.onDetectorUnregister(ctx.toolSessionId);
+      readyObserver.dispose();
+      popupObserver.dispose();
+      if (ctx.toolSessionId && this.tuiOpts.onSurfaceUnregister) {
+        this.tuiOpts.onSurfaceUnregister(ctx.toolSessionId);
       }
       if (ctx.toolSessionId && this.tuiOpts.onPtyUnregister) {
         this.tuiOpts.onPtyUnregister(ctx.toolSessionId);
       }
-      detector.dispose();
+      surface.dispose();
     });
     return ptyChild;
   }
@@ -41992,8 +42017,8 @@ async function startDaemon(config) {
     onPtyData: (tsid, b64, seq) => manager.emitPtyChunk(tsid, b64, seq),
     onPopupTransition: (tsid, kind, visible) => manager.emitPopupTransition(tsid, kind, visible),
     onPtyReplayRegister: (tsid, replay) => manager.registerPtyReplay(tsid, replay),
-    onDetectorRegister: (tsid, detector) => manager.registerDetector(tsid, detector),
-    onDetectorUnregister: (tsid) => manager.unregisterDetector(tsid),
+    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)
   }) : new ClaudeAdapter({ logger, historyReader: new ClaudeHistoryReader() });

package/package.json

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