@clawos-dev/clawd 0.2.95 → 0.2.96-beta.178.1cde6b7

package/dist/cli.cjs

@@ -21289,10 +21289,28 @@ function cloneState(s) {
     freshSpawn: s.freshSpawn,
     procAlive: s.procAlive,
     seenUuids: s.seenUuids,
-    subSessionMeta: s.subSessionMeta
+    subSessionMeta: s.subSessionMeta,
+    // ReadyGate v2：readyForSend 是基础类型直接复制；pendingSend 必须浅拷贝防止
+    // reduce 内 push/shift 在调用方原 state 上副作用（reducer 纯函数契约）
+    readyForSend: s.readyForSend,
+    pendingSend: s.pendingSend.slice()
   };
 }
 var IDLE_KILL_DELAY_MS = 6e4;
+function tryFlushPending(state, deps) {
+  if (!state.readyForSend || state.pendingSend.length === 0) return [];
+  const text = state.pendingSend.shift();
+  state.readyForSend = false;
+  const payload = deps.encodeStdin(text, { sessionId: state.file.sessionId });
+  return [{ kind: "write-stdin", payload }];
+}
+function rgDbg(event, info) {
+  console.debug(`[RG] ${event}`, info);
+}
+function resetReadyGate(next) {
+  next.pendingSend = [];
+  next.readyForSend = true;
+}
 var SEEN_UUID_CAP = 2e3;
 function applyEventBatch(state, events, deps) {
   if (events.length === 0) return { state, effects: [] };
@@ -21532,6 +21550,9 @@ function applyCommand(state, command, deps) {
         next.nextSeq = 0;
         next.turnOpen = false;
         next.status = "running";
+        if (deps.mode === "tui") {
+          next.readyForSend = false;
+        }
         effects.push({ kind: "spawn", ctx: buildSpawnContext(next, deps) });
         effects.push({
           kind: "emit-frame",
@@ -21549,8 +21570,29 @@ function applyCommand(state, command, deps) {
       };
       const pushed = pushEventToBuffer(next, userEvent, deps);
       effects.push(...pushed.effects);
-      const payload = deps.encodeStdin(command.text, { sessionId });
-      effects.push({ kind: "write-stdin", payload });
+      const procAliveBefore = state.procAlive;
+      const readyBefore = state.readyForSend;
+      const queueBefore = state.pendingSend.length;
+      if (deps.mode === "tui") {
+        pushed.state.pendingSend.push(command.text);
+        effects.push(...tryFlushPending(pushed.state, deps));
+      } else {
+        const payload = deps.encodeStdin(command.text, { sessionId });
+        effects.push({ kind: "write-stdin", payload });
+      }
+      rgDbg("send", {
+        sid: sessionId,
+        mode: deps.mode ?? "sdk",
+        procAliveBefore,
+        spawned: !procAliveBefore,
+        readyBefore,
+        queueBefore,
+        textLen: command.text.length,
+        preview: command.text.slice(0, 40),
+        wroteStdin: effects.some((e) => e.kind === "write-stdin"),
+        readyAfter: pushed.state.readyForSend,
+        queueAfter: pushed.state.pendingSend.length
+      });
       return { state: pushed.state, effects };
     }
     case "stop": {
@@ -21566,6 +21608,7 @@ function applyCommand(state, command, deps) {
       }
       next.pendingPermissions = {};
       next.pendingQuestions = {};
+      resetReadyGate(next);
       if (next.procAlive) {
         next.status = "stopping";
         effects.push({ kind: "kill", signal: "SIGKILL" });
@@ -21583,6 +21626,9 @@ function applyCommand(state, command, deps) {
       next.nextSeq = 0;
       next.turnOpen = false;
       next.status = "running";
+      if (deps.mode === "tui") {
+        next.readyForSend = false;
+      }
       effects.push({ kind: "spawn", ctx: buildSpawnContext(next, deps) });
       effects.push({
         kind: "emit-frame",
@@ -21603,6 +21649,7 @@ function applyCommand(state, command, deps) {
       }
       next.pendingPermissions = {};
       next.pendingQuestions = {};
+      resetReadyGate(next);
       if (next.procAlive) {
         effects.push({ kind: "kill", signal: "SIGKILL" });
       }
@@ -21651,6 +21698,7 @@ function applyCommand(state, command, deps) {
           frame: { type: "session:cleared", sessionId }
         });
       }
+      resetReadyGate(next);
       if (next.procAlive) {
         effects.push({ kind: "kill", signal: "SIGKILL" });
       }
@@ -21683,6 +21731,7 @@ function applyCommand(state, command, deps) {
       next.pendingPermissions = {};
       next.freshSpawn = false;
       next.seenUuids = [];
+      resetReadyGate(next);
       effects.push({ kind: "persist-file", file: nextFile });
       effects.push(sessionInfoFrame(nextFile));
       effects.push({
@@ -21717,6 +21766,7 @@ function reduceSession(state, input, deps) {
       const next = cloneState(state);
       next.procAlive = false;
       next.status = "stopped";
+      resetReadyGate(next);
       const sessionId = next.file.sessionId;
       const clearedEffects = Object.keys(state.pendingQuestions ?? {}).map(
         (toolUseId) => ({
@@ -21748,6 +21798,7 @@ function reduceSession(state, input, deps) {
     case "proc-error": {
       const next = cloneState(state);
       next.status = "error";
+      resetReadyGate(next);
       return {
         state: next,
         effects: [
@@ -21899,6 +21950,22 @@ function reduceSession(state, input, deps) {
       next.pendingPermissions = keep;
       return { state: next, effects: [] };
     }
+    case "ready-detected": {
+      if (deps.mode !== "tui") {
+        rgDbg("ready-input", { sid: state.file.sessionId, skipped: "non-tui-mode" });
+        return { state, effects: [] };
+      }
+      const next = cloneState(state);
+      next.readyForSend = true;
+      const flushEffects = tryFlushPending(next, deps);
+      rgDbg("ready-input", {
+        sid: next.file.sessionId,
+        wroteStdin: flushEffects.length > 0,
+        readyAfter: next.readyForSend,
+        queueAfter: next.pendingSend.length
+      });
+      return { state: next, effects: flushEffects };
+    }
     default:
       assertNever(input);
   }
@@ -22062,7 +22129,9 @@ var SessionRunner = class {
       resolveContextWindow: this.hooks.resolveContextWindow,
       genUuid: this.hooks.genUuid ?? v4_default,
       ownerDisplayName: this.hooks.ownerDisplayName,
-      personaRoot: this.hooks.personaRoot
+      personaRoot: this.hooks.personaRoot,
+      // ReadyGate v2：透传 mode 让 reducer send / ready-detected 分支决定走暂存队列还是直写
+      mode: this.hooks.mode
     };
     const { state, effects } = reduceSession(this.state, inputMsg, deps);
     this.state = state;
@@ -22241,6 +22310,12 @@ var SessionRunner = class {
         this.doKill(effect.signal);
         break;
       case "write-stdin":
+        console.debug("[RG] write-stdin", {
+          procAlive: !!this.proc,
+          stdinWritable: !!this.proc?.stdin,
+          len: effect.payload.length,
+          preview: effect.payload.replace(/\x1b\[20[01]~/g, "\xB7paste\xB7").slice(0, 60)
+        });
         this.proc?.stdin?.write(effect.payload);
         this.recorder?.tapStdinWrite(effect.payload);
         break;
@@ -22492,7 +22567,11 @@ function makeInitialState(file, subSessionMeta) {
     freshSpawn: false,
     procAlive: false,
     seenUuids: [],
-    subSessionMeta
+    subSessionMeta,
+    // ReadyGate v2：默认值兼容 SDK happy path（直写 stdin，不走队列）。
+    // TUI 模式由 reducer send 分支按 deps.mode='tui' 主动翻 readyForSend=false
+    readyForSend: true,
+    pendingSend: []
   };
 }
 var SessionManager = class {
@@ -22742,7 +22821,10 @@ var SessionManager = class {
         tool: input.tool,
         relPath: input.relPath,
         cwd: input.cwd
-      }) : void 0
+      }) : void 0,
+      // ReadyGate v2：透传 daemon mode，runner 装配 ReducerDeps 时让 reducer 判断
+      // send / ready-detected 分支走暂存队列还是直写
+      mode: this.deps.mode
     });
     if (this.deps.mode === "tui" && !file.toolSessionId) {
       const newTsid = v4_default();
@@ -23871,6 +23953,26 @@ var SessionManager = class {
       "broadcast"
     );
   }
+  /**
+   * ClaudeTuiAdapter onReady callback（ReadyGate v2）：ReadyDetector 扫到 cc TUI 主输入框 +
+   * quiet window 通过时投递 reducer 'ready-detected' input，触发 pendingSend 队列出队 flush。
+   * 仅 mode='tui' 时启用；SDK 模式 reducer 内 early return 也无害（双层兜底）。
+   */
+  dispatchReadyDetected(toolSessionId) {
+    if (this.deps.mode !== "tui") {
+      console.debug("[RG] mgr-disp", { tsid: toolSessionId, skipped: "non-tui-mode" });
+      return;
+    }
+    const sid = this.sessionIdByToolSid(toolSessionId);
+    const runner = sid ? this.runners.get(sid) : void 0;
+    console.debug("[RG] mgr-disp", {
+      tsid: toolSessionId,
+      sid: sid ?? null,
+      runnerFound: !!runner
+    });
+    if (!runner) return;
+    runner.input({ kind: "ready-detected" });
+  }
   /** toolSessionId → sessionId 反查（遍历 runners）；session 数典型 < 10，O(n) 可接受 */
   sessionIdByToolSid(toolSessionId) {
     for (const [sid, runner] of this.runners) {
@@ -24985,26 +25087,27 @@ var PtyChildProcess = class extends import_node_events.EventEmitter {
     super();
     this.pty = pty;
     this.pid = pty.pid;
-    const { logger, tag, bootGate } = opts;
-    this.bootReady = !bootGate;
-    this.bootGateLogger = logger;
-    this.bootGateTag = tag;
-    logger?.debug("pty-child constructed", { pid: this.pid, tag, gated: !!bootGate });
+    const { logger, tag } = opts;
+    logger?.debug("pty-child constructed", { pid: this.pid, tag });
     const writeToPty = (data) => {
       const match = data.match(/^(\x1b\[200~[\s\S]*\x1b\[201~)(\r+)$/);
       if (match) {
         const paste = match[1];
         const enter = match[2];
+        console.debug("[RG] pty-paste", { pasteLen: paste.length, enterLen: enter.length });
         pty.write(paste);
         setTimeout(() => {
           try {
             pty.write(enter);
+            console.debug("[RG] pty-paste-enter", { wrote: "\\r", disposed: false });
             logger?.debug("pty bracketed paste submit \\r delayed", { tag, pid: this.pid });
           } catch (err) {
+            console.debug("[RG] pty-paste-enter", { error: err.message });
             logger?.warn("pty delayed \\r failed", { tag, error: err.message });
           }
         }, 120);
       } else {
+        console.debug("[RG] pty-write-direct", { len: data.length });
         pty.write(data);
       }
     };
@@ -25012,17 +25115,6 @@ var PtyChildProcess = class extends import_node_events.EventEmitter {
       decodeStrings: false,
       write: (chunk, _enc, cb) => {
         const s = typeof chunk === "string" ? chunk : chunk.toString("utf8");
-        if (!this.bootReady) {
-          this.stdinBuffer.push(s);
-          logger?.debug("pty stdin.write buffered (boot gate)", {
-            tag,
-            pid: this.pid,
-            bytes: s.length,
-            preview: s.replace(/\x1b\[20[01]~/g, "\xB7paste\xB7").slice(0, 80)
-          });
-          cb();
-          return;
-        }
         try {
           writeToPty(s);
           logger?.debug("pty stdin.write", {
@@ -25038,7 +25130,6 @@ var PtyChildProcess = class extends import_node_events.EventEmitter {
         }
       }
     });
-    this._writeToPty = writeToPty;
     this.stdout = new import_node_stream.Readable({ read() {
     } });
     pty.onData((data) => {
@@ -25069,40 +25160,6 @@ var PtyChildProcess = class extends import_node_events.EventEmitter {
   stderr;
   exitCode = null;
   firstDataLogged = false;
-  // Boot gate buffer：bootGate 启用且 ready=false 时，stdin.write 入这个队列等待 flush
-  stdinBuffer = [];
-  bootReady;
-  bootGateLogger;
-  bootGateTag;
-  // bracketed paste 拆分写入实现；构造器内闭包初始化，setReady flush 也用同一份
-  _writeToPty = () => {
-  };
-  /**
-   * 标记 boot gate 已通过（CC TUI 启动完成，可以接受用户输入）。
-   * 立刻 flush 之前 buffered 的 stdin 字节到 pty。幂等。外部由 ClaudeTuiAdapter 在
-   * 看到 banner / popup 处理完成 / 超时兜底时调用
-   */
-  setReady() {
-    if (this.bootReady) return;
-    this.bootReady = true;
-    const count = this.stdinBuffer.length;
-    this.bootGateLogger?.debug("pty boot gate cleared, flushing buffered stdin", {
-      tag: this.bootGateTag,
-      pid: this.pid,
-      bufferedWrites: count
-    });
-    while (this.stdinBuffer.length > 0) {
-      const data = this.stdinBuffer.shift();
-      try {
-        this._writeToPty(data);
-      } catch (err) {
-        this.bootGateLogger?.warn("pty flush stdin write failed", {
-          tag: this.bootGateTag,
-          error: err.message
-        });
-      }
-    }
-  }
   /** 与 ChildProcess.kill 签名对齐，返回是否成功发送信号 */
   kill(signal) {
     try {
@@ -25259,9 +25316,83 @@ function createPopupDetector(opts) {
     }
   };
 }
-function createBootGate(pty, ptyChild, logger, toolSessionId) {
-  const FALLBACK_MS = 4e3;
-  const POST_POPUP_QUIET_MS = 800;
+function createReadyDetector(opts) {
+  const term = new Terminal({
+    cols: opts.cols ?? 120,
+    rows: opts.rows ?? 40,
+    scrollback: 200,
+    allowProposedApi: true
+  });
+  let quietTimer = null;
+  let disposed = false;
+  const scanReadyFrame = () => {
+    const buf = term.buffer.active;
+    let prevHasDivider = false;
+    for (let i = 0; i < buf.length; i++) {
+      const line = buf.getLine(i);
+      if (!line) {
+        prevHasDivider = false;
+        continue;
+      }
+      const text = line.translateToString(true);
+      const hasPrompt = /^❯/.test(text);
+      const hasDivider = /─{20,}/.test(text);
+      if (hasPrompt && prevHasDivider) return true;
+      prevHasDivider = hasDivider;
+    }
+    return false;
+  };
+  const clearQuiet = () => {
+    if (quietTimer) {
+      clearTimeout(quietTimer);
+      quietTimer = null;
+    }
+  };
+  const quietFire = () => {
+    quietTimer = null;
+    if (disposed) return;
+    if (!scanReadyFrame()) {
+      console.debug("[RG] det-state", { event: "quiet-fire-but-not-ready-anymore" });
+      return;
+    }
+    console.debug("[RG] det-state", { event: "quiet-fire \u2192 onReady" });
+    opts.onReady();
+  };
+  let prevReady = false;
+  const tick = () => {
+    if (disposed) return;
+    const ready = scanReadyFrame();
+    if (!ready) {
+      clearQuiet();
+      if (prevReady) {
+        console.debug("[RG] det-state", { event: "ready \u2192 not-ready" });
+        prevReady = false;
+      }
+      return;
+    }
+    if (!prevReady) {
+      console.debug("[RG] det-state", { event: "not-ready \u2192 ready-candidate (quiet timer set)" });
+      prevReady = true;
+    }
+    clearQuiet();
+    quietTimer = setTimeout(quietFire, opts.quietMs);
+  };
+  return {
+    writeBytes(data) {
+      if (disposed) return;
+      term.write(data, () => {
+        if (disposed) return;
+        tick();
+      });
+    },
+    dispose() {
+      disposed = true;
+      clearQuiet();
+      term.dispose();
+    }
+  };
+}
+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 = {
     trust: { handled: false, regex: /trust this folder/i, accept: "\r", label: "trust-folder" },
@@ -25273,22 +25404,7 @@ function createBootGate(pty, ptyChild, logger, toolSessionId) {
     }
   };
   let scanBuf = "";
-  let opened = false;
-  let postPopupQuiet = null;
-  const openGate = (reason) => {
-    if (opened) return;
-    opened = true;
-    logger?.debug("boot gate setReady", { toolSessionId, reason });
-    clearTimeout(fallbackTimer);
-    if (postPopupQuiet) clearTimeout(postPopupQuiet);
-    scanBuf = "";
-    ptyChild.setReady();
-  };
-  const fallbackTimer = setTimeout(() => openGate("timeout-4s"), FALLBACK_MS);
   return {
-    get opened() {
-      return opened;
-    },
     feedBytes(data) {
       scanBuf += data.toString("utf8");
       const cleanBuf = stripAnsi(scanBuf).replace(/\s+/g, " ");
@@ -25296,7 +25412,7 @@ function createBootGate(pty, ptyChild, logger, toolSessionId) {
         if (popup.handled) continue;
         if (popup.regex.test(cleanBuf)) {
           popup.handled = true;
-          logger?.debug(`${popup.label} popup auto-yes`, { toolSessionId });
+          logger?.debug(`${popup.label} popup auto-yes`);
           try {
             pty.write(popup.accept);
           } catch (err) {
@@ -25305,15 +25421,11 @@ function createBootGate(pty, ptyChild, logger, toolSessionId) {
             });
           }
           scanBuf = "";
-          if (postPopupQuiet) clearTimeout(postPopupQuiet);
-          postPopupQuiet = setTimeout(() => openGate("post-popup-quiet"), POST_POPUP_QUIET_MS);
         }
       }
       if (scanBuf.length > 8192) scanBuf = scanBuf.slice(-4096);
     },
     dispose() {
-      clearTimeout(fallbackTimer);
-      if (postPopupQuiet) clearTimeout(postPopupQuiet);
     }
   };
 }
@@ -25355,13 +25467,9 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
     }
     const ptyChild = new PtyChildProcess(pty, {
       logger: this.tuiLogger,
-      tag: ctx.toolSessionId ?? "no-tsid",
-      // boot gate：CC TUI 启动 + popup 处理前 stdin.write 一律 buffer，防止用户 prompt 在
-      // CC 加载 node runtime 时被吞。bootGate scanner 在 popup 处理完成 / 4s 兜底任一条件
-      // 触发后调 setReady() 开闸
-      bootGate: true
+      tag: ctx.toolSessionId ?? "no-tsid"
     });
-    const bootGate = createBootGate(pty, ptyChild, this.tuiLogger, ctx.toolSessionId);
+    const bootGate = createBootGate(pty, this.tuiLogger);
     const detector = createPopupDetector({
       clearQuietMs: 200,
       onTransition: (kind, visible) => {
@@ -25374,6 +25482,14 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
         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);
+      }
+    });
     if (ctx.toolSessionId && this.tuiOpts.onDetectorRegister) {
       this.tuiOpts.onDetectorRegister(ctx.toolSessionId, detector);
     }
@@ -25400,11 +25516,9 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
       if (ctx.toolSessionId && this.tuiOpts.onPtyData) {
         this.tuiOpts.onPtyData(ctx.toolSessionId, merged.toString("base64"), seq);
       }
-      if (bootGate.opened) {
-        void detector.writeBytes(merged.toString("utf8"), seq);
-      } else {
-        bootGate.feedBytes(merged);
-      }
+      bootGate.feedBytes(merged);
+      void detector.writeBytes(merged.toString("utf8"), seq);
+      readyDetector.writeBytes(merged.toString("utf8"));
       if (ctx.toolSessionId) {
         probePtyDataThrottled(ctx.toolSessionId, merged.length, merged);
       }
@@ -25422,6 +25536,7 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
         flushCoalesced();
       }
       bootGate.dispose();
+      readyDetector.dispose();
       if (ctx.toolSessionId && this.tuiOpts.onDetectorUnregister) {
         this.tuiOpts.onDetectorUnregister(ctx.toolSessionId);
       }
@@ -30655,7 +30770,9 @@ async function startDaemon(config) {
     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)
+    onDetectorUnregister: (tsid) => manager.unregisterDetector(tsid),
+    // ReadyGate v2：ReadyDetector emit ready 时投递 reducer 'ready-detected' input
+    onReady: (tsid) => manager.dispatchReadyDetected(tsid)
   }) : new ClaudeAdapter({ logger, historyReader: new ClaudeHistoryReader() });
   registerAdapter("claude", claudeAdapter);
   const personaRegistry = new PersonaRegistry(personaStore);

package/package.json

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