@threadbase-sh/streamer 1.67.0 → 1.67.2

package/dist/index.js

@@ -6477,7 +6477,7 @@ import {
   search
 } from "@threadbase-sh/scanner";
 import { createReadStream, existsSync as existsSync8, readdirSync as readdirSync3 } from "fs";
-import { join as join12 } from "path";
+import { basename as basename5, join as join12 } from "path";
 import { createInterface } from "readline";
 
 // src/conversation-cache.ts
@@ -6769,6 +6769,7 @@ CREATE TABLE IF NOT EXISTS session_names (
 );
 `;
 var cacheLog = getLogger("cache");
+var PARSE_STATE_LOOKBACK = 8;
 var ConversationCache = class _ConversationCache {
   db;
   tailSize;
@@ -7285,7 +7286,7 @@ var ConversationCache = class _ConversationCache {
     if (to <= from) return { messages: [], total, fromIndex: from };
     const rows = this.getMessageIndexWindow(
       _ConversationCache.conversationIdForFile(filePath),
-      from,
+      Math.max(0, from - PARSE_STATE_LOOKBACK),
       to
     );
     if (rows.length === 0) return { messages: [], total, fromIndex: from };
@@ -7297,7 +7298,7 @@ var ConversationCache = class _ConversationCache {
         const buf = Buffer.alloc(row.byte_length);
         readSync3(fd, buf, 0, row.byte_length, row.byte_offset);
         const msg = parseJsonlLine(buf.toString("utf-8"), state);
-        if (msg) messages.push(msg);
+        if (msg && row.message_index >= from) messages.push(msg);
       }
     } finally {
       closeSync3(fd);
@@ -8644,6 +8645,64 @@ var ConversationHandlers = class {
     }
     return null;
   }
+  /**
+   * Resolve a conversation id to a JSONL path, in order of authority.
+   *
+   * `findJsonlPath` alone answers 64.0% of this machine's 961 conversations and
+   * 0 of 343 Codex ones — it reconstructs `<projectsDir>/<dir>/<uuid>.jsonl`,
+   * which is Claude Code's layout, and a Codex rollout is
+   * `rollout-<ts>-<uuid>.jsonl` under a date path, so that walk cannot match one
+   * by construction. The ladder below answers 99.7%, leaving only the three
+   * whose file is genuinely gone.
+   */
+  async locateJsonlPath(uuid, lookupId) {
+    const live = this.deps.findLiveSessionFilePath(uuid) ?? this.deps.findLiveSessionFilePath(lookupId);
+    if (live) return live;
+    const cached3 = this.cache?.getMetaById(lookupId)?.filePath;
+    if (cached3 && await this.isJsonlPathFor(cached3, lookupId)) return cached3;
+    return this.findJsonlPath(lookupId);
+  }
+  /**
+   * Does `filePath` actually hold the conversation `requestedId` names?
+   *
+   * The filename settles it for both providers: Claude writes `<uuid>.jsonl`
+   * (or `agent-<agentId>.jsonl`), Codex writes `rollout-<ts>-<uuid>.jsonl`.
+   * Only when the name says nothing do we open the file — and there the naive
+   * rule is wrong, because **a Claude subagent transcript carries the PARENT's
+   * `sessionId`**. Matching on `sessionId` alone therefore verifies exactly the
+   * file this check exists to reject, so a sidechain is refused outright unless
+   * it was asked for by its own `agent-<agentId>` name, which the filename
+   * branch above already covers.
+   */
+  async isJsonlPathFor(filePath, requestedId) {
+    if (!existsSync8(filePath)) return false;
+    const stem = basename5(filePath).replace(/\.jsonl$/, "");
+    if (stem === requestedId || stem.includes(requestedId)) return true;
+    const first = await this.readFirstJsonlEntry(filePath);
+    if (!first || first.isSidechain === true) return false;
+    return first.sessionId === requestedId;
+  }
+  /** First parseable JSONL line, for identity checks. Null on an empty or unreadable file. */
+  async readFirstJsonlEntry(filePath) {
+    return new Promise((resolve2) => {
+      const rl = createInterface({ input: createReadStream(filePath), crlfDelay: Infinity });
+      let done = false;
+      rl.on("line", (line) => {
+        if (done) return;
+        try {
+          const entry = JSON.parse(line);
+          done = true;
+          rl.close();
+          resolve2(entry);
+        } catch {
+        }
+      });
+      rl.on("close", () => {
+        if (!done) resolve2(null);
+      });
+      rl.on("error", () => resolve2(null));
+    });
+  }
   async readCwdFromJsonl(filePath) {
     return new Promise((resolve2) => {
       const rl = createInterface({ input: createReadStream(filePath), crlfDelay: Infinity });
@@ -8669,7 +8728,7 @@ var ConversationHandlers = class {
   async findConversationByUuid(uuid) {
     const lookupId = this.deps.resolveConversationLookupId(uuid);
     if (!this.scannerManager.ready && !this.scanProfiles) {
-      const filePath2 = this.findJsonlPath(lookupId) ?? this.deps.findLiveSessionFilePath(uuid) ?? this.deps.findLiveSessionFilePath(lookupId);
+      const filePath2 = await this.locateJsonlPath(uuid, lookupId);
       if (filePath2) {
         const account = this.cache?.getMetaById(lookupId)?.account ?? void 0;
         const coldScanner = this.scannerManager.current ?? this.scannerManager.newScanner();
@@ -8721,7 +8780,7 @@ var ConversationHandlers = class {
       return fromIndex;
     }
     if (this.scanProfiles) return null;
-    const filePath = this.findJsonlPath(lookupId) ?? this.deps.findLiveSessionFilePath(uuid) ?? this.deps.findLiveSessionFilePath(lookupId);
+    const filePath = await this.locateJsonlPath(uuid, lookupId);
     if (!filePath) return null;
     if (this.scannerManager.ready) {
       const account = this.cache?.getMetaById(lookupId)?.account ?? void 0;
@@ -9135,7 +9194,7 @@ var ConversationHandlers = class {
 
 // src/api/handlers/sessions.handlers.ts
 import { existsSync as existsSync10 } from "fs";
-import { basename as basename5, dirname as dirname9, join as join16 } from "path";
+import { basename as basename6, dirname as dirname9, join as join16 } from "path";
 
 // node_modules/nanoid/index.js
 import crypto2 from "crypto";
@@ -10659,7 +10718,7 @@ var SessionHandlers = class {
       const jsonlCwd = jsonlPath ? await this.deps.readCwdFromJsonl(jsonlPath) : null;
       if (jsonlCwd) {
         projectPath = jsonlCwd;
-        projectName = projectName || basename5(jsonlCwd);
+        projectName = projectName || basename6(jsonlCwd);
       }
     }
     if (!projectPath) {
@@ -15256,7 +15315,7 @@ function discoveredToResponse(d, conversationId) {
 // src/session-watchers.ts
 import { existsSync as existsSync15, watch as fsWatch, readdirSync as readdirSync7, readFileSync as readFileSync10, statSync as statSync13 } from "fs";
 import { homedir as homedir13 } from "os";
-import { basename as basename6, join as join24 } from "path";
+import { basename as basename7, join as join24 } from "path";
 var SessionWatchers = class {
   constructor(deps) {
     this.deps = deps;
@@ -15362,7 +15421,7 @@ var SessionWatchers = class {
         try {
           const now = Date.now();
           const match = readdirSync7(projectsDir).filter((f) => f.endsWith(".jsonl")).map((f) => ({ f, mtime: statSync13(join24(projectsDir, f)).mtimeMs })).filter(({ mtime }) => now - mtime < 5e3).filter(
-            ({ f }) => basename6(f, ".jsonl") === sessionId || this.readFirstLineSessionId(join24(projectsDir, f)) === sessionId
+            ({ f }) => basename7(f, ".jsonl") === sessionId || this.readFirstLineSessionId(join24(projectsDir, f)) === sessionId
           ).sort((a, b) => b.mtime - a.mtime)[0];
           if (match) resolvedFilePath = join24(projectsDir, match.f);
         } catch {