@threadbase-sh/streamer 1.39.1 → 1.41.0

package/dist/index.js

@@ -448,6 +448,12 @@ var FEATURE_FLAGS = [
     description: "Send the built system prompt to fresh Codex sessions. Off by default: Codex has no --system-prompt flag, so the prompt goes in the positional [PROMPT] argument, which Codex treats as the user's opening turn rather than a system-level instruction.",
     default: false,
     env: "THREADBASE_FEATURE_CODEX_SYSTEM_PROMPT"
+  },
+  {
+    id: "sessionRehydration",
+    description: "Seed the session list at boot with sessions a previous streamer run left behind, so a restart leaves them one tap from resuming instead of silently gone. On by default, with a kill switch: it changes what GET /api/sessions contains.",
+    default: true,
+    env: "THREADBASE_FEATURE_SESSION_REHYDRATION"
   }
 ];
 function findFeatureFlag(id) {
@@ -1883,6 +1889,12 @@ function detectShellPrompt(lines) {
   return null;
 }
 
+// src/utils/deriveSessionName.ts
+function deriveSessionName(firstMessageText) {
+  const firstLine = firstMessageText.split("\n", 1)[0]?.trim() ?? "";
+  return firstLine.slice(0, 80);
+}
+
 // src/pty-manager.ts
 var OUTPUT_BUFFER_MAX2 = 65536;
 var INPUT_HISTORY_MAX2 = 50;
@@ -2356,6 +2368,10 @@ var PTYManager = class {
     if (session.inputHistory.length > INPUT_HISTORY_MAX2) {
       session.inputHistory.shift();
     }
+    if (session.firstMessageText === void 0) {
+      session.firstMessageText = text;
+      session.sessionName = deriveSessionName(text);
+    }
     this.onUserMessage?.(session.id, text, ts);
   }
   getSession(sessionId) {
@@ -2621,7 +2637,9 @@ function toPublicSession2(s) {
     ...s.lastActivityAt != null && { lastActivityAt: s.lastActivityAt },
     ...s.statusSource != null && { statusSource: s.statusSource },
     ...s.statusUpdatedAt != null && { statusUpdatedAt: s.statusUpdatedAt },
-    ...s.filePath != null && { filePath: s.filePath }
+    ...s.filePath != null && { filePath: s.filePath },
+    ...s.sessionName != null && { sessionName: s.sessionName },
+    ...s.firstMessageText != null && { firstMessageText: s.firstMessageText }
   };
 }
 function stripAnsi2(str) {
@@ -3017,7 +3035,7 @@ import { randomUUID as randomUUID5 } from "crypto";
 import { EventEmitter } from "events";
 import {
   createReadStream,
-  existsSync as existsSync10,
+  existsSync as existsSync11,
   watch as fsWatch,
   readdirSync as readdirSync6,
   readFileSync as readFileSync8,
@@ -3025,7 +3043,7 @@ import {
 } from "fs";
 import { realpath as realpath2 } from "fs/promises";
 import { createServer } from "http";
-import { homedir as homedir9, hostname as hostname2 } from "os";
+import { homedir as homedir9, hostname as hostname3 } from "os";
 import { basename as basename5, dirname as dirname9, join as join18 } from "path";
 import { createInterface } from "readline";
 
@@ -3285,7 +3303,7 @@ async function handleStartAgentSession(body, deps) {
 }
 
 // src/api/app.ts
-import { Hono as Hono16 } from "hono";
+import { Hono as Hono18 } from "hono";
 
 // src/db/repositories/devices.repository.ts
 import { createHash, randomBytes as randomBytes2, randomUUID as randomUUID3, timingSafeEqual as timingSafeEqual2 } from "crypto";
@@ -3605,12 +3623,222 @@ var errorMiddleware = (err, c) => {
   return c.json({ error: message }, 500);
 };
 
-// src/api/routes/browse.routes.ts
+// src/api/routes/backup.routes.ts
 import { Hono as Hono2 } from "hono";
+import { hostname } from "os";
+
+// src/services/backup/backup.ts
+var BACKUP_FORMAT_VERSION = 1;
+var BackupError = class extends Error {
+  constructor(message, code) {
+    super(message);
+    this.code = code;
+  }
+  code;
+};
+function validateArchive(input) {
+  if (!input || typeof input !== "object") {
+    throw new BackupError("Backup is not an object", "INVALID_ARCHIVE");
+  }
+  const archive = input;
+  const manifest = archive.manifest;
+  if (!manifest || typeof manifest !== "object") {
+    throw new BackupError("Backup is missing its manifest", "INVALID_ARCHIVE");
+  }
+  if (manifest.formatVersion !== BACKUP_FORMAT_VERSION) {
+    throw new BackupError(
+      `Unsupported backup format version ${String(manifest.formatVersion)}; this build reads version ${BACKUP_FORMAT_VERSION}`,
+      "UNSUPPORTED_VERSION"
+    );
+  }
+  if (!Array.isArray(archive.projects)) {
+    throw new BackupError("Backup is missing its projects array", "INVALID_ARCHIVE");
+  }
+  for (const [i, p] of archive.projects.entries()) {
+    if (!p || typeof p !== "object") {
+      throw new BackupError(`Project at index ${i} is not an object`, "INVALID_ARCHIVE");
+    }
+    if (typeof p.id !== "string" || p.id.length === 0) {
+      throw new BackupError(`Project at index ${i} has no id`, "INVALID_ARCHIVE");
+    }
+    if (typeof p.path !== "string" || p.path.length === 0) {
+      throw new BackupError(`Project at index ${i} has no path`, "INVALID_ARCHIVE");
+    }
+  }
+  const ids = new Set(archive.projects.map((p) => p.id));
+  if (ids.size !== archive.projects.length) {
+    throw new BackupError("Backup contains duplicate project ids", "INVALID_ARCHIVE");
+  }
+  return archive;
+}
+function remapPaths(projects, rules) {
+  const ordered = [...rules].sort((a, b) => b.from.length - a.from.length);
+  return projects.map((p) => {
+    const rule = ordered.find((r) => p.path === r.from || p.path.startsWith(`${r.from}/`));
+    if (!rule) return p;
+    return { ...p, path: `${rule.to}${p.path.slice(rule.from.length)}` };
+  });
+}
+function planRestore(incoming, existing) {
+  const byId = new Map(existing.map((e) => [e.id, e]));
+  const byPath = new Map(existing.map((e) => [e.path, e]));
+  const plan = { create: [], update: [], conflict: [] };
+  for (const p of incoming) {
+    const sameId = byId.get(p.id);
+    if (sameId) {
+      if (sameId.path !== p.path) plan.update.push(p);
+      continue;
+    }
+    const samePath = byPath.get(p.path);
+    if (samePath) {
+      plan.conflict.push({ incoming: p, existingId: samePath.id });
+      continue;
+    }
+    plan.create.push(p);
+  }
+  return plan;
+}
+
+// src/version.ts
+import { readFileSync as readFileSync4, realpathSync } from "fs";
+import { dirname as dirname5, join as join7 } from "path";
+var cached;
+function getVersion() {
+  if (cached !== void 0) return cached;
+  cached = resolveVersion();
+  return cached;
+}
+function resolveVersion() {
+  const scriptPath = process.argv[1] ?? "";
+  const here = scriptPath ? dirname5(scriptPath) : process.cwd();
+  let realHere = here;
+  try {
+    realHere = dirname5(realpathSync(scriptPath));
+  } catch {
+  }
+  const searchDirs = realHere === here ? [here, join7(here, "..")] : [here, join7(here, ".."), realHere, join7(realHere, "..")];
+  for (const dir of searchDirs) {
+    try {
+      const v = readFileSync4(join7(dir, "version.txt"), "utf8").trim();
+      if (v) return v;
+    } catch {
+    }
+  }
+  try {
+    const pkg = JSON.parse(readFileSync4(join7(here, "..", "package.json"), "utf8"));
+    if (pkg.version) return `${pkg.version}+source`;
+  } catch {
+  }
+  return "0.0.0+unknown";
+}
+
+// src/api/routes/backup.routes.ts
+function readBody(c) {
+  return new Promise((resolve2, reject) => {
+    const chunks = [];
+    c.env.incoming.on("data", (chunk) => chunks.push(chunk));
+    c.env.incoming.on("end", () => {
+      try {
+        const raw = Buffer.concat(chunks).toString("utf-8");
+        resolve2(raw ? JSON.parse(raw) : {});
+      } catch {
+        reject(new Error("Invalid JSON body"));
+      }
+    });
+    c.env.incoming.on("error", reject);
+  });
+}
+var createBackupRoutes = (deps) => {
+  const app = new Hono2();
+  app.get("/export", (c) => {
+    const repo = deps.projectsRepo();
+    if (!repo) {
+      return c.json({ error: "Project store is unavailable", code: "STORE_UNAVAILABLE" }, 503);
+    }
+    const projects = repo.listProjects().map((p) => ({
+      id: p.id,
+      path: p.path,
+      name: p.name ?? null,
+      createdAt: p.createdAt,
+      updatedAt: p.updatedAt
+    }));
+    return c.json({
+      manifest: {
+        formatVersion: BACKUP_FORMAT_VERSION,
+        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        streamerVersion: getVersion(),
+        sourceHost: hostname(),
+        // No endpoint here exports the API key. The flag is recorded so an
+        // archive is self-describing about its own sensitivity rather than
+        // requiring a reader to infer it.
+        includesSecrets: false,
+        counts: { projects: projects.length }
+      },
+      projects
+    });
+  });
+  app.post("/restore", async (c) => {
+    const repo = deps.projectsRepo();
+    if (!repo) {
+      return c.json({ error: "Project store is unavailable", code: "STORE_UNAVAILABLE" }, 503);
+    }
+    let body;
+    try {
+      body = await readBody(c);
+    } catch {
+      return c.json({ error: "Invalid JSON body", code: "INVALID_BODY" }, 400);
+    }
+    let archive;
+    try {
+      archive = validateArchive(body.archive);
+    } catch (err) {
+      if (err instanceof BackupError) {
+        return c.json({ error: err.message, code: err.code }, 400);
+      }
+      throw err;
+    }
+    const rules = Array.isArray(body.pathMap) ? body.pathMap.filter((r) => typeof r?.from === "string" && typeof r?.to === "string").map((r) => ({ from: r.from, to: r.to })) : [];
+    const incoming = rules.length > 0 ? remapPaths(archive.projects, rules) : archive.projects;
+    const existing = repo.listProjects().map((p) => ({ id: p.id, path: p.path }));
+    const plan = planRestore(incoming, existing);
+    const summary = {
+      create: plan.create.length,
+      update: plan.update.length,
+      conflict: plan.conflict.length
+    };
+    if (body.apply !== true) {
+      return c.json({ applied: false, summary, plan });
+    }
+    if (plan.conflict.length > 0) {
+      return c.json(
+        {
+          error: "Restore has unresolved conflicts",
+          code: "RESTORE_CONFLICT",
+          summary,
+          plan
+        },
+        409
+      );
+    }
+    let applied = 0;
+    for (const p of [...plan.create, ...plan.update]) {
+      try {
+        repo.upsertProjectByPath(p.path, { name: p.name });
+        applied++;
+      } catch {
+      }
+    }
+    return c.json({ applied: true, summary, appliedCount: applied });
+  });
+  return app;
+};
+
+// src/api/routes/browse.routes.ts
+import { Hono as Hono3 } from "hono";
 var ALREADY_HANDLED = 597;
 var alreadyHandled = () => new Response(null, { status: ALREADY_HANDLED });
 var createBrowseRoutes = (deps) => {
-  const app = new Hono2();
+  const app = new Hono3();
   app.get("/browse", async (c) => {
     const url = new URL(c.req.url);
     await deps.handleBrowse(url, c.env.outgoing);
@@ -3624,7 +3852,7 @@ var createBrowseRoutes = (deps) => {
 };
 
 // src/api/routes/cacheAlert.routes.ts
-import { Hono as Hono3 } from "hono";
+import { Hono as Hono4 } from "hono";
 
 // src/schemas/cacheAlert.schema.ts
 import { z } from "zod";
@@ -3647,7 +3875,7 @@ function readRawBody2(req) {
   });
 }
 var createCacheAlertRoutes = (deps) => {
-  const app = new Hono3();
+  const app = new Hono4();
   app.get("/", (c) => {
     const monitor = deps.cacheMonitor();
     return c.json({ pending: monitor?.pending ?? null });
@@ -3684,7 +3912,7 @@ var createCacheAlertRoutes = (deps) => {
 };
 
 // src/api/routes/config.routes.ts
-import { Hono as Hono4 } from "hono";
+import { Hono as Hono5 } from "hono";
 
 // src/schemas/claudeFlags.schema.ts
 import { z as z2 } from "zod";
@@ -3705,7 +3933,7 @@ function readRawBody3(req) {
   });
 }
 var createConfigRoutes = (deps) => {
-  const app = new Hono4();
+  const app = new Hono5();
   app.get("/claude-flags", (c) => c.json(deps.claudeFlagsConfig()));
   app.get("/feature-flags", (c) => c.json(deps.featureFlagsConfig()));
   app.put("/claude-flags", async (c) => {
@@ -3740,11 +3968,11 @@ var createConfigRoutes = (deps) => {
 };
 
 // src/api/routes/conversations.routes.ts
-import { Hono as Hono5 } from "hono";
+import { Hono as Hono6 } from "hono";
 var ALREADY_HANDLED2 = 597;
 var alreadyHandled2 = () => new Response(null, { status: ALREADY_HANDLED2 });
 var createConversationRoutes = (deps) => {
-  const app = new Hono5();
+  const app = new Hono6();
   app.get("/count", async (c) => {
     const url = new URL(c.req.url);
     await deps.handleConversationsCount(url, c.env.outgoing);
@@ -3771,9 +3999,9 @@ var createConversationRoutes = (deps) => {
 };
 
 // src/api/routes/devices.routes.ts
-import { Hono as Hono6 } from "hono";
+import { Hono as Hono7 } from "hono";
 var createDeviceRoutes = (deps) => {
-  const app = new Hono6();
+  const app = new Hono7();
   app.get("/", (c) => {
     const repo = deps.devicesRepo();
     if (!repo) return c.json({ devices: [], available: false });
@@ -3796,45 +4024,134 @@ var createDeviceRoutes = (deps) => {
   return app;
 };
 
-// src/api/routes/health.routes.ts
-import { Hono as Hono7 } from "hono";
+// src/api/routes/diagnostics.routes.ts
+import { existsSync as existsSync5 } from "fs";
+import { Hono as Hono8 } from "hono";
 
-// src/version.ts
-import { readFileSync as readFileSync4, realpathSync } from "fs";
-import { dirname as dirname5, join as join7 } from "path";
-var cached;
-function getVersion() {
-  if (cached !== void 0) return cached;
-  cached = resolveVersion();
-  return cached;
+// src/services/diagnostics/diagnostics.ts
+var DIAGNOSTICS_CONTRACT_VERSION = 1;
+function redactPath(path) {
+  if (!path) return null;
+  const parts = path.split(/[/\\]/).filter(Boolean);
+  if (parts.length <= 2) return parts.join("/");
+  return `\u2026/${parts.slice(-2).join("/")}`;
+}
+function worstStatus(checks) {
+  const rank = { ok: 0, unknown: 1, degraded: 2, failed: 3 };
+  return checks.reduce(
+    (worst, c) => rank[c.status] > rank[worst] ? c.status : worst,
+    "ok"
+  );
 }
-function resolveVersion() {
-  const scriptPath = process.argv[1] ?? "";
-  const here = scriptPath ? dirname5(scriptPath) : process.cwd();
-  let realHere = here;
-  try {
-    realHere = dirname5(realpathSync(scriptPath));
-  } catch {
+function buildReport(checks, now = /* @__PURE__ */ new Date()) {
+  return {
+    contractVersion: DIAGNOSTICS_CONTRACT_VERSION,
+    generatedAt: now.toISOString(),
+    overall: worstStatus(checks),
+    checks
+  };
+}
+var SECRET_KEY_RE = /(key|token|secret|password|passwd|credential|authorization|cookie)/i;
+function redactValue(value) {
+  if (Array.isArray(value)) {
+    return value.map((v) => redactValue(v));
   }
-  const searchDirs = realHere === here ? [here, join7(here, "..")] : [here, join7(here, ".."), realHere, join7(realHere, "..")];
-  for (const dir of searchDirs) {
-    try {
-      const v = readFileSync4(join7(dir, "version.txt"), "utf8").trim();
-      if (v) return v;
-    } catch {
+  if (value && typeof value === "object") {
+    const out = {};
+    for (const [k, v] of Object.entries(value)) {
+      out[k] = SECRET_KEY_RE.test(k) ? "[redacted]" : redactValue(v);
     }
+    return out;
   }
+  return value;
+}
+
+// src/api/routes/diagnostics.routes.ts
+function providerCheck(name, resolve2) {
   try {
-    const pkg = JSON.parse(readFileSync4(join7(here, "..", "package.json"), "utf8"));
-    if (pkg.version) return `${pkg.version}+source`;
+    const exe = resolve2();
+    return {
+      id: `provider:${name}`,
+      status: "ok",
+      summary: `${name} CLI is installed.`,
+      remediation: "NONE",
+      detail: { location: redactPath(exe) }
+    };
   } catch {
+    return {
+      id: `provider:${name}`,
+      status: "failed",
+      summary: `${name} CLI could not be located. Sessions for this provider cannot start.`,
+      remediation: "PROVIDER_NOT_INSTALLED"
+    };
   }
-  return "0.0.0+unknown";
 }
+var createDiagnosticsRoutes = (deps) => {
+  const app = new Hono8();
+  app.get("/", (c) => {
+    const checks = [];
+    checks.push({
+      id: "streamer",
+      status: "ok",
+      summary: "Streamer is running.",
+      remediation: "NONE",
+      detail: { version: getVersion(), uptimeSeconds: Math.floor(process.uptime()) }
+    });
+    checks.push(providerCheck("claude-code", resolveClaudeExe));
+    checks.push(providerCheck("codex-cli", resolveCodexExe));
+    const cacheAlert = deps.cacheMonitor()?.healthzField();
+    checks.push(
+      cacheAlert ? {
+        id: "cache",
+        status: "degraded",
+        summary: "Conversation cache reported an integrity alert.",
+        remediation: "CACHE_DEGRADED"
+      } : {
+        id: "cache",
+        status: "ok",
+        summary: "Conversation cache is healthy.",
+        remediation: "NONE"
+      }
+    );
+    let ptyOk = true;
+    try {
+      __require.resolve("node-pty");
+    } catch {
+      ptyOk = false;
+    }
+    checks.push(
+      ptyOk ? { id: "pty", status: "ok", summary: "PTY subsystem is available.", remediation: "NONE" } : {
+        id: "pty",
+        status: "failed",
+        summary: "node-pty failed to load, so no managed session can start.",
+        remediation: "PTY_UNAVAILABLE"
+      }
+    );
+    const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
+    const claudeProjects = home ? `${home}/.claude/projects` : "";
+    checks.push(
+      claudeProjects && existsSync5(claudeProjects) ? {
+        id: "filesystem",
+        status: "ok",
+        summary: "Provider history directory is present.",
+        remediation: "NONE",
+        detail: { location: redactPath(claudeProjects) }
+      } : {
+        id: "filesystem",
+        status: "degraded",
+        summary: "Provider history directory was not found; history may be unavailable.",
+        remediation: "FS_SCOPE_MISSING"
+      }
+    );
+    return c.json(redactValue(buildReport(checks)));
+  });
+  return app;
+};
 
 // src/api/routes/health.routes.ts
+import { Hono as Hono9 } from "hono";
 var createHealthRoutes = (deps) => {
-  const app = new Hono7();
+  const app = new Hono9();
   app.get("/", (c) => {
     const cacheAlert = deps.cacheMonitor()?.healthzField();
     return c.json({ ok: true, version: getVersion(), ...cacheAlert ? { cacheAlert } : {} });
@@ -3843,9 +4160,9 @@ var createHealthRoutes = (deps) => {
 };
 
 // src/api/routes/logs.routes.ts
-import { closeSync, existsSync as existsSync5, fstatSync, openSync, readSync, statSync } from "fs";
+import { closeSync, existsSync as existsSync6, fstatSync, openSync, readSync, statSync } from "fs";
 import { join as join9 } from "path";
-import { Hono as Hono8 } from "hono";
+import { Hono as Hono10 } from "hono";
 
 // src/lifecycle/constants.ts
 import { homedir as homedir4 } from "os";
@@ -3863,12 +4180,12 @@ function resolveLogPath(source) {
 function pickDefaultSource() {
   for (const source of ["stdout", "stderr", "dev"]) {
     const p = resolveLogPath(source);
-    if (existsSync5(p) && statSync(p).size > 0) return source;
+    if (existsSync6(p) && statSync(p).size > 0) return source;
   }
   return "stdout";
 }
 function readLogLines(filePath, sinceOffset, limit) {
-  if (!existsSync5(filePath)) {
+  if (!existsSync6(filePath)) {
     return { lines: [], offset: 0, total: 0 };
   }
   const fd = openSync(filePath, "r");
@@ -3903,7 +4220,7 @@ function readLogLines(filePath, sinceOffset, limit) {
   }
 }
 function createLogsRoutes() {
-  const app = new Hono8();
+  const app = new Hono10();
   app.get("/", (c) => {
     try {
       const sourceParam = (c.req.query("source") || "").toLowerCase();
@@ -3911,7 +4228,7 @@ function createLogsRoutes() {
       const logPath = resolveLogPath(source);
       const sinceOffset = parseInt(c.req.query("since") || "0", 10);
       const limit = Math.min(parseInt(c.req.query("limit") || "100", 10) || 100, 1e3);
-      if (!existsSync5(logPath)) {
+      if (!existsSync6(logPath)) {
         return c.json({
           logs: [],
           message: `No log file found for source=${source}`,
@@ -3948,7 +4265,7 @@ function createLogsRoutes() {
     try {
       const sources = ["stdout", "stderr", "dev"].map((source) => {
         const logPath = resolveLogPath(source);
-        if (!existsSync5(logPath)) {
+        if (!existsSync6(logPath)) {
           return { source, exists: false, total: 0, fileSize: 0 };
         }
         const stats = statSync(logPath);
@@ -3974,8 +4291,8 @@ function createLogsRoutes() {
 // src/api/routes/misc.routes.ts
 import { spawn } from "child_process";
 import { createHmac, timingSafeEqual as timingSafeEqual3 } from "crypto";
-import { Hono as Hono9 } from "hono";
-import { hostname } from "os";
+import { Hono as Hono11 } from "hono";
+import { hostname as hostname2 } from "os";
 
 // src/config/update-config.ts
 import { readFileSync as readFileSync5 } from "fs";
@@ -4305,12 +4622,12 @@ function verifyWebhookSignature(body, header, secret) {
 }
 var clientLog = getLogger("client");
 var createMiscRoutes = (deps) => {
-  const app = new Hono9();
+  const app = new Hono11();
   app.get("/api/info", (c) => {
     const ptyIds = deps.ptyAttachedIds();
     return c.json({
       version: getVersion(),
-      machineName: hostname(),
+      machineName: hostname2(),
       platform: process.platform,
       activeSessions: deps.sessionStore.list(ptyIds).filter((s) => s.status === "running").length,
       publicUrl: deps.publicUrl,
@@ -4436,11 +4753,11 @@ var createMiscRoutes = (deps) => {
 };
 
 // src/api/routes/pair.routes.ts
-import { Hono as Hono10 } from "hono";
+import { Hono as Hono12 } from "hono";
 var ALREADY_HANDLED3 = 597;
 var alreadyHandled3 = () => new Response(null, { status: ALREADY_HANDLED3 });
 var createPairRoutes = (deps) => {
-  const app = new Hono10();
+  const app = new Hono12();
   app.post("/start", (c) => {
     deps.handlePairStart(c.env.outgoing);
     return alreadyHandled3();
@@ -4453,11 +4770,11 @@ var createPairRoutes = (deps) => {
 };
 
 // src/api/routes/projects.routes.ts
-import { Hono as Hono11 } from "hono";
+import { Hono as Hono13 } from "hono";
 var ALREADY_HANDLED4 = 597;
 var alreadyHandled4 = () => new Response(null, { status: ALREADY_HANDLED4 });
 var createProjectRoutes = (deps) => {
-  const app = new Hono11();
+  const app = new Hono13();
   app.get("/", (c) => {
     const url = new URL(c.req.url);
     deps.handleListProjects(url, c.env.outgoing);
@@ -4472,7 +4789,7 @@ var createProjectRoutes = (deps) => {
 };
 
 // src/api/routes/providers.routes.ts
-import { Hono as Hono12 } from "hono";
+import { Hono as Hono14 } from "hono";
 
 // src/services/providers/providerHealth.ts
 import { execFile as execFile2 } from "child_process";
@@ -4595,7 +4912,7 @@ async function providerHealth(name, resolveExe, detect = runVersion) {
 
 // src/api/routes/providers.routes.ts
 var createProviderRoutes = () => {
-  const app = new Hono12();
+  const app = new Hono14();
   app.get("/", async (c) => {
     const providers = await Promise.all([
       providerHealth(CLAUDE_CODE_PROVIDER, resolveClaudeExe),
@@ -4607,11 +4924,11 @@ var createProviderRoutes = () => {
 };
 
 // src/api/routes/scanner.routes.ts
-import { Hono as Hono13 } from "hono";
+import { Hono as Hono15 } from "hono";
 var ALREADY_HANDLED5 = 597;
 var alreadyHandled5 = () => new Response(null, { status: ALREADY_HANDLED5 });
 var createScannerRoutes = (deps) => {
-  const app = new Hono13();
+  const app = new Hono15();
   app.get("/api/search", async (c) => {
     const url = new URL(c.req.url);
     await deps.handleSearch(url, c.env.outgoing);
@@ -4621,11 +4938,11 @@ var createScannerRoutes = (deps) => {
 };
 
 // src/api/routes/sessions.routes.ts
-import { Hono as Hono14 } from "hono";
+import { Hono as Hono16 } from "hono";
 var ALREADY_HANDLED6 = 597;
 var alreadyHandled6 = () => new Response(null, { status: ALREADY_HANDLED6 });
 var createSessionRoutes = (deps) => {
-  const app = new Hono14();
+  const app = new Hono16();
   app.get("/count", (c) => {
     deps.handleSessionsCount(c.env.outgoing);
     return alreadyHandled6();
@@ -4700,9 +5017,9 @@ var createSessionRoutes = (deps) => {
 };
 
 // src/api/routes/ws.routes.ts
-import { Hono as Hono15 } from "hono";
+import { Hono as Hono17 } from "hono";
 var createWsRoutes = (deps, upgradeWebSocket) => {
-  const app = new Hono15();
+  const app = new Hono17();
   app.get(
     "/ws",
     upgradeWebSocket(() => {
@@ -4728,7 +5045,7 @@ var createWsRoutes = (deps, upgradeWebSocket) => {
 
 // src/api/app.ts
 var createHonoApp = (deps, upgradeWebSocket) => {
-  const app = new Hono16();
+  const app = new Hono18();
   const httpLog = getLogger("http");
   app.use("*", async (c, next) => {
     const start = Date.now();
@@ -4749,6 +5066,7 @@ var createHonoApp = (deps, upgradeWebSocket) => {
   app.use("*", authMiddleware(deps));
   app.onError(errorMiddleware);
   app.route("/healthz", createHealthRoutes(deps));
+  app.route("/api/diagnostics", createDiagnosticsRoutes(deps));
   app.route("/", createMiscRoutes(deps));
   app.route("/api/sessions", createSessionRoutes(deps));
   app.route("/api/conversations", createConversationRoutes(deps));
@@ -4757,6 +5075,7 @@ var createHonoApp = (deps, upgradeWebSocket) => {
   app.route("/api/projects", createProjectRoutes(deps));
   app.route("/api/providers", createProviderRoutes());
   app.route("/api/devices", createDeviceRoutes(deps));
+  app.route("/api/backup", createBackupRoutes(deps));
   app.route("/api/pair", createPairRoutes(deps));
   app.route("/api", createBrowseRoutes(deps));
   app.route("/", createScannerRoutes(deps));
@@ -4825,7 +5144,7 @@ import {
   parseJsonlLine
 } from "@threadbase-sh/scanner";
 import Database from "better-sqlite3";
-import { closeSync as closeSync3, existsSync as existsSync6, mkdirSync as mkdirSync3, openSync as openSync3, readSync as readSync3, statSync as statSync3 } from "fs";
+import { closeSync as closeSync3, existsSync as existsSync7, mkdirSync as mkdirSync3, openSync as openSync3, readSync as readSync3, statSync as statSync3 } from "fs";
 import { open as openAsync } from "fs/promises";
 import { dirname as dirname7 } from "path";
 import { setImmediate as yieldToEventLoop } from "timers/promises";
@@ -4840,6 +5159,9 @@ function getMigrationsDir2() {
   }
   return __dirname;
 }
+function resolveMigrationsDir(name = "migrations") {
+  return join12(getMigrationsDir2(), name);
+}
 var SCHEMA_MIGRATIONS_SQL = `
 CREATE TABLE IF NOT EXISTS schema_migrations (
   id TEXT PRIMARY KEY,
@@ -4848,7 +5170,7 @@ CREATE TABLE IF NOT EXISTS schema_migrations (
 `;
 function runSqliteMigrations(db, migrationsDir) {
   db.exec(SCHEMA_MIGRATIONS_SQL);
-  const dir = migrationsDir ?? join12(getMigrationsDir2(), "migrations");
+  const dir = migrationsDir ?? resolveMigrationsDir();
   const files = readdirSync2(dir).filter((f) => f.endsWith(".sql")).sort();
   const appliedRows = db.prepare("SELECT id FROM schema_migrations").all();
   const appliedSet = new Set(appliedRows.map((r) => r.id));
@@ -6057,7 +6379,7 @@ var ConversationCache = class _ConversationCache {
    * `handleGetConversation` can still serve the cached tail even when the
    * JSONL has been deleted.
    */
-  pruneGhostFiles(exists = existsSync6) {
+  pruneGhostFiles(exists = existsSync7) {
     const rows = this.stmts.allFilePaths.all();
     const ghosts = [];
     const prune = this.db.transaction((ids) => {
@@ -6112,7 +6434,7 @@ var ConversationCache = class _ConversationCache {
    * Returns the removed IDs.
    */
   reconcileDeletions(livePaths, opts) {
-    const exists = opts?.exists ?? existsSync6;
+    const exists = opts?.exists ?? existsSync7;
     const rows = this.stmts.allFilePaths.all();
     const removed = [];
     const drop = this.db.transaction((ids) => {
@@ -6147,7 +6469,7 @@ var ConversationCache = class _ConversationCache {
    * reports drift for the CacheIntegrityMonitor to classify. `tailed` flags
    * rows that still have cached history (which pruneGhostFiles would keep).
    */
-  listMissingFiles(exists = existsSync6) {
+  listMissingFiles(exists = existsSync7) {
     const rows = this.stmts.allFilePathsWithTitle.all();
     const missing = [];
     for (const row of rows) {
@@ -6259,6 +6581,7 @@ var ManagedSessionsRepository = class {
   updateStatusStmt;
   getStmt;
   listNonTerminalStmt;
+  listRecoverableStmt;
   deleteStmt;
   constructor(db) {
     this.upsertStmt = db.prepare(`
@@ -6311,6 +6634,13 @@ var ManagedSessionsRepository = class {
        WHERE completed_at IS NULL
        ORDER BY started_at ASC
     `);
+    this.listRecoverableStmt = db.prepare(`
+      SELECT * FROM managed_sessions
+       WHERE (completed_at IS NULL OR status_source = 'shutdown')
+         AND status_updated_at >= @since
+       ORDER BY status_updated_at DESC
+       LIMIT @limit
+    `);
     this.deleteStmt = db.prepare("DELETE FROM managed_sessions WHERE session_id = ?");
   }
   /** Record a session at spawn, or refresh every field of an existing row. */
@@ -6362,6 +6692,14 @@ var ManagedSessionsRepository = class {
   listNonTerminal() {
     return this.listNonTerminalStmt.all();
   }
+  /**
+   * Rows a restart could bring back: still open, or closed by our own shutdown,
+   * and touched no longer ago than `sinceMs`. Newest first, capped — the caller
+   * decides which of these actually deserve rehydrating (`shouldRehydrate`).
+   */
+  listRecoverable({ sinceMs, limit }) {
+    return this.listRecoverableStmt.all({ since: sinceMs, limit });
+  }
   delete(sessionId) {
     this.deleteStmt.run(sessionId);
   }
@@ -6497,6 +6835,54 @@ var SessionsRepository = class {
   }
 };
 
+// src/db/runtime-store.ts
+import Database2 from "better-sqlite3";
+var RuntimeStore = class _RuntimeStore {
+  constructor(db) {
+    this.db = db;
+  }
+  db;
+  static open(dbPath, migrationsDir) {
+    const db = new Database2(dbPath);
+    db.pragma("journal_mode = WAL");
+    runSqliteMigrations(db, migrationsDir ?? resolveMigrationsDir("runtime-migrations"));
+    return new _RuntimeStore(db);
+  }
+  getDatabase() {
+    return this.db;
+  }
+  /**
+   * One-time move of `managed_sessions` rows out of a pre-split `cache.db`.
+   *
+   * Non-destructive by design: the source table is left in place so an older
+   * streamer rolled back onto the same machine still finds its registry. Runs
+   * only when this file's table is empty, so a second boot is a no-op rather
+   * than a re-copy that would resurrect rows deleted since.
+   *
+   * Returns the number of rows copied.
+   */
+  importLegacyManagedSessions(source) {
+    const existing = this.db.prepare("SELECT COUNT(*) AS n FROM managed_sessions").get();
+    if (existing.n > 0) return 0;
+    const hasTable = source.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'managed_sessions'").get();
+    if (!hasTable) return 0;
+    const rows = source.prepare("SELECT * FROM managed_sessions").all();
+    if (rows.length === 0) return 0;
+    const columns = Object.keys(rows[0]);
+    const insert = this.db.prepare(
+      `INSERT OR IGNORE INTO managed_sessions (${columns.join(", ")})
+       VALUES (${columns.map((c) => `@${c}`).join(", ")})`
+    );
+    this.db.transaction((batch) => {
+      for (const row of batch) insert.run(row);
+    })(rows);
+    return rows.length;
+  }
+  close() {
+    this.db.close();
+  }
+};
+
 // src/db/upload-records.ts
 async function recordUpload(pool2, instanceId, row) {
   if (!pool2) return;
@@ -6648,7 +7034,7 @@ function setCacheMetadata(repo, key, value) {
 
 // src/services/cache-integrity/cacheIntegrityMonitor.ts
 import { createHash as createHash3 } from "crypto";
-import { existsSync as existsSync8 } from "fs";
+import { existsSync as existsSync9 } from "fs";
 
 // src/services/cache-integrity/alertStore.ts
 import { mkdirSync as mkdirSync4, readFileSync as readFileSync7, writeFileSync as writeFileSync3 } from "fs";
@@ -6674,7 +7060,7 @@ function saveAlertState(state) {
 }
 
 // src/services/cache-integrity/backup.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync5, readdirSync as readdirSync4, statSync as statSync5, unlinkSync } from "fs";
+import { existsSync as existsSync8, mkdirSync as mkdirSync5, readdirSync as readdirSync4, statSync as statSync5, unlinkSync } from "fs";
 import { join as join15 } from "path";
 var DEFAULT_RETAIN = 3;
 function retainCount() {
@@ -6696,7 +7082,7 @@ async function backupCacheDb(db, cacheDir) {
     return { full, mtime: statSync5(full).mtimeMs };
   }).sort((a, b) => b.mtime - a.mtime);
   for (const stale of backups.slice(retain)) {
-    if (existsSync7(stale.full)) unlinkSync(stale.full);
+    if (existsSync8(stale.full)) unlinkSync(stale.full);
   }
   return destPath;
 }
@@ -6793,7 +7179,7 @@ var CacheIntegrityMonitor = class {
    * the pending record, back up on high severity, and broadcast the alert.
    */
   async runDetection(detectedAt = (/* @__PURE__ */ new Date()).toISOString()) {
-    const all = this.cache.listMissingFiles(existsSync8);
+    const all = this.cache.listMissingFiles(existsSync9);
     const missing = all.filter((m) => !this.ignoredIds.has(m.id));
     if (missing.length === 0) {
       if (this._pending) {
@@ -6897,7 +7283,7 @@ var CacheIntegrityMonitor = class {
       case "prune_all": {
         await this.ensureBackup(pending);
         const backupPath = pending.backupPath;
-        const stillMissing = pending.missing.filter((m) => !existsSync8(m.filePath)).map((m) => m.id);
+        const stillMissing = pending.missing.filter((m) => !existsSync9(m.filePath)).map((m) => m.id);
         const pruned = this.cache.dropRowsById(stillMissing);
         this.applyDeferredUnlinks();
         this.clearPending();
@@ -7167,14 +7553,14 @@ function findSearchTarget(messages, query) {
 }
 
 // src/services/conversations/pruneAgentConversations.ts
-import { existsSync as existsSync9 } from "fs";
+import { existsSync as existsSync10 } from "fs";
 function pruneAgentConversations(cache) {
   const db = cache.getDatabase();
   const rows = db.prepare("SELECT id, file_path FROM conversation_meta").all();
   let pruned = 0;
   let missing = 0;
   for (const row of rows) {
-    if (!existsSync9(row.file_path)) {
+    if (!existsSync10(row.file_path)) {
       missing += 1;
       continue;
     }
@@ -7514,7 +7900,8 @@ function contentStateForSession(args) {
     status,
     startedAt: args.startedAtOverride ?? args.session.startedAt.getTime(),
     lastOutput: truncateLastOutput(args.session.lastOutput ?? ""),
-    ...args.serverLabel != null && { serverLabel: args.serverLabel }
+    ...args.serverLabel != null && { serverLabel: args.serverLabel },
+    ...args.session.sessionName != null && { sessionName: args.session.sessionName }
   };
 }
 var LiveActivityNotifier = class {
@@ -7527,14 +7914,17 @@ var LiveActivityNotifier = class {
   serverId;
   serverLabel;
   /**
-   * Last status pushed per session.
+   * Sessions with a currently open (pushed) activity.
    *
-   * Live Activity pushes are rate-limited by iOS and the surface only renders
-   * `running` vs `waiting_input`, so re-pushing an unchanged status is pure
-   * budget spend for no visible change. This is what makes the notifier
-   * edge-triggered rather than level-triggered.
+   * An activity opens on a `waiting_input → running` edge (the user sent a
+   * prompt) and closes on the matching `running → waiting_input` edge (the
+   * response, including any sub-agents, finished) — so this set is what makes
+   * the notifier per-turn rather than per-session. A session's very first
+   * `running` (right after spawn, before any user prompt) has no prior
+   * `waiting_input` and therefore no edge, so it never opens an activity —
+   * this is what keeps a fresh/idle session from pushing anything.
    */
-  lastPushed = /* @__PURE__ */ new Map();
+  openActivity = /* @__PURE__ */ new Map();
   /**
    * React to a session status change.
    *
@@ -7542,34 +7932,22 @@ var LiveActivityNotifier = class {
    * transition, so this returns a promise the caller may ignore and every error
    * is logged rather than propagated.
    */
-  async onStatusChange(session) {
+  async onStatusChange(session, previousStatus) {
     const status = toLiveActivityStatus(session.status);
     try {
       if (!status) {
-        await this.endFor(session);
+        if (this.openActivity.has(session.id)) await this.endFor(session);
         return;
       }
-      if (this.lastPushed.get(session.id) === status) return;
-      const contentState = contentStateForSession({
-        session,
-        serverId: this.serverId,
-        serverLabel: this.serverLabel
-      });
-      if (!contentState) return;
-      const outcome = await this.sender.send({
-        sessionId: session.id,
-        event: "update",
-        contentState
-      });
-      this.lastPushed.set(session.id, status);
-      if (outcome.attempted > 0) {
-        log4.info("live_activity.updated", {
-          event: "live_activity.updated",
-          sessionId: session.id,
-          status,
-          ...outcome
-        });
+      if (status === "running" && previousStatus === "waiting_input") {
+        await this.startTurn(session);
+        return;
       }
+      if (status === "waiting_input" && previousStatus === "running") {
+        if (this.openActivity.has(session.id)) await this.endFor(session);
+        return;
+      }
+      await this.maybeSendName(session);
     } catch (err) {
       log4.error("live_activity.notify_failed", {
         event: "live_activity.notify_failed",
@@ -7579,14 +7957,57 @@ var LiveActivityNotifier = class {
       });
     }
   }
+  async startTurn(session) {
+    const contentState = contentStateForSession({
+      session,
+      serverId: this.serverId,
+      serverLabel: this.serverLabel
+    });
+    if (!contentState) return;
+    const outcome = await this.sender.send({
+      sessionId: session.id,
+      event: "update",
+      contentState
+    });
+    this.openActivity.set(session.id, { sessionNameSent: session.sessionName != null });
+    if (outcome.attempted > 0) {
+      log4.info("live_activity.updated", {
+        event: "live_activity.updated",
+        sessionId: session.id,
+        status: contentState.status,
+        ...outcome
+      });
+    }
+  }
+  async maybeSendName(session) {
+    const open2 = this.openActivity.get(session.id);
+    if (!open2 || open2.sessionNameSent || session.sessionName == null) return;
+    const contentState = contentStateForSession({
+      session,
+      serverId: this.serverId,
+      serverLabel: this.serverLabel
+    });
+    if (!contentState) return;
+    const outcome = await this.sender.send({
+      sessionId: session.id,
+      event: "update",
+      contentState
+    });
+    open2.sessionNameSent = true;
+    if (outcome.attempted > 0) {
+      log4.info("live_activity.updated", {
+        event: "live_activity.updated",
+        sessionId: session.id,
+        status: contentState.status,
+        ...outcome
+      });
+    }
+  }
   async endFor(session) {
-    const lastStatus = this.lastPushed.get(session.id);
-    this.lastPushed.delete(session.id);
+    this.openActivity.delete(session.id);
+    const status = toLiveActivityStatus(session.status);
     const contentState = contentStateForSession({
-      session: {
-        ...session,
-        status: lastStatus === "waiting_input" ? "waiting_input" : "running"
-      },
+      session: { ...session, status: status ?? "waiting_input" },
       serverId: this.serverId,
       serverLabel: this.serverLabel
     });
@@ -7600,9 +8021,9 @@ var LiveActivityNotifier = class {
       });
     }
   }
-  /** Drop cached state for a session, so a resume re-pushes its first status. */
+  /** Drop cached state for a session, so a resume re-opens on its next turn. */
   forget(sessionId) {
-    this.lastPushed.delete(sessionId);
+    this.openActivity.delete(sessionId);
   }
 };
 
@@ -7833,7 +8254,8 @@ var LiveActivityRenewalScheduler = class {
       status,
       startedAt,
       lastOutput: session.lastOutput ?? "",
-      ...this.deps.serverLabel != null && { serverLabel: this.deps.serverLabel }
+      ...this.deps.serverLabel != null && { serverLabel: this.deps.serverLabel },
+      ...session.sessionName != null && { sessionName: session.sessionName }
     };
     try {
       await this.deps.sender.send({
@@ -7893,7 +8315,8 @@ var LiveActivityRenewalScheduler = class {
         // Carried through unchanged — the whole point of the renewal.
         startedAt: args.startedAt,
         lastOutput: truncateLastOutput(session.lastOutput ?? ""),
-        ...this.deps.serverLabel != null && { serverLabel: this.deps.serverLabel }
+        ...this.deps.serverLabel != null && { serverLabel: this.deps.serverLabel },
+        ...session.sessionName != null && { sessionName: session.sessionName }
       },
       now: args.now,
       staleDate: args.startedAt + ACTIVITY_MAX_LIFETIME_MS
@@ -8051,6 +8474,88 @@ function resolveAnswer(pending, body) {
   }
 }
 
+// src/services/search/searchQuery.ts
+var DEFAULT_SEARCH_LIMIT = 50;
+var MAX_SEARCH_LIMIT = 200;
+var MAX_QUERY_LENGTH = 256;
+var SearchQueryError = class extends Error {
+  constructor(message, code) {
+    super(message);
+    this.code = code;
+  }
+  code;
+};
+function intOr(raw, fallback) {
+  if (raw === null) return fallback;
+  const n = Number.parseInt(raw, 10);
+  return Number.isFinite(n) ? n : fallback;
+}
+function parseSearchQuery(params) {
+  const q = (params.get("q") ?? "").trim();
+  if (!q) {
+    throw new SearchQueryError("Missing query parameter: q", "invalid_query");
+  }
+  if (q.length > MAX_QUERY_LENGTH) {
+    throw new SearchQueryError(`Query exceeds ${MAX_QUERY_LENGTH} characters`, "query_too_long");
+  }
+  const limit = Math.min(
+    Math.max(intOr(params.get("limit"), DEFAULT_SEARCH_LIMIT), 1),
+    MAX_SEARCH_LIMIT
+  );
+  const offset = Math.max(intOr(params.get("offset"), 0), 0);
+  const filters = {};
+  const provider = params.get("provider");
+  if (provider !== null) {
+    if (!isProviderName(provider)) {
+      throw new SearchQueryError(`Unknown provider: ${provider}`, "invalid_filter");
+    }
+    filters.provider = provider;
+  }
+  const projectPath = params.get("projectPath");
+  if (projectPath) filters.projectPath = projectPath;
+  const branch = params.get("branch");
+  if (branch) filters.branch = branch;
+  for (const [key, field] of [
+    ["since", "since"],
+    ["until", "until"]
+  ]) {
+    const raw = params.get(key);
+    if (raw === null) continue;
+    const ms = Date.parse(raw);
+    if (Number.isNaN(ms)) {
+      throw new SearchQueryError(`Invalid ${key}: expected an ISO 8601 date`, "invalid_filter");
+    }
+    filters[field] = ms;
+  }
+  if (filters.since != null && filters.until != null && filters.since > filters.until) {
+    throw new SearchQueryError("`since` must not be after `until`", "invalid_filter");
+  }
+  return { q, limit, offset, filters };
+}
+function applyFilters(results, filters) {
+  return results.filter((r) => {
+    if (filters.provider && r.provider !== filters.provider) return false;
+    if (filters.projectPath && r.projectPath !== filters.projectPath) return false;
+    if (filters.branch && r.branch !== filters.branch) return false;
+    if (filters.since != null || filters.until != null) {
+      const ts = r.lastActivity == null ? Number.NaN : new Date(r.lastActivity).getTime();
+      if (Number.isNaN(ts)) return false;
+      if (filters.since != null && ts < filters.since) return false;
+      if (filters.until != null && ts > filters.until) return false;
+    }
+    return true;
+  });
+}
+function paginate(results, offset, limit) {
+  const items = results.slice(offset, offset + limit);
+  return {
+    items,
+    total: results.length,
+    offset,
+    hasMore: offset + items.length < results.length
+  };
+}
+
 // src/services/sessions/conversationBusy.ts
 import { statSync as statSync8 } from "fs";
 var RESUME_BUSY_WINDOW_MS = 12e4;
@@ -8198,6 +8703,50 @@ async function reconcileSessions(rows, probe, currentInstanceId) {
   return Promise.all(rows.map((row) => classifySession(row, probe, currentInstanceId)));
 }
 
+// src/services/sessions/rehydrateSessions.ts
+var REHYDRATE_MAX = 25;
+var REHYDRATE_WINDOW_MS = 7 * 24 * 60 * 60 * 1e3;
+var AGENT_EXIT_SOURCES = /* @__PURE__ */ new Set(["exit", "process-exit"]);
+function shouldRehydrate(row, opts) {
+  if (!opts.projectExists(row.project_path)) return false;
+  if (opts.now - row.status_updated_at > REHYDRATE_WINDOW_MS) return false;
+  if (AGENT_EXIT_SOURCES.has(row.status_source) && row.failure_reason == null) return false;
+  return true;
+}
+function rowToStubSession(row) {
+  return {
+    id: row.session_id,
+    provider: row.provider,
+    projectPath: row.project_path,
+    projectName: row.project_name,
+    branch: row.branch,
+    // No PTY exists for a stub, so this is the only truthful status.
+    status: "idle",
+    startedAt: new Date(row.started_at),
+    completedAt: row.completed_at != null ? new Date(row.completed_at) : null,
+    promptCount: row.prompt_count,
+    lastOutput: "",
+    rehydrated: true,
+    ...row.session_name != null && { sessionName: row.session_name },
+    ...row.project_id != null && { projectId: row.project_id },
+    ...row.bound_conversation_id != null && { boundConversationId: row.bound_conversation_id },
+    ...row.resumed_from_conversation_id != null && {
+      resumedFromConversationId: row.resumed_from_conversation_id
+    },
+    ...row.failure_reason != null && { failureReason: row.failure_reason },
+    ...row.last_activity_at != null && { lastActivityAt: new Date(row.last_activity_at) },
+    // Only `shutdown` crosses over. It is the one registry source that is also a
+    // wire StatusSource *and* that genuinely describes the `idle` above — the
+    // streamer stopped this session. A crashed row still says `transition` over
+    // a `running` status, and copying that here would attach observed-confidence
+    // provenance to a status we derived at boot, so leave it unset instead.
+    ...row.status_source === "shutdown" && {
+      statusSource: "shutdown",
+      statusUpdatedAt: new Date(row.status_updated_at)
+    }
+  };
+}
+
 // src/types.ts
 function confidenceForSource(source) {
   return source === "timeout-fallback" || source === "quiet-fallback" ? "inferred" : "observed";
@@ -8345,14 +8894,15 @@ function managedToResponse(s, ptyAttached) {
     // Lifecycle for a session this run knows about. `attached` while we hold
     // its PTY; once the PTY is gone the session is terminal from this run's
     // perspective — `failed` when it recorded a reason, else `completed`.
-    // Sessions left by *previous* runs never reach here: they aren't in the
-    // in-memory store, and the boot reconciler classifies them instead
-    // (docs/architecture/2026-07-24-durable-session-runtime.md).
-    lifecycle: ptyAttached ? "attached" : s.failureReason != null ? "failed" : "completed",
-    lifecycleSource: ptyAttached ? "spawn" : "exit",
+    // A `rehydrated` stub is the exception: the boot rehydrator seeded it from
+    // the durable registry, so it is a previous run's session with no process
+    // behind it — `resumable`, and `historical` rather than `managed`
+    // (docs/plans/live-sessions-persistence-plan.md §4, Phase 1).
+    lifecycle: ptyAttached ? "attached" : s.rehydrated ? "resumable" : s.failureReason != null ? "failed" : "completed",
+    lifecycleSource: ptyAttached ? "spawn" : s.rehydrated ? "reconcile" : "exit",
     // We spawned it, so `status` is the authoritative signal — no inferred
     // `activity` is attached for managed sessions.
-    ownership: "managed",
+    ownership: s.rehydrated ? "historical" : "managed",
     projectPath: s.projectPath,
     projectName: s.projectName,
     branch: s.branch,
@@ -8753,6 +9303,8 @@ var DEFAULT_PTY_GRACE_PERIOD_MS = 27e4;
 var GRACE_MAX_DEFERS = 4;
 var IDLE_REAP_AFTER_MS = 6 * 60 * 60 * 1e3;
 var IDLE_REAP_SWEEP_MS = 5 * 60 * 1e3;
+var SEARCH_OVERFETCH = 4;
+var SEARCH_MAX_SCAN = 1e3;
 var RESUME_DISCOVERY_TIMEOUT_MS = 750;
 var DISCOVERY_TTL_MS = 15e3;
 var ADOPT_KILL_TIMEOUT_MS = 5e3;
@@ -8940,10 +9492,13 @@ var StreamerServer = class {
   projectsRepo = null;
   conversationsRepo = null;
   sessionsRepo = null;
-  // Durable session registry (C1 Phase 2). Null when the cache DB failed to
-  // open — persistence degrades to today's in-memory-only behaviour rather than
-  // taking the server down with it, so every write goes through `?.`.
+  // Durable session registry (C1 Phase 2). Null when runtime.db failed to open
+  // — persistence degrades to today's in-memory-only behaviour rather than
+  // taking the server down with it, so every write goes through `?.`. Note the
+  // handle is runtime.db, NOT the conversation cache: a cache failure used to
+  // null this repo and silently disable all session persistence.
   managedSessionsRepo = null;
+  runtimeStore = null;
   // Identifies this streamer run. A registry row carrying a different id is a
   // session that outlived the process that started it.
   streamerInstanceId = randomUUID5();
@@ -8962,6 +9517,7 @@ var StreamerServer = class {
   liveActivityRenewal = null;
   discoveryCache = null;
   cacheDir;
+  runtimeDbPath;
   tailSize;
   directoryDebounceMs;
   // Trailing-debounced trigger that flags the scanner stale after a quiet
@@ -9008,6 +9564,7 @@ var StreamerServer = class {
     this.claudeFlags = config.claudeFlags ?? loadClaudeFlags();
     this.claudeExtraArgs = config.claudeExtraArgs ?? loadClaudeExtraArgs();
     this.cacheDir = config.cacheDir ?? loadCacheDir() ?? join18(homedir9(), ".threadbase", "cache");
+    this.runtimeDbPath = config.runtimeDbPath ?? process.env.THREADBASE_RUNTIME_DB ?? join18(process.env.THREADBASE_CONFIG_DIR ?? join18(homedir9(), ".threadbase"), "runtime.db");
     this.tailSize = config.tailSize ?? loadTailSize() ?? 10;
     this.directoryDebounceMs = parseDirScanDebounceEnv(process.env.THREADBASE_DIR_SCAN_DEBOUNCE_MS) ?? config.directoryScanDebounceMs ?? 1e3;
     this.markScannerStaleDebounced = debounce(() => {
@@ -9178,6 +9735,7 @@ var StreamerServer = class {
         if (resp) this.wsHub.broadcast({ type: "session_ready", session: resp });
       },
       onStatusChange: (session) => {
+        const previousStatus = this.sessionStore.getManaged(session.id)?.status;
         this.sessionStore.updateManaged(session.id, {
           status: session.status,
           completedAt: session.completedAt,
@@ -9232,7 +9790,7 @@ var StreamerServer = class {
         if (resp) {
           this.wsHub.broadcast({ type: "session_update", session: resp });
         }
-        void this.liveActivityNotifier?.onStatusChange(session);
+        void this.liveActivityNotifier?.onStatusChange(session, previousStatus);
         this.sessionStatusBus.emit(`status:${session.id}`, session.status);
       }
     });
@@ -9283,6 +9841,7 @@ var StreamerServer = class {
       conversationsRepo: () => this.conversationsRepo,
       sessionsRepo: () => this.sessionsRepo,
       cacheMetadataRepo: () => this.cacheMetadataRepo,
+      runtimeStore: () => this.runtimeStore,
       ptyAttachedIds: () => this.ptyAttachedIds(),
       handleListSessions: (url, res) => this.handleListSessions(url, res),
       handleSessionsCount: (res) => this.handleSessionsCount(res),
@@ -9521,14 +10080,14 @@ var StreamerServer = class {
     }
     this.apnsClient = new ApnsClient(creds);
     const sender = new LiveActivitySender(this.apnsClient, pushRepo);
-    const serverId = process.env.THREADBASE_INSTANCE_ID ?? hostname2();
-    this.liveActivityNotifier = new LiveActivityNotifier(sender, serverId, hostname2());
+    const serverId = process.env.THREADBASE_INSTANCE_ID ?? hostname3();
+    this.liveActivityNotifier = new LiveActivityNotifier(sender, serverId, hostname3());
     this.liveActivityRenewal = new LiveActivityRenewalScheduler({
       repo: pushRepo,
       sender,
       sessionStore: this.sessionStore,
       serverId,
-      serverLabel: hostname2()
+      serverLabel: hostname3()
     });
     this.liveActivityRenewal.start();
     this.log.info("Live Activity push enabled", {
@@ -9582,6 +10141,58 @@ var StreamerServer = class {
     }
     return verdicts;
   }
+  /**
+   * Seed the session list with what previous runs left behind (persistence plan
+   * Phase 1, gaps G1/G2/G8).
+   *
+   * Reconciliation classifies rows and stops there; a verdict is overlaid onto a
+   * SessionResponse that already exists, and after a clean restart none does —
+   * `SessionStore` starts empty. So the user's session did not become
+   * `resumable`, it became *absent*. This is the half that puts it back.
+   *
+   * The seeded stubs hold no PTY and are never handed to `LiveSessionManager`,
+   * so `reapIdleSessions` and `startGraceTimer` — both of which iterate
+   * `ptyManager.listSessions()` — cannot observe them. A later resume calls
+   * `sessionStore.addManaged` with the real session, which overwrites the stub
+   * by id rather than duplicating it.
+   */
+  rehydratePreviousSessions(verdicts) {
+    if (!this.featureFlags.sessionRehydration || !this.managedSessionsRepo) return;
+    try {
+      const now = Date.now();
+      const rows = this.managedSessionsRepo.listRecoverable({
+        sinceMs: now - REHYDRATE_WINDOW_MS,
+        limit: REHYDRATE_MAX + 1
+      });
+      const truncated = rows.length > REHYDRATE_MAX;
+      const candidates = truncated ? rows.slice(0, REHYDRATE_MAX) : rows;
+      if (candidates.length === 0) return;
+      const lifecycleByVerdict = new Map(verdicts.map((v) => [v.sessionId, v.lifecycle]));
+      let rehydrated = 0;
+      for (const row of candidates) {
+        if (this.sessionStore.getManaged(row.session_id)) continue;
+        if (!shouldRehydrate(row, { now, projectExists: existsSync11 })) continue;
+        this.sessionStore.addManaged(rowToStubSession(row));
+        this.sessionLifecycles.set(
+          row.session_id,
+          lifecycleByVerdict.get(row.session_id) ?? "resumable"
+        );
+        if (row.completed_at != null) this.selfPtyEndedAt.set(row.session_id, row.completed_at);
+        rehydrated++;
+      }
+      this.log.info(`[rehydrate] recovered ${rehydrated} session(s) from the registry`, {
+        event: "sessions.rehydrated",
+        rehydrated,
+        skipped: candidates.length - rehydrated,
+        truncated
+      });
+    } catch (err) {
+      this.log.warn("[rehydrate] failed to rehydrate previous sessions", {
+        event: "sessions.rehydrate_failed",
+        err
+      });
+    }
+  }
   /**
    * Pick a token guaranteed to appear in the spawned process's argv, for the
    * reconciler's pid-reuse guard.
@@ -9815,6 +10426,17 @@ var StreamerServer = class {
           port,
           event: "server.listening"
         });
+        try {
+          this.runtimeStore = RuntimeStore.open(this.runtimeDbPath);
+          this.managedSessionsRepo = new ManagedSessionsRepository(this.runtimeStore.getDatabase());
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          const abiMismatch = message.includes("NODE_MODULE_VERSION") || message.includes("was compiled against a different Node.js version");
+          this.log.error(
+            `Runtime store failed to open \u2014 session persistence DISABLED; sessions will not survive a restart.` + (abiMismatch ? ` Fix: npm rebuild better-sqlite3` : "") + ` (${message})`,
+            { error: message, abiMismatch, path: this.runtimeDbPath, event: "runtime.open_failed" }
+          );
+        }
         try {
           this.cache = ConversationCache.open(
             join18(this.cacheDir, "cache.db"),
@@ -9842,8 +10464,20 @@ var StreamerServer = class {
           this.projectsRepo = new ProjectsRepository(db);
           this.conversationsRepo = new ConversationsRepository(this.cache);
           this.sessionsRepo = new SessionsRepository(this.sessionStore);
-          this.managedSessionsRepo = new ManagedSessionsRepository(db);
-          void this.reconcilePreviousSessions();
+          try {
+            const copied = this.runtimeStore?.importLegacyManagedSessions(db) ?? 0;
+            if (copied > 0) {
+              this.log.info(`Copied ${copied} managed session row(s) from cache.db to runtime.db`, {
+                copied,
+                event: "runtime.legacy_import"
+              });
+            }
+          } catch (err) {
+            this.log.warn("[registry] legacy managed_sessions copy failed", {
+              event: "runtime.legacy_import_failed",
+              err
+            });
+          }
           this.cacheMetadataRepo = new CacheMetadataRepository(db);
           this.pushRepo = new PushRepository(db);
           this.devicesRepo = new DevicesRepository(db);
@@ -9867,7 +10501,7 @@ var StreamerServer = class {
             this.fileWatcher.watchDirectory(dir);
           }
           for (const dir of this.codexRoots) {
-            if (!existsSync10(dir)) continue;
+            if (!existsSync11(dir)) continue;
             this.fileWatcher.watchDirectory(dir);
           }
         } catch (err) {
@@ -9879,6 +10513,7 @@ var StreamerServer = class {
           );
           this.scannerPersistenceDisabled = true;
         }
+        void this.reconcilePreviousSessions().then((v) => this.rehydratePreviousSessions(v));
         if (this.skipStartupWarmup) {
           this.log.debug?.("startup warm-up scan skipped (skipStartupWarmup)", {
             event: "cache.warmup_skipped"
@@ -10086,6 +10721,7 @@ var StreamerServer = class {
     this.allScanners.clear();
     this.scanner = null;
     this.cache?.close();
+    this.runtimeStore?.close();
     this.ptyManager.dispose();
     this.fileWatcher.dispose();
     this.externalTails.clear();
@@ -10140,7 +10776,7 @@ var StreamerServer = class {
     }
     let body;
     try {
-      body = await readBody(req);
+      body = await readBody2(req);
     } catch (err) {
       const message = err instanceof Error ? err.message : "Invalid body";
       json(res, 400, { error: message });
@@ -10186,7 +10822,7 @@ var StreamerServer = class {
       nonce: sealed.nonce,
       ephemeralPublicKey: sealed.ephemeralPublicKey,
       publicUrl: this.publicUrl,
-      machineName: hostname2(),
+      machineName: hostname3(),
       ...device && {
         deviceId: device.deviceId,
         deviceToken: device.deviceToken,
@@ -10533,7 +11169,8 @@ var StreamerServer = class {
   }
   handleSessionsCount(res) {
     if (this.rejectIfWarmingUp(res)) return;
-    json(res, 200, { total: this.sessionStore.list(this.ptyAttachedIds()).length });
+    const total = this.sessionStore.list(this.ptyAttachedIds()).filter((s) => s.ownership !== "historical").length;
+    json(res, 200, { total });
   }
   handleGetRecentSessions(url, res) {
     if (this.rejectIfWarmingUp(res)) return;
@@ -10721,15 +11358,15 @@ var StreamerServer = class {
   findJsonlPath(uuid) {
     const filename = `${uuid}.jsonl`;
     for (const projectsDir of this.projectsDirs()) {
-      if (!existsSync10(projectsDir)) continue;
+      if (!existsSync11(projectsDir)) continue;
       for (const dir of readdirSync6(projectsDir)) {
         const fp = join18(projectsDir, dir, filename);
-        if (existsSync10(fp)) return fp;
+        if (existsSync11(fp)) return fp;
         const projectDir = join18(projectsDir, dir);
         try {
           for (const sub of readdirSync6(projectDir)) {
             const subagentPath = join18(projectDir, sub, "subagents", filename);
-            if (existsSync10(subagentPath)) return subagentPath;
+            if (existsSync11(subagentPath)) return subagentPath;
           }
         } catch {
         }
@@ -11266,7 +11903,7 @@ var StreamerServer = class {
     }
     let body;
     try {
-      body = await readBody(req);
+      body = await readBody2(req);
     } catch {
       res.setHeader("Accept-Query", "application/json");
       json(res, 422, { error: "Malformed JSON body", code: "invalid_query" });
@@ -11304,17 +11941,27 @@ var StreamerServer = class {
     });
   }
   async handleSearch(url, res) {
-    const q = url.searchParams.get("q") ?? "";
-    if (!q) {
-      json(res, 400, { error: "Missing query parameter: q" });
-      return;
+    let parsed;
+    try {
+      parsed = parseSearchQuery(url.searchParams);
+    } catch (err) {
+      if (err instanceof SearchQueryError) {
+        json(res, 400, { error: err.message, code: err.code });
+        return;
+      }
+      throw err;
     }
-    const limit = intParam(url, "limit", 50);
+    const { q, limit, offset, filters } = parsed;
+    const startedAt = Date.now();
     const scanner = await this.getScanner();
     const results = await search(
       q,
       {
-        limit,
+        // Fetch beyond the requested page: filters below are applied AFTER the
+        // scanner returns, so slicing at `limit` here would drop results that a
+        // later page should contain. Bounded so a broad query cannot pull an
+        // unbounded set into memory.
+        limit: Math.min(offset + limit * SEARCH_OVERFETCH, SEARCH_MAX_SCAN),
         include: "conversations",
         ...this.scanProfiles ? { profiles: this.scanProfiles } : {},
         ...this.codexScanOpts()
@@ -11338,13 +11985,24 @@ var StreamerServer = class {
       lastActivity: r.meta.timestamp,
       firstMessage: r.meta.firstMessage ?? void 0,
       lastMessage: r.meta.lastMessage ?? void 0,
-      provider: r.meta.provider ?? CLAUDE_CODE_PROVIDER
+      provider: r.meta.provider ?? CLAUDE_CODE_PROVIDER,
+      // The scanner already computes relevance and match snippets; the previous
+      // adapter discarded both, so results arrived in an unexplained order with
+      // no indication of WHY anything matched.
+      score: r.score,
+      matches: Array.isArray(r.matches) ? r.matches.map((m) => ({
+        field: m.field,
+        snippet: m.snippet
+      })) : []
     }));
+    const page = paginate(applyFilters(adapted, filters), offset, limit);
     json(res, 200, {
-      conversations: adapted,
-      hasMore: false,
-      offset: 0,
-      total: adapted.length
+      conversations: page.items,
+      hasMore: page.hasMore,
+      offset: page.offset,
+      total: page.total,
+      // Query timing, so a slow search is diagnosable rather than merely felt.
+      tookMs: Date.now() - startedAt
     });
   }
   async handleListSessions(url, res) {
@@ -11390,7 +12048,7 @@ var StreamerServer = class {
     if (this.rejectIfWarmingUp(res)) return;
     const session = this.sessionStore.get(sessionId, this.ptyAttachedIds());
     if (session) {
-      if (!existsSync10(session.projectPath)) {
+      if (!existsSync11(session.projectPath)) {
         session.failureReason = `Project directory not found: ${session.projectPath}`;
       }
       const reconciled = this.withReconciledLifecycle([session])[0];
@@ -11417,7 +12075,7 @@ var StreamerServer = class {
     json(res, 404, { error: "Session not found" });
   }
   async handleResume(req, res) {
-    const body = await readBody(req);
+    const body = await readBody2(req);
     const sessionId = body.sessionId ?? body.conversationId;
     if (!sessionId) {
       json(res, 400, { error: "Missing sessionId" });
@@ -11549,7 +12207,7 @@ var StreamerServer = class {
       return;
     }
     if (this.agentConfig.enabled) {
-      const body2 = await readBody(req);
+      const body2 = await readBody2(req);
       const cache = this.cache;
       if (!cache) {
         json(res, 503, {
@@ -11568,7 +12226,7 @@ var StreamerServer = class {
       json(res, result.status, result.body);
       return;
     }
-    const body = await readBody(req);
+    const body = await readBody2(req);
     const { input, keys } = body;
     let idempotencyKey;
     try {
@@ -11732,7 +12390,7 @@ var StreamerServer = class {
     });
   }
   async handleSendAnswer(sessionId, req, res) {
-    const body = await readBody(req);
+    const body = await readBody2(req);
     const pending = this.pendingQuestions.get(sessionId);
     const resolution = resolveAnswer(pending, body);
     if (!resolution.ok) {
@@ -11761,7 +12419,7 @@ var StreamerServer = class {
       json(res, 400, { error: "Session has no project path" });
       return;
     }
-    const body = await readBody(req);
+    const body = await readBody2(req);
     const { filename, mimeType, dataBase64 } = body ?? {};
     if (typeof filename !== "string" || typeof mimeType !== "string" || typeof dataBase64 !== "string") {
       json(res, 400, { error: "Missing filename, mimeType, or dataBase64" });
@@ -11963,7 +12621,7 @@ var StreamerServer = class {
       return;
     }
     if (this.agentConfig.enabled) {
-      const body2 = await readBody(req);
+      const body2 = await readBody2(req);
       const result = await handleStartAgentSession(body2, {
         sessionStore: this.sessionStore,
         // biome-ignore lint/style/noNonNullAssertion: agentClient is set when agentConfig.enabled is true
@@ -11977,7 +12635,7 @@ var StreamerServer = class {
       }
       return;
     }
-    const body = await readBody(req);
+    const body = await readBody2(req);
     const { path: relativePath, provider: requestedProvider, systemPrompt: clientPrompt } = body;
     if (requestedProvider !== void 0 && !isProviderName(requestedProvider)) {
       json(res, 400, { error: "Invalid provider" });
@@ -12149,8 +12807,8 @@ var StreamerServer = class {
         cleanup();
         return;
       }
-      let resolvedFilePath = existsSync10(filePath) ? filePath : null;
-      if (!resolvedFilePath && existsSync10(projectsDir)) {
+      let resolvedFilePath = existsSync11(filePath) ? filePath : null;
+      if (!resolvedFilePath && existsSync11(projectsDir)) {
         try {
           const now = Date.now();
           const match = readdirSync6(projectsDir).filter((f) => f.endsWith(".jsonl")).map((f) => ({ f, mtime: statSync9(join18(projectsDir, f)).mtimeMs })).filter(({ mtime }) => now - mtime < 5e3).filter(
@@ -12246,7 +12904,7 @@ var StreamerServer = class {
       );
       for (const root of this.codexRoots) {
         const sessionsDir = join18(root, dateDir);
-        if (!existsSync10(sessionsDir)) continue;
+        if (!existsSync11(sessionsDir)) continue;
         let candidateFiles;
         try {
           candidateFiles = readdirSync6(sessionsDir).filter((f) => f.endsWith(".jsonl"));
@@ -12335,7 +12993,7 @@ var StreamerServer = class {
       });
       return;
     }
-    const body = await readBody(req);
+    const body = await readBody2(req);
     const { path: relativePath, name } = body;
     if (!name || typeof name !== "string") {
       json(res, 400, { error: "Missing name field" });
@@ -12365,7 +13023,7 @@ var StreamerServer = class {
     }
     let parsed;
     try {
-      parsed = await readBody(req);
+      parsed = await readBody2(req);
     } catch {
       json(res, 400, { error: "Invalid JSON" });
       return;
@@ -12422,7 +13080,7 @@ var StreamerServer = class {
     }
     let parsed;
     try {
-      parsed = await readBody(req);
+      parsed = await readBody2(req);
     } catch {
       json(res, 400, { error: "Invalid JSON" });
       return;
@@ -12481,7 +13139,7 @@ async function waitForProcessExit(pid, timeoutMs, pollMs = ADOPT_KILL_POLL_MS) {
 }
 function classifyResumability(cwd) {
   if (!cwd) return { resumable: true };
-  if (existsSync10(cwd)) return { resumable: true };
+  if (existsSync11(cwd)) return { resumable: true };
   const ranInWorktree = /\/\.worktrees\//.test(cwd) || /\/\.claude\/worktrees\//.test(cwd);
   return {
     resumable: false,
@@ -12599,7 +13257,7 @@ function parseSessionListQuery(url) {
   const cursor = url.searchParams.get("cursor") ?? void 0;
   return { query: { limit, sortBy, order, status, cursor } };
 }
-function readBody(req) {
+function readBody2(req) {
   return new Promise((resolve2, reject) => {
     const chunks = [];
     req.on("data", (chunk) => chunks.push(chunk));