@threadbase-sh/streamer 1.34.0 → 1.35.0

package/dist/index.d.cts

@@ -276,6 +276,12 @@ type WSMessage = {
 };
 /** The four cache-integrity resolution actions (POST /api/cache/alert/resolve). */
 type CacheAlertResolveAction = "prune_all" | "prune_selected" | "ignore" | "reset_rescan";
+type ServerWarmupState = "startup" | "cache_reset" | "conversation_refresh";
+interface ServerWarmingUpResponse {
+    error: "Server is warming up";
+    code: "SERVER_WARMING_UP";
+    warmupState: ServerWarmupState;
+}
 interface SessionResponse {
     id: string;
     conversationId: string;
@@ -957,11 +963,12 @@ declare class CacheIntegrityMonitor {
     private readonly log;
     private readonly cacheDir;
     private readonly rescan?;
+    private readonly runDuringReset?;
     private _pending;
     private ignoredIds;
     private deferredUnlinks;
     private unlinkTimes;
-    constructor(cache: ConversationCache, wsHub: WSHub, log: Logger, cacheDir: string, rescan?: (() => Promise<ScannerMeta[]>) | undefined);
+    constructor(cache: ConversationCache, wsHub: WSHub, log: Logger, cacheDir: string, rescan?: (() => Promise<ScannerMeta[]>) | undefined, runDuringReset?: (<T>(operation: () => Promise<T>) => Promise<T>) | undefined);
     get pending(): PendingAlert | null;
     private persist;
     private classifySeverity;
@@ -1185,7 +1192,8 @@ declare class StreamerServer {
     private scannerStale;
     private refreshInFlight;
     private binding;
-    private cacheReady;
+    private activeWarmups;
+    private nextWarmupId;
     private inFlightCacheWrites;
     private apiKey;
     private apiKeySource;
@@ -1246,6 +1254,11 @@ declare class StreamerServer {
     private addSessionSubscriber;
     private startGraceTimer;
     get port(): number;
+    private currentWarmupState;
+    private beginWarmup;
+    private finishWarmup;
+    private withWarmup;
+    private rejectIfWarmingUp;
     listen(port: number, opts?: {
         awaitReady?: boolean;
     }): Promise<void>;
@@ -1448,4 +1461,4 @@ declare class ConversationWatcher {
     private readNewLines;
 }
 
-export { type AgentClient, type AgentClientOpts, type AgentConfig, type AppendArgs, type AskOption, type AskQuestion, CLAUDE_CODE_PROVIDER, CODEX_CLI_PROVIDER, type CacheAlertResolveAction, type ConversationListResponse, ConversationWatcher, type ConversationWriter, type DbConfig, type DiscoveredProcess, LiveSessionManager, type ManagedSession, PTYManager, type PTYManagerOptions, type PermissionOption, type ProcessLiveness, type ProgressDedupeLRU, type ProviderName, type ServerConfig, type SessionActivity, type SessionCursor, type SessionListPage, type SessionListQuery, type SessionOwnership, type SessionResponse, type SessionRunner, type SessionSortKey, type SessionStatus, SessionStore, type SortOrder, type StartFreshSessionOptions, type StartSessionOptions, StreamerServer, type UserMessage, WSHub, type WSMessage, createAgentClient, createConversationWriter, createPool, createProgressDedupeLRU, createProgressRoutes, discoverClaudeProcesses, generateApiKey, getDbConfig, isDbEnabled, isProviderName, isProviderResumable, loadOrCreateApiKey, maskConnectionString, readAgentConfig, validateApiKey };
+export { type AgentClient, type AgentClientOpts, type AgentConfig, type AppendArgs, type AskOption, type AskQuestion, CLAUDE_CODE_PROVIDER, CODEX_CLI_PROVIDER, type CacheAlertResolveAction, type ConversationListResponse, ConversationWatcher, type ConversationWriter, type DbConfig, type DiscoveredProcess, LiveSessionManager, type ManagedSession, PTYManager, type PTYManagerOptions, type PermissionOption, type ProcessLiveness, type ProgressDedupeLRU, type ProviderName, type ServerConfig, type ServerWarmingUpResponse, type ServerWarmupState, type SessionActivity, type SessionCursor, type SessionListPage, type SessionListQuery, type SessionOwnership, type SessionResponse, type SessionRunner, type SessionSortKey, type SessionStatus, SessionStore, type SortOrder, type StartFreshSessionOptions, type StartSessionOptions, StreamerServer, type UserMessage, WSHub, type WSMessage, createAgentClient, createConversationWriter, createPool, createProgressDedupeLRU, createProgressRoutes, discoverClaudeProcesses, generateApiKey, getDbConfig, isDbEnabled, isProviderName, isProviderResumable, loadOrCreateApiKey, maskConnectionString, readAgentConfig, validateApiKey };

package/dist/index.d.ts

@@ -276,6 +276,12 @@ type WSMessage = {
 };
 /** The four cache-integrity resolution actions (POST /api/cache/alert/resolve). */
 type CacheAlertResolveAction = "prune_all" | "prune_selected" | "ignore" | "reset_rescan";
+type ServerWarmupState = "startup" | "cache_reset" | "conversation_refresh";
+interface ServerWarmingUpResponse {
+    error: "Server is warming up";
+    code: "SERVER_WARMING_UP";
+    warmupState: ServerWarmupState;
+}
 interface SessionResponse {
     id: string;
     conversationId: string;
@@ -957,11 +963,12 @@ declare class CacheIntegrityMonitor {
     private readonly log;
     private readonly cacheDir;
     private readonly rescan?;
+    private readonly runDuringReset?;
     private _pending;
     private ignoredIds;
     private deferredUnlinks;
     private unlinkTimes;
-    constructor(cache: ConversationCache, wsHub: WSHub, log: Logger, cacheDir: string, rescan?: (() => Promise<ScannerMeta[]>) | undefined);
+    constructor(cache: ConversationCache, wsHub: WSHub, log: Logger, cacheDir: string, rescan?: (() => Promise<ScannerMeta[]>) | undefined, runDuringReset?: (<T>(operation: () => Promise<T>) => Promise<T>) | undefined);
     get pending(): PendingAlert | null;
     private persist;
     private classifySeverity;
@@ -1185,7 +1192,8 @@ declare class StreamerServer {
     private scannerStale;
     private refreshInFlight;
     private binding;
-    private cacheReady;
+    private activeWarmups;
+    private nextWarmupId;
     private inFlightCacheWrites;
     private apiKey;
     private apiKeySource;
@@ -1246,6 +1254,11 @@ declare class StreamerServer {
     private addSessionSubscriber;
     private startGraceTimer;
     get port(): number;
+    private currentWarmupState;
+    private beginWarmup;
+    private finishWarmup;
+    private withWarmup;
+    private rejectIfWarmingUp;
     listen(port: number, opts?: {
         awaitReady?: boolean;
     }): Promise<void>;
@@ -1448,4 +1461,4 @@ declare class ConversationWatcher {
     private readNewLines;
 }
 
-export { type AgentClient, type AgentClientOpts, type AgentConfig, type AppendArgs, type AskOption, type AskQuestion, CLAUDE_CODE_PROVIDER, CODEX_CLI_PROVIDER, type CacheAlertResolveAction, type ConversationListResponse, ConversationWatcher, type ConversationWriter, type DbConfig, type DiscoveredProcess, LiveSessionManager, type ManagedSession, PTYManager, type PTYManagerOptions, type PermissionOption, type ProcessLiveness, type ProgressDedupeLRU, type ProviderName, type ServerConfig, type SessionActivity, type SessionCursor, type SessionListPage, type SessionListQuery, type SessionOwnership, type SessionResponse, type SessionRunner, type SessionSortKey, type SessionStatus, SessionStore, type SortOrder, type StartFreshSessionOptions, type StartSessionOptions, StreamerServer, type UserMessage, WSHub, type WSMessage, createAgentClient, createConversationWriter, createPool, createProgressDedupeLRU, createProgressRoutes, discoverClaudeProcesses, generateApiKey, getDbConfig, isDbEnabled, isProviderName, isProviderResumable, loadOrCreateApiKey, maskConnectionString, readAgentConfig, validateApiKey };
+export { type AgentClient, type AgentClientOpts, type AgentConfig, type AppendArgs, type AskOption, type AskQuestion, CLAUDE_CODE_PROVIDER, CODEX_CLI_PROVIDER, type CacheAlertResolveAction, type ConversationListResponse, ConversationWatcher, type ConversationWriter, type DbConfig, type DiscoveredProcess, LiveSessionManager, type ManagedSession, PTYManager, type PTYManagerOptions, type PermissionOption, type ProcessLiveness, type ProgressDedupeLRU, type ProviderName, type ServerConfig, type ServerWarmingUpResponse, type ServerWarmupState, type SessionActivity, type SessionCursor, type SessionListPage, type SessionListQuery, type SessionOwnership, type SessionResponse, type SessionRunner, type SessionSortKey, type SessionStatus, SessionStore, type SortOrder, type StartFreshSessionOptions, type StartSessionOptions, StreamerServer, type UserMessage, WSHub, type WSMessage, createAgentClient, createConversationWriter, createPool, createProgressDedupeLRU, createProgressRoutes, discoverClaudeProcesses, generateApiKey, getDbConfig, isDbEnabled, isProviderName, isProviderResumable, loadOrCreateApiKey, maskConnectionString, readAgentConfig, validateApiKey };

package/dist/index.js

@@ -5477,12 +5477,13 @@ function fingerprintOf(ids) {
   return `sha256:${createHash2("sha256").update(sorted.join("\n")).digest("hex")}`;
 }
 var CacheIntegrityMonitor = class {
-  constructor(cache, wsHub, log3, cacheDir, rescan) {
+  constructor(cache, wsHub, log3, cacheDir, rescan, runDuringReset) {
     this.cache = cache;
     this.wsHub = wsHub;
     this.log = log3;
     this.cacheDir = cacheDir;
     this.rescan = rescan;
+    this.runDuringReset = runDuringReset;
     const state = loadAlertState();
     this._pending = state.pending ?? null;
     this.ignoredIds = new Set(state.ignoredIds ?? []);
@@ -5492,6 +5493,7 @@ var CacheIntegrityMonitor = class {
   log;
   cacheDir;
   rescan;
+  runDuringReset;
   _pending;
   ignoredIds;
   deferredUnlinks = [];
@@ -5695,18 +5697,20 @@ var CacheIntegrityMonitor = class {
       }
       case "reset_rescan": {
         const backupPath = await this.ensureBackup(pending);
-        this.cache.clearAll();
-        if (this.rescan) {
-          try {
+        const reset = async () => {
+          this.cache.clearAll();
+          if (this.rescan) {
             const metas = await this.rescan();
             this.cache.upsertFromScannerMeta(metas);
-          } catch (err) {
-            this.log.error("cache-integrity reset rescan failed", {
-              event: "cache_integrity.reset_rescan_failed",
-              error: err instanceof Error ? err.message : String(err)
-            });
           }
-        }
+        };
+        const resetPromise = this.runDuringReset ? this.runDuringReset(reset) : reset();
+        void resetPromise.catch((err) => {
+          this.log.error("cache-integrity reset rescan failed", {
+            event: "cache_integrity.reset_rescan_failed",
+            error: err instanceof Error ? err.message : String(err)
+          });
+        });
         this.clearPending();
         this.broadcastResolved(fingerprint, action);
         return { ok: true, action, backupPath };
@@ -6697,7 +6701,8 @@ var StreamerServer = class {
   // listener-level 'error' handler demotes EADDRINUSE to debug during this
   // window so the self-healing kickstart-relaunch race doesn't spam warn.
   binding = false;
-  cacheReady = false;
+  activeWarmups = /* @__PURE__ */ new Map([[0, "startup"]]);
+  nextWarmupId = 1;
   // Every fire-and-forget task that runs a scan and then writes to this.cache
   // in an async continuation (startup warm-up, background count refresh, …).
   // close() awaits all of them before closing this.cache, so a scan's post-scan
@@ -7047,7 +7052,7 @@ var StreamerServer = class {
         this.wsHub.addClient(ws);
         const sessions = this.sessionStore.list(this.ptyAttachedIds());
         ws.send(JSON.stringify({ type: "session_list", sessions }));
-        if (this.cacheReady) {
+        if (!this.currentWarmupState()) {
           ws.send(JSON.stringify({ type: "cache_ready" }));
         }
         const alertMsg = this.cacheMonitor?.wsMessage();
@@ -7256,6 +7261,39 @@ var StreamerServer = class {
     const addr = this.httpServer.address();
     return typeof addr === "object" && addr ? addr.port : 0;
   }
+  currentWarmupState() {
+    let current = null;
+    for (const state of this.activeWarmups.values()) current = state;
+    return current;
+  }
+  beginWarmup(state) {
+    const id = this.nextWarmupId++;
+    this.activeWarmups.set(id, state);
+    return id;
+  }
+  finishWarmup(id) {
+    if (!this.activeWarmups.delete(id) || this.activeWarmups.size > 0) return;
+    this.wsHub.broadcast({ type: "cache_ready" });
+  }
+  async withWarmup(state, operation) {
+    const id = this.beginWarmup(state);
+    try {
+      return await operation();
+    } finally {
+      this.finishWarmup(id);
+    }
+  }
+  rejectIfWarmingUp(res) {
+    const warmupState = this.currentWarmupState();
+    if (!warmupState) return false;
+    const body = {
+      error: "Server is warming up",
+      code: "SERVER_WARMING_UP",
+      warmupState
+    };
+    json(res, 503, body);
+    return true;
+  }
   async listen(port, opts) {
     const dbConfig = this.disableDb ? null : getDbConfig();
     if (dbConfig) {
@@ -7313,6 +7351,11 @@ var StreamerServer = class {
             async () => {
               const scanner = await this.rescanForRefresh();
               return [...scanner.getMetadataCache().values()];
+            },
+            (operation) => {
+              const reset = this.withWarmup("cache_reset", operation);
+              this.trackCacheWrite(reset);
+              return reset;
             }
           );
           for (const dir of this.projectsDirs()) {
@@ -7408,8 +7451,7 @@ var StreamerServer = class {
             event: "cache.warmup_failed"
           });
         }).finally(() => {
-          this.cacheReady = true;
-          this.wsHub.broadcast({ type: "cache_ready" });
+          this.finishWarmup(0);
           resolveWarm();
         });
       }
@@ -7641,6 +7683,7 @@ var StreamerServer = class {
     return this.checkRateLimit(this.sessionInputAttempts, sessionId, 500, 6e4);
   }
   async handleListConversations(url, res) {
+    if (this.rejectIfWarmingUp(res)) return;
     const limit = intParam(url, "limit", 50);
     const offset = intParam(url, "offset", 0);
     const sort = url.searchParams.get("sort") ?? "recent";
@@ -7648,7 +7691,7 @@ var StreamerServer = class {
     const providerFilter = url.searchParams.get("provider") ?? void 0;
     const bustCache = url.searchParams.get("refresh") === "1";
     if (bustCache && this.cache) {
-      const scanner2 = await this.rescanForRefresh();
+      const scanner2 = await this.withWarmup("conversation_refresh", () => this.rescanForRefresh());
       const metas2 = [...scanner2.getMetadataCache().values()];
       try {
         this.cache.upsertFromScannerMeta(metas2);
@@ -7729,6 +7772,7 @@ var StreamerServer = class {
     json(res, 200, { conversations: adapted, hasMore: offset + limit < total, offset, total });
   }
   async handleConversationsCount(url, res) {
+    if (this.rejectIfWarmingUp(res)) return;
     const project = url.searchParams.get("project") ?? void 0;
     const providerFilter = url.searchParams.get("provider") ?? void 0;
     const bustCache = url.searchParams.get("refresh") === "1";
@@ -7756,7 +7800,7 @@ var StreamerServer = class {
   // path — refresh=1 returns the cached total synchronously and this catches up.
   refreshCountInBackground() {
     this.trackCacheWrite(
-      (async () => {
+      this.withWarmup("conversation_refresh", async () => {
         try {
           const scanner = await this.getFreshScanner();
           if (this.cache) {
@@ -7768,13 +7812,15 @@ var StreamerServer = class {
             { event: "count.refresh_failed" }
           );
         }
-      })()
+      })
     );
   }
   handleSessionsCount(res) {
+    if (this.rejectIfWarmingUp(res)) return;
     json(res, 200, { total: this.sessionStore.list(this.ptyAttachedIds()).length });
   }
   handleGetRecentSessions(url, res) {
+    if (this.rejectIfWarmingUp(res)) return;
     const limit = intParam(url, "limit", 20);
     if (!this.cache) {
       json(res, 200, { sessions: [], total: 0 });
@@ -8222,6 +8268,7 @@ var StreamerServer = class {
     return isScannedSnapshotStale(conv.timestamp, mtimeMs);
   }
   async handleGetConversation(id, url, res, ifNoneMatch) {
+    if (this.rejectIfWarmingUp(res)) return;
     const conversation = await this.findConversationByUuid(id);
     if (!conversation && this.cache) {
       const isFirstLoad = !url.searchParams.has("before_index");
@@ -8549,6 +8596,7 @@ var StreamerServer = class {
     });
   }
   async handleListSessions(url, res) {
+    if (this.rejectIfWarmingUp(res)) return;
     const now = Date.now();
     if (!this.discoveryCache || now - this.discoveryCache.fetchedAt >= DISCOVERY_TTL_MS) {
       try {
@@ -8581,6 +8629,7 @@ var StreamerServer = class {
     }
   }
   handleGetSession(sessionId, res) {
+    if (this.rejectIfWarmingUp(res)) return;
     const session = this.sessionStore.get(sessionId, this.ptyAttachedIds());
     if (session) {
       if (!existsSync10(session.projectPath)) {
@@ -9032,12 +9081,21 @@ var StreamerServer = class {
       json(res, 404, { error: "Discovered session not found" });
       return;
     }
-    const { projectPath, projectName, branch } = discSession;
+    const { branch } = discSession;
+    let { projectPath, projectName } = discSession;
     const convId = discSession.id;
     if (discSession.pid == null) {
       json(res, 400, { error: "Session has no known PID" });
       return;
     }
+    if (!projectPath) {
+      const jsonlPath = this.findJsonlPath(convId);
+      const jsonlCwd = jsonlPath ? await this.readCwdFromJsonl(jsonlPath) : null;
+      if (jsonlCwd) {
+        projectPath = jsonlCwd;
+        projectName = projectName || basename5(jsonlCwd);
+      }
+    }
     if (!projectPath) {
       this.log.warn("adopt: refusing, working directory unknown", {
         event: "adopt.no_project_path",
@@ -9050,6 +9108,22 @@ var StreamerServer = class {
       });
       return;
     }
+    const availability = classifyResumability(projectPath);
+    if (!availability.resumable) {
+      this.log.warn("adopt: refusing, project directory no longer exists", {
+        event: "adopt.project_path_missing",
+        sessionId,
+        pid: discSession.pid,
+        projectPath,
+        reason: availability.unavailable_reason
+      });
+      json(res, 400, {
+        error: "Cannot take over this session: its project directory no longer exists",
+        code: "ADOPT_PROJECT_PATH_MISSING",
+        reason: availability.unavailable_reason
+      });
+      return;
+    }
     this.ptyManager.killPid(discSession.pid);
     const exited = await waitForProcessExit(discSession.pid, ADOPT_KILL_TIMEOUT_MS);
     if (!exited) {