@threadbase-sh/streamer 1.69.2 → 1.69.4

package/dist/index.js

@@ -1046,11 +1046,6 @@ 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;
-  return `${escaped.slice(0, 100)}\u2026[${escaped.length - 200}B omitted]\u2026${escaped.slice(-100)}`;
-}
 var pty = null;
 async function loadPty() {
   if (pty) return pty;
@@ -1485,17 +1480,12 @@ var CodexPtyRunner = class {
       const lines = await this.getOutputLines(sessionId, PTY_ROWS);
       if (!this.pendingReady.has(sessionId)) return;
       const busy = codexScreenBlocksComposer(lines);
-      const bar = codexStatusBarLine(lines);
-      this.log.info(
-        `[codex.ready_fallback] ${sessionId.slice(0, 8)} busy=${busy} bar=${JSON.stringify(bar.slice(0, 120))}`,
-        {
-          event: "codex.ready_fallback",
-          sessionId,
-          busy,
-          hasReady: codexScreenShowsReady(lines),
-          statusBar: bar.slice(0, 160)
-        }
-      );
+      this.log.info(`[codex.ready_fallback] ${sessionId.slice(0, 8)} busy=${busy}`, {
+        event: "codex.ready_fallback",
+        sessionId,
+        busy,
+        hasReady: codexScreenShowsReady(lines)
+      });
       if (busy) {
         this.armReadyFallback(sessionId);
         return;
@@ -1530,10 +1520,11 @@ var CodexPtyRunner = class {
     const gate = this.openGate.get(sessionId);
     const digit = gate ? /^([0-9])\r?$/.exec(keys)?.[1] : void 0;
     const out = gate && digit ? this.resolveGateAnswer(sessionId, gate, digit) : keys;
-    this.log.info(
-      `[codex.keys.write] ${sessionId.slice(0, 8)} bytes=${out.length} digest=${digestBytes(out)}`,
-      { event: "codex.keys_write", sessionId, byteLen: out.length }
-    );
+    this.log.info(`[codex.keys.write] ${sessionId.slice(0, 8)} bytes=${out.length}`, {
+      event: "codex.keys_write",
+      sessionId,
+      byteLen: out.length
+    });
     session.process.write(out);
     session.lastActivityAt = /* @__PURE__ */ new Date();
   }
@@ -1612,13 +1603,12 @@ var CodexPtyRunner = class {
   writeSubmit(sessionId, session, input, path, promptCount) {
     this.recordUserMessage(session, input);
     this.log.info(
-      `[codex.input.write] ${sessionId.slice(0, 8)} promptCount=${promptCount} bytes=${input.length} digest=${digestBytes(input)}`,
+      `[codex.input.write] ${sessionId.slice(0, 8)} promptCount=${promptCount} bytes=${input.length}`,
       {
         event: "codex.input_write",
         sessionId,
         promptCount,
         byteLen: input.length,
-        digest: digestBytes(input),
         path,
         phase: "input"
       }
@@ -1682,8 +1672,7 @@ var CodexPtyRunner = class {
       }
       this.log.info(`[codex.submit_stale] ${sessionId.slice(0, 8)} recovering`, {
         event: "codex.submit_stale",
-        sessionId,
-        statusBar: codexStatusBarLine(lines).slice(0, 160)
+        sessionId
       });
       this.markReady(sessionId, session, "quiet-fallback", "submit-stale");
     } catch (err) {
@@ -1966,7 +1955,7 @@ var CodexPtyRunner = class {
     if (this.lastScreenLog.get(sessionId) !== screenFp) {
       this.lastScreenLog.set(sessionId, screenFp);
       this.log.info(
-        `[codex.screen] ${sessionId.slice(0, 8)} pending=${this.pendingReady.has(sessionId)} status=${session.status} ready=${hasReady} busy=${busy} usage=${Boolean(blocking)} bar=${JSON.stringify(bar.slice(0, 100))}`,
+        `[codex.screen] ${sessionId.slice(0, 8)} pending=${this.pendingReady.has(sessionId)} status=${session.status} ready=${hasReady} busy=${busy} usage=${Boolean(blocking)}`,
         {
           event: "codex.screen",
           sessionId,
@@ -1976,8 +1965,7 @@ var CodexPtyRunner = class {
           hasReady,
           busy,
           usageHit: Boolean(blocking),
-          usageSoft: Boolean(blocking?.soft),
-          statusBar: bar.slice(0, 160)
+          usageSoft: Boolean(blocking?.soft)
         }
       );
     }
@@ -2012,8 +2000,7 @@ var CodexPtyRunner = class {
       session.failureReason = blocking.detail ? `${blocking.prompt} ${blocking.detail}` : blocking.prompt;
       this.log.info(`[codex.usage_limit] ${sessionId.slice(0, 8)}`, {
         event: "codex.usage_limit",
-        sessionId,
-        prompt: blocking.prompt
+        sessionId
       });
       this.onPermissionChange?.(sessionId, blocking);
     }
@@ -2059,8 +2046,7 @@ var CodexPtyRunner = class {
     this.log.info(`[codex.gate_prompt] ${sessionId.slice(0, 8)} ${gate}`, {
       event: "codex.gate_prompt",
       sessionId,
-      gate,
-      prompt: card.prompt
+      gate
     });
     this.onPermissionChange?.(sessionId, card);
   }
@@ -3078,10 +3064,11 @@ var PTYManager = class {
       session.statusUpdatedAt = /* @__PURE__ */ new Date();
       this.onStatusChange?.(toPublicSession2(session));
     }
-    this.log.info(
-      `[pty.keys.write] ${sessionId.slice(0, 8)} bytes=${keys.length} digest=${digestBytes(keys)}`,
-      { event: "pty.keys_write", sessionId, byteLen: keys.length }
-    );
+    this.log.info(`[pty.keys.write] ${sessionId.slice(0, 8)} bytes=${keys.length}`, {
+      event: "pty.keys_write",
+      sessionId,
+      byteLen: keys.length
+    });
     session.process.write(keys);
     session.lastActivityAt = /* @__PURE__ */ new Date();
     const openGate = this.permissionOpen.get(sessionId);
@@ -3143,13 +3130,12 @@ var PTYManager = class {
     this.recordUserMessage(session, input);
     const pasteBytes = buildPasteBytes(input);
     this.log.info(
-      `[pty.input.write] ${sessionId.slice(0, 8)} promptCount=${promptCount} bytes=${pasteBytes.length} digest=${digestBytes(pasteBytes)}`,
+      `[pty.input.write] ${sessionId.slice(0, 8)} promptCount=${promptCount} bytes=${pasteBytes.length}`,
       {
         event: "pty.input_write",
         sessionId,
         promptCount,
         byteLen: pasteBytes.length,
-        digest: digestBytes(pasteBytes),
         path,
         phase: "paste"
       }
@@ -3349,7 +3335,7 @@ var PTYManager = class {
     this.lastChunkAt.set(sessionId, now);
     const gapMs = last == null ? 0 : now - last;
     this.log.info(
-      `[pty.chunk] ${sessionId.slice(0, 8)} #${idx} +${chunk.length}B gap=${gapMs}ms status=${session.status} digest=${digestBytes(data)}`,
+      `[pty.chunk] ${sessionId.slice(0, 8)} #${idx} +${chunk.length}B gap=${gapMs}ms status=${session.status}`,
       {
         event: "pty.chunk",
         sessionId,
@@ -3357,8 +3343,7 @@ var PTYManager = class {
         chunkBytes: chunk.length,
         gapMs,
         status: session.status,
-        pendingReady: this.pendingReady.has(sessionId),
-        digest: digestBytes(data)
+        pendingReady: this.pendingReady.has(sessionId)
       }
     );
     session.outputBuffer = Buffer.concat([session.outputBuffer, chunk]);
@@ -3422,15 +3407,18 @@ var PTYManager = class {
     }
     const askFooterOnScreen = lines.some((l) => /Enter to select/i.test(l));
     if (oscPermission || hasAskFooter || askFooterOnScreen) {
+      const permGate = oscPermission && !askFooterOnScreen ? scrapePermissionGate(lines) : null;
+      const askQuestion = askFooterOnScreen ? detectQuestionFromScreen(lines) : null;
       this.log.debug?.(`[pty.prompt_detect] ${sessionId.slice(0, 8)} trigger`, {
         event: "pty.prompt_detect",
         sessionId,
         oscPermission,
         hasAskFooter,
         askFooterOnScreen,
-        permGate: oscPermission && !askFooterOnScreen ? scrapePermissionGate(lines) : void 0,
-        askQuestion: askFooterOnScreen ? detectQuestionFromScreen(lines) : void 0,
-        renderedTail: lines.slice(-25)
+        permGateDetected: permGate !== null,
+        permGateOptionCount: permGate?.options.length ?? 0,
+        askQuestionDetected: askQuestion !== null,
+        askQuestionCount: askQuestion?.questions.length ?? 0
       });
     }
     if (oscPermission && !askFooterOnScreen) {
@@ -4101,7 +4089,7 @@ async function readGitBranch(dir) {
 // src/server.ts
 import { createNodeWebSocket } from "@hono/node-ws";
 import { Connection, Client as TemporalClient } from "@temporalio/client";
-import { randomUUID as randomUUID5 } from "crypto";
+import { randomUUID as randomUUID6 } from "crypto";
 import { EventEmitter } from "events";
 import { existsSync as existsSync16 } from "fs";
 import { realpath as realpath2 } from "fs/promises";
@@ -9223,6 +9211,7 @@ var ConversationHandlers = class {
 };
 
 // src/api/handlers/sessions.handlers.ts
+import { randomUUID as randomUUID4 } from "crypto";
 import { existsSync as existsSync10 } from "fs";
 import { basename as basename6, dirname as dirname9, join as join16 } from "path";
 
@@ -10518,7 +10507,9 @@ var SessionHandlers = class {
     }
     const key = permissionContentKey(gate);
     if (this.pendingPermissionKey.get(sessionId) === key) return;
-    this.pendingPermission.set(sessionId, gate);
+    const prior = this.pendingPermission.get(sessionId);
+    const gateId = prior && permissionGateKey(prior) === permissionGateKey(gate) ? prior.gateId : randomUUID4();
+    this.pendingPermission.set(sessionId, { ...gate, gateId });
     this.pendingPermissionKey.set(sessionId, key);
     const subscriberCount = this.sessionSubscribers.get(sessionId)?.size ?? 0;
     this.log.info(
@@ -10532,7 +10523,8 @@ var SessionHandlers = class {
       ...gate.detail ? { detail: gate.detail } : {},
       options: gate.options,
       ...gate.cursor !== void 0 ? { cursor: gate.cursor } : {},
-      contentKey: permissionGateKey(gate)
+      contentKey: permissionGateKey(gate),
+      gateId
     });
   }
   /**
@@ -10560,10 +10552,15 @@ var SessionHandlers = class {
     const body = await readBody2(req);
     const contentKey = body?.contentKey;
     const optionIndex = body?.optionIndex;
+    const gateId = body?.gateId;
     if (typeof contentKey !== "string" || !Number.isInteger(optionIndex) || optionIndex < 0) {
       json(res, 400, { ok: false, reason: "Expected { contentKey: string, optionIndex: number }" });
       return;
     }
+    if (gateId !== void 0 && typeof gateId !== "string") {
+      json(res, 400, { ok: false, reason: "Expected gateId to be a string" });
+      return;
+    }
     const gateClosed = () => {
       this.pendingPermission.delete(sessionId);
       this.pendingPermissionKey.delete(sessionId);
@@ -10575,6 +10572,16 @@ var SessionHandlers = class {
       gateClosed();
       return;
     }
+    if (gateId !== void 0 && gateId !== gate.gateId) {
+      json(res, 409, { ok: false, reason: "gate_mismatch" });
+      return;
+    }
+    if (gateId === void 0) {
+      this.log.info(`[permission.answer_legacy_identity] ${sessionId.slice(0, 8)}`, {
+        event: "permission.answer_legacy_identity",
+        sessionId
+      });
+    }
     if (permissionGateKey(gate) !== contentKey) {
       json(res, 409, { ok: false, reason: "gate_mismatch" });
       return;
@@ -10584,7 +10591,8 @@ var SessionHandlers = class {
       json(res, 409, { ok: false, reason: "unknown_option" });
       return;
     }
-    if (!await this.permissionGateStillOpen(sessionId, contentKey)) {
+    const provider = this.sessionStore.getManaged(sessionId)?.provider;
+    if (provider !== CODEX_CLI_PROVIDER && !await this.permissionGateStillOpen(sessionId, contentKey)) {
       gateClosed();
       return;
     }
@@ -11292,7 +11300,7 @@ var ManagedSessionsRepository = class {
 };
 
 // src/db/repositories/projects.repository.ts
-import { randomUUID as randomUUID4 } from "crypto";
+import { randomUUID as randomUUID5 } from "crypto";
 function rowToProject(row) {
   return {
     id: row.id,
@@ -11377,7 +11385,7 @@ var ProjectsRepository = class {
       });
       return rowToProject(this.getById.get(existing.id));
     }
-    const id = randomUUID4();
+    const id = randomUUID5();
     this.insert.run({
       id,
       path,
@@ -13154,7 +13162,8 @@ function createApiDeps(deps) {
                 ...pendingGate.detail ? { detail: pendingGate.detail } : {},
                 options: pendingGate.options,
                 ...pendingGate.cursor !== void 0 ? { cursor: pendingGate.cursor } : {},
-                contentKey: permissionGateKey(pendingGate)
+                contentKey: permissionGateKey(pendingGate),
+                gateId: pendingGate.gateId
               })
             );
           }
@@ -16012,7 +16021,7 @@ var StreamerServer = class {
   runtimeStore = null;
   // Identifies this streamer run. A registry row carrying a different id is a
   // session that outlived the process that started it.
-  streamerInstanceId = randomUUID5();
+  streamerInstanceId = randomUUID6();
   cacheMetadataRepo = null;
   // Push registration + delivery state (C7). Null when the cache DB failed to
   // open — registration then degrades to a no-op rather than 500ing.