switchroom 0.18.24 → 0.18.26

package/telegram-plugin/dist/gateway/gateway.js

@@ -7525,9 +7525,329 @@ var init_approval_card = __esm(() => {
   import_grammy3 = __toESM(require_mod2(), 1);
 });
 
+// render/code-segments.ts
+function findClosingBackticks(text, from, runLen) {
+  let i = from;
+  while (i < text.length) {
+    if (text[i] === "`") {
+      let j = i;
+      while (j < text.length && text[j] === "`")
+        j++;
+      if (j - i === runLen)
+        return j;
+      i = j;
+    } else {
+      i++;
+    }
+  }
+  return -1;
+}
+function splitCodeSegments(text) {
+  const out = [];
+  let i = 0;
+  let plainStart = 0;
+  while (i < text.length) {
+    if (text[i] === "`") {
+      let j = i;
+      while (j < text.length && text[j] === "`")
+        j++;
+      const runLen = j - i;
+      const close = findClosingBackticks(text, j, runLen);
+      if (close !== -1) {
+        if (plainStart < i)
+          out.push({ code: false, text: text.slice(plainStart, i) });
+        out.push({ code: true, text: text.slice(i, close) });
+        i = close;
+        plainStart = close;
+        continue;
+      }
+    }
+    i++;
+  }
+  if (plainStart < text.length)
+    out.push({ code: false, text: text.slice(plainStart) });
+  return out;
+}
+function isTableDelimiterRow(line) {
+  const t = line.trim();
+  return t.length > 0 && /^[\s|:-]+$/.test(t) && t.includes("-") && t.includes("|");
+}
+function isTableCandidateLine(line) {
+  return /^\s*\|/.test(line);
+}
+function findTableRanges(text) {
+  const ranges = [];
+  const lines = text.split(`
+`);
+  let offset = 0;
+  let runStart = -1;
+  let runEnd = -1;
+  let runHasDelim = false;
+  let runLineCount = 0;
+  const flush = () => {
+    if (runStart !== -1 && runLineCount >= 2 && runHasDelim) {
+      ranges.push([runStart, runEnd]);
+    }
+    runStart = -1;
+    runEnd = -1;
+    runHasDelim = false;
+    runLineCount = 0;
+  };
+  for (let k = 0;k < lines.length; k++) {
+    const line = lines[k];
+    const lineLen = line.length + (k < lines.length - 1 ? 1 : 0);
+    if (isTableCandidateLine(line)) {
+      if (runStart === -1)
+        runStart = offset;
+      runEnd = offset + lineLen;
+      runLineCount += 1;
+      if (isTableDelimiterRow(line))
+        runHasDelim = true;
+    } else {
+      flush();
+    }
+    offset += lineLen;
+  }
+  flush();
+  return ranges;
+}
+function splitProseProtected(text) {
+  const out = [];
+  const tables = findTableRanges(text);
+  let tIdx = 0;
+  let i = 0;
+  let plainStart = 0;
+  const pushProtected = (from, to) => {
+    if (plainStart < from)
+      out.push({ code: false, text: text.slice(plainStart, from) });
+    out.push({ code: true, text: text.slice(from, to) });
+    plainStart = to;
+  };
+  while (i < text.length) {
+    while (tIdx < tables.length && tables[tIdx][1] <= i)
+      tIdx++;
+    if (tIdx < tables.length && tables[tIdx][0] === i) {
+      const [, end] = tables[tIdx];
+      pushProtected(i, end);
+      i = end;
+      continue;
+    }
+    const ch = text[i];
+    if (ch === "[") {
+      const close = text.indexOf("]", i + 1);
+      if (close !== -1 && text[close + 1] === "(") {
+        const destClose = text.indexOf(")", close + 2);
+        if (destClose !== -1) {
+          pushProtected(close + 1, destClose + 1);
+          i = destClose + 1;
+          continue;
+        }
+      }
+      i++;
+      continue;
+    }
+    if ((ch === "h" || ch === "w") && (i === 0 || !/[A-Za-z0-9]/.test(text[i - 1]))) {
+      const m = /^(?:https?:\/\/|www\.)[^\s<>()\[\]]+/.exec(text.slice(i));
+      if (m) {
+        const end = i + m[0].length;
+        pushProtected(i, end);
+        i = end;
+        continue;
+      }
+    }
+    i++;
+  }
+  if (plainStart < text.length)
+    out.push({ code: false, text: text.slice(plainStart) });
+  return out;
+}
+function splitProtectedSegments(text) {
+  const out = [];
+  for (const seg of splitCodeSegments(text)) {
+    if (seg.code) {
+      out.push(seg);
+      continue;
+    }
+    for (const sub of splitProseProtected(seg.text))
+      out.push(sub);
+  }
+  return out;
+}
+
+// render/dollar-math-guard.ts
+function guardDollarMath(text) {
+  if (!text.includes("$"))
+    return text;
+  const segments = splitProtectedSegments(text);
+  let total = 0;
+  let hasCurrencySignal = false;
+  for (const seg of segments) {
+    if (seg.code)
+      continue;
+    total += seg.text.match(ANY_DOLLAR)?.length ?? 0;
+    if (!hasCurrencySignal && CURRENCY_SIGNAL.test(seg.text))
+      hasCurrencySignal = true;
+  }
+  if (total < 2 || !hasCurrencySignal)
+    return text;
+  return segments.map((seg) => seg.code ? seg.text : seg.text.replace(UNESCAPED_DOLLAR, () => "\\$")).join("");
+}
+var ANY_DOLLAR, CURRENCY_SIGNAL, UNESCAPED_DOLLAR;
+var init_dollar_math_guard = __esm(() => {
+  ANY_DOLLAR = /\$/g;
+  CURRENCY_SIGNAL = /\$\.?\d|\d\s?\$/;
+  UNESCAPED_DOLLAR = /(?<!\\)\$/g;
+});
+
+// render/emphasis-guard.ts
+function guardAccidentalEmphasis(text) {
+  if (!text.includes("_") && !text.includes("*"))
+    return text;
+  const segments = splitProtectedSegments(text);
+  let hasIntraUnderscore = false;
+  let hasIntraAsterisk = false;
+  let underscoreCount = 0;
+  let asteriskCount = 0;
+  for (const seg of segments) {
+    if (seg.code)
+      continue;
+    if (INTRA_WORD_UNDERSCORE.test(seg.text))
+      hasIntraUnderscore = true;
+    if (INTRA_WORD_ASTERISK.test(seg.text))
+      hasIntraAsterisk = true;
+    underscoreCount += seg.text.match(ANY_UNDERSCORE)?.length ?? 0;
+    asteriskCount += seg.text.match(ANY_ASTERISK)?.length ?? 0;
+  }
+  INTRA_WORD_UNDERSCORE.lastIndex = 0;
+  INTRA_WORD_ASTERISK.lastIndex = 0;
+  const armUnderscore = hasIntraUnderscore && underscoreCount >= 2;
+  const armAsterisk = hasIntraAsterisk && asteriskCount >= 2;
+  if (!armUnderscore && !armAsterisk)
+    return text;
+  return segments.map((seg) => {
+    if (seg.code)
+      return seg.text;
+    let out = seg.text;
+    if (armUnderscore)
+      out = out.replace(INTRA_WORD_UNDERSCORE, "\\_");
+    if (armAsterisk)
+      out = out.replace(INTRA_WORD_ASTERISK, "\\*");
+    return out;
+  }).join("");
+}
+var INTRA_WORD_UNDERSCORE, INTRA_WORD_ASTERISK, ANY_UNDERSCORE, ANY_ASTERISK;
+var init_emphasis_guard = __esm(() => {
+  INTRA_WORD_UNDERSCORE = /(?<=[A-Za-z0-9])_(?=[A-Za-z0-9])/g;
+  INTRA_WORD_ASTERISK = /(?<=[A-Za-z0-9])\*(?=[A-Za-z0-9])/g;
+  ANY_UNDERSCORE = /(?<!\\)_/g;
+  ANY_ASTERISK = /(?<!\\)\*/g;
+});
+
+// render/line-start-guard.ts
+function escapeAccidentalLineStart(line) {
+  const indent = /^ */.exec(line)[0];
+  if (indent.length >= 4)
+    return line;
+  const rest = line.slice(indent.length);
+  if (ACCIDENTAL_BLOCKQUOTE.test(rest)) {
+    return indent + "\\" + rest;
+  }
+  const ol = ACCIDENTAL_ORDERED_LIST.exec(rest);
+  if (ol) {
+    const digits = ol[1];
+    const delim = ol[2];
+    return indent + digits + "\\" + delim + rest.slice(digits.length + 1);
+  }
+  return line;
+}
+function guardAccidentalBlockConstructs(text) {
+  if (!text.includes(">") && !/\d{4,}[.)]/.test(text))
+    return text;
+  const segments = splitProtectedSegments(text);
+  let out = "";
+  let atLineStart = true;
+  for (const seg of segments) {
+    if (seg.code) {
+      out += seg.text;
+      atLineStart = seg.text.endsWith(`
+`);
+      continue;
+    }
+    const lines = seg.text.split(`
+`);
+    for (let k = 0;k < lines.length; k++) {
+      const lineIsAtStart = k === 0 ? atLineStart : true;
+      const processed = lineIsAtStart ? escapeAccidentalLineStart(lines[k]) : lines[k];
+      out += processed;
+      if (k < lines.length - 1)
+        out += `
+`;
+    }
+    atLineStart = seg.text.endsWith(`
+`);
+  }
+  return out;
+}
+var ACCIDENTAL_BLOCKQUOTE, ACCIDENTAL_ORDERED_LIST;
+var init_line_start_guard = __esm(() => {
+  ACCIDENTAL_BLOCKQUOTE = /^>[0-9=]/;
+  ACCIDENTAL_ORDERED_LIST = /^(\d{4,})([.)])(\s|$)/;
+});
+
+// render/inline-pairs-guard.ts
+function countMatches(text, re) {
+  return text.match(re)?.length ?? 0;
+}
+function guardAccidentalInlinePairs(text) {
+  if (!/[~=|]/.test(text))
+    return text;
+  const segments = splitProtectedSegments(text);
+  let tildes = 0;
+  let marks = 0;
+  let spoilers = 0;
+  for (const seg of segments) {
+    if (seg.code)
+      continue;
+    tildes += countMatches(seg.text, TILDE_APPROX);
+    marks += countMatches(seg.text, MARK_OP);
+    spoilers += countMatches(seg.text, SPOILER_OP);
+  }
+  const armTilde = tildes >= 2;
+  const armMark = marks >= 2;
+  const armSpoiler = spoilers >= 2;
+  if (!armTilde && !armMark && !armSpoiler)
+    return text;
+  return segments.map((seg) => {
+    if (seg.code)
+      return seg.text;
+    let out = seg.text;
+    if (armTilde)
+      out = out.replace(TILDE_APPROX, () => "\\~");
+    if (armMark)
+      out = out.replace(MARK_OP, () => "\\=\\=");
+    if (armSpoiler)
+      out = out.replace(SPOILER_OP, () => "\\|\\|");
+    return out;
+  }).join("");
+}
+var TILDE_APPROX, MARK_OP, SPOILER_OP;
+var init_inline_pairs_guard = __esm(() => {
+  TILDE_APPROX = /(?<!\\)~(?=\$?\.?\d)/g;
+  MARK_OP = /(?<=\w)==(?=\w)/g;
+  SPOILER_OP = /(?<=\w)\|\|(?=\w)/g;
+});
+
 // rich-send.ts
+function guardAccidentalFormatting(markdown) {
+  let out = markdown;
+  out = guardAccidentalEmphasis(out);
+  out = guardAccidentalBlockConstructs(out);
+  out = guardAccidentalInlinePairs(out);
+  out = guardDollarMath(out);
+  return out;
+}
 function richMessage(markdown) {
-  return { markdown };
+  return { markdown: guardAccidentalFormatting(markdown) };
 }
 function isParseEntitiesError(err) {
   if (!(err instanceof import_grammy4.GrammyError) || err.error_code !== 400)
@@ -7545,6 +7865,10 @@ function isLengthError(err) {
 }
 var import_grammy4;
 var init_rich_send = __esm(() => {
+  init_dollar_math_guard();
+  init_emphasis_guard();
+  init_line_start_guard();
+  init_inline_pairs_guard();
   import_grammy4 = __toESM(require_mod2(), 1);
 });
 
@@ -21866,6 +22190,142 @@ var init_loader = __esm(() => {
   };
 });
 
+// quota-check.ts
+import { readFileSync as readFileSync17, existsSync as existsSync15 } from "fs";
+import { join as join20 } from "path";
+function readOauthToken(claudeConfigDir) {
+  const tokenFile = join20(claudeConfigDir, ".oauth-token");
+  if (!existsSync15(tokenFile))
+    return null;
+  try {
+    const raw = readFileSync17(tokenFile, "utf-8").trim();
+    return raw.length > 0 ? raw : null;
+  } catch {
+    return null;
+  }
+}
+function parseFloatHeader(headers, name) {
+  const v = headers.get(name);
+  if (v == null || v.trim().length === 0)
+    return null;
+  const n = Number(v);
+  return Number.isFinite(n) ? n : null;
+}
+function parseEpochHeader(headers, name) {
+  const v = headers.get(name);
+  if (v == null)
+    return null;
+  const n = Number(v);
+  if (!Number.isFinite(n) || n <= 0)
+    return null;
+  return new Date(n * 1000);
+}
+function parseQuotaHeaders(headers) {
+  const fiveHour = parseFloatHeader(headers, "anthropic-ratelimit-unified-5h-utilization");
+  const sevenDay = parseFloatHeader(headers, "anthropic-ratelimit-unified-7d-utilization");
+  if (fiveHour == null && sevenDay == null) {
+    return {
+      ok: false,
+      reason: "no unified rate-limit headers in response (API token, not OAuth?)"
+    };
+  }
+  return {
+    ok: true,
+    data: {
+      fiveHourUtilizationPct: (fiveHour ?? 0) * 100,
+      sevenDayUtilizationPct: (sevenDay ?? 0) * 100,
+      fiveHourUtilPresent: fiveHour != null,
+      sevenDayUtilPresent: sevenDay != null,
+      fiveHourResetAt: parseEpochHeader(headers, "anthropic-ratelimit-unified-5h-reset"),
+      sevenDayResetAt: parseEpochHeader(headers, "anthropic-ratelimit-unified-7d-reset"),
+      representativeClaim: headers.get("anthropic-ratelimit-unified-representative-claim"),
+      overageStatus: headers.get("anthropic-ratelimit-unified-overage-status"),
+      overageDisabledReason: headers.get("anthropic-ratelimit-unified-overage-disabled-reason")
+    }
+  };
+}
+async function fetchQuota(opts) {
+  let token;
+  if (opts.accessToken && opts.claudeConfigDir) {
+    return {
+      ok: false,
+      reason: "pass only one of `accessToken` or `claudeConfigDir`, not both"
+    };
+  }
+  if (opts.accessToken) {
+    token = opts.accessToken.trim().length > 0 ? opts.accessToken : null;
+  } else if (opts.claudeConfigDir) {
+    token = readOauthToken(opts.claudeConfigDir);
+  } else {
+    return {
+      ok: false,
+      reason: "fetchQuota requires `accessToken` or `claudeConfigDir`"
+    };
+  }
+  if (!token) {
+    return { ok: false, reason: "no OAuth token at .oauth-token" };
+  }
+  const controller = new AbortController;
+  const timeout = setTimeout(() => controller.abort(), opts.timeoutMs ?? 1e4);
+  const fetchFn = opts.fetchImpl ?? fetch;
+  let resp;
+  try {
+    resp = await fetchFn("https://api.anthropic.com/v1/messages", {
+      method: "POST",
+      headers: {
+        "anthropic-version": "2023-06-01",
+        "anthropic-beta": OAUTH_BETA,
+        authorization: `Bearer ${token}`,
+        "x-app": "cli",
+        "user-agent": DEFAULT_USER_AGENT,
+        "content-type": "application/json"
+      },
+      body: JSON.stringify({
+        model: opts.model ?? DEFAULT_PROBE_MODEL,
+        max_tokens: 1,
+        messages: [{ role: "user", content: "hi" }]
+      }),
+      signal: controller.signal
+    });
+  } catch (err) {
+    const msg = err?.message ?? String(err);
+    return { ok: false, reason: `request failed: ${msg}` };
+  } finally {
+    clearTimeout(timeout);
+  }
+  if (resp.status === 401 || resp.status === 403) {
+    return { ok: false, reason: `auth rejected (HTTP ${resp.status})` };
+  }
+  const parsed = parseQuotaHeaders(resp.headers);
+  if (!parsed.ok && resp.status >= 400) {
+    return { ok: false, reason: `HTTP ${resp.status}, ${parsed.reason}` };
+  }
+  return parsed;
+}
+function formatQuotaLine(q) {
+  const fmt = (n) => `${Math.round(n)}%`;
+  return `${fmt(q.fiveHourUtilizationPct)} / 5h \u00b7 ${fmt(q.sevenDayUtilizationPct)} / 7d`;
+}
+function formatResetRelative(target, now = new Date) {
+  if (!target)
+    return "\u2014";
+  const deltaMs = target.getTime() - now.getTime();
+  if (deltaMs <= 0)
+    return "resets now";
+  const totalMin = Math.round(deltaMs / 60000);
+  if (totalMin < 60)
+    return `resets in ${totalMin}m`;
+  const hours = Math.floor(totalMin / 60);
+  const mins = totalMin % 60;
+  if (hours < 24)
+    return mins > 0 ? `resets in ${hours}h ${mins}m` : `resets in ${hours}h`;
+  const days = Math.floor(hours / 24);
+  const remH = hours % 24;
+  return remH > 0 ? `resets in ${days}d ${remH}h` : `resets in ${days}d`;
+}
+var OAUTH_BETA = "oauth-2025-04-20", DEFAULT_USER_AGENT = "claude-cli/1.0.0 (external, cli)", DEFAULT_PROBE_MODEL = "claude-haiku-4-5-20251001";
+var init_quota_check = () => {};
+
 // ../node_modules/.bun/@xterm+headless@6.0.0/node_modules/@xterm/headless/lib-headless/xterm-headless.js
 var require_xterm_headless = __commonJS((exports2) => {
   (() => {
@@ -27427,9 +27887,9 @@ var init_flock = () => {};
 // ../src/vault/vault.ts
 import { randomBytes as randomBytes4, scryptSync, createCipheriv, createDecipheriv } from "node:crypto";
 import {
-  readFileSync as readFileSync17,
+  readFileSync as readFileSync18,
   writeSync as writeSync2,
-  existsSync as existsSync15,
+  existsSync as existsSync16,
   renameSync as renameSync6,
   mkdirSync as mkdirSync16,
   unlinkSync as unlinkSync10,
@@ -27470,12 +27930,12 @@ function normalizeSecrets(raw) {
   return out;
 }
 function openVault(passphrase, vaultPath) {
-  if (!existsSync15(vaultPath)) {
+  if (!existsSync16(vaultPath)) {
     throw new VaultError(`Vault file not found: ${vaultPath}`);
   }
   let vaultFile;
   try {
-    vaultFile = JSON.parse(readFileSync17(vaultPath, "utf8"));
+    vaultFile = JSON.parse(readFileSync18(vaultPath, "utf8"));
   } catch {
     throw new VaultError(`Failed to read vault file: ${vaultPath}`);
   }
@@ -27529,7 +27989,7 @@ import {
   statSync as statSync5,
   writeSync as writeSync3
 } from "node:fs";
-import { join as join21 } from "node:path";
+import { join as join23 } from "node:path";
 import { tmpdir as tmpdir2 } from "node:os";
 import { constants as fsConstants } from "node:fs";
 function isVaultReference(value) {
@@ -27581,11 +28041,11 @@ function materializationRoot() {
     return cachedRoot;
   const xdg = process.env.XDG_RUNTIME_DIR;
   if (xdg) {
-    const base = join21(xdg, "switchroom", "vault");
+    const base = join23(xdg, "switchroom", "vault");
     mkdirSync17(base, { recursive: true, mode: 448 });
-    cachedRoot = mkdtempSync(join21(base, "run-"));
+    cachedRoot = mkdtempSync(join23(base, "run-"));
   } else {
-    cachedRoot = mkdtempSync(join21(tmpdir2(), "switchroom-vault-"));
+    cachedRoot = mkdtempSync(join23(tmpdir2(), "switchroom-vault-"));
   }
   chmodSync5(cachedRoot, 448);
   return cachedRoot;
@@ -27600,7 +28060,7 @@ function writeFileExclusive(filePath, content3) {
   }
 }
 function materializeFilesEntry(key, files) {
-  const dir = join21(materializationRoot(), key);
+  const dir = join23(materializationRoot(), key);
   if (materializedDirs.has(dir)) {
     try {
       rmSync(dir, { recursive: true, force: true });
@@ -27616,7 +28076,7 @@ function materializeFilesEntry(key, files) {
     if (filename.includes("/") || filename.includes("\\") || filename === ".." || filename === "." || filename.includes("\x00")) {
       throw new Error(`Refusing to materialize vault file with unsafe name: ${filename}`);
     }
-    const filePath = join21(dir, filename);
+    const filePath = join23(dir, filename);
     const content3 = encoding === "base64" ? Buffer.from(value, "base64") : value;
     writeFileExclusive(filePath, content3);
   }
@@ -28184,17 +28644,21 @@ __export(exports_history, {
   recordEdit: () => recordEdit,
   query: () => query,
   pruneMessagesOlderThanDays: () => pruneMessagesOlderThanDays,
+  normalizeDeliveryText: () => normalizeDeliveryText,
   lookupMessageRoleAndText: () => lookupMessageRoleAndText,
   initHistory: () => initHistory,
+  hasOutboundWithText: () => hasOutboundWithText,
   hasOutboundDeliveredSince: () => hasOutboundDeliveredSince,
   getRecentOutboundCount: () => getRecentOutboundCount,
   getLatestInboundMessageId: () => getLatestInboundMessageId,
+  deliveryTextMatch: () => deliveryTextMatch,
   deleteFromHistory: () => deleteFromHistory,
   checkpointWal: () => checkpointWal,
-  _resetForTests: () => _resetForTests
+  _resetForTests: () => _resetForTests,
+  MIN_PREFIX_MATCH_CHARS: () => MIN_PREFIX_MATCH_CHARS
 });
-import { chmodSync as chmodSync7, existsSync as existsSync21, mkdirSync as mkdirSync21 } from "fs";
-import { join as join24 } from "path";
+import { chmodSync as chmodSync7, existsSync as existsSync22, mkdirSync as mkdirSync21 } from "fs";
+import { join as join26 } from "path";
 function loadDatabaseClass() {
   if (DatabaseClass != null)
     return DatabaseClass;
@@ -28217,7 +28681,7 @@ function initHistory(stateDir, retentionDays = 30) {
     return;
   const Database = loadDatabaseClass();
   mkdirSync21(stateDir, { recursive: true, mode: 448 });
-  const path2 = join24(stateDir, "history.db");
+  const path2 = join26(stateDir, "history.db");
   dbPath = path2;
   db = new Database(path2, { create: true });
   db.exec("PRAGMA journal_mode = WAL");
@@ -28283,7 +28747,7 @@ function initHistory(stateDir, retentionDays = 30) {
   }
   for (const suffix of ["", "-shm", "-wal"]) {
     const f = path2 + suffix;
-    if (existsSync21(f)) {
+    if (existsSync22(f)) {
       try {
         chmodSync7(f, 420);
       } catch {}
@@ -28308,7 +28772,7 @@ function checkpointWal() {
     if (dbPath) {
       for (const suffix of ["-shm", "-wal"]) {
         const f = dbPath + suffix;
-        if (existsSync21(f)) {
+        if (existsSync22(f)) {
           try {
             chmodSync7(f, 420);
           } catch {}
@@ -28447,6 +28911,50 @@ function hasOutboundDeliveredSince(chatId, sinceMs, threadId, minChars = 200) {
     return false;
   }
 }
+function hasOutboundWithText(chatId, text4, threadId, sinceMs) {
+  const needle = normalizeDeliveryText(text4);
+  if (needle.length === 0)
+    return false;
+  try {
+    const params = [chatId];
+    let sql = "SELECT text FROM messages WHERE chat_id = ? AND role = 'assistant'";
+    if (threadId !== undefined) {
+      if (threadId === null) {
+        sql += " AND thread_id IS NULL";
+      } else {
+        sql += " AND thread_id = ?";
+        params.push(threadId);
+      }
+    }
+    if (sinceMs != null && Number.isFinite(sinceMs)) {
+      sql += " AND ts >= ?";
+      params.push(Math.floor(sinceMs / 1000));
+    }
+    sql += " ORDER BY ts DESC LIMIT 500";
+    const rows = requireDb().prepare(sql).all(...params);
+    for (const r of rows) {
+      const hay = normalizeDeliveryText(r.text ?? "");
+      if (hay.length === 0)
+        continue;
+      if (deliveryTextMatch(hay, needle))
+        return true;
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
+function normalizeDeliveryText(text4) {
+  return text4.replace(/\s+/g, " ").trim();
+}
+function deliveryTextMatch(hay, needle) {
+  if (hay === needle)
+    return true;
+  const shorter = Math.min(hay.length, needle.length);
+  if (shorter < MIN_PREFIX_MATCH_CHARS)
+    return false;
+  return hay.startsWith(needle) || needle.startsWith(hay);
+}
 function query(opts) {
   const limit = Math.min(MAX_LIMIT, Math.max(1, opts.limit ?? DEFAULT_LIMIT));
   const params = [opts.chat_id];
@@ -28469,147 +28977,11 @@ function query(opts) {
   rows.reverse();
   return rows;
 }
-var DatabaseClass = null, DEFAULT_LIMIT = 10, MAX_LIMIT = 50, db = null, dbPath = null;
+var DatabaseClass = null, DEFAULT_LIMIT = 10, MAX_LIMIT = 50, db = null, dbPath = null, MIN_PREFIX_MATCH_CHARS = 40;
 var init_history = __esm(() => {
   init_redact();
 });
 
-// quota-check.ts
-import { readFileSync as readFileSync21, existsSync as existsSync22 } from "fs";
-import { join as join25 } from "path";
-function readOauthToken(claudeConfigDir) {
-  const tokenFile = join25(claudeConfigDir, ".oauth-token");
-  if (!existsSync22(tokenFile))
-    return null;
-  try {
-    const raw = readFileSync21(tokenFile, "utf-8").trim();
-    return raw.length > 0 ? raw : null;
-  } catch {
-    return null;
-  }
-}
-function parseFloatHeader(headers, name) {
-  const v = headers.get(name);
-  if (v == null || v.trim().length === 0)
-    return null;
-  const n = Number(v);
-  return Number.isFinite(n) ? n : null;
-}
-function parseEpochHeader(headers, name) {
-  const v = headers.get(name);
-  if (v == null)
-    return null;
-  const n = Number(v);
-  if (!Number.isFinite(n) || n <= 0)
-    return null;
-  return new Date(n * 1000);
-}
-function parseQuotaHeaders(headers) {
-  const fiveHour = parseFloatHeader(headers, "anthropic-ratelimit-unified-5h-utilization");
-  const sevenDay = parseFloatHeader(headers, "anthropic-ratelimit-unified-7d-utilization");
-  if (fiveHour == null && sevenDay == null) {
-    return {
-      ok: false,
-      reason: "no unified rate-limit headers in response (API token, not OAuth?)"
-    };
-  }
-  return {
-    ok: true,
-    data: {
-      fiveHourUtilizationPct: (fiveHour ?? 0) * 100,
-      sevenDayUtilizationPct: (sevenDay ?? 0) * 100,
-      fiveHourUtilPresent: fiveHour != null,
-      sevenDayUtilPresent: sevenDay != null,
-      fiveHourResetAt: parseEpochHeader(headers, "anthropic-ratelimit-unified-5h-reset"),
-      sevenDayResetAt: parseEpochHeader(headers, "anthropic-ratelimit-unified-7d-reset"),
-      representativeClaim: headers.get("anthropic-ratelimit-unified-representative-claim"),
-      overageStatus: headers.get("anthropic-ratelimit-unified-overage-status"),
-      overageDisabledReason: headers.get("anthropic-ratelimit-unified-overage-disabled-reason")
-    }
-  };
-}
-async function fetchQuota(opts) {
-  let token;
-  if (opts.accessToken && opts.claudeConfigDir) {
-    return {
-      ok: false,
-      reason: "pass only one of `accessToken` or `claudeConfigDir`, not both"
-    };
-  }
-  if (opts.accessToken) {
-    token = opts.accessToken.trim().length > 0 ? opts.accessToken : null;
-  } else if (opts.claudeConfigDir) {
-    token = readOauthToken(opts.claudeConfigDir);
-  } else {
-    return {
-      ok: false,
-      reason: "fetchQuota requires `accessToken` or `claudeConfigDir`"
-    };
-  }
-  if (!token) {
-    return { ok: false, reason: "no OAuth token at .oauth-token" };
-  }
-  const controller = new AbortController;
-  const timeout = setTimeout(() => controller.abort(), opts.timeoutMs ?? 1e4);
-  const fetchFn = opts.fetchImpl ?? fetch;
-  let resp;
-  try {
-    resp = await fetchFn("https://api.anthropic.com/v1/messages", {
-      method: "POST",
-      headers: {
-        "anthropic-version": "2023-06-01",
-        "anthropic-beta": OAUTH_BETA,
-        authorization: `Bearer ${token}`,
-        "x-app": "cli",
-        "user-agent": DEFAULT_USER_AGENT,
-        "content-type": "application/json"
-      },
-      body: JSON.stringify({
-        model: opts.model ?? DEFAULT_PROBE_MODEL,
-        max_tokens: 1,
-        messages: [{ role: "user", content: "hi" }]
-      }),
-      signal: controller.signal
-    });
-  } catch (err) {
-    const msg = err?.message ?? String(err);
-    return { ok: false, reason: `request failed: ${msg}` };
-  } finally {
-    clearTimeout(timeout);
-  }
-  if (resp.status === 401 || resp.status === 403) {
-    return { ok: false, reason: `auth rejected (HTTP ${resp.status})` };
-  }
-  const parsed = parseQuotaHeaders(resp.headers);
-  if (!parsed.ok && resp.status >= 400) {
-    return { ok: false, reason: `HTTP ${resp.status}, ${parsed.reason}` };
-  }
-  return parsed;
-}
-function formatQuotaLine(q) {
-  const fmt = (n) => `${Math.round(n)}%`;
-  return `${fmt(q.fiveHourUtilizationPct)} / 5h \u00b7 ${fmt(q.sevenDayUtilizationPct)} / 7d`;
-}
-function formatResetRelative(target, now = new Date) {
-  if (!target)
-    return "\u2014";
-  const deltaMs = target.getTime() - now.getTime();
-  if (deltaMs <= 0)
-    return "resets now";
-  const totalMin = Math.round(deltaMs / 60000);
-  if (totalMin < 60)
-    return `resets in ${totalMin}m`;
-  const hours = Math.floor(totalMin / 60);
-  const mins = totalMin % 60;
-  if (hours < 24)
-    return mins > 0 ? `resets in ${hours}h ${mins}m` : `resets in ${hours}h`;
-  const days = Math.floor(hours / 24);
-  const remH = hours % 24;
-  return remH > 0 ? `resets in ${days}d ${remH}h` : `resets in ${days}d`;
-}
-var OAUTH_BETA = "oauth-2025-04-20", DEFAULT_USER_AGENT = "claude-cli/1.0.0 (external, cli)", DEFAULT_PROBE_MODEL = "claude-haiku-4-5-20251001";
-var init_quota_check = () => {};
-
 // ../src/util/atomic.ts
 import { closeSync as closeSync5, constants as constants2, fsyncSync as fsyncSync2, openSync as openSync5, renameSync as renameSync10, rmSync as rmSync5, writeSync as writeSync4 } from "node:fs";
 var TMP_OPEN_FLAGS;
@@ -31573,7 +31945,7 @@ var require_util = __commonJS((exports2) => {
     return path2;
   }
   exports2.normalize = normalize;
-  function join31(aRoot, aPath) {
+  function join32(aRoot, aPath) {
     if (aRoot === "") {
       aRoot = ".";
     }
@@ -31605,7 +31977,7 @@ var require_util = __commonJS((exports2) => {
     }
     return joined;
   }
-  exports2.join = join31;
+  exports2.join = join32;
   exports2.isAbsolute = function(aPath) {
     return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
   };
@@ -31778,7 +32150,7 @@ var require_util = __commonJS((exports2) => {
           parsed.path = parsed.path.substring(0, index2 + 1);
         }
       }
-      sourceURL = join31(urlGenerate(parsed), sourceURL);
+      sourceURL = join32(urlGenerate(parsed), sourceURL);
     }
     return normalize(sourceURL);
   }
@@ -34384,9 +34756,9 @@ function renderAuthLine(state4, agentName3, now = Date.now()) {
 
 // gateway/quota-cache.ts
 import { existsSync as existsSync37, readFileSync as readFileSync39, writeFileSync as writeFileSync31, mkdirSync as mkdirSync30 } from "fs";
-import { join as join41, dirname as dirname11 } from "path";
+import { join as join42, dirname as dirname11 } from "path";
 function defaultCachePath() {
-  return process.env.SWITCHROOM_QUOTA_CACHE_PATH ?? join41(process.env.HOME ?? "/tmp", ".switchroom", "quota-cache.json");
+  return process.env.SWITCHROOM_QUOTA_CACHE_PATH ?? join42(process.env.HOME ?? "/tmp", ".switchroom", "quota-cache.json");
 }
 function readQuotaCache(opts = {}) {
   const path2 = opts.path ?? defaultCachePath();
@@ -34433,7 +34805,7 @@ var init_quota_cache = __esm(() => {
 
 // gateway/boot-probes.ts
 import { readFileSync as readFileSync40, readdirSync as readdirSync8, existsSync as existsSync38 } from "fs";
-import { join as join42 } from "path";
+import { join as join43 } from "path";
 import { execFile as execFileCb } from "child_process";
 import { promisify } from "util";
 async function withTimeout(label, p, timeoutMs = PROBE_TIMEOUT_MS) {
@@ -34475,8 +34847,8 @@ function mapPlan(billingType, hasExtra) {
 }
 async function probeAccount(agentDir) {
   return withTimeout("Account", (async () => {
-    const claudeDir = join42(agentDir, ".claude");
-    const claudeJsonPath = join42(claudeDir, ".claude.json");
+    const claudeDir = join43(agentDir, ".claude");
+    const claudeJsonPath = join43(claudeDir, ".claude.json");
     let cfg = {};
     try {
       const raw = readFileSync40(claudeJsonPath, "utf8");
@@ -34497,8 +34869,8 @@ async function probeAccount(agentDir) {
     let tokenStr = "";
     let status = "ok";
     for (const candidate of [
-      join42(claudeDir, ".oauth-token.meta.json"),
-      join42(claudeDir, "accounts", "default", ".oauth-token.meta.json")
+      join43(claudeDir, ".oauth-token.meta.json"),
+      join43(claudeDir, "accounts", "default", ".oauth-token.meta.json")
     ]) {
       if (existsSync38(candidate)) {
         try {
@@ -34884,9 +35256,9 @@ async function probeQuota(claudeConfigDir, _agentDir, fetchImpl = fetch, opts =
       let claudeDirForProbe = null;
       for (const candidate of [
         claudeConfigDir,
-        join42(claudeConfigDir, "accounts", "default")
+        join43(claudeConfigDir, "accounts", "default")
       ]) {
-        if (existsSync38(join42(candidate, ".oauth-token"))) {
+        if (existsSync38(join43(candidate, ".oauth-token"))) {
           claudeDirForProbe = candidate;
           break;
         }
@@ -35121,7 +35493,7 @@ async function probeSkills(agentDir, opts = {}) {
   return withTimeout("Skills", (async () => {
     const fs2 = opts.fs ?? realSkillsFs;
     const max = opts.maxNamesShown ?? 3;
-    const skillsDir = join42(agentDir, ".claude", "skills");
+    const skillsDir = join43(agentDir, ".claude", "skills");
     if (!fs2.exists(skillsDir)) {
       return { status: "ok", label: "Skills", detail: "no skills dir" };
     }
@@ -35136,17 +35508,17 @@ async function probeSkills(agentDir, opts = {}) {
     }
     const dangling = [];
     for (const name of entries) {
-      const skillPath = join42(skillsDir, name);
+      const skillPath = join43(skillsDir, name);
       if (!fs2.exists(skillPath)) {
         dangling.push(name);
         continue;
       }
-      const skillMd = join42(skillPath, "SKILL.md");
+      const skillMd = join43(skillPath, "SKILL.md");
       if (!fs2.exists(skillMd) && !fs2.exists(skillPath + ".md")) {
         continue;
       }
     }
-    const overlayDir = opts.overlaySkillsDir ?? join42(agentDir, "skills.d");
+    const overlayDir = opts.overlaySkillsDir ?? join43(agentDir, "skills.d");
     const overlaySlugs = new Set;
     if (fs2.exists(overlayDir)) {
       let overlayEntries = [];
@@ -35188,7 +35560,7 @@ function renderBucketedSkills(switchroom, agent) {
 }
 async function probeConnections(agentDir, opts = {}) {
   return withTimeout("Connections", (async () => {
-    const path2 = join42(agentDir, ".claude", "connection-health.json");
+    const path2 = join43(agentDir, ".claude", "connection-health.json");
     const read = opts.readFileImpl ?? ((p) => readFileSync40(p, "utf8"));
     let issues = [];
     try {
@@ -35530,7 +35902,7 @@ __export(exports_boot_card, {
   renderBootCard: () => renderBootCard,
   renderAccountRows: () => renderAuthLine
 });
-import { join as join43 } from "path";
+import { join as join44 } from "path";
 function resolvePersonaName(slug, loadConfig3) {
   try {
     const config = loadConfig3 ? loadConfig3() : loadConfig();
@@ -35621,7 +35993,7 @@ function renderBootCard(opts) {
   return stackCardLines(flatLines);
 }
 async function runAllProbes(opts) {
-  const claudeDir = join43(opts.agentDir, ".claude");
+  const claudeDir = join44(opts.agentDir, ".claude");
   const probes = {};
   const slug = opts.agentSlug ?? opts.agentName;
   await Promise.allSettled([
@@ -37300,8 +37672,8 @@ import {
   unlinkSync as unlinkSync24,
   appendFileSync as appendFileSync6
 } from "fs";
-import { homedir as homedir17 } from "os";
-import { join as join54, extname, sep as sep3, basename as basename12 } from "path";
+import { homedir as homedir18 } from "os";
+import { join as join55, extname, sep as sep3, basename as basename13 } from "path";
 
 // plugin-logger.ts
 import { appendFileSync, mkdirSync, renameSync, statSync, existsSync } from "fs";
@@ -40211,16 +40583,34 @@ function clipNarrative(s) {
   return s.split(`
 `)[0].trim().slice(0, STATUS_LINE_MAX);
 }
-function renderActivityHeader(emoji, label, description, elapsedMs, toolCount, state, model) {
+function renderActivityHeader(emoji, label, description, elapsedMs, toolCount, state, model, totalTokens) {
   const toolWord = toolCount === 1 ? "tool" : "tools";
   const elapsed = formatFeedElapsed(elapsedMs);
   const descPart = description.length > 0 ? ` \u00b7 _${escapeMarkdown(description)}_` : "";
   const line1 = `${emoji} **${escapeMarkdown(label)}**${descPart}`;
+  const tokPart = tokenSegment(totalTokens);
   const modelLabel = formatModelLabel(model);
   const modelPart = modelLabel != null ? ` \u00b7 ${escapeMarkdown(modelLabel)}` : "";
-  const line2 = state === "running" ? `_${elapsed} \u00b7 ${toolCount} ${toolWord}${modelPart}_` : `_${state} \u00b7 ${toolCount} ${toolWord} \u00b7 ${elapsed}${modelPart}_`;
+  const line2 = state === "running" ? `_${elapsed} \u00b7 ${toolCount} ${toolWord}${tokPart}${modelPart}_` : `_${state} \u00b7 ${toolCount} ${toolWord}${tokPart} \u00b7 ${elapsed}${modelPart}_`;
   return [line1, line2];
 }
+function formatTokenCount(n) {
+  if (!Number.isFinite(n) || n <= 0)
+    return "0";
+  if (n < 1000)
+    return String(Math.floor(n));
+  if (n < 1e6) {
+    const k = Number((n / 1000).toFixed(1));
+    if (k < 1000)
+      return `${k.toFixed(1)}k`;
+  }
+  return `${(n / 1e6).toFixed(1)}M`;
+}
+function tokenSegment(totalTokens) {
+  if (totalTokens == null || totalTokens <= 0)
+    return "";
+  return ` \u00b7 ${formatTokenCount(totalTokens)} tok`;
+}
 function formatFeedElapsed(ms) {
   const s = Math.floor(ms / 1000);
   if (s < 60)
@@ -40257,7 +40647,7 @@ function renderStatusCard(opts) {
   const hasChildren = rawChildren.length > 0;
   const steps = rawSteps.map(escapeStepLine);
   const children = rawChildren.map(escapeStepLine);
-  const headerLines = header != null ? renderActivityHeader(header.emoji, header.label, header.description ?? "", header.elapsedMs, header.toolCount, header.state, header.model) : [];
+  const headerLines = header != null ? renderActivityHeader(header.emoji, header.label, header.description ?? "", header.elapsedMs, header.toolCount, header.state, header.model, header.totalTokens) : [];
   const out = [...headerLines];
   if (hasChildren) {
     const shownParent = steps.slice(-STATUS_ROLLING_LINES);
@@ -40354,7 +40744,8 @@ function renderActivityFeed(lines, final = false, liveSuffix = "", stepCount, he
       elapsedMs: header.elapsedMs,
       toolCount: header.toolCount,
       state: header.state,
-      model: header.model
+      model: header.model,
+      totalTokens: header.totalTokens
     } : undefined,
     steps: lines,
     final,
@@ -40373,7 +40764,8 @@ function renderActivityFeedWithNested(lines, childLines, final = false, liveSuff
       elapsedMs: header.elapsedMs,
       toolCount: header.toolCount,
       state: header.state,
-      model: header.model
+      model: header.model,
+      totalTokens: header.totalTokens
     } : undefined,
     steps: lines,
     childSteps: children,
@@ -40398,9 +40790,10 @@ function renderCombinedWorkerFeed(rows, opts) {
   const rowHeader = (r) => {
     const desc = escapeMarkdown(truncate(stripMarkdown(r.description).replace(/\s+/g, " ").trim() || "background task", COMBINED_ROW_DESC_MAX));
     const toolWord = r.toolCount === 1 ? "tool" : "tools";
+    const tokPart = tokenSegment(r.totalTokens);
     const modelLabel = formatModelLabel(r.model);
     const modelPart = modelLabel != null ? ` \u00b7 ${escapeMarkdown(modelLabel)}` : "";
-    return `**${desc}** _\u00b7 ${formatFeedElapsed(r.elapsedMs)} \u00b7 ${r.toolCount} ${toolWord}${modelPart}_`;
+    return `**${desc}** _\u00b7 ${formatFeedElapsed(r.elapsedMs)} \u00b7 ${r.toolCount} ${toolWord}${tokPart}${modelPart}_`;
   };
   const rowHistory = (r) => {
     const src = r.historyLines != null && r.historyLines.length > 0 ? r.historyLines : [r.currentStep];
@@ -40511,7 +40904,8 @@ function renderWorkerActivity(v, liveSuffix = "") {
     elapsedMs: v.elapsedMs,
     toolCount: v.toolCount,
     state: v.state,
-    model: v.model
+    model: v.model,
+    totalTokens: v.totalTokens
   };
   let result;
   if (finished && v.state !== "incomplete") {
@@ -40536,6 +40930,9 @@ _starting\u2026_`;
   return card;
 }
 var COOLDOWN_JITTER_MS = 500;
+var WORKER_CARD_SUPERSEDED_BODY = `\uD83D\uDEE0 **Worker** \u00b7 _continued_
+
+_Live progress moved to a fresh card to stay pinned._`;
 function extractRetryAfterSecs(err) {
   if (err == null || typeof err !== "object")
     return null;
@@ -40570,6 +40967,7 @@ function createWorkerActivityFeed(opts) {
   const maxRows = Math.max(1, Math.floor(opts.maxRows ?? 8));
   const staleWorkerTtlMs = Math.max(1, Math.floor(opts.staleWorkerTtlMs ?? 50 * 60000));
   const absoluteRowLifetimeCapMs = Math.max(1, Math.floor(opts.absoluteRowLifetimeCapMs ?? 6 * 60 * 60000));
+  const groupMessageLifetimeCapMs = Math.max(1, Math.floor(opts.groupMessageLifetimeCapMs ?? 60 * 60000));
   const reconcilePinFn = opts.reconcilePin ?? (() => {});
   const setIntervalFn = opts.setInterval ?? ((cb, ms) => {
     const t = setInterval(cb, ms);
@@ -40670,6 +41068,7 @@ function createWorkerActivityFeed(opts) {
         description: v.description,
         elapsedMs: elapsedFor(r),
         toolCount: v.toolCount,
+        totalTokens: v.totalTokens,
         currentStep,
         historyLines: r.narrative.length > 0 ? [...r.narrative] : undefined,
         model: v.model
@@ -40747,6 +41146,7 @@ function createWorkerActivityFeed(opts) {
           return;
         }
         g.messageId = sent.message_id;
+        g.messageCreatedAtMs = now;
         g.lastBody = body;
         g.lastEditAt = now;
         g.terminalPainted = false;
@@ -40777,6 +41177,7 @@ function createWorkerActivityFeed(opts) {
         log(`worker-feed: finish feed=${g.feedKey} chat=${g.chatId} thread=${g.threadId ?? "-"} ` + `msgId=${g.messageId} agent=${finishingAgentId ?? "-"} ` + `state=${opts2.terminalRecap?.state ?? "done"} bytes=${body.length}`);
       } else {
         log(`worker-feed: edit feed=${g.feedKey} chat=${g.chatId} ` + `thread=${g.threadId ?? "-"} msgId=${g.messageId} workers=${g.workers.size} bytes=${body.length}`);
+        syncPin(g);
       }
       if (isTerminal)
         clearStaged();
@@ -40795,6 +41196,7 @@ function createWorkerActivityFeed(opts) {
       }
       if (outcome === "gone") {
         g.messageId = null;
+        g.messageCreatedAtMs = 0;
         g.lastBody = null;
         if (isTerminal)
           clearStaged();
@@ -40838,6 +41240,7 @@ function createWorkerActivityFeed(opts) {
       description: lv?.description ?? "background task",
       lastTool: null,
       toolCount: lv?.toolCount ?? 0,
+      totalTokens: lv?.totalTokens,
       latestSummary: "",
       elapsedMs: liveElapsed(row, nowFn()),
       state: "incomplete",
@@ -40897,6 +41300,16 @@ function createWorkerActivityFeed(opts) {
       const running = runningRows(g);
       if (running.length === 0)
         continue;
+      if (g.messageId != null && now - g.messageCreatedAtMs >= groupMessageLifetimeCapMs) {
+        const age = Math.floor((now - g.messageCreatedAtMs) / 1000);
+        const retiredId = g.messageId;
+        log(`worker-feed: group-message lifetime cap rotate feed=${g.feedKey} ` + `msgId=${retiredId} \u2014 age ${age}s (>= ${Math.floor(groupMessageLifetimeCapMs / 1000)}s); ` + `rotating to a fresh message to re-establish the pin surface`);
+        g.messageId = null;
+        g.messageCreatedAtMs = 0;
+        g.lastBody = null;
+        syncPin(g);
+        opts.bot.editMessageText(g.chatId, retiredId, WORKER_CARD_SUPERSEDED_BODY, sendOptsFor(g)).catch(() => {});
+      }
       if (g.messageId == null) {
         const maxElapsed = Math.max(0, ...running.map((r) => liveElapsed(r, now)));
         if (maxElapsed < firstPaintMin)
@@ -40951,6 +41364,7 @@ function createWorkerActivityFeed(opts) {
           chatId,
           threadId,
           messageId: null,
+          messageCreatedAtMs: 0,
           lastBody: null,
           lastEditAt: 0,
           cooldownUntil: 0,
@@ -40963,6 +41377,7 @@ function createWorkerActivityFeed(opts) {
       }
       if (!g.workers.has(agentId) && g.terminalPainted && !hasLiveWorker(g)) {
         g.messageId = null;
+        g.messageCreatedAtMs = 0;
         g.lastBody = null;
         g.pendingFinalize.clear();
         g.terminalPainted = false;
@@ -41889,8 +42304,18 @@ function buildVaultGrantDeniedInbound(opts) {
     }
   };
 }
+var MAX_GRANT_REASON_CHARS = 300;
+function normalizeGrantReason(raw) {
+  if (raw == null)
+    return "";
+  const collapsed = raw.replace(/\s+/g, " ").trim();
+  if (collapsed.length === 0)
+    return "";
+  return collapsed.length > MAX_GRANT_REASON_CHARS ? collapsed.slice(0, MAX_GRANT_REASON_CHARS - 1) + "\u2026" : collapsed;
+}
 function buildVaultGrantApprovedCardText(opts) {
-  return `\u2705 Granted **${opts.agentEscaped}** ${opts.scope} access to ` + `\`${opts.key}\` for ${opts.days}d. ` + `(grant \`${opts.grantId}\`)` + (opts.footer ?? "");
+  const reasonClause = opts.reasonEscaped != null && opts.reasonEscaped.length > 0 ? ` _Reason: ${opts.reasonEscaped}_` : "";
+  return `\u2705 Granted **${opts.agentEscaped}** ${opts.scope} access to ` + `\`${opts.key}\` for ${opts.days}d. ` + `(grant \`${opts.grantId}\`)` + reasonClause + (opts.footer ?? "");
 }
 function buildVaultSaveCompletedInbound(opts) {
   const ts = opts.nowMs ?? Date.now();
@@ -43163,6 +43588,7 @@ function createCallbackQueryHandlers(deps) {
     pendingCardStore.remove(stageId);
     if (pending.card_message_id != null) {
       const days = Math.round(pending.ttl_seconds / 86400);
+      const reasonNormalized = normalizeGrantReason(pending.reason);
       const footer = getVaultApprovalAuthMode() === "telegram-id" ? `
 _Approver verified by Telegram identity \u2014 broker auto-unlocked at startup._` : "";
       await ctx.api.editMessageText(pending.chat_id, pending.card_message_id, richMessage(buildVaultGrantApprovedCardText({
@@ -43171,6 +43597,7 @@ _Approver verified by Telegram identity \u2014 broker auto-unlocked at startup._
         key: pending.key,
         days,
         grantId: id,
+        reasonEscaped: reasonNormalized.length > 0 ? escapeHtmlForTg2(reasonNormalized) : undefined,
         footer
       })), { reply_markup: { inline_keyboard: [] } }).catch(() => {});
     }
@@ -45035,16 +45462,34 @@ function clipNarrative2(s) {
   return s.split(`
 `)[0].trim().slice(0, STATUS_LINE_MAX);
 }
-function renderActivityHeader2(emoji, label, description, elapsedMs, toolCount, state, model) {
+function renderActivityHeader2(emoji, label, description, elapsedMs, toolCount, state, model, totalTokens) {
   const toolWord = toolCount === 1 ? "tool" : "tools";
   const elapsed = formatFeedElapsed2(elapsedMs);
   const descPart = description.length > 0 ? ` \u00b7 _${escapeMarkdown(description)}_` : "";
   const line1 = `${emoji} **${escapeMarkdown(label)}**${descPart}`;
+  const tokPart = tokenSegment2(totalTokens);
   const modelLabel = formatModelLabel(model);
   const modelPart = modelLabel != null ? ` \u00b7 ${escapeMarkdown(modelLabel)}` : "";
-  const line2 = state === "running" ? `_${elapsed} \u00b7 ${toolCount} ${toolWord}${modelPart}_` : `_${state} \u00b7 ${toolCount} ${toolWord} \u00b7 ${elapsed}${modelPart}_`;
+  const line2 = state === "running" ? `_${elapsed} \u00b7 ${toolCount} ${toolWord}${tokPart}${modelPart}_` : `_${state} \u00b7 ${toolCount} ${toolWord}${tokPart} \u00b7 ${elapsed}${modelPart}_`;
   return [line1, line2];
 }
+function formatTokenCount2(n) {
+  if (!Number.isFinite(n) || n <= 0)
+    return "0";
+  if (n < 1000)
+    return String(Math.floor(n));
+  if (n < 1e6) {
+    const k = Number((n / 1000).toFixed(1));
+    if (k < 1000)
+      return `${k.toFixed(1)}k`;
+  }
+  return `${(n / 1e6).toFixed(1)}M`;
+}
+function tokenSegment2(totalTokens) {
+  if (totalTokens == null || totalTokens <= 0)
+    return "";
+  return ` \u00b7 ${formatTokenCount2(totalTokens)} tok`;
+}
 function formatFeedElapsed2(ms) {
   const s = Math.floor(ms / 1000);
   if (s < 60)
@@ -45081,7 +45526,7 @@ function renderStatusCard2(opts) {
   const hasChildren = rawChildren.length > 0;
   const steps = rawSteps.map(escapeStepLine2);
   const children = rawChildren.map(escapeStepLine2);
-  const headerLines = header != null ? renderActivityHeader2(header.emoji, header.label, header.description ?? "", header.elapsedMs, header.toolCount, header.state, header.model) : [];
+  const headerLines = header != null ? renderActivityHeader2(header.emoji, header.label, header.description ?? "", header.elapsedMs, header.toolCount, header.state, header.model, header.totalTokens) : [];
   const out = [...headerLines];
   if (hasChildren) {
     const shownParent = steps.slice(-STATUS_ROLLING_LINES);
@@ -45178,7 +45623,8 @@ function renderActivityFeed2(lines, final = false, liveSuffix = "", stepCount, h
       elapsedMs: header.elapsedMs,
       toolCount: header.toolCount,
       state: header.state,
-      model: header.model
+      model: header.model,
+      totalTokens: header.totalTokens
     } : undefined,
     steps: lines,
     final,
@@ -45197,7 +45643,8 @@ function renderActivityFeedWithNested2(lines, childLines, final = false, liveSuf
       elapsedMs: header.elapsedMs,
       toolCount: header.toolCount,
       state: header.state,
-      model: header.model
+      model: header.model,
+      totalTokens: header.totalTokens
     } : undefined,
     steps: lines,
     childSteps: children,
@@ -62872,6 +63319,597 @@ function resolveAnswerLaneConfig(input) {
   };
 }
 
+// session-tail.ts
+import { homedir as homedir7 } from "os";
+import { basename as basename5, join as join21 } from "path";
+
+// operator-events.ts
+init_format();
+
+// raw-error-scrub.ts
+function stripRawErrorBytes(raw) {
+  if (typeof raw !== "string" || raw.length === 0)
+    return "";
+  let s = raw;
+  s = s.replace(/API Error:?\s*\d*\s*/gi, " ");
+  s = s.replace(/\bb'[^']*'/g, " ");
+  s = s.replace(/\bb"[^"]*"/g, " ");
+  s = s.replace(/[\u00b7\-\s]*\{[\s\S]*?["']type["']\s*:\s*["']error["'][\s\S]*$/i, " ");
+  s = s.replace(/^\s*\{[\s\S]*\}\s*$/g, " ");
+  s = s.replace(/\s+/g, " ").replace(/[\u00b7:\-\s]+$/g, "").replace(/^[\u00b7:\-\s]+/g, "").trim();
+  return s;
+}
+function extractRequestId(raw) {
+  if (typeof raw !== "string" || raw.length === 0)
+    return;
+  const m = raw.match(/["']request[_-]?id["']\s*:\s*["']([A-Za-z0-9._-]+)["']/i) ?? raw.match(/\brequest[_-]?id[=:]\s*([A-Za-z0-9._-]+)/i);
+  return m ? m[1] : undefined;
+}
+
+// operator-events.ts
+function classifyClaudeError(raw) {
+  try {
+    return classifyInner(raw);
+  } catch {
+    return "unknown-4xx";
+  }
+}
+function classifyInner(raw) {
+  if (raw == null)
+    return "unknown-4xx";
+  const obj = typeof raw === "object" ? raw : {};
+  const errorType = extractString(obj, "error_type") ?? extractString(obj, "type") ?? extractString(getNestedObj(obj, "error"), "type") ?? "";
+  const errorCode = extractString(obj, "code") ?? extractString(getNestedObj(obj, "error"), "code") ?? "";
+  const message = extractString(obj, "message") ?? extractString(getNestedObj(obj, "error"), "message") ?? (typeof raw === "string" ? raw : "") ?? "";
+  const status = extractNumber(obj, "status") ?? extractNumber(obj, "statusCode") ?? extractNumber(obj, "status_code") ?? null;
+  const sdkCode = extractString(obj, "error_code") ?? "";
+  if (errorType === "authentication_error" || errorCode === "authentication_error" || sdkCode === "authentication_error" || message.toLowerCase().includes("authentication_error")) {
+    const msg = message.toLowerCase();
+    if (msg.includes("expired") || msg.includes("refresh")) {
+      return "credentials-expired";
+    }
+    return "credentials-invalid";
+  }
+  if (errorType === "invalid_api_key" || errorCode === "invalid_api_key" || sdkCode === "invalid_api_key" || message.toLowerCase().includes("invalid_api_key") || message.toLowerCase().includes("invalid api key")) {
+    return "credentials-invalid";
+  }
+  if (errorType === "credit_balance_too_low" || errorCode === "credit_balance_too_low" || sdkCode === "credit_balance_too_low" || message.toLowerCase().includes("credit_balance_too_low") || message.toLowerCase().includes("credit balance")) {
+    return "credit-exhausted";
+  }
+  if (errorType === "rate_limit_error" || errorCode === "rate_limit_error" || sdkCode === "rate_limit_error" || message.toLowerCase().includes("rate_limit_error") || message.toLowerCase().includes("rate limit")) {
+    return "rate-limited";
+  }
+  if (errorType === "overloaded_error" || errorCode === "overloaded_error" || sdkCode === "overloaded_error" || message.toLowerCase().includes("overloaded_error") || message.toLowerCase().includes("overloaded")) {
+    return "rate-limited";
+  }
+  if (errorType === "agent-crashed" || errorCode === "agent-crashed") {
+    return "agent-crashed";
+  }
+  if (errorType === "agent-restarted-unexpectedly" || errorCode === "agent-restarted-unexpectedly") {
+    return "agent-restarted-unexpectedly";
+  }
+  if (status != null) {
+    if (status >= 400 && status < 500)
+      return "unknown-4xx";
+    if (status >= 500 && status < 600)
+      return "unknown-5xx";
+  }
+  return "unknown-4xx";
+}
+function extractString(obj, key) {
+  const v = obj[key];
+  return typeof v === "string" && v.length > 0 ? v : null;
+}
+function extractNumber(obj, key) {
+  const v = obj[key];
+  return typeof v === "number" ? v : null;
+}
+function getNestedObj(obj, key) {
+  const v = obj[key];
+  return typeof v === "object" && v != null ? v : {};
+}
+var DEFAULT_OPERATOR_EVENT_COOLDOWN_MS = 5 * 60000;
+var cooldownMap = new Map;
+
+// model-unavailable.ts
+init_quota_check();
+init_card_format();
+var transientUpstreamSignals = [
+  "not your usage limit",
+  "not your account",
+  "not your account's",
+  "temporarily limiting requests",
+  "temporarily rate",
+  "server is temporarily",
+  "would exceed your account\u2019s rate limit",
+  "would exceed your account's rate limit"
+];
+function isTransientUpstreamSignal(text4) {
+  if (typeof text4 !== "string" || text4.length === 0)
+    return false;
+  const sample = text4.length > 16384 ? text4.slice(0, 16384) : text4;
+  const lower = sample.toLowerCase();
+  return transientUpstreamSignals.some((s) => lower.includes(s));
+}
+var litellmProxyLocal429Signals = [
+  "deployment over user-defined ratelimit",
+  "model rate limit exceeded. tpm limit",
+  "model rate limit exceeded. rpm limit",
+  "deployment over defined rpm limit",
+  "no deployments available for selected model",
+  "litellm rate limit handler",
+  "crossed tpm / rpm",
+  "max parallel request limit reached"
+];
+var litellmV3LimiterSignalPair = ["rate limit exceeded for ", "limit type:"];
+function isLitellmProxyLocal429(text4) {
+  if (typeof text4 !== "string" || text4.length === 0)
+    return false;
+  const sample = text4.length > 16384 ? text4.slice(0, 16384) : text4;
+  const lower = sample.toLowerCase();
+  if (litellmProxyLocal429Signals.some((s) => lower.includes(s)))
+    return true;
+  return litellmV3LimiterSignalPair.every((s) => lower.includes(s));
+}
+function parseLitellmLimitDetail(text4, parseTimeNow = new Date) {
+  const empty2 = { limitType: null, limit: null, currentUsage: null, resetAtMs: null };
+  if (typeof text4 !== "string" || text4.length === 0)
+    return empty2;
+  const sample = text4.length > 16384 ? text4.slice(0, 16384) : text4;
+  const lower = sample.toLowerCase();
+  let limitType = null;
+  let limit = null;
+  const eqLimit = lower.match(/\b([tr]pm)[ _]limit[=:]\s*(\d+)/);
+  if (eqLimit) {
+    limitType = eqLimit[1];
+    limit = Number(eqLimit[2]);
+  }
+  if (limitType == null) {
+    const v3Type = lower.match(/limit type:\s*(tokens|requests|max_parallel_requests)/);
+    if (v3Type)
+      limitType = v3Type[1];
+  }
+  if (limit == null) {
+    const v3Limit = lower.match(/current limit:\s*(\d+)/);
+    if (v3Limit)
+      limit = Number(v3Limit[1]);
+  }
+  let currentUsage = null;
+  const usage = lower.match(/current usage=(\d+)/);
+  if (usage)
+    currentUsage = Number(usage[1]);
+  let resetAtMs = null;
+  const resetsAt = sample.match(/limit resets at:\s*(\d{4}-\d{2}-\d{2}) (\d{2}:\d{2}:\d{2}) UTC/i);
+  if (resetsAt) {
+    const d = new Date(`${resetsAt[1]}T${resetsAt[2]}Z`);
+    if (!Number.isNaN(d.getTime()))
+      resetAtMs = d.getTime();
+  }
+  if (resetAtMs == null) {
+    const tryAgain = lower.match(/try again in\s+(\d+(?:\.\d+)?)\s*seconds/);
+    if (tryAgain) {
+      const secs = Number(tryAgain[1]);
+      if (Number.isFinite(secs) && secs > 0 && secs < 7 * 24 * 3600) {
+        resetAtMs = parseTimeNow.getTime() + Math.round(secs * 1000);
+      }
+    }
+  }
+  return {
+    limitType,
+    limit: limit != null && Number.isFinite(limit) ? limit : null,
+    currentUsage: currentUsage != null && Number.isFinite(currentUsage) ? currentUsage : null,
+    resetAtMs
+  };
+}
+function detectModelUnavailable(stderr) {
+  if (typeof stderr !== "string" || stderr.length === 0)
+    return null;
+  const sample = stderr.length > 16384 ? stderr.slice(0, 16384) : stderr;
+  const lower = sample.toLowerCase();
+  if (transientUpstreamSignals.some((s) => lower.includes(s))) {
+    const resetAt = parseResetTime(sample);
+    return resetAt !== undefined ? { kind: "overload", resetAt, raw: stderr } : { kind: "overload", raw: stderr };
+  }
+  if (isLitellmProxyLocal429(sample)) {
+    const resetAt = parseResetTime(sample);
+    return resetAt !== undefined ? { kind: "overload", resetAt, raw: stderr } : { kind: "overload", raw: stderr };
+  }
+  const quotaSignals = [
+    "out of extra usage",
+    "extra usage",
+    "credit_balance_too_low",
+    "credit balance too low",
+    "usage limit",
+    "usage_limit",
+    "quota exhausted",
+    "quota_exhausted",
+    "plan limit",
+    "subscription limit",
+    "hit your limit",
+    "hit the limit",
+    "session limit",
+    "session cap"
+  ];
+  if (quotaSignals.some((s) => lower.includes(s))) {
+    const resetAt = parseResetTime(sample);
+    return resetAt !== undefined ? { kind: "quota_exhausted", resetAt, raw: stderr } : { kind: "quota_exhausted", raw: stderr };
+  }
+  const overloadSignals = [
+    "overloaded_error",
+    "overloaded",
+    "rate_limit_error",
+    "rate limit",
+    "rate-limited",
+    "http 429",
+    '"status":429',
+    "status: 429",
+    " 429 ",
+    "503 service",
+    "service unavailable",
+    '"status":529',
+    "http 529",
+    " 529 "
+  ];
+  if (overloadSignals.some((s) => lower.includes(s))) {
+    const resetAt = parseResetTime(sample);
+    return resetAt !== undefined ? { kind: "overload", resetAt, raw: stderr } : { kind: "overload", raw: stderr };
+  }
+  const networkSignals = [
+    "econnrefused",
+    "econnreset",
+    "etimedout",
+    "enotfound",
+    "eai_again",
+    "fetch failed",
+    "network error",
+    "socket hang up",
+    "request timed out",
+    "connection refused",
+    "getaddrinfo"
+  ];
+  if (networkSignals.some((s) => lower.includes(s))) {
+    return { kind: "network", raw: stderr };
+  }
+  return null;
+}
+function parseResetTime(text4, parseTimeNow = new Date) {
+  const lower = text4.toLowerCase();
+  const retryAfter = lower.match(/retry[\s-]*after[:\s]+(\d+)\s*(seconds?|s\b|minutes?|m\b|hours?|h\b)?/);
+  if (retryAfter) {
+    const n = Number(retryAfter[1]);
+    if (Number.isFinite(n) && n > 0 && n < 7 * 24 * 3600) {
+      const unit = (retryAfter[2] ?? "seconds").toLowerCase();
+      const ms = unit.startsWith("h") ? n * 3600000 : unit.startsWith("m") ? n * 60000 : n * 1000;
+      return new Date(parseTimeNow.getTime() + ms);
+    }
+  }
+  const relReset = lower.match(/resets?\s+in\s+([0-9hms\s]+)/);
+  if (relReset) {
+    const ms = parseRelativeDuration(relReset[1]);
+    if (ms != null)
+      return new Date(parseTimeNow.getTime() + ms);
+  }
+  const iso = text4.match(/\b\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})?\b/);
+  if (iso) {
+    const d = new Date(iso[0]);
+    if (!Number.isNaN(d.getTime()))
+      return d;
+  }
+  const calReset = text4.match(/resets?\s+(?:at\s+)?([A-Z][a-z]{2,8}\s+\d{1,2}(?:,?\s*(?:\d{1,2}(?::\d{2})?\s*(?:am|pm|AM|PM)?))?)/);
+  if (calReset) {
+    const candidate = `${calReset[1]} ${parseTimeNow.getUTCFullYear()}`;
+    const d = new Date(candidate);
+    if (!Number.isNaN(d.getTime()))
+      return d;
+  }
+  const timeOnly = text4.match(/resets?\s+(?:at\s+)?(?!(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[a-z]*\b)(\d{1,2})(?::(\d{2}))?\s*(am|pm)?\s*(?:\(([^)]+)\))?/i);
+  if (timeOnly) {
+    const d = resolveNextWallClock(Number(timeOnly[1]), timeOnly[2] ? Number(timeOnly[2]) : 0, timeOnly[3]?.toLowerCase(), timeOnly[4]?.trim(), parseTimeNow);
+    if (d != null)
+      return d;
+  }
+  return;
+}
+function resolveNextWallClock(hour12or24, minute, ampm, tz, nowDate) {
+  let hour = hour12or24;
+  if (ampm === "pm" && hour < 12)
+    hour += 12;
+  if (ampm === "am" && hour === 12)
+    hour = 0;
+  if (!Number.isFinite(hour) || hour > 23 || hour < 0)
+    return;
+  if (!Number.isFinite(minute) || minute > 59 || minute < 0)
+    return;
+  const nowMs2 = nowDate.getTime();
+  const base = new Date(nowMs2);
+  for (let dayOffset = 0;dayOffset <= 2; dayOffset++) {
+    const dateParts = tzDateParts(new Date(nowMs2 + dayOffset * 86400000), tz);
+    if (dateParts == null)
+      return;
+    const epoch = wallClockToEpoch(dateParts.year, dateParts.month, dateParts.day, hour, minute, tz);
+    if (epoch != null && epoch > nowMs2)
+      return new Date(epoch);
+  }
+  return;
+}
+function tzDateParts(d, tz) {
+  if (!tz) {
+    return { year: d.getUTCFullYear(), month: d.getUTCMonth(), day: d.getUTCDate() };
+  }
+  try {
+    const fmt = new Intl.DateTimeFormat("en-US", {
+      timeZone: tz,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit"
+    });
+    const parts = Object.fromEntries(fmt.formatToParts(d).filter((p) => p.type !== "literal").map((p) => [p.type, p.value]));
+    return {
+      year: Number(parts.year),
+      month: Number(parts.month) - 1,
+      day: Number(parts.day)
+    };
+  } catch {
+    return null;
+  }
+}
+function wallClockToEpoch(year, month, day, hour, minute, tz) {
+  const asUtc = Date.UTC(year, month, day, hour, minute, 0);
+  if (!tz)
+    return asUtc;
+  try {
+    const fmt = new Intl.DateTimeFormat("en-US", {
+      timeZone: tz,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      hour12: false
+    });
+    const parts = Object.fromEntries(fmt.formatToParts(new Date(asUtc)).filter((p) => p.type !== "literal").map((p) => [p.type, p.value]));
+    const shown = Date.UTC(Number(parts.year), Number(parts.month) - 1, Number(parts.day), Number(parts.hour) % 24, Number(parts.minute), Number(parts.second));
+    const offset = shown - asUtc;
+    return asUtc - offset;
+  } catch {
+    return null;
+  }
+}
+function parseRelativeDuration(s) {
+  let total = 0;
+  let matched = false;
+  const re = /(\d+)\s*(h|hours?|m|minutes?|s|seconds?)/g;
+  let m;
+  while ((m = re.exec(s)) != null) {
+    matched = true;
+    const n = Number(m[1]);
+    const unit = m[2].toLowerCase();
+    if (unit.startsWith("h"))
+      total += n * 3600000;
+    else if (unit.startsWith("m"))
+      total += n * 60000;
+    else
+      total += n * 1000;
+  }
+  return matched && total > 0 ? total : null;
+}
+
+// session-tail.ts
+function sanitizeCwdToProjectName(cwd) {
+  return cwd.replace(/[^a-zA-Z0-9]/g, "-");
+}
+function getProjectsDirForCwd(cwd = process.cwd(), claudeHome = process.env.CLAUDE_CONFIG_DIR ?? join21(homedir7(), ".claude")) {
+  return join21(claudeHome, "projects", sanitizeCwdToProjectName(cwd));
+}
+function parseChannelMeta(content3) {
+  const grab = (key) => {
+    const m = content3.match(new RegExp(`(?:^|[\\s"'])${key}="([^"]+)"`));
+    return m ? m[1] : null;
+  };
+  return {
+    chatId: grab("chat_id"),
+    messageId: grab("message_id"),
+    threadId: grab("message_thread_id")
+  };
+}
+var MAX_JSONL_LINE_BYTES = 2 * 1024 * 1024;
+var MAX_ERROR_TEXT_CHARS = 500;
+function extractToolResultErrorText(content3) {
+  if (typeof content3 === "string") {
+    return content3.slice(0, MAX_ERROR_TEXT_CHARS);
+  }
+  if (Array.isArray(content3)) {
+    const parts = [];
+    for (const block of content3) {
+      if (typeof block === "object" && block != null) {
+        const b = block;
+        if (b.type === "text" && typeof b.text === "string") {
+          parts.push(b.text);
+        }
+      }
+    }
+    return parts.join(`
+`).slice(0, MAX_ERROR_TEXT_CHARS);
+  }
+  return "";
+}
+function projectAssistantTextBlocks(content3, make) {
+  const out = new Map;
+  let lastToolUseIdx = -1;
+  content3.forEach((c, i) => {
+    if (c.type === "tool_use")
+      lastToolUseIdx = i;
+  });
+  content3.forEach((c, i) => {
+    if (c.type !== "text")
+      return;
+    const text4 = c.text ?? "";
+    if (text4.trim().length === 0)
+      return;
+    out.set(i, make(text4, i, i > lastToolUseIdx));
+  });
+  return out;
+}
+function sumUsageTokens(usage) {
+  if (usage == null || typeof usage !== "object")
+    return 0;
+  const u = usage;
+  const n = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
+  return n(u.input_tokens) + n(u.output_tokens) + n(u.cache_creation_input_tokens);
+}
+function projectTrailingAnswerFromTranscript(transcriptText) {
+  const buf = [];
+  let lastMeaningful = null;
+  for (const rawLine of transcriptText.split(`
+`)) {
+    const line = rawLine.trim();
+    if (!line)
+      continue;
+    if (isRealUserTurnBoundary(line)) {
+      buf.length = 0;
+      lastMeaningful = null;
+      continue;
+    }
+    for (const ev of projectTranscriptLine(line)) {
+      if (ev.kind === "enqueue") {
+        buf.length = 0;
+        lastMeaningful = null;
+      } else if (ev.kind === "tool_use") {
+        buf.length = 0;
+        lastMeaningful = "tool_use";
+      } else if (ev.kind === "text") {
+        const t = ev.text ?? "";
+        if (t.trim().length > 0) {
+          buf.push(t);
+          lastMeaningful = "text";
+        }
+      }
+    }
+  }
+  const text4 = buf.join("").trim();
+  return { text: text4, trailingIsText: lastMeaningful === "text" && text4.length > 0 };
+}
+function isRealUserTurnBoundary(line) {
+  let obj;
+  try {
+    obj = JSON.parse(line);
+  } catch {
+    return false;
+  }
+  if (obj.type !== "user")
+    return false;
+  const message = obj.message;
+  const content3 = message?.content;
+  if (typeof content3 === "string")
+    return content3.trim().length > 0;
+  if (Array.isArray(content3)) {
+    for (const c of content3) {
+      if (typeof c === "object" && c != null && c.type === "text") {
+        const t = String(c.text ?? "");
+        if (t.trim().length > 0)
+          return true;
+      }
+    }
+  }
+  return false;
+}
+function projectTranscriptLine(line) {
+  if (line.length > MAX_JSONL_LINE_BYTES)
+    return [];
+  let obj;
+  try {
+    obj = JSON.parse(line);
+  } catch {
+    return [];
+  }
+  const type = obj.type;
+  if (!type)
+    return [];
+  if (type === "queue-operation") {
+    const op = obj.operation;
+    if (op === "enqueue") {
+      const content3 = obj.content ?? "";
+      const { chatId, messageId, threadId } = parseChannelMeta(content3);
+      return [{ kind: "enqueue", chatId, messageId, threadId, rawContent: content3 }];
+    }
+    if (op === "dequeue") {
+      return [{ kind: "dequeue" }];
+    }
+    return [];
+  }
+  if (type === "assistant") {
+    const message = obj.message;
+    const content3 = message?.content;
+    if (!Array.isArray(content3))
+      return [];
+    if (obj.isApiErrorMessage === true) {
+      const mainModel2 = message?.model;
+      return typeof mainModel2 === "string" && !isModelSentinel(mainModel2) ? [{ kind: "model", model: mainModel2 }] : [];
+    }
+    const events = [];
+    const mainModel = message?.model;
+    if (typeof mainModel === "string" && !isModelSentinel(mainModel)) {
+      events.push({ kind: "model", model: mainModel });
+    }
+    const mainUsageTotal = sumUsageTokens(message?.usage);
+    if (mainUsageTotal > 0) {
+      const mainMsgId = message?.id;
+      events.push({
+        kind: "usage",
+        messageId: typeof mainMsgId === "string" ? mainMsgId : null,
+        totalTokens: mainUsageTotal
+      });
+    }
+    const textEvents = projectAssistantTextBlocks(content3, (text4, blockIndex, lastInMessage) => ({ kind: "text", text: text4, blockIndex, lastInMessage }));
+    content3.forEach((c, i) => {
+      const ct = c.type;
+      if (ct === "thinking") {
+        events.push({ kind: "thinking" });
+      } else if (ct === "tool_use") {
+        const input = c.input;
+        events.push({
+          kind: "tool_use",
+          toolName: c.name ?? "",
+          toolUseId: c.id ?? null,
+          input: input && typeof input === "object" ? input : undefined
+        });
+      } else if (ct === "text") {
+        const ev = textEvents.get(i);
+        if (ev != null)
+          events.push(ev);
+      }
+    });
+    return events;
+  }
+  if (type === "user") {
+    const message = obj.message;
+    const content3 = message?.content;
+    if (!Array.isArray(content3))
+      return [];
+    const events = [];
+    for (const c of content3) {
+      if (c.type === "tool_result") {
+        const isError2 = c.is_error === true ? true : undefined;
+        events.push({
+          kind: "tool_result",
+          toolUseId: c.tool_use_id ?? "",
+          toolName: null,
+          isError: isError2,
+          errorText: isError2 ? extractToolResultErrorText(c.content) : undefined
+        });
+      }
+    }
+    return events;
+  }
+  if (type === "system" && obj.subtype === "turn_duration") {
+    return [
+      { kind: "turn_end", durationMs: obj.durationMs ?? 0 }
+    ];
+  }
+  return [];
+}
+
 // pty-tail.ts
 var import_headless = __toESM(require_xterm_headless(), 1);
 var PTY_DEBUG = process.env.SWITCHROOM_PTY_DEBUG === "1";
@@ -62956,7 +63994,7 @@ async function gatewayStartupRetry(fn, opts = {}) {
 
 // gateway/quarantine.ts
 import { mkdirSync as mkdirSync15, writeFileSync as writeFileSync15 } from "node:fs";
-import { join as join20 } from "node:path";
+import { join as join22 } from "node:path";
 var QUARANTINE_FILENAME = "quarantine.json";
 function writeQuarantineMarker(telegramStateDir, reason, detail, nowFn = Date.now) {
   mkdirSync15(telegramStateDir, { recursive: true, mode: 448 });
@@ -62966,7 +64004,7 @@ function writeQuarantineMarker(telegramStateDir, reason, detail, nowFn = Date.no
     ts: nowFn(),
     detail
   };
-  writeFileSync15(join20(telegramStateDir, QUARANTINE_FILENAME), JSON.stringify(marker) + `
+  writeFileSync15(join22(telegramStateDir, QUARANTINE_FILENAME), JSON.stringify(marker) + `
 `, "utf-8");
 }
 
@@ -63985,9 +65023,9 @@ function defaultAddAccount(label, credentials, opts) {
 // ../src/auth/broker/client.ts
 init_protocol2();
 import * as net3 from "node:net";
-import { homedir as homedir7 } from "node:os";
+import { homedir as homedir8 } from "node:os";
 import { randomUUID as randomUUID4 } from "node:crypto";
-import { join as join22 } from "node:path";
+import { join as join24 } from "node:path";
 var DEFAULT_TIMEOUT_MS3 = 5000;
 function reviveDate2(v) {
   if (v == null)
@@ -63997,8 +65035,8 @@ function reviveDate2(v) {
   const d = new Date(v);
   return Number.isNaN(d.getTime()) ? null : d;
 }
-function operatorSocketPath2(home2 = homedir7()) {
-  return join22(home2, ".switchroom", "state", "auth-broker-operator", "sock");
+function operatorSocketPath2(home2 = homedir8()) {
+  return join24(home2, ".switchroom", "state", "auth-broker-operator", "sock");
 }
 function resolveAuthBrokerSocketPath2(opts) {
   if (opts?.socket)
@@ -64312,13 +65350,13 @@ class AuthBrokerClient2 {
 init_loader();
 init_resolver();
 init_vault();
-import { existsSync as existsSync16 } from "node:fs";
+import { existsSync as existsSync17 } from "node:fs";
 var DEFAULT_VOICE_API_KEY_REF = "vault:openai/api-key";
 function tryDirectVaultRead(ref, config, passphrase) {
   if (!passphrase)
     return null;
   const vaultPath = resolvePath(config.vault?.path ?? "~/.switchroom/vault.enc");
-  if (!existsSync16(vaultPath))
+  if (!existsSync17(vaultPath))
     return null;
   try {
     const secrets = openVault(passphrase, vaultPath);
@@ -64374,14 +65412,14 @@ async function materializeVoiceKey(opts = {}, logger2 = (line) => process.stderr
 init_loader();
 init_resolver();
 init_vault();
-import { existsSync as existsSync17 } from "node:fs";
+import { existsSync as existsSync18 } from "node:fs";
 var VOICE_SIDECAR_TOKEN_KEY = "voice/sidecar-token";
 var DEFAULT_VOICE_SIDECAR_TOKEN_REF = `vault:${VOICE_SIDECAR_TOKEN_KEY}`;
 function tryDirectVaultRead2(ref, config, passphrase) {
   if (!passphrase)
     return null;
   const vaultPath = resolvePath(config.vault?.path ?? "~/.switchroom/vault.enc");
-  if (!existsSync17(vaultPath))
+  if (!existsSync18(vaultPath))
     return null;
   try {
     const secrets = openVault(passphrase, vaultPath);
@@ -64434,17 +65472,17 @@ async function materializeSidecarToken(opts = {}, logger2 = (line) => process.st
 }
 
 // ../src/setup/host-capabilities.ts
-import { existsSync as existsSync18, mkdirSync as mkdirSync18, readFileSync as readFileSync18, writeFileSync as writeFileSync16 } from "node:fs";
+import { existsSync as existsSync19, mkdirSync as mkdirSync18, readFileSync as readFileSync19, writeFileSync as writeFileSync16 } from "node:fs";
 init_paths();
 function hostCapabilitiesPath() {
   return resolveStatePath("host-capabilities.json");
 }
 function loadHostCapabilities() {
   const path2 = hostCapabilitiesPath();
-  if (!existsSync18(path2))
+  if (!existsSync19(path2))
     return null;
   try {
-    const parsed = JSON.parse(readFileSync18(path2, "utf-8"));
+    const parsed = JSON.parse(readFileSync19(path2, "utf-8"));
     if (parsed && typeof parsed === "object" && "voice" in parsed && typeof parsed.voice === "object") {
       return parsed;
     }
@@ -64552,16 +65590,16 @@ function resolveExhaustUntil(resetAtMs, now = Date.now()) {
 
 // gateway/auth-add-flow.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
-import { existsSync as existsSync20, mkdirSync as mkdirSync20, readFileSync as readFileSync20, readdirSync as readdirSync4, rmSync as rmSync3, statSync as statSync7, writeFileSync as writeFileSync18 } from "node:fs";
-import { homedir as homedir8 } from "node:os";
-import { join as join23 } from "node:path";
+import { existsSync as existsSync21, mkdirSync as mkdirSync20, readFileSync as readFileSync21, readdirSync as readdirSync4, rmSync as rmSync3, statSync as statSync7, writeFileSync as writeFileSync18 } from "node:fs";
+import { homedir as homedir9 } from "node:os";
+import { join as join25 } from "node:path";
 import { randomBytes as randomBytes5 } from "node:crypto";
 
 // ../src/auth/manager.ts
 import {
-  readFileSync as readFileSync19,
+  readFileSync as readFileSync20,
   readdirSync as readdirSync3,
-  existsSync as existsSync19,
+  existsSync as existsSync20,
   writeFileSync as writeFileSync17,
   mkdirSync as mkdirSync19,
   mkdtempSync as mkdtempSync2,
@@ -64588,9 +65626,9 @@ function parseSetupTokenUrl(output) {
 }
 function readTokenFromCredentialsFile(credentialsFilePath) {
   try {
-    if (!existsSync19(credentialsFilePath))
+    if (!existsSync20(credentialsFilePath))
       return null;
-    const raw = readFileSync19(credentialsFilePath, "utf-8");
+    const raw = readFileSync20(credentialsFilePath, "utf-8");
     const parsed = JSON.parse(raw);
     const token = parsed?.claudeAiOauth?.accessToken;
     if (typeof token !== "string")
@@ -64648,9 +65686,9 @@ function makeAuthAddTmuxOps(tmuxBin = "tmux") {
   };
 }
 var pendingAuthAddFlows = new Map;
-function pickScratchDir(label, home2 = homedir8()) {
+function pickScratchDir(label, home2 = homedir9()) {
   const suffix = randomBytes5(8).toString("hex");
-  return join23(home2, ".switchroom", "accounts", ".in-progress", `${label}-${suffix}`);
+  return join25(home2, ".switchroom", "accounts", ".in-progress", `${label}-${suffix}`);
 }
 function cleanScratchDir(scratchDir) {
   try {
@@ -64659,8 +65697,8 @@ function cleanScratchDir(scratchDir) {
 }
 var AUTH_TMUX_SESSION_FILE = ".auth-tmux-session";
 function sweepOrphanSessions(home2, tmux, nowMs2 = Date.now()) {
-  const inProgressDir = join23(home2, ".switchroom", "accounts", ".in-progress");
-  if (!existsSync20(inProgressDir))
+  const inProgressDir = join25(home2, ".switchroom", "accounts", ".in-progress");
+  if (!existsSync21(inProgressDir))
     return;
   let entries;
   try {
@@ -64670,16 +65708,16 @@ function sweepOrphanSessions(home2, tmux, nowMs2 = Date.now()) {
   }
   const tenMinMs = 10 * 60000;
   for (const entry of entries) {
-    const dir = join23(inProgressDir, entry);
-    const sessionFile = join23(dir, AUTH_TMUX_SESSION_FILE);
-    if (!existsSync20(sessionFile))
+    const dir = join25(inProgressDir, entry);
+    const sessionFile = join25(dir, AUTH_TMUX_SESSION_FILE);
+    if (!existsSync21(sessionFile))
       continue;
     let fileContents;
     let fileMtime;
     try {
       const stat = statSync7(sessionFile);
       fileMtime = stat.mtimeMs;
-      fileContents = readFileSync20(sessionFile, "utf8").trim();
+      fileContents = readFileSync21(sessionFile, "utf8").trim();
     } catch {
       continue;
     }
@@ -64699,7 +65737,7 @@ async function startAccountAuthSession(label, opts = {}) {
   if (process.env.SWITCHROOM_TMUX_SUPERVISOR !== "1" && !opts.tmuxOps) {
     throw new Error('tmux supervisor required for /auth add: SWITCHROOM_TMUX_SUPERVISOR is not set to "1". ' + "Legacy pipe-based setup-token is unsupported (setup-token writes to /dev/tty, not stdout/stderr).");
   }
-  const home2 = opts.home ?? homedir8();
+  const home2 = opts.home ?? homedir9();
   const urlTimeoutMs = opts.urlTimeoutMs ?? 12000;
   const agentName3 = opts.agentName ?? process.env.SWITCHROOM_AGENT_NAME ?? "gateway";
   const tmux = opts.tmuxOps ?? makeAuthAddTmuxOps(opts.tmuxBin);
@@ -64711,7 +65749,7 @@ async function startAccountAuthSession(label, opts = {}) {
   const tmuxSocket = `switchroom-${agentName3}`;
   const tmuxSession = `auth-add-${label}-${hexSuffix}`.slice(0, 64);
   try {
-    writeFileSync18(join23(scratchDir, AUTH_TMUX_SESSION_FILE), `${tmuxSocket}
+    writeFileSync18(join25(scratchDir, AUTH_TMUX_SESSION_FILE), `${tmuxSocket}
 ${tmuxSession}`, "utf8");
   } catch {}
   const sessionEnv = {
@@ -64760,7 +65798,7 @@ async function submitAccountAuthCode(flow3, code2, opts = {}) {
   const pollIntervalMs = opts.pollIntervalMs ?? 250;
   const pollTimeoutMs = opts.pollTimeoutMs ?? 300000;
   const tmux = opts.tmuxOps ?? makeAuthAddTmuxOps();
-  const credentialsPath = join23(flow3.scratchDir, ".credentials.json");
+  const credentialsPath = join25(flow3.scratchDir, ".credentials.json");
   try {
     tmux.send(flow3.tmuxSocket, flow3.tmuxSession, code2);
   } catch (err) {
@@ -64770,11 +65808,11 @@ async function submitAccountAuthCode(flow3, code2, opts = {}) {
   const deadline = Date.now() + pollTimeoutMs;
   while (Date.now() < deadline) {
     await new Promise((r) => setTimeout(r, pollIntervalMs));
-    if (existsSync20(credentialsPath)) {
+    if (existsSync21(credentialsPath)) {
       const token = readTokenFromCredentialsFile(credentialsPath);
       if (token) {
         try {
-          const raw = readFileSync20(credentialsPath, "utf-8");
+          const raw = readFileSync21(credentialsPath, "utf-8");
           const parsed = JSON.parse(raw);
           if (parsed.claudeAiOauth?.accessToken) {
             tmux.killSession(flow3.tmuxSocket, flow3.tmuxSession);
@@ -64784,7 +65822,7 @@ async function submitAccountAuthCode(flow3, code2, opts = {}) {
       }
     }
     if (!tmux.hasSession(flow3.tmuxSocket, flow3.tmuxSession)) {
-      if (!existsSync20(credentialsPath)) {
+      if (!existsSync21(credentialsPath)) {
         cleanScratchDir(flow3.scratchDir);
         throw new Error("claude setup-token exited without writing credentials \u2014 the code may be invalid or expired");
       }
@@ -65236,28 +66274,6 @@ function autoClassifyMidTurnInbound(i) {
 
 // operator-events.ts
 init_format();
-
-// raw-error-scrub.ts
-function stripRawErrorBytes(raw) {
-  if (typeof raw !== "string" || raw.length === 0)
-    return "";
-  let s = raw;
-  s = s.replace(/API Error:?\s*\d*\s*/gi, " ");
-  s = s.replace(/\bb'[^']*'/g, " ");
-  s = s.replace(/\bb"[^"]*"/g, " ");
-  s = s.replace(/[\u00b7\-\s]*\{[\s\S]*?["']type["']\s*:\s*["']error["'][\s\S]*$/i, " ");
-  s = s.replace(/^\s*\{[\s\S]*\}\s*$/g, " ");
-  s = s.replace(/\s+/g, " ").replace(/[\u00b7:\-\s]+$/g, "").replace(/^[\u00b7:\-\s]+/g, "").trim();
-  return s;
-}
-function extractRequestId(raw) {
-  if (typeof raw !== "string" || raw.length === 0)
-    return;
-  const m = raw.match(/["']request[_-]?id["']\s*:\s*["']([A-Za-z0-9._-]+)["']/i) ?? raw.match(/\brequest[_-]?id[=:]\s*([A-Za-z0-9._-]+)/i);
-  return m ? m[1] : undefined;
-}
-
-// operator-events.ts
 function renderOperatorEvent(ev) {
   const agent = escapeMarkdown(ev.agent);
   const detail = escapeMarkdown(stripRawErrorBytes(ev.detail));
@@ -65445,15 +66461,15 @@ function renderOperatorEvent(ev) {
       };
   }
 }
-var DEFAULT_OPERATOR_EVENT_COOLDOWN_MS = 5 * 60000;
-var cooldownMap = new Map;
-function shouldEmitOperatorEvent(agent, kind, now = Date.now(), cooldownMs = DEFAULT_OPERATOR_EVENT_COOLDOWN_MS) {
+var DEFAULT_OPERATOR_EVENT_COOLDOWN_MS2 = 5 * 60000;
+var cooldownMap2 = new Map;
+function shouldEmitOperatorEvent(agent, kind, now = Date.now(), cooldownMs = DEFAULT_OPERATOR_EVENT_COOLDOWN_MS2) {
   const key = `${agent}:${kind}`;
-  const last = cooldownMap.get(key);
+  const last = cooldownMap2.get(key);
   if (last != null && now - last < cooldownMs) {
     return false;
   }
-  cooldownMap.set(key, now);
+  cooldownMap2.set(key, now);
   return true;
 }
 
@@ -65464,290 +66480,6 @@ function recordOperatorEvent(event, now = Date.now()) {
   store.set(event.agent, { event, storedAt: now });
 }
 
-// model-unavailable.ts
-init_quota_check();
-init_card_format();
-var transientUpstreamSignals = [
-  "not your usage limit",
-  "not your account",
-  "not your account's",
-  "temporarily limiting requests",
-  "temporarily rate",
-  "server is temporarily",
-  "would exceed your account\u2019s rate limit",
-  "would exceed your account's rate limit"
-];
-function isTransientUpstreamSignal(text4) {
-  if (typeof text4 !== "string" || text4.length === 0)
-    return false;
-  const sample = text4.length > 16384 ? text4.slice(0, 16384) : text4;
-  const lower = sample.toLowerCase();
-  return transientUpstreamSignals.some((s) => lower.includes(s));
-}
-var litellmProxyLocal429Signals = [
-  "deployment over user-defined ratelimit",
-  "model rate limit exceeded. tpm limit",
-  "model rate limit exceeded. rpm limit",
-  "deployment over defined rpm limit",
-  "no deployments available for selected model",
-  "litellm rate limit handler",
-  "crossed tpm / rpm",
-  "max parallel request limit reached"
-];
-var litellmV3LimiterSignalPair = ["rate limit exceeded for ", "limit type:"];
-function isLitellmProxyLocal429(text4) {
-  if (typeof text4 !== "string" || text4.length === 0)
-    return false;
-  const sample = text4.length > 16384 ? text4.slice(0, 16384) : text4;
-  const lower = sample.toLowerCase();
-  if (litellmProxyLocal429Signals.some((s) => lower.includes(s)))
-    return true;
-  return litellmV3LimiterSignalPair.every((s) => lower.includes(s));
-}
-function parseLitellmLimitDetail(text4, parseTimeNow = new Date) {
-  const empty2 = { limitType: null, limit: null, currentUsage: null, resetAtMs: null };
-  if (typeof text4 !== "string" || text4.length === 0)
-    return empty2;
-  const sample = text4.length > 16384 ? text4.slice(0, 16384) : text4;
-  const lower = sample.toLowerCase();
-  let limitType = null;
-  let limit = null;
-  const eqLimit = lower.match(/\b([tr]pm)[ _]limit[=:]\s*(\d+)/);
-  if (eqLimit) {
-    limitType = eqLimit[1];
-    limit = Number(eqLimit[2]);
-  }
-  if (limitType == null) {
-    const v3Type = lower.match(/limit type:\s*(tokens|requests|max_parallel_requests)/);
-    if (v3Type)
-      limitType = v3Type[1];
-  }
-  if (limit == null) {
-    const v3Limit = lower.match(/current limit:\s*(\d+)/);
-    if (v3Limit)
-      limit = Number(v3Limit[1]);
-  }
-  let currentUsage = null;
-  const usage = lower.match(/current usage=(\d+)/);
-  if (usage)
-    currentUsage = Number(usage[1]);
-  let resetAtMs = null;
-  const resetsAt = sample.match(/limit resets at:\s*(\d{4}-\d{2}-\d{2}) (\d{2}:\d{2}:\d{2}) UTC/i);
-  if (resetsAt) {
-    const d = new Date(`${resetsAt[1]}T${resetsAt[2]}Z`);
-    if (!Number.isNaN(d.getTime()))
-      resetAtMs = d.getTime();
-  }
-  if (resetAtMs == null) {
-    const tryAgain = lower.match(/try again in\s+(\d+(?:\.\d+)?)\s*seconds/);
-    if (tryAgain) {
-      const secs = Number(tryAgain[1]);
-      if (Number.isFinite(secs) && secs > 0 && secs < 7 * 24 * 3600) {
-        resetAtMs = parseTimeNow.getTime() + Math.round(secs * 1000);
-      }
-    }
-  }
-  return {
-    limitType,
-    limit: limit != null && Number.isFinite(limit) ? limit : null,
-    currentUsage: currentUsage != null && Number.isFinite(currentUsage) ? currentUsage : null,
-    resetAtMs
-  };
-}
-function detectModelUnavailable(stderr) {
-  if (typeof stderr !== "string" || stderr.length === 0)
-    return null;
-  const sample = stderr.length > 16384 ? stderr.slice(0, 16384) : stderr;
-  const lower = sample.toLowerCase();
-  if (transientUpstreamSignals.some((s) => lower.includes(s))) {
-    const resetAt = parseResetTime(sample);
-    return resetAt !== undefined ? { kind: "overload", resetAt, raw: stderr } : { kind: "overload", raw: stderr };
-  }
-  if (isLitellmProxyLocal429(sample)) {
-    const resetAt = parseResetTime(sample);
-    return resetAt !== undefined ? { kind: "overload", resetAt, raw: stderr } : { kind: "overload", raw: stderr };
-  }
-  const quotaSignals = [
-    "out of extra usage",
-    "extra usage",
-    "credit_balance_too_low",
-    "credit balance too low",
-    "usage limit",
-    "usage_limit",
-    "quota exhausted",
-    "quota_exhausted",
-    "plan limit",
-    "subscription limit",
-    "hit your limit",
-    "hit the limit",
-    "session limit",
-    "session cap"
-  ];
-  if (quotaSignals.some((s) => lower.includes(s))) {
-    const resetAt = parseResetTime(sample);
-    return resetAt !== undefined ? { kind: "quota_exhausted", resetAt, raw: stderr } : { kind: "quota_exhausted", raw: stderr };
-  }
-  const overloadSignals = [
-    "overloaded_error",
-    "overloaded",
-    "rate_limit_error",
-    "rate limit",
-    "rate-limited",
-    "http 429",
-    '"status":429',
-    "status: 429",
-    " 429 ",
-    "503 service",
-    "service unavailable",
-    '"status":529',
-    "http 529",
-    " 529 "
-  ];
-  if (overloadSignals.some((s) => lower.includes(s))) {
-    const resetAt = parseResetTime(sample);
-    return resetAt !== undefined ? { kind: "overload", resetAt, raw: stderr } : { kind: "overload", raw: stderr };
-  }
-  const networkSignals = [
-    "econnrefused",
-    "econnreset",
-    "etimedout",
-    "enotfound",
-    "eai_again",
-    "fetch failed",
-    "network error",
-    "socket hang up",
-    "request timed out",
-    "connection refused",
-    "getaddrinfo"
-  ];
-  if (networkSignals.some((s) => lower.includes(s))) {
-    return { kind: "network", raw: stderr };
-  }
-  return null;
-}
-function parseResetTime(text4, parseTimeNow = new Date) {
-  const lower = text4.toLowerCase();
-  const retryAfter = lower.match(/retry[\s-]*after[:\s]+(\d+)\s*(seconds?|s\b|minutes?|m\b|hours?|h\b)?/);
-  if (retryAfter) {
-    const n = Number(retryAfter[1]);
-    if (Number.isFinite(n) && n > 0 && n < 7 * 24 * 3600) {
-      const unit = (retryAfter[2] ?? "seconds").toLowerCase();
-      const ms = unit.startsWith("h") ? n * 3600000 : unit.startsWith("m") ? n * 60000 : n * 1000;
-      return new Date(parseTimeNow.getTime() + ms);
-    }
-  }
-  const relReset = lower.match(/resets?\s+in\s+([0-9hms\s]+)/);
-  if (relReset) {
-    const ms = parseRelativeDuration(relReset[1]);
-    if (ms != null)
-      return new Date(parseTimeNow.getTime() + ms);
-  }
-  const iso = text4.match(/\b\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})?\b/);
-  if (iso) {
-    const d = new Date(iso[0]);
-    if (!Number.isNaN(d.getTime()))
-      return d;
-  }
-  const calReset = text4.match(/resets?\s+(?:at\s+)?([A-Z][a-z]{2,8}\s+\d{1,2}(?:,?\s*(?:\d{1,2}(?::\d{2})?\s*(?:am|pm|AM|PM)?))?)/);
-  if (calReset) {
-    const candidate = `${calReset[1]} ${parseTimeNow.getUTCFullYear()}`;
-    const d = new Date(candidate);
-    if (!Number.isNaN(d.getTime()))
-      return d;
-  }
-  const timeOnly = text4.match(/resets?\s+(?:at\s+)?(?!(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[a-z]*\b)(\d{1,2})(?::(\d{2}))?\s*(am|pm)?\s*(?:\(([^)]+)\))?/i);
-  if (timeOnly) {
-    const d = resolveNextWallClock(Number(timeOnly[1]), timeOnly[2] ? Number(timeOnly[2]) : 0, timeOnly[3]?.toLowerCase(), timeOnly[4]?.trim(), parseTimeNow);
-    if (d != null)
-      return d;
-  }
-  return;
-}
-function resolveNextWallClock(hour12or24, minute, ampm, tz, nowDate) {
-  let hour = hour12or24;
-  if (ampm === "pm" && hour < 12)
-    hour += 12;
-  if (ampm === "am" && hour === 12)
-    hour = 0;
-  if (!Number.isFinite(hour) || hour > 23 || hour < 0)
-    return;
-  if (!Number.isFinite(minute) || minute > 59 || minute < 0)
-    return;
-  const nowMs2 = nowDate.getTime();
-  const base = new Date(nowMs2);
-  for (let dayOffset = 0;dayOffset <= 2; dayOffset++) {
-    const dateParts = tzDateParts(new Date(nowMs2 + dayOffset * 86400000), tz);
-    if (dateParts == null)
-      return;
-    const epoch = wallClockToEpoch(dateParts.year, dateParts.month, dateParts.day, hour, minute, tz);
-    if (epoch != null && epoch > nowMs2)
-      return new Date(epoch);
-  }
-  return;
-}
-function tzDateParts(d, tz) {
-  if (!tz) {
-    return { year: d.getUTCFullYear(), month: d.getUTCMonth(), day: d.getUTCDate() };
-  }
-  try {
-    const fmt = new Intl.DateTimeFormat("en-US", {
-      timeZone: tz,
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit"
-    });
-    const parts = Object.fromEntries(fmt.formatToParts(d).filter((p) => p.type !== "literal").map((p) => [p.type, p.value]));
-    return {
-      year: Number(parts.year),
-      month: Number(parts.month) - 1,
-      day: Number(parts.day)
-    };
-  } catch {
-    return null;
-  }
-}
-function wallClockToEpoch(year, month, day, hour, minute, tz) {
-  const asUtc = Date.UTC(year, month, day, hour, minute, 0);
-  if (!tz)
-    return asUtc;
-  try {
-    const fmt = new Intl.DateTimeFormat("en-US", {
-      timeZone: tz,
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit",
-      hour: "2-digit",
-      minute: "2-digit",
-      second: "2-digit",
-      hour12: false
-    });
-    const parts = Object.fromEntries(fmt.formatToParts(new Date(asUtc)).filter((p) => p.type !== "literal").map((p) => [p.type, p.value]));
-    const shown = Date.UTC(Number(parts.year), Number(parts.month) - 1, Number(parts.day), Number(parts.hour) % 24, Number(parts.minute), Number(parts.second));
-    const offset = shown - asUtc;
-    return asUtc - offset;
-  } catch {
-    return null;
-  }
-}
-function parseRelativeDuration(s) {
-  let total = 0;
-  let matched = false;
-  const re = /(\d+)\s*(h|hours?|m|minutes?|s|seconds?)/g;
-  let m;
-  while ((m = re.exec(s)) != null) {
-    matched = true;
-    const n = Number(m[1]);
-    const unit = m[2].toLowerCase();
-    if (unit.startsWith("h"))
-      total += n * 3600000;
-    else if (unit.startsWith("m"))
-      total += n * 60000;
-    else
-      total += n * 1000;
-  }
-  return matched && total > 0 ? total : null;
-}
-
 // throttle-tier.ts
 init_card_format();
 init_quota_check();
@@ -65807,72 +66539,6 @@ function renderThrottleEscalationNotice(opts) {
 ${tail}`;
 }
 
-// operator-events.ts
-init_format();
-function classifyClaudeError(raw) {
-  try {
-    return classifyInner(raw);
-  } catch {
-    return "unknown-4xx";
-  }
-}
-function classifyInner(raw) {
-  if (raw == null)
-    return "unknown-4xx";
-  const obj = typeof raw === "object" ? raw : {};
-  const errorType = extractString(obj, "error_type") ?? extractString(obj, "type") ?? extractString(getNestedObj(obj, "error"), "type") ?? "";
-  const errorCode = extractString(obj, "code") ?? extractString(getNestedObj(obj, "error"), "code") ?? "";
-  const message = extractString(obj, "message") ?? extractString(getNestedObj(obj, "error"), "message") ?? (typeof raw === "string" ? raw : "") ?? "";
-  const status = extractNumber(obj, "status") ?? extractNumber(obj, "statusCode") ?? extractNumber(obj, "status_code") ?? null;
-  const sdkCode = extractString(obj, "error_code") ?? "";
-  if (errorType === "authentication_error" || errorCode === "authentication_error" || sdkCode === "authentication_error" || message.toLowerCase().includes("authentication_error")) {
-    const msg = message.toLowerCase();
-    if (msg.includes("expired") || msg.includes("refresh")) {
-      return "credentials-expired";
-    }
-    return "credentials-invalid";
-  }
-  if (errorType === "invalid_api_key" || errorCode === "invalid_api_key" || sdkCode === "invalid_api_key" || message.toLowerCase().includes("invalid_api_key") || message.toLowerCase().includes("invalid api key")) {
-    return "credentials-invalid";
-  }
-  if (errorType === "credit_balance_too_low" || errorCode === "credit_balance_too_low" || sdkCode === "credit_balance_too_low" || message.toLowerCase().includes("credit_balance_too_low") || message.toLowerCase().includes("credit balance")) {
-    return "credit-exhausted";
-  }
-  if (errorType === "rate_limit_error" || errorCode === "rate_limit_error" || sdkCode === "rate_limit_error" || message.toLowerCase().includes("rate_limit_error") || message.toLowerCase().includes("rate limit")) {
-    return "rate-limited";
-  }
-  if (errorType === "overloaded_error" || errorCode === "overloaded_error" || sdkCode === "overloaded_error" || message.toLowerCase().includes("overloaded_error") || message.toLowerCase().includes("overloaded")) {
-    return "rate-limited";
-  }
-  if (errorType === "agent-crashed" || errorCode === "agent-crashed") {
-    return "agent-crashed";
-  }
-  if (errorType === "agent-restarted-unexpectedly" || errorCode === "agent-restarted-unexpectedly") {
-    return "agent-restarted-unexpectedly";
-  }
-  if (status != null) {
-    if (status >= 400 && status < 500)
-      return "unknown-4xx";
-    if (status >= 500 && status < 600)
-      return "unknown-5xx";
-  }
-  return "unknown-4xx";
-}
-function extractString(obj, key) {
-  const v = obj[key];
-  return typeof v === "string" && v.length > 0 ? v : null;
-}
-function extractNumber(obj, key) {
-  const v = obj[key];
-  return typeof v === "number" ? v : null;
-}
-function getNestedObj(obj, key) {
-  const v = obj[key];
-  return typeof v === "object" && v != null ? v : {};
-}
-var DEFAULT_OPERATOR_EVENT_COOLDOWN_MS2 = 5 * 60000;
-var cooldownMap2 = new Map;
-
 // llm-error-present.ts
 function extractModel(raw) {
   const m = raw.match(/["']?model["']?\s*[=:]\s*["']?((?:claude|sr)[A-Za-z0-9._-]+)/i);
@@ -67368,9 +68034,50 @@ function backOffOpenInline2(text4, cut) {
 }
 
 // rich-send.ts
+init_dollar_math_guard();
+init_emphasis_guard();
+init_line_start_guard();
+init_inline_pairs_guard();
 var import_grammy8 = __toESM(require_mod2(), 1);
+function guardAccidentalFormatting2(markdown) {
+  let out = markdown;
+  out = guardAccidentalEmphasis(out);
+  out = guardAccidentalBlockConstructs(out);
+  out = guardAccidentalInlinePairs(out);
+  out = guardDollarMath(out);
+  return out;
+}
 function richMessage2(markdown) {
-  return { markdown };
+  return { markdown: guardAccidentalFormatting2(markdown) };
+}
+
+// gateway/redelivery-decision.ts
+var REDELIVERY_PREFIX = "Recovered from an interrupted turn:";
+function decideRedeliverCapture(input) {
+  if (input.willBeResumed)
+    return { capture: false, skipReason: "will-be-resumed" };
+  if (!input.hasSessionId)
+    return { capture: false, skipReason: "no-session-id" };
+  return { capture: true };
+}
+function frameRedelivery(capturedText) {
+  return `${REDELIVERY_PREFIX}
+
+${capturedText.trim()}`;
+}
+function decideRedeliver(input) {
+  const text4 = input.capturedText.trim();
+  if (text4.length === 0)
+    return { redeliver: false, skipReason: "empty-text" };
+  if (!input.trailingIsText)
+    return { redeliver: false, skipReason: "trailing-not-text" };
+  if (input.alreadyRedelivered)
+    return { redeliver: false, skipReason: "already-redelivered" };
+  if (input.hasDeliveredText)
+    return { redeliver: false, skipReason: "already-delivered" };
+  if (input.ageMs > input.maxAgeMs)
+    return { redeliver: false, skipReason: "stale" };
+  return { redeliver: true, framedText: frameRedelivery(text4) };
 }
 
 // text-voice-scrub.ts
@@ -68360,10 +69067,10 @@ function resolveAgentDirFromEnv() {
 
 // active-reactions.ts
 import { readFileSync as readFileSync22, writeFileSync as writeFileSync19, renameSync as renameSync7, existsSync as existsSync23, unlinkSync as unlinkSync11 } from "node:fs";
-import { join as join26 } from "node:path";
+import { join as join27 } from "node:path";
 var ACTIVE_REACTIONS_FILENAME = ".active-reactions.json";
 function reactionsPath(agentDir) {
-  return join26(agentDir, ACTIVE_REACTIONS_FILENAME);
+  return join27(agentDir, ACTIVE_REACTIONS_FILENAME);
 }
 function readActiveReactions(agentDir) {
   const p = reactionsPath(agentDir);
@@ -68428,10 +69135,10 @@ function clearActiveReactions(agentDir) {
 
 // active-reactions.ts
 import { readFileSync as readFileSync23, writeFileSync as writeFileSync20, renameSync as renameSync8, existsSync as existsSync24, unlinkSync as unlinkSync12 } from "node:fs";
-import { join as join27 } from "node:path";
+import { join as join28 } from "node:path";
 var ACTIVE_REACTIONS_FILENAME2 = ".active-reactions.json";
 function reactionsPath2(agentDir) {
-  return join27(agentDir, ACTIVE_REACTIONS_FILENAME2);
+  return join28(agentDir, ACTIVE_REACTIONS_FILENAME2);
 }
 function readActiveReactions2(agentDir) {
   const p = reactionsPath2(agentDir);
@@ -69349,12 +70056,12 @@ async function approvalRecord(args, opts) {
 
 // quota-check.ts
 import { readFileSync as readFileSync24, existsSync as existsSync25 } from "fs";
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 var OAUTH_BETA2 = "oauth-2025-04-20";
 var DEFAULT_USER_AGENT2 = "claude-cli/1.0.0 (external, cli)";
 var DEFAULT_PROBE_MODEL2 = "claude-haiku-4-5-20251001";
 function readOauthToken2(claudeConfigDir) {
-  const tokenFile = join28(claudeConfigDir, ".oauth-token");
+  const tokenFile = join29(claudeConfigDir, ".oauth-token");
   if (!existsSync25(tokenFile))
     return null;
   try {
@@ -69754,18 +70461,32 @@ async function injectSlashCommand(agentName3, command, opts = {}) {
   const socket = opts.socketName ?? defaultSocketName(agentName3);
   const session = opts.sessionName ?? agentName3;
   const settleMs = opts.settleMs ?? 2000;
-  const timeoutMs = opts.timeoutMs ?? 5000;
+  const signalMode = !!(opts.successPattern || opts.errorPattern);
+  const timeoutMs = opts.timeoutMs ?? (signalMode ? 8000 : 5000);
   return withPaneLock(`${socket}:${session}`, () => injectSlashCommandWith(makeTmuxRunner(tmuxBin), {
     socket,
     session,
     command: command.trim(),
     settleMs,
     timeoutMs,
-    precondition: opts.precondition
+    precondition: opts.precondition,
+    successPattern: opts.successPattern,
+    errorPattern: opts.errorPattern,
+    settleBeforeSendMs: opts.settleBeforeSendMs
   }));
 }
 async function injectSlashCommandWith(runner, args) {
-  const { socket, session, command, settleMs, timeoutMs, precondition } = args;
+  const {
+    socket,
+    session,
+    command,
+    settleMs,
+    timeoutMs,
+    precondition,
+    successPattern,
+    errorPattern,
+    settleBeforeSendMs
+  } = args;
   let bareVerb;
   try {
     bareVerb = validateInjectCommand(command);
@@ -69806,6 +70527,17 @@ async function injectSlashCommandWith(runner, args) {
       errorMessage: "inject precondition returned false at write time; send aborted " + "(no keys sent)."
     };
   }
+  if (settleBeforeSendMs && settleBeforeSendMs > 0) {
+    const settleStart = Date.now();
+    let prevSettle = runner.capture(socket, session) ?? "";
+    while (Date.now() - settleStart < settleBeforeSendMs) {
+      await sleep(POLL_INTERVAL_MS2);
+      const cur = runner.capture(socket, session) ?? "";
+      if (cur === prevSettle)
+        break;
+      prevSettle = cur;
+    }
+  }
   const before = runner.capture(socket, session) ?? "";
   try {
     runner.send(socket, session, ["send-keys", "-l", command]);
@@ -69824,9 +70556,23 @@ async function injectSlashCommandWith(runner, args) {
   const start = Date.now();
   let last = before;
   let stableSince = null;
+  const signalMode = !!(successPattern || errorPattern);
   while (Date.now() - start < timeoutMs) {
     await sleep(POLL_INTERVAL_MS2);
     const cur = runner.capture(socket, session) ?? "";
+    if (signalMode) {
+      last = cur;
+      if (cur !== before) {
+        const { output: region } = diffPane(before, cur, command);
+        const regionLines = region.split(`
+`).map((l) => l.trim());
+        if (errorPattern && regionLines.some((l) => errorPattern.test(l)))
+          break;
+        if (successPattern && regionLines.some((l) => successPattern.test(l)))
+          break;
+      }
+      continue;
+    }
     if (cur === last && cur !== before) {
       if (stableSince === null) {
         stableSince = Date.now();
@@ -70261,7 +71007,11 @@ async function handleModelCommand(parsed, deps) {
   const verbHtml = `\`/model ${deps.escapeHtml(model)}\``;
   let result;
   try {
-    result = await deps.inject(deps.getAgentName(), `/model ${model}`);
+    result = await deps.inject(deps.getAgentName(), `/model ${model}`, {
+      successPattern: MODEL_SWITCH_CONFIRMATION_PREFIX,
+      errorPattern: MODEL_SWITCH_ERROR_RE,
+      settleBeforeSendMs: 1500
+    });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     return {
@@ -70269,21 +71019,21 @@ async function handleModelCommand(parsed, deps) {
       html: true
     };
   }
-  if (result.outcome === "ok") {
-    const errLine = modelSwitchErrorLine(result.output);
-    if (errLine) {
-      return {
-        text: [
-          `\u274c ${verbHtml} \u2014 the switch did not take:`,
-          deps.preBlock(errLine),
-          "Check `/model` for valid model names."
-        ].join(`
-`),
-        html: true
-      };
-    }
-    const confirmation = modelSwitchConfirmationLine(result.output);
+  if (result.outcome === "ok" || result.outcome === "ok_no_output") {
+    const confirmation = result.outcome === "ok" ? modelSwitchConfirmationLine(result.output) : null;
     if (confirmation) {
+      if (isKeptModelConfirmation(confirmation)) {
+        return {
+          text: [
+            `${verbHtml}`,
+            deps.preBlock(confirmation),
+            ...result.truncated ? ["_truncated_"] : [],
+            PERSIST_NOTE
+          ].join(`
+`),
+          html: true
+        };
+      }
       const confirmed = sessionModelFromConfirmation(confirmation) ?? model;
       return {
         text: [
@@ -70294,26 +71044,31 @@ async function handleModelCommand(parsed, deps) {
         ].join(`
 `),
         html: true,
-        ...isKeptModelConfirmation(confirmation) ? {} : { selectedModel: confirmed }
+        selectedModel: confirmed
       };
     }
-    return {
-      text: [
-        `${verbHtml} \u2014 sent, but couldn't confirm the switch \u2014 check \`/status\`.`,
-        PERSIST_NOTE
-      ].join(`
+    const errLine = result.outcome === "ok" ? modelSwitchErrorLine(result.output) : null;
+    if (errLine) {
+      return {
+        text: [
+          `\u274c ${verbHtml} \u2014 the switch did not take:`,
+          deps.preBlock(errLine),
+          "Check `/model` for a valid, available model."
+        ].join(`
 `),
-      html: true
-    };
-  }
-  if (result.outcome === "ok_no_output") {
+        html: true
+      };
+    }
+    const optimisticLabel = optimisticModelRecordLabel(model);
     return {
       text: [
-        `${verbHtml} \u2014 sent, but no response captured. The agent may be mid-turn; check \`/inject /status\` to confirm the active model.`,
+        `${verbHtml} \u2014 sent, but couldn't read a confirmation line. \`/status\` will show the live model once it's confirmed.`,
         PERSIST_NOTE
       ].join(`
 `),
-      html: true
+      html: true,
+      selectedModel: optimisticLabel,
+      optimistic: true
     };
   }
   if (result.errorCode === "session_missing") {
@@ -70376,6 +71131,15 @@ function expandSrAlias(arg) {
 function srFriendlyLabel(srName) {
   return SR_MODEL_LABELS[srName] ?? srName.replace(/^sr-/, "").replace(/-/g, " ");
 }
+function optimisticModelRecordLabel(token) {
+  if (isSrModel(token))
+    return token;
+  const lower = token.toLowerCase();
+  if (MODEL_ALIASES.includes(lower)) {
+    return lower.charAt(0).toUpperCase() + lower.slice(1);
+  }
+  return token;
+}
 function classifyDiscoveredOptions(options) {
   return {
     claude: options.filter((o) => !o.label.startsWith("sr-") && !o.label.includes("/") && (/^[A-Z]/.test(o.label) || o.label.startsWith("claude-"))),
@@ -70548,7 +71312,11 @@ async function handleModelMenuCallback(data, deps) {
     }
     let aliasResult;
     try {
-      aliasResult = await deps.inject(deps.getAgentName(), `/model ${alias}`);
+      aliasResult = await deps.inject(deps.getAgentName(), `/model ${alias}`, {
+        successPattern: MODEL_SWITCH_CONFIRMATION_PREFIX,
+        errorPattern: MODEL_SWITCH_ERROR_RE,
+        settleBeforeSendMs: 1500
+      });
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       return {
@@ -70556,16 +71324,32 @@ async function handleModelMenuCallback(data, deps) {
         reply: await menuWithBanner(deps, `\u274c Switch to **${deps.escapeHtml(alias)}** failed: ${deps.escapeHtml(msg)}`)
       };
     }
-    if (aliasResult.outcome === "ok") {
-      const confirmation = modelSwitchConfirmationLine(aliasResult.output) ?? `Switched to ${alias} (session)`;
-      const kept = isKeptModelConfirmation(confirmation);
+    if (aliasResult.outcome === "ok" || aliasResult.outcome === "ok_no_output") {
+      const confirmation = aliasResult.outcome === "ok" ? modelSwitchConfirmationLine(aliasResult.output) : null;
+      if (confirmation) {
+        const kept = isKeptModelConfirmation(confirmation);
+        return {
+          answer: confirmation,
+          reply: await menuWithBannerStatic(deps, `\u2705 ${deps.escapeHtml(confirmation)}`),
+          ...kept ? {} : {
+            selectedModel: sessionModelFromConfirmation(confirmation) ?? optimisticModelRecordLabel(alias),
+            selectedModelToken: alias
+          }
+        };
+      }
+      const aliasErr = aliasResult.outcome === "ok" ? modelSwitchErrorLine(aliasResult.output) : null;
+      if (aliasErr) {
+        return {
+          answer: "Switch failed",
+          reply: await menuWithBanner(deps, `\u274c Switch to **${deps.escapeHtml(alias)}** did not take: ${deps.escapeHtml(aliasErr)}`)
+        };
+      }
+      const optimisticLabel = optimisticModelRecordLabel(alias);
       return {
-        answer: confirmation,
-        reply: await menuWithBannerStatic(deps, `\u2705 ${deps.escapeHtml(confirmation)}`),
-        ...kept ? {} : {
-          selectedModel: sessionModelFromConfirmation(confirmation) ?? alias,
-          selectedModelToken: alias
-        }
+        answer: `Sent /model ${alias} \u2014 check /status`,
+        reply: await menuWithBannerStatic(deps, `Sent \`/model ${deps.escapeHtml(alias)}\` \u2014 couldn\u2019t read a confirmation line. \`/status\` will show the live model once it\u2019s confirmed.`),
+        selectedModel: optimisticLabel,
+        selectedModelToken: alias
       };
     }
     return {
@@ -70662,7 +71446,7 @@ function modelSwitchConfirmationLine(output) {
 `).map((l) => l.trim()).find((l) => MODEL_SWITCH_CONFIRMATION_PREFIX.test(l));
   return line && line.length > 0 ? line : null;
 }
-var MODEL_SWITCH_ERROR_RE = /^\s*[\u23fa\u25cf\u2022>\u23bf-]?\s*(?:Error:\s*)?(?:Model(?:\s+'[^']+')?\s+not found|Invalid model|Unknown model|No such model)\b/i;
+var MODEL_SWITCH_ERROR_RE = /^\s*[\u23fa\u25cf\u2022>\u23bf-]?\s*(?:Error:\s*)?(?:Model(?:\s+'[^']+')?\s+not found|Invalid model|Unknown model|No such model|(?:[\w'\u2019.\-]+\s+){0,4}(?:(?:is |are )?(?:not available|unavailable|not enabled|not supported)|access denied|requires\b[^\n]{0,40}\b(?:subscription|plan)|no access)\b)/i;
 function modelSwitchErrorLine(output) {
   const line = output.split(`
 `).map((l) => l.trim()).find((l) => MODEL_SWITCH_ERROR_RE.test(l));
@@ -70711,7 +71495,7 @@ async function menuWithBannerStatic(deps, banner) {
 
 // gateway/session-model-file.ts
 import { readFileSync as readFileSync25, writeFileSync as writeFileSync21, renameSync as renameSync9, rmSync as rmSync4 } from "node:fs";
-import { join as join29 } from "node:path";
+import { join as join30 } from "node:path";
 
 // gateway/model-command.ts
 var MODEL_ARG_RE2 = /^[A-Za-z0-9][A-Za-z0-9._/\[\]-]{0,99}$/;
@@ -70740,18 +71524,18 @@ function writeSessionModelFile(agentDir, model, configuredDefaultAtWrite) {
   if (!isValidModelArg2(model)) {
     throw new Error(`refusing to persist non-canonical session model token: ${JSON.stringify(model)}`);
   }
-  atomicWrite(join29(agentDir, SESSION_MODEL_FILE), serializeSessionModel({ model, configuredDefaultAtWrite, ts: Date.now() }));
+  atomicWrite(join30(agentDir, SESSION_MODEL_FILE), serializeSessionModel({ model, configuredDefaultAtWrite, ts: Date.now() }));
 }
 function readSessionModelFileRaw(agentDir) {
   try {
-    return readFileSync25(join29(agentDir, SESSION_MODEL_FILE), "utf8");
+    return readFileSync25(join30(agentDir, SESSION_MODEL_FILE), "utf8");
   } catch {
     return null;
   }
 }
 function clearSessionModelFile(agentDir) {
   try {
-    rmSync4(join29(agentDir, SESSION_MODEL_FILE), { force: true });
+    rmSync4(join30(agentDir, SESSION_MODEL_FILE), { force: true });
   } catch {}
 }
 function restoreSessionModelFileRaw(agentDir, raw) {
@@ -70760,12 +71544,12 @@ function restoreSessionModelFileRaw(agentDir, raw) {
     return;
   }
   try {
-    atomicWrite(join29(agentDir, SESSION_MODEL_FILE), raw);
+    atomicWrite(join30(agentDir, SESSION_MODEL_FILE), raw);
   } catch {}
 }
 function readConfiguredDefaultModel(agentDir) {
   try {
-    const v = readFileSync25(join29(agentDir, CONFIGURED_DEFAULT_MODEL_FILE), "utf8").trim();
+    const v = readFileSync25(join30(agentDir, CONFIGURED_DEFAULT_MODEL_FILE), "utf8").trim();
     return v.length > 0 ? v : null;
   } catch {
     return null;
@@ -70777,12 +71561,12 @@ function writeSessionEffortFile(agentDir, level, configuredDefaultAtWrite) {
   if (!EFFORT_LEVEL_RE.test(level)) {
     throw new Error(`refusing to persist non-allowlisted effort level: ${JSON.stringify(level)}`);
   }
-  atomicWrite(join29(agentDir, SESSION_EFFORT_FILE), `${JSON.stringify({ level, configuredDefaultAtWrite: configuredDefaultAtWrite ?? "", ts: Date.now() })}
+  atomicWrite(join30(agentDir, SESSION_EFFORT_FILE), `${JSON.stringify({ level, configuredDefaultAtWrite: configuredDefaultAtWrite ?? "", ts: Date.now() })}
 `);
 }
 function clearSessionEffortFile(agentDir) {
   try {
-    rmSync4(join29(agentDir, SESSION_EFFORT_FILE), { force: true });
+    rmSync4(join30(agentDir, SESSION_EFFORT_FILE), { force: true });
   } catch {}
 }
 var PREMIUM_RECOVERY_FILE = ".premium-recovery";
@@ -70805,13 +71589,13 @@ function writePremiumRecoveryFile(agentDir, premiumModel, chats) {
   if (clean.length === 0) {
     throw new Error("refusing to persist premium-recovery marker with no chats to notify");
   }
-  atomicWrite(join29(agentDir, PREMIUM_RECOVERY_FILE), `${JSON.stringify({ premiumModel, chats: clean, ts: Date.now() })}
+  atomicWrite(join30(agentDir, PREMIUM_RECOVERY_FILE), `${JSON.stringify({ premiumModel, chats: clean, ts: Date.now() })}
 `);
 }
 function readPremiumRecoveryFile(agentDir) {
   let raw;
   try {
-    raw = readFileSync25(join29(agentDir, PREMIUM_RECOVERY_FILE), "utf8");
+    raw = readFileSync25(join30(agentDir, PREMIUM_RECOVERY_FILE), "utf8");
   } catch {
     return null;
   }
@@ -70824,7 +71608,7 @@ function readPremiumRecoveryFile(agentDir) {
 }
 function clearPremiumRecoveryFile(agentDir) {
   try {
-    rmSync4(join29(agentDir, PREMIUM_RECOVERY_FILE), { force: true });
+    rmSync4(join30(agentDir, PREMIUM_RECOVERY_FILE), { force: true });
   } catch {}
 }
 
@@ -71016,7 +71800,7 @@ function makeIo(agentName3, opts) {
     socket: opts.socketName ?? `switchroom-${agentName3}`,
     session: opts.sessionName ?? agentName3,
     stepMs: opts.stepMs ?? 600,
-    timeoutMs: opts.timeoutMs ?? 1e4,
+    timeoutMs: opts.timeoutMs ?? 12000,
     sleep: opts._sleep ?? realSleep,
     log: opts._log ?? ((line) => process.stderr.write(`${line}
 `)),
@@ -71039,7 +71823,7 @@ function sendLiteral(io, text4) {
 function sendKey(io, key) {
   io.runner.send(io.socket, io.session, ["send-keys", key]);
 }
-async function openPicker(io) {
+async function openPicker(io, deadlineMs) {
   sendLiteral(io, "/model");
   sendKey(io, "Enter");
   for (;; ) {
@@ -71048,10 +71832,24 @@ async function openPicker(io) {
     const parsed = parseModelPicker(pane);
     if (parsed?.footerSeen)
       return parsed;
-    if (expired(io))
+    if (deadlineMs != null && Date.now() >= deadlineMs || expired(io)) {
       return parsed;
+    }
   }
 }
+async function openPickerWithRetry(io) {
+  const remaining = io.timeoutMs - (Date.now() - io.startedAt);
+  const firstDeadline = Date.now() + Math.max(io.stepMs * 2, Math.floor(remaining / 2));
+  const parsed = await openPicker(io, firstDeadline);
+  if (parsed?.footerSeen)
+    return parsed;
+  if (expired(io))
+    return parsed;
+  await dismissPicker(io);
+  if (expired(io))
+    return parsed;
+  return openPicker(io);
+}
 async function dismissPicker(io) {
   for (let attempt = 0;attempt < 2; attempt++) {
     try {
@@ -71081,7 +71879,7 @@ async function discoverModels(agentName3, opts = {}) {
     let parsed = null;
     let dismissed = true;
     try {
-      parsed = await openPicker(io);
+      parsed = await openPickerWithRetry(io);
     } finally {
       dismissed = await dismissOrWarn(io, "discover");
     }
@@ -71106,7 +71904,7 @@ async function selectModel(agentName3, targetLabel, opts = {}) {
     io.startedAt = Date.now();
     let selected = false;
     try {
-      const parsed = await openPicker(io);
+      const parsed = await openPickerWithRetry(io);
       if (!parsed || !parsed.footerSeen) {
         return { ok: false, reason: "picker did not render \u2014 agent may be mid-turn" };
       }
@@ -71163,7 +71961,7 @@ function extractConfirmation(pane) {
 }
 
 // ../src/agents/scaffold.ts
-import { join as join32, resolve as resolve6 } from "node:path";
+import { join as join33, resolve as resolve6 } from "node:path";
 init_atomic();
 
 // ../src/agents/agent-uid.ts
@@ -71187,8 +71985,8 @@ var CONTAINER_DEFAULT_UTC_ZONES = new Set([
 ]);
 
 // ../src/cli/agent-config.ts
-import { join as join30 } from "node:path";
-import { homedir as homedir9 } from "node:os";
+import { join as join31 } from "node:path";
+import { homedir as homedir10 } from "node:os";
 
 // ../src/cli/helpers.ts
 init_loader();
@@ -71208,12 +72006,12 @@ var WEBKITE_VAULT_KEYS = new Set([
 init_overlay_loader();
 
 // ../src/cli/agent-config.ts
-var AUDIT_ROOT = join30(homedir9(), ".switchroom", "audit");
+var AUDIT_ROOT = join31(homedir10(), ".switchroom", "audit");
 
 // ../src/agents/profiles.ts
 var import_handlebars = __toESM(require_lib(), 1);
 import { readFileSync as readFileSync26, writeFileSync as writeFileSync22, existsSync as existsSync26, readdirSync as readdirSync5, statSync as statSync8, copyFileSync, mkdirSync as mkdirSync22, realpathSync as realpathSync2 } from "node:fs";
-import { resolve as resolve5, join as join31, sep as pathSep } from "node:path";
+import { resolve as resolve5, join as join32, sep as pathSep } from "node:path";
 var PROFILES_ROOT = resolve5(import.meta.dirname, "../../profiles");
 import_handlebars.default.registerHelper("json", (value) => {
   return new import_handlebars.default.SafeString(JSON.stringify(value, null, 2));
@@ -71224,7 +72022,7 @@ import_handlebars.default.registerHelper("isNumber", (value) => {
 var SHARED_FRAGMENTS_DIR = resolve5(PROFILES_ROOT, "_shared");
 var SHARED_FRAGMENTS = ["vault-protocol", "agent-self-service", "execution-discipline", "reply-discipline", "dev-protocol"];
 for (const name of SHARED_FRAGMENTS) {
-  const fragPath = join31(SHARED_FRAGMENTS_DIR, `${name}.md.hbs`);
+  const fragPath = join32(SHARED_FRAGMENTS_DIR, `${name}.md.hbs`);
   if (existsSync26(fragPath)) {
     import_handlebars.default.registerPartial(name, readFileSync26(fragPath, "utf-8"));
   }
@@ -71936,7 +72734,7 @@ init_overlay_loader();
 init_merge();
 var import_yaml4 = __toESM(require_dist(), 1);
 import { readFileSync as readFileSync27, existsSync as existsSync27 } from "node:fs";
-import { homedir as homedir10 } from "node:os";
+import { homedir as homedir11 } from "node:os";
 import { resolve as resolve7 } from "node:path";
 
 class ConfigError2 extends Error {
@@ -71993,7 +72791,7 @@ function coerceLegacyGoogleWorkspaceKeys2(parsed, filePath) {
 }
 function findConfigFile2(startDir) {
   const envPath = process.env.SWITCHROOM_CONFIG;
-  const home2 = homedir10();
+  const home2 = homedir11();
   const userDir = resolve7(home2, ".switchroom");
   const searchPaths = [
     envPath ? resolve7(envPath) : null,
@@ -72632,7 +73430,7 @@ function numField(obj, key) {
 
 // gateway/context-occupancy.ts
 import { mkdirSync as mkdirSync23, writeFileSync as writeFileSync23 } from "node:fs";
-import { join as join33 } from "node:path";
+import { join as join34 } from "node:path";
 var CONTEXT_OCCUPANCY_FILENAME = "context-occupancy.json";
 var TIGHT_FRACTION = 0.8;
 function buildContextOccupancy(occupancy, cap, now) {
@@ -72655,7 +73453,7 @@ function buildContextOccupancy(occupancy, cap, now) {
 }
 function writeContextOccupancySnapshot(stateDir, snapshot, deps) {
   try {
-    const path2 = join33(stateDir, CONTEXT_OCCUPANCY_FILENAME);
+    const path2 = join34(stateDir, CONTEXT_OCCUPANCY_FILENAME);
     (deps?.mkdir ?? ((p, o) => mkdirSync23(p, o)))(stateDir, { recursive: true });
     (deps?.writeFile ?? ((p, d) => writeFileSync23(p, d)))(path2, JSON.stringify(snapshot, null, 2) + `
 `);
@@ -73150,12 +73948,12 @@ function startWebhookIngestServer(opts) {
 
 // ../src/web/webhook-gateway-record.ts
 import { appendFileSync as appendFileSync5, mkdirSync as mkdirSync26 } from "fs";
-import { join as join36 } from "path";
-import { homedir as homedir12 } from "os";
+import { join as join37 } from "path";
+import { homedir as homedir13 } from "os";
 
 // ../src/web/webhook-handler.ts
 import { appendFileSync as appendFileSync4, existsSync as existsSync31, mkdirSync as mkdirSync24, readFileSync as readFileSync29, writeFileSync as writeFileSync24 } from "fs";
-import { join as join34 } from "path";
+import { join as join35 } from "path";
 var DEDUP_MAX = 1000;
 var DEDUP_TTL_MS = 24 * 60 * 60 * 1000;
 function loadDedupFile(path2) {
@@ -73184,8 +73982,8 @@ var agentDedupCache = new Map;
 function createFileDedupStore(resolveAgentDir) {
   return {
     check(agent, deliveryId, now) {
-      const telegramDir = join34(resolveAgentDir(agent), "telegram");
-      const filePath = join34(telegramDir, "webhook-dedup.json");
+      const telegramDir = join35(resolveAgentDir(agent), "telegram");
+      const filePath = join35(telegramDir, "webhook-dedup.json");
       if (!agentDedupCache.has(agent)) {
         agentDedupCache.set(agent, loadDedupFile(filePath));
       }
@@ -73207,8 +74005,8 @@ var throttleIssueWindow = new Map;
 
 // ../src/web/webhook-dispatch.ts
 import { existsSync as existsSync32, mkdirSync as mkdirSync25, readFileSync as readFileSync30, writeFileSync as writeFileSync25 } from "fs";
-import { join as join35 } from "path";
-import { homedir as homedir11 } from "os";
+import { join as join36 } from "path";
+import { homedir as homedir12 } from "os";
 
 // ../src/agent-scheduler/ipc-client.ts
 import { createConnection as createConnection2 } from "node:net";
@@ -73527,8 +74325,8 @@ function createFileCooldownStore(resolveAgentDir) {
     isCoolingDown(agent, key, cooldownMs, now) {
       if (cooldownMs <= 0)
         return false;
-      const telegramDir = join35(resolveAgentDir(agent), "telegram");
-      const filePath = join35(telegramDir, "webhook-cooldown.json");
+      const telegramDir = join36(resolveAgentDir(agent), "telegram");
+      const filePath = join36(telegramDir, "webhook-cooldown.json");
       if (!cache.has(agent)) {
         cache.set(agent, loadCooldownFile(filePath));
       }
@@ -73585,9 +74383,9 @@ async function defaultInject(socketPath, agentName3, inbound) {
 }
 function injectWebhookInbound(agent, prompt, ctx, deps = {}) {
   const log = deps.log ?? ((s) => process.stderr.write(s));
-  const resolveAgentDir = deps.resolveAgentDir ?? ((a) => join35(homedir11(), ".switchroom", "agents", a));
+  const resolveAgentDir = deps.resolveAgentDir ?? ((a) => join36(homedir12(), ".switchroom", "agents", a));
   const now = (deps.now ?? Date.now)();
-  const socketPath = join35(resolveAgentDir(agent), "telegram", "gateway.sock");
+  const socketPath = join36(resolveAgentDir(agent), "telegram", "gateway.sock");
   const inbound = {
     type: "inbound",
     chatId: ctx.chatId,
@@ -73659,7 +74457,7 @@ function evaluateDispatch(args, deps = {}) {
   const log = deps.log ?? ((s) => process.stderr.write(s));
   const now = (deps.now ?? Date.now)();
   const nowDate = deps.nowDate ?? (() => new Date(now));
-  const resolveAgentDir = deps.resolveAgentDir ?? ((a) => join35(homedir11(), ".switchroom", "agents", a));
+  const resolveAgentDir = deps.resolveAgentDir ?? ((a) => join36(homedir12(), ".switchroom", "agents", a));
   const cooldownStore = deps.cooldownStore ?? createFileCooldownStore(resolveAgentDir);
   if (!DISPATCH_SOURCES.includes(args.source))
     return 0;
@@ -73737,10 +74535,10 @@ var CONSOLIDATION_COMPLETED_EVENT = "consolidation.completed";
 function recordWebhookEvent(rec, deps = {}) {
   const log = deps.log ?? ((s) => process.stderr.write(s));
   const now = rec.ts || (deps.now ?? Date.now)();
-  const resolveAgentDir = deps.resolveAgentDir ?? ((a) => join36(homedir12(), ".switchroom", "agents", a));
+  const resolveAgentDir = deps.resolveAgentDir ?? ((a) => join37(homedir13(), ".switchroom", "agents", a));
   const dedupStore = deps.dedupStore ?? createFileDedupStore(resolveAgentDir);
   const agent = rec.agent;
-  const telegramDir = join36(resolveAgentDir(agent), "telegram");
+  const telegramDir = join37(resolveAgentDir(agent), "telegram");
   if (rec.source === "github" && rec.delivery_id) {
     const originalTs = dedupStore.check(agent, rec.delivery_id, now);
     if (originalTs !== undefined) {
@@ -73749,7 +74547,7 @@ function recordWebhookEvent(rec, deps = {}) {
       return { status: "deduped", ts: originalTs };
     }
   }
-  const logPath = join36(telegramDir, "webhook-events.jsonl");
+  const logPath = join37(telegramDir, "webhook-events.jsonl");
   try {
     mkdirSync26(telegramDir, { recursive: true });
     const record = {
@@ -77197,17 +77995,17 @@ import {
   readFileSync as readFileSync31,
   writeSync as writeSync5
 } from "node:fs";
-import { join as join37 } from "node:path";
+import { join as join38 } from "node:path";
 import { randomUUID as randomUUID5 } from "node:crypto";
 var PROPOSALS_FILE2 = "skill-proposals.jsonl";
 var REJECTED_FILE2 = "skill-proposals-rejected.jsonl";
 var REJECTION_TTL_MS2 = 90 * 24 * 60 * 60 * 1000;
 var PROPOSAL_SIM_THRESHOLD = 0.5;
 function proposalsPath2(stateDir) {
-  return join37(stateDir, PROPOSALS_FILE2);
+  return join38(stateDir, PROPOSALS_FILE2);
 }
 function rejectedPath2(stateDir) {
-  return join37(stateDir, REJECTED_FILE2);
+  return join38(stateDir, REJECTED_FILE2);
 }
 function ensureDir3(stateDir) {
   if (!existsSync33(stateDir)) {
@@ -78702,17 +79500,17 @@ import {
   readdirSync as readdirSync6,
   readFileSync as readFileSync37
 } from "fs";
-import { join as join39 } from "path";
+import { join as join40 } from "path";
 
 // session-tail.ts
-function sanitizeCwdToProjectName(cwd) {
+function sanitizeCwdToProjectName2(cwd) {
   return cwd.replace(/[^a-zA-Z0-9]/g, "-");
 }
-var MAX_JSONL_LINE_BYTES = 2 * 1024 * 1024;
-var MAX_ERROR_TEXT_CHARS = 500;
-function extractToolResultErrorText(content3) {
+var MAX_JSONL_LINE_BYTES2 = 2 * 1024 * 1024;
+var MAX_ERROR_TEXT_CHARS2 = 500;
+function extractToolResultErrorText2(content3) {
   if (typeof content3 === "string") {
-    return content3.slice(0, MAX_ERROR_TEXT_CHARS);
+    return content3.slice(0, MAX_ERROR_TEXT_CHARS2);
   }
   if (Array.isArray(content3)) {
     const parts = [];
@@ -78725,11 +79523,11 @@ function extractToolResultErrorText(content3) {
       }
     }
     return parts.join(`
-`).slice(0, MAX_ERROR_TEXT_CHARS);
+`).slice(0, MAX_ERROR_TEXT_CHARS2);
   }
   return "";
 }
-function projectAssistantTextBlocks(content3, make) {
+function projectAssistantTextBlocks2(content3, make) {
   const out = new Map;
   let lastToolUseIdx = -1;
   content3.forEach((c, i) => {
@@ -78746,6 +79544,13 @@ function projectAssistantTextBlocks(content3, make) {
   });
   return out;
 }
+function sumUsageTokens2(usage) {
+  if (usage == null || typeof usage !== "object")
+    return 0;
+  const u = usage;
+  const n = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
+  return n(u.input_tokens) + n(u.output_tokens) + n(u.cache_creation_input_tokens);
+}
 function assistantLineCarriesAnswerSurface(content3) {
   if (!Array.isArray(content3))
     return false;
@@ -78805,7 +79610,7 @@ function projectSubagentLine(line, agentId, state4) {
           agentId,
           toolUseId: cc.tool_use_id ?? "",
           isError: isError2,
-          errorText: isError2 ? extractToolResultErrorText(cc.content) : undefined
+          errorText: isError2 ? extractToolResultErrorText2(cc.content) : undefined
         });
       }
     }
@@ -78821,7 +79626,17 @@ function projectSubagentLine(line, agentId, state4) {
     if (typeof subModel === "string" && !isModelSentinel(subModel)) {
       events.push({ kind: "sub_agent_model", agentId, model: subModel });
     }
-    const textEvents = projectAssistantTextBlocks(content3, (text4, blockIndex, lastInMessage) => ({
+    const subUsageTotal = sumUsageTokens2(message?.usage);
+    if (subUsageTotal > 0) {
+      const subMsgId = message?.id;
+      events.push({
+        kind: "sub_agent_usage",
+        agentId,
+        messageId: typeof subMsgId === "string" ? subMsgId : null,
+        totalTokens: subUsageTotal
+      });
+    }
+    const textEvents = projectAssistantTextBlocks2(content3, (text4, blockIndex, lastInMessage) => ({
       kind: "sub_agent_text",
       agentId,
       text: text4,
@@ -78945,7 +79760,7 @@ function sanitiseToolArg(name, raw) {
     case "NotebookEdit": {
       const fp = raw.file_path;
       if (typeof fp === "string" && fp.length > 0)
-        out = basename5(fp);
+        out = basename6(fp);
       break;
     }
     case "Bash": {
@@ -78981,7 +79796,7 @@ function sanitiseToolArg(name, raw) {
     out = out.slice(0, SANITISE_MAX_LEN - 1) + "\u2026";
   return out;
 }
-function basename5(p) {
+function basename6(p) {
   const idx = p.lastIndexOf("/");
   return idx === -1 ? p : p.slice(idx + 1);
 }
@@ -79185,10 +80000,10 @@ import {
   utimesSync,
   writeFileSync as writeFileSync29
 } from "node:fs";
-import { join as join38 } from "node:path";
+import { join as join39 } from "node:path";
 var TURN_ACTIVE_MARKER_FILE = "turn-active.json";
 function touchTurnActiveMarker(stateDir) {
-  const path2 = join38(stateDir, TURN_ACTIVE_MARKER_FILE);
+  const path2 = join39(stateDir, TURN_ACTIVE_MARKER_FILE);
   if (!existsSync34(path2))
     return;
   const now = new Date;
@@ -79355,6 +80170,7 @@ function readSubTail(entry, tail, now, onDescriptionUpdate, fs2, log, db2, paren
               },
               lastTool: entry.lastTool,
               toolCount: entry.toolCount,
+              totalTokens: entry.totalTokens,
               model: entry.currentModel,
               skeleton: true
             });
@@ -79436,6 +80252,7 @@ function readSubTail(entry, tail, now, onDescriptionUpdate, fs2, log, db2, paren
               },
               lastTool: entry.lastTool,
               toolCount: entry.toolCount,
+              totalTokens: entry.totalTokens,
               model: entry.currentModel
             });
             return true;
@@ -79546,6 +80363,15 @@ function readSubTail(entry, tail, now, onDescriptionUpdate, fs2, log, db2, paren
           }
           continue;
         }
+        if (ev.kind === "sub_agent_usage") {
+          if (ev.messageId == null) {
+            entry.totalTokens += ev.totalTokens;
+          } else if (!entry.seenUsageMessageIds.has(ev.messageId)) {
+            entry.seenUsageMessageIds.add(ev.messageId);
+            entry.totalTokens += ev.totalTokens;
+          }
+          continue;
+        }
         if (ev.kind === "sub_agent_tool_use") {
           const narrativeJustFired = resolvePendingSubNarrative(ev.toolName, ev.input);
           if (REPLY_TOOLS2.has(ev.toolName) && typeof ev.input?.text === "string") {
@@ -79574,6 +80400,7 @@ function readSubTail(entry, tail, now, onDescriptionUpdate, fs2, log, db2, paren
                   },
                   lastTool: entry.lastTool,
                   toolCount: entry.toolCount,
+                  totalTokens: entry.totalTokens,
                   progressLine: toolLine,
                   model: entry.currentModel
                 });
@@ -79648,7 +80475,7 @@ function readSubTail(entry, tail, now, onDescriptionUpdate, fs2, log, db2, paren
 }
 function startSubagentWatcher(config) {
   const agentDir = config.agentDir;
-  const expectedProjectSlug = config.agentCwd != null ? sanitizeCwdToProjectName(config.agentCwd) : null;
+  const expectedProjectSlug = config.agentCwd != null ? sanitizeCwdToProjectName2(config.agentCwd) : null;
   const extraWatchCwdsProvider = config.extraWatchCwdsProvider ?? null;
   const warnedForeignSlugs = new Set;
   const stallThresholdMs = config.stallThresholdMs ?? parseEnvMs("SWITCHROOM_SUBAGENT_STALL_MS") ?? DEFAULT_STALL_THRESHOLD_MS;
@@ -79713,6 +80540,8 @@ function startSubagentWatcher(config) {
       dispatchedAt: n,
       lastActivityAt: n,
       toolCount: 0,
+      totalTokens: 0,
+      seenUsageMessageIds: new Set,
       stallNotified: false,
       stalledAt: null,
       completionNotified: false,
@@ -79849,6 +80678,7 @@ function startSubagentWatcher(config) {
             state: entry.state,
             outcome: entry.errored ? "failed" : entry.historical ? "orphan" : "completed",
             toolCount: entry.toolCount,
+            totalTokens: entry.totalTokens,
             durationMs: nowFn() - entry.dispatchedAt,
             description: entry.description,
             resultText: entry.errored ? entry.lastResultText || entry.errorDetail || "" : entry.lastResultText,
@@ -79869,6 +80699,7 @@ function startSubagentWatcher(config) {
             state: entry.state,
             outcome: "failed",
             toolCount: entry.toolCount,
+            totalTokens: entry.totalTokens,
             durationMs: nowFn() - entry.dispatchedAt,
             description: entry.description,
             resultText: entry.lastResultText,
@@ -80125,8 +80956,8 @@ function startSubagentWatcher(config) {
     if (stopped)
       return;
     pruneVanishedDirWatchers();
-    const claudeHome = join39(agentDir, ".claude");
-    const projectsRoot = join39(claudeHome, "projects");
+    const claudeHome = join40(agentDir, ".claude");
+    const projectsRoot = join40(claudeHome, "projects");
     if (!fs2.existsSync(projectsRoot))
       return;
     let projectDirs;
@@ -80142,7 +80973,7 @@ function startSubagentWatcher(config) {
       if (extraWatchCwdsProvider != null) {
         try {
           for (const cwd of extraWatchCwdsProvider()) {
-            allowedSlugs.add(sanitizeCwdToProjectName(cwd));
+            allowedSlugs.add(sanitizeCwdToProjectName2(cwd));
           }
         } catch (err) {
           providerOk = false;
@@ -80160,7 +80991,7 @@ function startSubagentWatcher(config) {
         continue;
       }
       warnedForeignSlugs.delete(pDir);
-      const projectPath = join39(projectsRoot, pDir);
+      const projectPath = join40(projectsRoot, pDir);
       let sessionDirs;
       try {
         sessionDirs = fs2.readdirSync(projectPath);
@@ -80170,7 +81001,7 @@ function startSubagentWatcher(config) {
       for (const sDir of sessionDirs) {
         if (sDir.endsWith(".jsonl"))
           continue;
-        const subagentsPath = join39(projectPath, sDir, "subagents");
+        const subagentsPath = join40(projectPath, sDir, "subagents");
         if (!fs2.existsSync(subagentsPath))
           continue;
         const watchAndScan = (dirPath) => {
@@ -80179,7 +81010,7 @@ function startSubagentWatcher(config) {
               const w = fs2.watch(dirPath, (_event, filename) => {
                 if (!filename || !filename.toString().startsWith("agent-") || !filename.toString().endsWith(".jsonl"))
                   return;
-                const filePath = join39(dirPath, filename.toString());
+                const filePath = join40(dirPath, filename.toString());
                 if (!knownFiles.has(filePath)) {
                   scanSubagentsDir(dirPath);
                 }
@@ -80193,7 +81024,7 @@ function startSubagentWatcher(config) {
           scanSubagentsDir(dirPath);
         };
         watchAndScan(subagentsPath);
-        const workflowsPath = join39(subagentsPath, "workflows");
+        const workflowsPath = join40(subagentsPath, "workflows");
         if (fs2.existsSync(workflowsPath)) {
           let wfDirs;
           try {
@@ -80203,7 +81034,7 @@ function startSubagentWatcher(config) {
           }
           for (const wfDir of wfDirs) {
             try {
-              const wfPath = join39(workflowsPath, wfDir);
+              const wfPath = join40(workflowsPath, wfDir);
               if (!fs2.statSync(wfPath).isDirectory())
                 continue;
               watchAndScan(wfPath);
@@ -80223,7 +81054,7 @@ function startSubagentWatcher(config) {
     for (const e of entries) {
       if (!e.startsWith("agent-") || !e.endsWith(".jsonl"))
         continue;
-      const filePath = join39(subagentsPath, e);
+      const filePath = join40(subagentsPath, e);
       if (knownFiles.has(filePath))
         continue;
       const agentId = e.slice("agent-".length, -".jsonl".length);
@@ -80335,13 +81166,13 @@ import {
   existsSync as existsSync36,
   renameSync as renameSync15
 } from "node:fs";
-import { join as join40, resolve as resolve8 } from "node:path";
-import { homedir as homedir13 } from "node:os";
+import { join as join41, resolve as resolve8 } from "node:path";
+import { homedir as homedir14 } from "node:os";
 function registryDir() {
-  return resolve8(process.env.SWITCHROOM_WORKTREE_DIR ?? join40(homedir13(), ".switchroom", "worktrees"));
+  return resolve8(process.env.SWITCHROOM_WORKTREE_DIR ?? join41(homedir14(), ".switchroom", "worktrees"));
 }
 function recordPath(id) {
-  return join40(registryDir(), `${id}.json`);
+  return join41(registryDir(), `${id}.json`);
 }
 function ensureDir4() {
   mkdirSync29(registryDir(), { recursive: true });
@@ -80392,12 +81223,12 @@ function recordExists(id) {
 
 // worktree-watch-cwds.ts
 import { realpathSync as realpathSync3 } from "node:fs";
-import { basename as basename7 } from "node:path";
+import { basename as basename8 } from "node:path";
 var identityEscalated = false;
 function defaultDeriveName(agentDir) {
   if (!agentDir || agentDir.trim().length === 0)
     return "";
-  const leaf = basename7(agentDir).trim();
+  const leaf = basename8(agentDir).trim();
   return leaf;
 }
 function resolveOwnerIdentity(self, agentDir, deriveName) {
@@ -80520,14 +81351,14 @@ init_boot_card();
 
 // gateway/update-announce.ts
 import { existsSync as existsSync41, mkdirSync as mkdirSync33, openSync as openSync9, closeSync as closeSync9, readFileSync as readFileSync44 } from "node:fs";
-import { join as join45 } from "node:path";
-import { homedir as homedir15 } from "node:os";
+import { join as join46 } from "node:path";
+import { homedir as homedir16 } from "node:os";
 
 // ../src/host-control/audit-reader.ts
-import { homedir as homedir14 } from "node:os";
-import { join as join44 } from "node:path";
-function defaultAuditLogPath(home2 = homedir14()) {
-  return join44(home2, ".switchroom", "host-control-audit.log");
+import { homedir as homedir15 } from "node:os";
+import { join as join45 } from "node:path";
+function defaultAuditLogPath(home2 = homedir15()) {
+  return join45(home2, ".switchroom", "host-control-audit.log");
 }
 function parseAuditLine(line) {
   const trimmed = line.trim();
@@ -80712,15 +81543,15 @@ function renderUpdateOutcomeLine(entry) {
 `);
 }
 function claimUpdateAnnouncement(requestId, opts = {}) {
-  const stateDir = opts.stateDir ?? process.env.TELEGRAM_STATE_DIR ?? join45(homedir15(), ".switchroom");
-  const dir = join45(stateDir, "update-announced");
+  const stateDir = opts.stateDir ?? process.env.TELEGRAM_STATE_DIR ?? join46(homedir16(), ".switchroom");
+  const dir = join46(stateDir, "update-announced");
   try {
     mkdirSync33(dir, { recursive: true });
   } catch {
     return false;
   }
   const safeId = requestId.replace(/[^A-Za-z0-9_.-]/g, "_").slice(0, 200);
-  const path2 = join45(dir, safeId);
+  const path2 = join46(dir, safeId);
   try {
     const fd = openSync9(path2, "wx");
     closeSync9(fd);
@@ -80942,7 +81773,7 @@ function createIssuesCardHandle(opts) {
 
 // issues-watcher.ts
 import { existsSync as existsSync43, statSync as statSync12 } from "node:fs";
-import { join as join47 } from "node:path";
+import { join as join48 } from "node:path";
 
 // ../src/issues/store.ts
 import {
@@ -80958,7 +81789,7 @@ import {
   writeFileSync as writeFileSync36,
   writeSync as writeSync6
 } from "node:fs";
-import { join as join46 } from "node:path";
+import { join as join47 } from "node:path";
 import { randomBytes as randomBytes7 } from "node:crypto";
 import { execSync } from "node:child_process";
 
@@ -80977,7 +81808,7 @@ init_redact();
 var ISSUES_FILE = "issues.jsonl";
 var ISSUES_LOCK = "issues.lock";
 function readAll(stateDir) {
-  const path2 = join46(stateDir, ISSUES_FILE);
+  const path2 = join47(stateDir, ISSUES_FILE);
   if (!existsSync42(path2))
     return [];
   let raw;
@@ -81014,7 +81845,7 @@ function list2(stateDir, opts = {}) {
   });
 }
 function resolve9(stateDir, fingerprint, nowFn = Date.now) {
-  if (!existsSync42(join46(stateDir, ISSUES_FILE)))
+  if (!existsSync42(join47(stateDir, ISSUES_FILE)))
     return 0;
   return withLock(stateDir, () => {
     const all2 = readAll(stateDir);
@@ -81032,7 +81863,7 @@ function resolve9(stateDir, fingerprint, nowFn = Date.now) {
   });
 }
 function writeAll(stateDir, events) {
-  const path2 = join46(stateDir, ISSUES_FILE);
+  const path2 = join47(stateDir, ISSUES_FILE);
   sweepOrphanTmpFiles(stateDir);
   const tmp = `${path2}.tmp-${process.pid}-${randomBytes7(4).toString("hex")}`;
   const body = events.length === 0 ? "" : events.map((e) => JSON.stringify(e)).join(`
@@ -81054,7 +81885,7 @@ function sweepOrphanTmpFiles(stateDir) {
   for (const entry of entries) {
     if (!entry.startsWith(TMP_PREFIX))
       continue;
-    const tmpPath2 = join46(stateDir, entry);
+    const tmpPath2 = join47(stateDir, entry);
     try {
       const stat = statSync11(tmpPath2);
       if (stat.mtimeMs < cutoff) {
@@ -81066,7 +81897,7 @@ function sweepOrphanTmpFiles(stateDir) {
 var LOCK_RETRY_MS = 25;
 var LOCK_TIMEOUT_MS = 1e4;
 function withLock(stateDir, fn) {
-  const lockPath = join46(stateDir, ISSUES_LOCK);
+  const lockPath = join47(stateDir, ISSUES_LOCK);
   const startedAt = Date.now();
   let fd = null;
   while (fd === null) {
@@ -81151,7 +81982,7 @@ function isIssueEvent(v) {
 // issues-watcher.ts
 var DEFAULT_POLL_INTERVAL_MS2 = 2000;
 function startIssuesWatcher(opts) {
-  const path2 = join47(opts.stateDir, ISSUES_FILE);
+  const path2 = join48(opts.stateDir, ISSUES_FILE);
   const log = opts.log ?? (() => {});
   const intervalMs = opts.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS2;
   const setIntervalFn = opts.setInterval ?? setInterval;
@@ -81213,10 +82044,10 @@ function defaultReadEvents(stateDir) {
 }
 // permission-title.ts
 init_card_format();
-import { basename as basename9 } from "node:path";
+import { basename as basename10 } from "node:path";
 
 // permission-rule.ts
-import { basename as basename8 } from "node:path";
+import { basename as basename9 } from "node:path";
 var FILE_TOOLS = new Set([
   "Edit",
   "Write",
@@ -81294,7 +82125,7 @@ function skillBasenameFromPath(input) {
   if (!path2)
     return null;
   const trimmed = path2.replace(/\/SKILL\.md$/i, "").replace(/\/$/, "");
-  return basename8(trimmed) || null;
+  return basename9(trimmed) || null;
 }
 function matchesAllowRule(rule, toolName, inputPreview) {
   if (!rule || !toolName)
@@ -81586,11 +82417,11 @@ function describeGrant(toolName, inputPreview, option) {
       return m ? `run ${m[1]} commands` : "run that command";
     }
     if (t === "Edit" || t === "MultiEdit" || t === "NotebookEdit")
-      return `edit ${basename9(arg)}`;
+      return `edit ${basename10(arg)}`;
     if (t === "Write")
-      return `write ${basename9(arg)}`;
+      return `write ${basename10(arg)}`;
     if (t === "Read")
-      return `read ${basename9(arg)}`;
+      return `read ${basename10(arg)}`;
     return naturalAction(toolName, inputPreview);
   }
   switch (rule) {
@@ -81629,12 +82460,12 @@ function fileBase(input, rawPreview) {
   if (input) {
     const p = readString2(input, "file_path") ?? readString2(input, "notebook_path");
     if (p)
-      return basename9(p);
+      return basename10(p);
   }
   if (rawPreview) {
     const p = extractFilePathFromRaw2(rawPreview);
     if (p)
-      return basename9(p);
+      return basename10(p);
   }
   return null;
 }
@@ -81765,7 +82596,7 @@ function truncate6(text4, max) {
 }
 
 // permission-rule.ts
-import { basename as basename10 } from "node:path";
+import { basename as basename11 } from "node:path";
 var FILE_TOOLS2 = new Set([
   "Edit",
   "Write",
@@ -81897,14 +82728,14 @@ function skillBasenameFromPath3(input) {
   if (!path2)
     return null;
   const trimmed = path2.replace(/\/SKILL\.md$/i, "").replace(/\/$/, "");
-  return basename10(trimmed) || null;
+  return basename11(trimmed) || null;
 }
 function isRulePersisted(resolvedAllow, ruleRule) {
   return resolvedAllow.includes(ruleRule);
 }
 
 // scoped-approval.ts
-import { basename as basename11 } from "node:path";
+import { basename as basename12 } from "node:path";
 var SCOPED_APPROVAL_DEFAULT_TTL_MS = 30 * 60 * 1000;
 function scopedApprovalTtlMs(env = process.env) {
   const raw = env.SWITCHROOM_SCOPED_APPROVAL_TTL_MS;
@@ -81929,7 +82760,7 @@ function resolveTimeBox(toolName, inputPreview, choices) {
   const fileMatch = FILE_RULE.exec(rule);
   if (fileMatch) {
     const verb = fileMatch[1] === "Read" ? "reads of" : "edits to";
-    return { rule, breadth: `${verb} ${basename11(fileMatch[2])}` };
+    return { rule, breadth: `${verb} ${basename12(fileMatch[2])}` };
   }
   const bashMatch = BASH_FAMILY_RULE.exec(rule);
   if (bashMatch) {
@@ -82030,7 +82861,7 @@ function readBashCommand(inputPreview) {
 
 // gateway/scoped-grant-store.ts
 import { readFileSync as readFileSync47, writeFileSync as writeFileSync37 } from "node:fs";
-import { join as join48 } from "node:path";
+import { join as join49 } from "node:path";
 
 // scoped-approval.ts
 var SCOPED_APPROVAL_DEFAULT_TTL_MS2 = 30 * 60 * 1000;
@@ -82072,7 +82903,7 @@ function scopedGrantPersistEnabled(env = process.env) {
   return env.SWITCHROOM_SCOPED_GRANT_PERSIST !== "0";
 }
 function createScopedGrantStore(stateDir, env = process.env) {
-  const filePath = join48(stateDir, "scoped-grants.json");
+  const filePath = join49(stateDir, "scoped-grants.json");
   const enabled8 = scopedGrantPersistEnabled(env);
   function read() {
     try {
@@ -82446,7 +83277,7 @@ function isDiffPreApproved(agentName3, unifiedDiff, deps) {
 // credits-watch.ts
 init_card_format();
 import { readFileSync as readFileSync48, writeFileSync as writeFileSync38, existsSync as existsSync44, mkdirSync as mkdirSync35 } from "fs";
-import { join as join49 } from "path";
+import { join as join50 } from "path";
 var STATE_FILE = "credits-watch.json";
 var DEFAULT_CREDIT_FATAL_REASONS = new Set;
 var KNOWN_CREDIT_REASONS = [
@@ -82468,7 +83299,7 @@ function emptyCreditState() {
   return { lastNotifiedReason: null, lastNotifiedAt: 0 };
 }
 function readClaudeJsonOverage(claudeConfigDir) {
-  const path2 = join49(claudeConfigDir, ".claude.json");
+  const path2 = join50(claudeConfigDir, ".claude.json");
   if (!existsSync44(path2))
     return null;
   let raw;
@@ -82551,7 +83382,7 @@ function humanizeReason(reason) {
   }
 }
 function loadCreditState(stateDir) {
-  const path2 = join49(stateDir, STATE_FILE);
+  const path2 = join50(stateDir, STATE_FILE);
   if (!existsSync44(path2))
     return emptyCreditState();
   try {
@@ -82568,7 +83399,7 @@ function loadCreditState(stateDir) {
 }
 function saveCreditState(stateDir, state4) {
   mkdirSync35(stateDir, { recursive: true });
-  const path2 = join49(stateDir, STATE_FILE);
+  const path2 = join50(stateDir, STATE_FILE);
   writeFileSync38(path2, JSON.stringify(state4, null, 2) + `
 `, { mode: 384 });
 }
@@ -82577,7 +83408,7 @@ function saveCreditState(stateDir, state4) {
 init_auth_snapshot_format();
 init_card_format();
 import { readFileSync as readFileSync49, writeFileSync as writeFileSync39, existsSync as existsSync45, mkdirSync as mkdirSync36 } from "fs";
-import { join as join50 } from "path";
+import { join as join51 } from "path";
 var STATE_FILE2 = "quota-watch.json";
 function emptyQuotaWatchState() {
   return {};
@@ -82815,7 +83646,7 @@ function buildRecoveryMessage(agentName3, snap) {
 `);
 }
 function loadQuotaWatchState(stateDir) {
-  const path2 = join50(stateDir, STATE_FILE2);
+  const path2 = join51(stateDir, STATE_FILE2);
   if (!existsSync45(path2))
     return emptyQuotaWatchState();
   try {
@@ -82837,7 +83668,7 @@ function loadQuotaWatchState(stateDir) {
 }
 function saveQuotaWatchState(stateDir, state4) {
   mkdirSync36(stateDir, { recursive: true });
-  const path2 = join50(stateDir, STATE_FILE2);
+  const path2 = join51(stateDir, STATE_FILE2);
   writeFileSync39(path2, JSON.stringify(state4, null, 2) + `
 `, { mode: 384 });
 }
@@ -82895,17 +83726,17 @@ import {
   utimesSync as utimesSync2,
   writeFileSync as writeFileSync40
 } from "node:fs";
-import { join as join51 } from "node:path";
+import { join as join52 } from "node:path";
 var TURN_ACTIVE_MARKER_FILE2 = "turn-active.json";
 function writeTurnActiveMarker(stateDir, marker) {
   try {
     mkdirSync37(stateDir, { recursive: true });
-    writeFileSync40(join51(stateDir, TURN_ACTIVE_MARKER_FILE2), JSON.stringify(marker, null, 2) + `
+    writeFileSync40(join52(stateDir, TURN_ACTIVE_MARKER_FILE2), JSON.stringify(marker, null, 2) + `
 `, { mode: 384 });
   } catch {}
 }
 function touchTurnActiveMarker2(stateDir) {
-  const path2 = join51(stateDir, TURN_ACTIVE_MARKER_FILE2);
+  const path2 = join52(stateDir, TURN_ACTIVE_MARKER_FILE2);
   if (!existsSync46(path2))
     return;
   const now = new Date;
@@ -82920,11 +83751,11 @@ function touchTurnActiveMarker2(stateDir) {
 }
 function removeTurnActiveMarker(stateDir) {
   try {
-    unlinkSync21(join51(stateDir, TURN_ACTIVE_MARKER_FILE2));
+    unlinkSync21(join52(stateDir, TURN_ACTIVE_MARKER_FILE2));
   } catch {}
 }
 function sweepStaleTurnActiveMarker(stateDir, opts) {
-  const path2 = join51(stateDir, TURN_ACTIVE_MARKER_FILE2);
+  const path2 = join52(stateDir, TURN_ACTIVE_MARKER_FILE2);
   if (!existsSync46(path2))
     return false;
   const now = opts.now ?? Date.now();
@@ -82955,7 +83786,7 @@ function sweepStaleTurnActiveMarker(stateDir, opts) {
   }
 }
 function readTurnActiveMarkerAgeMs(stateDir, now) {
-  const path2 = join51(stateDir, TURN_ACTIVE_MARKER_FILE2);
+  const path2 = join52(stateDir, TURN_ACTIVE_MARKER_FILE2);
   try {
     const st = statSync13(path2);
     return (now ?? Date.now()) - st.mtimeMs;
@@ -82965,10 +83796,10 @@ function readTurnActiveMarkerAgeMs(stateDir, now) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.18.24";
-var COMMIT_SHA = "f641363e";
-var COMMIT_DATE = "2026-07-14T15:55:33+10:00";
-var LATEST_PR = 3240;
+var VERSION = "0.18.26";
+var COMMIT_SHA = "ceb7d1a9";
+var COMMIT_DATE = "2026-07-15T11:05:52Z";
+var LATEST_PR = 3258;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -83045,12 +83876,12 @@ init_protocol();
 init_peercred();
 import * as net5 from "node:net";
 import * as fs2 from "node:fs";
-import { homedir as homedir16 } from "node:os";
-import { join as join52 } from "node:path";
+import { homedir as homedir17 } from "node:os";
+import { join as join53 } from "node:path";
 var DEFAULT_TIMEOUT_MS4 = 2000;
 var UNLOCK_TIMEOUT_MS = 30000;
-var LEGACY_SOCKET_PATH2 = join52(homedir16(), ".switchroom", "vault-broker.sock");
-var OPERATOR_SOCKET_PATH2 = join52(homedir16(), ".switchroom", "broker-operator", "sock");
+var LEGACY_SOCKET_PATH2 = join53(homedir17(), ".switchroom", "vault-broker.sock");
+var OPERATOR_SOCKET_PATH2 = join53(homedir17(), ".switchroom", "broker-operator", "sock");
 function defaultBrokerSocketPath2() {
   if (fs2.existsSync(OPERATOR_SOCKET_PATH2))
     return OPERATOR_SOCKET_PATH2;
@@ -83933,7 +84764,7 @@ function resolveVaultApprovalPosture(broker) {
 
 // registry/turns-schema.ts
 import { chmodSync as chmodSync10, mkdirSync as mkdirSync38 } from "fs";
-import { join as join53 } from "path";
+import { join as join54 } from "path";
 var DatabaseClass2 = null;
 function loadDatabaseClass2() {
   if (DatabaseClass2 != null)
@@ -83984,12 +84815,16 @@ var PHASE2_MIGRATIONS = [
 var PHASE3_MIGRATIONS = [
   `ALTER TABLE turns ADD COLUMN resumed_at INTEGER`
 ];
+var PHASE4_MIGRATIONS = [
+  `ALTER TABLE turns ADD COLUMN session_id TEXT`,
+  `ALTER TABLE turns ADD COLUMN answer_redelivered_at INTEGER`
+];
 function applySchema(db2) {
   db2.exec("PRAGMA journal_mode = WAL");
   db2.exec("PRAGMA synchronous = NORMAL");
   db2.exec("PRAGMA busy_timeout = 5000");
   db2.exec(SCHEMA_SQL);
-  for (const sql of [...PHASE1_MIGRATIONS, ...PHASE2_MIGRATIONS, ...PHASE3_MIGRATIONS]) {
+  for (const sql of [...PHASE1_MIGRATIONS, ...PHASE2_MIGRATIONS, ...PHASE3_MIGRATIONS, ...PHASE4_MIGRATIONS]) {
     try {
       db2.exec(sql);
     } catch (err) {
@@ -84001,9 +84836,9 @@ function applySchema(db2) {
 }
 function openTurnsDb(agentDir) {
   const Database = loadDatabaseClass2();
-  const dir = join53(agentDir, "telegram");
+  const dir = join54(agentDir, "telegram");
   mkdirSync38(dir, { recursive: true, mode: 448 });
-  const path2 = join53(dir, "registry.db");
+  const path2 = join54(dir, "registry.db");
   const db2 = new Database(path2, { create: true });
   applySchema(db2);
   try {
@@ -84032,6 +84867,8 @@ function mapRow(row) {
     tool_call_count: row.tool_call_count,
     interrupt_reason: row.interrupt_reason,
     resumed_at: row.resumed_at,
+    session_id: row.session_id ?? null,
+    answer_redelivered_at: row.answer_redelivered_at ?? null,
     created_at: row.created_at,
     updated_at: row.updated_at
   };
@@ -84127,6 +84964,24 @@ function markTurnResumed(db2, turnKey2, now = Date.now()) {
     WHERE turn_key = ? AND resumed_at IS NULL
   `).run(now, now, turnKey2);
 }
+function stampTurnSessionId(db2, turnKey2, sessionId, now = Date.now()) {
+  if (!sessionId)
+    return;
+  db2.prepare(`
+    UPDATE turns
+    SET session_id = ?,
+        updated_at = ?
+    WHERE turn_key = ? AND session_id IS NULL
+  `).run(sessionId, now, turnKey2);
+}
+function markAnswerRedelivered(db2, turnKey2, now = Date.now()) {
+  db2.prepare(`
+    UPDATE turns
+    SET answer_redelivered_at = ?,
+        updated_at            = ?
+    WHERE turn_key = ? AND answer_redelivered_at IS NULL
+  `).run(now, now, turnKey2);
+}
 function findLatestTurnIfInterrupted(db2) {
   const row = db2.prepare(`
     SELECT * FROM turns
@@ -84756,7 +85611,7 @@ installGlobalErrorHandlers();
 process.on("beforeExit", () => {
   shutdownAnalytics();
 });
-var STATE_DIR = process.env.TELEGRAM_STATE_DIR ?? join54(homedir17(), ".claude", "channels", "telegram");
+var STATE_DIR = process.env.TELEGRAM_STATE_DIR ?? join55(homedir18(), ".claude", "channels", "telegram");
 var permCardStore = createPermissionCardStore(STATE_DIR);
 var BLOCKED_APPROVALS_DIR = process.env.SWITCHROOM_BLOCKED_APPROVALS_DIR ?? "/state/blocked-approvals";
 var AGENT_NAME = process.env.SWITCHROOM_AGENT_NAME ?? "agent";
@@ -84856,11 +85711,11 @@ function scheduleAlwaysAllowPersistDrain() {
   }, ALWAYS_ALLOW_DRAIN_INTERVAL_MS);
   timer3.unref?.();
 }
-var ACCESS_FILE = join54(STATE_DIR, "access.json");
-var APPROVED_DIR = join54(STATE_DIR, "approved");
-var ENV_FILE = join54(STATE_DIR, ".env");
-var INBOX_DIR = join54(STATE_DIR, "inbox");
-var PEOPLE_FILE = join54(STATE_DIR, "people.json");
+var ACCESS_FILE = join55(STATE_DIR, "access.json");
+var APPROVED_DIR = join55(STATE_DIR, "approved");
+var ENV_FILE = join55(STATE_DIR, ".env");
+var INBOX_DIR = join55(STATE_DIR, "inbox");
+var PEOPLE_FILE = join55(STATE_DIR, "people.json");
 function triggerSelfRestart(targetAgent, reason, delayMs = 300) {
   const isDocker = process.env.SWITCHROOM_RUNTIME === "docker";
   const selfAgent = process.env.SWITCHROOM_AGENT_NAME;
@@ -85057,7 +85912,7 @@ function assertSendable(f) {
   } catch {
     throw new Error(`refusing to send file \u2014 cannot resolve real path: ${f}`);
   }
-  const inbox = join54(stateReal, "inbox");
+  const inbox = join55(stateReal, "inbox");
   if (real.startsWith(stateReal + sep3) && !real.startsWith(inbox + sep3)) {
     throw new Error(`refusing to send channel state: ${f}`);
   }
@@ -85182,7 +86037,7 @@ var HISTORY_ENABLED = HISTORY_ACCESS.historyEnabled !== false;
 if (HISTORY_ENABLED) {
   try {
     initHistory(STATE_DIR, HISTORY_ACCESS.historyRetentionDays ?? 30);
-    process.stderr.write(`telegram gateway: history capture enabled at ${join54(STATE_DIR, "history.db")}
+    process.stderr.write(`telegram gateway: history capture enabled at ${join55(STATE_DIR, "history.db")}
 `);
   } catch (err) {
     process.stderr.write(`telegram gateway: history init failed (${err.message}) \u2014 capture disabled
@@ -85191,6 +86046,7 @@ if (HISTORY_ENABLED) {
 }
 var turnsDb = null;
 var bootResumeInbound = null;
+var pendingRedelivery = null;
 var bridgeDeadPriorStreak = 0;
 try {
   const agentDir = STATE_DIR.endsWith("/telegram") ? STATE_DIR.slice(0, -"/telegram".length) : STATE_DIR;
@@ -85199,7 +86055,7 @@ try {
   let markerTurnKey = null;
   let markerAgeMs = null;
   try {
-    const markerPath = join54(STATE_DIR, TURN_ACTIVE_MARKER_FILE2);
+    const markerPath = join55(STATE_DIR, TURN_ACTIVE_MARKER_FILE2);
     if (existsSync50(markerPath)) {
       const st = statSync16(markerPath);
       markerAgeMs = Date.now() - st.mtimeMs;
@@ -85224,10 +86080,10 @@ try {
     process.stderr.write(`telegram gateway: turn-registry boot-reaper stamped ${reaped} orphaned turn(s)${timeoutTurnKey ? ` (turnKey=${timeoutTurnKey} as 'timeout', markerAgeMs=${markerAgeMs})` : " as 'restart'"}
 `);
   } else {
-    process.stderr.write(`telegram gateway: turn-registry initialized at ${join54(agentDir, "telegram", "registry.db")}
+    process.stderr.write(`telegram gateway: turn-registry initialized at ${join55(agentDir, "telegram", "registry.db")}
 `);
   }
-  const bridgeDeadMarker = consumeBridgeDeadEscalationMarker(join54(STATE_DIR, "bridge-dead-escalation.json"));
+  const bridgeDeadMarker = consumeBridgeDeadEscalationMarker(join55(STATE_DIR, "bridge-dead-escalation.json"));
   if (bridgeDeadMarker != null) {
     bridgeDeadPriorStreak = bridgeDeadMarker.count ?? 1;
     process.stderr.write(`telegram gateway: boot: prior restart was a bridge-dead escalation (reason=${bridgeDeadMarker.reason}, consecutive=${bridgeDeadPriorStreak}${bridgeDeadMarker.crashTail ? `, crashTail=${bridgeDeadMarker.crashTail}` : ""})
@@ -85240,7 +86096,7 @@ try {
   const pending2 = findLatestTurnIfInterrupted(turnsDb);
   const selfAgent = process.env.SWITCHROOM_AGENT_NAME ?? "";
   if (pending2 != null && selfAgent) {
-    const bootResumeMarkerPath = process.env.SWITCHROOM_GATEWAY_CLEAN_SHUTDOWN_MARKER ?? join54(STATE_DIR, "clean-shutdown.json");
+    const bootResumeMarkerPath = process.env.SWITCHROOM_GATEWAY_CLEAN_SHUTDOWN_MARKER ?? join55(STATE_DIR, "clean-shutdown.json");
     const bootResumeCleanMarker = readCleanShutdownMarker(bootResumeMarkerPath);
     const bootResumeForceAlways = process.env.SWITCHROOM_BOOT_RESUME_ALWAYS === "1";
     const bootResumeMode = parseBootResumeMode(process.env.SWITCHROOM_BOOT_RESUME);
@@ -85258,6 +86114,19 @@ try {
       ageMs: Math.max(0, Date.now() - pending2.started_at),
       maxAgeMs: RESUME_MAX_AGE_MS
     });
+    const redeliverCapture = decideRedeliverCapture({
+      willBeResumed: bootResumeKind === "resume",
+      hasSessionId: Boolean(pending2.session_id)
+    });
+    if (redeliverCapture.capture) {
+      pendingRedelivery = { turn: pending2, maxAgeMs: RESUME_MAX_AGE_MS };
+    } else if (redeliverCapture.skipReason === "will-be-resumed") {
+      process.stderr.write(`telegram gateway: crash-redelivery suppressed \u2014 interrupted turnKey=${pending2.turn_key} will be RESUMED (bootResumeKind=resume); the fresh re-answer supersedes the recovered draft (no double-send)
+`);
+    } else {
+      process.stderr.write(`telegram gateway: crash-redelivery skipped \u2014 interrupted turnKey=${pending2.turn_key} has no pinned session_id (pre-feature turn or no session event seen); cannot resolve exact transcript
+`);
+    }
     let interruptedSubagents = [];
     try {
       interruptedSubagents = listNonTerminalSubagentsForTurn(turnsDb, pending2.turn_key).map((s) => ({ agentType: s.agent_type, description: s.description, status: s.status }));
@@ -85340,7 +86209,7 @@ try {
 `);
     }
   }
-  const pendingEnvPath = join54(agentDir, ".pending-turn.env");
+  const pendingEnvPath = join55(agentDir, ".pending-turn.env");
   try {
     if (pending2 != null) {
       const lines = [
@@ -85396,6 +86265,10 @@ function resolveSubagentOriginChat(agentId) {
 var WORKER_FEED_FALLBACK_LOG_CAP = 256;
 var WORKER_FEED_STALE_TTL_MARGIN_MS = 300000;
 var WORKER_FEED_ABSOLUTE_ROW_LIFETIME_CAP_MULTIPLE = 4;
+var WORKER_FEED_GROUP_MESSAGE_LIFETIME_CAP_MS = (() => {
+  const v = Number(process.env.SWITCHROOM_WORKER_FEED_GROUP_MESSAGE_LIFETIME_CAP_MS);
+  return Number.isFinite(v) && v > 0 ? v : 3600000;
+})();
 var workerFeedOwnerDmFallbackLogged = new Set;
 function resolveWorkerFeedChat(agentId, fleetChatId) {
   const origin = resolveSubagentOriginChat(agentId);
@@ -85458,7 +86331,7 @@ function checkApprovals() {
     return;
   }
   for (const senderId of files) {
-    const file = join54(APPROVED_DIR, senderId);
+    const file = join55(APPROVED_DIR, senderId);
     bot.api.sendMessage(senderId, "Paired! Say hi to Claude.").then(() => rmSync6(file, { force: true }), (err) => {
       process.stderr.write(`telegram gateway: failed to send approval confirm: ${err}
 `);
@@ -85563,7 +86436,7 @@ function noteAgentOutputAt(key, ts) {
       lastAgentOutputAt.delete(oldest);
   }
 }
-var OBLIGATION_STORE_PATH = join54(STATE_DIR, "obligations.json");
+var OBLIGATION_STORE_PATH = join55(STATE_DIR, "obligations.json");
 var obligationStoreFs = {
   readFileSync: (p) => readFileSync54(p, "utf8"),
   writeFileSync: (p, d) => writeFileSync43(p, d),
@@ -85678,6 +86551,7 @@ var pendingRestarts = new Map;
 var pendingSessionCommand = createPendingSessionCommandSlots();
 var PENDING_CMD_DRAIN_CAP_MS = 60000;
 var lastSessionActiveFile = null;
+var lastSessionStampedTurnKey = null;
 var compactState = initialCompactState();
 var compactDispatching = false;
 var COMPACT_CARD_TIMEOUT_MS = 900000;
@@ -87891,7 +88765,7 @@ var statusPinState = new Map;
 var statusPinChatIds = new Map;
 var statusPinPinnedAt = new Map;
 var statusPinRightsCache = new PinRightsCache2;
-var STATUS_PIN_STORE_PATH = join54(STATE_DIR, "status-pins.json");
+var STATUS_PIN_STORE_PATH = join55(STATE_DIR, "status-pins.json");
 var statusPinStoreFs = {
   readFileSync: (p) => readFileSync54(p, "utf8"),
   writeFileSync: (p, d) => writeFileSync43(p, d),
@@ -87899,7 +88773,7 @@ var statusPinStoreFs = {
   existsSync: (p) => existsSync50(p)
 };
 var statusPinPersistEnabled = !STATIC && PIN_STATUS_WHILE_WORKING;
-var ACTIVITY_CARD_STORE_PATH = join54(STATE_DIR, "activity-cards-pending.json");
+var ACTIVITY_CARD_STORE_PATH = join55(STATE_DIR, "activity-cards-pending.json");
 var activityCardStoreFs = {
   readFileSync: (p) => readFileSync54(p, "utf8"),
   writeFileSync: (p, d) => writeFileSync43(p, d),
@@ -87907,7 +88781,7 @@ var activityCardStoreFs = {
   existsSync: (p) => existsSync50(p)
 };
 var activityCardPersistEnabled = !STATIC;
-var QUEUED_CARD_STORE_PATH = join54(STATE_DIR, "queued-cards-pending.json");
+var QUEUED_CARD_STORE_PATH = join55(STATE_DIR, "queued-cards-pending.json");
 var queuedCardStoreFs = {
   readFileSync: (p) => readFileSync54(p, "utf8"),
   writeFileSync: (p, d) => writeFileSync43(p, d),
@@ -88261,11 +89135,11 @@ var getPinnedProgressCardMessageId = null;
 var completeProgressCardTurn = null;
 var subagentWatcher = null;
 var workerActivityFeed = null;
-var SOCKET_PATH = process.env.SWITCHROOM_GATEWAY_SOCKET ?? join54(STATE_DIR, "gateway.sock");
+var SOCKET_PATH = process.env.SWITCHROOM_GATEWAY_SOCKET ?? join55(STATE_DIR, "gateway.sock");
 mkdirSync40(STATE_DIR, { recursive: true, mode: 448 });
-var GATEWAY_PID_PATH = process.env.SWITCHROOM_GATEWAY_PID_FILE ?? join54(STATE_DIR, "gateway.pid.json");
-var GATEWAY_SESSION_MARKER_PATH = process.env.SWITCHROOM_GATEWAY_SESSION_MARKER ?? join54(STATE_DIR, "gateway-session.json");
-var GATEWAY_CLEAN_SHUTDOWN_MARKER_PATH = process.env.SWITCHROOM_GATEWAY_CLEAN_SHUTDOWN_MARKER ?? join54(STATE_DIR, "clean-shutdown.json");
+var GATEWAY_PID_PATH = process.env.SWITCHROOM_GATEWAY_PID_FILE ?? join55(STATE_DIR, "gateway.pid.json");
+var GATEWAY_SESSION_MARKER_PATH = process.env.SWITCHROOM_GATEWAY_SESSION_MARKER ?? join55(STATE_DIR, "gateway-session.json");
+var GATEWAY_CLEAN_SHUTDOWN_MARKER_PATH = process.env.SWITCHROOM_GATEWAY_CLEAN_SHUTDOWN_MARKER ?? join55(STATE_DIR, "clean-shutdown.json");
 var GATEWAY_STARTED_AT_MS = Date.now();
 var BOOT_CARD_ENABLED = process.env.SWITCHROOM_BOOT_CARD !== "false";
 var activeBootCard = null;
@@ -88294,7 +89168,7 @@ function ensureIssuesCard(chatId, threadId) {
     bot: botApi,
     log: (msg) => process.stderr.write(`telegram gateway: ${msg}
 `),
-    persistPath: join54(stateDir, "issues-card.json")
+    persistPath: join55(stateDir, "issues-card.json")
   });
   activeIssuesWatcher = startIssuesWatcher({
     stateDir,
@@ -88625,7 +89499,7 @@ startTimer2({
   }
 });
 var inboundSpool = STATIC ? undefined : createInboundSpool({
-  path: join54(STATE_DIR, "inbound-spool.jsonl"),
+  path: join55(STATE_DIR, "inbound-spool.jsonl"),
   fs: {
     appendFileSync: (p, d) => appendFileSync6(p, d),
     readFileSync: (p) => readFileSync54(p, "utf8"),
@@ -88760,6 +89634,88 @@ async function deliverCapturedProse(args) {
     }
   }
 }
+async function maybeRedeliverUndeliveredAnswer() {
+  const candidate = pendingRedelivery;
+  pendingRedelivery = null;
+  if (candidate == null || turnsDb == null)
+    return;
+  const { turn, maxAgeMs } = candidate;
+  const sessionId = turn.session_id;
+  if (!sessionId)
+    return;
+  let transcriptText;
+  try {
+    const projectsDir = getProjectsDirForCwd();
+    const path2 = join55(projectsDir, `${sessionId}.jsonl`);
+    if (!existsSync50(path2)) {
+      process.stderr.write(`telegram gateway: crash-redelivery \u2014 transcript not found for turnKey=${turn.turn_key} session=${sessionId} (${path2}); skipping
+`);
+      return;
+    }
+    transcriptText = readFileSync54(path2, "utf8");
+  } catch (err) {
+    process.stderr.write(`telegram gateway: crash-redelivery \u2014 transcript read failed turnKey=${turn.turn_key}: ${err.message}
+`);
+    return;
+  }
+  const projected = projectTrailingAnswerFromTranscript(transcriptText);
+  const threadIdNum2 = turn.thread_id != null && turn.thread_id !== "" ? Number(turn.thread_id) : undefined;
+  const threadIdForOracle = threadIdNum2 != null && Number.isFinite(threadIdNum2) ? threadIdNum2 : null;
+  const decision = decideRedeliver({
+    capturedText: projected.text,
+    trailingIsText: projected.trailingIsText,
+    hasDeliveredText: HISTORY_ENABLED ? hasOutboundWithText(turn.chat_id, projected.text, threadIdForOracle, turn.started_at) : false,
+    alreadyRedelivered: turn.answer_redelivered_at != null,
+    ageMs: Math.max(0, Date.now() - turn.started_at),
+    maxAgeMs
+  });
+  if (!decision.redeliver || decision.framedText == null) {
+    process.stderr.write(`telegram gateway: crash-redelivery skipped turnKey=${turn.turn_key} reason=${decision.skipReason ?? "unknown"}
+`);
+    return;
+  }
+  const chatId = turn.chat_id;
+  const out = redactOutboundText(decision.framedText, "crash_redelivery");
+  const chunks = splitMarkdownChunks2(out, RICH_MESSAGE_MAX_CHARS2);
+  const sentIds = [];
+  try {
+    let liveThreadId = threadIdNum2 != null && Number.isFinite(threadIdNum2) ? threadIdNum2 : undefined;
+    for (const c of chunks) {
+      const sent = await retryWithThreadFallback2(robustApiCall, (tid) => {
+        const opts = {
+          link_preview_options: { is_disabled: true },
+          ...tid != null ? { message_thread_id: tid } : {}
+        };
+        return bot.api.sendRichMessage(chatId, richMessage2(c), opts);
+      }, { threadId: liveThreadId, chat_id: chatId, verb: "crash-redelivery.sendMessage" });
+      if (liveThreadId != null && sent.message_thread_id == null) {
+        liveThreadId = undefined;
+      }
+      sentIds.push(sent.message_id);
+    }
+    if (HISTORY_ENABLED && sentIds.length > 0) {
+      try {
+        recordOutbound({
+          chat_id: chatId,
+          thread_id: threadIdForOracle,
+          message_ids: sentIds,
+          texts: chunks
+        });
+      } catch {}
+    }
+    try {
+      markAnswerRedelivered(turnsDb, turn.turn_key);
+    } catch (err) {
+      process.stderr.write(`telegram gateway: crash-redelivery markAnswerRedelivered failed turnKey=${turn.turn_key}: ${err.message}
+`);
+    }
+    process.stderr.write(`telegram gateway: crash-redelivery \u2014 delivered recovered answer (${out.length} chars, ${chunks.length} chunk(s)) for turnKey=${turn.turn_key} chat=${chatId}
+`);
+  } catch (err) {
+    process.stderr.write(`telegram gateway: crash-redelivery send failed turnKey=${turn.turn_key}: ${err.message} ` + `\u2014 left un-stamped for a later retry
+`);
+  }
+}
 function obligationSweep() {
   if (!OBLIGATION_LEDGER_ENABLED)
     return;
@@ -88919,8 +89875,8 @@ var bridgeDeadWatchdog = createBridgeDeadWatchdog({
   isSessionAlive: () => findAgentProcessInContainer2()?.comm === "claude",
   isShuttingDown: () => shuttingDown,
   escalate: (reason) => triggerSelfRestart(process.env.SWITCHROOM_AGENT_NAME ?? "", reason, 1500),
-  crashLogPath: join54(STATE_DIR, "bridge-crash.log"),
-  markerPath: join54(STATE_DIR, "bridge-dead-escalation.json"),
+  crashLogPath: join55(STATE_DIR, "bridge-crash.log"),
+  markerPath: join55(STATE_DIR, "bridge-dead-escalation.json"),
   log: (line) => process.stderr.write(`${line}
 `),
   priorStreak: bridgeDeadPriorStreak,
@@ -89047,8 +90003,8 @@ var ipcServer = createIpcServer({
             probeQuotaViaBroker: (t) => probeQuotaForBootCard(agentSlug, t),
             tmuxSupervisor: process.env.SWITCHROOM_TMUX_SUPERVISOR === "1",
             dockerMode: process.env.SWITCHROOM_RUNTIME === "docker",
-            configSnapshotPath: join54(resolvedAgentDirForCard, ".config-snapshot.json"),
-            bootCardStatePath: join54(resolvedAgentDirForCard, ".boot-card-msgid.json"),
+            configSnapshotPath: join55(resolvedAgentDirForCard, ".config-snapshot.json"),
+            bootCardStatePath: join55(resolvedAgentDirForCard, ".boot-card-msgid.json"),
             floodStatePath: FLOOD_STATE_PATH,
             ...updateOutcomeLine ? { updateOutcomeLine } : {}
           }, ackMsgId).then((handle) => {
@@ -89133,6 +90089,21 @@ var ipcServer = createIpcServer({
       return;
     if (msg.activeFile)
       lastSessionActiveFile = msg.activeFile;
+    if (turnsDb != null && msg.activeFile != null) {
+      const stampKey = currentTurn?.registryKey ?? null;
+      if (stampKey != null && stampKey !== lastSessionStampedTurnKey) {
+        const sessionId = basename13(msg.activeFile).replace(/\.jsonl$/, "");
+        if (sessionId) {
+          try {
+            stampTurnSessionId(turnsDb, stampKey, sessionId);
+            lastSessionStampedTurnKey = stampKey;
+          } catch (err) {
+            process.stderr.write(`telegram gateway: stampTurnSessionId failed turnKey=${stampKey}: ${err.message}
+`);
+          }
+        }
+      }
+    }
     const ev = msg.event;
     handleSessionEvent(ev);
     toolFlightTracker.onEvent(ev);
@@ -89715,7 +90686,7 @@ var ipcServer = createIpcServer({
     const receiverUid = receiverUidRaw ? Number(receiverUidRaw) : NaN;
     if (Number.isInteger(receiverUid))
       allowedUids.push(receiverUid);
-    const socketPath = join54(STATE_DIR, "webhook.sock");
+    const socketPath = join55(STATE_DIR, "webhook.sock");
     const webhookInject = (agentName3, inbound) => {
       const msg = inbound;
       const delivered = ipcServer.sendToAgent(agentName3, msg);
@@ -89950,9 +90921,9 @@ function redactOutboundText(text5, site) {
 var VOICE_OUT_DEFAULT_CHUNK_CHARS = 600;
 var VOICE_OUT_HARD_CHUNK_CAP = 4096;
 var voiceOnDemandCache = new VoiceOnDemandCache({
-  persistPath: join54(STATE_DIR, "voice-ondemand.json")
+  persistPath: join55(STATE_DIR, "voice-ondemand.json")
 });
-var VOICE_CACHE_DIR = join54(STATE_DIR, "voice-cache");
+var VOICE_CACHE_DIR = join55(STATE_DIR, "voice-cache");
 var voicePreSynthQueue = new PreSynthQueue({
   runJob: async (job) => {
     const sidecarToken = await materializeSidecarToken();
@@ -90931,7 +91902,7 @@ async function executeSendGif(rawArgs) {
   };
 }
 async function publishToTelegraph(text5, shortName, authorName) {
-  const accountPath = join54(STATE_DIR, "telegraph-account.json");
+  const accountPath = join55(STATE_DIR, "telegraph-account.json");
   let account = null;
   try {
     if (existsSync50(accountPath)) {
@@ -91854,7 +92825,8 @@ function composeTurnActivity(turn, final = false, liveSuffix = "") {
     elapsedMs: turn.startedAt > 0 ? Date.now() - turn.startedAt : 0,
     toolCount: turn.labeledToolCount,
     state: final ? "done" : "running",
-    model: turn.currentModel
+    model: turn.currentModel,
+    totalTokens: turn.totalTokens
   };
   return renderActivityFeedWithNested2(turn.mirrorLines, childLines, final, liveSuffix, stepCount, header);
 }
@@ -92315,6 +93287,8 @@ function handleSessionEvent(ev) {
           lastAssistantDone: false,
           toolCallCount: 0,
           labeledToolCount: 0,
+          totalTokens: 0,
+          seenUsageMessageIds: new Set,
           activityMessageId: null,
           activityInFlight: null,
           activityPendingRender: null,
@@ -92388,6 +93362,18 @@ function handleSessionEvent(ev) {
       sessionModelSource.noteTranscriptModel(ev.model);
       return;
     }
+    case "usage": {
+      const turn = currentTurn;
+      if (turn == null)
+        return;
+      if (ev.messageId != null) {
+        if (turn.seenUsageMessageIds.has(ev.messageId))
+          return;
+        turn.seenUsageMessageIds.add(ev.messageId);
+      }
+      turn.totalTokens += ev.totalTokens;
+      return;
+    }
     case "thinking": {
       const turn = currentTurn;
       if (turn == null)
@@ -94258,7 +95244,7 @@ function getMyAgentName() {
   const fromEnv = process.env.SWITCHROOM_AGENT_NAME;
   if (fromEnv && fromEnv.trim().length > 0)
     return fromEnv.trim();
-  return basename12(process.cwd());
+  return basename13(process.cwd());
 }
 function isSelfTargetingCommand(name) {
   if (name === "all")
@@ -94271,7 +95257,7 @@ function restartMarkerPath() {
   const agentDir = resolveAgentDirFromEnv();
   if (!agentDir)
     return null;
-  return join54(agentDir, "restart-pending.json");
+  return join55(agentDir, "restart-pending.json");
 }
 function writeRestartMarker(marker) {
   const p = restartMarkerPath();
@@ -94463,7 +95449,7 @@ function _resetDockerReachableCache() {
 }
 function spawnSwitchroomDetached(args, onFailure) {
   const fullArgs = SWITCHROOM_CONFIG ? ["--config", SWITCHROOM_CONFIG, ...args] : args;
-  const logPath = join54(STATE_DIR, "detached-spawn.log");
+  const logPath = join55(STATE_DIR, "detached-spawn.log");
   let outFd = null;
   try {
     mkdirSync40(STATE_DIR, { recursive: true });
@@ -94861,7 +95847,7 @@ bot.use(async (ctx, next) => {
 });
 function readRecentDenialsForAgent(agentName3, windowMs, limit) {
   try {
-    const auditPath = join54(homedir17(), ".switchroom", "vault-audit.log");
+    const auditPath = join55(homedir18(), ".switchroom", "vault-audit.log");
     if (!existsSync50(auditPath))
       return [];
     const raw = readFileSync54(auditPath, "utf8");
@@ -94915,7 +95901,7 @@ async function buildAgentMetadata(agentName3) {
   try {
     const agentDir = resolveAgentDirFromEnv();
     if (agentDir) {
-      const raw = readFileSync54(join54(agentDir, ".claude", ".claude.json"), "utf8");
+      const raw = readFileSync54(join55(agentDir, ".claude", ".claude.json"), "utf8");
       claudeJson = JSON.parse(raw);
     }
   } catch {}
@@ -95111,7 +96097,7 @@ function buildModelDeps(restartCtx) {
       try {
         const agentDir = resolveAgentDirFromEnv();
         if (agentDir) {
-          const local = await fetchQuota2({ claudeConfigDir: join54(agentDir, ".claude") });
+          const local = await fetchQuota2({ claudeConfigDir: join55(agentDir, ".claude") });
           if (local.ok)
             return formatQuotaLine2(local.data);
         }
@@ -95583,7 +96569,7 @@ bot.command("restart", async (ctx) => {
 function flushAgentHandoff(agentDir) {
   let removed = 0;
   for (const fname of [".handoff.md", ".handoff-topic"]) {
-    const p = join54(agentDir, fname);
+    const p = join55(agentDir, fname);
     try {
       if (existsSync50(p)) {
         unlinkSync24(p);
@@ -95641,7 +96627,7 @@ async function handleNewCommand(ctx) {
   writeRestartMarker({ chat_id: chatId, thread_id: threadId ?? null, ack_message_id: ackId, ts: Date.now() });
   if (agentDir != null) {
     try {
-      writeFileSync43(join54(agentDir, ".force-fresh-session"), `${kind} at ${new Date().toISOString()}
+      writeFileSync43(join55(agentDir, ".force-fresh-session"), `${kind} at ${new Date().toISOString()}
 `, "utf8");
     } catch (err) {
       process.stderr.write(`telegram gateway: failed to write force-fresh marker: ${err}
@@ -96011,7 +96997,7 @@ var lockoutOps = {
   writeFileSync: (p, data, opts) => writeFileSync43(p, data, opts),
   existsSync: (p) => existsSync50(p),
   mkdirSync: (p, opts) => mkdirSync40(p, opts),
-  joinPath: (...parts) => join54(...parts)
+  joinPath: (...parts) => join55(...parts)
 };
 var FLEET_FALLBACK_DEDUP_MS = 30000;
 function isAuthBrokerSocketReachable() {
@@ -96271,7 +97257,7 @@ async function runCreditWatch() {
   if (!agentDir)
     return;
   const agentName3 = getMyAgentName();
-  const claudeConfigDir = join54(agentDir, ".claude");
+  const claudeConfigDir = join55(agentDir, ".claude");
   const stateDir = STATE_DIR;
   const reason = readClaudeJsonOverage(claudeConfigDir);
   const prev = loadCreditState(stateDir);
@@ -97283,7 +98269,7 @@ bot.command("usage", async (ctx) => {
     await switchroomReply(ctx, "**/usage:** cannot resolve agent dir.", { html: true });
     return;
   }
-  const result = await fetchQuota2({ claudeConfigDir: join54(agentDir, ".claude") });
+  const result = await fetchQuota2({ claudeConfigDir: join55(agentDir, ".claude") });
   if (!result.ok) {
     await switchroomReply(ctx, `**/usage:** ${escapeHtmlForTg2(result.reason)}`, { html: true });
     return;
@@ -99171,6 +100157,10 @@ var didOneTimeSetup = false;
           process.stderr.write(`telegram gateway: blocked-approval boot reconcile failed: ${err.message}
 `);
         }
+        maybeRedeliverUndeliveredAnswer().catch((err) => {
+          process.stderr.write(`telegram gateway: crash-redelivery boot send errored: ${err.message}
+`);
+        });
         try {
           const bootAccess = loadAccess();
           const chatSet = new Set(bootAccess.allowFrom);
@@ -99268,7 +100258,7 @@ var didOneTimeSetup = false;
                         return;
                       }
                     })();
-                    const resolvedAgentDirForBootCard = agentDir ?? join54(homedir17(), ".switchroom", "agents", agentSlug);
+                    const resolvedAgentDirForBootCard = agentDir ?? join55(homedir18(), ".switchroom", "agents", agentSlug);
                     const handle = await startBootCard(chatId, threadId, botApiForCard, {
                       agentName: agentDisplayName,
                       agentSlug,
@@ -99282,8 +100272,8 @@ var didOneTimeSetup = false;
                       probeQuotaViaBroker: (t) => probeQuotaForBootCard(agentSlug, t),
                       tmuxSupervisor: process.env.SWITCHROOM_TMUX_SUPERVISOR === "1",
                       dockerMode: process.env.SWITCHROOM_RUNTIME === "docker",
-                      configSnapshotPath: join54(resolvedAgentDirForBootCard, ".config-snapshot.json"),
-                      bootCardStatePath: join54(resolvedAgentDirForBootCard, ".boot-card-msgid.json"),
+                      configSnapshotPath: join55(resolvedAgentDirForBootCard, ".config-snapshot.json"),
+                      bootCardStatePath: join55(resolvedAgentDirForBootCard, ".boot-card-msgid.json"),
                       floodStatePath: FLOOD_STATE_PATH,
                       ...updateOutcomeLine ? { updateOutcomeLine } : {}
                     }, ackMsgId);
@@ -99314,7 +100304,7 @@ var didOneTimeSetup = false;
         try {
           const smAgentDir = resolveAgentDirFromEnv();
           if (smAgentDir) {
-            const activePath = join54(smAgentDir, ".active-session-model");
+            const activePath = join55(smAgentDir, ".active-session-model");
             if (existsSync50(activePath)) {
               try {
                 const launched = readFileSync54(activePath, "utf8").trim();
@@ -99326,7 +100316,7 @@ var didOneTimeSetup = false;
                 sessionModelSource.setOverride(launched.length > 0 && launched !== configured ? launched : null);
               } catch {}
             }
-            const activeEffortPath = join54(smAgentDir, ".active-session-effort");
+            const activeEffortPath = join55(smAgentDir, ".active-session-effort");
             if (existsSync50(activeEffortPath)) {
               try {
                 const launchedEffort = readFileSync54(activeEffortPath, "utf8").trim();
@@ -99334,7 +100324,7 @@ var didOneTimeSetup = false;
                 sessionEffortOverride = launchedEffort.length > 0 && launchedEffort !== configuredEffort ? launchedEffort : null;
               } catch {}
             }
-            const alertPath = join54(smAgentDir, ".session-model-alert");
+            const alertPath = join55(smAgentDir, ".session-model-alert");
             if (existsSync50(alertPath)) {
               let alertText = null;
               try {
@@ -99463,6 +100453,7 @@ var didOneTimeSetup = false;
               maxRows: workerFeedMaxRows,
               staleWorkerTtlMs: resolveInflightTerminalCapMs() + WORKER_FEED_STALE_TTL_MARGIN_MS,
               absoluteRowLifetimeCapMs: resolveInflightTerminalCapMs() * WORKER_FEED_ABSOLUTE_ROW_LIFETIME_CAP_MULTIPLE,
+              groupMessageLifetimeCapMs: WORKER_FEED_GROUP_MESSAGE_LIFETIME_CAP_MS,
               reconcilePin: ({ feedKey, chatId, messageId }) => {
                 if (!PIN_STATUS_WHILE_WORKING)
                   return;
@@ -99516,7 +100507,7 @@ var didOneTimeSetup = false;
 `);
                 }
               },
-              onFinish: ({ agentId, outcome, description, resultText, toolCount, durationMs, background: entryBackground }) => {
+              onFinish: ({ agentId, outcome, description, resultText, toolCount, totalTokens, durationMs, background: entryBackground }) => {
                 deferredDoneReactions.promote();
                 let fleetChatId = "";
                 try {
@@ -99544,6 +100535,7 @@ var didOneTimeSetup = false;
                       description: dispatch.feedDescription,
                       lastTool: null,
                       toolCount,
+                      totalTokens,
                       latestSummary: resultText,
                       elapsedMs: durationMs,
                       state: outcome === "failed" ? "failed" : "done",
@@ -99591,6 +100583,7 @@ var didOneTimeSetup = false;
                       description: dispatch.feedDescription,
                       lastTool: null,
                       toolCount,
+                      totalTokens,
                       latestSummary: resultText,
                       elapsedMs: durationMs,
                       state: outcome === "failed" ? "failed" : "done",
@@ -99604,6 +100597,7 @@ var didOneTimeSetup = false;
                     description: dispatch.feedDescription,
                     lastTool: null,
                     toolCount,
+                    totalTokens,
                     latestSummary: resultText,
                     elapsedMs: durationMs,
                     state: outcome === "failed" ? "failed" : "done",
@@ -99644,7 +100638,7 @@ var didOneTimeSetup = false;
                 process.stderr.write(`telegram gateway: subagent-handback queued agent=${agentId} outcome=${outcome} chat=${decision.chatId} resultChars=${resultText.length}
 `);
               },
-              onProgress: ({ agentId, description, latestSummary, elapsedMs, prevBucketIdx, setBucketIdx, lastTool, toolCount, progressLine, model, skeleton }) => {
+              onProgress: ({ agentId, description, latestSummary, elapsedMs, prevBucketIdx, setBucketIdx, lastTool, toolCount, totalTokens, progressLine, model, skeleton }) => {
                 let fleetChatId = "";
                 try {
                   const fleets = progressDriver?.peekAllFleets() ?? [];
@@ -99681,7 +100675,8 @@ var didOneTimeSetup = false;
                       latestSummary: stepLine,
                       elapsedMs,
                       state: "running",
-                      model: feedModel
+                      model: feedModel,
+                      totalTokens
                     }, wk.threadId);
                     return;
                   }
@@ -99742,7 +100737,8 @@ var didOneTimeSetup = false;
                     latestSummary: stepLine,
                     elapsedMs,
                     state: "running",
-                    model: feedModel
+                    model: feedModel,
+                    totalTokens
                   }, wk.threadId);
                   return;
                 }