@threadbase-sh/streamer 1.28.2 → 1.29.1

package/dist/index.cjs

@@ -5328,6 +5328,89 @@ function sanitizeFilename(name) {
   return cleaned;
 }
 
+// src/utils/codexConversationLine.ts
+function extractCodexText(content) {
+  if (typeof content === "string") return content.trim();
+  if (!Array.isArray(content)) return "";
+  return content.map((item) => {
+    if (typeof item === "string") return item;
+    const block = item;
+    const t = block?.type;
+    if ((t === "input_text" || t === "output_text" || t === "text") && typeof block.text === "string") {
+      return block.text;
+    }
+    return "";
+  }).filter(Boolean).join("").trim();
+}
+function normalizeCodexLineToClaudeShape(line) {
+  let entry;
+  try {
+    entry = JSON.parse(line);
+  } catch {
+    return null;
+  }
+  if (entry.type !== "response_item") return null;
+  const payload = entry.payload;
+  if (payload?.type !== "message") return null;
+  const role = payload.role;
+  if (role !== "user" && role !== "assistant") return null;
+  const text = extractCodexText(payload.content);
+  if (!text) return null;
+  if (role === "user" && isCodexInjectedContext(text)) return null;
+  const timestamp = typeof entry.timestamp === "string" ? entry.timestamp : (/* @__PURE__ */ new Date()).toISOString();
+  const uuid = typeof payload.id === "string" && payload.id.length > 0 ? payload.id : `codex-${role}-${timestamp}-${hashPrefix(text)}`;
+  return JSON.stringify({
+    type: role,
+    uuid,
+    timestamp,
+    message: {
+      role,
+      content: [{ type: "text", text }]
+    }
+  });
+}
+function isCodexRolloutLine(line) {
+  try {
+    const entry = JSON.parse(line);
+    return entry.type === "response_item" || entry.type === "event_msg" || entry.type === "session_meta" || entry.type === "turn_context";
+  } catch {
+    return false;
+  }
+}
+function toClientConversationLines(lines) {
+  if (lines.length === 0) return lines;
+  const codex = lines.some(isCodexRolloutLine);
+  if (!codex) return lines;
+  const out = [];
+  for (const line of lines) {
+    const normalized = normalizeCodexLineToClaudeShape(line);
+    if (normalized) out.push(normalized);
+  }
+  return out;
+}
+function isCodexInjectedContext(text) {
+  if (text.startsWith("# AGENTS.md") || text.includes("<INSTRUCTIONS>")) return true;
+  if (text.startsWith("<permissions instructions>") || text.includes("Filesystem sandboxing defines")) {
+    return true;
+  }
+  if (text.includes("limit the options to at most 3")) return true;
+  if (text.includes("You are working within the project boundary:")) return true;
+  if (text.includes(
+    "Do not read, write, or execute commands that access files or directories outside this boundary"
+  )) {
+    return true;
+  }
+  return false;
+}
+function hashPrefix(text) {
+  let h = 0;
+  const sample = text.slice(0, 64);
+  for (let i = 0; i < sample.length; i++) {
+    h = h * 31 + sample.charCodeAt(i) | 0;
+  }
+  return Math.abs(h).toString(36);
+}
+
 // src/utils/conversationEtag.ts
 var import_node_crypto3 = require("crypto");
 function computeConversationEtag({
@@ -5712,15 +5795,7 @@ var StreamerServer = class {
               if (broadcast) this.wsHub.broadcast(m);
             }
             const seqs = this.pendingLineSeqs.get(filePath);
-            this.wsHub.broadcast({
-              type: "conversation_events",
-              sessionId,
-              lines,
-              ...seqs && seqs.length === lines.length ? { seqs } : {}
-            });
-            for (const line of lines) {
-              this.wsHub.broadcast({ type: "conversation_event", sessionId, line });
-            }
+            this.broadcastConversationLines(sessionId, lines, seqs);
             break;
           }
         }
@@ -5917,7 +5992,7 @@ var StreamerServer = class {
         }
         for (const [sessionId, subscribers] of this.sessionSubscribers) {
           subscribers.delete(ws);
-          if (subscribers.size === 0) {
+          if (subscribers.size === 0 && this.ptyGracePeriodMs > 0) {
             this.startGraceTimer(sessionId, this.ptyGracePeriodMs);
           }
         }
@@ -6701,11 +6776,62 @@ var StreamerServer = class {
       rl.on("error", () => resolve2(null));
     });
   }
+  /**
+   * Live Codex sessions keep `SessionResponse.conversationId === managed.id`
+   * (stable deep-link / PTY key) and store the rollout UUID separately as
+   * `boundConversationId`. REST history is indexed under the rollout UUID, so
+   * resolve the placeholder → bound id before looking up the scanner.
+   */
+  resolveConversationLookupId(uuid) {
+    const managed = this.sessionStore.getManaged(uuid);
+    if (managed?.boundConversationId) return managed.boundConversationId;
+    return uuid;
+  }
+  /** File path for a live managed session (placeholder id or bound Codex id). */
+  findLiveSessionFilePath(uuid) {
+    const direct = this.sessionFileMap.get(uuid);
+    if (direct) return direct;
+    for (const s of this.sessionStore.listManaged()) {
+      if (s.boundConversationId === uuid) {
+        return this.sessionFileMap.get(s.id) ?? null;
+      }
+    }
+    return null;
+  }
+  /** True when a conversation UUID is the bound rollout of a live PTY session. */
+  isBoundConversationLive(boundId) {
+    for (const s of this.sessionStore.listManaged()) {
+      if (s.boundConversationId === boundId && this.ptyManager.hasSession(s.id)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  /**
+   * Broadcast conversation JSONL lines to WS clients. Codex rollout lines are
+   * normalized to the Claude `type:user|assistant` shape mobile understands;
+   * Claude lines pass through unchanged so seq alignment stays intact.
+   */
+  broadcastConversationLines(sessionId, lines, seqs) {
+    const clientLines = toClientConversationLines(lines);
+    if (clientLines.length === 0) return;
+    const seqsOk = !!seqs && seqs.length === lines.length && clientLines.length === lines.length;
+    this.wsHub.broadcast({
+      type: "conversation_events",
+      sessionId,
+      lines: clientLines,
+      ...seqsOk ? { seqs } : {}
+    });
+    for (const line of clientLines) {
+      this.wsHub.broadcast({ type: "conversation_event", sessionId, line });
+    }
+  }
   async findConversationByUuid(uuid) {
+    const lookupId = this.resolveConversationLookupId(uuid);
     if (!this.scannerReady && !this.scanProfiles) {
-      const filePath2 = this.findJsonlPath(uuid);
+      const filePath2 = this.findJsonlPath(lookupId) ?? this.findLiveSessionFilePath(uuid) ?? this.findLiveSessionFilePath(lookupId);
       if (filePath2) {
-        const account = this.cache?.getMetaById(uuid)?.account ?? void 0;
+        const account = this.cache?.getMetaById(lookupId)?.account ?? void 0;
         const coldScanner = this.scanner ?? this.newScanner();
         const page = await coldScanner.parseSingleFilePage(filePath2, account, {
           limit: Number.MAX_SAFE_INTEGER
@@ -6715,9 +6841,27 @@ var StreamerServer = class {
       return null;
     }
     const scanner = await this.getScanner(true);
-    const fromIndex = await scanner.getConversation(uuid);
+    const fromIndex = await scanner.getConversation(lookupId);
     if (fromIndex) {
-      if (this.ptyManager.hasSession(uuid)) {
+      if (this.ptyManager.hasSession(uuid) || this.ptyManager.hasSession(lookupId) || this.isBoundConversationLive(lookupId)) {
+        const livePath = this.findLiveSessionFilePath(uuid) ?? this.findLiveSessionFilePath(lookupId) ?? fromIndex.filePath ?? null;
+        const isCodexLive = this.isBoundConversationLive(lookupId) || this.sessionStore.getManaged(uuid)?.provider === CODEX_CLI_PROVIDER;
+        if (isCodexLive && livePath) {
+          try {
+            const account = this.cache?.getMetaById(lookupId)?.account ?? fromIndex.account ?? void 0;
+            const page = await scanner.parseSingleFilePage(livePath, account, {
+              limit: Number.MAX_SAFE_INTEGER
+            });
+            if (page?.conversation) return page.conversation;
+          } catch (err) {
+            this.log.warn("codex.live_reparse_failed", {
+              event: "codex.live_reparse_failed",
+              conversationId: lookupId,
+              filePath: livePath,
+              err
+            });
+          }
+        }
         return fromIndex;
       }
       if (fromIndex.filePath && this.isConversationSnapshotStale(fromIndex)) {
@@ -6737,12 +6881,12 @@ var StreamerServer = class {
       return fromIndex;
     }
     if (this.scanProfiles) return null;
-    const filePath = this.findJsonlPath(uuid);
+    const filePath = this.findJsonlPath(lookupId) ?? this.findLiveSessionFilePath(uuid) ?? this.findLiveSessionFilePath(lookupId);
     if (!filePath) return null;
     this.scanner = null;
     this.scannerReady = null;
     const freshScanner = await this.getScanner();
-    return freshScanner.getConversation(uuid);
+    return freshScanner.getConversation(lookupId);
   }
   // True when the JSONL on disk is meaningfully newer than the scanned
   // snapshot's last-activity timestamp — i.e. the file grew after the scan.
@@ -6823,7 +6967,9 @@ var StreamerServer = class {
       res.end();
       return;
     }
-    const filtered = conversation.messages;
+    const filtered = conversation.messages.filter(
+      (m) => !(m.role === "user" && typeof m.text === "string" && isCodexInjectedContext(m.text))
+    );
     const total = filtered.length;
     const hasAnchor = url.searchParams.has("anchor_index");
     const hasAfter = url.searchParams.has("after_index");
@@ -6881,8 +7027,7 @@ var StreamerServer = class {
           })
         );
       }
-      const pagedScanner = !indexWindow && this.scannerReady ? await this.getScanner(true) : null;
-      const page = indexWindow ?? (scanLimit > 0 && pagedScanner && typeof pagedScanner.getConversationPage === "function" ? await pagedScanner.getConversationPage(id, { beforeIndex, limit: scanLimit }) : null);
+      const page = indexWindow;
       if (indexWindow) indexTotal = indexWindow.total;
       const start = page?.fromIndex ?? windowStart;
       slice = page?.messages ?? filtered.slice(start, beforeIndex);
@@ -7690,10 +7835,7 @@ var StreamerServer = class {
       try {
         const existing = (0, import_fs12.readFileSync)(resolvedFilePath, "utf8").split("\n").filter(Boolean);
         if (existing.length > 0) {
-          this.wsHub.broadcast({ type: "conversation_events", sessionId, lines: existing });
-          for (const line of existing) {
-            this.wsHub.broadcast({ type: "conversation_event", sessionId, line });
-          }
+          this.broadcastConversationLines(sessionId, existing);
         }
       } catch {
       }
@@ -7794,10 +7936,7 @@ var StreamerServer = class {
           try {
             const existing = (0, import_fs12.readFileSync)(candidatePath, "utf8").split("\n").filter(Boolean);
             if (existing.length > 0) {
-              this.wsHub.broadcast({ type: "conversation_events", sessionId, lines: existing });
-              for (const line of existing) {
-                this.wsHub.broadcast({ type: "conversation_event", sessionId, line });
-              }
+              this.broadcastConversationLines(sessionId, existing);
             }
           } catch {
           }