@threadbase-sh/streamer 1.55.2 → 1.55.4

package/dist/index.js

@@ -996,6 +996,7 @@ import { Terminal } from "@xterm/headless";
 var PTY_COLS = 120;
 var PTY_ROWS = 40;
 var SCREEN_SCROLLBACK = 1e3;
+var REPLAY_MAX_LINES = SCREEN_SCROLLBACK + PTY_ROWS;
 function digestBytes(s) {
   const escaped = s.replace(new RegExp(String.fromCharCode(27), "g"), "\\x1b").replace(/\r/g, "\\r").replace(/\n/g, "\\n").replace(/\t/g, "\\t");
   if (escaped.length <= 200) return escaped;
@@ -1070,6 +1071,38 @@ var CODEX_ACTIVE_WRITER_CODE = "codex_active_writer";
 var CODEX_USAGE_LIMIT_RE = /you(?:'ve| have) hit your usage limit/i;
 var CODEX_USAGE_RESET_TIP_RE = /usage limit reset available/i;
 var CODEX_RATE_LIMIT_MENU_RE = /approaching rate limits/i;
+var CODEX_COMMAND_APPROVAL_HEADING_RE = /^\s*E\s*X\s*E\s*C\s*$/i;
+var CODEX_COMMAND_APPROVAL_ENV_RE = /^\s*Environment:\s*.+/i;
+var CODEX_COMMAND_APPROVAL_REASON_RE = /^\s*Reason:\s*.+/i;
+var CODEX_COMMAND_APPROVAL_CONFIRM_RE = /(?:enter|return) to (?:confirm|approve)|press (?:enter|return) to (?:confirm|approve)/i;
+var CODEX_COMMAND_APPROVAL_YES_RE = /^\s*›?\s*\d+\.\s*yes\b/i;
+var CODEX_COMMAND_APPROVAL_NO_RE = /^\s*›?\s*\d+\.\s*no\b/i;
+function detectCodexCommandApproval(lines) {
+  let heading = -1;
+  for (let i = 0; i < lines.length; i++) {
+    if (CODEX_COMMAND_APPROVAL_HEADING_RE.test(lines[i])) heading = i;
+  }
+  if (heading < 0) return null;
+  if (lines.some((line) => CODEX_USAGE_LIMIT_RE.test(line) || CODEX_RATE_LIMIT_MENU_RE.test(line))) {
+    return null;
+  }
+  const card = lines.slice(heading);
+  if (!card.some((line) => CODEX_COMMAND_APPROVAL_ENV_RE.test(line)) || !card.some((line) => CODEX_COMMAND_APPROVAL_REASON_RE.test(line)) || !card.some((line) => CODEX_COMMAND_APPROVAL_YES_RE.test(line)) || !card.some((line) => CODEX_COMMAND_APPROVAL_NO_RE.test(line)) || !card.some((line) => CODEX_COMMAND_APPROVAL_CONFIRM_RE.test(line))) {
+    return null;
+  }
+  const detail = card.filter((line) => {
+    const trimmed = line.trim();
+    return trimmed.length > 0 && !CODEX_COMMAND_APPROVAL_HEADING_RE.test(line) && !CODEX_COMMAND_APPROVAL_YES_RE.test(line) && !CODEX_COMMAND_APPROVAL_NO_RE.test(line) && !CODEX_COMMAND_APPROVAL_CONFIRM_RE.test(line);
+  }).join("\n");
+  return {
+    prompt: "Codex requests command approval",
+    ...detail ? { detail } : {},
+    options: [
+      { index: 1, label: "Yes", answerKeys: "y" },
+      { index: 2, label: "No", answerKeys: "\x1B" }
+    ]
+  };
+}
 function parseCodexNumberedOptions(lines) {
   const options = [];
   for (const line of lines) {
@@ -1250,6 +1283,10 @@ var CodexPtyRunner = class {
   turnBusy = /* @__PURE__ */ new Set();
   // Usage-limit / rate-limit menus — content key for deduped permission cards.
   openBlockingPrompt = /* @__PURE__ */ new Map();
+  // Command-approval cards are independent of quota cards: both use the
+  // permission transport, but a repaint/removal of one must not suppress the
+  // other detector's state.
+  openCommandApproval = /* @__PURE__ */ new Map();
   // Last codex.screen fingerprint per session — only emit when it changes so
   // MCP boot redraw storms don't flood the log.
   lastScreenLog = /* @__PURE__ */ new Map();
@@ -1482,7 +1519,7 @@ var CodexPtyRunner = class {
     if (session.status === "idle") {
       throw new Error(`Session is idle (no active PTY): ${sessionId}`);
     }
-    if (this.pendingReady.has(sessionId) || this.openGate.has(sessionId)) {
+    if (this.pendingReady.has(sessionId) || this.openGate.has(sessionId) || this.openCommandApproval.has(sessionId)) {
       const queue = this.queuedInputs.get(sessionId) ?? [];
       queue.push(input);
       this.queuedInputs.set(sessionId, queue);
@@ -1609,7 +1646,9 @@ var CodexPtyRunner = class {
   // pendingReady (markReady drains it) — the gate-close path re-drives it for
   // the ready-with-gate-open case.
   flushQueuedInputs(sessionId) {
-    if (this.openGate.has(sessionId) || this.pendingReady.has(sessionId)) return;
+    if (this.openGate.has(sessionId) || this.openCommandApproval.has(sessionId) || this.pendingReady.has(sessionId)) {
+      return;
+    }
     const queue = this.queuedInputs.get(sessionId);
     if (!queue || queue.length === 0) return;
     this.queuedInputs.delete(sessionId);
@@ -1689,6 +1728,9 @@ var CodexPtyRunner = class {
     if (this.openBlockingPrompt.delete(sessionId)) {
       this.onPermissionChange?.(sessionId, null);
     }
+    if (this.openCommandApproval.delete(sessionId)) {
+      this.onPermissionChange?.(sessionId, null);
+    }
     this.lastScreenLog.delete(sessionId);
   }
   getOutput(sessionId) {
@@ -1768,6 +1810,7 @@ var CodexPtyRunner = class {
     this.lastChunkAt.clear();
     this.turnBusy.clear();
     this.openBlockingPrompt.clear();
+    this.openCommandApproval.clear();
     this.lastScreenLog.clear();
   }
   handleOutput(sessionId, data) {
@@ -1838,6 +1881,13 @@ var CodexPtyRunner = class {
       this.onPermissionChange?.(sessionId, null);
       this.flushQueuedInputs(sessionId);
     }
+    const commandApproval = gate ? null : detectCodexCommandApproval(lines);
+    if (commandApproval) {
+      this.handleCommandApproval(sessionId, commandApproval);
+    } else if (this.openCommandApproval.delete(sessionId)) {
+      this.onPermissionChange?.(sessionId, null);
+      this.flushQueuedInputs(sessionId);
+    }
     const blocking = detectCodexBlockingPrompt(lines);
     if (blocking) {
       const elevateSoft = !blocking.soft || session.status === "running" && session.statusSource === "user-input" && !this.turnBusy.has(sessionId) && !this.pendingReady.has(sessionId);
@@ -1917,6 +1967,20 @@ var CodexPtyRunner = class {
       this.markReady(sessionId, session, "quiet-fallback", "usage-limit");
     }
   }
+  // Surface Codex's EXEC card through the existing permission event. The
+  // rendered screen is authoritative: keying it by content suppresses TUI
+  // repaint repeats and the absence path above clears it only after the card
+  // has left the screen.
+  handleCommandApproval(sessionId, approval) {
+    const key = `${approval.detail ?? ""}\0${approval.options.map((o) => o.answerKeys).join(",")}`;
+    if (this.openCommandApproval.get(sessionId) === key) return;
+    this.openCommandApproval.set(sessionId, key);
+    this.log.info(`[codex.command_approval] ${sessionId.slice(0, 8)}`, {
+      event: "codex.command_approval",
+      sessionId
+    });
+    this.onPermissionChange?.(sessionId, approval);
+  }
   // Answer a gate from the persisted remember-store, or surface it as a
   // question card over the permission transport. Actioned once per session and
   // gate type — repaints of the same dialog neither re-write nor re-broadcast.
@@ -12252,7 +12316,7 @@ function createApiDeps(deps) {
           }
           deps.addSessionSubscriber(msg.sessionId, ws);
           if (deps.ptyManager.hasSession(msg.sessionId)) {
-            const lines = await deps.ptyManager.getOutputLines(msg.sessionId, 200);
+            const lines = await deps.ptyManager.getOutputLines(msg.sessionId, REPLAY_MAX_LINES);
             const userMessages = deps.ptyManager.getInputHistory(msg.sessionId);
             ws.send(
               JSON.stringify({