@clawos-dev/clawd 0.2.93-beta.175.b162fd0 → 0.2.94-beta.176.8dff088

package/dist/cli.cjs

@@ -222,11 +222,7 @@ var init_errors = __esm({
       PERMISSION_REQUEST_STALE: "PERMISSION_REQUEST_STALE",
       FILE_TOO_LARGE: "FILE_TOO_LARGE",
       INTERNAL: "INTERNAL",
-      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"
+      UNAUTHORIZED: "UNAUTHORIZED"
     };
     ClawdError = class extends Error {
       constructor(code, message) {
@@ -10559,6 +10555,20 @@ 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;
@@ -10566,6 +10576,7 @@ 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;
@@ -10879,7 +10890,11 @@ 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);
         }
@@ -11305,6 +11320,7 @@ 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) {
@@ -21273,9 +21289,7 @@ function cloneState(s) {
     freshSpawn: s.freshSpawn,
     procAlive: s.procAlive,
     seenUuids: s.seenUuids,
-    subSessionMeta: s.subSessionMeta,
-    readyForSend: s.readyForSend,
-    pendingSend: s.pendingSend
+    subSessionMeta: s.subSessionMeta
   };
 }
 var IDLE_KILL_DELAY_MS = 6e4;
@@ -21510,23 +21524,6 @@ 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;
@@ -21535,9 +21532,6 @@ 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",
@@ -21554,15 +21548,10 @@ function applyCommand(state, command, deps) {
         uuid: deps.genUuid?.()
       };
       const pushed = pushEventToBuffer(next, userEvent, deps);
-      let nextState = pushed.state;
       effects.push(...pushed.effects);
-      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 };
+      const payload = deps.encodeStdin(command.text, { sessionId });
+      effects.push({ kind: "write-stdin", payload });
+      return { state: pushed.state, effects };
     }
     case "stop": {
       for (const toolUseId of Object.keys(state.pendingQuestions ?? {})) {
@@ -21577,7 +21566,6 @@ 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" });
@@ -21615,8 +21603,6 @@ 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" });
       }
@@ -21660,7 +21646,6 @@ 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 }
@@ -21698,7 +21683,6 @@ 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({
@@ -21733,8 +21717,6 @@ 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) => ({
@@ -21766,8 +21748,6 @@ 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: [
@@ -21894,30 +21874,6 @@ 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",
@@ -22106,8 +22062,7 @@ var SessionRunner = class {
       resolveContextWindow: this.hooks.resolveContextWindow,
       genUuid: this.hooks.genUuid ?? v4_default,
       ownerDisplayName: this.hooks.ownerDisplayName,
-      personaRoot: this.hooks.personaRoot,
-      mode: this.hooks.mode ?? "sdk"
+      personaRoot: this.hooks.personaRoot
     };
     const { state, effects } = reduceSession(this.state, inputMsg, deps);
     this.state = state;
@@ -22537,14 +22492,7 @@ function makeInitialState(file, subSessionMeta) {
     freshSpawn: false,
     procAlive: false,
     seenUuids: [],
-    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
+    subSessionMeta
   };
 }
 var SessionManager = class {
@@ -22787,9 +22735,6 @@ var SessionManager = class {
       // Phase 2 capability platform (plan §3): 透传 personaRoot, buildSpawnArgs 据
       // cwd 是否在 personaRoot 下自动决定是否注入 --settings sandbox-settings.json.
       personaRoot: this.deps.personaRoot,
-      // 透传给 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,
@@ -23925,9 +23870,6 @@ 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) {
@@ -25212,29 +25154,6 @@ 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 matchPopupFooterKind(bufferText) {
-  for (const p2 of POPUP_FOOTER_PATTERNS) {
-    if (p2.regex.test(bufferText)) return p2.kind;
-  }
-  return null;
-}
-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) {
-  if (matchPopupFooterKind(bufferText) !== null) return false;
-  return READY_SIGNATURE_PATTERNS.some((p2) => p2.match(bufferText));
-}
 function createPopupDetector(opts) {
   const term = new Terminal({
     cols: opts.cols ?? 120,
@@ -25246,52 +25165,43 @@ function createPopupDetector(opts) {
   term.loadAddon(serializeAddon);
   let visible = null;
   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 scanFooter = () => {
     const buf = term.buffer.active;
-    const lines = [];
     for (let i = 0; i < buf.length; i++) {
       const line = buf.getLine(i);
       if (!line) continue;
-      lines.push(line.translateToString(true));
+      const text = line.translateToString(true);
+      if (!text) continue;
+      for (const p2 of POPUP_FOOTER_PATTERNS) {
+        if (p2.regex.test(text)) return p2.kind;
+      }
     }
-    const text = lines.join("\n");
-    return { ready: isReadySignature(text), footerKind: matchPopupFooterKind(text) };
+    return null;
   };
   const tick = () => {
-    if (quietTimer) clearTimeout(quietTimer);
-    quietTimer = setTimeout(() => {
-      quietTimer = null;
-      const { ready, footerKind } = scanScreen();
-      const popupKind = footerKind ?? "unknown";
-      if (!ready && visible === null) {
-        visible = popupKind;
-        opts.onTransition(popupKind, 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);
+    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);
+    }
   };
   return {
     get visibleKind() {
@@ -25334,10 +25244,6 @@ function createPopupDetector(opts) {
     },
     dispose() {
       disposed = true;
-      if (quietTimer) {
-        clearTimeout(quietTimer);
-        quietTimer = null;
-      }
       if (pendingClear) {
         clearTimeout(pendingClear);
         pendingClear = null;
@@ -25353,6 +25259,64 @@ 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 区分
@@ -25392,14 +25356,14 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
     const ptyChild = new PtyChildProcess(pty, {
       logger: this.tuiLogger,
       tag: ctx.toolSessionId ?? "no-tsid",
-      // MVP 阶段：boot gate 自动应答 + 4s 硬超时已废弃（由 ReadyGate 反向判定接管），
-      // 故 stdin buffer 关闸 —— 用户 query 直发 CC。
-      // boot gate 废弃；Task 5/6 在 reducer 层接 ReadyGate ready 信号做 pending-send 调度
-      bootGate: false
+      // boot gate：CC TUI 启动 + popup 处理前 stdin.write 一律 buffer，防止用户 prompt 在
+      // CC 加载 node runtime 时被吞。bootGate scanner 在 popup 处理完成 / 4s 兜底任一条件
+      // 触发后调 setReady() 开闸
+      bootGate: true
     });
+    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", {
@@ -25436,7 +25400,11 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
       if (ctx.toolSessionId && this.tuiOpts.onPtyData) {
         this.tuiOpts.onPtyData(ctx.toolSessionId, merged.toString("base64"), seq);
       }
-      void detector.writeBytes(merged.toString("utf8"), seq);
+      if (bootGate.opened) {
+        void detector.writeBytes(merged.toString("utf8"), seq);
+      } else {
+        bootGate.feedBytes(merged);
+      }
       if (ctx.toolSessionId) {
         probePtyDataThrottled(ctx.toolSessionId, merged.length, merged);
       }
@@ -25453,6 +25421,7 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
       if (coalesceBuf.length > 0) {
         flushCoalesced();
       }
+      bootGate.dispose();
       if (ctx.toolSessionId && this.tuiOpts.onDetectorUnregister) {
         this.tuiOpts.onDetectorUnregister(ctx.toolSessionId);
       }
@@ -25970,7 +25939,8 @@ var SessionObserver = class {
       pollTimer: null,
       lastSize: size,
       buf: "",
-      adapter: args.adapter
+      adapter: args.adapter,
+      prevIsRejectSentinel: false
     };
     try {
       import_node_fs14.default.mkdirSync(import_node_path15.default.dirname(filePath), { recursive: true });
@@ -26043,6 +26013,15 @@ 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) {

package/package.json

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