@threadbase-sh/streamer 1.39.1 → 1.41.0

package/dist/cli.cjs

@@ -4121,7 +4121,7 @@ var require_transport = __commonJS({
   "node_modules/pino/lib/transport.js"(exports2, module2) {
     "use strict";
     var { createRequire } = require("module");
-    var { existsSync: existsSync15 } = require("fs");
+    var { existsSync: existsSync16 } = require("fs");
     var getCallers = require_caller();
     var { join: join29, isAbsolute: isAbsolute2, sep: sep3 } = require("path");
     var { fileURLToPath: fileURLToPath3 } = require("url");
@@ -4195,7 +4195,7 @@ var require_transport = __commonJS({
           return false;
         }
       }
-      return isAbsolute2(path2) && !existsSync15(path2);
+      return isAbsolute2(path2) && !existsSync16(path2);
     }
     function stripQuotes(value) {
       const first = value[0];
@@ -5937,7 +5937,7 @@ var require_pino = __commonJS({
     } = symbols;
     var { epochTime, nullTime } = time3;
     var { pid } = process;
-    var hostname5 = os2.hostname();
+    var hostname6 = os2.hostname();
     var defaultErrorSerializer = stdSerializers.err;
     var defaultOptions2 = {
       level: "info",
@@ -5947,7 +5947,7 @@ var require_pino = __commonJS({
       errorKey: "err",
       nestedKey: null,
       enabled: true,
-      base: { pid, hostname: hostname5 },
+      base: { pid, hostname: hostname6 },
       serializers: Object.assign(/* @__PURE__ */ Object.create(null), {
         err: defaultErrorSerializer
       }),
@@ -6213,6 +6213,12 @@ var init_feature_flags = __esm({
         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"
       }
     ];
   }
@@ -38620,8 +38626,8 @@ var require_service_config = __commonJS({
         }
         if (Array.isArray(validatedConfig.clientHostname)) {
           let hostnameMatched = false;
-          for (const hostname5 of validatedConfig.clientHostname) {
-            if (hostname5 === os2.hostname()) {
+          for (const hostname6 of validatedConfig.clientHostname) {
+            if (hostname6 === os2.hostname()) {
               hostnameMatched = true;
             }
           }
@@ -51190,8 +51196,8 @@ var require_single_subchannel_channel = __commonJS({
         if (splitPath2.length >= 2) {
           serviceName = splitPath2[1];
         }
-        const hostname5 = (_b = (_a3 = (0, uri_parser_1.splitHostPort)(this.options.host)) === null || _a3 === void 0 ? void 0 : _a3.host) !== null && _b !== void 0 ? _b : "localhost";
-        this.serviceUrl = `https://${hostname5}/${serviceName}`;
+        const hostname6 = (_b = (_a3 = (0, uri_parser_1.splitHostPort)(this.options.host)) === null || _a3 === void 0 ? void 0 : _a3.host) !== null && _b !== void 0 ? _b : "localhost";
+        this.serviceUrl = `https://${hostname6}/${serviceName}`;
         const timeout = (0, deadline_1.getRelativeTimeout)(options.deadline);
         if (timeout !== Infinity) {
           if (timeout <= 0) {
@@ -51838,8 +51844,8 @@ var require_resolver_dns = __commonJS({
           }
           trace("Looking up DNS hostname " + this.dnsHostname);
           this.latestLookupResult = null;
-          const hostname5 = this.dnsHostname;
-          this.pendingLookupPromise = this.lookup(hostname5);
+          const hostname6 = this.dnsHostname;
+          this.pendingLookupPromise = this.lookup(hostname6);
           this.pendingLookupPromise.then((addressList) => {
             if (this.pendingLookupPromise === null) {
               return;
@@ -51862,7 +51868,7 @@ var require_resolver_dns = __commonJS({
             this.listener((0, call_interface_1.statusOrFromError)(this.defaultResolutionError), {}, this.latestServiceConfigResult, "");
           });
           if (this.isServiceConfigEnabled && this.pendingTxtPromise === null) {
-            this.pendingTxtPromise = this.resolveTxt(hostname5);
+            this.pendingTxtPromise = this.resolveTxt(hostname6);
             this.pendingTxtPromise.then((txtRecord) => {
               if (this.pendingTxtPromise === null) {
                 return;
@@ -51904,12 +51910,12 @@ var require_resolver_dns = __commonJS({
           this.continueResolving = true;
         }
       }
-      async lookup(hostname5) {
+      async lookup(hostname6) {
         if (environment_1.GRPC_NODE_USE_ALTERNATIVE_RESOLVER) {
           trace("Using alternative DNS resolver.");
           const records = await Promise.allSettled([
-            this.alternativeResolver.resolve4(hostname5),
-            this.alternativeResolver.resolve6(hostname5)
+            this.alternativeResolver.resolve4(hostname6),
+            this.alternativeResolver.resolve6(hostname6)
           ]);
           if (records.every((result) => result.status === "rejected")) {
             throw new Error(records[0].reason);
@@ -51921,15 +51927,15 @@ var require_resolver_dns = __commonJS({
             port: +this.port
           }));
         }
-        const addressList = await dns_1.promises.lookup(hostname5, { all: true });
+        const addressList = await dns_1.promises.lookup(hostname6, { all: true });
         return addressList.map((addr) => ({ host: addr.address, port: +this.port }));
       }
-      async resolveTxt(hostname5) {
+      async resolveTxt(hostname6) {
         if (environment_1.GRPC_NODE_USE_ALTERNATIVE_RESOLVER) {
           trace("Using alternative DNS resolver.");
-          return this.alternativeResolver.resolveTxt(hostname5);
+          return this.alternativeResolver.resolveTxt(hostname6);
         }
-        return dns_1.promises.resolveTxt(hostname5);
+        return dns_1.promises.resolveTxt(hostname6);
       }
       startNextResolutionTimer() {
         var _a3, _b;
@@ -52057,13 +52063,13 @@ var require_http_proxy = __commonJS({
           userCred = proxyUrl.username;
         }
       }
-      const hostname5 = proxyUrl.hostname;
+      const hostname6 = proxyUrl.hostname;
       let port = proxyUrl.port;
       if (port === "") {
         port = "80";
       }
       const result = {
-        address: `${hostname5}:${port}`
+        address: `${hostname6}:${port}`
       };
       if (userCred) {
         result.creds = userCred;
@@ -53376,8 +53382,8 @@ var require_load_balancing_call = __commonJS({
         if (splitPath2.length >= 2) {
           serviceName = splitPath2[1];
         }
-        const hostname5 = (_b = (_a3 = (0, uri_parser_1.splitHostPort)(this.host)) === null || _a3 === void 0 ? void 0 : _a3.host) !== null && _b !== void 0 ? _b : "localhost";
-        this.serviceUrl = `https://${hostname5}/${serviceName}`;
+        const hostname6 = (_b = (_a3 = (0, uri_parser_1.splitHostPort)(this.host)) === null || _a3 === void 0 ? void 0 : _a3.host) !== null && _b !== void 0 ? _b : "localhost";
+        this.serviceUrl = `https://${hostname6}/${serviceName}`;
         this.startTime = /* @__PURE__ */ new Date();
       }
       getDeadlineInfo() {
@@ -91186,9 +91192,9 @@ var require_parse_host_uri = __commonJS({
     var ipv4Hostname = "(?:\\d{1,3}(?:\\.\\d{1,3}){3})";
     var ipv6Hostname = "(?:\\[(?<ipv6>[0-9a-fA-F.:]+)\\])";
     var dnsHostname = "(?:[^:/]+)";
-    var hostname5 = `(?:${ipv4Hostname}|${ipv6Hostname}|${dnsHostname})`;
+    var hostname6 = `(?:${ipv4Hostname}|${ipv6Hostname}|${dnsHostname})`;
     var port = "(?::(?<port>\\d+))";
-    var protoHostPortRegex = new RegExp(`^${scheme}??(?<hostname>${hostname5})${port}?$`);
+    var protoHostPortRegex = new RegExp(`^${scheme}??(?<hostname>${hostname6})${port}?$`);
     function splitProtoHostPort(uri) {
       const match2 = protoHostPortRegex.exec(uri);
       if (!match2?.groups)
@@ -91200,9 +91206,9 @@ var require_parse_host_uri = __commonJS({
       };
     }
     function joinProtoHostPort(components) {
-      const { scheme: scheme2, hostname: hostname6, port: port2 } = components;
+      const { scheme: scheme2, hostname: hostname7, port: port2 } = components;
       const schemeText = scheme2 ? `${scheme2}:` : "";
-      const hostnameText = hostname6.includes(":") ? `[${hostname6}]` : hostname6;
+      const hostnameText = hostname7.includes(":") ? `[${hostname7}]` : hostname7;
       const portText = port2 !== void 0 ? `:${port2}` : "";
       return `${schemeText}${hostnameText}${portText}`;
     }
@@ -104140,11 +104146,11 @@ var require_pg_connection_string = __commonJS({
         config2.client_encoding = result.searchParams.get("encoding");
         return config2;
       }
-      const hostname5 = dummyHost ? "" : result.hostname;
+      const hostname6 = dummyHost ? "" : result.hostname;
       if (!config2.host) {
-        config2.host = decodeURIComponent(hostname5);
-      } else if (hostname5 && /^%2f/i.test(hostname5)) {
-        result.pathname = hostname5 + result.pathname;
+        config2.host = decodeURIComponent(hostname6);
+      } else if (hostname6 && /^%2f/i.test(hostname6)) {
+        result.pathname = hostname6 + result.pathname;
       }
       if (!config2.port) {
         config2.port = result.port;
@@ -124077,8 +124083,8 @@ function isAbiMismatch(message) {
 }
 function checkSqliteAbi() {
   try {
-    const Database3 = require("better-sqlite3");
-    const db = new Database3(":memory:");
+    const Database4 = require("better-sqlite3");
+    const db = new Database4(":memory:");
     db.close();
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
@@ -135423,10 +135429,10 @@ async function search(query, options, scanner) {
 // src/server.ts
 var import_crypto13 = require("crypto");
 var import_events2 = require("events");
-var import_fs29 = require("fs");
+var import_fs30 = require("fs");
 var import_promises16 = require("fs/promises");
 var import_http = require("http");
-var import_os12 = require("os");
+var import_os13 = require("os");
 var import_path29 = require("path");
 var import_readline4 = require("readline");
 
@@ -138231,6 +138237,215 @@ var errorMiddleware = (err, c) => {
   return c.json({ error: message }, 500);
 };
 
+// src/api/routes/backup.routes.ts
+var import_os5 = require("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, p2] of archive.projects.entries()) {
+    if (!p2 || typeof p2 !== "object") {
+      throw new BackupError(`Project at index ${i} is not an object`, "INVALID_ARCHIVE");
+    }
+    if (typeof p2.id !== "string" || p2.id.length === 0) {
+      throw new BackupError(`Project at index ${i} has no id`, "INVALID_ARCHIVE");
+    }
+    if (typeof p2.path !== "string" || p2.path.length === 0) {
+      throw new BackupError(`Project at index ${i} has no path`, "INVALID_ARCHIVE");
+    }
+  }
+  const ids = new Set(archive.projects.map((p2) => p2.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, b2) => b2.from.length - a.from.length);
+  return projects.map((p2) => {
+    const rule = ordered.find((r) => p2.path === r.from || p2.path.startsWith(`${r.from}/`));
+    if (!rule) return p2;
+    return { ...p2, path: `${rule.to}${p2.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 p2 of incoming) {
+    const sameId = byId.get(p2.id);
+    if (sameId) {
+      if (sameId.path !== p2.path) plan.update.push(p2);
+      continue;
+    }
+    const samePath = byPath.get(p2.path);
+    if (samePath) {
+      plan.conflict.push({ incoming: p2, existingId: samePath.id });
+      continue;
+    }
+    plan.create.push(p2);
+  }
+  return plan;
+}
+
+// src/version.ts
+var import_node_fs7 = require("fs");
+var import_node_path8 = require("path");
+var cached2;
+function getVersion() {
+  if (cached2 !== void 0) return cached2;
+  cached2 = resolveVersion();
+  return cached2;
+}
+function resolveVersion() {
+  const scriptPath = process.argv[1] ?? "";
+  const here = scriptPath ? (0, import_node_path8.dirname)(scriptPath) : process.cwd();
+  let realHere = here;
+  try {
+    realHere = (0, import_node_path8.dirname)((0, import_node_fs7.realpathSync)(scriptPath));
+  } catch {
+  }
+  const searchDirs = realHere === here ? [here, (0, import_node_path8.join)(here, "..")] : [here, (0, import_node_path8.join)(here, ".."), realHere, (0, import_node_path8.join)(realHere, "..")];
+  for (const dir of searchDirs) {
+    try {
+      const v2 = (0, import_node_fs7.readFileSync)((0, import_node_path8.join)(dir, "version.txt"), "utf8").trim();
+      if (v2) return v2;
+    } catch {
+    }
+  }
+  try {
+    const pkg = JSON.parse((0, import_node_fs7.readFileSync)((0, import_node_path8.join)(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((resolve4, reject) => {
+    const chunks = [];
+    c.env.incoming.on("data", (chunk) => chunks.push(chunk));
+    c.env.incoming.on("end", () => {
+      try {
+        const raw2 = Buffer.concat(chunks).toString("utf-8");
+        resolve4(raw2 ? JSON.parse(raw2) : {});
+      } 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((p2) => ({
+      id: p2.id,
+      path: p2.path,
+      name: p2.name ?? null,
+      createdAt: p2.createdAt,
+      updatedAt: p2.updatedAt
+    }));
+    return c.json({
+      manifest: {
+        formatVersion: BACKUP_FORMAT_VERSION,
+        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        streamerVersion: getVersion(),
+        sourceHost: (0, import_os5.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((p2) => ({ id: p2.id, path: p2.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 p2 of [...plan.create, ...plan.update]) {
+      try {
+        repo.upsertProjectByPath(p2.path, { name: p2.name });
+        applied++;
+      } catch {
+      }
+    }
+    return c.json({ applied: true, summary, appliedCount: applied });
+  });
+  return app;
+};
+
 // src/api/routes/browse.routes.ts
 var ALREADY_HANDLED = 597;
 var alreadyHandled = () => new Response(null, { status: ALREADY_HANDLED });
@@ -138413,38 +138628,251 @@ var createDeviceRoutes = (deps) => {
   return app;
 };
 
-// src/version.ts
-var import_node_fs7 = require("fs");
-var import_node_path8 = require("path");
-var cached2;
-function getVersion() {
-  if (cached2 !== void 0) return cached2;
-  cached2 = resolveVersion();
-  return cached2;
-}
-function resolveVersion() {
-  const scriptPath = process.argv[1] ?? "";
-  const here = scriptPath ? (0, import_node_path8.dirname)(scriptPath) : process.cwd();
-  let realHere = here;
-  try {
-    realHere = (0, import_node_path8.dirname)((0, import_node_fs7.realpathSync)(scriptPath));
-  } catch {
+// src/api/routes/diagnostics.routes.ts
+var import_fs14 = require("fs");
+
+// src/platform.ts
+var import_child_process = require("child_process");
+var import_fs13 = require("fs");
+var import_os6 = require("os");
+var import_path13 = require("path");
+var isWindows2 = (0, import_os6.platform)() === "win32";
+var _claudeExe;
+function resolveClaudeExe() {
+  if (_claudeExe !== void 0) return _claudeExe;
+  if (isWindows2) {
+    try {
+      const found = (0, import_child_process.execFileSync)("where.exe", ["claude"], {
+        encoding: "utf-8",
+        windowsHide: true,
+        timeout: 3e3
+      }).trim().split("\n")[0].trim();
+      if (found) {
+        _claudeExe = found;
+        return _claudeExe;
+      }
+    } catch {
+    }
+    const candidates = [
+      (0, import_path13.join)((0, import_os6.homedir)(), ".local", "bin", "claude.exe"),
+      (0, import_path13.join)(
+        process.env.LOCALAPPDATA ?? (0, import_path13.join)((0, import_os6.homedir)(), "AppData", "Local"),
+        "Microsoft",
+        "WindowsApps",
+        "claude.exe"
+      )
+    ];
+    for (const p2 of candidates) {
+      if ((0, import_fs13.existsSync)(p2)) {
+        _claudeExe = p2;
+        return _claudeExe;
+      }
+    }
+  } else {
+    try {
+      const found = (0, import_child_process.execFileSync)("/usr/bin/which", ["claude"], {
+        encoding: "utf-8",
+        timeout: 3e3
+      }).trim().split("\n")[0].trim();
+      if (found && (0, import_fs13.existsSync)(found)) {
+        _claudeExe = found;
+        return _claudeExe;
+      }
+    } catch {
+    }
+    const candidates = [
+      "/opt/homebrew/bin/claude",
+      "/usr/local/bin/claude",
+      (0, import_path13.join)((0, import_os6.homedir)(), ".local", "bin", "claude")
+    ];
+    for (const p2 of candidates) {
+      if ((0, import_fs13.existsSync)(p2)) {
+        _claudeExe = p2;
+        return _claudeExe;
+      }
+    }
   }
-  const searchDirs = realHere === here ? [here, (0, import_node_path8.join)(here, "..")] : [here, (0, import_node_path8.join)(here, ".."), realHere, (0, import_node_path8.join)(realHere, "..")];
-  for (const dir of searchDirs) {
+  _claudeExe = "claude";
+  return _claudeExe;
+}
+var _codexExe;
+function resolveCodexExe() {
+  if (_codexExe !== void 0) return _codexExe;
+  if (isWindows2) {
     try {
-      const v2 = (0, import_node_fs7.readFileSync)((0, import_node_path8.join)(dir, "version.txt"), "utf8").trim();
-      if (v2) return v2;
+      const found = (0, import_child_process.execFileSync)("where.exe", ["codex"], {
+        encoding: "utf-8",
+        windowsHide: true,
+        timeout: 3e3
+      }).trim().split("\n")[0].trim();
+      if (found) {
+        _codexExe = found;
+        return _codexExe;
+      }
     } catch {
     }
+    const candidates = [
+      (0, import_path13.join)((0, import_os6.homedir)(), ".local", "bin", "codex.exe"),
+      (0, import_path13.join)(
+        process.env.LOCALAPPDATA ?? (0, import_path13.join)((0, import_os6.homedir)(), "AppData", "Local"),
+        "Microsoft",
+        "WindowsApps",
+        "codex.exe"
+      )
+    ];
+    for (const p2 of candidates) {
+      if ((0, import_fs13.existsSync)(p2)) {
+        _codexExe = p2;
+        return _codexExe;
+      }
+    }
+  } else {
+    try {
+      const found = (0, import_child_process.execFileSync)("/usr/bin/which", ["codex"], {
+        encoding: "utf-8",
+        timeout: 3e3
+      }).trim().split("\n")[0].trim();
+      if (found && (0, import_fs13.existsSync)(found)) {
+        _codexExe = found;
+        return _codexExe;
+      }
+    } catch {
+    }
+    const candidates = [
+      "/opt/homebrew/bin/codex",
+      "/usr/local/bin/codex",
+      (0, import_path13.join)((0, import_os6.homedir)(), ".local", "bin", "codex")
+    ];
+    for (const p2 of candidates) {
+      if ((0, import_fs13.existsSync)(p2)) {
+        _codexExe = p2;
+        return _codexExe;
+      }
+    }
+  }
+  _codexExe = "codex";
+  return _codexExe;
+}
+
+// src/services/diagnostics/diagnostics.ts
+var DIAGNOSTICS_CONTRACT_VERSION = 1;
+function redactPath(path2) {
+  if (!path2) return null;
+  const parts = path2.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 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((v2) => redactValue(v2));
+  }
+  if (value && typeof value === "object") {
+    const out = {};
+    for (const [k2, v2] of Object.entries(value)) {
+      out[k2] = SECRET_KEY_RE.test(k2) ? "[redacted]" : redactValue(v2);
+    }
+    return out;
   }
+  return value;
+}
+
+// src/api/routes/diagnostics.routes.ts
+function providerCheck(name, resolve4) {
   try {
-    const pkg = JSON.parse((0, import_node_fs7.readFileSync)((0, import_node_path8.join)(here, "..", "package.json"), "utf8"));
-    if (pkg.version) return `${pkg.version}+source`;
+    const exe = resolve4();
+    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 Hono2();
+  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 && (0, import_fs14.existsSync)(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
 var createHealthRoutes = (deps) => {
@@ -138579,7 +139007,7 @@ function createLogsRoutes() {
 // src/api/routes/misc.routes.ts
 var import_node_child_process2 = require("child_process");
 var import_node_crypto = require("crypto");
-var import_os5 = require("os");
+var import_os7 = require("os");
 
 // src/db/repositories/push.repository.ts
 var FAILURE_STREAK_LIMIT = 5;
@@ -138879,7 +139307,7 @@ var createMiscRoutes = (deps) => {
     const ptyIds = deps.ptyAttachedIds();
     return c.json({
       version: getVersion(),
-      machineName: (0, import_os5.hostname)(),
+      machineName: (0, import_os7.hostname)(),
       platform: process.platform,
       activeSessions: deps.sessionStore.list(ptyIds).filter((s3) => s3.status === "running").length,
       publicUrl: deps.publicUrl,
@@ -139168,129 +139596,6 @@ var createProjectRoutes = (deps) => {
   return app;
 };
 
-// src/platform.ts
-var import_child_process = require("child_process");
-var import_fs13 = require("fs");
-var import_os6 = require("os");
-var import_path13 = require("path");
-var isWindows2 = (0, import_os6.platform)() === "win32";
-var _claudeExe;
-function resolveClaudeExe() {
-  if (_claudeExe !== void 0) return _claudeExe;
-  if (isWindows2) {
-    try {
-      const found = (0, import_child_process.execFileSync)("where.exe", ["claude"], {
-        encoding: "utf-8",
-        windowsHide: true,
-        timeout: 3e3
-      }).trim().split("\n")[0].trim();
-      if (found) {
-        _claudeExe = found;
-        return _claudeExe;
-      }
-    } catch {
-    }
-    const candidates = [
-      (0, import_path13.join)((0, import_os6.homedir)(), ".local", "bin", "claude.exe"),
-      (0, import_path13.join)(
-        process.env.LOCALAPPDATA ?? (0, import_path13.join)((0, import_os6.homedir)(), "AppData", "Local"),
-        "Microsoft",
-        "WindowsApps",
-        "claude.exe"
-      )
-    ];
-    for (const p2 of candidates) {
-      if ((0, import_fs13.existsSync)(p2)) {
-        _claudeExe = p2;
-        return _claudeExe;
-      }
-    }
-  } else {
-    try {
-      const found = (0, import_child_process.execFileSync)("/usr/bin/which", ["claude"], {
-        encoding: "utf-8",
-        timeout: 3e3
-      }).trim().split("\n")[0].trim();
-      if (found && (0, import_fs13.existsSync)(found)) {
-        _claudeExe = found;
-        return _claudeExe;
-      }
-    } catch {
-    }
-    const candidates = [
-      "/opt/homebrew/bin/claude",
-      "/usr/local/bin/claude",
-      (0, import_path13.join)((0, import_os6.homedir)(), ".local", "bin", "claude")
-    ];
-    for (const p2 of candidates) {
-      if ((0, import_fs13.existsSync)(p2)) {
-        _claudeExe = p2;
-        return _claudeExe;
-      }
-    }
-  }
-  _claudeExe = "claude";
-  return _claudeExe;
-}
-var _codexExe;
-function resolveCodexExe() {
-  if (_codexExe !== void 0) return _codexExe;
-  if (isWindows2) {
-    try {
-      const found = (0, import_child_process.execFileSync)("where.exe", ["codex"], {
-        encoding: "utf-8",
-        windowsHide: true,
-        timeout: 3e3
-      }).trim().split("\n")[0].trim();
-      if (found) {
-        _codexExe = found;
-        return _codexExe;
-      }
-    } catch {
-    }
-    const candidates = [
-      (0, import_path13.join)((0, import_os6.homedir)(), ".local", "bin", "codex.exe"),
-      (0, import_path13.join)(
-        process.env.LOCALAPPDATA ?? (0, import_path13.join)((0, import_os6.homedir)(), "AppData", "Local"),
-        "Microsoft",
-        "WindowsApps",
-        "codex.exe"
-      )
-    ];
-    for (const p2 of candidates) {
-      if ((0, import_fs13.existsSync)(p2)) {
-        _codexExe = p2;
-        return _codexExe;
-      }
-    }
-  } else {
-    try {
-      const found = (0, import_child_process.execFileSync)("/usr/bin/which", ["codex"], {
-        encoding: "utf-8",
-        timeout: 3e3
-      }).trim().split("\n")[0].trim();
-      if (found && (0, import_fs13.existsSync)(found)) {
-        _codexExe = found;
-        return _codexExe;
-      }
-    } catch {
-    }
-    const candidates = [
-      "/opt/homebrew/bin/codex",
-      "/usr/local/bin/codex",
-      (0, import_path13.join)((0, import_os6.homedir)(), ".local", "bin", "codex")
-    ];
-    for (const p2 of candidates) {
-      if ((0, import_fs13.existsSync)(p2)) {
-        _codexExe = p2;
-        return _codexExe;
-      }
-    }
-  }
-  _codexExe = "codex";
-  return _codexExe;
-}
-
 // src/providers.ts
 var CLAUDE_CODE_PROVIDER2 = "claude-code";
 var CODEX_CLI_PROVIDER2 = "codex-cli";
@@ -139576,6 +139881,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));
@@ -139584,6 +139890,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));
@@ -139654,13 +139961,13 @@ init_claude_flags();
 
 // src/conversation-cache.ts
 var import_better_sqlite32 = __toESM(require("better-sqlite3"), 1);
-var import_fs16 = require("fs");
+var import_fs17 = require("fs");
 var import_promises12 = require("fs/promises");
 var import_path17 = require("path");
 var import_promises13 = require("timers/promises");
 
 // src/db/sqlite-migrate.ts
-var import_fs14 = require("fs");
+var import_fs15 = require("fs");
 var import_path15 = require("path");
 var import_url6 = require("url");
 var import_meta2 = {};
@@ -139670,6 +139977,9 @@ function getMigrationsDir() {
   }
   return __dirname;
 }
+function resolveMigrationsDir(name = "migrations") {
+  return (0, import_path15.join)(getMigrationsDir(), name);
+}
 var SCHEMA_MIGRATIONS_SQL = `
 CREATE TABLE IF NOT EXISTS schema_migrations (
   id TEXT PRIMARY KEY,
@@ -139678,8 +139988,8 @@ CREATE TABLE IF NOT EXISTS schema_migrations (
 `;
 function runSqliteMigrations(db, migrationsDir) {
   db.exec(SCHEMA_MIGRATIONS_SQL);
-  const dir = migrationsDir ?? (0, import_path15.join)(getMigrationsDir(), "migrations");
-  const files = (0, import_fs14.readdirSync)(dir).filter((f2) => f2.endsWith(".sql")).sort();
+  const dir = migrationsDir ?? resolveMigrationsDir();
+  const files = (0, import_fs15.readdirSync)(dir).filter((f2) => f2.endsWith(".sql")).sort();
   const appliedRows = db.prepare("SELECT id FROM schema_migrations").all();
   const appliedSet = new Set(appliedRows.map((r) => r.id));
   const recordApplied = db.prepare("INSERT INTO schema_migrations (id, applied_at) VALUES (?, ?)");
@@ -139690,7 +140000,7 @@ function runSqliteMigrations(db, migrationsDir) {
       skipped.push(file2);
       continue;
     }
-    const sql = (0, import_fs14.readFileSync)((0, import_path15.join)(dir, file2), "utf-8");
+    const sql = (0, import_fs15.readFileSync)((0, import_path15.join)(dir, file2), "utf-8");
     const tx = db.transaction(() => {
       db.exec(sql);
       recordApplied.run(file2, (/* @__PURE__ */ new Date()).toISOString());
@@ -139702,7 +140012,7 @@ function runSqliteMigrations(db, migrationsDir) {
 }
 
 // src/services/conversations/isAgentConversation.ts
-var import_fs15 = require("fs");
+var import_fs16 = require("fs");
 var DEFAULT_AGENT_ENTRYPOINTS = /* @__PURE__ */ new Set(["sdk-cli", "claude-vscode"]);
 var CHUNK_BYTES = 64 * 1024;
 var ENTRYPOINT_PROBE = `"entrypoint":`;
@@ -139724,12 +140034,12 @@ function isAgentFile(filePath, entrypoints = DEFAULT_AGENT_ENTRYPOINTS) {
   if (cached3 !== void 0) return cached3;
   let fd;
   try {
-    fd = (0, import_fs15.openSync)(filePath, "r");
+    fd = (0, import_fs16.openSync)(filePath, "r");
   } catch {
     return false;
   }
   try {
-    const fileSize = (0, import_fs15.statSync)(filePath).size;
+    const fileSize = (0, import_fs16.statSync)(filePath).size;
     if (fileSize === 0) {
       fileDecisionCache.set(key, false);
       return false;
@@ -139740,7 +140050,7 @@ function isAgentFile(filePath, entrypoints = DEFAULT_AGENT_ENTRYPOINTS) {
     let carry = "";
     while (offset < fileSize) {
       const toRead = Math.min(CHUNK_BYTES, fileSize - offset);
-      const got = (0, import_fs15.readSync)(fd, buf, 0, toRead, offset);
+      const got = (0, import_fs16.readSync)(fd, buf, 0, toRead, offset);
       if (got <= 0) break;
       const chunk = carry + buf.toString("utf8", 0, got);
       for (const marker of markers) {
@@ -139761,7 +140071,7 @@ function isAgentFile(filePath, entrypoints = DEFAULT_AGENT_ENTRYPOINTS) {
   } catch {
     return false;
   } finally {
-    (0, import_fs15.closeSync)(fd);
+    (0, import_fs16.closeSync)(fd);
   }
 }
 function parseAgentEntrypointsEnv(raw2) {
@@ -140336,7 +140646,7 @@ var ConversationCache = class _ConversationCache {
     if (!fileState) return null;
     let stat7;
     try {
-      stat7 = (0, import_fs16.statSync)(filePath);
+      stat7 = (0, import_fs17.statSync)(filePath);
     } catch {
       return null;
     }
@@ -140357,17 +140667,17 @@ var ConversationCache = class _ConversationCache {
     );
     if (rows.length === 0) return { messages: [], total, fromIndex: from };
     const messages = [];
-    const fd = (0, import_fs16.openSync)(filePath, "r");
+    const fd = (0, import_fs17.openSync)(filePath, "r");
     try {
       const state = initialConvState();
       for (const row of rows) {
         const buf = Buffer.alloc(row.byte_length);
-        (0, import_fs16.readSync)(fd, buf, 0, row.byte_length, row.byte_offset);
+        (0, import_fs17.readSync)(fd, buf, 0, row.byte_length, row.byte_offset);
         const msg = parseJsonlLine(buf.toString("utf-8"), state);
         if (msg) messages.push(msg);
       }
     } finally {
-      (0, import_fs16.closeSync)(fd);
+      (0, import_fs17.closeSync)(fd);
     }
     return { messages, total, fromIndex: from };
   }
@@ -140395,14 +140705,14 @@ var ConversationCache = class _ConversationCache {
   isAgentFileCached(filePath) {
     let s3;
     try {
-      s3 = (0, import_fs16.statSync)(filePath);
+      s3 = (0, import_fs17.statSync)(filePath);
     } catch {
       return false;
     }
     return this.classifyAgentFile(filePath, s3.mtimeMs, s3.size);
   }
   static open(dbPath, tailSize = 10, migrationsDir, options) {
-    (0, import_fs16.mkdirSync)((0, import_path17.dirname)(dbPath), { recursive: true });
+    (0, import_fs17.mkdirSync)((0, import_path17.dirname)(dbPath), { recursive: true });
     const db = new import_better_sqlite32.default(dbPath);
     db.pragma("journal_mode = WAL");
     db.pragma("foreign_keys = ON");
@@ -140589,7 +140899,7 @@ var ConversationCache = class _ConversationCache {
         let mtimeMs = null;
         let fileSize = null;
         try {
-          const s3 = (0, import_fs16.statSync)(m2.filePath);
+          const s3 = (0, import_fs17.statSync)(m2.filePath);
           mtimeMs = s3.mtimeMs;
           fileSize = s3.size;
         } catch {
@@ -140649,8 +140959,8 @@ var ConversationCache = class _ConversationCache {
     let fileSize;
     let fd;
     try {
-      fileSize = (0, import_fs16.statSync)(filePath).size;
-      fd = (0, import_fs16.openSync)(filePath, "r");
+      fileSize = (0, import_fs17.statSync)(filePath).size;
+      fd = (0, import_fs17.openSync)(filePath, "r");
     } catch {
       return false;
     }
@@ -140663,7 +140973,7 @@ var ConversationCache = class _ConversationCache {
       while (pos > 0 && lines.length < this.tailSize * 4) {
         const toRead = Math.min(CHUNK, pos);
         pos -= toRead;
-        (0, import_fs16.readSync)(fd, buf, 0, toRead, pos);
+        (0, import_fs17.readSync)(fd, buf, 0, toRead, pos);
         const chunk = buf.subarray(0, toRead).toString("utf8");
         const combined = chunk + partial2;
         const parts = combined.split("\n");
@@ -140674,7 +140984,7 @@ var ConversationCache = class _ConversationCache {
       }
       if (partial2) lines.push(partial2);
     } finally {
-      (0, import_fs16.closeSync)(fd);
+      (0, import_fs17.closeSync)(fd);
     }
     const msgs = [];
     for (let i = 0; i < lines.length && msgs.length < this.tailSize; i++) {
@@ -140887,7 +141197,7 @@ var ConversationCache = class _ConversationCache {
    * `handleGetConversation` can still serve the cached tail even when the
    * JSONL has been deleted.
    */
-  pruneGhostFiles(exists = import_fs16.existsSync) {
+  pruneGhostFiles(exists = import_fs17.existsSync) {
     const rows = this.stmts.allFilePaths.all();
     const ghosts = [];
     const prune = this.db.transaction((ids) => {
@@ -140942,7 +141252,7 @@ var ConversationCache = class _ConversationCache {
    * Returns the removed IDs.
    */
   reconcileDeletions(livePaths, opts) {
-    const exists = opts?.exists ?? import_fs16.existsSync;
+    const exists = opts?.exists ?? import_fs17.existsSync;
     const rows = this.stmts.allFilePaths.all();
     const removed = [];
     const drop = this.db.transaction((ids) => {
@@ -140977,7 +141287,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 = import_fs16.existsSync) {
+  listMissingFiles(exists = import_fs17.existsSync) {
     const rows = this.stmts.allFilePathsWithTitle.all();
     const missing = [];
     for (const row of rows) {
@@ -141062,7 +141372,7 @@ function getDbConfig() {
 }
 
 // src/db/migrations.ts
-var import_fs17 = require("fs");
+var import_fs18 = require("fs");
 var import_path18 = require("path");
 var import_url7 = require("url");
 var import_meta3 = {};
@@ -141085,10 +141395,10 @@ async function runMigrations2(pool2, migrationsDir) {
   );
   const appliedSet = new Set(applied.map((r) => r.name));
   const dir = migrationsDir ?? (0, import_path18.join)(getMigrationsDir2(), "pg-migrations");
-  const files = (0, import_fs17.readdirSync)(dir).filter((f2) => f2.endsWith(".sql")).sort();
+  const files = (0, import_fs18.readdirSync)(dir).filter((f2) => f2.endsWith(".sql")).sort();
   for (const file2 of files) {
     if (appliedSet.has(file2)) continue;
-    const sql = (0, import_fs17.readFileSync)((0, import_path18.join)(dir, file2), "utf-8");
+    const sql = (0, import_fs18.readFileSync)((0, import_path18.join)(dir, file2), "utf-8");
     await pool2.query(sql);
     await pool2.query("INSERT INTO _migrations (name) VALUES ($1)", [file2]);
   }
@@ -141179,6 +141489,7 @@ var ManagedSessionsRepository = class {
   updateStatusStmt;
   getStmt;
   listNonTerminalStmt;
+  listRecoverableStmt;
   deleteStmt;
   constructor(db) {
     this.upsertStmt = db.prepare(`
@@ -141231,6 +141542,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. */
@@ -141282,6 +141600,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);
   }
@@ -141417,6 +141743,54 @@ var SessionsRepository = class {
   }
 };
 
+// src/db/runtime-store.ts
+var import_better_sqlite33 = __toESM(require("better-sqlite3"), 1);
+var RuntimeStore = class _RuntimeStore {
+  constructor(db) {
+    this.db = db;
+  }
+  db;
+  static open(dbPath, migrationsDir) {
+    const db = new import_better_sqlite33.default(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;
@@ -141440,8 +141814,8 @@ async function recordUpload(pool2, instanceId, row) {
 init_feature_flags();
 
 // src/handlers/handleListProjects.ts
-var import_fs18 = require("fs");
-var import_os7 = require("os");
+var import_fs19 = require("fs");
+var import_os8 = require("os");
 var import_path19 = require("path");
 function decodeProjectPath(dirName) {
   return dirName.replace(/-/g, "/");
@@ -141449,14 +141823,14 @@ function decodeProjectPath(dirName) {
 function handleListProjects(url2, res) {
   const limit = Math.max(1, parseInt(url2.searchParams.get("limit") ?? "50", 10) || 50);
   const offset = Math.max(0, parseInt(url2.searchParams.get("offset") ?? "0", 10) || 0);
-  const projectsDir = (0, import_path19.join)((0, import_os7.homedir)(), ".claude", "projects");
+  const projectsDir = (0, import_path19.join)((0, import_os8.homedir)(), ".claude", "projects");
   let entries;
   try {
-    entries = (0, import_fs18.readdirSync)(projectsDir).map((dirName) => {
+    entries = (0, import_fs19.readdirSync)(projectsDir).map((dirName) => {
       const fullPath = (0, import_path19.join)(projectsDir, dirName);
       let mtime = 0;
       try {
-        mtime = (0, import_fs18.statSync)(fullPath).mtimeMs;
+        mtime = (0, import_fs19.statSync)(fullPath).mtimeMs;
       } catch {
       }
       const path2 = decodeProjectPath(dirName);
@@ -141492,21 +141866,21 @@ var import_path23 = require("path");
 // src/codex-pty-runner.ts
 var import_headless = __toESM(require_xterm_headless(), 1);
 var import_crypto8 = require("crypto");
-var import_fs20 = require("fs");
+var import_fs21 = require("fs");
 var import_path21 = require("path");
 init_logger();
 
 // src/services/questions/codexGateAnswers.ts
-var import_fs19 = require("fs");
-var import_os8 = require("os");
+var import_fs20 = require("fs");
+var import_os9 = require("os");
 var import_path20 = require("path");
 function gateAnswersPath() {
-  const dir = process.env.THREADBASE_CONFIG_DIR ?? (0, import_path20.join)((0, import_os8.homedir)(), ".threadbase");
+  const dir = process.env.THREADBASE_CONFIG_DIR ?? (0, import_path20.join)((0, import_os9.homedir)(), ".threadbase");
   return (0, import_path20.join)(dir, "gate-answers.json");
 }
 function loadGateAnswers() {
   try {
-    const parsed = JSON.parse((0, import_fs19.readFileSync)(gateAnswersPath(), "utf-8"));
+    const parsed = JSON.parse((0, import_fs20.readFileSync)(gateAnswersPath(), "utf-8"));
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
     return {};
@@ -141514,8 +141888,8 @@ function loadGateAnswers() {
 }
 function saveGateAnswer(key, value) {
   const path2 = gateAnswersPath();
-  (0, import_fs19.mkdirSync)((0, import_path20.dirname)(path2), { recursive: true });
-  (0, import_fs19.writeFileSync)(path2, `${JSON.stringify({ ...loadGateAnswers(), [key]: value }, null, 2)}
+  (0, import_fs20.mkdirSync)((0, import_path20.dirname)(path2), { recursive: true });
+  (0, import_fs20.writeFileSync)(path2, `${JSON.stringify({ ...loadGateAnswers(), [key]: value }, null, 2)}
 `);
 }
 function rememberedGateDigit(gate) {
@@ -142191,7 +142565,7 @@ var CodexPtyRunner = class {
     session.statusUpdatedAt = /* @__PURE__ */ new Date();
     const elapsedMs = session.completedAt.getTime() - session.startedAt.getTime();
     if (exitCode !== 0 && elapsedMs < 2e3 && session.lastOutput === "") {
-      if (!(0, import_fs20.existsSync)(session.projectPath)) {
+      if (!(0, import_fs21.existsSync)(session.projectPath)) {
         session.failureReason = `Project directory not found: ${session.projectPath}`;
       } else {
         session.failureReason = `Codex process exited immediately (code ${exitCode}).`;
@@ -142230,7 +142604,7 @@ function stripAnsi(str) {
 // src/pty-manager.ts
 var import_headless2 = __toESM(require_xterm_headless(), 1);
 var import_crypto9 = require("crypto");
-var import_fs21 = require("fs");
+var import_fs22 = require("fs");
 var import_path22 = require("path");
 init_claude_flags();
 init_logger();
@@ -142438,6 +142812,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;
@@ -142911,6 +143291,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, ts2);
   }
   getSession(sessionId) {
@@ -143142,7 +143526,7 @@ var PTYManager = class {
     session.statusUpdatedAt = /* @__PURE__ */ new Date();
     const elapsedMs = session.completedAt.getTime() - session.startedAt.getTime();
     if (exitCode !== 0 && elapsedMs < 2e3 && session.lastOutput === "") {
-      if (!(0, import_fs21.existsSync)(session.projectPath)) {
+      if (!(0, import_fs22.existsSync)(session.projectPath)) {
         session.failureReason = `Project directory not found: ${session.projectPath}`;
       } else {
         session.failureReason = `Process exited immediately (code ${exitCode}). Check that the Claude binary is installed and accessible.`;
@@ -143176,7 +143560,9 @@ function toPublicSession2(s3) {
     ...s3.lastActivityAt != null && { lastActivityAt: s3.lastActivityAt },
     ...s3.statusSource != null && { statusSource: s3.statusSource },
     ...s3.statusUpdatedAt != null && { statusUpdatedAt: s3.statusUpdatedAt },
-    ...s3.filePath != null && { filePath: s3.filePath }
+    ...s3.filePath != null && { filePath: s3.filePath },
+    ...s3.sessionName != null && { sessionName: s3.sessionName },
+    ...s3.firstMessageText != null && { firstMessageText: s3.firstMessageText }
   };
 }
 function stripAnsi2(str) {
@@ -143351,10 +143737,10 @@ var PairTokenStore = class {
 
 // src/process-discovery.ts
 var import_child_process3 = require("child_process");
-var import_os9 = require("os");
+var import_os10 = require("os");
 var import_path24 = require("path");
 async function discoverClaudeProcesses() {
-  if ((0, import_os9.platform)() === "win32") return discoverWindows();
+  if ((0, import_os10.platform)() === "win32") return discoverWindows();
   return discoverUnix();
 }
 var CLAUDE_CLI_SCRIPT = /claude-code[\\/](?:cli|index)\.(?:js|mjs|cjs)$/i;
@@ -143494,7 +143880,7 @@ async function getProcessArgsUnix(pid) {
 async function getProcessArgs(pid) {
   if (!Number.isInteger(pid) || pid < 1) return "";
   try {
-    if ((0, import_os9.platform)() === "win32") {
+    if ((0, import_os10.platform)() === "win32") {
       const info = await getProcessInfoWindows(pid);
       return info?.args ?? "";
     }
@@ -143645,19 +144031,19 @@ function setCacheMetadata(repo, key, value) {
 
 // src/services/cache-integrity/cacheIntegrityMonitor.ts
 var import_crypto11 = require("crypto");
-var import_fs24 = require("fs");
+var import_fs25 = require("fs");
 
 // src/services/cache-integrity/alertStore.ts
-var import_fs22 = require("fs");
-var import_os10 = require("os");
+var import_fs23 = require("fs");
+var import_os11 = require("os");
 var import_path25 = require("path");
 function alertStatePath() {
-  const dir = process.env.THREADBASE_CONFIG_DIR ?? (0, import_path25.join)((0, import_os10.homedir)(), ".threadbase");
+  const dir = process.env.THREADBASE_CONFIG_DIR ?? (0, import_path25.join)((0, import_os11.homedir)(), ".threadbase");
   return (0, import_path25.join)(dir, "cache-alert.json");
 }
 function loadAlertState() {
   try {
-    const parsed = JSON.parse((0, import_fs22.readFileSync)(alertStatePath(), "utf-8"));
+    const parsed = JSON.parse((0, import_fs23.readFileSync)(alertStatePath(), "utf-8"));
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
     return {};
@@ -143665,13 +144051,13 @@ function loadAlertState() {
 }
 function saveAlertState(state) {
   const path2 = alertStatePath();
-  (0, import_fs22.mkdirSync)((0, import_path25.dirname)(path2), { recursive: true });
-  (0, import_fs22.writeFileSync)(path2, `${JSON.stringify(state, null, 2)}
+  (0, import_fs23.mkdirSync)((0, import_path25.dirname)(path2), { recursive: true });
+  (0, import_fs23.writeFileSync)(path2, `${JSON.stringify(state, null, 2)}
 `);
 }
 
 // src/services/cache-integrity/backup.ts
-var import_fs23 = require("fs");
+var import_fs24 = require("fs");
 var import_path26 = require("path");
 var DEFAULT_RETAIN = 3;
 function retainCount() {
@@ -143684,16 +144070,16 @@ function timestamp(d) {
 }
 async function backupCacheDb(db, cacheDir) {
   const backupsDir = (0, import_path26.join)(cacheDir, "backups");
-  (0, import_fs23.mkdirSync)(backupsDir, { recursive: true });
+  (0, import_fs24.mkdirSync)(backupsDir, { recursive: true });
   const destPath = (0, import_path26.join)(backupsDir, `cache-${timestamp(/* @__PURE__ */ new Date())}.db`);
   await db.backup(destPath);
   const retain = retainCount();
-  const backups = (0, import_fs23.readdirSync)(backupsDir).filter((f2) => f2.startsWith("cache-") && f2.endsWith(".db")).map((f2) => {
+  const backups = (0, import_fs24.readdirSync)(backupsDir).filter((f2) => f2.startsWith("cache-") && f2.endsWith(".db")).map((f2) => {
     const full = (0, import_path26.join)(backupsDir, f2);
-    return { full, mtime: (0, import_fs23.statSync)(full).mtimeMs };
+    return { full, mtime: (0, import_fs24.statSync)(full).mtimeMs };
   }).sort((a, b2) => b2.mtime - a.mtime);
   for (const stale of backups.slice(retain)) {
-    if ((0, import_fs23.existsSync)(stale.full)) (0, import_fs23.unlinkSync)(stale.full);
+    if ((0, import_fs24.existsSync)(stale.full)) (0, import_fs24.unlinkSync)(stale.full);
   }
   return destPath;
 }
@@ -143790,7 +144176,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(import_fs24.existsSync);
+    const all = this.cache.listMissingFiles(import_fs25.existsSync);
     const missing = all.filter((m2) => !this.ignoredIds.has(m2.id));
     if (missing.length === 0) {
       if (this._pending) {
@@ -143894,7 +144280,7 @@ var CacheIntegrityMonitor = class {
       case "prune_all": {
         await this.ensureBackup(pending);
         const backupPath = pending.backupPath;
-        const stillMissing = pending.missing.filter((m2) => !(0, import_fs24.existsSync)(m2.filePath)).map((m2) => m2.id);
+        const stillMissing = pending.missing.filter((m2) => !(0, import_fs25.existsSync)(m2.filePath)).map((m2) => m2.id);
         const pruned = this.cache.dropRowsById(stillMissing);
         this.applyDeferredUnlinks();
         this.clearPending();
@@ -143955,7 +144341,7 @@ var CacheIntegrityMonitor = class {
 };
 
 // src/services/conversations/conversationWatcher.ts
-var import_fs25 = require("fs");
+var import_fs26 = require("fs");
 var import_promises14 = require("fs/promises");
 var ConversationWatcher = class {
   files = /* @__PURE__ */ new Map();
@@ -143981,7 +144367,7 @@ var ConversationWatcher = class {
     if (this.files.has(key)) return;
     let offset;
     try {
-      offset = (0, import_fs25.statSync)(filePath).size;
+      offset = (0, import_fs26.statSync)(filePath).size;
     } catch {
       offset = 0;
     }
@@ -144163,14 +144549,14 @@ function findSearchTarget(messages, query) {
 }
 
 // src/services/conversations/pruneAgentConversations.ts
-var import_fs26 = require("fs");
+var import_fs27 = require("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 (!(0, import_fs26.existsSync)(row.file_path)) {
+    if (!(0, import_fs27.existsSync)(row.file_path)) {
       missing += 1;
       continue;
     }
@@ -144491,22 +144877,22 @@ function refreshConversationCache(deps) {
 }
 
 // src/services/conversations/shouldRefreshProjectsFromHdd.ts
-var import_fs27 = require("fs");
-var import_os11 = require("os");
+var import_fs28 = require("fs");
+var import_os12 = require("os");
 var import_path27 = require("path");
-var DEFAULT_PROJECTS_DIR = (0, import_path27.join)((0, import_os11.homedir)(), ".claude", "projects");
+var DEFAULT_PROJECTS_DIR = (0, import_path27.join)((0, import_os12.homedir)(), ".claude", "projects");
 function maxProjectsTreeMtimeMs(projectsDir) {
   let maxMs;
   try {
-    maxMs = (0, import_fs27.statSync)(projectsDir).mtimeMs;
+    maxMs = (0, import_fs28.statSync)(projectsDir).mtimeMs;
   } catch {
     return null;
   }
   try {
-    for (const ent of (0, import_fs27.readdirSync)(projectsDir, { withFileTypes: true })) {
+    for (const ent of (0, import_fs28.readdirSync)(projectsDir, { withFileTypes: true })) {
       if (!ent.isDirectory()) continue;
       try {
-        const childMs = (0, import_fs27.statSync)((0, import_path27.join)(projectsDir, ent.name)).mtimeMs;
+        const childMs = (0, import_fs28.statSync)((0, import_path27.join)(projectsDir, ent.name)).mtimeMs;
         if (childMs > maxMs) maxMs = childMs;
       } catch {
       }
@@ -144734,7 +145120,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 {
@@ -144747,14 +145134,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.
    *
@@ -144762,34 +145152,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",
@@ -144799,14 +145177,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 open3 = this.openActivity.get(session.id);
+    if (!open3 || open3.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
+    });
+    open3.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
     });
@@ -144820,9 +145241,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);
   }
 };
 
@@ -145057,7 +145478,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({
@@ -145117,7 +145539,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
@@ -145275,8 +145698,90 @@ 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(raw2, fallback) {
+  if (raw2 === null) return fallback;
+  const n = Number.parseInt(raw2, 10);
+  return Number.isFinite(n) ? n : fallback;
+}
+function parseSearchQuery(params) {
+  const q2 = (params.get("q") ?? "").trim();
+  if (!q2) {
+    throw new SearchQueryError("Missing query parameter: q", "invalid_query");
+  }
+  if (q2.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 raw2 = params.get(key);
+    if (raw2 === null) continue;
+    const ms2 = Date.parse(raw2);
+    if (Number.isNaN(ms2)) {
+      throw new SearchQueryError(`Invalid ${key}: expected an ISO 8601 date`, "invalid_filter");
+    }
+    filters[field] = ms2;
+  }
+  if (filters.since != null && filters.until != null && filters.since > filters.until) {
+    throw new SearchQueryError("`since` must not be after `until`", "invalid_filter");
+  }
+  return { q: q2, 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 ts2 = r.lastActivity == null ? Number.NaN : new Date(r.lastActivity).getTime();
+      if (Number.isNaN(ts2)) return false;
+      if (filters.since != null && ts2 < filters.since) return false;
+      if (filters.until != null && ts2 > 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
-var import_fs28 = require("fs");
+var import_fs29 = require("fs");
 var RESUME_BUSY_WINDOW_MS = 12e4;
 function resolveResumeBusyWindowMs(env = process.env) {
   const raw2 = env.THREADBASE_RESUME_BUSY_WINDOW_MS;
@@ -145293,7 +145798,7 @@ function conversationBusy(input) {
   let lastActivityMs = null;
   if (input.jsonlPath) {
     try {
-      const mtimeMs = (0, import_fs28.statSync)(input.jsonlPath).mtimeMs;
+      const mtimeMs = (0, import_fs29.statSync)(input.jsonlPath).mtimeMs;
       const age = now - mtimeMs;
       lastActivityMs = Math.max(0, age);
       const isSelfEcho = input.selfPtyEndedAt != null && mtimeMs <= input.selfPtyEndedAt + SELF_ACTIVITY_SKEW_MS;
@@ -145422,6 +145927,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/agent/dedupe.ts
 function createProgressDedupeLRU(capacity) {
   if (!Number.isFinite(capacity) || capacity < 1) {
@@ -145595,14 +146144,15 @@ function managedToResponse(s3, 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" : s3.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" : s3.rehydrated ? "resumable" : s3.failureReason != null ? "failed" : "completed",
+    lifecycleSource: ptyAttached ? "spawn" : s3.rehydrated ? "reconcile" : "exit",
     // We spawned it, so `status` is the authoritative signal — no inferred
     // `activity` is attached for managed sessions.
-    ownership: "managed",
+    ownership: s3.rehydrated ? "historical" : "managed",
     projectPath: s3.projectPath,
     projectName: s3.projectName,
     branch: s3.branch,
@@ -146003,6 +146553,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;
@@ -146190,10 +146742,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 = (0, import_crypto13.randomUUID)();
@@ -146212,6 +146767,7 @@ var StreamerServer = class {
   liveActivityRenewal = null;
   discoveryCache = null;
   cacheDir;
+  runtimeDbPath;
   tailSize;
   directoryDebounceMs;
   // Trailing-debounced trigger that flags the scanner stale after a quiet
@@ -146243,7 +146799,7 @@ var StreamerServer = class {
     this.skipStartupWarmup = config2.skipStartupWarmup ?? false;
     this.scannerPersistenceDisabled = config2.scannerPersistent === false;
     this.scanProfiles = config2.scanProfiles;
-    this.codexRoots = config2.codexRoots ?? [(0, import_path29.join)((0, import_os12.homedir)(), ".codex", "sessions")];
+    this.codexRoots = config2.codexRoots ?? [(0, import_path29.join)((0, import_os13.homedir)(), ".codex", "sessions")];
     this.ptyGracePeriodMs = config2.ptyGracePeriodMs ?? DEFAULT_PTY_GRACE_PERIOD_MS;
     this.defaultSystemPrompt = config2.defaultSystemPrompt ?? DEFAULT_SYSTEM_PROMPT;
     this.featureFlags = resolveFeatureFlags({ cli: config2.featureFlags, yaml: loadFeatureFlags() });
@@ -146257,7 +146813,8 @@ var StreamerServer = class {
     this.claudeFlagsPersistable = config2.claudeFlags === void 0;
     this.claudeFlags = config2.claudeFlags ?? loadClaudeFlags();
     this.claudeExtraArgs = config2.claudeExtraArgs ?? loadClaudeExtraArgs();
-    this.cacheDir = config2.cacheDir ?? loadCacheDir() ?? (0, import_path29.join)((0, import_os12.homedir)(), ".threadbase", "cache");
+    this.cacheDir = config2.cacheDir ?? loadCacheDir() ?? (0, import_path29.join)((0, import_os13.homedir)(), ".threadbase", "cache");
+    this.runtimeDbPath = config2.runtimeDbPath ?? process.env.THREADBASE_RUNTIME_DB ?? (0, import_path29.join)(process.env.THREADBASE_CONFIG_DIR ?? (0, import_path29.join)((0, import_os13.homedir)(), ".threadbase"), "runtime.db");
     this.tailSize = config2.tailSize ?? loadTailSize() ?? 10;
     this.directoryDebounceMs = parseDirScanDebounceEnv(process.env.THREADBASE_DIR_SCAN_DEBOUNCE_MS) ?? config2.directoryScanDebounceMs ?? 1e3;
     this.markScannerStaleDebounced = debounce(() => {
@@ -146308,7 +146865,7 @@ var StreamerServer = class {
           const seqs = cache.extendMessageIndex(
             filePath,
             spans,
-            (0, import_fs29.statSync)(filePath),
+            (0, import_fs30.statSync)(filePath),
             readFrom,
             endOffset
           );
@@ -146428,6 +146985,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,
@@ -146482,7 +147040,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);
       }
     });
@@ -146533,6 +147091,7 @@ var StreamerServer = class {
       conversationsRepo: () => this.conversationsRepo,
       sessionsRepo: () => this.sessionsRepo,
       cacheMetadataRepo: () => this.cacheMetadataRepo,
+      runtimeStore: () => this.runtimeStore,
       ptyAttachedIds: () => this.ptyAttachedIds(),
       handleListSessions: (url2, res) => this.handleListSessions(url2, res),
       handleSessionsCount: (res) => this.handleSessionsCount(res),
@@ -146771,14 +147330,14 @@ var StreamerServer = class {
     }
     this.apnsClient = new ApnsClient(creds);
     const sender = new LiveActivitySender(this.apnsClient, pushRepo);
-    const serverId = process.env.THREADBASE_INSTANCE_ID ?? (0, import_os12.hostname)();
-    this.liveActivityNotifier = new LiveActivityNotifier(sender, serverId, (0, import_os12.hostname)());
+    const serverId = process.env.THREADBASE_INSTANCE_ID ?? (0, import_os13.hostname)();
+    this.liveActivityNotifier = new LiveActivityNotifier(sender, serverId, (0, import_os13.hostname)());
     this.liveActivityRenewal = new LiveActivityRenewalScheduler({
       repo: pushRepo,
       sender,
       sessionStore: this.sessionStore,
       serverId,
-      serverLabel: (0, import_os12.hostname)()
+      serverLabel: (0, import_os13.hostname)()
     });
     this.liveActivityRenewal.start();
     this.log.info("Live Activity push enabled", {
@@ -146832,6 +147391,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((v2) => [v2.sessionId, v2.lifecycle]));
+      let rehydrated = 0;
+      for (const row of candidates) {
+        if (this.sessionStore.getManaged(row.session_id)) continue;
+        if (!shouldRehydrate(row, { now, projectExists: import_fs30.existsSync })) 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.
@@ -147065,6 +147676,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(
             (0, import_path29.join)(this.cacheDir, "cache.db"),
@@ -147092,8 +147714,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);
@@ -147117,7 +147751,7 @@ var StreamerServer = class {
             this.fileWatcher.watchDirectory(dir);
           }
           for (const dir of this.codexRoots) {
-            if (!(0, import_fs29.existsSync)(dir)) continue;
+            if (!(0, import_fs30.existsSync)(dir)) continue;
             this.fileWatcher.watchDirectory(dir);
           }
         } catch (err) {
@@ -147129,6 +147763,7 @@ var StreamerServer = class {
           );
           this.scannerPersistenceDisabled = true;
         }
+        void this.reconcilePreviousSessions().then((v2) => this.rehydratePreviousSessions(v2));
         if (this.skipStartupWarmup) {
           this.log.debug?.("startup warm-up scan skipped (skipStartupWarmup)", {
             event: "cache.warmup_skipped"
@@ -147336,6 +147971,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();
@@ -147390,7 +148026,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";
       json2(res, 400, { error: message });
@@ -147436,7 +148072,7 @@ var StreamerServer = class {
       nonce: sealed.nonce,
       ephemeralPublicKey: sealed.ephemeralPublicKey,
       publicUrl: this.publicUrl,
-      machineName: (0, import_os12.hostname)(),
+      machineName: (0, import_os13.hostname)(),
       ...device && {
         deviceId: device.deviceId,
         deviceToken: device.deviceToken,
@@ -147564,7 +148200,7 @@ var StreamerServer = class {
     if (this.scanProfiles && this.scanProfiles.length > 0) {
       return this.scanProfiles.filter((p2) => p2.enabled).map((p2) => (0, import_path29.join)(p2.configDir, "projects"));
     }
-    return [(0, import_path29.join)((0, import_os12.homedir)(), ".claude", "projects")];
+    return [(0, import_path29.join)((0, import_os13.homedir)(), ".claude", "projects")];
   }
   /**
    * Full-glob scan + cache upsert/delete reconcile. Used by ?refresh=1 and by
@@ -147783,7 +148419,8 @@ var StreamerServer = class {
   }
   handleSessionsCount(res) {
     if (this.rejectIfWarmingUp(res)) return;
-    json2(res, 200, { total: this.sessionStore.list(this.ptyAttachedIds()).length });
+    const total = this.sessionStore.list(this.ptyAttachedIds()).filter((s3) => s3.ownership !== "historical").length;
+    json2(res, 200, { total });
   }
   handleGetRecentSessions(url2, res) {
     if (this.rejectIfWarmingUp(res)) return;
@@ -147966,20 +148603,20 @@ var StreamerServer = class {
     if (this.scanProfiles && this.scanProfiles.length > 0) {
       return this.scanProfiles.filter((p2) => p2.enabled).map((p2) => (0, import_path29.join)(p2.configDir, "projects"));
     }
-    return [(0, import_path29.join)((0, import_os12.homedir)(), ".claude", "projects")];
+    return [(0, import_path29.join)((0, import_os13.homedir)(), ".claude", "projects")];
   }
   findJsonlPath(uuid3) {
     const filename = `${uuid3}.jsonl`;
     for (const projectsDir of this.projectsDirs()) {
-      if (!(0, import_fs29.existsSync)(projectsDir)) continue;
-      for (const dir of (0, import_fs29.readdirSync)(projectsDir)) {
+      if (!(0, import_fs30.existsSync)(projectsDir)) continue;
+      for (const dir of (0, import_fs30.readdirSync)(projectsDir)) {
         const fp = (0, import_path29.join)(projectsDir, dir, filename);
-        if ((0, import_fs29.existsSync)(fp)) return fp;
+        if ((0, import_fs30.existsSync)(fp)) return fp;
         const projectDir = (0, import_path29.join)(projectsDir, dir);
         try {
-          for (const sub of (0, import_fs29.readdirSync)(projectDir)) {
+          for (const sub of (0, import_fs30.readdirSync)(projectDir)) {
             const subagentPath = (0, import_path29.join)(projectDir, sub, "subagents", filename);
-            if ((0, import_fs29.existsSync)(subagentPath)) return subagentPath;
+            if ((0, import_fs30.existsSync)(subagentPath)) return subagentPath;
           }
         } catch {
         }
@@ -147989,7 +148626,7 @@ var StreamerServer = class {
   }
   async readCwdFromJsonl(filePath) {
     return new Promise((resolve4) => {
-      const rl = (0, import_readline4.createInterface)({ input: (0, import_fs29.createReadStream)(filePath), crlfDelay: Infinity });
+      const rl = (0, import_readline4.createInterface)({ input: (0, import_fs30.createReadStream)(filePath), crlfDelay: Infinity });
       let found = false;
       rl.on("line", (line) => {
         if (found) return;
@@ -148079,7 +148716,7 @@ var StreamerServer = class {
     if (this.isManagedTailPath(key)) return;
     let mtimeMs;
     try {
-      mtimeMs = (0, import_fs29.statSync)(filePath).mtimeMs;
+      mtimeMs = (0, import_fs30.statSync)(filePath).mtimeMs;
     } catch {
       return;
     }
@@ -148261,7 +148898,7 @@ var StreamerServer = class {
     if (!conv.filePath) return false;
     let mtimeMs = null;
     try {
-      mtimeMs = (0, import_fs29.statSync)(conv.filePath).mtimeMs;
+      mtimeMs = (0, import_fs30.statSync)(conv.filePath).mtimeMs;
     } catch {
       return false;
     }
@@ -148516,7 +149153,7 @@ var StreamerServer = class {
     }
     let body;
     try {
-      body = await readBody(req);
+      body = await readBody2(req);
     } catch {
       res.setHeader("Accept-Query", "application/json");
       json2(res, 422, { error: "Malformed JSON body", code: "invalid_query" });
@@ -148554,17 +149191,27 @@ var StreamerServer = class {
     });
   }
   async handleSearch(url2, res) {
-    const q2 = url2.searchParams.get("q") ?? "";
-    if (!q2) {
-      json2(res, 400, { error: "Missing query parameter: q" });
-      return;
+    let parsed;
+    try {
+      parsed = parseSearchQuery(url2.searchParams);
+    } catch (err) {
+      if (err instanceof SearchQueryError) {
+        json2(res, 400, { error: err.message, code: err.code });
+        return;
+      }
+      throw err;
     }
-    const limit = intParam(url2, "limit", 50);
+    const { q: q2, limit, offset, filters } = parsed;
+    const startedAt = Date.now();
     const scanner = await this.getScanner();
     const results = await search(
       q2,
       {
-        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()
@@ -148588,13 +149235,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_PROVIDER2
+      provider: r.meta.provider ?? CLAUDE_CODE_PROVIDER2,
+      // 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((m2) => ({
+        field: m2.field,
+        snippet: m2.snippet
+      })) : []
     }));
+    const page = paginate(applyFilters(adapted, filters), offset, limit);
     json2(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(url2, res) {
@@ -148640,7 +149298,7 @@ var StreamerServer = class {
     if (this.rejectIfWarmingUp(res)) return;
     const session = this.sessionStore.get(sessionId, this.ptyAttachedIds());
     if (session) {
-      if (!(0, import_fs29.existsSync)(session.projectPath)) {
+      if (!(0, import_fs30.existsSync)(session.projectPath)) {
         session.failureReason = `Project directory not found: ${session.projectPath}`;
       }
       const reconciled = this.withReconciledLifecycle([session])[0];
@@ -148667,7 +149325,7 @@ var StreamerServer = class {
     json2(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) {
       json2(res, 400, { error: "Missing sessionId" });
@@ -148799,7 +149457,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) {
         json2(res, 503, {
@@ -148818,7 +149476,7 @@ var StreamerServer = class {
       json2(res, result.status, result.body);
       return;
     }
-    const body = await readBody(req);
+    const body = await readBody2(req);
     const { input, keys } = body;
     let idempotencyKey;
     try {
@@ -148982,7 +149640,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) {
@@ -149011,7 +149669,7 @@ var StreamerServer = class {
       json2(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") {
       json2(res, 400, { error: "Missing filename, mimeType, or dataBase64" });
@@ -149213,7 +149871,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
@@ -149227,7 +149885,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)) {
       json2(res, 400, { error: "Invalid provider" });
@@ -149364,7 +150022,7 @@ var StreamerServer = class {
   // file isn't slurped in full.
   readFirstLineSessionId(filePath) {
     try {
-      const content = (0, import_fs29.readFileSync)(filePath, "utf8");
+      const content = (0, import_fs30.readFileSync)(filePath, "utf8");
       const nl = content.indexOf("\n");
       const firstLine = nl === -1 ? content : content.slice(0, nl);
       if (!firstLine.trim()) return null;
@@ -149379,7 +150037,7 @@ var StreamerServer = class {
   // was passed to Claude via --session-id so the filename matches from the start.
   watchForJsonl(sessionId, projectPath) {
     const encoded = projectPath.replace(/[/\\:.]/g, "-");
-    const projectsDir = (0, import_path29.join)((0, import_os12.homedir)(), ".claude", "projects", encoded);
+    const projectsDir = (0, import_path29.join)((0, import_os13.homedir)(), ".claude", "projects", encoded);
     const expectedFile = `${sessionId}.jsonl`;
     const filePath = (0, import_path29.join)(projectsDir, expectedFile);
     const deadline = Date.now() + 12e4;
@@ -149399,11 +150057,11 @@ var StreamerServer = class {
         cleanup();
         return;
       }
-      let resolvedFilePath = (0, import_fs29.existsSync)(filePath) ? filePath : null;
-      if (!resolvedFilePath && (0, import_fs29.existsSync)(projectsDir)) {
+      let resolvedFilePath = (0, import_fs30.existsSync)(filePath) ? filePath : null;
+      if (!resolvedFilePath && (0, import_fs30.existsSync)(projectsDir)) {
         try {
           const now = Date.now();
-          const match2 = (0, import_fs29.readdirSync)(projectsDir).filter((f2) => f2.endsWith(".jsonl")).map((f2) => ({ f: f2, mtime: (0, import_fs29.statSync)((0, import_path29.join)(projectsDir, f2)).mtimeMs })).filter(({ mtime }) => now - mtime < 5e3).filter(
+          const match2 = (0, import_fs30.readdirSync)(projectsDir).filter((f2) => f2.endsWith(".jsonl")).map((f2) => ({ f: f2, mtime: (0, import_fs30.statSync)((0, import_path29.join)(projectsDir, f2)).mtimeMs })).filter(({ mtime }) => now - mtime < 5e3).filter(
             ({ f: f2 }) => (0, import_path29.basename)(f2, ".jsonl") === sessionId || this.readFirstLineSessionId((0, import_path29.join)(projectsDir, f2)) === sessionId
           ).sort((a, b2) => b2.mtime - a.mtime)[0];
           if (match2) resolvedFilePath = (0, import_path29.join)(projectsDir, match2.f);
@@ -149414,7 +150072,7 @@ var StreamerServer = class {
       cleanup();
       this.sessionFileMap.set(sessionId, resolvedFilePath);
       try {
-        const existing = (0, import_fs29.readFileSync)(resolvedFilePath, "utf8").split("\n").filter(Boolean);
+        const existing = (0, import_fs30.readFileSync)(resolvedFilePath, "utf8").split("\n").filter(Boolean);
         if (existing.length > 0) {
           this.broadcastConversationLines(sessionId, existing);
         }
@@ -149438,7 +150096,7 @@ var StreamerServer = class {
     if (this.sessionFileMap.has(sessionId)) return;
     try {
       require("fs").mkdirSync(projectsDir, { recursive: true });
-      watcher = (0, import_fs29.watch)(projectsDir, tryWire);
+      watcher = (0, import_fs30.watch)(projectsDir, tryWire);
       watcher.on("error", cleanup);
     } catch {
     }
@@ -149467,7 +150125,7 @@ var StreamerServer = class {
     };
     const matchesProjectPath = (candidatePath) => {
       try {
-        const firstLine = (0, import_fs29.readFileSync)(candidatePath, "utf8").split("\n", 1)[0];
+        const firstLine = (0, import_fs30.readFileSync)(candidatePath, "utf8").split("\n", 1)[0];
         if (!firstLine) return null;
         const parsed = JSON.parse(firstLine);
         if (parsed?.type !== "session_meta") return null;
@@ -149496,15 +150154,15 @@ var StreamerServer = class {
       );
       for (const root of this.codexRoots) {
         const sessionsDir = (0, import_path29.join)(root, dateDir);
-        if (!(0, import_fs29.existsSync)(sessionsDir)) continue;
+        if (!(0, import_fs30.existsSync)(sessionsDir)) continue;
         let candidateFiles;
         try {
-          candidateFiles = (0, import_fs29.readdirSync)(sessionsDir).filter((f2) => f2.endsWith(".jsonl"));
+          candidateFiles = (0, import_fs30.readdirSync)(sessionsDir).filter((f2) => f2.endsWith(".jsonl"));
         } catch {
           continue;
         }
         const nowMs = Date.now();
-        const recentCandidates = candidateFiles.map((f2) => ({ f: f2, mtime: (0, import_fs29.statSync)((0, import_path29.join)(sessionsDir, f2)).mtimeMs })).filter(({ mtime }) => nowMs - mtime < 1e4).sort((a, b2) => b2.mtime - a.mtime);
+        const recentCandidates = candidateFiles.map((f2) => ({ f: f2, mtime: (0, import_fs30.statSync)((0, import_path29.join)(sessionsDir, f2)).mtimeMs })).filter(({ mtime }) => nowMs - mtime < 1e4).sort((a, b2) => b2.mtime - a.mtime);
         for (const { f: f2 } of recentCandidates) {
           const candidatePath = (0, import_path29.join)(sessionsDir, f2);
           const match2 = matchesProjectPath(candidatePath);
@@ -149516,7 +150174,7 @@ var StreamerServer = class {
           this.sessionFileMap.set(sessionId, candidatePath);
           this.fileWatcher.watch(candidatePath);
           try {
-            const existing = (0, import_fs29.readFileSync)(candidatePath, "utf8").split("\n").filter(Boolean);
+            const existing = (0, import_fs30.readFileSync)(candidatePath, "utf8").split("\n").filter(Boolean);
             if (existing.length > 0) {
               this.broadcastConversationLines(sessionId, existing);
             }
@@ -149585,7 +150243,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") {
       json2(res, 400, { error: "Missing name field" });
@@ -149615,7 +150273,7 @@ var StreamerServer = class {
     }
     let parsed;
     try {
-      parsed = await readBody(req);
+      parsed = await readBody2(req);
     } catch {
       json2(res, 400, { error: "Invalid JSON" });
       return;
@@ -149672,7 +150330,7 @@ var StreamerServer = class {
     }
     let parsed;
     try {
-      parsed = await readBody(req);
+      parsed = await readBody2(req);
     } catch {
       json2(res, 400, { error: "Invalid JSON" });
       return;
@@ -149731,7 +150389,7 @@ async function waitForProcessExit(pid, timeoutMs, pollMs = ADOPT_KILL_POLL_MS) {
 }
 function classifyResumability(cwd) {
   if (!cwd) return { resumable: true };
-  if ((0, import_fs29.existsSync)(cwd)) return { resumable: true };
+  if ((0, import_fs30.existsSync)(cwd)) return { resumable: true };
   const ranInWorktree = /\/\.worktrees\//.test(cwd) || /\/\.claude\/worktrees\//.test(cwd);
   return {
     resumable: false,
@@ -149849,7 +150507,7 @@ function parseSessionListQuery(url2) {
   const cursor = url2.searchParams.get("cursor") ?? void 0;
   return { query: { limit, sortBy, order, status, cursor } };
 }
-function readBody(req) {
+function readBody2(req) {
   return new Promise((resolve4, reject) => {
     const chunks = [];
     req.on("data", (chunk) => chunks.push(chunk));
@@ -150401,7 +151059,7 @@ var import_node_fs18 = require("fs");
 
 // node_modules/tar/dist/esm/index.min.js
 var import_events3 = __toESM(require("events"), 1);
-var import_fs30 = __toESM(require("fs"), 1);
+var import_fs31 = __toESM(require("fs"), 1);
 var import_node_events3 = require("events");
 var import_node_stream2 = __toESM(require("stream"), 1);
 var import_node_string_decoder = require("string_decoder");
@@ -150415,8 +151073,8 @@ var Ps = __toESM(require("zlib"), 1);
 var import_zlib = __toESM(require("zlib"), 1);
 var import_node_path15 = require("path");
 var import_node_path16 = require("path");
-var import_fs31 = __toESM(require("fs"), 1);
 var import_fs32 = __toESM(require("fs"), 1);
+var import_fs33 = __toESM(require("fs"), 1);
 var import_path31 = __toESM(require("path"), 1);
 var import_node_path17 = require("path");
 var import_path32 = __toESM(require("path"), 1);
@@ -150425,7 +151083,7 @@ var import_node_assert = __toESM(require("assert"), 1);
 var import_node_crypto6 = require("crypto");
 var import_node_fs14 = __toESM(require("fs"), 1);
 var import_node_path18 = __toESM(require("path"), 1);
-var import_fs33 = __toESM(require("fs"), 1);
+var import_fs34 = __toESM(require("fs"), 1);
 var import_node_fs15 = __toESM(require("fs"), 1);
 var import_node_path19 = __toESM(require("path"), 1);
 var import_node_fs16 = __toESM(require("fs"), 1);
@@ -150777,7 +151435,7 @@ var A = class extends import_node_events3.EventEmitter {
     return Wr;
   }
 };
-var Jr = import_fs30.default.writev;
+var Jr = import_fs31.default.writev;
 var ht = /* @__PURE__ */ Symbol("_autoClose");
 var H2 = /* @__PURE__ */ Symbol("_close");
 var te = /* @__PURE__ */ Symbol("_ended");
@@ -150832,7 +151490,7 @@ var _t = class extends A {
     throw new TypeError("this is a readable stream");
   }
   [at]() {
-    import_fs30.default.open(this[U], "r", (t, e) => this[Ht](t, e));
+    import_fs31.default.open(this[U], "r", (t, e) => this[Ht](t, e));
   }
   [Ht](t, e) {
     t ? this[Ut](t) : (this[u] = e, this.emit("open", e), this[zt]());
@@ -150845,7 +151503,7 @@ var _t = class extends A {
       this[j] = true;
       let t = this[vi]();
       if (t.length === 0) return process.nextTick(() => this[Ii](null, 0, t));
-      import_fs30.default.read(this[u], t, 0, t.length, null, (e, i, r) => this[Ii](e, i, r));
+      import_fs31.default.read(this[u], t, 0, t.length, null, (e, i, r) => this[Ii](e, i, r));
     }
   }
   [Ii](t, e, i) {
@@ -150854,7 +151512,7 @@ var _t = class extends A {
   [H2]() {
     if (this[ht] && typeof this[u] == "number") {
       let t = this[u];
-      this[u] = void 0, import_fs30.default.close(t, (e) => e ? this.emit("error", e) : this.emit("close"));
+      this[u] = void 0, import_fs31.default.close(t, (e) => e ? this.emit("error", e) : this.emit("close"));
     }
   }
   [Ut](t) {
@@ -150882,7 +151540,7 @@ var Be = class extends _t {
   [at]() {
     let t = true;
     try {
-      this[Ht](null, import_fs30.default.openSync(this[U], "r")), t = false;
+      this[Ht](null, import_fs31.default.openSync(this[U], "r")), t = false;
     } finally {
       t && this[H2]();
     }
@@ -150893,7 +151551,7 @@ var Be = class extends _t {
       if (!this[j]) {
         this[j] = true;
         do {
-          let e = this[vi](), i = e.length === 0 ? 0 : import_fs30.default.readSync(this[u], e, 0, e.length, null);
+          let e = this[vi](), i = e.length === 0 ? 0 : import_fs31.default.readSync(this[u], e, 0, e.length, null);
           if (!this[ki](i, e)) break;
         } while (true);
         this[j] = false;
@@ -150906,7 +151564,7 @@ var Be = class extends _t {
   [H2]() {
     if (this[ht] && typeof this[u] == "number") {
       let t = this[u];
-      this[u] = void 0, import_fs30.default.closeSync(t), this.emit("close");
+      this[u] = void 0, import_fs31.default.closeSync(t), this.emit("close");
     }
   }
 };
@@ -150948,7 +151606,7 @@ var et = class extends import_events3.default {
     this[H2](), this[gt] = true, this.emit("error", t);
   }
   [at]() {
-    import_fs30.default.open(this[U], this[tt], this[ie], (t, e) => this[Ht](t, e));
+    import_fs31.default.open(this[U], this[tt], this[ie], (t, e) => this[Ht](t, e));
   }
   [Ht](t, e) {
     this[Me] && this[tt] === "r+" && t && t.code === "ENOENT" ? (this[tt] = "w", this[at]()) : t ? this[Ut](t) : (this[u] = e, this.emit("open", e), this[gt] || this[Ai]());
@@ -150960,7 +151618,7 @@ var et = class extends import_events3.default {
     return typeof t == "string" && (t = Buffer.from(t, e)), this[te] ? (this.emit("error", new Error("write() after end()")), false) : this[u] === void 0 || this[gt] || this[Y2].length ? (this[Y2].push(t), this[ke] = true, false) : (this[gt] = true, this[ve](t), true);
   }
   [ve](t) {
-    import_fs30.default.write(this[u], t, 0, t.length, this[ot], (e, i) => this[Pt](e, i));
+    import_fs31.default.write(this[u], t, 0, t.length, this[ot], (e, i) => this[Pt](e, i));
   }
   [Pt](t, e) {
     t ? this[Ut](t) : (this[ot] !== void 0 && typeof e == "number" && (this[ot] += e), this[Y2].length ? this[Ai]() : (this[gt] = false, this[te] && !this[Ni] ? (this[Ni] = true, this[H2](), this.emit("finish")) : this[ke] && (this[ke] = false, this.emit("drain"))));
@@ -150976,7 +151634,7 @@ var et = class extends import_events3.default {
   [H2]() {
     if (this[ht] && typeof this[u] == "number") {
       let t = this[u];
-      this[u] = void 0, import_fs30.default.close(t, (e) => e ? this.emit("error", e) : this.emit("close"));
+      this[u] = void 0, import_fs31.default.close(t, (e) => e ? this.emit("error", e) : this.emit("close"));
     }
   }
 };
@@ -150984,24 +151642,24 @@ var Wt = class extends et {
   [at]() {
     let t;
     if (this[Me] && this[tt] === "r+") try {
-      t = import_fs30.default.openSync(this[U], this[tt], this[ie]);
+      t = import_fs31.default.openSync(this[U], this[tt], this[ie]);
     } catch (e) {
       if (e?.code === "ENOENT") return this[tt] = "w", this[at]();
       throw e;
     }
-    else t = import_fs30.default.openSync(this[U], this[tt], this[ie]);
+    else t = import_fs31.default.openSync(this[U], this[tt], this[ie]);
     this[Ht](null, t);
   }
   [H2]() {
     if (this[ht] && typeof this[u] == "number") {
       let t = this[u];
-      this[u] = void 0, import_fs30.default.closeSync(t), this.emit("close");
+      this[u] = void 0, import_fs31.default.closeSync(t), this.emit("close");
     }
   }
   [ve](t) {
     let e = true;
     try {
-      this[Pt](null, import_fs30.default.writeSync(this[u], t, 0, t.length, this[ot])), e = false;
+      this[Pt](null, import_fs31.default.writeSync(this[u], t, 0, t.length, this[ot])), e = false;
     } finally {
       if (e) try {
         this[H2]();
@@ -151919,7 +152577,7 @@ var de = class extends A {
     return t === "error" && (this.#t = true), super.emit(t, ...e);
   }
   [ss]() {
-    import_fs32.default.lstat(this.absolute, (t, e) => {
+    import_fs33.default.lstat(this.absolute, (t, e) => {
       if (t) return this.emit("error", t);
       this[si](e);
     });
@@ -151957,7 +152615,7 @@ var de = class extends A {
     this.path.slice(-1) !== "/" && (this.path += "/"), this.stat.size = 0, this[fe](), this.end();
   }
   [is]() {
-    import_fs32.default.readlink(this.absolute, (t, e) => {
+    import_fs33.default.readlink(this.absolute, (t, e) => {
       if (t) return this.emit("error", t);
       this[ns](e);
     });
@@ -151980,7 +152638,7 @@ var de = class extends A {
     this[os]();
   }
   [os]() {
-    import_fs32.default.open(this.absolute, "r", (t, e) => {
+    import_fs33.default.open(this.absolute, "r", (t, e) => {
       if (t) return this.emit("error", t);
       this[hs](e);
     });
@@ -151995,14 +152653,14 @@ var de = class extends A {
   [ii]() {
     let { fd: t, buf: e, offset: i, length: r, pos: n } = this;
     if (t === void 0 || e === void 0) throw new Error("cannot read file without first opening");
-    import_fs32.default.read(t, e, i, r, n, (o, h) => {
+    import_fs33.default.read(t, e, i, r, n, (o, h) => {
       if (o) return this[pt](() => this.emit("error", o));
       this[rs](h);
     });
   }
   [pt](t = () => {
   }) {
-    this.fd !== void 0 && import_fs32.default.close(this.fd, t);
+    this.fd !== void 0 && import_fs33.default.close(this.fd, t);
   }
   [rs](t) {
     if (t <= 0 && this.remain > 0) {
@@ -152037,20 +152695,20 @@ var de = class extends A {
 var ni = class extends de {
   sync = true;
   [ss]() {
-    this[si](import_fs32.default.lstatSync(this.absolute));
+    this[si](import_fs33.default.lstatSync(this.absolute));
   }
   [is]() {
-    this[ns](import_fs32.default.readlinkSync(this.absolute));
+    this[ns](import_fs33.default.readlinkSync(this.absolute));
   }
   [os]() {
-    this[hs](import_fs32.default.openSync(this.absolute, "r"));
+    this[hs](import_fs33.default.openSync(this.absolute, "r"));
   }
   [ii]() {
     let t = true;
     try {
       let { fd: e, buf: i, offset: r, length: n, pos: o } = this;
       if (e === void 0 || i === void 0) throw new Error("fd and buf must be set in READ method");
-      let h = import_fs32.default.readSync(e, i, r, n, o);
+      let h = import_fs33.default.readSync(e, i, r, n, o);
       this[rs](h), t = false;
     } finally {
       if (t) try {
@@ -152065,7 +152723,7 @@ var ni = class extends de {
   }
   [pt](t = () => {
   }) {
-    this.fd !== void 0 && import_fs32.default.closeSync(this.fd), t();
+    this.fd !== void 0 && import_fs33.default.closeSync(this.fd), t();
   }
 };
 var oi = class extends A {
@@ -152396,7 +153054,7 @@ var wt = class extends A {
   [ds](t) {
     t.pending = true, this[G] += 1;
     let e = this.follow ? "stat" : "lstat";
-    import_fs31.default[e](t.absolute, (i, r) => {
+    import_fs32.default[e](t.absolute, (i, r) => {
       t.pending = false, this[G] -= 1, i ? this.emit("error", i) : this[li](t, r);
     });
   }
@@ -152410,7 +153068,7 @@ var wt = class extends A {
     this[Ft]();
   }
   [ms](t) {
-    t.pending = true, this[G] += 1, import_fs31.default.readdir(t.absolute, (e, i) => {
+    t.pending = true, this[G] += 1, import_fs32.default.readdir(t.absolute, (e, i) => {
       if (t.pending = false, this[G] -= 1, e) return this.emit("error", e);
       this[fi](t, i);
     });
@@ -152511,10 +153169,10 @@ var kt = class extends wt {
   }
   [ds](t) {
     let e = this.follow ? "statSync" : "lstatSync";
-    this[li](t, import_fs31.default[e](t.absolute));
+    this[li](t, import_fs32.default[e](t.absolute));
   }
   [ms](t) {
-    this[fi](t, import_fs31.default.readdirSync(t.absolute));
+    this[fi](t, import_fs32.default.readdirSync(t.absolute));
   }
   [di](t) {
     let e = t.entry, i = this.zip;
@@ -152565,8 +153223,8 @@ var Qn = K(Vn, $n, Xn, qn, (s3, t) => {
 });
 var Jn = process.env.__FAKE_PLATFORM__ || process.platform;
 var Er = Jn === "win32";
-var { O_CREAT: wr, O_NOFOLLOW: mr, O_TRUNC: Sr, O_WRONLY: yr } = import_fs33.default.constants;
-var Rr = Number(process.env.__FAKE_FS_O_FILENAME__) || import_fs33.default.constants.UV_FS_O_FILEMAP || 0;
+var { O_CREAT: wr, O_NOFOLLOW: mr, O_TRUNC: Sr, O_WRONLY: yr } = import_fs34.default.constants;
+var Rr = Number(process.env.__FAKE_FS_O_FILENAME__) || import_fs34.default.constants.UV_FS_O_FILEMAP || 0;
 var jn = Er && !!Rr;
 var to = 512 * 1024;
 var eo = Rr | Sr | wr | yr;
@@ -153944,12 +154602,12 @@ program2.command("cache").description("Manage the local SQLite conversation cach
     "Cache directory (default: ~/.threadbase/cache)",
     `${process.env.HOME}/.threadbase/cache`
   ).action((opts) => {
-    const { rmSync: rmSync6, existsSync: existsSync15 } = require("fs");
+    const { rmSync: rmSync6, existsSync: existsSync16 } = require("fs");
     const { join: join29 } = require("path");
     const dbPath = join29(opts.cacheDir, "cache.db");
     for (const suffix of ["", "-shm", "-wal"]) {
       const f2 = dbPath + suffix;
-      if (existsSync15(f2)) {
+      if (existsSync16(f2)) {
         rmSync6(f2);
         log11.info(`Deleted ${f2}`, { path: f2 }, "console");
       }