@threadbase-sh/streamer 1.17.0 → 1.18.0

package/dist/index.cjs

@@ -2319,6 +2319,14 @@ function runSqliteMigrations(db, migrationsDir) {
   return { applied, skipped };
 }
 
+// src/providers.ts
+var CLAUDE_CODE_PROVIDER = "claude-code";
+var CODEX_CLI_PROVIDER = "codex-cli";
+function isProviderResumable(provider, availabilityResumable) {
+  if (provider === CODEX_CLI_PROVIDER) return false;
+  return availabilityResumable;
+}
+
 // src/services/conversations/isAgentConversation.ts
 var import_fs6 = require("fs");
 var DEFAULT_AGENT_ENTRYPOINTS = /* @__PURE__ */ new Set(["sdk-cli", "claude-vscode"]);
@@ -2486,11 +2494,11 @@ var ConversationCache = class _ConversationCache {
         INSERT INTO conversation_meta
           (id, file_path, project_path, project_name, title, model, account, branch,
            message_count, last_activity, first_message, last_message, preview, updated_at,
-           mtime_ms, file_size)
+           mtime_ms, file_size, provider)
         VALUES
           (@id, @file_path, @project_path, @project_name, @title, @model, @account, @branch,
            @message_count, @last_activity, @first_message, @last_message, @preview, @updated_at,
-           @mtime_ms, @file_size)
+           @mtime_ms, @file_size, @provider)
         ON CONFLICT(id) DO UPDATE SET
           file_path     = excluded.file_path,
           project_path  = excluded.project_path,
@@ -2506,7 +2514,8 @@ var ConversationCache = class _ConversationCache {
           preview       = excluded.preview,
           updated_at    = excluded.updated_at,
           mtime_ms      = excluded.mtime_ms,
-          file_size     = excluded.file_size
+          file_size     = excluded.file_size,
+          provider      = excluded.provider
         WHERE conversation_meta.updated_at < excluded.updated_at
       `),
       getTail: db.prepare("SELECT * FROM conversation_tail WHERE conversation_id = ?"),
@@ -2530,6 +2539,10 @@ var ConversationCache = class _ConversationCache {
       countByProject: db.prepare(
         "SELECT COUNT(*) as n FROM conversation_meta WHERE project_path = ?"
       ),
+      listByProvider: db.prepare(
+        "SELECT * FROM conversation_meta WHERE provider = ? ORDER BY last_activity DESC LIMIT ? OFFSET ?"
+      ),
+      countByProvider: db.prepare("SELECT COUNT(*) as n FROM conversation_meta WHERE provider = ?"),
       deleteById: db.prepare("DELETE FROM conversation_meta WHERE id = ?"),
       deleteTailById: db.prepare("DELETE FROM conversation_tail WHERE conversation_id = ?"),
       deleteAll: db.prepare("DELETE FROM conversation_meta"),
@@ -2787,7 +2800,8 @@ var ConversationCache = class _ConversationCache {
           preview: m.preview ?? null,
           updated_at: 0,
           mtime_ms: mtimeMs,
-          file_size: fileSize
+          file_size: fileSize,
+          provider: m.provider ?? CLAUDE_CODE_PROVIDER
         });
         if (this.fileIndexLoaded) this.fileIndex.set(m.filePath, id);
         upsertedIds.push(id);
@@ -2866,12 +2880,15 @@ var ConversationCache = class _ConversationCache {
     return true;
   }
   listConversations(opts) {
-    const { project, limit, offset } = opts;
+    const { project, provider, limit, offset } = opts;
     let total;
     let rows;
     if (project) {
       total = this.stmts.countByProject.get(project).n;
       rows = limit === 0 ? [] : this.stmts.listByProject.all(project, limit, offset);
+    } else if (provider) {
+      total = this.stmts.countByProvider.get(provider).n;
+      rows = limit === 0 ? [] : this.stmts.listByProvider.all(provider, limit, offset);
     } else {
       total = this.stmts.count.get().n;
       rows = limit === 0 ? [] : this.stmts.list.all(limit, offset);
@@ -2893,7 +2910,8 @@ var ConversationCache = class _ConversationCache {
         firstMessage: r.first_message,
         lastMessage: r.last_message,
         preview: r.preview,
-        source: r.source
+        source: r.source,
+        provider: r.provider ?? CLAUDE_CODE_PROVIDER
       }))
     };
   }
@@ -2926,7 +2944,8 @@ var ConversationCache = class _ConversationCache {
       firstMessage: row.first_message,
       lastMessage: row.last_message,
       preview: row.preview,
-      source: row.source
+      source: row.source,
+      provider: row.provider ?? CLAUDE_CODE_PROVIDER
     };
   }
   setConversationProjectId(conversationId, projectId) {
@@ -3437,6 +3456,7 @@ function normalizeConversationToProjectChat(conversation) {
     createdAt: null,
     status: "resumable",
     source: "hdd-cache",
+    provider: conversation.provider ?? CLAUDE_CODE_PROVIDER,
     indexedAt: null,
     fileMtime: null,
     filePath: conversation.filePath ?? null,
@@ -4361,6 +4381,7 @@ var StreamerServer = class {
   // in the constructor body (NOT a field initializer) so directoryDebounceMs
   // is already set when debounce() captures the wait.
   markScannerStaleDebounced;
+  codexRoots;
   includeAgents;
   agentEntrypoints;
   honoApp;
@@ -4375,6 +4396,7 @@ var StreamerServer = class {
     this.verbose = config.verbose ?? false;
     this.disableDb = config.disableDb ?? false;
     this.scanProfiles = config.scanProfiles;
+    this.codexRoots = config.codexRoots ?? [(0, import_path11.join)((0, import_os6.homedir)(), ".codex", "sessions")];
     this.ptyGracePeriodMs = config.ptyGracePeriodMs ?? DEFAULT_PTY_GRACE_PERIOD_MS;
     this.cacheDir = config.cacheDir ?? loadCacheDir() ?? (0, import_path11.join)((0, import_os6.homedir)(), ".threadbase", "cache");
     this.tailSize = config.tailSize ?? loadTailSize() ?? 10;
@@ -4792,9 +4814,13 @@ var StreamerServer = class {
         const warmupScanner = new import_scanner2.ConversationScanner();
         const warmupStatCache = this.buildStatCache(null);
         const shouldEmitProgress = createScanProgressThrottle();
-        warmupScanner.scan({
+        const scanOpts = {
           ...this.scanProfiles ? { profiles: this.scanProfiles } : {},
-          ...warmupStatCache ? { statCache: warmupStatCache } : {},
+          ...this.codexScanOpts(),
+          ...warmupStatCache ? { statCache: warmupStatCache } : {}
+        };
+        warmupScanner.scan({
+          ...scanOpts,
           onProgress: (scanned, total) => {
             if (shouldEmitProgress(scanned, total)) {
               this.wsHub.broadcast({ type: "scan_progress", scanned, total });
@@ -5019,6 +5045,7 @@ var StreamerServer = class {
     const offset = intParam(url, "offset", 0);
     const sort = url.searchParams.get("sort") ?? "recent";
     const project = url.searchParams.get("project") ?? void 0;
+    const providerFilter = url.searchParams.get("provider") ?? void 0;
     const bustCache = url.searchParams.get("refresh") === "1";
     if (bustCache) {
       this.cache?.invalidate();
@@ -5026,7 +5053,12 @@ var StreamerServer = class {
       this.scannerReady = null;
     }
     if (this.cache && !bustCache) {
-      const { conversations, total: total2 } = this.cache.listConversations({ project, limit, offset });
+      const { conversations, total: total2 } = this.cache.listConversations({
+        project,
+        provider: providerFilter,
+        limit,
+        offset
+      });
       const adapted2 = conversations.map((c) => ({
         id: c.id,
         title: deriveProjectChatTitle({
@@ -5045,7 +5077,8 @@ var StreamerServer = class {
         lastActivity: c.lastActivity,
         firstMessage: c.firstMessage ? JSON.parse(c.firstMessage) : void 0,
         lastMessage: c.lastMessage ? JSON.parse(c.lastMessage) : void 0,
-        model: c.model ?? void 0
+        model: c.model ?? void 0,
+        provider: c.provider ?? CLAUDE_CODE_PROVIDER
       }));
       json(res, 200, { conversations: adapted2, hasMore: offset + limit < total2, offset, total: total2 });
       return;
@@ -5054,6 +5087,8 @@ var StreamerServer = class {
     let metas = [...scanner.getMetadataCache().values()];
     metas = (0, import_scanner2.applyIncludeFilter)(metas, "conversations");
     if (project) metas = (0, import_scanner2.applyProjectFilter)(metas, project);
+    if (providerFilter)
+      metas = metas.filter((m) => (m.provider ?? CLAUDE_CODE_PROVIDER) === providerFilter);
     metas = (0, import_scanner2.applySort)(metas, sort);
     const total = metas.length;
     const page = (0, import_scanner2.applyPagination)(metas, limit, offset);
@@ -5077,7 +5112,8 @@ var StreamerServer = class {
         lastActivity: c.timestamp,
         firstMessage: c.firstMessage ?? void 0,
         lastMessage: c.lastMessage ?? void 0,
-        model: c.model ?? void 0
+        model: c.model ?? void 0,
+        provider: c.provider ?? CLAUDE_CODE_PROVIDER
       };
     });
     json(res, 200, { conversations: adapted, hasMore: offset + limit < total, offset, total });
@@ -5090,9 +5126,15 @@ var StreamerServer = class {
   }
   async handleConversationsCount(url, res) {
     const project = url.searchParams.get("project") ?? void 0;
+    const providerFilter = url.searchParams.get("provider") ?? void 0;
     const bustCache = url.searchParams.get("refresh") === "1";
     if (this.cache) {
-      const { total } = this.cache.listConversations({ project, limit: 0, offset: 0 });
+      const { total } = this.cache.listConversations({
+        project,
+        provider: providerFilter,
+        limit: 0,
+        offset: 0
+      });
       json(res, 200, { total });
       if (bustCache) this.refreshCountInBackground();
       return;
@@ -5101,6 +5143,8 @@ var StreamerServer = class {
     let metas = [...scanner.getMetadataCache().values()];
     metas = (0, import_scanner2.applyIncludeFilter)(metas, "conversations");
     if (project) metas = (0, import_scanner2.applyProjectFilter)(metas, project);
+    if (providerFilter)
+      metas = metas.filter((m) => (m.provider ?? CLAUDE_CODE_PROVIDER) === providerFilter);
     json(res, 200, { total: metas.length });
   }
   // Fire-and-forget full rescan that reconciles the SQLite cache from disk so a
@@ -5189,6 +5233,14 @@ var StreamerServer = class {
     }
     return statCache.size > 0 ? statCache : void 0;
   }
+  // Returns the provider + codexRoots fragment to spread into every scan()/search() call.
+  // codexRoots=[] disables codex scanning (safe no-op per scanner contract).
+  codexScanOpts() {
+    return {
+      providers: [CLAUDE_CODE_PROVIDER, CODEX_CLI_PROVIDER],
+      codexRoots: this.codexRoots
+    };
+  }
   // skipStaleRescan: when an indexed scanner already exists, return it directly
   // even if scannerStale is set, leaving the flag untouched so the next
   // list-level call still rescans. The single-conversation detail path passes
@@ -5214,6 +5266,7 @@ var StreamerServer = class {
     this.scanner = new import_scanner2.ConversationScanner();
     this.scannerReady = this.scanner.scan({
       ...this.scanProfiles ? { profiles: this.scanProfiles } : {},
+      ...this.codexScanOpts(),
       ...statCache ? { statCache } : {}
     });
     await this.scannerReady;
@@ -5317,6 +5370,7 @@ var StreamerServer = class {
         const tail = this.cache.getConversationTail(id);
         if (tail && tail.messages.length > 0) {
           const cachedMeta = this.cache.getMetaById(id);
+          const cachedProvider = cachedMeta?.provider ?? CLAUDE_CODE_PROVIDER;
           const availability2 = classifyResumability(cachedMeta?.projectPath);
           const messagesPayload2 = tail.messages.map((m, idx) => ({
             message_index: idx,
@@ -5335,7 +5389,8 @@ var StreamerServer = class {
               file_path: cachedMeta?.filePath ?? void 0,
               last_updated_at: cachedMeta?.lastActivity ?? void 0,
               message_count: cachedMeta?.messageCount ?? void 0,
-              resumable: availability2.resumable,
+              provider: cachedProvider,
+              resumable: isProviderResumable(cachedProvider, availability2.resumable),
               ...availability2.unavailable_reason && {
                 unavailable_reason: availability2.unavailable_reason
               }
@@ -5433,6 +5488,8 @@ var StreamerServer = class {
       };
     });
     const conv = conversation;
+    const cachedConvMeta = this.cache?.getMetaById(id);
+    const convProvider = conv.provider ?? cachedConvMeta?.provider ?? CLAUDE_CODE_PROVIDER;
     const availability = classifyResumability(conv.projectPath);
     const body = {
       meta: {
@@ -5444,7 +5501,8 @@ var StreamerServer = class {
         last_updated_at: conv.timestamp,
         message_count: conv.messageCount,
         last_prompt: conv.lastPrompt ?? void 0,
-        resumable: availability.resumable,
+        provider: convProvider,
+        resumable: isProviderResumable(convProvider, availability.resumable),
         ...availability.unavailable_reason && {
           unavailable_reason: availability.unavailable_reason
         }
@@ -5479,7 +5537,8 @@ var StreamerServer = class {
       {
         limit,
         include: "conversations",
-        ...this.scanProfiles ? { profiles: this.scanProfiles } : {}
+        ...this.scanProfiles ? { profiles: this.scanProfiles } : {},
+        ...this.codexScanOpts()
       },
       scanner
     );
@@ -5495,7 +5554,8 @@ var StreamerServer = class {
       messageCount: r.meta.messageCount,
       lastActivity: r.meta.timestamp,
       firstMessage: r.meta.firstMessage ?? void 0,
-      lastMessage: r.meta.lastMessage ?? void 0
+      lastMessage: r.meta.lastMessage ?? void 0,
+      provider: r.meta.provider ?? CLAUDE_CODE_PROVIDER
     }));
     json(res, 200, {
       conversations: adapted,
@@ -6175,6 +6235,7 @@ function classifyResumability(cwd) {
 }
 function conversationToResumableSession(c) {
   const availability = classifyResumability(c.projectPath);
+  const provider = c.provider ?? CLAUDE_CODE_PROVIDER;
   return {
     type: "conversation",
     id: c.id,
@@ -6199,7 +6260,8 @@ function conversationToResumableSession(c) {
     ...c.firstMessage != null && { firstMessageText: c.firstMessage },
     ...c.lastMessage != null && { lastMessageText: c.lastMessage },
     filePath: c.filePath,
-    resumable: availability.resumable,
+    provider,
+    resumable: isProviderResumable(provider, availability.resumable),
     ...availability.unavailable_reason && {
       unavailable_reason: availability.unavailable_reason
     }