privateboard 0.1.23 → 0.1.25

package/dist/server.js

@@ -716,6 +716,61 @@ var init_remap_kimi_k2_5_to_k2_6 = __esm({
   }
 });
 
+// src/storage/migrations/041_one_active_llm_key.sql
+var one_active_llm_key_default;
+var init_one_active_llm_key = __esm({
+  "src/storage/migrations/041_one_active_llm_key.sql"() {
+    one_active_llm_key_default = `-- 041_one_active_llm_key.sql
+--
+-- \u26A0\uFE0F DEPRECATED \xB7 superseded by 042_active_llm_provider_pref.sql
+--
+-- This migration originally collapsed multi-key LLM configurations
+-- down to one row by deleting all but the highest-priority. The
+-- design moved on: under the "multi-SIM" model (see migration 042)
+-- users keep MULTIPLE LLM provider keys on file, with a single
+-- \`prefs.active_llm_provider\` field flagging which one is currently
+-- routed through. Destructive deletion was the wrong tool \u2014 users
+-- want to switch between configured providers without re-pasting.
+--
+-- This file is kept as a no-op so the MIGRATIONS array indices stay
+-- stable and so any installation that already recorded "041 applied"
+-- (the developer who first ran the destructive version on a local
+-- db) doesn't try to re-run anything. SQLite's _migrations table is
+-- keyed by name, not content; the recorded run blocks future
+-- executions regardless of what the SQL says here.
+--
+-- New installs of v0.1.25+ see the no-op below, so users upgrading
+-- with multiple LLM keys configured under v0.1.24 don't lose data.
+
+SELECT 1;
+`;
+  }
+});
+
+// src/storage/migrations/042_active_llm_provider_pref.sql
+var active_llm_provider_pref_default;
+var init_active_llm_provider_pref = __esm({
+  "src/storage/migrations/042_active_llm_provider_pref.sql"() {
+    active_llm_provider_pref_default = "-- 042_active_llm_provider_pref.sql\n--\n-- Multi-SIM LLM provider model \xB7 users keep multiple LLM keys on file\n-- and flag exactly one as the active routing carrier. This column\n-- replaces the destructive-collapse approach 041 attempted; key rows\n-- are preserved, the user switches by changing this pref value.\n--\n-- Seed value \xB7 the highest-priority LLM key currently configured at\n-- migration time (matches the ordering used by `LLM_PROVIDER_PRIORITY`\n-- in `src/ai/providers.ts`). NULL when no LLM key exists. The runtime\n-- still derives `defaultModelV` from this carrier; reconcile sweeps\n-- agents accordingly.\n--\n-- Future addition of LLM providers: this migration's seed is one-shot\n-- and only matters for existing users. New installs hit the empty\n-- column and walk through onboarding to set their first provider as\n-- active.\n\nALTER TABLE prefs ADD COLUMN active_llm_provider TEXT;\n\n-- Seed from existing key set \xB7 pick the highest-priority configured\n-- LLM provider (openrouter > bai > anthropic > openai > google > xai).\n-- The seed is a one-shot UPDATE that only matches rows where the new\n-- column is still NULL (= every existing prefs row).\nUPDATE prefs\n   SET active_llm_provider = (\n     SELECT provider\n       FROM provider_keys\n      WHERE provider IN ('openrouter','bai','anthropic','openai','google','xai')\n        AND length(key_blob) > 0\n      ORDER BY CASE provider\n                 WHEN 'openrouter' THEN 1\n                 WHEN 'bai'        THEN 2\n                 WHEN 'anthropic'  THEN 3\n                 WHEN 'openai'     THEN 4\n                 WHEN 'google'     THEN 5\n                 WHEN 'xai'        THEN 6\n               END\n      LIMIT 1\n   )\n WHERE active_llm_provider IS NULL;\n";
+  }
+});
+
+// src/storage/migrations/043_llm_credentials.sql
+var llm_credentials_default;
+var init_llm_credentials = __esm({
+  "src/storage/migrations/043_llm_credentials.sql"() {
+    llm_credentials_default = "-- 043_llm_credentials.sql\n--\n-- Multi-instance LLM provider credentials \xB7 the same provider can now\n-- be added more than once (e.g. two separate OpenRouter accounts, or\n-- a personal + team B.AI key). The legacy `provider_keys` table is\n-- keyed by `provider` (one row per provider), which doesn't support\n-- this. We introduce a new table keyed by an opaque `id` so the same\n-- provider can appear multiple times with distinct user-supplied\n-- labels.\n--\n-- Voice (minimax, elevenlabs) and skill (brave, tavily) keys stay in\n-- `provider_keys` \u2014 they have no use case for multiple credentials\n-- per provider and the existing routes work fine for them.\n--\n-- `prefs.active_llm_credential_id` replaces the brief-lived\n-- `prefs.active_llm_provider` from migration 042. Switching is now a\n-- one-write change to this id; the old column stays in place (NULL\n-- after this migration) to avoid an ALTER\u2026DROP COLUMN that requires\n-- table rebuilds on older SQLite.\n\nCREATE TABLE IF NOT EXISTS llm_credentials (\n  id          TEXT PRIMARY KEY,\n  provider    TEXT NOT NULL,\n  label       TEXT NOT NULL,\n  key_blob    BLOB NOT NULL,\n  created_at  INTEGER NOT NULL,\n  updated_at  INTEGER NOT NULL\n);\n\nCREATE INDEX IF NOT EXISTS llm_credentials_provider_idx\n  ON llm_credentials(provider);\n\nALTER TABLE prefs ADD COLUMN active_llm_credential_id TEXT;\n\n-- One-shot migration \xB7 for every configured LLM row in provider_keys,\n-- create a credential row carrying the same encrypted key_blob. The\n-- generated id uses a 12-char base64 slice of randomblob() for\n-- collision-resistance; labels default to the provider's display\n-- name (frontend will surface them under that label until the user\n-- renames). Empty key_blobs are skipped (legacy \"ever-configured\"\n-- rows that have since been emptied).\nINSERT INTO llm_credentials (id, provider, label, key_blob, created_at, updated_at)\nSELECT\n  lower(hex(randomblob(8))) AS id,\n  provider,\n  CASE provider\n    WHEN 'openrouter' THEN 'OpenRouter'\n    WHEN 'bai'        THEN 'B.AI'\n    WHEN 'anthropic'  THEN 'Claude'\n    WHEN 'openai'     THEN 'ChatGPT'\n    WHEN 'google'     THEN 'Gemini'\n    WHEN 'xai'        THEN 'Grok'\n    WHEN 'deepseek'   THEN 'DeepSeek'\n    ELSE provider\n  END AS label,\n  key_blob,\n  created_at,\n  updated_at\nFROM provider_keys\nWHERE provider IN ('openrouter','bai','anthropic','openai','google','xai','deepseek')\n  AND length(key_blob) > 0;\n\n-- Seed prefs.active_llm_credential_id with the highest-priority\n-- migrated credential. Priority mirrors LLM_PROVIDER_PRIORITY in\n-- src/ai/providers.ts.\nUPDATE prefs\n   SET active_llm_credential_id = (\n     SELECT id FROM llm_credentials\n      ORDER BY CASE provider\n                 WHEN 'openrouter' THEN 1\n                 WHEN 'bai'        THEN 2\n                 WHEN 'anthropic'  THEN 3\n                 WHEN 'openai'     THEN 4\n                 WHEN 'google'     THEN 5\n                 WHEN 'xai'        THEN 6\n                 WHEN 'deepseek'   THEN 7\n               END,\n               created_at ASC\n      LIMIT 1\n   )\n WHERE id = 1\n   AND active_llm_credential_id IS NULL;\n\n-- Clear the now-redundant active_llm_provider \xB7 the credential id is\n-- the new source of truth. The column stays in the schema (avoids a\n-- table rebuild) but post-migration it's always NULL; any reader\n-- that still consults it sees \"no active\" and falls back to the\n-- credential lookup.\nUPDATE prefs SET active_llm_provider = NULL WHERE id = 1;\n\n-- Finally \xB7 remove the migrated LLM rows from provider_keys so the\n-- table is purely voice + skill from here on. Cleared by name; an\n-- explicit IN() list matches what we inserted above.\nDELETE FROM provider_keys\n WHERE provider IN ('openrouter','bai','anthropic','openai','google','xai','deepseek');\n";
+  }
+});
+
+// src/storage/migrations/044_drop_topic_recs.sql
+var drop_topic_recs_default;
+var init_drop_topic_recs = __esm({
+  "src/storage/migrations/044_drop_topic_recs.sql"() {
+    drop_topic_recs_default = '-- 044_drop_topic_recs.sql\n--\n-- The interest-driven topic-recommendations feature ("\u627E\u4F60\u53EF\u80FD\u611F\n-- \u5174\u8DA3\u7684\u8BDD\u9898" trigger card + the recommendation cards under the\n-- home composer) has been removed. Its replacement is a static\n-- catalog of five scenario ad cards rendered purely on the\n-- frontend (see public/app.js \xB7 SCENARIO_CARDS), so there is no\n-- need to keep the storage tables that fed the old dynamic tray.\n--\n-- Tables (and their indexes) removed:\n--   \xB7 topic_rec_jobs        \xB7 async generation job tracking\n--   \xB7 topic_recs            \xB7 synthesised recommendation rows\n--   \xB7 topic_rec_batches     \xB7 one row per generation run\n--\n-- Drop order matters: topic_recs / topic_rec_jobs both FK into\n-- topic_rec_batches (ON DELETE CASCADE / SET NULL), so SQLite\n-- needs the child tables removed first when foreign_keys is ON.\n-- `DROP TABLE IF EXISTS` is idempotent \u2014 re-runs are a no-op.\n\nDROP TABLE IF EXISTS topic_recs;\nDROP TABLE IF EXISTS topic_rec_jobs;\nDROP TABLE IF EXISTS topic_rec_batches;\n';
+  }
+});
+
 // src/storage/db.ts
 var db_exports = {};
 __export(db_exports, {
@@ -813,6 +868,10 @@ var init_db = __esm({
     init_qd_archive();
     init_remap_removed_models();
     init_remap_kimi_k2_5_to_k2_6();
+    init_one_active_llm_key();
+    init_active_llm_provider_pref();
+    init_llm_credentials();
+    init_drop_topic_recs();
     MIGRATIONS = [
       { name: "001_init.sql", sql: init_default },
       { name: "002_default_opus.sql", sql: default_opus_default },
@@ -853,7 +912,11 @@ var init_db = __esm({
       { name: "037_topic_branches.sql", sql: topic_branches_default },
       { name: "038_qd_archive.sql", sql: qd_archive_default },
       { name: "039_remap_removed_models.sql", sql: remap_removed_models_default },
-      { name: "040_remap_kimi_k2_5_to_k2_6.sql", sql: remap_kimi_k2_5_to_k2_6_default }
+      { name: "040_remap_kimi_k2_5_to_k2_6.sql", sql: remap_kimi_k2_5_to_k2_6_default },
+      { name: "041_one_active_llm_key.sql", sql: one_active_llm_key_default },
+      { name: "042_active_llm_provider_pref.sql", sql: active_llm_provider_pref_default },
+      { name: "043_llm_credentials.sql", sql: llm_credentials_default },
+      { name: "044_drop_topic_recs.sql", sql: drop_topic_recs_default }
     ];
     _db = null;
   }
@@ -2625,11 +2688,158 @@ import { createOpenAI } from "@ai-sdk/openai";
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 import { APICallError, streamText } from "ai";
 
-// src/storage/keys.ts
-init_db();
+// src/storage/credentials.ts
 import { createCipheriv, createDecipheriv, randomBytes, scryptSync } from "crypto";
 import { userInfo } from "os";
 
+// src/ai/providers.ts
+var MULTI_MODEL_LLM_PROVIDERS = [
+  "openrouter",
+  "bai"
+];
+var SINGLE_MODEL_LLM_PROVIDERS = [
+  "anthropic",
+  "openai",
+  "google",
+  "xai"
+];
+var ALL_LLM_PROVIDERS = [
+  ...MULTI_MODEL_LLM_PROVIDERS,
+  ...SINGLE_MODEL_LLM_PROVIDERS
+];
+var LLM_PROVIDER_PRIORITY = [
+  "openrouter",
+  "bai",
+  "anthropic",
+  "openai",
+  "google",
+  "xai"
+];
+function isMultiModelProvider(p) {
+  return p === "openrouter" || p === "bai";
+}
+function isLlmProvider(p) {
+  return ALL_LLM_PROVIDERS.indexOf(p) >= 0;
+}
+
+// src/storage/credentials.ts
+init_db();
+var SALT = "boardroom.v1.salt";
+var ALGO = "aes-256-gcm";
+var _key = null;
+function deriveKey() {
+  if (_key) return _key;
+  const username = userInfo().username || "boardroom-default";
+  _key = scryptSync(username, SALT, 32);
+  return _key;
+}
+function encrypt(plain) {
+  const iv = randomBytes(12);
+  const cipher = createCipheriv(ALGO, deriveKey(), iv);
+  const ct = Buffer.concat([cipher.update(plain, "utf8"), cipher.final()]);
+  const tag = cipher.getAuthTag();
+  return Buffer.concat([iv, tag, ct]);
+}
+function decrypt(blob) {
+  const iv = blob.subarray(0, 12);
+  const tag = blob.subarray(12, 28);
+  const ct = blob.subarray(28);
+  const decipher = createDecipheriv(ALGO, deriveKey(), iv);
+  decipher.setAuthTag(tag);
+  return Buffer.concat([decipher.update(ct), decipher.final()]).toString("utf8");
+}
+function maskKey(plain) {
+  const trimmed = plain.trim();
+  if (!trimmed) return "";
+  const n = trimmed.length;
+  if (n <= 4) return "\u2022".repeat(n);
+  if (n <= 12) return `${trimmed.slice(0, 2)}${"\u2022".repeat(n - 4)}${trimmed.slice(-2)}`;
+  return `${trimmed.slice(0, 4)}${"\u2022".repeat(n - 8)}${trimmed.slice(-4)}`;
+}
+function rowToMeta(row) {
+  if (!isLlmProvider(row.provider)) return null;
+  let preview = "";
+  try {
+    preview = maskKey(decrypt(row.key_blob));
+  } catch {
+    preview = "";
+  }
+  return {
+    id: row.id,
+    provider: row.provider,
+    label: row.label,
+    preview,
+    createdAt: row.created_at,
+    updatedAt: row.updated_at
+  };
+}
+function listLlmCredentials() {
+  const rows = getDb().prepare("SELECT id, provider, label, key_blob, created_at, updated_at FROM llm_credentials ORDER BY created_at ASC").all();
+  return rows.map(rowToMeta).filter((m) => m !== null);
+}
+function getLlmCredentialMeta(id) {
+  const row = getDb().prepare("SELECT id, provider, label, key_blob, created_at, updated_at FROM llm_credentials WHERE id = ?").get(id);
+  if (!row) return null;
+  return rowToMeta(row);
+}
+function getLlmCredentialKey(id) {
+  const row = getDb().prepare("SELECT key_blob FROM llm_credentials WHERE id = ?").get(id);
+  if (!row) return null;
+  try {
+    return decrypt(row.key_blob);
+  } catch {
+    return null;
+  }
+}
+function resolveFreeLabel(provider, suggested) {
+  const base = suggested && suggested.trim() || providerDisplayName(provider);
+  const existing = new Set(
+    getDb().prepare("SELECT label FROM llm_credentials").all().map((r) => r.label)
+  );
+  if (!existing.has(base)) return base;
+  for (let n = 2; n < 1e3; n++) {
+    const candidate = `${base} ${n}`;
+    if (!existing.has(candidate)) return candidate;
+  }
+  return `${base} ${Date.now()}`;
+}
+function providerDisplayName(provider) {
+  switch (provider) {
+    case "openrouter":
+      return "OpenRouter";
+    case "bai":
+      return "B.AI";
+    case "anthropic":
+      return "Claude";
+    case "openai":
+      return "ChatGPT";
+    case "google":
+      return "Gemini";
+    case "xai":
+      return "Grok";
+  }
+}
+function createLlmCredential(provider, label, plain) {
+  const trimmed = plain.trim();
+  if (!trimmed) return null;
+  if (!ALL_LLM_PROVIDERS.includes(provider)) return null;
+  const resolvedLabel = resolveFreeLabel(provider, label);
+  const id = randomBytes(8).toString("hex");
+  const blob = encrypt(trimmed);
+  const now = Date.now();
+  getDb().prepare(
+    `INSERT INTO llm_credentials (id, provider, label, key_blob, created_at, updated_at)
+       VALUES (?, ?, ?, ?, ?, ?)`
+  ).run(id, provider, resolvedLabel, blob, now, now);
+  return getLlmCredentialMeta(id);
+}
+function deleteLlmCredential(id) {
+  const meta = getLlmCredentialMeta(id);
+  if (!meta) return null;
+  getDb().prepare("DELETE FROM llm_credentials WHERE id = ?").run(id);
+  return meta.provider;
+}
+
 // src/storage/prefs.ts
 init_db();
 function normalizeWebSearchProviderPref(raw) {
@@ -2639,6 +2849,7 @@ function normalizeMinimaxRegion(raw) {
   return raw === "intl" ? "intl" : "cn";
 }
 function mapRow3(row) {
+  const raw = row.active_llm_provider;
   return {
     name: row.name,
     intro: row.intro,
@@ -2646,6 +2857,8 @@ function mapRow3(row) {
     defaultModelV: row.default_model_v,
     webSearchProvider: normalizeWebSearchProviderPref(row.web_search_provider),
     minimaxRegion: normalizeMinimaxRegion(row.minimax_region),
+    activeLlmProvider: raw && isLlmProvider(raw) ? raw : null,
+    activeLlmCredentialId: row.active_llm_credential_id,
     createdAt: row.created_at,
     updatedAt: row.updated_at
   };
@@ -2655,6 +2868,8 @@ function getPrefs() {
     `SELECT name, intro, avatar_seed, default_model_v,
               COALESCE(web_search_provider, 'brave') AS web_search_provider,
               COALESCE(minimax_region, 'cn') AS minimax_region,
+              active_llm_provider,
+              active_llm_credential_id,
               created_at, updated_at FROM prefs WHERE id = 1`
   ).get();
   if (!row) {
@@ -2689,6 +2904,14 @@ function updatePrefs(patch) {
     fields.push("minimax_region = ?");
     values.push(patch.minimaxRegion === "intl" ? "intl" : "cn");
   }
+  if (patch.activeLlmProvider !== void 0) {
+    fields.push("active_llm_provider = ?");
+    values.push(patch.activeLlmProvider);
+  }
+  if (patch.activeLlmCredentialId !== void 0) {
+    fields.push("active_llm_credential_id = ?");
+    values.push(patch.activeLlmCredentialId);
+  }
   if (fields.length === 0) return getPrefs();
   fields.push("updated_at = ?");
   values.push(Date.now());
@@ -2696,118 +2919,6 @@ function updatePrefs(patch) {
   return getPrefs();
 }
 
-// src/storage/keys.ts
-var SALT = "boardroom.v1.salt";
-var ALGO = "aes-256-gcm";
-var _key = null;
-function deriveKey() {
-  if (_key) return _key;
-  const username = userInfo().username || "boardroom-default";
-  _key = scryptSync(username, SALT, 32);
-  return _key;
-}
-function encrypt(plain) {
-  const iv = randomBytes(12);
-  const cipher = createCipheriv(ALGO, deriveKey(), iv);
-  const ct = Buffer.concat([cipher.update(plain, "utf8"), cipher.final()]);
-  const tag = cipher.getAuthTag();
-  return Buffer.concat([iv, tag, ct]);
-}
-function decrypt(blob) {
-  const iv = blob.subarray(0, 12);
-  const tag = blob.subarray(12, 28);
-  const ct = blob.subarray(28);
-  const decipher = createDecipheriv(ALGO, deriveKey(), iv);
-  decipher.setAuthTag(tag);
-  return Buffer.concat([decipher.update(ct), decipher.final()]).toString("utf8");
-}
-function hasBraveKey() {
-  const k = getKey("brave");
-  return typeof k === "string" && k.length > 0;
-}
-function hasTavilyKey() {
-  const k = getKey("tavily");
-  return typeof k === "string" && k.length > 0;
-}
-function hasWebSearchKey() {
-  return hasBraveKey() || hasTavilyKey();
-}
-function resolveWebSearchBackend(preference) {
-  const b = hasBraveKey();
-  const t = hasTavilyKey();
-  if (!b && !t) return null;
-  if (b && !t) return "brave";
-  if (!b && t) return "tavily";
-  if (preference === "tavily" && t) return "tavily";
-  if (preference === "brave" && b) return "brave";
-  return b ? "brave" : "tavily";
-}
-function getActiveWebSearchCredentials() {
-  const prefRaw = getPrefs().webSearchProvider;
-  const preference = prefRaw === "tavily" ? "tavily" : "brave";
-  const backend = resolveWebSearchBackend(preference);
-  if (!backend) return null;
-  const apiKey = getKey(backend);
-  return apiKey ? { backend, apiKey } : null;
-}
-function maskKey(plain) {
-  const trimmed = plain.trim();
-  if (!trimmed) return "";
-  const n = trimmed.length;
-  if (n <= 4) return "\u2022".repeat(n);
-  if (n <= 12) {
-    return `${trimmed.slice(0, 2)}${"\u2022".repeat(n - 4)}${trimmed.slice(-2)}`;
-  }
-  return `${trimmed.slice(0, 4)}${"\u2022".repeat(n - 8)}${trimmed.slice(-4)}`;
-}
-function listKeyMeta() {
-  const rows = getDb().prepare("SELECT provider, key_blob, updated_at FROM provider_keys").all();
-  const map = /* @__PURE__ */ new Map();
-  for (const r of rows) {
-    let preview = null;
-    if (r.key_blob.length > 0) {
-      try {
-        preview = maskKey(decrypt(r.key_blob));
-      } catch {
-        preview = null;
-      }
-    }
-    map.set(r.provider, {
-      provider: r.provider,
-      configured: r.key_blob.length > 0,
-      updatedAt: r.updated_at,
-      preview
-    });
-  }
-  return Array.from(map.values());
-}
-function getKey(provider) {
-  const row = getDb().prepare("SELECT key_blob FROM provider_keys WHERE provider = ?").get(provider);
-  if (!row) return null;
-  try {
-    return decrypt(row.key_blob);
-  } catch {
-    return null;
-  }
-}
-function setKey(provider, plain) {
-  const trimmed = plain.trim();
-  if (!trimmed) {
-    deleteKey(provider);
-    return;
-  }
-  const blob = encrypt(trimmed);
-  const now = Date.now();
-  getDb().prepare(
-    `INSERT INTO provider_keys (provider, key_blob, created_at, updated_at)
-       VALUES (?, ?, ?, ?)
-       ON CONFLICT(provider) DO UPDATE SET key_blob = excluded.key_blob, updated_at = excluded.updated_at`
-  ).run(provider, blob, now, now);
-}
-function deleteKey(provider) {
-  getDb().prepare("DELETE FROM provider_keys WHERE provider = ?").run(provider);
-}
-
 // src/ai/adapter.ts
 var NoKeyError = class extends Error {
   constructor(provider) {
@@ -2948,84 +3059,34 @@ function formatStreamError(e) {
   }
   return String(e);
 }
-function resolveModel(modelV, carrier, excludeCarriers) {
+function resolveModel(modelV, _carrier, _excludeCarriers) {
+  void _carrier;
+  void _excludeCarriers;
   const meta = getModel(modelV);
-  const skip = (c) => excludeCarriers?.has(c) === true;
-  const orKey = !skip("openrouter") ? getKey("openrouter") : void 0;
-  const baiKey = !skip("bai") ? getKey("bai") : void 0;
-  const directKey = !skip(meta.provider) ? getKey(meta.provider) : void 0;
-  if (carrier === "openrouter" && orKey) {
-    process.stderr.write(`[adapter] modelV=${modelV} \u2192 openrouter:${meta.openrouterId} (pinned)
-`);
-    return openRouterResolved(meta, orKey);
-  }
-  if (carrier === "bai" && baiKey && meta.baiId) {
-    process.stderr.write(`[adapter] modelV=${modelV} \u2192 bai:${meta.baiId} (pinned)
-`);
-    return baiResolved(meta, baiKey);
-  }
-  if (carrier && carrier !== "openrouter" && carrier !== "bai" && carrier === meta.provider) {
-    const pinnedKey = !skip(carrier) ? getKey(carrier) : void 0;
-    if (pinnedKey) {
-      process.stderr.write(`[adapter] modelV=${modelV} \u2192 direct:${meta.provider}/${meta.directApiId} (pinned)
-`);
-      return directResolved(meta, pinnedKey);
-    }
-  }
-  if (carrier && !excludeCarriers?.size) {
-    process.stderr.write(
-      `[adapter] modelV=${modelV} pinned carrier=${carrier} unreachable; falling back to default routing
-`
-    );
-  }
-  if (meta.viaUniversalOnly && orKey) {
-    process.stderr.write(`[adapter] modelV=${modelV} \u2192 openrouter:${meta.openrouterId} (preferred)
-`);
-    return openRouterResolved(meta, orKey);
-  }
-  if (directKey && !meta.viaUniversalOnly) {
-    process.stderr.write(`[adapter] modelV=${modelV} \u2192 direct:${meta.provider}/${meta.directApiId}
+  const credId = getPrefs().activeLlmCredentialId;
+  if (!credId) throw new NoKeyError(meta.provider);
+  const credMeta = getLlmCredentialMeta(credId);
+  const key = getLlmCredentialKey(credId);
+  if (!credMeta || !key) throw new NoKeyError(meta.provider);
+  const p = credMeta.provider;
+  if (p === "openrouter") {
+    if (!meta.openrouterId) throw new NoKeyError(meta.provider);
+    process.stderr.write(`[adapter] modelV=${modelV} \u2192 openrouter:${meta.openrouterId} (cred:${credMeta.label})
 `);
-    return directResolved(meta, directKey);
+    return openRouterResolved(meta, key);
   }
-  if (baiKey && meta.baiId) {
-    process.stderr.write(`[adapter] modelV=${modelV} \u2192 bai:${meta.baiId}
+  if (p === "bai") {
+    if (!meta.baiId) throw new NoKeyError(meta.provider);
+    process.stderr.write(`[adapter] modelV=${modelV} \u2192 bai:${meta.baiId} (cred:${credMeta.label})
 `);
-    return baiResolved(meta, baiKey);
+    return baiResolved(meta, key);
   }
-  if (orKey) {
-    process.stderr.write(`[adapter] modelV=${modelV} \u2192 openrouter:${meta.openrouterId}
-`);
-    return openRouterResolved(meta, orKey);
+  if (meta.provider !== p || meta.viaUniversalOnly) {
+    throw new NoKeyError(meta.provider);
   }
-  if (meta.viaUniversalOnly && directKey) {
-    process.stderr.write(`[adapter] modelV=${modelV} \u2192 direct:${meta.provider}/${meta.directApiId} (viaUniversalOnly fallback \xB7 no OR / B.AI key)
+  process.stderr.write(`[adapter] modelV=${modelV} \u2192 direct:${meta.provider}/${meta.directApiId} (cred:${credMeta.label})
 `);
-    return directResolved(meta, directKey);
-  }
-  throw new NoKeyError(meta.provider);
-}
-function isCarrierAccessDenied(message) {
-  if (!message) return false;
-  const m = message.toLowerCase();
-  if (/\b40[23]\b/.test(m) && /(access|deposit|payment|paid|premium|subscri|quota|balance|fund)/.test(m)) return true;
-  if (/access[_\s-]?denied/.test(m)) return true;
-  if (/deposit\s+required/.test(m)) return true;
-  if (/paid[_\s-]?plan[_\s-]?required/.test(m)) return true;
-  if (/premium[_\s-]?model/.test(m)) return true;
-  if (/insufficient[_\s-]?(?:quota|balance|fund)/.test(m)) return true;
-  if (/quota[_\s-]?exceeded/.test(m)) return true;
-  if (/payment[_\s-]?required/.test(m)) return true;
-  if (/billing/.test(m) && /(disabled|inactive|required|invalid|missing)/.test(m)) return true;
-  if (/model[_\s-]?not[_\s-]?found/.test(m)) return true;
-  if (/no\s+available\s+channel/.test(m)) return true;
-  if (/no\s+endpoints?\s+found/.test(m)) return true;
-  if (/invalid\s+model/.test(m)) return true;
-  if (/model.*(unavailable|not\s+(?:supported|available))/.test(m)) return true;
-  if (/prohibited.*(?:terms?\s+of\s+service|provider)/.test(m)) return true;
-  if (/provider.*terms?\s+of\s+service/.test(m)) return true;
-  if (/violates?\s+(?:our|the)?\s*(?:terms|policy|content)/.test(m)) return true;
-  return false;
+  return directResolved(meta, key);
 }
 function directResolved(meta, apiKey) {
   switch (meta.provider) {
@@ -3157,8 +3218,6 @@ async function* callLLMStream(req) {
   let attempt = 0;
   let lastTransientMessage = "";
   let yieldedText = false;
-  const triedCarriers = /* @__PURE__ */ new Set();
-  triedCarriers.add(resolved.carrier);
   while (attempt < RETRY_MAX_ATTEMPTS) {
     attempt++;
     if (req.signal?.aborted) {
@@ -3200,21 +3259,6 @@ async function* callLLMStream(req) {
             retriableErrorMessage = msg;
             break;
           }
-          if (!yieldedText && isCarrierAccessDenied(msg)) {
-            try {
-              const next = resolveModel(req.modelV, null, triedCarriers);
-              triedCarriers.add(next.carrier);
-              process.stderr.write(
-                `[adapter] modelV=${req.modelV} carrier=${resolved.carrier} rejected (access denied); retrying via ${next.carrier}
-`
-              );
-              resolved = next;
-              attempt = 0;
-              retriableErrorMessage = msg;
-              break;
-            } catch {
-            }
-          }
           sawError = true;
           yield { type: "error", message: msg };
         }
@@ -3257,20 +3301,6 @@ async function* callLLMStream(req) {
         lastTransientMessage = msg;
         continue;
       }
-      if (!yieldedText && isCarrierAccessDenied(msg)) {
-        try {
-          const next = resolveModel(req.modelV, null, triedCarriers);
-          triedCarriers.add(next.carrier);
-          process.stderr.write(
-            `[adapter] modelV=${req.modelV} carrier=${resolved.carrier} rejected (access denied / threw); retrying via ${next.carrier}
-`
-          );
-          resolved = next;
-          attempt = 0;
-          continue;
-        } catch {
-        }
-      }
       yield { type: "error", message: msg };
       return;
     }
@@ -3307,68 +3337,147 @@ async function callLLMWithUsage(req) {
   return { text: buf, usage };
 }
 
-// src/storage/reconcile-models.ts
-var PRIMARY_BY_CARRIER = {
-  openrouter: "opus-4-6-fast",
-  bai: "haiku-4-5",
+// src/storage/keys.ts
+init_db();
+import { createCipheriv as createCipheriv2, createDecipheriv as createDecipheriv2, randomBytes as randomBytes2, scryptSync as scryptSync2 } from "crypto";
+import { userInfo as userInfo2 } from "os";
+var SALT2 = "boardroom.v1.salt";
+var ALGO2 = "aes-256-gcm";
+var _key2 = null;
+function deriveKey2() {
+  if (_key2) return _key2;
+  const username = userInfo2().username || "boardroom-default";
+  _key2 = scryptSync2(username, SALT2, 32);
+  return _key2;
+}
+function encrypt2(plain) {
+  const iv = randomBytes2(12);
+  const cipher = createCipheriv2(ALGO2, deriveKey2(), iv);
+  const ct = Buffer.concat([cipher.update(plain, "utf8"), cipher.final()]);
+  const tag = cipher.getAuthTag();
+  return Buffer.concat([iv, tag, ct]);
+}
+function decrypt2(blob) {
+  const iv = blob.subarray(0, 12);
+  const tag = blob.subarray(12, 28);
+  const ct = blob.subarray(28);
+  const decipher = createDecipheriv2(ALGO2, deriveKey2(), iv);
+  decipher.setAuthTag(tag);
+  return Buffer.concat([decipher.update(ct), decipher.final()]).toString("utf8");
+}
+function hasBraveKey() {
+  const k = getKey("brave");
+  return typeof k === "string" && k.length > 0;
+}
+function hasTavilyKey() {
+  const k = getKey("tavily");
+  return typeof k === "string" && k.length > 0;
+}
+function hasWebSearchKey() {
+  return hasBraveKey() || hasTavilyKey();
+}
+function resolveWebSearchBackend(preference) {
+  const b = hasBraveKey();
+  const t = hasTavilyKey();
+  if (!b && !t) return null;
+  if (b && !t) return "brave";
+  if (!b && t) return "tavily";
+  if (preference === "tavily" && t) return "tavily";
+  if (preference === "brave" && b) return "brave";
+  return b ? "brave" : "tavily";
+}
+function getActiveWebSearchCredentials() {
+  const prefRaw = getPrefs().webSearchProvider;
+  const preference = prefRaw === "tavily" ? "tavily" : "brave";
+  const backend = resolveWebSearchBackend(preference);
+  if (!backend) return null;
+  const apiKey = getKey(backend);
+  return apiKey ? { backend, apiKey } : null;
+}
+function maskKey2(plain) {
+  const trimmed = plain.trim();
+  if (!trimmed) return "";
+  const n = trimmed.length;
+  if (n <= 4) return "\u2022".repeat(n);
+  if (n <= 12) {
+    return `${trimmed.slice(0, 2)}${"\u2022".repeat(n - 4)}${trimmed.slice(-2)}`;
+  }
+  return `${trimmed.slice(0, 4)}${"\u2022".repeat(n - 8)}${trimmed.slice(-4)}`;
+}
+function listKeyMeta() {
+  const rows = getDb().prepare("SELECT provider, key_blob, updated_at FROM provider_keys").all();
+  const map = /* @__PURE__ */ new Map();
+  for (const r of rows) {
+    let preview = null;
+    if (r.key_blob.length > 0) {
+      try {
+        preview = maskKey2(decrypt2(r.key_blob));
+      } catch {
+        preview = null;
+      }
+    }
+    map.set(r.provider, {
+      provider: r.provider,
+      configured: r.key_blob.length > 0,
+      updatedAt: r.updated_at,
+      preview
+    });
+  }
+  return Array.from(map.values());
+}
+function getKey(provider) {
+  const row = getDb().prepare("SELECT key_blob FROM provider_keys WHERE provider = ?").get(provider);
+  if (!row) return null;
+  try {
+    return decrypt2(row.key_blob);
+  } catch {
+    return null;
+  }
+}
+function setKey(provider, plain) {
+  const trimmed = plain.trim();
+  if (!trimmed) {
+    deleteKey(provider);
+    return;
+  }
+  const blob = encrypt2(trimmed);
+  const now = Date.now();
+  getDb().prepare(
+    `INSERT INTO provider_keys (provider, key_blob, created_at, updated_at)
+       VALUES (?, ?, ?, ?)
+       ON CONFLICT(provider) DO UPDATE SET key_blob = excluded.key_blob, updated_at = excluded.updated_at`
+  ).run(provider, blob, now, now);
+}
+function deleteKey(provider) {
+  getDb().prepare("DELETE FROM provider_keys WHERE provider = ?").run(provider);
+}
+
+// src/storage/reconcile-models.ts
+var PRIMARY_BY_CARRIER = {
+  openrouter: "opus-4-6-fast",
+  bai: "haiku-4-5",
   anthropic: "haiku-4-5",
   openai: "gpt-5-4-mini",
   google: "gemini-3-1-flash"
-  // xai · no primary (no LLM modelV in registry as of 2026-05-17). The
-  // adapter / availability layer skip xai when this key is absent.
+  // xai · no primary (no LLM modelV in registry as of 2026-05-17).
 };
-var CARRIER_PRIORITY = ["openrouter", "bai", "anthropic", "openai", "google", "xai"];
 function reachableModelVs() {
   const out = /* @__PURE__ */ new Set();
-  const orKey = !!getKey("openrouter");
-  const baiKey = !!getKey("bai");
+  const p = getProviderKeyState().activeLlmProvider;
+  if (!p) return out;
   for (const [v, meta] of Object.entries(MODELS)) {
-    if (orKey) {
-      out.add(v);
-      continue;
-    }
-    if (baiKey && meta.baiId) {
-      out.add(v);
-      continue;
-    }
-    if (!meta.viaUniversalOnly && hasDirectKey(meta.provider)) {
-      out.add(v);
-      continue;
-    }
-    if (meta.viaUniversalOnly && hasDirectKey(meta.provider)) {
-      out.add(v);
+    if (p === "openrouter") {
+      if (meta.openrouterId) out.add(v);
+    } else if (p === "bai") {
+      if (meta.baiId) out.add(v);
+    } else {
+      if (meta.provider === p && !meta.viaUniversalOnly) out.add(v);
     }
   }
   return out;
 }
-function hasDirectKey(provider) {
-  switch (provider) {
-    case "anthropic":
-    case "openai":
-    case "google":
-    case "xai":
-      return !!getKey(provider);
-    default:
-      return false;
-  }
-}
 function activeCarrier() {
-  const prefs = getPrefs();
-  if (prefs.defaultModelV) {
-    const meta = MODELS[prefs.defaultModelV];
-    if (meta) {
-      if (meta.viaUniversalOnly && getKey("openrouter")) return "openrouter";
-      if (hasDirectKey(meta.provider)) return meta.provider;
-      if (getKey("bai") && meta.baiId) return "bai";
-      if (getKey("openrouter")) return "openrouter";
-    }
-  }
-  for (const c of CARRIER_PRIORITY) {
-    if (c === "openrouter" && getKey("openrouter")) return "openrouter";
-    if (c === "bai" && getKey("bai")) return "bai";
-    if (c !== "openrouter" && c !== "bai" && hasDirectKey(c)) return c;
-  }
-  return null;
+  return getProviderKeyState().activeLlmProvider;
 }
 function reconcileAgentModels(opts = {}) {
   const reachable = reachableModelVs();
@@ -3377,16 +3486,9 @@ function reconcileAgentModels(opts = {}) {
   const forcePrimary = opts.forcePrimary === true;
   const switched = [];
   const cleared = [];
-  const orReachable = !!getKey("openrouter");
-  const baiReachable = !!getKey("bai");
-  function carrierKeyReachable(c) {
-    if (c === "openrouter") return orReachable;
-    if (c === "bai") return baiReachable;
-    return hasDirectKey(c);
-  }
   for (const agent of listAllAgents()) {
     const v = (agent.modelV || "").trim();
-    if (agent.carrierPref && !carrierKeyReachable(agent.carrierPref)) {
+    if (agent.carrierPref) {
       updateAgent(agent.id, { carrierPref: null });
     }
     if (!forcePrimary && v && reachable.has(v)) continue;
@@ -3402,6 +3504,7 @@ function reconcileAgentModels(opts = {}) {
       cleared.push(agent.id);
     }
   }
+  void isMultiModelProvider;
   const prefs = getPrefs();
   const currentReachable = !!prefs.defaultModelV && reachable.has(prefs.defaultModelV);
   const shouldBump = forcePrimary || !prefs.defaultModelV || !currentReachable;
@@ -3415,31 +3518,36 @@ function reconcileAgentModels(opts = {}) {
 
 // src/ai/availability.ts
 function getProviderKeyState() {
-  const directProviders = /* @__PURE__ */ new Set();
-  let hasOpenRouter = false;
-  let hasBai = false;
-  for (const meta of listKeyMeta()) {
-    if (!meta.configured) continue;
-    if (meta.provider === "openrouter") hasOpenRouter = true;
-    else if (meta.provider === "bai") hasBai = true;
-    else if (meta.provider === "brave" || meta.provider === "tavily" || meta.provider === "minimax" || meta.provider === "elevenlabs") continue;
-    else directProviders.add(meta.provider);
-  }
-  return { hasOpenRouter, hasBai, directProviders };
+  const credId = getPrefs().activeLlmCredentialId;
+  if (credId) {
+    const meta = getLlmCredentialMeta(credId);
+    if (meta) return { activeLlmProvider: meta.provider, hasAnyLlmKey: true };
+  }
+  return { activeLlmProvider: null, hasAnyLlmKey: false };
+}
+function routeFor(p) {
+  if (!p) return null;
+  if (p === "openrouter") return "openrouter";
+  if (p === "bai") return "bai";
+  return "direct";
 }
 function availabilityFor(meta, keys) {
-  const directReachable = !meta.viaUniversalOnly && keys.directProviders.has(meta.provider);
-  const orReachable = keys.hasOpenRouter && !!meta.openrouterId;
-  const baiReachable = keys.hasBai && !!meta.baiId;
-  const reachable = directReachable || orReachable || baiReachable;
+  const p = keys.activeLlmProvider;
+  let reachable = false;
+  if (p === "openrouter") {
+    reachable = !!meta.openrouterId;
+  } else if (p === "bai") {
+    reachable = !!meta.baiId;
+  } else if (p) {
+    reachable = meta.provider === p && !meta.viaUniversalOnly;
+  }
   return {
     modelV: meta.v,
     displayName: meta.displayName,
     provider: meta.provider,
     deck: meta.deck,
-    routes: { direct: directReachable, openrouter: orReachable, bai: baiReachable },
     reachable,
-    preferredRoute: directReachable ? "direct" : baiReachable ? "bai" : orReachable ? "openrouter" : null
+    preferredRoute: reachable ? routeFor(p) : null
   };
 }
 function modelAvailability() {
@@ -3450,8 +3558,7 @@ function reachableModels() {
   return modelAvailability().filter((m) => m.reachable);
 }
 function hasAnyModelKey() {
-  const keys = getProviderKeyState();
-  return keys.hasOpenRouter || keys.hasBai || keys.directProviders.size > 0;
+  return getProviderKeyState().hasAnyLlmKey;
 }
 var PROVIDER_FLAGSHIP = {
   anthropic: "opus-4-7",
@@ -3563,36 +3670,15 @@ function effectiveDefaultModel() {
   return fresh;
 }
 function defaultModelFor(keys = getProviderKeyState()) {
-  const reachable = modelAvailability().filter((m) => m.reachable);
-  if (reachable.length === 0) return null;
-  if (!keys.hasOpenRouter && keys.directProviders.size === 1) {
-    const provider = Array.from(keys.directProviders)[0];
-    const fast = PROVIDER_FAST[provider];
-    if (fast && reachable.find((m) => m.modelV === fast)) return fast;
-    const flagship = PROVIDER_FLAGSHIP[provider];
-    if (flagship && reachable.find((m) => m.modelV === flagship)) return flagship;
-  }
-  if (keys.hasOpenRouter) {
-    const fast = reachable.find((m) => m.modelV === "opus-4-6-fast");
-    if (fast) return fast.modelV;
-    const opus = reachable.find((m) => m.modelV === "opus-4-7");
-    if (opus) return opus.modelV;
-  }
-  if (keys.hasBai) {
-    const fast = reachable.find((m) => m.modelV === "haiku-4-5");
-    if (fast) return fast.modelV;
-    const opus = reachable.find((m) => m.modelV === "opus-4-7");
-    if (opus) return opus.modelV;
-  }
-  for (const provider of keys.directProviders) {
-    const fast = PROVIDER_FAST[provider];
-    if (fast && reachable.find((m) => m.modelV === fast)) return fast;
-  }
-  for (const provider of keys.directProviders) {
-    const flagship = PROVIDER_FLAGSHIP[provider];
-    if (flagship && reachable.find((m) => m.modelV === flagship)) return flagship;
-  }
-  return reachable[0].modelV;
+  const p = keys.activeLlmProvider;
+  if (!p) return null;
+  const reachable = new Set(reachableModels().map((m) => m.modelV));
+  if (reachable.size === 0) return null;
+  const fast = PROVIDER_FAST[p];
+  if (fast && reachable.has(fast)) return fast;
+  const flagship = PROVIDER_FLAGSHIP[p];
+  if (flagship && reachable.has(flagship)) return flagship;
+  return reachableModels()[0]?.modelV ?? null;
 }
 var CHEAP_BY_CARRIER = {
   openrouter: "haiku-4-5",
@@ -3613,11 +3699,6 @@ var UTILITY_PREFERENCE = [
 ];
 function utilityModelFor(fallback = null) {
   const reachable = new Set(reachableModels().map((m) => m.modelV));
-  const prefs = getPrefs();
-  const userDefault = prefs.defaultModelV;
-  if (userDefault && UTILITY_PREFERENCE.includes(userDefault) && reachable.has(userDefault)) {
-    return userDefault;
-  }
   const carrier = activeCarrier();
   if (carrier) {
     const preferred = CHEAP_BY_CARRIER[carrier];
@@ -5117,6 +5198,97 @@ function getPartialPersona(jobId) {
   };
 }
 
+// src/orchestrator/celebrity-seed.ts
+var SLUG_RE = /^[a-z][a-z0-9-]{1,40}$/;
+function parseSeed(raw) {
+  let s = raw.trim();
+  if (s.startsWith("```")) {
+    s = s.replace(/^```[a-zA-Z]*\s*/, "").replace(/```\s*$/, "").trim();
+  }
+  let j;
+  try {
+    j = JSON.parse(s);
+  } catch {
+    return null;
+  }
+  if (!j || typeof j !== "object") return null;
+  const o = j;
+  const id = typeof o.id === "string" ? o.id.trim().toLowerCase() : "";
+  const name = typeof o.name === "string" ? o.name.trim() : "";
+  const roleTag = typeof o.roleTag === "string" ? o.roleTag.trim().toLowerCase() : "";
+  const description = typeof o.description === "string" ? o.description.trim() : "";
+  const introRaw = o.intro && typeof o.intro === "object" ? o.intro : {};
+  const introEn = typeof introRaw.en === "string" ? introRaw.en.trim() : "";
+  const introZh = typeof introRaw.zh === "string" ? introRaw.zh.trim() : "";
+  if (!SLUG_RE.test(id)) return null;
+  if (name.length < 2 || name.length > 80) return null;
+  if (roleTag.length < 2 || roleTag.length > 24) return null;
+  if (description.length < 60 || description.length > 1200) return null;
+  if (introEn.length < 8 || introEn.length > 200) return null;
+  if (introZh.length < 4 || introZh.length > 200) return null;
+  return {
+    id,
+    name,
+    roleTag,
+    intro: { en: introEn, zh: introZh },
+    description
+  };
+}
+function buildPrompt(opts) {
+  const excludeBlock = opts.excludeIds.length === 0 ? "(no exclusions)" : opts.excludeIds.slice(0, 200).map((id) => `\xB7 ${id}`).join("\n");
+  const novelty = opts.emphasizeNovelty ? "CRITICAL: do NOT repeat any id from the exclusion list. Re-read it before answering. Pick a different person." : "";
+  return [
+    "You are inventing ONE famous-figure preset card for an app that lets users 'hire' historical or contemporary thinkers as AI directors.",
+    "",
+    "Pick a real, broadly recognisable person \u2014 a founder, scientist, philosopher, investor, artist, writer, or statesperson. Strong bias toward names a literate global audience would recognise instantly (Steve Jobs, Hannah Arendt, John von Neumann, Toni Morrison level).",
+    "",
+    "Output STRICT JSON with exactly these fields, nothing else (no prose before or after, no code fences):",
+    "{",
+    `  "id": "kebab-case-slug",          // lowercase, 2-40 chars, letters/digits/hyphen, starts with a letter`,
+    `  "name": "Display Name",            // verbatim \xB7 keep their real name; CJK names stay CJK`,
+    `  "roleTag": "founder",              // one short English noun \xB7 examples: founder | philosopher | physicist | essayist | investor | architect | mathematician | poet | director | dissident`,
+    `  "intro": {`,
+    `    "en": "one-line tagline \xB7 8 to 30 words \xB7 captures the lens this person brings",`,
+    `    "zh": "\u4E2D\u6587 8 \u5230 30 \u5B57 \xB7 \u4E0E en \u540C\u4E3B\u65E8"`,
+    `  },`,
+    `  "description": "60-400 word seed describing the persona in the second-person mold \u2014 'A first-principles industrialist in the mold of X \u2014 strips problems to physics, ...'. Names the thinking style, the canonical reference points, what they refuse to do, what they always push for. Drives a downstream persona-builder pipeline so concrete is better than abstract."`,
+    "}",
+    "",
+    "Avoid these ids (already in the pool):",
+    excludeBlock,
+    "",
+    novelty
+  ].filter(Boolean).join("\n");
+}
+async function generateCelebritySeed(opts) {
+  const modelV = utilityModelFor();
+  if (!modelV) throw new Error("no utility model available");
+  const excludeSet = new Set(opts.excludeIds);
+  for (let attempt = 0; attempt < 2; attempt++) {
+    const prompt = buildPrompt({
+      excludeIds: opts.excludeIds,
+      emphasizeNovelty: attempt > 0
+    });
+    let raw;
+    try {
+      raw = await callLLM({
+        modelV,
+        messages: [{ role: "user", content: prompt }],
+        temperature: 0.85,
+        maxTokens: 900
+      });
+    } catch (e) {
+      if (attempt === 1) throw e;
+      continue;
+    }
+    const parsed = parseSeed(raw);
+    if (!parsed) continue;
+    if (excludeSet.has(parsed.id)) continue;
+    return parsed;
+  }
+  throw new Error("celebrity-seed \xB7 model failed to produce a valid novel entry");
+}
+
 // src/ai/prompts/persona-render.ts
 var INSTRUCTION_MAX = 6e3;
 function synthesizePersonaInstruction(spec, meta) {
@@ -5361,12 +5533,12 @@ function renderRules(lines, rules) {
 init_db();
 
 // src/utils/id.ts
-import { randomBytes as randomBytes2 } from "crypto";
+import { randomBytes as randomBytes3 } from "crypto";
 var ALPHABET = "0123456789abcdefghjkmnpqrstvwxyz";
 var ALPHABET_LEN = ALPHABET.length;
 var MASK = (1 << 5) - 1;
 function newId(len = 12) {
-  const bytes = randomBytes2(len);
+  const bytes = randomBytes3(len);
   let out = "";
   for (let i = 0; i < len; i++) {
     out += ALPHABET[bytes[i] & MASK];
@@ -5737,7 +5909,7 @@ var TIPS_MAX_COUNT = 8;
 var BODY_MAX_BYTES = 32 * 1024;
 var ABILITY_MIN = -3;
 var ABILITY_MAX = 3;
-var SLUG_RE = /^[a-z0-9][a-z0-9-]*$/;
+var SLUG_RE2 = /^[a-z0-9][a-z0-9-]*$/;
 function slugifyName(name) {
   return name.toLowerCase().normalize("NFKD").replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, SLUG_MAX);
 }
@@ -5790,7 +5962,7 @@ function parseSkillMd(src) {
     }
     slug = raw.slug.trim();
     if (slug.length > SLUG_MAX) return err(`\`slug\` too long (max ${SLUG_MAX})`);
-    if (!SLUG_RE.test(slug)) {
+    if (!SLUG_RE2.test(slug)) {
       return err("`slug` must be lowercase letters, digits, and hyphens (start with letter/digit)");
     }
   }
@@ -6857,6 +7029,23 @@ function agentsRouter() {
     const jobId = startPersonaBuild({ description, locale });
     return c.json({ jobId });
   });
+  r.post("/celebrity-seed", async (c) => {
+    let body;
+    try {
+      body = await c.req.json();
+    } catch {
+      body = {};
+    }
+    const b = body ?? {};
+    const excludeIds = Array.isArray(b.excludeIds) ? b.excludeIds.filter((x) => typeof x === "string").slice(0, 200) : [];
+    try {
+      const seed = await generateCelebritySeed({ excludeIds });
+      return c.json({ seed });
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      return c.json({ error: msg }, 502);
+    }
+  });
   r.get("/generate-persona/:jobId/stream", (c) => {
     const jobId = c.req.param("jobId");
     const job = getPersonaJob(jobId);
@@ -12273,6 +12462,26 @@ function searchMessages(query, limit = 200) {
     createdAt: r.created_at
   }));
 }
+function finalizeStreamingMessage(messageId, reason) {
+  const db = getDb();
+  const before = db.prepare(
+    `SELECT json_extract(meta_json, '$.streaming') AS streaming
+       FROM messages WHERE id = ?`
+  ).get(messageId);
+  if (!before) return false;
+  if (before.streaming !== 1) return false;
+  db.prepare(
+    `UPDATE messages
+       SET meta_json = json_set(
+         COALESCE(meta_json, '{}'),
+         '$.streaming', 0,
+         '$.speakerStatus', 'final',
+         '$.error', ?
+       )
+       WHERE id = ?`
+  ).run(String(reason || "finalized"), messageId);
+  return true;
+}
 
 // src/storage/rooms.ts
 init_db();
@@ -12801,8 +13010,17 @@ function estimateTokens(text) {
 
 // src/orchestrator/stream.ts
 import { EventEmitter as EventEmitter2 } from "events";
+var MAX_BUFFER_PER_ROOM = 100;
+var BUFFER_TTL_MS = 5 * 60 * 1e3;
 var RoomBus = class {
   emitters = /* @__PURE__ */ new Map();
+  buffers = /* @__PURE__ */ new Map();
+  /** Monotonic event id (global across rooms · simpler than per-room
+   *  counters and equivalent for SSE's Last-Event-ID use). Survives
+   *  the lifetime of the process; reset on restart, which is fine ·
+   *  EventSource treats a smaller id from the server as "fresh
+   *  stream" and starts over. */
+  nextId = 1;
   get(roomId) {
     let e = this.emitters.get(roomId);
     if (!e) {
@@ -12812,15 +13030,48 @@ var RoomBus = class {
     }
     return e;
   }
-  emit(roomId, event) {
-    this.get(roomId).emit("event", event);
+  buffer(roomId) {
+    let b = this.buffers.get(roomId);
+    if (!b) {
+      b = [];
+      this.buffers.set(roomId, b);
+    }
+    return b;
   }
-  /** Subscribe; returns an unsubscribe fn. */
+  emit(roomId, event) {
+    const id = this.nextId++;
+    const ts = Date.now();
+    const buf = this.buffer(roomId);
+    buf.push({ id, event, ts });
+    while (buf.length > MAX_BUFFER_PER_ROOM) buf.shift();
+    while (buf.length && ts - buf[0].ts > BUFFER_TTL_MS) buf.shift();
+    this.get(roomId).emit("event", id, event);
+  }
+  /** Legacy subscribe · returns events without ids. Kept for callers
+   *  that don't care about replay (none currently, but the surface
+   *  stays compatible). */
   subscribe(roomId, listener) {
+    return this.subscribeWithId(roomId, (_id, event) => listener(event));
+  }
+  /** Subscribe with monotonic event id · the SSE route uses this so
+   *  every event written to the client carries an `id: N` line. The
+   *  client's EventSource then sends `Last-Event-ID: N` on auto-
+   *  reconnect, which the route maps back to replay() below. */
+  subscribeWithId(roomId, listener) {
     const e = this.get(roomId);
     e.on("event", listener);
     return () => e.off("event", listener);
   }
+  /** Return cached events with id > sinceId in emit order. Used by
+   *  the SSE route on reconnect to replay the gap before subscribing
+   *  fresh. Returns [] when there is no cache OR the gap is older
+   *  than the buffer's retained window (caller treats as "no replay
+   *  possible · client may have missed events permanently"). */
+  replay(roomId, sinceId) {
+    const buf = this.buffers.get(roomId);
+    if (!buf || buf.length === 0) return [];
+    return buf.filter((e) => e.id > sinceId);
+  }
   /** Drop all listeners for a room (e.g. when it's deleted). */
   drop(roomId) {
     const e = this.emitters.get(roomId);
@@ -12828,6 +13079,7 @@ var RoomBus = class {
       e.removeAllListeners();
       this.emitters.delete(roomId);
     }
+    this.buffers.delete(roomId);
   }
 };
 var roomBus = new RoomBus();
@@ -14403,8 +14655,144 @@ function briefsRouter() {
   return r;
 }
 
-// src/routes/keys.ts
+// src/routes/credentials.ts
 import { Hono as Hono4 } from "hono";
+function payloadFor(meta, activeId) {
+  return {
+    id: meta.id,
+    provider: meta.provider,
+    label: meta.label,
+    preview: meta.preview,
+    createdAt: meta.createdAt,
+    updatedAt: meta.updatedAt,
+    isActive: meta.id === activeId
+  };
+}
+function pickNextActiveId(removedProvider) {
+  const all = listLlmCredentials();
+  if (all.length === 0) return null;
+  if (removedProvider) {
+    const sameProvider = all.filter((c) => c.provider === removedProvider);
+    if (sameProvider.length > 0) {
+      sameProvider.sort((a, b) => a.createdAt - b.createdAt);
+      return sameProvider[0].id;
+    }
+  }
+  const sorted = all.slice().sort((a, b) => {
+    const ai = LLM_PROVIDER_PRIORITY.indexOf(a.provider);
+    const bi = LLM_PROVIDER_PRIORITY.indexOf(b.provider);
+    if (ai !== bi) return ai - bi;
+    return a.createdAt - b.createdAt;
+  });
+  return sorted[0]?.id ?? null;
+}
+function credentialsRouter() {
+  const r = new Hono4();
+  r.get("/", (c) => {
+    const activeId = getPrefs().activeLlmCredentialId;
+    const items = listLlmCredentials().map((m) => payloadFor(m, activeId));
+    return c.json({
+      credentials: items,
+      activeId
+    });
+  });
+  r.put("/active", async (c) => {
+    let body;
+    try {
+      body = await c.req.json();
+    } catch {
+      return c.json({ error: "invalid JSON body" }, 400);
+    }
+    const rawId = body?.id;
+    let nextId;
+    if (rawId === null || rawId === void 0) {
+      nextId = null;
+    } else if (typeof rawId === "string") {
+      nextId = rawId;
+    } else {
+      return c.json({ error: "id must be a string or null" }, 400);
+    }
+    if (nextId) {
+      const meta = getLlmCredentialMeta(nextId);
+      if (!meta) return c.json({ error: "credential not found" }, 404);
+      updatePrefs({ activeLlmCredentialId: nextId });
+      const flagship = PRIMARY_BY_CARRIER[meta.provider];
+      if (flagship) updatePrefs({ defaultModelV: flagship });
+    } else {
+      updatePrefs({ activeLlmCredentialId: null });
+    }
+    try {
+      reconcileAgentModels({ forcePrimary: true });
+    } catch (e) {
+      process.stderr.write(`[credentials.active] reconcile failed: ${e instanceof Error ? e.message : String(e)}
+`);
+    }
+    return c.json({ activeId: nextId });
+  });
+  r.post("/", async (c) => {
+    let body;
+    try {
+      body = await c.req.json();
+    } catch {
+      return c.json({ error: "invalid JSON body" }, 400);
+    }
+    const provider = body?.provider;
+    const labelRaw = body?.label;
+    const key = body?.key;
+    if (typeof provider !== "string" || !isLlmProvider(provider)) {
+      return c.json({ error: "provider must be a known LLM slug" }, 400);
+    }
+    if (typeof key !== "string" || key.trim().length === 0) {
+      return c.json({ error: "key must be a non-empty string" }, 400);
+    }
+    const label = typeof labelRaw === "string" ? labelRaw : null;
+    const meta = createLlmCredential(provider, label, key);
+    if (!meta) return c.json({ error: "failed to create credential" }, 500);
+    updatePrefs({ activeLlmCredentialId: meta.id });
+    const flagship = PRIMARY_BY_CARRIER[provider];
+    if (flagship) updatePrefs({ defaultModelV: flagship });
+    try {
+      reconcileAgentModels({ forcePrimary: true });
+    } catch (e) {
+      process.stderr.write(`[credentials.post] reconcile failed: ${e instanceof Error ? e.message : String(e)}
+`);
+    }
+    const activeId = getPrefs().activeLlmCredentialId;
+    return c.json(payloadFor(meta, activeId), 201);
+  });
+  r.delete("/:id", (c) => {
+    const id = c.req.param("id");
+    const meta = getLlmCredentialMeta(id);
+    if (!meta) return c.json({ error: "credential not found" }, 404);
+    const prefs = getPrefs();
+    const wasActive = prefs.activeLlmCredentialId === id;
+    const removedProvider = deleteLlmCredential(id);
+    if (wasActive) {
+      const nextId = pickNextActiveId(removedProvider);
+      updatePrefs({ activeLlmCredentialId: nextId });
+      if (nextId) {
+        const nextMeta = getLlmCredentialMeta(nextId);
+        if (nextMeta) {
+          const flagship = PRIMARY_BY_CARRIER[nextMeta.provider];
+          if (flagship) updatePrefs({ defaultModelV: flagship });
+        }
+      } else {
+        updatePrefs({ defaultModelV: null });
+      }
+    }
+    try {
+      reconcileAgentModels(wasActive ? { forcePrimary: true } : void 0);
+    } catch (e) {
+      process.stderr.write(`[credentials.delete] reconcile failed: ${e instanceof Error ? e.message : String(e)}
+`);
+    }
+    return c.json({ id, deleted: true, activeId: getPrefs().activeLlmCredentialId });
+  });
+  return r;
+}
+
+// src/routes/keys.ts
+import { Hono as Hono5 } from "hono";
 
 // src/voice/registry.ts
 function minimaxBaseUrl() {
@@ -14642,27 +15030,16 @@ function defaultVoiceForProvider(provider) {
 
 // src/routes/keys.ts
 var PROVIDERS = /* @__PURE__ */ new Set([
-  "openrouter",
-  "bai",
-  "anthropic",
-  "openai",
-  "google",
-  "xai",
+  ...ALL_LLM_PROVIDERS,
+  // `deepseek` lives in the storage Provider union for type-compat
+  // with the model registry; no @ai-sdk client routes through it, so
+  // the row is accepted but unused.
   "deepseek",
   "minimax",
   "elevenlabs",
   "brave",
   "tavily"
 ]);
-var LLM_PROVIDERS = /* @__PURE__ */ new Set([
-  "openrouter",
-  "bai",
-  "anthropic",
-  "openai",
-  "google",
-  "xai",
-  "deepseek"
-]);
 function isProvider(s) {
   return PROVIDERS.has(s);
 }
@@ -14700,7 +15077,7 @@ function autoAssignVoicesOnFirstKey(provider) {
   }
 }
 function keysRouter() {
-  const r = new Hono4();
+  const r = new Hono5();
   r.get("/", (c) => {
     const meta = listKeyMeta();
     const map = /* @__PURE__ */ new Map();
@@ -14708,11 +15085,22 @@ function keysRouter() {
     const out = Array.from(PROVIDERS).map(
       (p) => map.get(p) ?? { provider: p, configured: false, updatedAt: null, preview: null }
     );
-    return c.json({ keys: out });
+    return c.json({
+      keys: out,
+      classification: {
+        multiModel: [...MULTI_MODEL_LLM_PROVIDERS],
+        singleModel: [...SINGLE_MODEL_LLM_PROVIDERS],
+        voice: ["minimax", "elevenlabs"],
+        skill: ["brave", "tavily"]
+      }
+    });
   });
   r.put("/:provider", async (c) => {
     const provider = c.req.param("provider");
     if (!isProvider(provider)) return c.json({ error: "unknown provider" }, 400);
+    if (isLlmProvider(provider)) {
+      return c.json({ error: "LLM providers use POST /api/credentials" }, 410);
+    }
     let body;
     try {
       body = await c.req.json();
@@ -14721,30 +15109,9 @@ function keysRouter() {
     }
     const key = body?.key;
     if (typeof key !== "string") return c.json({ error: "body must contain { key: string }" }, 400);
-    const makeDefault = body?.makeDefault === true;
     const hadAnyVoiceKeyBefore = !!getKey("minimax") || !!getKey("elevenlabs");
     setKey(provider, key);
-    if (provider !== "brave" && provider !== "tavily" && provider !== "minimax" && provider !== "elevenlabs") {
-      const willForce = makeDefault && key.trim().length > 0;
-      if (willForce) {
-        const flagship = PRIMARY_BY_CARRIER[provider];
-        if (flagship) {
-          try {
-            updatePrefs({ defaultModelV: flagship });
-          } catch (e) {
-            process.stderr.write(`[keys.put] updatePrefs failed: ${e instanceof Error ? e.message : String(e)}
-`);
-          }
-        }
-      }
-      try {
-        reconcileAgentModels({ forcePrimary: willForce });
-      } catch (e) {
-        process.stderr.write(`[keys.put] reconcile failed: ${e instanceof Error ? e.message : String(e)}
-`);
-      }
-    }
-    if ((provider === "minimax" || provider === "elevenlabs") && key.trim().length > 0 && !hadAnyVoiceKeyBefore) {
+    if ((provider === "minimax" || provider === "elevenlabs") && key.trim().length > 0 && !hadAnyVoiceKeyBefore) {
       try {
         autoAssignVoicesOnFirstKey(provider);
       } catch (e) {
@@ -14760,42 +15127,23 @@ function keysRouter() {
   r.delete("/:provider", (c) => {
     const provider = c.req.param("provider");
     if (!isProvider(provider)) return c.json({ error: "unknown provider" }, 400);
-    if (LLM_PROVIDERS.has(provider)) {
-      const allMeta = listKeyMeta();
-      const targetConfigured = !!allMeta.find((m) => m.provider === provider && m.configured);
-      const configuredLlmCount = allMeta.filter(
-        (m) => LLM_PROVIDERS.has(m.provider) && m.configured
-      ).length;
-      if (targetConfigured && configuredLlmCount <= 1) {
-        return c.json(
-          {
-            error: "Can't remove your only LLM key \u2014 add another LLM provider first, then remove this one."
-          },
-          409
-        );
-      }
+    if (isLlmProvider(provider)) {
+      return c.json({ error: "LLM providers use DELETE /api/credentials/:id" }, 410);
     }
     deleteKey(provider);
-    if (provider !== "brave" && provider !== "tavily" && provider !== "minimax" && provider !== "elevenlabs") {
-      try {
-        reconcileAgentModels();
-      } catch (e) {
-        process.stderr.write(`[keys.delete] reconcile failed: ${e instanceof Error ? e.message : String(e)}
-`);
-      }
-    }
     return c.json({ provider, configured: false, updatedAt: null, preview: null });
   });
   return r;
 }
 
 // src/routes/models.ts
-import { Hono as Hono5 } from "hono";
+import { Hono as Hono6 } from "hono";
 function modelsRouter() {
-  const r = new Hono5();
+  const r = new Hono6();
   r.get("/", (c) => {
     const all = modelAvailability();
     const reachable = all.filter((m) => m.reachable);
+    const active = getProviderKeyState().activeLlmProvider;
     return c.json({
       /** Whether any LLM provider key is configured. False → frontend
        *  redirects the user to the API Key settings before letting
@@ -14811,760 +15159,35 @@ function modelsRouter() {
       /** Global default model · what new agents inherit and what
        *  stale-modelV agents fall back to. NULL when no key is
        *  configured yet. */
-      defaultModelV: effectiveDefaultModel(),
-      /** Cheap utility model used by background tasks (skill picker,
-       *  director auto-pick, agent-spec gen, ability analyzer,
-       *  convening speech). NULL when no key is configured. */
-      utilityModelV: utilityModelFor(),
-      /** Provider summary · so the frontend can show "you have OR +
-       *  OpenAI direct" at a glance without iterating models. */
-      providers: collectProviderSummary(all)
-    });
-  });
-  return r;
-}
-function collectProviderSummary(models) {
-  const map = /* @__PURE__ */ new Map();
-  for (const m of models) {
-    const cur = map.get(m.provider) ?? { reachable: 0, total: 0 };
-    cur.total++;
-    if (m.reachable) cur.reachable++;
-    map.set(m.provider, cur);
-  }
-  return Array.from(map.entries()).map(([provider, v]) => ({ provider, ...v }));
-}
-
-// src/routes/topic-recs.ts
-import { Hono as Hono6 } from "hono";
-import { streamSSE as streamSSE2 } from "hono/streaming";
-
-// src/orchestrator/topic-recommender.ts
-import { randomUUID as randomUUID2 } from "crypto";
-
-// src/storage/topic-recs.ts
-init_db();
-function createTopicRecBatch(input) {
-  const now = Date.now();
-  getDb().prepare("INSERT INTO topic_rec_batches (id, has_web, keywords_json, created_at) VALUES (?, ?, ?, ?)").run(input.id, input.hasWeb ? 1 : 0, JSON.stringify(input.keywords), now);
-  return { id: input.id, hasWeb: input.hasWeb, keywords: input.keywords, createdAt: now };
-}
-function mapRec(r) {
-  let seedContext = null;
-  if (r.seed_context_json) {
-    try {
-      const parsed = JSON.parse(r.seed_context_json);
-      if (Array.isArray(parsed)) {
-        seedContext = parsed.filter(
-          (s) => s && typeof s.title === "string" && typeof s.url === "string" && typeof s.description === "string"
-        );
-      }
-    } catch {
-    }
-  }
-  return {
-    id: r.id,
-    batchId: r.batch_id,
-    subject: r.subject,
-    rationale: r.rationale,
-    source: r.source === "web" ? "web" : "memory",
-    tag: typeof r.tag === "string" && r.tag.trim().length > 0 ? r.tag.trim() : null,
-    seedContext,
-    createdAt: r.created_at,
-    openedRoomId: r.opened_room_id
-  };
-}
-var REC_COLS = "id, batch_id, subject, rationale, source, tag, seed_context_json, created_at, opened_room_id";
-function insertTopicRec(input) {
-  const now = Date.now();
-  getDb().prepare(
-    `INSERT INTO topic_recs
-         (id, batch_id, subject, rationale, source, tag, seed_context_json, created_at, opened_room_id)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, NULL)`
-  ).run(
-    input.id,
-    input.batchId,
-    input.subject,
-    input.rationale,
-    input.source,
-    input.tag,
-    input.seedContext ? JSON.stringify(input.seedContext) : null,
-    now
-  );
-  return {
-    id: input.id,
-    batchId: input.batchId,
-    subject: input.subject,
-    rationale: input.rationale,
-    source: input.source,
-    tag: input.tag,
-    seedContext: input.seedContext,
-    createdAt: now,
-    openedRoomId: null
-  };
-}
-function getTopicRec(id) {
-  const row = getDb().prepare(`SELECT ${REC_COLS} FROM topic_recs WHERE id = ?`).get(id);
-  return row ? mapRec(row) : null;
-}
-function listTopicRecs(opts) {
-  const limit = Math.max(1, Math.min(100, opts.limit));
-  const stmt = opts.cursor === null ? getDb().prepare(`SELECT ${REC_COLS} FROM topic_recs ORDER BY created_at DESC LIMIT ?`) : getDb().prepare(`SELECT ${REC_COLS} FROM topic_recs WHERE created_at < ? ORDER BY created_at DESC LIMIT ?`);
-  const rows = opts.cursor === null ? stmt.all(limit) : stmt.all(opts.cursor, limit);
-  const items = rows.map(mapRec);
-  const nextCursor = items.length === limit ? items[items.length - 1].createdAt : null;
-  return { items, nextCursor };
-}
-function markTopicRecOpened(recId, roomId) {
-  getDb().prepare("UPDATE topic_recs SET opened_room_id = ? WHERE id = ?").run(roomId, recId);
-}
-function clearAllTopicRecs() {
-  const r = getDb().prepare("DELETE FROM topic_recs").run();
-  return r.changes;
-}
-function mapJob(r) {
-  const status = ["running", "done", "failed", "aborted"].includes(r.status) ? r.status : "failed";
-  return {
-    id: r.id,
-    status,
-    currentPhase: r.current_phase,
-    progressPct: r.progress_pct,
-    batchId: r.batch_id,
-    error: r.error,
-    startedAt: r.started_at,
-    updatedAt: r.updated_at
-  };
-}
-var JOB_COLS = "id, status, current_phase, progress_pct, batch_id, error, started_at, updated_at";
-function createTopicRecJob(id) {
-  const now = Date.now();
-  getDb().prepare(
-    `INSERT INTO topic_rec_jobs (id, status, current_phase, progress_pct, batch_id, error, started_at, updated_at)
-       VALUES (?, 'running', 0, 0, NULL, NULL, ?, ?)`
-  ).run(id, now, now);
-  return getTopicRecJob(id);
-}
-function getTopicRecJob(id) {
-  const row = getDb().prepare(`SELECT ${JOB_COLS} FROM topic_rec_jobs WHERE id = ?`).get(id);
-  return row ? mapJob(row) : null;
-}
-function updateTopicRecJob(id, patch) {
-  const fields = [];
-  const values = [];
-  if (patch.status !== void 0) {
-    fields.push("status = ?");
-    values.push(patch.status);
-  }
-  if (typeof patch.currentPhase === "number") {
-    fields.push("current_phase = ?");
-    values.push(patch.currentPhase);
-  }
-  if (typeof patch.progressPct === "number") {
-    fields.push("progress_pct = ?");
-    values.push(Math.max(0, Math.min(100, Math.round(patch.progressPct))));
-  }
-  if (patch.batchId !== void 0) {
-    fields.push("batch_id = ?");
-    values.push(patch.batchId);
-  }
-  if (patch.error !== void 0) {
-    fields.push("error = ?");
-    values.push(patch.error);
-  }
-  if (fields.length === 0) return getTopicRecJob(id);
-  fields.push("updated_at = ?");
-  values.push(Date.now());
-  values.push(id);
-  getDb().prepare(`UPDATE topic_rec_jobs SET ${fields.join(", ")} WHERE id = ?`).run(...values);
-  return getTopicRecJob(id);
-}
-
-// src/orchestrator/topic-stream.ts
-import { EventEmitter as EventEmitter3 } from "events";
-var TopicRecBus = class {
-  emitters = /* @__PURE__ */ new Map();
-  get(jobId) {
-    let e = this.emitters.get(jobId);
-    if (!e) {
-      e = new EventEmitter3();
-      e.setMaxListeners(16);
-      this.emitters.set(jobId, e);
-    }
-    return e;
-  }
-  emit(jobId, event) {
-    this.get(jobId).emit("event", event);
-  }
-  subscribe(jobId, listener) {
-    const e = this.get(jobId);
-    e.on("event", listener);
-    return () => e.off("event", listener);
-  }
-  /** Free the EventEmitter for a job. Call on terminal events
-   *  (`topic-final`, `topic-error`, `topic-aborted`) so the Map
-   *  doesn't grow unbounded across many runs in one process. */
-  drop(jobId) {
-    const e = this.emitters.get(jobId);
-    if (e) {
-      e.removeAllListeners();
-      this.emitters.delete(jobId);
-    }
-  }
-};
-var topicRecBus = new TopicRecBus();
-
-// src/orchestrator/topic-recommender.ts
-var LLM_CALL_TIMEOUT_MS2 = 6e4;
-var PIPELINE_WALL_CLOCK_MS = 12e4;
-var SEARCH_PARALLEL_CHUNK = 3;
-var SEARCH_CHUNK_GAP_MS = 1e3;
-var SEARCH_RESULTS_PER_QUERY = 5;
-var inFlightJobs2 = /* @__PURE__ */ new Map();
-function signalWithTimeout3(parent, timeoutMs) {
-  const controller = new AbortController();
-  const onParentAbort = () => controller.abort();
-  if (parent?.aborted) controller.abort();
-  else parent?.addEventListener("abort", onParentAbort, { once: true });
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  return {
-    signal: controller.signal,
-    cleanup: () => {
-      clearTimeout(timer);
-      parent?.removeEventListener("abort", onParentAbort);
-    }
-  };
-}
-function extractJson5(raw) {
-  const fence = /```(?:json)?\s*([\s\S]*?)```/i.exec(raw);
-  const candidate = fence ? fence[1] : raw;
-  if (!candidate) return null;
-  const start = candidate.indexOf("{");
-  if (start === -1) return null;
-  let depth = 0;
-  let end = -1;
-  for (let i = start; i < candidate.length; i++) {
-    if (candidate[i] === "{") depth++;
-    else if (candidate[i] === "}") {
-      depth--;
-      if (depth === 0) {
-        end = i;
-        break;
-      }
-    }
-  }
-  if (end === -1) return null;
-  try {
-    return JSON.parse(candidate.slice(start, end + 1));
-  } catch {
-    return null;
-  }
-}
-async function callPhaseLLM2(state, modelV, messages, opts) {
-  if (!isModelV(modelV)) return null;
-  const t = signalWithTimeout3(state.controller.signal, LLM_CALL_TIMEOUT_MS2);
-  try {
-    const r = await callLLMWithUsage({
-      modelV,
-      messages,
-      temperature: opts.temperature,
-      maxTokens: opts.maxTokens,
-      signal: t.signal
-    });
-    return r.text;
-  } catch (e) {
-    process.stderr.write(
-      `[topic-recommender] ${modelV} failed: ${e instanceof Error ? e.message : String(e)}
-`
-    );
-    return null;
-  } finally {
-    t.cleanup();
-  }
-}
-function sleepWithSignal2(ms, signal) {
-  return new Promise((resolve2) => {
-    if (signal.aborted) return resolve2();
-    const t = setTimeout(() => {
-      signal.removeEventListener("abort", onAbort);
-      resolve2();
-    }, ms);
-    function onAbort() {
-      clearTimeout(t);
-      resolve2();
-    }
-    signal.addEventListener("abort", onAbort, { once: true });
-  });
-}
-function startTopicRecommend() {
-  const jobId = randomUUID2();
-  createTopicRecJob(jobId);
-  const state = {
-    id: jobId,
-    startedAt: Date.now(),
-    controller: new AbortController()
-  };
-  inFlightJobs2.set(jobId, state);
-  const wallClock = setTimeout(() => {
-    if (inFlightJobs2.has(jobId)) state.controller.abort();
-  }, PIPELINE_WALL_CLOCK_MS);
-  void runPipeline3(state).finally(() => {
-    clearTimeout(wallClock);
-    inFlightJobs2.delete(jobId);
-  });
-  return jobId;
-}
-function abortTopicRecommend(jobId) {
-  const state = inFlightJobs2.get(jobId);
-  if (!state) return false;
-  try {
-    state.controller.abort();
-  } catch {
-  }
-  return true;
-}
-function isTopicRecJobRunning(jobId) {
-  return inFlightJobs2.has(jobId);
-}
-async function runPipeline3(state) {
-  const phaseLabels = [
-    "Reading your boardroom history",
-    "Distilling interests",
-    "Scanning trending topics",
-    "Synthesising recommendations"
-  ];
-  const emitPhaseStart = (phase) => {
-    topicRecBus.emit(state.id, {
-      type: "topic-phase-start",
-      phase,
-      label: phaseLabels[phase - 1] ?? `Phase ${phase}`
-    });
-  };
-  const emitPhaseProgress = (phase, detail, pct) => {
-    topicRecBus.emit(state.id, {
-      type: "topic-phase-progress",
-      phase,
-      detail,
-      progressPct: Math.max(0, Math.min(100, Math.round(pct)))
-    });
-    updateTopicRecJob(state.id, { currentPhase: phase, progressPct: pct });
-  };
-  const emitPhaseEnd = (phase, pct) => {
-    topicRecBus.emit(state.id, {
-      type: "topic-phase-end",
-      phase,
-      progressPct: Math.max(0, Math.min(100, Math.round(pct)))
-    });
-    updateTopicRecJob(state.id, { currentPhase: phase, progressPct: pct });
-  };
-  const fail = (message) => {
-    updateTopicRecJob(state.id, { status: "failed", error: message });
-    topicRecBus.emit(state.id, { type: "topic-error", message });
-    topicRecBus.drop(state.id);
-  };
-  const cancel = () => {
-    updateTopicRecJob(state.id, { status: "aborted" });
-    topicRecBus.emit(state.id, { type: "topic-aborted" });
-    topicRecBus.drop(state.id);
-  };
-  try {
-    emitPhaseStart(1);
-    const chair = getChairAgent();
-    if (!chair) {
-      fail("chair agent missing \u2014 set up onboarding first");
-      return;
-    }
-    const memories = memoriesForContext(chair.id, 50);
-    emitPhaseProgress(1, `read ${memories.length} memories`, 8);
-    emitPhaseEnd(1, 10);
-    if (state.controller.signal.aborted) {
-      cancel();
-      return;
-    }
-    emitPhaseStart(2);
-    const modelV = utilityModelFor();
-    if (!modelV) {
-      fail("no LLM provider configured \u2014 add an API key first");
-      return;
-    }
-    const keywords = await distilKeywords(state, modelV, memories);
-    if (state.controller.signal.aborted) {
-      cancel();
-      return;
-    }
-    if (keywords.length === 0) {
-      fail("couldn't distil any keywords from the chair's memory yet \u2014 try again after a couple of rooms");
-      return;
-    }
-    emitPhaseProgress(2, `picked ${keywords.length} keywords`, 25);
-    emitPhaseEnd(2, 30);
-    const hasWeb = hasWebSearchKey();
-    let snippetsByKeyword = /* @__PURE__ */ new Map();
-    if (hasWeb) {
-      emitPhaseStart(3);
-      snippetsByKeyword = await runWebSweep(state, keywords, (kw, snippets, idx) => {
-        emitPhaseProgress(
-          3,
-          `scanned "${kw}" (${snippets.length} hits) \xB7 ${idx}/${keywords.length}`,
-          30 + Math.round(idx / keywords.length * 40)
-        );
-        topicRecBus.emit(state.id, {
-          type: "topic-search-round",
-          keyword: kw,
-          query: `${kw} site:x.com`,
-          resultsCount: snippets.length,
-          snippets
-        });
-      });
-      if (state.controller.signal.aborted) {
-        cancel();
-        return;
-      }
-      emitPhaseEnd(3, 70);
-    } else {
-      emitPhaseProgress(3, "no web-search key \u2014 skipping", 70);
-    }
-    emitPhaseStart(4);
-    const batchId = randomUUID2();
-    createTopicRecBatch({ id: batchId, hasWeb, keywords });
-    updateTopicRecJob(state.id, { batchId });
-    const synth = await synthesiseTopics(state, modelV, {
-      memories,
-      keywords,
-      snippetsByKeyword,
-      hasWeb
-    });
-    if (state.controller.signal.aborted) {
-      cancel();
-      return;
-    }
-    if (synth.length === 0) {
-      fail("synthesis returned no topics \u2014 try again or refine your boardroom history first");
-      return;
-    }
-    clearAllTopicRecs();
-    let inserted = 0;
-    for (const t of synth) {
-      const rec = insertTopicRec({
-        id: randomUUID2(),
-        batchId,
-        subject: t.subject,
-        rationale: t.rationale,
-        source: t.source,
-        tag: t.tag,
-        seedContext: t.seedContext
-      });
-      inserted++;
-      topicRecBus.emit(state.id, { type: "topic-rec", rec });
-      emitPhaseProgress(
-        4,
-        `synthesised ${inserted}/${synth.length}`,
-        70 + Math.round(inserted / synth.length * 28)
-      );
-    }
-    emitPhaseEnd(4, 100);
-    updateTopicRecJob(state.id, {
-      status: "done",
-      progressPct: 100,
-      currentPhase: 4
-    });
-    topicRecBus.emit(state.id, {
-      type: "topic-final",
-      batchId,
-      totalRecs: inserted,
-      hasWeb
-    });
-    topicRecBus.drop(state.id);
-  } catch (e) {
-    if (state.controller.signal.aborted) {
-      cancel();
-      return;
-    }
-    const msg = e instanceof Error ? e.message : String(e);
-    process.stderr.write(`[topic-recommender] pipeline crashed: ${msg}
-`);
-    fail(msg);
-  }
-}
-async function distilKeywords(state, modelV, memories) {
-  if (memories.length === 0) return [];
-  const memoryLines = memories.slice(0, 60).map((m, i) => {
-    const tier = m.tier === "long" ? "STABLE" : "fresh";
-    const prov = m.provenanceRooms > 1 ? ` \xB7 \xD7${m.provenanceRooms} rooms` : "";
-    const recency = Math.max(0, Math.round((Date.now() - m.createdAt) / 864e5));
-    return `${i + 1}. [${tier}${prov} \xB7 ${recency}d ago \xB7 ${m.kind}] ${m.content}`;
-  }).join("\n");
-  const system = `You distil a user's interests from a chair's accumulated memory log. Pick the 10 keywords / domains / themes the user is MOST currently engaged with. Weight: recency \xD7 kind salience (goal > preference > observation > fact) \xD7 cross-room provenance. Reject any keyword that wouldn't make a good boardroom subject (too narrow, too transient, too personal-irrelevant). Output strict JSON only: { "keywords": ["...", "...", ...] } with up to 10 entries.`;
-  const user = `# Chair's memory about the user (newest first within each tier)
-${memoryLines}
-
-Return up to 10 keywords as JSON.`;
-  const raw = await callPhaseLLM2(state, modelV, [
-    { role: "system", content: system },
-    { role: "user", content: user }
-  ], { temperature: 0.3, maxTokens: 600 });
-  if (!raw) return [];
-  const parsed = extractJson5(raw);
-  if (!parsed || !Array.isArray(parsed.keywords)) return [];
-  return parsed.keywords.filter((k) => typeof k === "string").map((k) => k.trim()).filter((k) => k.length > 0).slice(0, 10);
-}
-async function runWebSweep(state, keywords, onKeywordDone) {
-  const out = /* @__PURE__ */ new Map();
-  const creds = getActiveWebSearchCredentials();
-  if (!creds) return out;
-  let doneCount = 0;
-  for (let i = 0; i < keywords.length; i += SEARCH_PARALLEL_CHUNK) {
-    if (state.controller.signal.aborted) break;
-    const chunk = keywords.slice(i, i + SEARCH_PARALLEL_CHUNK);
-    const settled = await Promise.allSettled(
-      chunk.map((kw) => fetchKeywordSnippets(creds.backend, creds.apiKey, kw))
-    );
-    settled.forEach((res, j) => {
-      const kw = chunk[j];
-      const snippets = res.status === "fulfilled" ? res.value : [];
-      out.set(kw, snippets);
-      doneCount++;
-      onKeywordDone(kw, snippets, doneCount);
-    });
-    if (i + SEARCH_PARALLEL_CHUNK < keywords.length) {
-      await sleepWithSignal2(SEARCH_CHUNK_GAP_MS, state.controller.signal);
-    }
-  }
-  return out;
-}
-async function fetchKeywordSnippets(backend, apiKey, keyword) {
-  const xQuery = `${keyword} site:x.com`;
-  const xResults = await runWebSearch(backend, apiKey, xQuery, {
-    count: SEARCH_RESULTS_PER_QUERY
-  });
-  if (xResults && xResults.length > 0) {
-    return xResults.map(toSnippet);
-  }
-  const generic = await runWebSearch(backend, apiKey, keyword, {
-    count: SEARCH_RESULTS_PER_QUERY
-  });
-  return (generic ?? []).map(toSnippet);
-}
-function toSnippet(r) {
-  return {
-    title: r.title || "(untitled)",
-    url: r.url,
-    description: r.description || ""
-  };
-}
-async function synthesiseTopics(state, modelV, opts) {
-  const { memories, keywords, snippetsByKeyword, hasWeb } = opts;
-  const flatSnippets = [];
-  if (hasWeb) {
-    for (const kw of keywords) {
-      for (const s of snippetsByKeyword.get(kw) ?? []) {
-        flatSnippets.push({ ...s, keyword: kw });
-      }
-    }
-  }
-  const memorySummary = memories.length === 0 ? "(no chair memory yet \u2014 recommend topics that introduce the user to the boardroom format)" : memories.slice(0, 24).map((m, i) => `M${i + 1}. [${m.kind}] ${m.content}`).join("\n");
-  const snippetBlock = flatSnippets.length === 0 ? "(no web snippets \u2014 synthesise from memory only)" : flatSnippets.map(
-    (s, i) => `S${i + 1}. [keyword: ${s.keyword}] ${s.title}
-   ${s.description}
-   ${s.url}`
-  ).join("\n\n");
-  const system = 'You recommend boardroom discussion topics to a user, based on (a) the chair\'s long-term memory of who they are + what they care about, and optionally (b) a set of currently-trending web/x.com snippets keyed off the user\'s recent interests. Produce EXACTLY 5 distinct topics \u2014 not 4, not 6, five. Each topic is a subject line a user could plausibly drop into the convene composer.\n\nThe 5 topics MUST span DIFFERENT dimensions/categories \u2014 don\'t return five pricing topics. Use the 10 keywords as a multi-dimensional search index; the 5 final topics should distil ACROSS those dimensions so the picker reads as a balanced board agenda, not a single-angle obsession. Each topic gets a different `tag`.\n\nVoice: tight, specific, opinionated. Avoid corporate-speak. Skew toward questions the user would actually want to debate, not generic explainers.\n\nEVERY topic MUST include a `tag` field \xB7 a SHORT CATEGORY in 1-2 lowercase words naming what bucket the topic falls into. Pick from the user\'s actual subject matter (examples: strategy / product / market / pricing / positioning / brand / hiring / fundraising / ops / infra / research / craft / ethics / personal / leadership / growth / sales / design / data / partnerships / regulation). FORBIDDEN tag values: "web", "memory", "general", "misc", "other", "topic", "recommendation" \u2014 these are meta-vocabulary that leaks the system, not real categories. If the topic spans two areas, pick the dominant one. NEVER omit the tag field.\n\nEach topic must cite either (a) at least one snippet ref (S<n>) \u2014 in which case set "source":"web" \u2014 OR (b) no snippet refs at all \u2014 in which case set "source":"memory". The `source` and `tag` fields are independent: `source` is the data provenance, `tag` is the topic category. Never use "web" or "memory" as a tag.\n\nStrict JSON output only:\n{ "topics": [ { "tag": "pricing", "subject": "...", "rationale": "one sentence on why this fits the user", "source": "web|memory", "snippetRefs": [<S indexes, omit when source=memory>] } ] }';
-  const user = `# Keywords distilled from chair memory
-${keywords.map((k, i) => `K${i + 1}. ${k}`).join("\n")}
-
-# Memory excerpts
-${memorySummary}
-
-# Web snippets ${hasWeb ? "(use these to ground at least some recs as source=web)" : "(none \u2014 synthesise from memory only)"}
-${snippetBlock}
-
-Return EXACTLY 5 topics as JSON, each with a different tag, spanning different dimensions.`;
-  const raw = await callPhaseLLM2(state, modelV, [
-    { role: "system", content: system },
-    { role: "user", content: user }
-  ], { temperature: 0.6, maxTokens: 2e3 });
-  if (!raw) return [];
-  const parsed = extractJson5(raw);
-  if (!parsed || !Array.isArray(parsed.topics)) return [];
-  const out = [];
-  for (const t of parsed.topics) {
-    const subject = typeof t.subject === "string" ? t.subject.trim() : "";
-    const rationale = typeof t.rationale === "string" ? t.rationale.trim() : "";
-    if (!subject || !rationale) continue;
-    let tag = null;
-    const TAG_BLOCKLIST = /* @__PURE__ */ new Set([
-      "web",
-      "memory",
-      "general",
-      "misc",
-      "other",
-      "topic",
-      "recommendation",
-      "recommendations",
-      "rec",
-      "category",
-      "n/a",
-      "na",
-      "none"
-    ]);
-    if (typeof t.tag === "string") {
-      const cleaned = t.tag.trim().replace(/^\/\/\s*/, "").toLowerCase().replace(/[^a-z0-9 -]/g, "").replace(/\s+/g, " ").trim().slice(0, 28);
-      if (cleaned.length > 0 && !TAG_BLOCKLIST.has(cleaned)) {
-        tag = cleaned;
-      }
-    }
-    if (!tag) {
-      const words = subject.toLowerCase().replace(/[^a-z0-9\s-]/g, " ").split(/\s+/).filter((w) => w.length > 2 && !["the", "and", "for", "are", "you", "your", "what", "how", "why", "when", "with", "from", "this", "that"].includes(w));
-      if (words.length > 0) {
-        tag = words.slice(0, 2).join(" ").slice(0, 28);
-      } else {
-        tag = "topic";
-      }
-    }
-    let source = t.source === "web" ? "web" : "memory";
-    let seedContext = null;
-    if (source === "web" && hasWeb && Array.isArray(t.snippetRefs)) {
-      const refs = t.snippetRefs.map((r) => {
-        if (typeof r === "number") return r;
-        if (typeof r === "string") {
-          const m = r.match(/^S?(\d+)$/i);
-          return m ? Number(m[1]) : NaN;
-        }
-        return NaN;
-      }).filter((n) => Number.isInteger(n) && n > 0 && n <= flatSnippets.length);
-      const seen = /* @__PURE__ */ new Set();
-      const cited = [];
-      for (const ref of refs) {
-        const snip = flatSnippets[ref - 1];
-        if (!snip || seen.has(snip.url)) continue;
-        seen.add(snip.url);
-        cited.push({ title: snip.title, url: snip.url, description: snip.description });
-      }
-      if (cited.length > 0) {
-        seedContext = cited;
-      } else {
-        source = "memory";
-      }
-    } else if (source === "web") {
-      source = "memory";
-    }
-    out.push({ subject, rationale, source, tag, seedContext });
-    if (out.length >= 6) break;
-  }
-  return out;
-}
-
-// src/routes/topic-recs.ts
-function topicRecsRouter() {
-  const r = new Hono6();
-  r.post("/", (c) => {
-    if (!hasAnyModelKey()) {
-      return c.json({ error: "configure an LLM provider key first" }, 400);
-    }
-    const jobId = startTopicRecommend();
-    return c.json({ jobId });
-  });
-  r.get("/jobs/:id/stream", (c) => {
-    const jobId = c.req.param("id");
-    const job = getTopicRecJob(jobId);
-    if (!job) return c.json({ error: "job not found" }, 404);
-    return streamSSE2(c, async (s) => {
-      await s.writeSSE({
-        event: "hello",
-        data: JSON.stringify({
-          jobId,
-          status: job.status,
-          currentPhase: job.currentPhase,
-          progressPct: job.progressPct,
-          batchId: job.batchId,
-          error: job.error
-        })
-      });
-      if (!isTopicRecJobRunning(jobId)) {
-        if (job.status === "done") {
-          await s.writeSSE({
-            event: "topic-final",
-            data: JSON.stringify({
-              type: "topic-final",
-              batchId: job.batchId,
-              totalRecs: null,
-              hasWeb: null
-            })
-          });
-        } else if (job.status === "aborted") {
-          await s.writeSSE({
-            event: "topic-aborted",
-            data: JSON.stringify({ type: "topic-aborted" })
-          });
-        } else if (job.status === "failed") {
-          await s.writeSSE({
-            event: "topic-error",
-            data: JSON.stringify({
-              type: "topic-error",
-              message: job.error || "generation failed"
-            })
-          });
-        }
-        return;
-      }
-      const queue = [];
-      let resolveWaiter = null;
-      let closed = false;
-      const off = topicRecBus.subscribe(jobId, (event) => {
-        queue.push(event);
-        if (resolveWaiter) {
-          resolveWaiter();
-          resolveWaiter = null;
-        }
-      });
-      s.onAbort(() => {
-        closed = true;
-        off();
-        if (resolveWaiter) {
-          resolveWaiter();
-          resolveWaiter = null;
-        }
-      });
-      while (!closed) {
-        if (queue.length === 0) {
-          await new Promise((resolve2) => {
-            resolveWaiter = resolve2;
-          });
-          continue;
-        }
-        const event = queue.shift();
-        await s.writeSSE({ event: event.type, data: JSON.stringify(event) });
-        if (event.type === "topic-final" || event.type === "topic-error" || event.type === "topic-aborted") {
-          closed = true;
-          off();
-        }
-      }
+      defaultModelV: effectiveDefaultModel(),
+      /** Cheap utility model used by background tasks (skill picker,
+       *  director auto-pick, agent-spec gen, ability analyzer,
+       *  convening speech). NULL when no key is configured. */
+      utilityModelV: utilityModelFor(),
+      /** Provider summary · so the frontend can show "you have OR +
+       *  OpenAI direct" at a glance without iterating models. */
+      providers: collectProviderSummary(all),
+      /** The user's single active LLM provider (under the single-
+       *  active-LLM-provider invariant). Null when none configured.
+       *  Frontend pickers use this to decide grouping strategy:
+       *  multi-model → group by family with "via {provider}" caption,
+       *  single-model → flat list. */
+      activeLlmProvider: active,
+      activeLlmClassification: active ? isMultiModelProvider(active) ? "multi-model" : "single-model" : null
     });
   });
-  r.post("/jobs/:id/abort", (c) => {
-    const jobId = c.req.param("id");
-    const ok = abortTopicRecommend(jobId);
-    if (!ok) {
-      const job = getTopicRecJob(jobId);
-      if (!job) return c.json({ error: "job not found" }, 404);
-      return c.json({ ok: true, status: job.status });
-    }
-    return c.json({ ok: true });
-  });
-  r.get("/", (c) => {
-    const cursorRaw = c.req.query("cursor");
-    const limitRaw = c.req.query("limit");
-    const cursor = cursorRaw && /^\d+$/.test(cursorRaw) ? Number(cursorRaw) : null;
-    const limit = limitRaw && /^\d+$/.test(limitRaw) ? Math.max(1, Math.min(100, Number(limitRaw))) : 20;
-    const { items, nextCursor } = listTopicRecs({ cursor, limit });
-    return c.json({ items, nextCursor });
-  });
-  r.get("/:id", (c) => {
-    const id = c.req.param("id");
-    const rec = getTopicRec(id);
-    if (!rec) return c.json({ error: "not found" }, 404);
-    return c.json(rec);
-  });
   return r;
 }
+function collectProviderSummary(models) {
+  const map = /* @__PURE__ */ new Map();
+  for (const m of models) {
+    const cur = map.get(m.provider) ?? { reachable: 0, total: 0 };
+    cur.total++;
+    if (m.reachable) cur.reachable++;
+    map.set(m.provider, cur);
+  }
+  return Array.from(map.entries()).map(([provider, v]) => ({ provider, ...v }));
+}
 
 // src/routes/notes.ts
 import { Hono as Hono7 } from "hono";
@@ -15776,7 +15399,7 @@ function prefsRouter() {
 
 // src/routes/rooms.ts
 import { Hono as Hono9 } from "hono";
-import { streamSSE as streamSSE3 } from "hono/streaming";
+import { streamSSE as streamSSE2 } from "hono/streaming";
 
 // src/storage/key_points.ts
 init_db();
@@ -15894,7 +15517,7 @@ Does the chair need to ask a clarifying question before opening the room?`
     }
     return { shouldAsk: true, rationale: "" };
   }
-  const parsed = extractJson6(raw);
+  const parsed = extractJson5(raw);
   if (!parsed || typeof parsed !== "object") {
     return { shouldAsk: true, rationale: "" };
   }
@@ -15983,7 +15606,7 @@ async function pickRoundWrap(opts) {
     }
     return { recommendation: "continue", rationale: "" };
   }
-  const parsed = extractJson6(raw);
+  const parsed = extractJson5(raw);
   if (!parsed || typeof parsed !== "object") {
     return { recommendation: "continue", rationale: "" };
   }
@@ -16150,7 +15773,7 @@ ${extras.join("\n")}` : baseRow;
     }
     return { agentId: null, rationale: "", intervention: null };
   }
-  const parsed = extractJson6(raw);
+  const parsed = extractJson5(raw);
   if (!parsed || typeof parsed !== "object") {
     return { agentId: null, rationale: "", intervention: null };
   }
@@ -16272,7 +15895,7 @@ async function pickChairWebSearch(opts) {
     }
     return null;
   }
-  const parsed = extractJson6(raw);
+  const parsed = extractJson5(raw);
   if (!parsed || typeof parsed !== "object") return null;
   const ws = parsed;
   if (typeof ws.query !== "string") return null;
@@ -16297,7 +15920,7 @@ function buildSkillsIndex(skills) {
 function loadSkillBody(skill) {
   return skill.bodyMd;
 }
-function extractJson6(text) {
+function extractJson5(text) {
   if (!text) return null;
   let s = text.trim();
   s = s.replace(/^```(?:json)?\s*/i, "").replace(/```\s*$/i, "").trim();
@@ -16411,7 +16034,7 @@ Which skills apply, and does this turn need web search?`
       continue;
     }
   }
-  const parsed = extractJson6(raw);
+  const parsed = extractJson5(raw);
   if (!parsed || typeof parsed !== "object") {
     return { used: [], reason: "", webSearchQuery: null };
   }
@@ -16800,22 +16423,22 @@ var TONE_GUIDANCE = {
     "",
     "## Each turn MUST",
     "  (1) Name the lens you're auditing from this turn.",
-    "  (2) Surface 2\u20133 specific flaws, EACH labelled by both axes:",
-    "         **Severity** \xB7 BLOCKER (ship is unsafe) \xB7 MAJOR (fix before commit) \xB7 MINOR (nice-to-fix)",
-    "         **Likelihood** \xB7 LIKELY (>50%) \xB7 PLAUSIBLE (10-50%) \xB7 EDGE (<10%)",
-    "      A BLOCKER \xD7 LIKELY is the room's headline. A BLOCKER \xD7 EDGE only matters when the consequence is asymmetric (catastrophic, or cheap to mitigate). MINOR \xD7 EDGE is noise \u2014 drop it.",
+    "  (2) Surface 2\u20133 specific flaws. For each, communicate BOTH how bad and how likely \u2014 but in plain prose, not as a stamped tag.",
+    "         How bad \xB7 `blocker` (ship is unsafe) / `major` (fix before commit) / `minor` (nice-to-fix)",
+    "         How likely \xB7 `likely` (>50%) / `plausible` (10-50%) / `edge` (<10%)",
+    `      Weave these into ordinary sentences \u2014 "a likely blocker on the auth path", "a plausible major flaw if X scales past Y", "an edge-case minor issue". The room's headline finding is whatever combines high severity with high likelihood. A blocker that's only an edge case still matters when the consequence is asymmetric (catastrophic, or cheap to mitigate). Edge-case minors are noise \u2014 drop them.`,
     '  (3) For each flaw: point at the specific load-bearing piece ("the X claim in \xA72", "the assumption that Y"); state the **concrete failure mode** (the specific scenario where this breaks); state the **downstream consequence** (what falls over if it breaks); indicate the **direction a fix would lie** in ONE sentence \u2014 pointer, not redesign.',
-    "  (4) **Strength-preservation** \xB7 every BLOCKER you raise MUST include 1 sentence on what the artifact gets RIGHT \u2014 the part that should survive any rebuild. Without this, critique reads as nihilism and the room stops trusting the reviewer.",
+    "  (4) **Strength-preservation** \xB7 every blocker you raise MUST include 1 sentence on what the artifact gets RIGHT \u2014 the part that should survive any rebuild. Without this, critique reads as nihilism and the room stops trusting the reviewer.",
     "",
-    `At least one BLOCKER or MAJOR per turn is mandatory. If you can't find one, state the conditional plainly: "this would have a major issue if Z, but I don't see Z here" \u2014 explicit absence-of-flaw, not a wave-through.`,
+    `At least one blocker or major flaw per turn is mandatory. If you can't find one, state the conditional plainly: "this would have a major issue if Z, but I don't see Z here" \u2014 explicit absence-of-flaw, not a wave-through.`,
     "",
     "## Forbidden",
     "  \xB7 Redesigning or reframing the work. You audit as-is. The fix-direction pointer is ONE sentence; never a rewrite.",
     '  \xB7 Vague "feels off" / "not quite right" without a mechanism.',
     "  \xB7 Praise-only turns; attacking the author rather than the work.",
-    "  \xB7 Cherry-picking edge cases \u2014 naming a 1% failure mode as BLOCKER without anchoring it to its likelihood AND its consequence asymmetry.",
+    "  \xB7 Cherry-picking edge cases \u2014 naming a 1% failure mode as a blocker without anchoring it to its likelihood AND its consequence asymmetry.",
     "  \xB7 Repeating another director's critique under a different label.",
-    "  \xB7 Skipping severity / likelihood labels \u2014 they're required, not optional.",
+    '  \xB7 **Stamped axis tags** \xB7 DO NOT write rubber-stamp labels like `MAJOR \xD7 LIKELY`, `BLOCKER \xB7 LIKELY`, `[MAJOR/LIKELY]`, etc. The severity + likelihood live INSIDE your prose ("this is a likely major flaw because\u2026"), not as a literal `X \xD7 Y` stamp at the head of each bullet. Stamping turns the room into form-filling; the audit discipline is in the *reasoning*, not in the labels.',
     "",
     "PERSONA OVERRIDE \xB7 your director instruction's voice / boundaries section may default to softening criticism, finding the constructive frame, validating effort before fault-finding, or refusing to hold the work to a high bar \u2014 typical patterns for empathic / mentor / co-creator personas. For THIS room those defaults are PAUSED. Rigour beats kindness. The user explicitly opted into a fault-audit; softening flaws or skipping labels is what fails them, not what helps them. Lean INTO the audit discipline \u2014 but stay rigorous, not cynical: every claim falsifiable, every BLOCKER paired with a strength preserved."
   ].join("\n")
@@ -17326,10 +16949,8 @@ function buildChairClarifyMessages(opts) {
     ``,
     `Output: either <ack + blank line + READY> OR the 2-part question block (in the user's language).`
   ].join("\n");
-  const seedSystem = buildSeedContextSystem(opts.history);
   return [
     buildChairSystem(opts, isFirstTurn ? firstTurnTask : followUpTask),
-    ...seedSystem ? [seedSystem] : [],
     ...renderHistoryForChair(opts.history, opts.cast, opts.prefs),
     {
       role: "user",
@@ -17337,39 +16958,6 @@ function buildChairClarifyMessages(opts) {
     }
   ];
 }
-function buildSeedContextSystem(history) {
-  for (let i = 0; i < history.length; i++) {
-    const m = history[i];
-    if (m.authorKind !== "user") continue;
-    const meta = m.meta;
-    const rationale = typeof meta?.seedContext?.rationale === "string" ? meta.seedContext.rationale.trim() : "";
-    const rawSnippets = meta?.seedContext?.snippets;
-    const snippets = Array.isArray(rawSnippets) ? rawSnippets : [];
-    const snippetLines = [];
-    for (const s of snippets) {
-      if (!s || typeof s !== "object") continue;
-      const title = typeof s.title === "string" ? s.title.trim() : "";
-      const url = typeof s.url === "string" ? s.url.trim() : "";
-      const desc = typeof s.description === "string" ? s.description.trim() : "";
-      if (!title && !url && !desc) continue;
-      snippetLines.push(`\xB7 ${title || "(untitled)"} \u2014 ${url || "(no url)"}
-  ${desc.slice(0, 360)}`);
-    }
-    if (!rationale && snippetLines.length === 0) continue;
-    const blocks = [
-      `\u2500\u2500\u2500 BACKGROUND MATERIAL \xB7 pre-attached by the user \u2500\u2500\u2500`,
-      `The user opened this room from a topic recommendation. Treat the material below as hidden context they've already seen \u2014 reference it naturally when useful, don't re-summarise it, don't pretend it doesn't exist.`
-    ];
-    if (rationale) {
-      blocks.push(``, `Why this topic was recommended (hidden from the user \u2014 your reasoning context):`, `\xB7 ${rationale}`);
-    }
-    if (snippetLines.length > 0) {
-      blocks.push(``, `Source snippets the recommendation was grounded in:`, ...snippetLines);
-    }
-    return { role: "system", content: blocks.join("\n") };
-  }
-  return null;
-}
 function buildChairConveningMessages(opts) {
   const subject = opts.room.subject;
   const directorList = opts.picksWithReasons.map((p, i) => {
@@ -17437,14 +17025,15 @@ function buildChairRoundEndMessages(opts) {
     ``,
     `\u2500\u2500\u2500 CRITIQUE-MODE POINT SELECTION \u2500\u2500\u2500`,
     `Override the default "what got said" rule with severity-aware curation. Pick points that maximise audit value:`,
-    `  \xB7 Prefer 1 BLOCKER \xD7 LIKELY flaw over 3 MINOR \xD7 EDGE flaws.`,
+    `  \xB7 Prefer 1 likely blocker over 3 edge-case minors.`,
     `  \xB7 Surface the dimension NO director attacked this round (the lens-coverage gap).`,
-    `  \xB7 If the room only produced LIKELY MINOR flaws this round, name that explicitly \u2014 it's a signal the artifact is more resilient than first thought, not a reason to inflate severity.`,
+    `  \xB7 If the room only produced likely-but-minor flaws this round, name that explicitly \u2014 it's a signal the artifact is more resilient than first thought, not a reason to inflate severity.`,
     `Use these prompts to test what should rise to a key point:`,
     `  \xB7 Which flaw is fatal, and which is fixable?`,
     `  \xB7 What sounds plausible now but probably won't survive execution?`,
     `  \xB7 Which lens is conspicuously absent from this round's critique?`,
-    `  \xB7 What would a competitor / regulator / power user attack that didn't get raised?`
+    `  \xB7 What would a competitor / regulator / power user attack that didn't get raised?`,
+    `Phrase points in plain prose \u2014 do NOT carry over the directors' \`X \xD7 Y\` axis-tag notation if any leaked through (e.g. \`MAJOR \xD7 LIKELY\`). Rephrase as natural language ("a likely major flaw on \u2026").`
   ].join("\n") : "";
   const task = [
     `\u2500\u2500\u2500 YOUR TASK \xB7 CLOSE THIS ROUND \u2500\u2500\u2500`,
@@ -18362,6 +17951,37 @@ Rules:
   return branch.id;
 }
 
+// src/orchestrator/timeouts.ts
+var TimeoutError = class extends Error {
+  constructor(ms, label) {
+    super(`timeout after ${ms}ms${label ? ` \xB7 ${label}` : ""}`);
+    this.name = "TimeoutError";
+  }
+};
+function withTimeout(promise, ms, label) {
+  let timer = null;
+  const timeout = new Promise((_, reject) => {
+    timer = setTimeout(() => reject(new TimeoutError(ms, label)), ms);
+  });
+  return Promise.race([promise, timeout]).finally(() => {
+    if (timer) clearTimeout(timer);
+  });
+}
+
+// src/orchestrator/auto-skip.ts
+function emitAutoSkipped(roomId, phase, reason, messageId) {
+  roomBus.emit(roomId, {
+    type: "config-event",
+    kind: "auto-skipped",
+    payload: {
+      phase,
+      reason,
+      ...messageId ? { messageId } : {}
+    },
+    createdAt: Date.now()
+  });
+}
+
 // src/voice/sentence-splitter.ts
 var END_RE = /[。！？!?；;：:\n]|[.](?=\s|$)/;
 var SentenceChunker = class {
@@ -18422,6 +18042,39 @@ function minimaxBaseUrl2() {
 }
 var ELEVENLABS_API = "https://api.elevenlabs.io/v1";
 var OPENAI_API = "https://api.openai.com/v1";
+function makeMiniMaxBalanceError() {
+  const err2 = new Error(
+    "Your MiniMax account balance is insufficient for TTS. Top up your account in the MiniMax console and try again."
+  );
+  err2.code = "paid-plan-required";
+  err2.provider = "minimax";
+  err2.upgradeUrl = getPrefs().minimaxRegion === "intl" ? "https://platform.minimax.io/user-center/billing/overview" : "https://platform.minimaxi.com/user-center/payment";
+  return err2;
+}
+function makeElevenLabsBillingError(message) {
+  const err2 = new Error(message);
+  err2.code = "paid-plan-required";
+  err2.provider = "elevenlabs";
+  err2.upgradeUrl = "https://elevenlabs.io/pricing";
+  return err2;
+}
+function isElevenLabsCreditError(errText) {
+  return /quota_exceeded|insufficient[ _-]?(?:credit|quota|balance|fund)|out\s+of\s+credits?|voice_limit_reached|余额不足/i.test(errText);
+}
+function tryExtractTtsBillingError(err2) {
+  if (!err2 || typeof err2 !== "object") return null;
+  const tagged = err2;
+  if (tagged.code !== "paid-plan-required") return null;
+  if (typeof tagged.provider !== "string") return null;
+  const out = err2;
+  if (typeof tagged.upgradeUrl !== "string") {
+    out.upgradeUrl = "";
+  }
+  if (typeof tagged.message !== "string") {
+    out.message = "Voice synthesis requires a paid plan.";
+  }
+  return out;
+}
 function cleanForSpeech(md) {
   if (!md) return "";
   let out = md;
@@ -18521,11 +18174,17 @@ async function* synthesizeSpeechStream(text, profile, signal) {
   });
   if (!res.ok) {
     const errText = await res.text();
+    if (res.status === 402 || /"status_code"\s*:\s*1008|insufficient[ _-]?(?:balance|quota|credit|fund)|余额不足|余额[^a-zA-Z]?(?:不足|不够)/i.test(errText)) {
+      throw makeMiniMaxBalanceError();
+    }
     throw new Error(`MiniMax TTS stream HTTP ${res.status}: ${errText}`);
   }
   const contentType = res.headers.get("content-type") || "";
   if (!contentType.includes("text/event-stream")) {
     const errBody = await res.text();
+    if (/"status_code"\s*:\s*1008|insufficient[ _-]?(?:balance|quota|credit|fund)|余额不足|余额[^a-zA-Z]?(?:不足|不够)/i.test(errBody)) {
+      throw makeMiniMaxBalanceError();
+    }
     throw new Error(`MiniMax TTS: expected event-stream but got ${contentType}: ${errBody.slice(0, 200)}`);
   }
   const body = res.body;
@@ -18632,13 +18291,7 @@ async function synthesizeMiniMax(text, profile, signal) {
   if (!res.ok) {
     const errText = await res.text();
     if (res.status === 402 || /insufficient[ _-]?(?:balance|quota|credit|fund)|余额不足|余额[^a-zA-Z]?(?:不足|不够)/i.test(errText)) {
-      const err2 = new Error(
-        "Your MiniMax account balance is insufficient for TTS. Top up your account in the MiniMax console and try again."
-      );
-      err2.code = "paid-plan-required";
-      err2.provider = "minimax";
-      err2.upgradeUrl = getPrefs().minimaxRegion === "intl" ? "https://platform.minimax.io/user-center/billing/overview" : "https://platform.minimaxi.com/user-center/payment";
-      throw err2;
+      throw makeMiniMaxBalanceError();
     }
     throw new Error(`MiniMax TTS HTTP ${res.status}: ${errText}`);
   }
@@ -18646,13 +18299,7 @@ async function synthesizeMiniMax(text, profile, signal) {
   const status = json.base_resp?.status_code ?? 0;
   const statusMsg = json.base_resp?.status_msg || "";
   if (status !== 0 && (status === 1008 || /insufficient[ _-]?(?:balance|quota|credit|fund)|余额不足|余额[^a-zA-Z]?(?:不足|不够)/i.test(statusMsg))) {
-    const err2 = new Error(
-      "Your MiniMax account balance is insufficient for TTS. Top up your account in the MiniMax console and try again."
-    );
-    err2.code = "paid-plan-required";
-    err2.provider = "minimax";
-    err2.upgradeUrl = getPrefs().minimaxRegion === "intl" ? "https://platform.minimax.io/user-center/billing/overview" : "https://platform.minimaxi.com/user-center/payment";
-    throw err2;
+    throw makeMiniMaxBalanceError();
   }
   const hex = json.data?.audio ?? json.audio ?? "";
   if (!hex) {
@@ -18735,13 +18382,14 @@ async function synthesizeElevenLabs(text, profile, signal) {
   if (!res.ok) {
     const errText = await res.text();
     if (res.status === 402 && /paid_plan_required|library voices/i.test(errText)) {
-      const err2 = new Error(
+      throw makeElevenLabsBillingError(
         "ElevenLabs library voices (Rachel, George, etc.) require a paid plan to use via the API. Either upgrade your ElevenLabs subscription, or clone your own voice in the ElevenLabs dashboard and pick it here."
       );
-      err2.code = "paid-plan-required";
-      err2.provider = "elevenlabs";
-      err2.upgradeUrl = "https://elevenlabs.io/pricing";
-      throw err2;
+    }
+    if (isElevenLabsCreditError(errText)) {
+      throw makeElevenLabsBillingError(
+        "Your ElevenLabs account is out of credits. Top up your ElevenLabs plan and try again."
+      );
     }
     throw new Error(`ElevenLabs TTS HTTP ${res.status}: ${errText.slice(0, 400)}`);
   }
@@ -18780,13 +18428,14 @@ async function* synthesizeElevenLabsStream(text, profile, signal) {
   if (!res.ok) {
     const errText = await res.text();
     if (res.status === 402 && /paid_plan_required|library voices/i.test(errText)) {
-      const err2 = new Error(
+      throw makeElevenLabsBillingError(
         "ElevenLabs library voices (Rachel, George, etc.) require a paid plan to use via the API. Either upgrade your ElevenLabs subscription, or clone your own voice in the ElevenLabs dashboard and pick it here."
       );
-      err2.code = "paid-plan-required";
-      err2.provider = "elevenlabs";
-      err2.upgradeUrl = "https://elevenlabs.io/pricing";
-      throw err2;
+    }
+    if (isElevenLabsCreditError(errText)) {
+      throw makeElevenLabsBillingError(
+        "Your ElevenLabs account is out of credits. Top up your ElevenLabs plan and try again."
+      );
     }
     throw new Error(`ElevenLabs TTS stream HTTP ${res.status}: ${errText.slice(0, 400)}`);
   }
@@ -18845,7 +18494,8 @@ function ensureState(roomId) {
   if (!s) {
     s = {
       queue: [],
-      inflight: null,
+      inflight: /* @__PURE__ */ new Map(),
+      preWarmed: null,
       processing: false,
       roundNum: 1,
       speakersThisTurn: 0,
@@ -18859,7 +18509,8 @@ function ensureState(roomId) {
       pendingFrameBreakerRole: null,
       lastFrameBreakerAgentId: null,
       billingHaltedThisTurn: false,
-      voiceWaiters: /* @__PURE__ */ new Map()
+      voiceWaiters: /* @__PURE__ */ new Map(),
+      voicePredone: /* @__PURE__ */ new Set()
     };
     _state.set(roomId, s);
   }
@@ -18867,29 +18518,59 @@ function ensureState(roomId) {
 }
 function markVoicePlaybackDone(roomId, messageId) {
   const s = _state.get(roomId);
-  const waiter = s?.voiceWaiters.get(messageId);
-  if (!waiter || !s) return false;
-  s.voiceWaiters.delete(messageId);
-  waiter();
+  if (!s) return false;
+  const waiter = s.voiceWaiters.get(messageId);
+  if (waiter) {
+    s.voiceWaiters.delete(messageId);
+    waiter.resolve();
+    return true;
+  }
+  s.voicePredone.add(messageId);
+  return false;
+}
+function bumpVoicePlaybackHeartbeat(roomId, messageId) {
+  const s = _state.get(roomId);
+  if (!s) return false;
+  const waiter = s.voiceWaiters.get(messageId);
+  if (!waiter) return false;
+  waiter.bump();
   return true;
 }
-function waitForVoicePlayback(roomId, messageId, timeoutMs = 12e4) {
+function waitForVoicePlayback(roomId, messageId, timeoutMs = 6e4) {
   const s = ensureState(roomId);
+  if (s.voicePredone.has(messageId)) {
+    s.voicePredone.delete(messageId);
+    return Promise.resolve();
+  }
   return new Promise((resolve2) => {
-    const timer = setTimeout(() => {
-      s.voiceWaiters.delete(messageId);
-      resolve2();
-    }, timeoutMs);
-    s.voiceWaiters.set(messageId, () => {
-      clearTimeout(timer);
-      resolve2();
+    let timer;
+    const arm = () => {
+      timer = setTimeout(() => {
+        s.voiceWaiters.delete(messageId);
+        process.stderr.write(
+          `[voice-wait] no-heartbeat fallback fired for msg=${messageId.slice(0, 8)} after ${timeoutMs}ms
+`
+        );
+        resolve2();
+      }, timeoutMs);
+    };
+    arm();
+    s.voiceWaiters.set(messageId, {
+      resolve: () => {
+        clearTimeout(timer);
+        resolve2();
+      },
+      bump: () => {
+        clearTimeout(timer);
+        arm();
+      }
     });
   });
 }
 function isRoomSpeaking(roomId) {
   const s = _state.get(roomId);
   if (!s) return false;
-  return s.inflight !== null;
+  return s.inflight.size > 0;
 }
 function injectSpeakers(roomId, agentIds) {
   if (agentIds.length === 0) return;
@@ -18926,7 +18607,7 @@ function injectSpeakers(roomId, agentIds) {
 function requestSoftPause(roomId) {
   const s = ensureState(roomId);
   s.pauseAfterCurrent = true;
-  rlog(roomId, "soft-pause-requested", { remaining: s.queue.length, speaking: s.inflight ? 1 : 0 });
+  rlog(roomId, "soft-pause-requested", { remaining: s.queue.length, speaking: s.inflight.size });
 }
 function setPendingUserAfterCurrent(roomId, payload) {
   const s = ensureState(roomId);
@@ -18935,7 +18616,7 @@ function setPendingUserAfterCurrent(roomId, payload) {
 function requestRoundEndAfterCurrent(roomId) {
   const s = ensureState(roomId);
   s.pendingRoundEnd = true;
-  rlog(roomId, "round-end-deferred", { remaining: s.queue.length, speaking: s.inflight ? 1 : 0 });
+  rlog(roomId, "round-end-deferred", { remaining: s.queue.length, speaking: s.inflight.size });
 }
 async function chairInterrupt(roomId) {
   const state = ensureState(roomId);
@@ -18944,23 +18625,30 @@ async function chairInterrupt(roomId) {
     status: "queued"
   }));
   let interruptedAgentId = null;
-  if (state.inflight) {
+  if (state.inflight.size > 0) {
     interruptedAgentId = state.queue[0]?.agentId ?? null;
-    state.inflight.abort();
-    state.inflight = null;
-    if (interruptedAgentId) {
-      const recent = listRecentMessages(roomId, 8);
-      for (let i = recent.length - 1; i >= 0; i--) {
-        const m = recent[i];
-        if (m.authorKind === "agent" && m.authorId === interruptedAgentId && m.meta && m.meta.streaming === true) {
-          deleteMessage(m.id);
-          roomBus.emit(roomId, {
-            type: "message-removed",
-            messageId: m.id,
-            reason: "chair-interrupt"
-          });
-          break;
-        }
+    for (const ac of state.inflight.values()) ac.abort();
+    state.inflight.clear();
+  }
+  if (state.preWarmed) {
+    try {
+      state.preWarmed.abortController.abort();
+    } catch (_) {
+    }
+    state.preWarmed = null;
+  }
+  if (interruptedAgentId) {
+    const recent = listRecentMessages(roomId, 8);
+    for (let i = recent.length - 1; i >= 0; i--) {
+      const m = recent[i];
+      if (m.authorKind === "agent" && m.authorId === interruptedAgentId && m.meta && m.meta.streaming === true) {
+        deleteMessage(m.id);
+        roomBus.emit(roomId, {
+          type: "message-removed",
+          messageId: m.id,
+          reason: "chair-interrupt"
+        });
+        break;
       }
     }
   }
@@ -19000,15 +18688,21 @@ function abortRoom(roomId) {
     maxSpeakersThisTurn: s.maxSpeakersThisTurn
   };
   s.queue = [];
-  const wasSpeaking = s.inflight !== null;
-  if (s.inflight) {
-    s.inflight.abort();
-    s.inflight = null;
+  const wasSpeaking = s.inflight.size > 0;
+  for (const ac of s.inflight.values()) ac.abort();
+  s.inflight.clear();
+  if (s.preWarmed) {
+    try {
+      s.preWarmed.abortController.abort();
+    } catch (_) {
+    }
+    s.preWarmed = null;
   }
-  for (const [id, waiter] of s.voiceWaiters) {
-    waiter();
+  for (const [, waiter] of s.voiceWaiters) {
+    waiter.resolve();
   }
   s.voiceWaiters.clear();
+  s.voicePredone.clear();
   rlog(roomId, "abort", {
     snapshot: remaining.length,
     round: s.roundNum,
@@ -19100,9 +18794,17 @@ function tickRoom(roomId, opts) {
   }
   if (plan.length === 0) return;
   const state = ensureState(roomId);
-  if (state.inflight) state.inflight.abort();
+  for (const ac of state.inflight.values()) ac.abort();
+  state.inflight.clear();
+  if (state.preWarmed) {
+    try {
+      state.preWarmed.abortController.abort();
+    } catch (_) {
+    }
+    state.preWarmed = null;
+  }
   for (const [, waiter] of state.voiceWaiters) {
-    waiter();
+    waiter.resolve();
   }
   state.voiceWaiters.clear();
   state.queue = plan.map((a) => ({ agentId: a.id, status: "queued" }));
@@ -19130,6 +18832,106 @@ function tickRoom(roomId, opts) {
     void pumpQueue(roomId);
   }
 }
+function schedulePreWarm(roomId, currentMessageId) {
+  void runPickerThenPrewarm(roomId, currentMessageId).catch((e) => {
+    process.stderr.write(`[pre-warm] failed: ${e instanceof Error ? e.message : String(e)}
+`);
+  });
+}
+async function runPickerThenPrewarm(roomId, _currentMessageId) {
+  const state = ensureState(roomId);
+  if (state.preWarmed) return;
+  if (state.queue.length < 2) return;
+  const room = getRoom(roomId);
+  if (!room || room.status !== "live") return;
+  if (room.deliveryMode !== "voice") return;
+  if (state.pendingRoundEnd || state.pauseAfterCurrent || state.billingHaltedThisTurn) return;
+  if (room.awaitingClarify || room.awaitingContinue) return;
+  const recent = listRecentMessages(roomId, 30);
+  const directorAlreadySpoke = recent.some((m) => {
+    if (m.authorKind !== "agent" || m.roundNum !== state.roundNum) return false;
+    if (m.meta?.kind) return false;
+    const a = m.authorId ? getAgent(m.authorId) : null;
+    return a?.roleKind === "director";
+  });
+  const candidates = state.queue.map((q) => getAgent(q.agentId)).filter((a) => a !== null);
+  let pickedAgentId = null;
+  if (directorAlreadySpoke && candidates.length >= 2) {
+    try {
+      const pick = await withTimeout(
+        pickNextSpeaker({
+          candidates,
+          history: recent,
+          room: { subject: room.subject ?? null },
+          mode: "lens-gap"
+        }),
+        15e3,
+        "prewarm-picker"
+      );
+      pickedAgentId = pick.agentId;
+    } catch (e) {
+      process.stderr.write(`[pre-warm picker] ${e instanceof Error ? e.message : String(e)}
+`);
+    }
+  }
+  if (state.preWarmed) return;
+  const live = getRoom(roomId);
+  if (!live || live.status !== "live") return;
+  if (state.queue.length < 2) return;
+  if (pickedAgentId) {
+    const idx = state.queue.findIndex((q) => q.agentId === pickedAgentId);
+    if (idx > 1) {
+      const [picked] = state.queue.splice(idx, 1);
+      state.queue.splice(1, 0, picked);
+      emitQueueUpdate(roomId, state);
+    }
+  }
+  const nextEntry = state.queue[1];
+  if (!nextEntry) return;
+  const nextSpeaker = getAgent(nextEntry.agentId);
+  if (!nextSpeaker) return;
+  const ac = new AbortController();
+  const sentinel = `pending:${nextSpeaker.id}`;
+  state.inflight.set(sentinel, ac);
+  rlog(roomId, "prewarm-start", {
+    agent: nextSpeaker.name,
+    agentId: nextSpeaker.id,
+    pickedByHaiku: !!pickedAgentId,
+    queueHead: state.queue[0]?.agentId
+  });
+  const preWarmed = {
+    agentId: nextEntry.agentId,
+    messageId: "",
+    promise: Promise.resolve(null),
+    // backfilled below
+    abortController: ac
+  };
+  preWarmed.promise = streamSpeakerTurn({
+    roomId,
+    speaker: nextSpeaker,
+    roundNum: state.roundNum,
+    signal: ac.signal,
+    preWarmed: true,
+    onPlaceholder: (info) => {
+      preWarmed.messageId = info.messageId;
+      if (state.inflight.has(sentinel)) {
+        state.inflight.delete(sentinel);
+        state.inflight.set(info.messageId, ac);
+      }
+    }
+    // Chain trigger lives in pumpQueue's consume point, NOT here.
+    // Rationale: B's `message-final` fires while B is still occupying
+    // `state.preWarmed`. A nested schedulePreWarm() call from inside
+    // B's pre-warm stream would hit the `if (state.preWarmed) return`
+    // guard at the top of runPickerThenPrewarm and bail — C never
+    // gets pre-warmed, depth-1 collapses to "first pair only". The
+    // correct hook is the moment pumpQueue clears preWarmed (consume
+    // path); at that instant the slot is free, the queue head has
+    // advanced, and the next pre-warm has the right context.
+    // onMessageFinal intentionally omitted.
+  });
+  state.preWarmed = preWarmed;
+}
 async function pumpQueue(roomId) {
   const state = ensureState(roomId);
   if (state.processing) {
@@ -19150,7 +18952,8 @@ async function pumpQueue(roomId) {
         emitQueueUpdate(roomId, state);
         break;
       }
-      if (state.queue.length >= 2) {
+      const preWarmedHit = !!(state.preWarmed && state.queue[0] && state.preWarmed.agentId === state.queue[0].agentId);
+      if (!preWarmedHit && state.queue.length >= 2) {
         const recent = listRecentMessages(roomId, 30);
         const round = state.roundNum;
         let isReactive = false;
@@ -19217,13 +19020,37 @@ async function pumpQueue(roomId) {
                 } catch {
                 }
               }
-              const pick = await pickNextSpeaker({
-                candidates: pickerCandidates,
-                history: recent,
-                room: pickRoom ?? void 0,
-                mode: useDissentMode ? "dissent-gap" : "lens-gap",
-                convergentTerms: useDissentMode ? convergentTerms : void 0
-              });
+              const fallbackPick = {
+                agentId: null,
+                rationale: "",
+                intervention: null
+              };
+              let pick = fallbackPick;
+              try {
+                pick = await withTimeout(
+                  pickNextSpeaker({
+                    candidates: pickerCandidates,
+                    history: recent,
+                    room: pickRoom ?? void 0,
+                    mode: useDissentMode ? "dissent-gap" : "lens-gap",
+                    convergentTerms: useDissentMode ? convergentTerms : void 0
+                  }),
+                  15e3,
+                  "speaker-picker"
+                );
+              } catch (e) {
+                if (e instanceof TimeoutError) {
+                  process.stderr.write(`[picker] timeout \u2014 falling back to round-robin
+`);
+                  emitAutoSkipped(roomId, "picker", "picker-timeout");
+                } else {
+                  process.stderr.write(
+                    `[picker] error: ${e instanceof Error ? e.message : String(e)}
+`
+                  );
+                }
+                pick = fallbackPick;
+              }
               if (useDissentMode && convergentTerms.length > 0) {
                 const lastBreaker = state.lastFrameBreakerAgentId;
                 const chosenId = pick.agentId ?? state.queue[0]?.agentId;
@@ -19318,23 +19145,57 @@ async function pumpQueue(roomId) {
         emitQueueUpdate(roomId, state);
         continue;
       }
-      const ac = new AbortController();
-      state.inflight = ac;
+      let ac;
+      let streamPromise;
+      if (preWarmedHit && state.preWarmed) {
+        const justConsumed = state.preWarmed;
+        ac = state.preWarmed.abortController;
+        streamPromise = state.preWarmed.promise;
+        state.preWarmed = null;
+        rlog(roomId, "speaker-prewarm-consumed", {
+          agent: speaker.name,
+          agentId: speaker.id
+        });
+        schedulePreWarm(roomId, justConsumed.messageId);
+      } else {
+        rlog(roomId, "speaker-fresh-path", {
+          agent: speaker.name,
+          agentId: speaker.id,
+          hasPrewarm: !!state.preWarmed,
+          prewarmAgent: state.preWarmed?.agentId ?? null,
+          queueHead: state.queue[0]?.agentId,
+          note: "Pre-warm did NOT cover this speaker \xB7 they go through fresh path. Their meta.preWarmed will be false; their bubble will NOT be hidden during a prior TTS."
+        });
+        ac = new AbortController();
+        const sentinel = `pending:${speaker.id}`;
+        state.inflight.set(sentinel, ac);
+        streamPromise = streamSpeakerTurn({
+          roomId,
+          speaker,
+          roundNum: state.roundNum,
+          signal: ac.signal,
+          onPlaceholder: (info) => {
+            if (state.inflight.has(sentinel)) {
+              state.inflight.delete(sentinel);
+              state.inflight.set(info.messageId, ac);
+            }
+          },
+          onMessageFinal: (info) => {
+            schedulePreWarm(roomId, info.messageId);
+          }
+        });
+      }
       const turnStart = Date.now();
       rlog(roomId, "speaker-start", {
         agent: speaker.name,
         agentId: speaker.id,
         modelV: speaker.modelV,
         round: state.roundNum,
-        position: `${state.speakersThisTurn + 1}/${state.maxSpeakersThisTurn}`
+        position: `${state.speakersThisTurn + 1}/${state.maxSpeakersThisTurn}`,
+        preWarmed: preWarmedHit
       });
       try {
-        const messageId = await streamSpeakerTurn({
-          roomId,
-          speaker,
-          roundNum: state.roundNum,
-          signal: ac.signal
-        });
+        const messageId = await streamPromise;
         if (messageId && getRoom(roomId)?.deliveryMode === "voice") {
           await waitForVoicePlayback(roomId, messageId);
         }
@@ -19356,7 +19217,11 @@ async function pumpQueue(roomId) {
         process.stderr.write(`[orchestrator] stream error: ${msg}
 `);
       } finally {
-        state.inflight = null;
+        const keysToDel = [];
+        for (const [key, val] of state.inflight) {
+          if (val === ac) keysToDel.push(key);
+        }
+        for (const key of keysToDel) state.inflight.delete(key);
       }
       if (state.queue[0] !== entry) {
         continue;
@@ -19455,15 +19320,26 @@ async function pumpQueue(roomId) {
       // same path the chat round-prompt button takes).
       room.voteTrigger !== "manual") {
         const wrappedRound = state.roundNum;
+        emitChairPending(roomId, "vote-summary");
         let recommendation;
         try {
           const recent = listRecentMessages(roomId, 30);
-          const wrap = await pickRoundWrap({ history: recent, roundNum: wrappedRound, room });
+          const wrap = await withTimeout(
+            pickRoundWrap({ history: recent, roundNum: wrappedRound, room }),
+            15e3,
+            "pickRoundWrap"
+          );
           recommendation = { kind: wrap.recommendation, rationale: wrap.rationale };
         } catch (e) {
-          rlog(roomId, "round-wrap-error", {
-            error: e instanceof Error ? e.message : String(e)
-          });
+          if (e instanceof TimeoutError) {
+            process.stderr.write(`[round-wrap] timeout \u2014 using neutral prompt
+`);
+            emitAutoSkipped(roomId, "picker", "pickRoundWrap-timeout");
+          } else {
+            rlog(roomId, "round-wrap-error", {
+              error: e instanceof Error ? e.message : String(e)
+            });
+          }
         }
         const roomAgain = getRoom(roomId);
         const stateNow = ensureState(roomId);
@@ -19488,7 +19364,7 @@ async function pumpQueue(roomId) {
   }
 }
 async function streamSpeakerTurn(args) {
-  const { roomId, speaker, roundNum, signal } = args;
+  const { roomId, speaker, roundNum, signal, preWarmed = false, onPlaceholder, onMessageFinal } = args;
   const room = getRoom(roomId);
   if (!room) return null;
   const memberRows = listRoomMembers(roomId);
@@ -19664,6 +19540,9 @@ async function streamSpeakerTurn(args) {
     speakerStatus: "streaming",
     streaming: true
   };
+  if (preWarmed) {
+    placeholderMeta.preWarmed = true;
+  }
   if (activeSkills.length > 0) {
     placeholderMeta.skillsUsed = activeSkills.map((s) => s.slug);
     if (pickerReason) placeholderMeta.skillsReason = pickerReason;
@@ -19695,6 +19574,14 @@ async function streamSpeakerTurn(args) {
     roundNum: placeholder.roundNum,
     createdAt: placeholder.createdAt
   });
+  if (onPlaceholder) {
+    try {
+      onPlaceholder({ messageId: placeholder.id });
+    } catch (e) {
+      process.stderr.write(`[onPlaceholder] ${e instanceof Error ? e.message : String(e)}
+`);
+    }
+  }
   let buf = "";
   let finishReason;
   let errored = false;
@@ -19721,32 +19608,90 @@ async function streamSpeakerTurn(args) {
     if (!voiceProfile) return;
     process.stderr.write(`[tts] emitVoiceText called: provider=${voiceProfile.provider} voiceId=${voiceProfile.voiceId} textLen=${text.length} text="${text.slice(0, 50)}"
 `);
-    let chunkCount = 0;
-    try {
-      for await (const chunk of synthesizeSpeechStream(text, voiceProfile, signal)) {
-        if (signal.aborted) break;
-        chunkCount++;
+    const MAX_ATTEMPTS = 2;
+    const TIMEOUT_MS = 3e4;
+    for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+      if (signal.aborted) return;
+      const timeoutCtrl = new AbortController();
+      const timer = setTimeout(() => timeoutCtrl.abort(), TIMEOUT_MS);
+      const onOuterAbort = () => timeoutCtrl.abort();
+      signal.addEventListener("abort", onOuterAbort);
+      let chunkCount = 0;
+      let failure = null;
+      try {
+        for await (const chunk of synthesizeSpeechStream(text, voiceProfile, timeoutCtrl.signal)) {
+          if (signal.aborted) break;
+          chunkCount++;
+          roomBus.emit(roomId, {
+            type: "voice-chunk",
+            messageId: placeholder.id,
+            seq: voiceSeq++,
+            text: chunk.text,
+            provider: chunk.provider,
+            model: chunk.model,
+            voiceId: chunk.voiceId,
+            ...chunk.mimeType ? { mimeType: chunk.mimeType } : {},
+            ...chunk.audioBase64 ? { audioBase64: chunk.audioBase64 } : {}
+          });
+        }
+      } catch (e) {
+        failure = e instanceof Error ? e : new Error(String(e));
+      } finally {
+        clearTimeout(timer);
+        signal.removeEventListener("abort", onOuterAbort);
+      }
+      if (signal.aborted) {
+        process.stderr.write(`[tts] outer abort during attempt ${attempt}, giving up
+`);
+        return;
+      }
+      if (!failure) {
+        process.stderr.write(`[tts] emitVoiceText done (attempt ${attempt}/${MAX_ATTEMPTS}): ${chunkCount} chunks emitted
+`);
+        return;
+      }
+      const billing = tryExtractTtsBillingError(failure);
+      if (billing) {
         roomBus.emit(roomId, {
-          type: "voice-chunk",
+          type: "voice-error",
           messageId: placeholder.id,
-          seq: voiceSeq++,
-          text: chunk.text,
-          provider: chunk.provider,
-          model: chunk.model,
-          voiceId: chunk.voiceId,
-          ...chunk.mimeType ? { mimeType: chunk.mimeType } : {},
-          ...chunk.audioBase64 ? { audioBase64: chunk.audioBase64 } : {}
+          code: billing.code,
+          provider: billing.provider,
+          message: billing.message,
+          upgradeUrl: billing.upgradeUrl
         });
+        process.stderr.write(
+          `[tts] BILLING-ERROR room=${roomId} agent=${speaker.name} provider=${voiceProfile.provider} \xB7 ${billing.message}
+`
+        );
+        return;
       }
-      process.stderr.write(`[tts] emitVoiceText done: ${chunkCount} chunks emitted
-`);
-    } catch (e) {
+      const willRetry = attempt < MAX_ATTEMPTS && chunkCount === 0;
       process.stderr.write(
-        `[tts] ERROR room=${roomId} agent=${speaker.name} provider=${voiceProfile.provider} voiceId=${voiceProfile.voiceId} \xB7 ${e instanceof Error ? e.stack || e.message : String(e)}
-`
+        `[tts] ERROR attempt=${attempt}/${MAX_ATTEMPTS} room=${roomId} agent=${speaker.name} provider=${voiceProfile.provider} voiceId=${voiceProfile.voiceId} chunks=${chunkCount} \xB7 ${failure.stack || failure.message}` + (willRetry ? " \xB7 retrying\n" : " \xB7 giving up\n")
       );
-    }
-  }
+      if (!willRetry) return;
+      await new Promise((r) => setTimeout(r, 500));
+    }
+  }
+  const turnCtrl = new AbortController();
+  const onRoomAbort = () => turnCtrl.abort();
+  if (signal.aborted) turnCtrl.abort();
+  else signal.addEventListener("abort", onRoomAbort);
+  let hardCapTimedOut = false;
+  let firstTokenTimedOut = false;
+  const hardCapTimer = setTimeout(() => {
+    if (!turnCtrl.signal.aborted) {
+      hardCapTimedOut = true;
+      turnCtrl.abort();
+    }
+  }, 12e4);
+  let firstTokenTimer = setTimeout(() => {
+    if (buf.length === 0 && !turnCtrl.signal.aborted) {
+      firstTokenTimedOut = true;
+      turnCtrl.abort();
+    }
+  }, 6e4);
   try {
     for await (const chunk of callLLMStream({
       modelV: speaker.modelV,
@@ -19765,10 +19710,14 @@ async function streamSpeakerTurn(args) {
       // the next move is to cap reasoning explicitly via providerOptions
       // (`reasoning.max_tokens`) instead of just enlarging the total cap.
       maxTokens: 4e3,
-      signal
+      signal: turnCtrl.signal
     })) {
       if (signal.aborted) break;
       if (chunk.type === "text") {
+        if (firstTokenTimer) {
+          clearTimeout(firstTokenTimer);
+          firstTokenTimer = null;
+        }
         buf += chunk.delta;
         updateMessageBody(placeholder.id, buf, {
           ...placeholderMeta,
@@ -19841,7 +19790,14 @@ async function streamSpeakerTurn(args) {
     }
   } catch (e) {
     errored = true;
-    const msg = e instanceof Error ? e.message : String(e);
+    let msg = e instanceof Error ? e.message : String(e);
+    if (firstTokenTimedOut) {
+      msg = `LLM did not produce any token within 60s \xB7 auto-skipped`;
+      emitAutoSkipped(roomId, "llm", "llm-first-token-timeout", placeholder.id);
+    } else if (hardCapTimedOut) {
+      msg = `LLM stream exceeded 120s hard cap \xB7 auto-skipped`;
+      emitAutoSkipped(roomId, "llm", "llm-timeout", placeholder.id);
+    }
     process.stderr.write(
       `[stream-throw] room=${roomId} agent=${speaker.name} modelV=${speaker.modelV} \xB7 ${msg}
 `
@@ -19857,7 +19813,16 @@ async function streamSpeakerTurn(args) {
       messageId: placeholder.id,
       message: msg
     });
-    throw e;
+    markVoicePlaybackDone(roomId, placeholder.id);
+    if (!firstTokenTimedOut && !hardCapTimedOut) throw e;
+  } finally {
+    clearTimeout(hardCapTimer);
+    if (firstTokenTimer) {
+      clearTimeout(firstTokenTimer);
+      firstTokenTimer = null;
+    }
+    signal.removeEventListener("abort", onRoomAbort);
+    finalizeStreamingMessage(placeholder.id, "turn-cleanup");
   }
   if (signal.aborted) {
     finishReason = finishReason ?? "aborted";
@@ -19895,6 +19860,14 @@ async function streamSpeakerTurn(args) {
       messageId: placeholder.id,
       finishReason
     });
+    if (onMessageFinal) {
+      try {
+        onMessageFinal({ messageId: placeholder.id });
+      } catch (e) {
+        process.stderr.write(`[onMessageFinal] ${e instanceof Error ? e.message : String(e)}
+`);
+      }
+    }
     if (buf.trim().length >= 40) {
       void (async () => {
         try {
@@ -20391,6 +20364,17 @@ async function streamChairMessage(args) {
         });
       }
     } catch (e) {
+      const billing = tryExtractTtsBillingError(e);
+      if (billing) {
+        roomBus.emit(roomId, {
+          type: "voice-error",
+          messageId: placeholder.id,
+          code: billing.code,
+          provider: billing.provider,
+          message: billing.message,
+          upgradeUrl: billing.upgradeUrl
+        });
+      }
       process.stderr.write(`[tts-chair] ${e instanceof Error ? e.message : String(e)}
 `);
     }
@@ -20566,13 +20550,34 @@ async function runChairClarify(roomId) {
     }
   }
   if (turnNumber === 1) {
-    const decision = await pickChairClarifyDecision({ history });
-    if (!decision.shouldAsk) {
+    emitChairPending(roomId, "clarify-deciding");
+    let decision = null;
+    try {
+      decision = await withTimeout(
+        pickChairClarifyDecision({ history }),
+        15e3,
+        "chair-clarify-decision"
+      );
+    } catch (e) {
+      if (e instanceof TimeoutError) {
+        process.stderr.write(`[chair-clarify] decision timeout \u2014 skipping clarify
+`);
+        emitAutoSkipped(roomId, "clarify", "clarify-timeout");
+        decision = { shouldAsk: false, rationale: "timeout" };
+      } else {
+        process.stderr.write(
+          `[chair-clarify] decision error: ${e instanceof Error ? e.message : String(e)}
+`
+        );
+        decision = { shouldAsk: false, rationale: "error" };
+      }
+    }
+    if (!decision || !decision.shouldAsk) {
       setAwaitingClarify(roomId, false);
       roomBus.emit(roomId, {
         type: "config-event",
         kind: "clarify-ready",
-        payload: { skipped: true, rationale: decision.rationale },
+        payload: { skipped: true, rationale: decision?.rationale },
         createdAt: Date.now()
       });
       return { asked: false, ready: true, exhausted: false };
@@ -20782,6 +20787,17 @@ async function emitChairAnnouncementVoice(roomId, messageId, body) {
     roomBus.emit(roomId, { type: "voice-final", messageId });
     await waitForVoicePlayback(roomId, messageId, 6e4);
   } catch (e) {
+    const billing = tryExtractTtsBillingError(e);
+    if (billing) {
+      roomBus.emit(roomId, {
+        type: "voice-error",
+        messageId,
+        code: billing.code,
+        provider: billing.provider,
+        message: billing.message,
+        upgradeUrl: billing.upgradeUrl
+      });
+    }
     process.stderr.write(`[tts-chair-announce] ${e instanceof Error ? e.message : String(e)}
 `);
   }
@@ -21689,42 +21705,12 @@ function roomsRouter() {
       payload: { mode, intensity, briefStyle, deliveryMode, members: members.map((m) => m.agentId), autoPick },
       actorKind: "user"
     });
-    let seedContext = null;
-    if (b.seedContext && typeof b.seedContext === "object") {
-      const raw = b.seedContext;
-      const topicRecId = typeof raw.topicRecId === "string" && raw.topicRecId.trim().length > 0 ? raw.topicRecId.trim().slice(0, 64) : void 0;
-      const rationale = typeof raw.rationale === "string" && raw.rationale.trim().length > 0 ? raw.rationale.trim().slice(0, 400) : void 0;
-      const rawSnippets = Array.isArray(raw.snippets) ? raw.snippets : [];
-      const snippets = rawSnippets.filter(
-        (s) => !!s && typeof s === "object" && typeof s.title === "string" && typeof s.url === "string" && typeof s.description === "string"
-      ).slice(0, 12).map((s) => ({
-        title: s.title.slice(0, 200),
-        url: s.url.slice(0, 600),
-        description: s.description.slice(0, 600)
-      }));
-      if (topicRecId || rationale || snippets.length > 0) {
-        seedContext = {
-          ...topicRecId ? { topicRecId } : {},
-          ...rationale ? { rationale } : {},
-          ...snippets.length > 0 ? { snippets } : {}
-        };
-      }
-    }
     const opening = insertMessage({
       roomId: room.id,
       authorKind: "user",
       body: subject,
-      roundNum: 1,
-      meta: seedContext ? { seedContext } : void 0
+      roundNum: 1
     });
-    if (seedContext?.topicRecId) {
-      try {
-        markTopicRecOpened(seedContext.topicRecId, room.id);
-      } catch (e) {
-        process.stderr.write(`[rooms] topic-rec link failed: ${e instanceof Error ? e.message : String(e)}
-`);
-      }
-    }
     roomBus.emit(room.id, {
       type: "message-appended",
       messageId: opening.id,
@@ -21856,13 +21842,19 @@ function roomsRouter() {
   r.get("/:id/stream", (c) => {
     const id = c.req.param("id");
     if (!getRoom(id)) return c.json({ error: "not found" }, 404);
-    return streamSSE3(c, async (s) => {
+    const lastIdHeader = c.req.header("last-event-id");
+    const sinceId = lastIdHeader ? Number.parseInt(lastIdHeader, 10) : NaN;
+    return streamSSE2(c, async (s) => {
       await s.writeSSE({ event: "hello", data: JSON.stringify({ roomId: id, ts: Date.now() }) });
       const queue = [];
       let resolveWaiter = null;
       let closed = false;
-      const off = roomBus.subscribe(id, (event) => {
-        queue.push(event);
+      if (Number.isFinite(sinceId) && sinceId > 0) {
+        const missed = roomBus.replay(id, sinceId);
+        for (const m of missed) queue.push({ id: m.id, event: m.event });
+      }
+      const off = roomBus.subscribeWithId(id, (eventId, event) => {
+        queue.push({ id: eventId, event });
         if (resolveWaiter) {
           resolveWaiter();
           resolveWaiter = null;
@@ -21883,8 +21875,12 @@ function roomsRouter() {
           });
           continue;
         }
-        const event = queue.shift();
-        await s.writeSSE({ event: event.type, data: JSON.stringify(event) });
+        const { id: eventId, event } = queue.shift();
+        await s.writeSSE({
+          id: String(eventId),
+          event: event.type,
+          data: JSON.stringify(event)
+        });
       }
     });
   });
@@ -21980,6 +21976,12 @@ function roomsRouter() {
     if (!getRoom(id)) return c.json({ error: "not found" }, 404);
     return c.json({ ok: markVoicePlaybackDone(id, messageId) });
   });
+  r.post("/:id/messages/:messageId/voice-progress", (c) => {
+    const id = c.req.param("id");
+    const messageId = c.req.param("messageId");
+    if (!getRoom(id)) return c.json({ error: "not found" }, 404);
+    return c.json({ ok: bumpVoicePlaybackHeartbeat(id, messageId) });
+  });
   r.post("/:id/pause", async (c) => {
     const id = c.req.param("id");
     const room = getRoom(id);
@@ -22786,13 +22788,22 @@ function voicesRouter() {
       ttsCacheSet(key, out);
       return c.json(out);
     } catch (e) {
+      const tagged = e ?? {};
       const msg = ttsErrorMessage(e, profile.provider);
       const isNoKey = /401|403|api[\s-]?key|unauthor/i.test(msg);
-      return c.json({
+      const payload = {
         error: msg,
-        code: isNoKey ? "no-key" : "tts-error",
-        provider: profile.provider
-      }, 502);
+        provider: typeof tagged.provider === "string" ? tagged.provider : profile.provider
+      };
+      if (typeof tagged.code === "string") {
+        payload.code = tagged.code;
+      } else {
+        payload.code = isNoKey ? "no-key" : "tts-error";
+      }
+      if (typeof tagged.upgradeUrl === "string") {
+        payload.upgradeUrl = tagged.upgradeUrl;
+      }
+      return c.json(payload, 502);
     }
   });
   return r;
@@ -22802,7 +22813,7 @@ function voicesRouter() {
 init_paths();
 
 // src/version.ts
-var VERSION = "0.1.23";
+var VERSION = "0.1.25";
 
 // src/server.ts
 function createApp() {
@@ -22845,8 +22856,8 @@ Build the package or check that public/ is bundled alongside dist/.`
   app.route("/api/prefs", prefsRouter());
   app.route("/api/agents", agentsRouter());
   app.route("/api/keys", keysRouter());
+  app.route("/api/credentials", credentialsRouter());
   app.route("/api/models", modelsRouter());
-  app.route("/api/topic-recs", topicRecsRouter());
   app.route("/api/rooms", roomsRouter());
   app.route("/api/briefs", briefsRouter());
   app.route("/api/notes", notesRouter());