@threadbase-sh/streamer 1.55.2 → 1.55.4

package/dist/cli.cjs

@@ -108227,7 +108227,7 @@ function createScreen() {
 function stripAnsi(str) {
   return str.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").replace(/\x1b\][^\x07]*\x07/g, "");
 }
-var import_headless, PTY_COLS, PTY_ROWS, SCREEN_SCROLLBACK, pty;
+var import_headless, PTY_COLS, PTY_ROWS, SCREEN_SCROLLBACK, REPLAY_MAX_LINES, pty;
 var init_pty_shared = __esm({
   "src/pty-shared.ts"() {
     "use strict";
@@ -108235,11 +108235,38 @@ var init_pty_shared = __esm({
     PTY_COLS = 120;
     PTY_ROWS = 40;
     SCREEN_SCROLLBACK = 1e3;
+    REPLAY_MAX_LINES = SCREEN_SCROLLBACK + PTY_ROWS;
     pty = null;
   }
 });
 
 // src/services/questions/codexScreen.ts
+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) {
@@ -108322,7 +108349,7 @@ function gateCard(gate, lines) {
     ]
   };
 }
-var CODEX_PROMPT_READY_TEXT, CODEX_BUSY_STATUS_RE, CODEX_WORKING_STATUS_RE, CODEX_MCP_BOOT_RE, CODEX_TRUST_GATE_REGEX, CODEX_HOOKS_GATE_REGEX, CODEX_ACTIVE_WRITER_RE, CODEX_ACTIVE_WRITER_CODE, CODEX_USAGE_LIMIT_RE, CODEX_USAGE_RESET_TIP_RE, CODEX_RATE_LIMIT_MENU_RE;
+var CODEX_PROMPT_READY_TEXT, CODEX_BUSY_STATUS_RE, CODEX_WORKING_STATUS_RE, CODEX_MCP_BOOT_RE, CODEX_TRUST_GATE_REGEX, CODEX_HOOKS_GATE_REGEX, CODEX_ACTIVE_WRITER_RE, CODEX_ACTIVE_WRITER_CODE, CODEX_USAGE_LIMIT_RE, CODEX_USAGE_RESET_TIP_RE, CODEX_RATE_LIMIT_MENU_RE, CODEX_COMMAND_APPROVAL_HEADING_RE, CODEX_COMMAND_APPROVAL_ENV_RE, CODEX_COMMAND_APPROVAL_REASON_RE, CODEX_COMMAND_APPROVAL_CONFIRM_RE, CODEX_COMMAND_APPROVAL_YES_RE, CODEX_COMMAND_APPROVAL_NO_RE;
 var init_codexScreen = __esm({
   "src/services/questions/codexScreen.ts"() {
     "use strict";
@@ -108337,6 +108364,12 @@ var init_codexScreen = __esm({
     CODEX_USAGE_LIMIT_RE = /you(?:'ve| have) hit your usage limit/i;
     CODEX_USAGE_RESET_TIP_RE = /usage limit reset available/i;
     CODEX_RATE_LIMIT_MENU_RE = /approaching rate limits/i;
+    CODEX_COMMAND_APPROVAL_HEADING_RE = /^\s*E\s*X\s*E\s*C\s*$/i;
+    CODEX_COMMAND_APPROVAL_ENV_RE = /^\s*Environment:\s*.+/i;
+    CODEX_COMMAND_APPROVAL_REASON_RE = /^\s*Reason:\s*.+/i;
+    CODEX_COMMAND_APPROVAL_CONFIRM_RE = /(?:enter|return) to (?:confirm|approve)|press (?:enter|return) to (?:confirm|approve)/i;
+    CODEX_COMMAND_APPROVAL_YES_RE = /^\s*›?\s*\d+\.\s*yes\b/i;
+    CODEX_COMMAND_APPROVAL_NO_RE = /^\s*›?\s*\d+\.\s*no\b/i;
   }
 });
 
@@ -120636,6 +120669,10 @@ var init_codex_pty_runner = __esm({
       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();
@@ -120868,7 +120905,7 @@ var init_codex_pty_runner = __esm({
         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);
@@ -120995,7 +121032,9 @@ var init_codex_pty_runner = __esm({
       // 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);
@@ -121075,6 +121114,9 @@ var init_codex_pty_runner = __esm({
         if (this.openBlockingPrompt.delete(sessionId)) {
           this.onPermissionChange?.(sessionId, null);
         }
+        if (this.openCommandApproval.delete(sessionId)) {
+          this.onPermissionChange?.(sessionId, null);
+        }
         this.lastScreenLog.delete(sessionId);
       }
       getOutput(sessionId) {
@@ -121154,6 +121196,7 @@ var init_codex_pty_runner = __esm({
         this.lastChunkAt.clear();
         this.turnBusy.clear();
         this.openBlockingPrompt.clear();
+        this.openCommandApproval.clear();
         this.lastScreenLog.clear();
       }
       handleOutput(sessionId, data) {
@@ -121224,6 +121267,13 @@ var init_codex_pty_runner = __esm({
           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);
@@ -121303,6 +121353,20 @@ var init_codex_pty_runner = __esm({
           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.
@@ -149795,6 +149859,7 @@ function handleListProjects(url2, res) {
 
 // src/server-wiring.ts
 init_logger();
+init_pty_shared();
 init_capabilities();
 function wsAllows(principal, required2) {
   return principal === null || hasCapability(principal, required2);
@@ -150110,7 +150175,7 @@ function createApiDeps(deps) {
           }
           deps.addSessionSubscriber(msg.sessionId, ws2);
           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);
             ws2.send(
               JSON.stringify({