@threadbase-sh/streamer 1.30.0 → 1.31.0

package/dist/index.cjs

@@ -215,7 +215,7 @@ function verifySignature(rawBody, signature, secret) {
   }
 }
 function isWithinSkew(timestampHeader, skewSeconds) {
-  if (!timestampHeader) return false;
+  if (!timestampHeader) return true;
   const t = Number(timestampHeader);
   if (!Number.isFinite(t)) return false;
   const now = Math.floor(Date.now() / 1e3);
@@ -797,6 +797,7 @@ function debounce(fn, waitMs) {
 
 // src/codex-pty-runner.ts
 var OUTPUT_BUFFER_MAX = 65536;
+var INPUT_HISTORY_MAX = 50;
 var PTY_COLS = 120;
 var PTY_ROWS = 40;
 var SCREEN_SCROLLBACK = 1e3;
@@ -877,6 +878,7 @@ var CodexPtyRunner = class {
   onPermissionChange;
   onLiveQuestion;
   onLiveQuestionGone;
+  onUserMessage;
   log;
   // Tracks sessions whose PTY has spawned but Codex hasn't yet reached its
   // "Ready" status bar — i.e. onReady hasn't fired.
@@ -907,6 +909,7 @@ var CodexPtyRunner = class {
     this.onPermissionChange = options.onPermissionChange;
     this.onLiveQuestion = options.onLiveQuestion;
     this.onLiveQuestionGone = options.onLiveQuestionGone;
+    this.onUserMessage = options.onUserMessage;
     this.log = options.logger ?? getLogger("codex-pty");
   }
   // Resume an existing Codex session. sessionId is the Codex-persisted
@@ -950,7 +953,8 @@ var CodexPtyRunner = class {
       lastOutput: "",
       process: proc,
       outputBuffer: Buffer.alloc(0),
-      screen: createScreen()
+      screen: createScreen(),
+      inputHistory: []
     };
     this.sessions.set(sessionId, session);
     this.pendingReady.add(sessionId);
@@ -996,7 +1000,8 @@ var CodexPtyRunner = class {
       lastOutput: "",
       process: proc,
       outputBuffer: Buffer.alloc(0),
-      screen: createScreen()
+      screen: createScreen(),
+      inputHistory: []
     };
     this.sessions.set(sessionId, session);
     this.pendingReady.add(sessionId);
@@ -1114,6 +1119,7 @@ var CodexPtyRunner = class {
   // confirmed Codex accepts plain keystrokes), then submit \r after a short
   // delay so Codex's TUI gets an event-loop tick to process the input first.
   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)}`,
       {
@@ -1243,6 +1249,19 @@ var CodexPtyRunner = class {
     }
     return lines.slice(-maxLines);
   }
+  getInputHistory(sessionId) {
+    return this.sessions.get(sessionId)?.inputHistory ?? [];
+  }
+  // Record a submitted user message as ground truth and fire onUserMessage.
+  // Called from writeSubmit (direct and flush paths) — never from sendKeys.
+  recordUserMessage(session, text) {
+    const ts = Date.now();
+    session.inputHistory.push({ text, ts });
+    if (session.inputHistory.length > INPUT_HISTORY_MAX) {
+      session.inputHistory.shift();
+    }
+    this.onUserMessage?.(session.id, text, ts);
+  }
   getSession(sessionId) {
     const session = this.sessions.get(sessionId);
     return session ? toPublicSession(session) : null;
@@ -1620,6 +1639,7 @@ function detectShellPrompt(lines) {
 
 // src/pty-manager.ts
 var OUTPUT_BUFFER_MAX2 = 65536;
+var INPUT_HISTORY_MAX2 = 50;
 var PTY_COLS2 = 120;
 var PTY_ROWS2 = 40;
 var SCREEN_SCROLLBACK2 = 1e3;
@@ -1678,6 +1698,7 @@ var PTYManager = class {
   onPermissionChange;
   onLiveQuestion;
   onLiveQuestionGone;
+  onUserMessage;
   // Per-session permission-gate state. True between an OSC 777 (gate open) and
   // the next prompt-ready without a fresh 777 (gate closed). Prevents
   // re-broadcasting open/close on every chunk.
@@ -1723,6 +1744,7 @@ var PTYManager = class {
     this.onPermissionChange = options.onPermissionChange;
     this.onLiveQuestion = options.onLiveQuestion;
     this.onLiveQuestionGone = options.onLiveQuestionGone;
+    this.onUserMessage = options.onUserMessage;
     this.log = options.logger ?? getLogger("pty");
   }
   // Resume an existing Claude conversation. sessionId is the JSONL UUID.
@@ -1785,7 +1807,8 @@ var PTYManager = class {
       lastOutput: "",
       process: proc,
       outputBuffer: Buffer.alloc(0),
-      screen: createScreen2()
+      screen: createScreen2(),
+      inputHistory: []
     };
     this.sessions.set(sessionId, session);
     this.pendingReady.add(sessionId);
@@ -1836,7 +1859,8 @@ var PTYManager = class {
       lastOutput: "",
       process: proc,
       outputBuffer: Buffer.alloc(0),
-      screen: createScreen2()
+      screen: createScreen2(),
+      inputHistory: []
     };
     this.sessions.set(sessionId, session);
     this.pendingReady.add(sessionId);
@@ -1916,6 +1940,7 @@ var PTYManager = class {
   // step gives the TUI as many extra ticks as it needs, capped at
   // SUBMIT_MAX_WAIT_MS so a silent/wedged PTY still gets its \r eventually.
   writeSubmit(sessionId, session, input, path, promptCount) {
+    this.recordUserMessage(session, input);
     const pasteBytes = buildPasteBytes(input);
     this.log.info(
       `[pty.input.write] ${sessionId.slice(0, 8)} promptCount=${promptCount} bytes=${pasteBytes.length} digest=${digestBytes2(pasteBytes)}`,
@@ -2046,6 +2071,20 @@ var PTYManager = class {
     }
     return lines.slice(-maxLines);
   }
+  getInputHistory(sessionId) {
+    return this.sessions.get(sessionId)?.inputHistory ?? [];
+  }
+  // Record a submitted user message as ground truth and fire onUserMessage.
+  // Called from writeSubmit (both direct and flush paths) — never from
+  // sendKeys, so raw keystrokes aren't logged as messages.
+  recordUserMessage(session, text) {
+    const ts = Date.now();
+    session.inputHistory.push({ text, ts });
+    if (session.inputHistory.length > INPUT_HISTORY_MAX2) {
+      session.inputHistory.shift();
+    }
+    this.onUserMessage?.(session.id, text, ts);
+  }
   getSession(sessionId) {
     const session = this.sessions.get(sessionId);
     return session ? toPublicSession2(session) : null;
@@ -2342,6 +2381,9 @@ var LiveSessionManager = class {
   getOutputLines(sessionId, maxLines) {
     return this.runnerFor(sessionId).getOutputLines(sessionId, maxLines);
   }
+  getInputHistory(sessionId) {
+    return this.runnerFor(sessionId).getInputHistory(sessionId);
+  }
   getSession(sessionId) {
     for (const runner of this.runners.values()) {
       const session = runner.getSession(sessionId);
@@ -2801,7 +2843,7 @@ function isLocalRequest(remoteAddr) {
   const addr = remoteAddr ?? "";
   return addr === "127.0.0.1" || addr === "::1" || addr === "::ffff:127.0.0.1";
 }
-var PUBLIC_PATHS = /* @__PURE__ */ new Set(["/healthz", "/ws"]);
+var PUBLIC_PATHS = /* @__PURE__ */ new Set(["/healthz"]);
 var LOCAL_ONLY_PATHS = /* @__PURE__ */ new Set(["/api/logs", "/api/logs/meta"]);
 var PUBLIC_POST_PATHS = /* @__PURE__ */ new Set(["/api/pair/exchange", "/api/__update"]);
 var PUBLIC_POST_PREFIXES = ["/internal/sessions/"];
@@ -3398,16 +3440,14 @@ var createWsRoutes = (deps, upgradeWebSocket) => {
   const app = new import_hono11.Hono();
   app.get(
     "/ws",
-    upgradeWebSocket((c) => {
-      const key = c.req.query("key");
-      const preAuthed = typeof key === "string" && validateApiKey(key, deps.apiKey);
+    upgradeWebSocket(() => {
       let openWs = null;
       return {
         onOpen(_evt, ws) {
           const raw = ws.raw;
           if (!raw) return;
           openWs = raw;
-          deps.handleWsOpen(raw, preAuthed);
+          deps.handleWsOpen(raw);
         },
         onMessage(evt, _ws) {
           if (openWs) deps.handleWsMessage(openWs, evt.data);
@@ -5313,13 +5353,6 @@ function deriveProjectChatTitle(input) {
   return `Untitled \xB7 ${input.id.slice(0, 8)}`;
 }
 
-// src/services/questions/permissionAnswerKeys.ts
-var ANSWER_KEYS_ALLOWLIST = /^(?:\r|[yn]\r|\x03|\d+\r)$/;
-function sanitizeAnswerKeys(keys) {
-  if (keys === void 0) return void 0;
-  return ANSWER_KEYS_ALLOWLIST.test(keys) ? keys : void 0;
-}
-
 // src/services/questions/detectAskUserQuestion.ts
 function normalizeContent2(raw) {
   if (Array.isArray(raw)) return raw;
@@ -5924,8 +5957,6 @@ var WSHub = class {
 var BROWSE_SYSTEM_PROMPT = (browseRoot) => `You are working within the project boundary: ${browseRoot}. Do not read, write, or execute commands that access files or directories outside this boundary.`;
 var DEFAULT_SYSTEM_PROMPT = "When presenting options or choices to the user, limit the options to at most 3.";
 var DEFAULT_PTY_GRACE_PERIOD_MS = 27e4;
-var DEFAULT_WS_AUTH_TIMEOUT_MS = 5e3;
-var WS_CLOSE_UNAUTHORIZED = 4401;
 var REFRESH_TTL_MS = 2e3;
 var START_READY_TIMEOUT_MS = 1e4;
 function parseIncludeAgentsEnv(raw) {
@@ -6016,14 +6047,6 @@ var StreamerServer = class {
   clientIdToWs = /* @__PURE__ */ new Map();
   // Reverse map for cleanup on close
   wsToClientId = /* @__PURE__ */ new Map();
-  // M1 — WS auth. Sockets that have authenticated (via ?key= at upgrade OR a
-  // { type: "auth", token } first message). Only authed sockets are added to
-  // the hub and receive broadcasts.
-  // Plan: https://github.com/RonenMars/threadbase-streamer/blob/a251353bfa417bd48ce3f15086bc336a2c622629/docs/plans/2026-06-24-security-hardening.md#L40
-  wsAuthed = /* @__PURE__ */ new Set();
-  // Keyless sockets awaiting their first-message auth handshake → close timer.
-  wsAuthPending = /* @__PURE__ */ new Map();
-  wsAuthTimeoutMs;
   cache = null;
   projectsRepo = null;
   conversationsRepo = null;
@@ -6063,7 +6086,6 @@ var StreamerServer = class {
     this.scanProfiles = config.scanProfiles;
     this.codexRoots = config.codexRoots ?? [(0, import_path14.join)((0, import_os7.homedir)(), ".codex", "sessions")];
     this.ptyGracePeriodMs = config.ptyGracePeriodMs ?? DEFAULT_PTY_GRACE_PERIOD_MS;
-    this.wsAuthTimeoutMs = config.wsAuthTimeoutMs ?? DEFAULT_WS_AUTH_TIMEOUT_MS;
     this.defaultSystemPrompt = config.defaultSystemPrompt ?? DEFAULT_SYSTEM_PROMPT;
     this.defaultPermissionMode = config.defaultPermissionMode ?? loadDefaultPermissionMode() ?? "acceptEdits";
     this.cacheDir = config.cacheDir ?? loadCacheDir() ?? (0, import_path14.join)((0, import_os7.homedir)(), ".threadbase", "cache");
@@ -6192,6 +6214,9 @@ var StreamerServer = class {
       onOutput: (sessionId, data) => {
         this.wsHub.broadcast({ type: "terminal_output", sessionId, data });
       },
+      onUserMessage: (sessionId, text, ts) => {
+        this.wsHub.broadcast({ type: "user_message", sessionId, text, ts });
+      },
       onPermissionChange: (sessionId, gate) => {
         this.handlePermissionChange(sessionId, gate);
       },
@@ -6321,39 +6346,17 @@ var StreamerServer = class {
       handlePairExchange: (req, res) => this.handlePairExchange(req, res),
       handleBrowse: (url, res) => this.handleBrowse(url, res),
       handleMkdir: (req, res) => this.handleMkdir(req, res),
-      handleWsOpen: (ws, preAuthed) => {
-        if (preAuthed) {
-          this.completeWsAuth(ws);
-          return;
+      handleWsOpen: (ws) => {
+        this.wsHub.addClient(ws);
+        const sessions = this.sessionStore.list(this.ptyAttachedIds());
+        ws.send(JSON.stringify({ type: "session_list", sessions }));
+        if (this.cacheReady) {
+          ws.send(JSON.stringify({ type: "cache_ready" }));
         }
-        const timer = setTimeout(() => {
-          this.wsAuthPending.delete(ws);
-          try {
-            ws.close(WS_CLOSE_UNAUTHORIZED, "auth timeout");
-          } catch {
-          }
-        }, this.wsAuthTimeoutMs);
-        this.wsAuthPending.set(ws, timer);
       },
       handleWsMessage: async (ws, raw) => {
         try {
           const msg = JSON.parse(String(raw));
-          if (!this.wsAuthed.has(ws)) {
-            if (msg.type === "auth" && typeof msg.token === "string") {
-              const t = this.wsAuthPending.get(ws);
-              if (t) clearTimeout(t);
-              this.wsAuthPending.delete(ws);
-              if (validateApiKey(msg.token, this.apiKey)) {
-                this.completeWsAuth(ws);
-              } else {
-                try {
-                  ws.close(WS_CLOSE_UNAUTHORIZED, "unauthorized");
-                } catch {
-                }
-              }
-            }
-            return;
-          }
           if (msg.type === "register" && typeof msg.clientId === "string") {
             const oldClientId = this.wsToClientId.get(ws);
             if (oldClientId) this.clientIdToWs.delete(oldClientId);
@@ -6364,7 +6367,15 @@ var StreamerServer = class {
             this.addSessionSubscriber(msg.sessionId, ws);
             if (this.ptyManager.hasSession(msg.sessionId)) {
               const lines = await this.ptyManager.getOutputLines(msg.sessionId, 200);
-              ws.send(JSON.stringify({ type: "terminal_replay", sessionId: msg.sessionId, lines }));
+              const userMessages = this.ptyManager.getInputHistory(msg.sessionId);
+              ws.send(
+                JSON.stringify({
+                  type: "terminal_replay",
+                  sessionId: msg.sessionId,
+                  lines,
+                  userMessages
+                })
+              );
             }
             const pendingGate = this.pendingPermission.get(msg.sessionId);
             if (pendingGate) {
@@ -6400,20 +6411,12 @@ var StreamerServer = class {
             }
           }
           if (msg.type === "hold_session" && typeof msg.sessionId === "string") {
-            if (this.sessionSubscribers.get(msg.sessionId)?.has(ws)) {
-              this.startGraceTimer(msg.sessionId, 0);
-            }
+            this.startGraceTimer(msg.sessionId, 0);
           }
         } catch {
         }
       },
       handleWsClose: (ws) => {
-        const pendingTimer = this.wsAuthPending.get(ws);
-        if (pendingTimer) {
-          clearTimeout(pendingTimer);
-          this.wsAuthPending.delete(ws);
-        }
-        this.wsAuthed.delete(ws);
         const clientId = this.wsToClientId.get(ws);
         if (clientId) {
           this.clientIdToWs.delete(clientId);
@@ -6483,20 +6486,6 @@ var StreamerServer = class {
       this.wsHub.broadcast(payload);
     }
   }
-  // M1: finalize a WebSocket auth (via ?key= at upgrade or a first-message
-  // handshake) — register it with the hub and send the initial snapshot. Only
-  // authed sockets reach this, so no unauthenticated client ever receives a
-  // broadcast.
-  // Plan: https://github.com/RonenMars/threadbase-streamer/blob/a251353bfa417bd48ce3f15086bc336a2c622629/docs/plans/2026-06-24-security-hardening.md#L40
-  completeWsAuth(ws) {
-    this.wsAuthed.add(ws);
-    this.wsHub.addClient(ws);
-    const sessions = this.sessionStore.list(this.ptyAttachedIds());
-    ws.send(JSON.stringify({ type: "session_list", sessions }));
-    if (this.cacheReady) {
-      ws.send(JSON.stringify({ type: "cache_ready" }));
-    }
-  }
   addSessionSubscriber(sessionId, ws) {
     let subs = this.sessionSubscribers.get(sessionId);
     if (!subs) {
@@ -6783,9 +6772,6 @@ var StreamerServer = class {
     this.ptyManager.dispose();
     this.fileWatcher.dispose();
     this.wsHub.dispose();
-    for (const timer of this.wsAuthPending.values()) clearTimeout(timer);
-    this.wsAuthPending.clear();
-    this.wsAuthed.clear();
     this.pairTokens.dispose();
     if (this.dbPool) {
       await this.dbPool.end();
@@ -7912,10 +7898,6 @@ var StreamerServer = class {
       return;
     }
     this.pendingPermission.set(sessionId, gate);
-    const safeOptions = gate.options.map((o) => {
-      const answerKeys = sanitizeAnswerKeys(o.answerKeys);
-      return answerKeys === void 0 ? { index: o.index, label: o.label } : { ...o, answerKeys };
-    });
     const subscriberCount = this.sessionSubscribers.get(sessionId)?.size ?? 0;
     this.log.info(
       `[ws.broadcast_permission] ${sessionId.slice(0, 8)} subscribers=${subscriberCount}`,
@@ -7926,7 +7908,7 @@ var StreamerServer = class {
       sessionId,
       ...gate.prompt ? { prompt: gate.prompt } : {},
       ...gate.detail ? { detail: gate.detail } : {},
-      options: safeOptions,
+      options: gate.options,
       ...gate.cursor !== void 0 ? { cursor: gate.cursor } : {}
     });
   }