switchroom 0.15.2 → 0.15.4

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

@@ -23936,7 +23936,8 @@ var init_schema = __esm(() => {
     stream_mode: exports_external.enum(["pty", "checklist"]).optional().describe("How live progress is streamed to Telegram during a turn. " + "'pty' (default) surfaces text snapshots of Claude Code's TUI \u2014 " + "compatible but can flicker as Ink re-renders. 'checklist' drives " + "a structured progress card from session-tail events \u2014 stable " + "order, per-tool status emojis, fires only on semantic transitions."),
     stream_throttle_ms: exports_external.number().int().nonnegative().optional().describe("Throttle window in ms between successive stream edits (or " + "sendMessageDraft tics) during a turn. Lower = more responsive " + "stream, higher = fewer API calls. Floored at 250 by draft-stream " + "itself. Default 300 for draft transport (DMs) and 1000 for " + "message transport (groups/forums). Override per-agent if a " + "particular agent needs snappier or quieter streaming."),
     clear_status_on_completion: exports_external.boolean().optional().describe("When true, the live activity/status feed (the in-place 'what it's " + "doing' message \u2014 Reading X, Searching the web for Y, \u2026) is DELETED " + "when the turn's final answer lands, so only the reply remains. " + "Default false: the status message is left in the chat as a record " + "(its last step marked done) \u2014 no post-then-delete. Per-agent " + "override; cascades defaults \u2192 profile \u2192 agent (per-key)."),
-    hotReloadStable: exports_external.boolean().optional().describe("If true, the stable workspace prefix (AGENTS.md, SOUL.md, USER.md, " + "IDENTITY.md, TOOLS.md, HEARTBEAT.md) is re-injected on every turn via " + "the UserPromptSubmit hook instead of baked into --append-system-prompt " + "at session start. Lets workspace edits propagate without a restart. " + "Costs ~5-10% per-turn latency/spend since the stable prefix is no " + "longer prompt-cached."),
+    hotReloadStable: exports_external.boolean().optional().describe("If true, the stable workspace prefix (AGENTS.md, SOUL.md, USER.md, " + "IDENTITY.md, TOOLS.md) is re-injected on every turn via " + "the UserPromptSubmit hook instead of baked into --append-system-prompt " + "at session start. Lets workspace edits propagate without a restart. " + "Costs ~5-10% per-turn latency/spend since the stable prefix is no " + "longer prompt-cached."),
+    inject_on_change: exports_external.boolean().optional().describe("Context-efficiency gate for per-turn hook injection (default true). " + "When true (the default), the turn-pacing directive and dynamic " + "workspace content are only re-emitted when their content changes or " + "the session_id changes \u2014 suppressing redundant injection that " + "otherwise triples compaction frequency. Set to false to revert to " + "the legacy always-emit behaviour (every turn injects the full " + "content regardless of whether it changed)."),
     orphan_promotion_ms: exports_external.number().int().nonnegative().optional().describe("How long (ms) a parent turn waits for a sub-agent JSONL watcher " + "to deliver sub_agent_started before the heartbeat promotes the spawn " + "to a synthesised 'running' row. Default 5000. Set to 0 to disable " + "orphan promotion entirely."),
     cold_sub_agent_threshold_ms: exports_external.number().int().nonnegative().optional().describe("JSONL-cold threshold (ms). When a running sub-agent emits no events " + "for this long, the heartbeat synthesises a turn_end for it so the " + "deferred-completion path can proceed. Default 30000. Set to 0 to " + "disable the synthetic close."),
     deferred_completion_timeout_ms: exports_external.number().int().nonnegative().optional().describe("Force-close timeout (ms) for deferred sub-agent completion. After " + "the parent turn_end arrives while sub-agents are still running, the " + "card is force-closed after this many ms even if sub-agents never " + "finish. Watcher-disconnect safety net. Default 180000 (3 min)."),
@@ -42942,7 +42943,8 @@ function formatAuthLine(auth) {
 function formatAgentLine(meta) {
   const m = meta.model && meta.model.length > 0 ? meta.model : "default";
   const topic = meta.topicName ? ` \u00b7 topic: ${escapeHtml6([meta.topicEmoji, meta.topicName].filter(Boolean).join(" "))}` : "";
-  return `<b>${escapeHtml6(meta.agentName)}</b> \u00b7 model: <code>${escapeHtml6(m)}</code>${topic}`;
+  const session = meta.sessionModel && meta.sessionModel.length > 0 ? ` \u00b7 live session: <code>${escapeHtml6(meta.sessionModel)}</code>` : "";
+  return `<b>${escapeHtml6(meta.agentName)}</b> \u00b7 model: <code>${escapeHtml6(m)}</code>${session}${topic}`;
 }
 function startText(agentName3, dmDisabled) {
   if (dmDisabled)
@@ -44328,6 +44330,10 @@ async function fetchQuota2(opts) {
   }
   return parsed;
 }
+function formatQuotaLine2(q) {
+  const fmt = (n) => `${Math.round(n)}%`;
+  return `${fmt(q.fiveHourUtilizationPct)} / 5h \u00b7 ${fmt(q.sevenDayUtilizationPct)} / 7d`;
+}
 function formatResetRelative2(target, now = new Date) {
   if (!target)
     return "\u2014";
@@ -44399,6 +44405,22 @@ var TOKEN_VALIDITY_MS2 = 365 * 24 * 60 * 60000;
 // ../src/agents/inject.ts
 import { execFile, execFileSync } from "node:child_process";
 import { promisify } from "node:util";
+
+// ../src/agents/pane-lock.ts
+var tails = new Map;
+function withPaneLock(key, fn) {
+  const tail = tails.get(key) ?? Promise.resolve();
+  const run2 = tail.then(() => fn());
+  const next = run2.then(() => {}, () => {});
+  tails.set(key, next);
+  next.then(() => {
+    if (tails.get(key) === next)
+      tails.delete(key);
+  });
+  return run2;
+}
+
+// ../src/agents/inject.ts
 var execFileAsync = promisify(execFile);
 var INJECT_COMMANDS = new Map([
   ["/cost", { description: "Show session cost", expectsOutput: true }],
@@ -44548,13 +44570,13 @@ async function injectSlashCommand(agentName3, command, opts = {}) {
   const session = opts.sessionName ?? agentName3;
   const settleMs = opts.settleMs ?? 2000;
   const timeoutMs = opts.timeoutMs ?? 5000;
-  return injectSlashCommandWith(makeTmuxRunner(tmuxBin), {
+  return withPaneLock(`${socket}:${session}`, () => injectSlashCommandWith(makeTmuxRunner(tmuxBin), {
     socket,
     session,
     command: command.trim(),
     settleMs,
     timeoutMs
-  });
+  }));
 }
 async function injectSlashCommandWith(runner, args) {
   const { socket, session, command, settleMs, timeoutMs } = args;
@@ -44685,6 +44707,34 @@ var INJECT_BLOCKED2 = new Map([
   ["/quit", { reason: "would kill the agent process" }]
 ]);
 var INJECT_BLOCKLIST2 = new Set(INJECT_BLOCKED2.keys());
+function makeTmuxRunner2(tmuxBin) {
+  return {
+    capture(socket, session) {
+      try {
+        return execFileSync2(tmuxBin, ["-L", socket, "capture-pane", "-p", "-t", session, "-S", "-200"], { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+      } catch {
+        return null;
+      }
+    },
+    send(socket, session, args) {
+      const [subcmd, ...rest] = args;
+      const flagEnd = rest.findIndex((a) => !a.startsWith("-"));
+      const flagsBeforeKeys = flagEnd === -1 ? rest : rest.slice(0, flagEnd);
+      const keys = flagEnd === -1 ? [] : rest.slice(flagEnd);
+      execFileSync2(tmuxBin, ["-L", socket, subcmd, ...flagsBeforeKeys, "-t", session, ...keys], { stdio: ["pipe", "pipe", "pipe"] });
+    },
+    hasSession(socket, session) {
+      try {
+        execFileSync2(tmuxBin, ["-L", socket, "has-session", "-t", session], {
+          stdio: ["pipe", "pipe", "pipe"]
+        });
+        return true;
+      } catch {
+        return false;
+      }
+    }
+  };
+}
 
 // stream-reply-handler.ts
 function buildAccentHeader2(accent) {
@@ -44815,6 +44865,16 @@ Allowed: <code>${deps.escapeHtml(allow)}</code>`, { html: true });
   await deps.reply(ctx, finalText, { html: true, accent });
 }
 
+// ../src/agents/model-picker.ts
+function labelTag(label) {
+  let h = 2166136261;
+  for (const ch of label) {
+    h ^= ch.codePointAt(0);
+    h = Math.imul(h, 16777619) >>> 0;
+  }
+  return h.toString(16).padStart(8, "0");
+}
+
 // gateway/model-command.ts
 var MODEL_ALIASES = ["opus", "sonnet", "haiku", "default"];
 var MODEL_ARG_RE = /^[A-Za-z0-9][A-Za-z0-9._\[\]-]{0,99}$/;
@@ -44914,6 +44974,325 @@ async function handleModelCommand(parsed, deps) {
     html: true
   };
 }
+var MODEL_CALLBACK_PREFIX = "mdl:";
+var MODEL_CALLBACK_SELECT = "mdl:s:";
+var MODEL_CALLBACK_REFRESH = "mdl:r";
+function modelSelectCallbackData(label) {
+  return `${MODEL_CALLBACK_SELECT}${labelTag(label)}`;
+}
+function busyReply(deps) {
+  return {
+    text: "\u23f3 The agent is mid-turn \u2014 the model picker needs an idle prompt. Try again in a moment.",
+    html: true
+  };
+}
+function menuKeyboard(options) {
+  const rows = options.map((o) => [
+    {
+      text: o.current ? `\u2705 ${o.label}` : o.label,
+      callback_data: modelSelectCallbackData(o.label)
+    }
+  ]);
+  rows.push([{ text: "\uD83D\uDD04 Refresh", callback_data: MODEL_CALLBACK_REFRESH }]);
+  return rows;
+}
+async function buildModelMenu(deps) {
+  if (deps.isBusy())
+    return busyReply(deps);
+  const [discovered, quota] = await Promise.all([
+    deps.discover(deps.getAgentName()),
+    deps.getQuotaBrief().catch(() => null)
+  ]);
+  if (!discovered.ok) {
+    const v1 = await handleModelCommand({ kind: "show" }, deps);
+    return {
+      text: [`<i>(picker unavailable: ${deps.escapeHtml(discovered.reason)})</i>`, v1.text].join(`
+`),
+      html: true
+    };
+  }
+  const current = discovered.options.find((o) => o.current);
+  const lines = [`<b>Model \u2014 ${deps.escapeHtml(deps.getAgentName())}</b>`];
+  if (discovered.dismissFailed) {
+    lines.push("\u26a0\ufe0f <i>The picker may still be open on the agent pane \u2014 check it before switching.</i>");
+  }
+  if (current) {
+    const detail = current.detail ? ` \u00b7 ${deps.escapeHtml(current.detail)}` : "";
+    lines.push(`Default (new sessions): <b>${deps.escapeHtml(current.label)}</b>${detail}`);
+  } else {
+    lines.push("Default (new sessions): <i>unknown (no \u2714 row in picker)</i>");
+  }
+  if (quota)
+    lines.push(`Quota: ${deps.escapeHtml(quota)}`);
+  lines.push("", "Tap a model to switch the <b>live session</b>:");
+  lines.push(PERSIST_NOTE);
+  return { text: lines.join(`
+`), html: true, keyboard: menuKeyboard(discovered.options) };
+}
+async function handleModelMenuCallback(data, deps) {
+  if (data === MODEL_CALLBACK_REFRESH) {
+    return { answer: "Refreshed", reply: await buildModelMenu(deps) };
+  }
+  if (!data.startsWith(MODEL_CALLBACK_SELECT)) {
+    return { answer: "Unknown action", reply: await buildModelMenu(deps) };
+  }
+  if (deps.isBusy()) {
+    return {
+      answer: "\u23f3 Agent is mid-turn \u2014 tap again when it\u2019s idle",
+      reply: busyReply(deps),
+      toastOnly: true
+    };
+  }
+  const tag = data.slice(MODEL_CALLBACK_SELECT.length);
+  const discovered = await deps.discover(deps.getAgentName());
+  if (!discovered.ok) {
+    return {
+      answer: "Picker unavailable",
+      reply: await menuWithBanner(deps, `\u274c Could not open the model picker: ${deps.escapeHtml(discovered.reason)}`)
+    };
+  }
+  const target = discovered.options.find((o) => labelTag(o.label) === tag);
+  if (!target) {
+    const fresh = await buildModelMenu(deps);
+    return { answer: "Model list changed \u2014 menu refreshed", reply: fresh };
+  }
+  const result = await deps.select(deps.getAgentName(), target.label);
+  if (!result.ok) {
+    return {
+      answer: "Switch failed \u2014 see the menu",
+      reply: await menuWithBanner(deps, `\u274c Switch to <b>${deps.escapeHtml(target.label)}</b> failed: ${deps.escapeHtml(result.reason)}`)
+    };
+  }
+  return {
+    answer: deps.escapeHtml(result.confirmation),
+    reply: await menuWithBanner(deps, `\u2705 ${deps.escapeHtml(result.confirmation)}`),
+    selectedModel: sessionModelFromConfirmation(result.confirmation) ?? target.label
+  };
+}
+function sessionModelFromConfirmation(confirmation) {
+  const m = /(?:Set model to|Switched to)\s+(.+?)(?:\s+for (?:this|the) session|\s*\(|\s*$)/i.exec(confirmation.trim());
+  const name = m?.[1]?.trim();
+  return name && name.length > 0 ? name : null;
+}
+async function menuWithBanner(deps, banner) {
+  const fresh = await buildModelMenu(deps);
+  return {
+    text: [banner, "", fresh.text].join(`
+`),
+    html: true,
+    ...fresh.keyboard ? { keyboard: fresh.keyboard } : {}
+  };
+}
+
+// ../src/agents/model-picker.ts
+var HEADER_RE = /Select model/;
+var OPTION_RE = /^\s*(\u276f)?\s*(\d+)\.\s+(.*)$/;
+var FOOTER_RE = /Esc to cancel/i;
+var EFFORT_RE = /^\s*\u25cb\s/;
+function parseModelPicker(pane) {
+  const lines = pane.split(`
+`);
+  let headerIdx = -1;
+  for (let i = lines.length - 1;i >= 0; i--) {
+    if (HEADER_RE.test(lines[i])) {
+      headerIdx = i;
+      break;
+    }
+  }
+  if (headerIdx < 0)
+    return null;
+  const options = [];
+  let cursorIndex = -1;
+  let footerSeen = false;
+  for (let i = headerIdx + 1;i < lines.length; i++) {
+    const raw = lines[i];
+    if (FOOTER_RE.test(raw)) {
+      footerSeen = true;
+      break;
+    }
+    if (EFFORT_RE.test(raw))
+      continue;
+    const m = OPTION_RE.exec(raw);
+    if (m) {
+      const index = Number(m[2]);
+      const rest = m[3].trimEnd();
+      const gap = rest.search(/\s{2,}/);
+      let label = (gap >= 0 ? rest.slice(0, gap) : rest).trim();
+      const detail = gap >= 0 ? rest.slice(gap).trim() : "";
+      let current = false;
+      if (/[\u2714\u2713]$/.test(label)) {
+        current = true;
+        label = label.replace(/\s*[\u2714\u2713]$/, "").trim();
+      }
+      if (label.length === 0)
+        continue;
+      options.push({ index, label, detail, current });
+      if (m[1])
+        cursorIndex = index;
+      continue;
+    }
+    if (options.length > 0 && /^\s{4,}\S/.test(raw)) {
+      const last = options[options.length - 1];
+      last.detail = `${last.detail} ${raw.trim()}`.trim();
+      continue;
+    }
+  }
+  if (options.length === 0)
+    return null;
+  return { options, cursorIndex, footerSeen };
+}
+var realSleep = (ms) => new Promise((r) => setTimeout(r, ms));
+function makeIo(agentName3, opts) {
+  return {
+    runner: opts._runner ?? makeTmuxRunner2(opts.tmuxBin ?? "tmux"),
+    socket: opts.socketName ?? `switchroom-${agentName3}`,
+    session: opts.sessionName ?? agentName3,
+    stepMs: opts.stepMs ?? 600,
+    timeoutMs: opts.timeoutMs ?? 1e4,
+    sleep: opts._sleep ?? realSleep,
+    log: opts._log ?? ((line) => process.stderr.write(`${line}
+`)),
+    startedAt: Date.now()
+  };
+}
+async function dismissOrWarn(io, verb) {
+  const dismissed = await dismissPicker(io);
+  if (!dismissed) {
+    io.log(`model-picker: ${verb}: picker may still be open after Esc retries ` + `(socket=${io.socket} session=${io.session}) \u2014 pane needs eyes`);
+  }
+  return dismissed;
+}
+function expired(io) {
+  return Date.now() - io.startedAt >= io.timeoutMs;
+}
+function sendLiteral(io, text) {
+  io.runner.send(io.socket, io.session, ["send-keys", "-l", text]);
+}
+function sendKey(io, key) {
+  io.runner.send(io.socket, io.session, ["send-keys", key]);
+}
+async function openPicker(io) {
+  sendLiteral(io, "/model");
+  sendKey(io, "Enter");
+  for (;; ) {
+    await io.sleep(io.stepMs);
+    const pane = io.runner.capture(io.socket, io.session) ?? "";
+    const parsed = parseModelPicker(pane);
+    if (parsed?.footerSeen)
+      return parsed;
+    if (expired(io))
+      return parsed;
+  }
+}
+async function dismissPicker(io) {
+  for (let attempt = 0;attempt < 2; attempt++) {
+    try {
+      sendKey(io, "Escape");
+    } catch {
+      return false;
+    }
+    await io.sleep(io.stepMs);
+    const pane = io.runner.capture(io.socket, io.session) ?? "";
+    const parsed = parseModelPicker(pane);
+    if (!parsed || !parsed.footerSeen)
+      return true;
+    const tail = pane.slice(pane.lastIndexOf("Esc to cancel"));
+    if (tail.split(`
+`).slice(1).some((l) => l.trim().length > 0))
+      return true;
+  }
+  return false;
+}
+async function discoverModels(agentName3, opts = {}) {
+  const io = makeIo(agentName3, opts);
+  if (!io.runner.hasSession(io.socket, io.session)) {
+    return { ok: false, reason: "tmux session not found" };
+  }
+  return withPaneLock(`${io.socket}:${io.session}`, async () => {
+    io.startedAt = Date.now();
+    let parsed = null;
+    let dismissed = true;
+    try {
+      parsed = await openPicker(io);
+    } finally {
+      dismissed = await dismissOrWarn(io, "discover");
+    }
+    const tail = dismissed ? {} : { dismissFailed: true };
+    if (!parsed || !parsed.footerSeen) {
+      return {
+        ok: false,
+        reason: "picker did not render \u2014 agent may be mid-turn or the CLI changed its /model UI",
+        ...tail
+      };
+    }
+    const current = parsed.options.find((o) => o.current) ?? null;
+    return { ok: true, options: parsed.options, currentLabel: current?.label ?? null, ...tail };
+  });
+}
+async function selectModel(agentName3, targetLabel, opts = {}) {
+  const io = makeIo(agentName3, opts);
+  if (!io.runner.hasSession(io.socket, io.session)) {
+    return { ok: false, reason: "tmux session not found" };
+  }
+  return withPaneLock(`${io.socket}:${io.session}`, async () => {
+    io.startedAt = Date.now();
+    let selected = false;
+    try {
+      const parsed = await openPicker(io);
+      if (!parsed || !parsed.footerSeen) {
+        return { ok: false, reason: "picker did not render \u2014 agent may be mid-turn" };
+      }
+      const target = parsed.options.find((o) => o.label === targetLabel);
+      if (!target) {
+        const have = parsed.options.map((o) => o.label).join(", ");
+        return { ok: false, reason: `option "${targetLabel}" not offered (have: ${have})` };
+      }
+      if (parsed.cursorIndex < 0) {
+        return { ok: false, reason: "cursor marker not visible \u2014 refusing blind navigation" };
+      }
+      const delta = target.index - parsed.cursorIndex;
+      const key = delta > 0 ? "Down" : "Up";
+      for (let i = 0;i < Math.abs(delta); i++) {
+        if (expired(io))
+          return { ok: false, reason: "timed out navigating picker" };
+        sendKey(io, key);
+        await io.sleep(Math.min(io.stepMs, 250));
+      }
+      await io.sleep(io.stepMs);
+      const verifyPane = io.runner.capture(io.socket, io.session) ?? "";
+      const verify = parseModelPicker(verifyPane);
+      const atRow = verify?.options.find((o) => o.index === verify.cursorIndex);
+      if (!verify || !atRow || atRow.label !== targetLabel) {
+        return {
+          ok: false,
+          reason: `cursor verification failed (on "${atRow?.label ?? "?"}", wanted "${targetLabel}")`
+        };
+      }
+      sendLiteral(io, "s");
+      selected = true;
+      await io.sleep(io.stepMs);
+      const after = io.runner.capture(io.socket, io.session) ?? "";
+      const confirmation = extractConfirmation(after) ?? `Switched to ${targetLabel} (session)`;
+      return { ok: true, confirmation };
+    } catch (err) {
+      return { ok: false, reason: err instanceof Error ? err.message : String(err) };
+    } finally {
+      if (!selected) {
+        await dismissOrWarn(io, "select");
+      }
+    }
+  });
+}
+function extractConfirmation(pane) {
+  const lines = pane.split(`
+`);
+  for (let i = lines.length - 1;i >= 0; i--) {
+    const t = lines[i].replace(/^\s*\u23bf\s*/, "").trim();
+    if (/^(Set model to|Kept model as|Switched to)/i.test(t))
+      return t;
+  }
+  return null;
+}
 
 // ../src/config/loader.ts
 init_dist();
@@ -47981,13 +48360,20 @@ function spoolId(msg) {
   const src = msg.meta?.source ?? "-";
   return `s:${msg.chatId}:${src}:${msg.ts}`;
 }
+function escChatKey(msg) {
+  const threadRaw = msg.meta?.threadId;
+  const thread = typeof threadRaw === "string" && threadRaw.length > 0 ? threadRaw : "-";
+  return `${msg.chatId}:${thread}`;
+}
 function createInboundSpool(opts) {
   const { path, fs: fs2 } = opts;
   const now = opts.now ?? Date.now;
   const log = opts.log ?? ((l) => process.stderr.write(l));
   const escalateAfterMs = opts.escalateAfterMs ?? 15 * 60 * 1000;
   const compactAtBytes = opts.compactAtBytes ?? 256 * 1024;
+  const escalateNoticeCooldownMs = opts.escalateNoticeCooldownMs ?? 30 * 60 * 1000;
   const live = new Map;
+  const escAttemptByChat = new Map;
   function parseLine(line) {
     const s = line.trim();
     if (!s)
@@ -48001,8 +48387,15 @@ function createInboundSpool(opts) {
     if (rec == null || typeof rec !== "object")
       return null;
     const r = rec;
-    if (r.t !== "put" && r.t !== "ack")
+    if (r.t !== "put" && r.t !== "ack" && r.t !== "esc")
       return null;
+    if (r.t === "esc") {
+      if (typeof r.chat !== "string" && typeof r.chat !== "number")
+        return null;
+      if (typeof r.at !== "number")
+        return null;
+      return r;
+    }
     if (typeof r.id !== "string" || r.id.length === 0)
       return null;
     if (r.t === "put") {
@@ -48017,6 +48410,7 @@ function createInboundSpool(opts) {
   }
   function hydrate() {
     live.clear();
+    escAttemptByChat.clear();
     if (!fs2.existsSync(path))
       return;
     let raw = "";
@@ -48036,6 +48430,8 @@ function createInboundSpool(opts) {
           msg: rec.msg,
           firstAt: rec.firstAt
         });
+      } else if (rec.t === "esc") {
+        escAttemptByChat.set(`${rec.chat}:${rec.thread ?? "-"}`, rec.at);
       } else {
         live.delete(rec.id);
       }
@@ -48063,6 +48459,17 @@ function createInboundSpool(opts) {
     for (const [id, e] of live) {
       lines.push(JSON.stringify({ t: "put", id, agent: e.agent, msg: e.msg, firstAt: e.firstAt }));
     }
+    for (const [key, at] of escAttemptByChat) {
+      const sep3 = key.lastIndexOf(":");
+      const chat = key.slice(0, sep3);
+      const thread = key.slice(sep3 + 1);
+      lines.push(JSON.stringify({
+        t: "esc",
+        chat,
+        ...thread !== "-" ? { thread } : {},
+        at
+      }));
+    }
     const tmp = path + ".compact.tmp";
     try {
       fs2.writeFileSync(tmp, lines.length ? lines.join(`
@@ -48124,27 +48531,39 @@ function createInboundSpool(opts) {
       return n;
     },
     sweepEscalations(onEscalate) {
-      const cutoff = now() - escalateAfterMs;
-      let n = 0;
+      const tNow = now();
+      const cutoff = tNow - escalateAfterMs;
+      let dropped = 0;
+      let posted = 0;
       for (const [id, e] of [...live.entries()]) {
         if (e.firstAt > cutoff)
           continue;
         live.delete(id);
         appendRecord({ t: "ack", id });
+        const key = escChatKey(e.msg);
+        const lastAttempt = escAttemptByChat.get(key);
+        const postNotice = lastAttempt === undefined || tNow - lastAttempt >= escalateNoticeCooldownMs;
+        escAttemptByChat.set(key, tNow);
+        const threadRaw = e.msg.meta?.threadId;
+        const thread = typeof threadRaw === "string" && threadRaw.length > 0 ? threadRaw : undefined;
+        appendRecord({ t: "esc", chat: e.msg.chatId, thread, at: tNow });
         try {
-          onEscalate({ agent: e.agent, msg: e.msg });
+          onEscalate({ agent: e.agent, msg: e.msg }, { postNotice });
         } catch (err) {
           log(`inbound-spool: onEscalate threw id=${id}: ${err.message}
 `);
         }
-        n++;
+        if (postNotice)
+          posted++;
+        dropped++;
       }
-      if (n > 0) {
-        log(`inbound-spool: escalated+dropped ${n} undelivered entr${n === 1 ? "y" : "ies"} (older than ${escalateAfterMs}ms)
+      if (dropped > 0) {
+        const suppressed = dropped - posted;
+        log(`inbound-spool: escalated+dropped ${dropped} undelivered entr${dropped === 1 ? "y" : "ies"} ` + `(older than ${escalateAfterMs}ms; ${posted} notice${posted === 1 ? "" : "s"} posted` + `${suppressed > 0 ? `, ${suppressed} coalesced` : ""})
 `);
         maybeCompact();
       }
-      return n;
+      return dropped;
     },
     liveCount() {
       return live.size;
@@ -50976,7 +51395,7 @@ function startSubagentWatcher(config) {
     watch
   };
   const registry = new Map;
-  const tails = new Map;
+  const tails2 = new Map;
   const dirWatchers = new Map;
   const knownFiles = new Set;
   const pendingCloses = new Map;
@@ -51022,7 +51441,7 @@ function startSubagentWatcher(config) {
       hasEmittedStart: false,
       watcher: null
     };
-    tails.set(agentId, tail);
+    tails2.set(agentId, tail);
     readSubTail(entry, tail, n, (desc) => {
       log?.(`subagent-watcher: description updated for ${agentId}: ${desc}`);
     }, fs2, log, db2, parentStateDir, config.onUnstall, undefined, config.onProgress);
@@ -51060,7 +51479,7 @@ function startSubagentWatcher(config) {
         if (stopped)
           return;
         const entry2 = registry.get(agentId);
-        const t = tails.get(agentId);
+        const t = tails2.get(agentId);
         if (!entry2 || !t)
           return;
         readSubTail(entry2, t, nowFn(), (desc) => {
@@ -51129,14 +51548,14 @@ function startSubagentWatcher(config) {
     pendingCloses.set(agentId, handle);
   }
   function cleanupTerminalAgent(agentId) {
-    const tail = tails.get(agentId);
+    const tail = tails2.get(agentId);
     if (tail?.watcher) {
       try {
         tail.watcher.close();
       } catch {}
       tail.watcher = null;
     }
-    tails.delete(agentId);
+    tails2.delete(agentId);
     const entry = registry.get(agentId);
     if (entry?.filePath) {
       knownFiles.delete(entry.filePath);
@@ -51306,7 +51725,7 @@ function startSubagentWatcher(config) {
     for (const [agentId, entry] of registry) {
       if (entry.state !== "running")
         continue;
-      const tail = tails.get(agentId);
+      const tail = tails2.get(agentId);
       if (!tail)
         continue;
       readSubTail(entry, tail, n, (desc) => {
@@ -51348,7 +51767,7 @@ function startSubagentWatcher(config) {
         } catch {}
       }
       dirWatchers.clear();
-      for (const tail of tails.values()) {
+      for (const tail of tails2.values()) {
         if (tail.watcher) {
           try {
             tail.watcher.close();
@@ -51356,7 +51775,7 @@ function startSubagentWatcher(config) {
           tail.watcher = null;
         }
       }
-      tails.clear();
+      tails2.clear();
       registry.clear();
       knownFiles.clear();
       terminatedAgentIds.clear();
@@ -53182,10 +53601,10 @@ function readTurnActiveMarkerAgeMs(stateDir, now) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.15.2";
-var COMMIT_SHA = "95461524";
-var COMMIT_DATE = "2026-06-10T02:48:01Z";
-var LATEST_PR = 2260;
+var VERSION = "0.15.4";
+var COMMIT_SHA = "dd68b93e";
+var COMMIT_DATE = "2026-06-11T14:24:12Z";
+var LATEST_PR = 2280;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -56636,11 +57055,13 @@ if (!STATIC) {
       process.stderr.write(`telegram gateway: idle-drain flushed ${r.redelivered}/${r.drained} buffered inbound for ${selfAgent}${r.rebuffered > 0 ? ` (${r.rebuffered} re-buffered)` : ""}
 `);
     }
-    inboundSpool?.sweepEscalations((e) => {
+    inboundSpool?.sweepEscalations((e, { postNotice }) => {
       const chat = e.msg.chatId;
       const escThread = typeof e.msg.meta?.threadId === "string" && e.msg.meta.threadId ? Number(e.msg.meta.threadId) : undefined;
       const threadOpts = escThread != null ? { message_thread_id: escThread } : {};
       reapQueuedStatus(chat, escThread);
+      if (!postNotice)
+        return;
       swallowingApiCall(() => bot.api.sendMessage(chat, "\u26A0\uFE0F I couldn't deliver an earlier message to the agent after repeated retries (it survived restarts but the agent never picked it up). Please resend it.", { ...threadOpts }), { chat_id: chat, verb: "inbound-spool-escalation" });
     });
   }, IDLE_DRAIN_INTERVAL_MS).unref();
@@ -60696,6 +61117,7 @@ function buildAgentAudit(agentName3) {
     return;
   }
 }
+var activeSessionModelOverride = null;
 async function buildAgentMetadata(agentName3) {
   const list2 = switchroomExecJson(["agent", "list"]);
   const brokerState = switchroomExecJson(["auth", "show"]);
@@ -60712,6 +61134,7 @@ async function buildAgentMetadata(agentName3) {
   return {
     agentName: agentName3,
     model: a?.model ?? null,
+    sessionModel: activeSessionModelOverride,
     extendsProfile: a?.extends ?? a?.template ?? null,
     topicName: a?.topic_name ?? null,
     topicEmoji: a?.topic_emoji ?? null,
@@ -60829,21 +61252,60 @@ bot.command("inject", async (ctx) => {
     formatOutput: formatSwitchroomOutput
   });
 });
-bot.command("model", async (ctx) => {
-  if (!isAuthorizedSender(ctx))
-    return;
-  const text = ctx.message?.text ?? ctx.channelPost?.text ?? "";
-  const parsed = parseModelCommand(text) ?? { kind: "show" };
-  const reply = await handleModelCommand(parsed, {
-    inject: injectSlashCommand,
+function buildModelDeps() {
+  return {
+    discover: (a) => discoverModels(a),
+    select: (a, label) => selectModel(a, label),
+    isBusy: () => currentTurn !== null,
     getAgentName: getMyAgentName,
+    getQuotaBrief: async () => {
+      try {
+        const probed = await probeQuotaForBootCard(getMyAgentName(), 4000);
+        if (probed?.ok)
+          return formatQuotaLine2(probed.data);
+      } catch {}
+      try {
+        const agentDir = resolveAgentDirFromEnv();
+        if (agentDir) {
+          const local = await fetchQuota2({ claudeConfigDir: join35(agentDir, ".claude") });
+          if (local.ok)
+            return formatQuotaLine2(local.data);
+        }
+      } catch {}
+      return null;
+    },
+    inject: injectSlashCommand,
     getConfiguredModel: () => {
       const data = switchroomExecJson(["agent", "list"]);
       return data?.agents?.find((a) => a.name === getMyAgentName())?.model ?? null;
     },
     escapeHtml: escapeHtmlForTg,
     preBlock
-  });
+  };
+}
+function modelMenuReplyMarkup(reply) {
+  if (!reply.keyboard)
+    return;
+  const kb = new import_grammy9.InlineKeyboard;
+  for (const row of reply.keyboard) {
+    for (const btn of row)
+      kb.text(btn.text, btn.callback_data);
+    kb.row();
+  }
+  return kb;
+}
+bot.command("model", async (ctx) => {
+  if (!isAuthorizedSender(ctx))
+    return;
+  const text = ctx.message?.text ?? ctx.channelPost?.text ?? "";
+  const parsed = parseModelCommand(text) ?? { kind: "show" };
+  const deps = buildModelDeps();
+  if (parsed.kind === "show" && process.env.SWITCHROOM_MODEL_MENU !== "0") {
+    const menu = await buildModelMenu(deps);
+    await switchroomReply(ctx, menu.text, { html: true, reply_markup: modelMenuReplyMarkup(menu) });
+    return;
+  }
+  const reply = await handleModelCommand(parsed, deps);
   await switchroomReply(ctx, reply.text, { html: reply.html });
 });
 bot.command("agentstart", async (ctx) => {
@@ -63573,6 +64035,44 @@ bot.on("callback_query:data", async (ctx) => {
     await handleAuthDashboardCallback(ctx);
     return;
   }
+  if (data.startsWith(MODEL_CALLBACK_PREFIX)) {
+    const access2 = loadAccess();
+    const senderId2 = String(ctx.from?.id ?? "");
+    if (!access2.allowFrom.includes(senderId2)) {
+      await ctx.answerCallbackQuery({ text: "Not authorized." });
+      return;
+    }
+    if (process.env.SWITCHROOM_MODEL_MENU === "0") {
+      await ctx.answerCallbackQuery({ text: "Model menu is disabled (SWITCHROOM_MODEL_MENU=0)." }).catch(() => {});
+      await ctx.editMessageText("Model menu is disabled on this agent. Use <code>/model &lt;name&gt;</code>.", {
+        parse_mode: "HTML",
+        reply_markup: { inline_keyboard: [] }
+      }).catch(() => {});
+      return;
+    }
+    const modelDeps = buildModelDeps();
+    if (modelDeps.isBusy()) {
+      await ctx.answerCallbackQuery({ text: "\u23F3 Agent is mid-turn \u2014 tap again when it\u2019s idle", show_alert: false }).catch(() => {});
+      return;
+    }
+    await ctx.answerCallbackQuery({ text: "Switching\u2026" }).catch(() => {});
+    try {
+      const outcome = await handleModelMenuCallback(data, modelDeps);
+      if (outcome.selectedModel) {
+        activeSessionModelOverride = outcome.selectedModel;
+      }
+      if (outcome.toastOnly)
+        return;
+      await ctx.editMessageText(outcome.reply.text, {
+        parse_mode: "HTML",
+        reply_markup: modelMenuReplyMarkup(outcome.reply) ?? { inline_keyboard: [] }
+      }).catch(() => {});
+    } catch (err) {
+      process.stderr.write(`telegram gateway: model-menu callback failed: ${err?.message ?? String(err)}
+`);
+    }
+    return;
+  }
   if (data.startsWith("cn:")) {
     const access2 = loadAccess();
     const senderId2 = String(ctx.from?.id ?? "");