@clawos-dev/clawd 0.2.93-beta.174.78b779b → 0.2.93-beta.175.b162fd0

package/dist/cli.cjs

@@ -114,8 +114,13 @@ var init_methods = __esm({
       "session:pty:resize",
       // session:pty:snapshot — UI XtermPanel 重新挂载（切 session 回来 / 刷新）时主动拉一次当前
       //   屏幕全量快照，再开始消费 incremental session:pty。daemon 调 manager.getPtyReplay(sessionId)
-      //   取该 session 的 @xterm/headless detector serialize 结果。response.data 与 session:pty
-      //   push 帧同格式（base64-utf8）；session 不存在 / 非 tui / pty 已 exit 时 data=null。
+      //   先 drain detector parse queue 再 serialize，保证 atSeq 与 buffer 内容严格对齐。
+      //   response 字段：
+      //     - data：当前屏幕 + scrollback 的 ANSI 字节串（base64-utf8），与 session:pty push 帧同格式
+      //     - atSeq：此 snapshot 覆盖到的最后一帧 session:pty 的 seq（即 detector 已 parse 完成的最大 seq）
+      //             UI 端 flush 时丢弃 pending 中 seq ≤ atSeq 的帧
+      //     - popupKind：当前 detector 检测到的 popup 类型（null = 无 popup）
+      //   session 不存在 / 非 tui / pty 已 exit 时 data=null, atSeq=0。
       "session:pty:snapshot",
       // ---- attachment.* file-sharing（详见 attachment-schemas.ts） ----
       // 命名警告：这里的 `attachment.*` RPC 与 CC v2.x 上行 `type:"attachment"` 系统行
@@ -10554,20 +10559,6 @@ function withCommonFields(msg, o) {
   if (typeof o.uuid === "string" && o.uuid.length > 0) msg.uuid = o.uuid;
   return msg;
 }
-function isRejectSentinelLine(obj) {
-  if (!obj || typeof obj !== "object") return false;
-  return typeof obj.toolUseResult === "string";
-}
-function isUserPlainTextLine(obj) {
-  if (!obj || typeof obj !== "object") return false;
-  const o = obj;
-  if (o.type !== "user") return false;
-  const message = o.message;
-  const content = message?.content;
-  if (!Array.isArray(content) || content.length !== 1) return false;
-  const part = content[0];
-  return part?.type === "text";
-}
 function messageFromJsonl(obj) {
   if (!obj || typeof obj !== "object") return null;
   const o = obj;
@@ -10575,7 +10566,6 @@ function messageFromJsonl(obj) {
   const ts = o.timestamp ?? o.ts;
   if (type === "user" || type === "assistant") {
     const message = o.message;
-    if (type === "assistant" && message?.model === "<synthetic>") return null;
     const content = message?.content;
     const toolResultExtra = type === "user" ? extractToolResultExtraFromRaw(o.toolUseResult) : void 0;
     const sourceToolAssistantUUID = type === "user" && typeof o.sourceToolAssistantUUID === "string" ? o.sourceToolAssistantUUID : void 0;
@@ -10889,11 +10879,7 @@ var init_claude_history = __esm({
         );
         const lines = readJsonlLines(file);
         const messages = [];
-        let prevIsRejectSentinel = false;
         for (const line of lines) {
-          const skipInterruptedMarker = prevIsRejectSentinel && isUserPlainTextLine(line);
-          prevIsRejectSentinel = isRejectSentinelLine(line);
-          if (skipInterruptedMarker) continue;
           const msg = messageFromJsonl(line);
           if (msg) messages.push(msg);
         }
@@ -11319,7 +11305,6 @@ function parseClaudeObjectInner(obj) {
   }
   if (type === "assistant") {
     const message = obj.message;
-    if (message?.model === "<synthetic>") return events;
     if (message) {
       const mModel = message.model;
       if (typeof mModel === "string" && mModel.length > 0) {
@@ -22601,6 +22586,11 @@ 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，
+  // 保证 snapshot serialize 时 cursor positioning 与 UI xterm 实际尺寸一致。
+  detectorsByToolSid = /* @__PURE__ */ new Map();
   // 仅 mode='tui' 需要：index.ts 装配阶段在 observer 构造后注入。
   // observer.onEvent 要回灌 manager.feedObserverEvents，所以 observer 必须晚于 manager
   // 构造；反过来 manager 又要在 mode='tui' 下 spawn session 时 attach observer。setter 解循环
@@ -23813,7 +23803,7 @@ var SessionManager = class {
    *   - session 存在但 pty 还没 spawn / 已 exit → null
    * 调用方（onSubscribe hook）按返回值非空时构造 session:pty + session:control 帧定向回放
    */
-  getPtyReplay(sessionId) {
+  async getPtyReplay(sessionId) {
     if (this.deps.mode !== "tui") {
       probeEvent("replay.request", { sid: sessionId, result: "not-tui-mode" });
       return null;
@@ -23842,7 +23832,7 @@ var SessionManager = class {
       });
       return null;
     }
-    const snap = replay();
+    const snap = await replay();
     const dumpFile = probeDumpReplay(sessionId, snap.data);
     probeEvent("replay.dump", {
       sid: sessionId,
@@ -23868,18 +23858,50 @@ 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);
+  }
+  /** spawn 进程 exit 时清理 */
+  unregisterDetector(toolSessionId) {
+    this.detectorsByToolSid.delete(toolSessionId);
+  }
+  /**
+   * 同时 resize pty 子进程和 detector buffer：UI session:pty:resize 入口走这个。
+   * 顺序：pty.resize 在前，detector.resize 在后 —— pty 是真正的 CC 子进程视图，必须先成功；
+   * detector 只是 daemon 端镜像，任一步失败都返 false。
+   * 找不到 runner / toolSessionId / pty 任一缺失 → 返 false，handler 静默给 UI 报 ok=false 不抛错。
+   */
+  resizePty(sessionId, cols, rows) {
+    const runner = this.runners.get(sessionId);
+    if (!runner) return false;
+    const tsid = runner.getState().file.toolSessionId;
+    if (!tsid) return false;
+    const pty = this.ptyTransports.get(tsid);
+    if (!pty) return false;
+    try {
+      pty.resize(cols, rows);
+    } catch {
+      return false;
+    }
+    const detector = this.detectorsByToolSid.get(tsid);
+    if (detector) detector.resize(cols, rows);
+    return true;
+  }
   /**
    * ClaudeTuiAdapter onPtyData callback：把 pty 字节流以 session:pty wire 帧广播给订阅者。
+   * seq 来自 adapter spawn 路径维护的 per-session counter，与 detector.parseSeq 同源。
+   * UI 端 snapshot/incremental dedup 必须靠这个 seq。
    * 仅 mode='tui' 时发——SDK spawn 模式根本没 pty。
-   * payload 永远只有 `{ sessionId, data }`，data = base64 UTF-8 字节流。
+   * payload 永远只有 `{ sessionId, data, seq }`，data = base64 UTF-8 字节流。
    * 详见 protocol/src/events.ts session:pty JSDoc
    */
-  emitPtyData(toolSessionId, b64) {
+  emitPtyChunk(toolSessionId, b64, seq) {
     if (this.deps.mode !== "tui") return;
     const sid = this.sessionIdByToolSid(toolSessionId);
     if (!sid) return;
     this.routeFromRunner(
-      { type: "session:pty", sessionId: sid, data: b64 },
+      { type: "session:pty", sessionId: sid, data: b64, seq },
       "broadcast"
     );
   }
@@ -25226,6 +25248,10 @@ function createPopupDetector(opts) {
   let pendingClear = null;
   let quietTimer = null;
   const QUIET_MS = opts.quietMs ?? 300;
+  let parseSeq = 0;
+  let pendingParse = 0;
+  let drainWaiters = [];
+  let disposed = false;
   const scanScreen = () => {
     const buf = term.buffer.active;
     const lines = [];
@@ -25271,15 +25297,43 @@ function createPopupDetector(opts) {
     get visibleKind() {
       return visible;
     },
-    writeBytes(data) {
+    get parseSeq() {
+      return parseSeq;
+    },
+    writeBytes(data, seq) {
+      pendingParse++;
       return new Promise((resolve6) => {
         term.write(data, () => {
+          if (disposed) {
+            resolve6();
+            return;
+          }
+          if (typeof seq === "number" && seq > parseSeq) parseSeq = seq;
+          pendingParse--;
           tick();
+          if (pendingParse === 0 && drainWaiters.length > 0) {
+            const waiters = drainWaiters;
+            drainWaiters = [];
+            for (const w2 of waiters) w2();
+          }
           resolve6();
         });
       });
     },
+    drain() {
+      if (pendingParse === 0) return Promise.resolve();
+      return new Promise((resolve6) => {
+        drainWaiters.push(resolve6);
+      });
+    },
+    resize(cols, rows) {
+      try {
+        term.resize(cols, rows);
+      } catch {
+      }
+    },
     dispose() {
+      disposed = true;
       if (quietTimer) {
         clearTimeout(quietTimer);
         quietTimer = null;
@@ -25288,6 +25342,9 @@ function createPopupDetector(opts) {
         clearTimeout(pendingClear);
         pendingClear = null;
       }
+      const waiters = drainWaiters;
+      drainWaiters = [];
+      for (const w2 of waiters) w2();
       serializeAddon.dispose();
       term.dispose();
     },
@@ -25353,23 +25410,52 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
         this.tuiOpts.onPopupTransition(ctx.toolSessionId, kind, visible);
       }
     });
+    if (ctx.toolSessionId && this.tuiOpts.onDetectorRegister) {
+      this.tuiOpts.onDetectorRegister(ctx.toolSessionId, detector);
+    }
+    let chunkSeq = 0;
     if (ctx.toolSessionId && this.tuiOpts.onPtyReplayRegister) {
-      this.tuiOpts.onPtyReplayRegister(ctx.toolSessionId, () => ({
-        data: detector.serialize(),
-        popupKind: detector.visibleKind
-      }));
+      this.tuiOpts.onPtyReplayRegister(ctx.toolSessionId, async () => {
+        await detector.drain();
+        return {
+          data: detector.serialize(),
+          popupKind: detector.visibleKind,
+          atSeq: detector.parseSeq
+        };
+      });
     }
-    ptyChild.stdout.on("data", (data) => {
+    let coalesceBuf = [];
+    let coalesceScheduled = false;
+    const flushCoalesced = () => {
+      coalesceScheduled = false;
+      if (coalesceBuf.length === 0) return;
+      const merged = Buffer.concat(coalesceBuf);
+      coalesceBuf = [];
+      chunkSeq++;
+      const seq = chunkSeq;
       if (ctx.toolSessionId && this.tuiOpts.onPtyData) {
-        this.tuiOpts.onPtyData(ctx.toolSessionId, data.toString("base64"));
+        this.tuiOpts.onPtyData(ctx.toolSessionId, merged.toString("base64"), seq);
       }
-      void detector.writeBytes(data.toString("utf8"));
+      void detector.writeBytes(merged.toString("utf8"), seq);
       if (ctx.toolSessionId) {
-        probePtyDataThrottled(ctx.toolSessionId, data.length, data);
+        probePtyDataThrottled(ctx.toolSessionId, merged.length, merged);
+      }
+    };
+    ptyChild.stdout.on("data", (data) => {
+      coalesceBuf.push(data);
+      if (!coalesceScheduled) {
+        coalesceScheduled = true;
+        queueMicrotask(flushCoalesced);
       }
     });
     ptyChild.on("exit", () => {
       probeEvent("pty.exit", { tsid: ctx.toolSessionId });
+      if (coalesceBuf.length > 0) {
+        flushCoalesced();
+      }
+      if (ctx.toolSessionId && this.tuiOpts.onDetectorUnregister) {
+        this.tuiOpts.onDetectorUnregister(ctx.toolSessionId);
+      }
       if (ctx.toolSessionId && this.tuiOpts.onPtyUnregister) {
         this.tuiOpts.onPtyUnregister(ctx.toolSessionId);
       }
@@ -25884,8 +25970,7 @@ var SessionObserver = class {
       pollTimer: null,
       lastSize: size,
       buf: "",
-      adapter: args.adapter,
-      prevIsRejectSentinel: false
+      adapter: args.adapter
     };
     try {
       import_node_fs14.default.mkdirSync(import_node_path15.default.dirname(filePath), { recursive: true });
@@ -25958,15 +26043,6 @@ var SessionObserver = class {
       while ((newlineIndex = w2.buf.indexOf("\n")) >= 0) {
         const line = w2.buf.slice(0, newlineIndex);
         w2.buf = w2.buf.slice(newlineIndex + 1);
-        let parsed = null;
-        try {
-          parsed = line.trim() ? JSON.parse(line) : null;
-        } catch {
-          parsed = null;
-        }
-        const skipAsMarker = w2.prevIsRejectSentinel && parsed !== null && isUserPlainTextLine(parsed);
-        w2.prevIsRejectSentinel = parsed !== null ? isRejectSentinelLine(parsed) : false;
-        if (skipAsMarker) continue;
         const events = w2.adapter.parseLine(line);
         this.maybeReportUserMessage(w2.sessionId, line);
         if (events.length > 0) {
@@ -29166,14 +29242,8 @@ function buildSessionHandlers(deps) {
       return { response: { type: "session:pty:resize", ok: false } };
     }
     ensureSessionAccess(ctx, sid, "send");
-    const pty = manager.getPtyBySessionId(sid);
-    if (!pty) return { response: { type: "session:pty:resize", ok: false } };
-    try {
-      pty.resize(cols, rows);
-    } catch {
-      return { response: { type: "session:pty:resize", ok: false } };
-    }
-    return { response: { type: "session:pty:resize", ok: true } };
+    const ok = manager.resizePty(sid, cols, rows);
+    return { response: { type: "session:pty:resize", ok } };
   };
   const ptySnapshot = async (frame, _client, ctx) => {
     const sid = frame.sessionId;
@@ -29181,13 +29251,14 @@ function buildSessionHandlers(deps) {
       return { response: { type: "session:pty:snapshot", ok: false } };
     }
     ensureSessionAccess(ctx, sid, "read");
-    const snap = manager.getPtyReplay(sid);
+    const snap = await manager.getPtyReplay(sid);
     if (!snap) {
       return {
         response: {
           type: "session:pty:snapshot",
           ok: true,
           data: null,
+          atSeq: 0,
           popupKind: null
         }
       };
@@ -29197,6 +29268,7 @@ function buildSessionHandlers(deps) {
         type: "session:pty:snapshot",
         ok: true,
         data: Buffer.from(snap.data, "utf8").toString("base64"),
+        atSeq: snap.atSeq,
         popupKind: snap.popupKind
       }
     };
@@ -30595,9 +30667,11 @@ async function startDaemon(config) {
     historyReader: new ClaudeHistoryReader(),
     onPtyRegister: (tsid, pty) => manager.registerPty(tsid, pty),
     onPtyUnregister: (tsid) => manager.unregisterPty(tsid),
-    onPtyData: (tsid, b64) => manager.emitPtyData(tsid, b64),
+    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)
+    onPtyReplayRegister: (tsid, replay) => manager.registerPtyReplay(tsid, replay),
+    onDetectorRegister: (tsid, detector) => manager.registerDetector(tsid, detector),
+    onDetectorUnregister: (tsid) => manager.unregisterDetector(tsid)
   }) : new ClaudeAdapter({ logger, historyReader: new ClaudeHistoryReader() });
   registerAdapter("claude", claudeAdapter);
   const personaRegistry = new PersonaRegistry(personaStore);
@@ -30763,16 +30837,8 @@ async function startDaemon(config) {
           questions: Array.isArray(questions) ? questions : []
         });
       }
-      const replay = manager.getPtyReplay(sessionId);
-      if (replay) {
-        if (replay.data) {
-          client.send({
-            type: "session:pty",
-            sessionId,
-            data: Buffer.from(replay.data, "utf8").toString("base64")
-          });
-        }
-        if (replay.popupKind) {
+      void manager.getPtyReplay(sessionId).then((replay) => {
+        if (replay && replay.popupKind) {
           client.send({
             type: "session:control",
             sessionId,
@@ -30780,7 +30846,8 @@ async function startDaemon(config) {
             popupKind: replay.popupKind
           });
         }
-      }
+      }).catch(() => {
+      });
     }
   });
   transport = wsServer;

package/package.json

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