@threadbase-sh/streamer 1.42.0 → 1.43.0

package/dist/index.d.cts

@@ -1815,6 +1815,7 @@ declare class StreamerServer {
     private dbInstanceId;
     private disableDb;
     private skipStartupWarmup;
+    private autoResumeOnBoot;
     private browseRoot;
     private publicUrl;
     private browserCors;
@@ -1881,6 +1882,7 @@ declare class StreamerServer {
      * a full broadcast if no match exists (old clients, or no WS registered yet).
      */
     private broadcastOrUnicastSessionList;
+    private sessionListPayload;
     /**
      * Overlay boot-reconciliation verdicts onto session responses.
      *
@@ -1944,6 +1946,8 @@ declare class StreamerServer {
      * by id rather than duplicating it.
      */
     private rehydratePreviousSessions;
+    /** Resume only the recent sessions the user explicitly allowed us to start at boot. */
+    private autoResumePreviousSessions;
     /**
      * Pick a token guaranteed to appear in the spawned process's argv, for the
      * reconciler's pid-reuse guard.

package/dist/index.d.ts

@@ -1815,6 +1815,7 @@ declare class StreamerServer {
     private dbInstanceId;
     private disableDb;
     private skipStartupWarmup;
+    private autoResumeOnBoot;
     private browseRoot;
     private publicUrl;
     private browserCors;
@@ -1881,6 +1882,7 @@ declare class StreamerServer {
      * a full broadcast if no match exists (old clients, or no WS registered yet).
      */
     private broadcastOrUnicastSessionList;
+    private sessionListPayload;
     /**
      * Overlay boot-reconciliation verdicts onto session responses.
      *
@@ -1944,6 +1946,8 @@ declare class StreamerServer {
      * by id rather than duplicating it.
      */
     private rehydratePreviousSessions;
+    /** Resume only the recent sessions the user explicitly allowed us to start at boot. */
+    private autoResumePreviousSessions;
     /**
      * Pick a token guaranteed to appear in the spawned process's argv, for the
      * reconciler's pid-reuse guard.

package/dist/index.js

@@ -8781,6 +8781,34 @@ function paginate(results, offset, limit) {
   };
 }
 
+// src/services/sessions/autoResumeOnBoot.ts
+var AUTO_RESUME_WINDOW_MS = 15 * 60 * 1e3;
+var AUTO_RESUME_MAX = 5;
+var AUTO_RESUME_CONCURRENCY = 2;
+var AUTO_RESUME_STAGGER_MS = 500;
+function autoResumeSkipReason(row, opts) {
+  if (row.status_source !== "shutdown") return "not_shutdown";
+  if (row.status !== "running" && row.status !== "waiting_input") return "not_interrupted";
+  if (opts.now - row.status_updated_at > AUTO_RESUME_WINDOW_MS) return "too_old";
+  if (!opts.projectExists(row.project_path)) return "project_missing";
+  if (resumeIdForRow(row) == null) return "resume_identity_missing";
+  return null;
+}
+function planAutoResume(rows, opts) {
+  const eligible = [];
+  const skipped = [];
+  for (const row of rows) {
+    const reason = autoResumeSkipReason(row, opts);
+    if (reason) skipped.push({ row, reason });
+    else eligible.push(row);
+  }
+  return {
+    attempts: eligible.slice(0, AUTO_RESUME_MAX),
+    skipped,
+    overflow: eligible.slice(AUTO_RESUME_MAX)
+  };
+}
+
 // src/services/sessions/conversationBusy.ts
 import { statSync as statSync8 } from "fs";
 var RESUME_BUSY_WINDOW_MS = 12e4;
@@ -9622,6 +9650,7 @@ var StreamerServer = class {
   disableDb = false;
   // Skip the startup warm-up scan (test hook; see ServerConfig.skipStartupWarmup).
   skipStartupWarmup;
+  autoResumeOnBoot;
   browseRoot = null;
   publicUrl = null;
   browserCors;
@@ -9738,6 +9767,7 @@ var StreamerServer = class {
     this.verbose = config.verbose ?? false;
     this.disableDb = config.disableDb ?? false;
     this.skipStartupWarmup = config.skipStartupWarmup ?? false;
+    this.autoResumeOnBoot = config.autoResumeOnBoot ?? false;
     this.scannerPersistenceDisabled = config.scannerPersistent === false;
     this.scanProfiles = config.scanProfiles;
     this.codexRoots = config.codexRoots ?? [join18(homedir9(), ".codex", "sessions")];
@@ -10218,16 +10248,19 @@ var StreamerServer = class {
   broadcastOrUnicastSessionList(req) {
     const clientId = req.headers["x-client-id"];
     const ws = typeof clientId === "string" ? this.clientIdToWs.get(clientId) : void 0;
-    const payload = {
-      type: "session_list",
-      sessions: this.withReconciledLifecycle(this.sessionStore.list(this.ptyAttachedIds()))
-    };
+    const payload = this.sessionListPayload();
     if (ws) {
       this.wsHub.unicast(ws, payload);
     } else {
       this.wsHub.broadcast(payload);
     }
   }
+  sessionListPayload() {
+    return {
+      type: "session_list",
+      sessions: this.withReconciledLifecycle(this.sessionStore.list(this.ptyAttachedIds()))
+    };
+  }
   /**
    * Overlay boot-reconciliation verdicts onto session responses.
    *
@@ -10401,7 +10434,7 @@ var StreamerServer = class {
    * by id rather than duplicating it.
    */
   rehydratePreviousSessions(verdicts) {
-    if (!this.featureFlags.sessionRehydration || !this.managedSessionsRepo) return;
+    if (!this.managedSessionsRepo) return [];
     try {
       const now = Date.now();
       const rows = this.managedSessionsRepo.listRecoverable({
@@ -10410,7 +10443,7 @@ var StreamerServer = class {
       });
       const truncated = rows.length > REHYDRATE_MAX;
       const candidates = truncated ? rows.slice(0, REHYDRATE_MAX) : rows;
-      if (candidates.length === 0) return;
+      if (!this.featureFlags.sessionRehydration || candidates.length === 0) return candidates;
       const verdictById = new Map(verdicts.map((v) => [v.sessionId, v]));
       let rehydrated = 0;
       const skippedBy = {};
@@ -10445,12 +10478,107 @@ var StreamerServer = class {
         skippedBy,
         truncated
       });
+      return candidates;
     } catch (err) {
       this.log.warn("[rehydrate] failed to rehydrate previous sessions", {
         event: "sessions.rehydrate_failed",
         err
       });
+      return [];
+    }
+  }
+  /** Resume only the recent sessions the user explicitly allowed us to start at boot. */
+  async autoResumePreviousSessions(rows) {
+    if (!this.autoResumeOnBoot) return;
+    const plan = planAutoResume(rows, { now: Date.now(), projectExists: existsSync11 });
+    const skippedBy = {};
+    for (const { row, reason } of plan.skipped) {
+      skippedBy[reason] = (skippedBy[reason] ?? 0) + 1;
+      this.log.debug(`[auto-resume] skipped ${row.session_id}: ${reason}`, {
+        event: "sessions.auto_resume_skipped",
+        sessionId: row.session_id,
+        reason
+      });
     }
+    if (plan.skipped.length > 0) {
+      this.log.info(
+        `[auto-resume] left ${plan.skipped.length} ineligible session(s) for manual resume`,
+        {
+          event: "sessions.auto_resume_skipped",
+          skipped: plan.skipped.length,
+          skippedBy
+        }
+      );
+    }
+    for (const row of plan.overflow) {
+      this.log.info(`[auto-resume] left ${row.session_id} for manual resume: ceiling reached`, {
+        event: "sessions.auto_resume_skipped",
+        sessionId: row.session_id,
+        reason: "ceiling_reached"
+      });
+    }
+    let resumed = 0;
+    let failed = 0;
+    const inFlight = /* @__PURE__ */ new Set();
+    let started = 0;
+    const resume = async (row) => {
+      try {
+        const outcome = await this.resumeSession({
+          sessionId: row.session_id,
+          projectName: row.project_name,
+          branch: row.branch
+        });
+        if (!outcome.ok) {
+          failed++;
+          this.log.info(`[auto-resume] skipped ${row.session_id}: ${outcome.reason}`, {
+            event: "sessions.auto_resume_skipped",
+            sessionId: row.session_id,
+            reason: outcome.reason,
+            ...outcome.reason === "conversation_busy" && {
+              detectedBy: outcome.detectedBy,
+              lastActivityMs: outcome.lastActivityMs,
+              likelyOwner: outcome.likelyOwner
+            }
+          });
+          return;
+        }
+        resumed++;
+        this.log.info(`[auto-resume] resumed ${row.session_id}`, {
+          event: "sessions.auto_resume_succeeded",
+          sessionId: row.session_id,
+          alreadyRunning: outcome.alreadyRunning
+        });
+      } catch (err) {
+        failed++;
+        this.log.warn(`[auto-resume] failed to resume ${row.session_id}`, {
+          event: "sessions.auto_resume_failed",
+          sessionId: row.session_id,
+          err
+        });
+      }
+    };
+    for (const row of plan.attempts) {
+      while (inFlight.size >= AUTO_RESUME_CONCURRENCY) {
+        await Promise.race(inFlight);
+      }
+      if (started > 0) {
+        await new Promise((resolve2) => setTimeout(resolve2, AUTO_RESUME_STAGGER_MS));
+      }
+      const task = resume(row);
+      inFlight.add(task);
+      void task.then(() => inFlight.delete(task));
+      started++;
+    }
+    await Promise.all(inFlight);
+    if (resumed > 0) this.wsHub.broadcast(this.sessionListPayload());
+    this.log.info(`[auto-resume] completed boot recovery: ${resumed} resumed`, {
+      event: "sessions.auto_resume_completed",
+      attempted: plan.attempts.length,
+      resumed,
+      failed,
+      ineligible: plan.skipped.length,
+      overflow: plan.overflow.length
+    });
   }
   /**
    * Pick a token guaranteed to appear in the spawned process's argv, for the
@@ -10772,8 +10900,9 @@ var StreamerServer = class {
           );
           this.scannerPersistenceDisabled = true;
         }
-        void this.reconcilePreviousSessions().then((v) => {
-          this.rehydratePreviousSessions(v);
+        void this.reconcilePreviousSessions().then(async (v) => {
+          const recoverableRows = this.rehydratePreviousSessions(v);
+          await this.autoResumePreviousSessions(recoverableRows);
           this.pruneTerminalSessions();
         });
         if (this.skipStartupWarmup) {