@clawos-dev/clawd 0.2.71 → 0.2.72-beta.140.1753cf8

package/dist/cli.cjs

@@ -175,7 +175,11 @@ var init_errors = __esm({
       PERMISSION_REQUEST_STALE: "PERMISSION_REQUEST_STALE",
       FILE_TOO_LARGE: "FILE_TOO_LARGE",
       INTERNAL: "INTERNAL",
-      UNAUTHORIZED: "UNAUTHORIZED"
+      UNAUTHORIZED: "UNAUTHORIZED",
+      // Ready gate：用户在 pendingSend 已存在时再次 send，daemon 拒绝（不覆盖暂存）。
+      // UI ChatInput 应在 popup 态 disable，daemon 兜底；error 帧 broadcast 通知所有 tab。
+      // Spec: clawd/superpowers/specs/2026-05-22-cc-ready-gate-design.md §错误处理
+      SEND_PENDING: "SEND_PENDING"
     };
     ClawdError = class extends Error {
       constructor(code, message) {
@@ -20872,7 +20876,9 @@ function cloneState(s) {
     freshSpawn: s.freshSpawn,
     procAlive: s.procAlive,
     seenUuids: s.seenUuids,
-    subSessionMeta: s.subSessionMeta
+    subSessionMeta: s.subSessionMeta,
+    readyForSend: s.readyForSend,
+    pendingSend: s.pendingSend
   };
 }
 var IDLE_KILL_DELAY_MS = 5e3;
@@ -21104,6 +21110,23 @@ function applyCommand(state, command, deps) {
         effects.push({ kind: "cancel-idle-kill", sessionId });
         next.status = next.procAlive ? "running" : "idle";
       }
+      if (next.pendingSend) {
+        return {
+          state: next,
+          effects: [
+            ...effects,
+            {
+              kind: "emit-frame",
+              frame: {
+                type: "error",
+                sessionId,
+                code: ERROR_CODES.SEND_PENDING,
+                message: "a previous message is still pending; cc not yet ready"
+              }
+            }
+          ]
+        };
+      }
       if (!next.procAlive) {
         next.procAlive = true;
         next.freshSpawn = true;
@@ -21112,6 +21135,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",
@@ -21128,10 +21154,14 @@ function applyCommand(state, command, deps) {
         uuid: deps.genUuid?.()
       };
       const pushed = pushEventToBuffer(next, userEvent, deps);
-      const nextState = pushed.state;
+      let nextState = pushed.state;
       effects.push(...pushed.effects);
-      const payload = deps.encodeStdin(command.text, { sessionId });
-      effects.push({ kind: "write-stdin", payload });
+      if (nextState.readyForSend) {
+        const payload = deps.encodeStdin(command.text, { sessionId });
+        effects.push({ kind: "write-stdin", payload });
+      } else {
+        nextState = { ...nextState, pendingSend: { text: command.text } };
+      }
       return { state: nextState, effects };
     }
     case "stop": {
@@ -21147,6 +21177,7 @@ function applyCommand(state, command, deps) {
       }
       next.pendingPermissions = {};
       next.pendingQuestions = {};
+      next.pendingSend = void 0;
       if (next.procAlive) {
         next.status = "stopping";
         effects.push({ kind: "kill", signal: "SIGKILL" });
@@ -21184,6 +21215,8 @@ function applyCommand(state, command, deps) {
       }
       next.pendingPermissions = {};
       next.pendingQuestions = {};
+      next.pendingSend = void 0;
+      next.readyForSend = false;
       if (next.procAlive) {
         effects.push({ kind: "kill", signal: "SIGKILL" });
       }
@@ -21227,6 +21260,7 @@ function applyCommand(state, command, deps) {
         next.pendingPermissions = {};
         next.freshSpawn = false;
         next.seenUuids = [];
+        next.pendingSend = void 0;
         effects.push({
           kind: "emit-frame",
           frame: { type: "session:cleared", sessionId }
@@ -21264,6 +21298,7 @@ function applyCommand(state, command, deps) {
       next.pendingPermissions = {};
       next.freshSpawn = false;
       next.seenUuids = [];
+      next.pendingSend = void 0;
       effects.push({ kind: "persist-file", file: nextFile });
       effects.push(sessionInfoFrame(nextFile));
       effects.push({
@@ -21298,6 +21333,8 @@ function reduceSession(state, input, deps) {
       const next = cloneState(state);
       next.procAlive = false;
       next.status = "stopped";
+      next.pendingSend = void 0;
+      next.readyForSend = false;
       const sessionId = next.file.sessionId;
       const clearedEffects = Object.keys(state.pendingQuestions ?? {}).map(
         (toolUseId) => ({
@@ -21329,6 +21366,8 @@ function reduceSession(state, input, deps) {
     case "proc-error": {
       const next = cloneState(state);
       next.status = "error";
+      next.pendingSend = void 0;
+      next.readyForSend = false;
       return {
         state: next,
         effects: [
@@ -21455,6 +21494,30 @@ function reduceSession(state, input, deps) {
         effects: [{ kind: "kill", signal: "SIGKILL" }]
       };
     }
+    case "ready-detected": {
+      if (!state.procAlive) {
+        return { state, effects: [] };
+      }
+      const next = cloneState(state);
+      next.readyForSend = true;
+      const flushEffects = [];
+      if (state.pendingSend) {
+        const payload = deps.encodeStdin(state.pendingSend.text, {
+          sessionId: next.file.sessionId
+        });
+        flushEffects.push({ kind: "write-stdin", payload });
+        next.pendingSend = void 0;
+      }
+      return { state: next, effects: flushEffects };
+    }
+    case "popup-detected": {
+      if (!state.procAlive) {
+        return { state, effects: [] };
+      }
+      const next = cloneState(state);
+      next.readyForSend = false;
+      return { state: next, effects: [] };
+    }
     case "inject-owner-text": {
       const ownerEvent = {
         kind: "meta-text",
@@ -21642,7 +21705,8 @@ var SessionRunner = class {
       now: this.hooks.now ?? Date.now,
       resolveContextWindow: this.hooks.resolveContextWindow,
       genUuid: this.hooks.genUuid ?? v4_default,
-      ownerDisplayName: this.hooks.ownerDisplayName
+      ownerDisplayName: this.hooks.ownerDisplayName,
+      mode: this.hooks.mode ?? "sdk"
     };
     const { state, effects } = reduceSession(this.state, inputMsg, deps);
     this.state = state;
@@ -22016,7 +22080,14 @@ function makeInitialState(file, subSessionMeta) {
     freshSpawn: false,
     procAlive: false,
     seenUuids: [],
-    subSessionMeta
+    subSessionMeta,
+    // Ready gate：保守起手 true，让 SDK 模式与 TUI 接线未完成时 send 仍走旧的"立即写 stdin"
+    // 路径不破坏 SDK 用户体验。TUI 模式 manager 集成（Task 6）会在 spawn 时显式 dispatch
+    // 'popup-detected' 把 flag 翻 false → 等 ReadyGate emit ready 再 dispatch 'ready-detected'
+    // 翻回 true 并 flush pendingSend。
+    // daemon-only 字段，不上 wire / 不写 SessionFile（compressFrameForWire 只处理
+    // session:status，SessionState 不直接序列化）。
+    readyForSend: true
   };
 }
 var SessionManager = class {
@@ -22192,6 +22263,9 @@ var SessionManager = class {
       dataDir: this.deps.dataDir,
       personaStore: this.deps.personaStore,
       ownerDisplayName: this.deps.ownerDisplayName,
+      // 透传给 ReducerDeps.mode：reducer send !procAlive spawn 路径据此判断要不要把
+      // readyForSend 翻 false（TUI 翻 false 让 user_text 走 pendingSend 暂存；SDK 不动保持直写）
+      mode: this.deps.mode,
       // file-sharing (spec §6 PR 3)：闭包 scope + sessionId，runner 只暴露 tool/relPath/cwd
       onFileEdit: attachmentGroup ? (input) => attachmentGroup.onFileEdit({
         scope,
@@ -23192,6 +23266,9 @@ var SessionManager = class {
       },
       "broadcast"
     );
+    const runner = this.runners.get(sid);
+    if (!runner) return;
+    runner.input({ kind: visible ? "popup-detected" : "ready-detected" });
   }
   /** toolSessionId → sessionId 反查（遍历 runners）；session 数典型 < 10，O(n) 可接受 */
   sessionIdByToolSid(toolSessionId) {
@@ -24510,10 +24587,22 @@ function spawnPty(opts) {
 
 // src/tools/claude-tui.ts
 var { Terminal } = import_headless.default;
-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 hasInputFrame(bufferText) {
+  const lines = bufferText.split("\n");
+  for (let i = 1; i < lines.length; i++) {
+    const cur = lines[i];
+    if (!/^\s*❯\s/.test(cur)) continue;
+    const prev = lines[i - 1];
+    if (/─{20,}/.test(prev)) return true;
+  }
+  return false;
+}
+var READY_SIGNATURE_PATTERNS = [
+  { name: "input-frame", match: hasInputFrame }
 ];
+function isReadySignature(bufferText) {
+  return READY_SIGNATURE_PATTERNS.some((p2) => p2.match(bufferText));
+}
 function createPopupDetector(opts) {
   const term = new Terminal({
     cols: opts.cols ?? 120,
@@ -24525,39 +24614,46 @@ function createPopupDetector(opts) {
   term.loadAddon(serializeAddon);
   let visible = null;
   let pendingClear = null;
-  const scanFooter = () => {
+  let quietTimer = null;
+  const QUIET_MS = opts.quietMs ?? 300;
+  const scanReady = () => {
     const buf = term.buffer.active;
+    const lines = [];
     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;
-      }
+      lines.push(line.translateToString(true));
     }
-    return null;
+    return isReadySignature(lines.join("\n"));
   };
   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);
-    }
+    if (quietTimer) clearTimeout(quietTimer);
+    quietTimer = setTimeout(() => {
+      quietTimer = null;
+      const ready = scanReady();
+      if (!ready && visible === null) {
+        visible = "unknown";
+        opts.onTransition("unknown", true);
+      } else if (!ready && visible !== null) {
+        if (pendingClear) {
+          clearTimeout(pendingClear);
+          pendingClear = null;
+        }
+      } else if (ready && visible !== null) {
+        if (pendingClear) {
+          clearTimeout(pendingClear);
+          pendingClear = null;
+        }
+        const toClear = visible;
+        pendingClear = setTimeout(() => {
+          pendingClear = null;
+          if (visible === toClear) {
+            visible = null;
+            opts.onTransition(toClear, false);
+          }
+        }, opts.clearQuietMs);
+      }
+    }, QUIET_MS);
   };
   return {
     get visibleKind() {
@@ -24572,6 +24668,10 @@ function createPopupDetector(opts) {
       });
     },
     dispose() {
+      if (quietTimer) {
+        clearTimeout(quietTimer);
+        quietTimer = null;
+      }
       if (pendingClear) {
         clearTimeout(pendingClear);
         pendingClear = null;
@@ -24584,64 +24684,6 @@ function createPopupDetector(opts) {
     }
   };
 }
-function createBootGate(pty, ptyChild, logger, toolSessionId) {
-  const FALLBACK_MS = 4e3;
-  const POST_POPUP_QUIET_MS = 800;
-  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" },
-    bypass: {
-      handled: false,
-      regex: /Bypass Permissions mode|By proceeding/i,
-      accept: "2\r",
-      label: "bypass-warning"
-    }
-  };
-  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, " ");
-      for (const popup of Object.values(popups)) {
-        if (popup.handled) continue;
-        if (popup.regex.test(cleanBuf)) {
-          popup.handled = true;
-          logger?.debug(`${popup.label} popup auto-yes`, { toolSessionId });
-          try {
-            pty.write(popup.accept);
-          } catch (err) {
-            logger?.warn(`${popup.label} auto-yes write failed`, {
-              error: err.message
-            });
-          }
-          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);
-    }
-  };
-}
 var ClaudeTuiAdapter = class extends ClaudeAdapter {
   // id 仍是 'claude'（继承）— UI / SessionFile.tool / capabilities:get RPC 字面量不变，
   // 完全兼容 SDK 模式 wiring。TUI 行为通过 daemon mode 流转，不通过 tool id 区分
@@ -24676,14 +24718,14 @@ 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
+      // MVP 阶段：boot gate 自动应答 + 4s 硬超时已废弃（由 ReadyGate 反向判定接管），
+      // 故 stdin buffer 关闸 —— 用户 query 直发 CC。
+      // boot gate 废弃；Task 5/6 在 reducer 层接 ReadyGate ready 信号做 pending-send 调度
+      bootGate: false
     });
-    const bootGate = createBootGate(pty, ptyChild, this.tuiLogger, ctx.toolSessionId);
     const detector = createPopupDetector({
       clearQuietMs: 200,
+      // quietMs 走默认 300ms — 屏幕静止判定时长，对 cc TUI 启动期重绘节奏足够
       onTransition: (kind, visible) => {
         if (!ctx.toolSessionId || !this.tuiOpts.onPopupTransition) return;
         this.tuiLogger?.debug("popup transition", {
@@ -24704,14 +24746,9 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
       if (ctx.toolSessionId && this.tuiOpts.onPtyData) {
         this.tuiOpts.onPtyData(ctx.toolSessionId, data.toString("base64"));
       }
-      if (bootGate.opened) {
-        void detector.writeBytes(data.toString("utf8"));
-      } else {
-        bootGate.feedBytes(data);
-      }
+      void detector.writeBytes(data.toString("utf8"));
     });
     ptyChild.on("exit", () => {
-      bootGate.dispose();
       if (ctx.toolSessionId && this.tuiOpts.onPtyUnregister) {
         this.tuiOpts.onPtyUnregister(ctx.toolSessionId);
       }

package/package.json

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