switchroom 0.19.4 → 0.19.5

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

@@ -8674,10 +8674,42 @@ function guardAccidentalBlockConstructs(text) {
   }
   return out;
 }
-var ACCIDENTAL_BLOCKQUOTE, ACCIDENTAL_ORDERED_LIST;
+function escapeAccidentalHeadingLine(line) {
+  return line.replace(ACCIDENTAL_HEADING, "$1\\$2");
+}
+function guardAccidentalHeading(text) {
+  if (!text.includes("#"))
+    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 ? escapeAccidentalHeadingLine(lines[k]) : lines[k];
+      out += processed;
+      if (k < lines.length - 1)
+        out += `
+`;
+    }
+    atLineStart = seg.text.endsWith(`
+`);
+  }
+  return out;
+}
+var ACCIDENTAL_BLOCKQUOTE, ACCIDENTAL_ORDERED_LIST, ACCIDENTAL_HEADING;
 var init_line_start_guard = __esm(() => {
   ACCIDENTAL_BLOCKQUOTE = /^>[0-9=]/;
   ACCIDENTAL_ORDERED_LIST = /^(\d{4,})([.)])(\s|$)/;
+  ACCIDENTAL_HEADING = /^([ \t]{0,3})(#{1,6})(?=[^\s#])/;
 });
 
 // render/inline-pairs-guard.ts
@@ -8727,6 +8759,7 @@ var init_inline_pairs_guard = __esm(() => {
 function guardAccidentalFormatting(markdown) {
   let out = markdown;
   out = guardAccidentalEmphasis(out);
+  out = guardAccidentalHeading(out);
   out = guardAccidentalBlockConstructs(out);
   out = guardAccidentalInlinePairs(out);
   out = guardDollarMath(out);
@@ -37338,7 +37371,7 @@ __export(exports_tmux2, {
   captureAgentPane: () => captureAgentPane2
 });
 import { execFileSync as execFileSync8 } from "node:child_process";
-import { chmodSync as chmodSync13, mkdirSync as mkdirSync45, readdirSync as readdirSync12, statSync as statSync18, unlinkSync as unlinkSync25, writeFileSync as writeFileSync46 } from "node:fs";
+import { chmodSync as chmodSync13, mkdirSync as mkdirSync46, readdirSync as readdirSync12, statSync as statSync18, unlinkSync as unlinkSync25, writeFileSync as writeFileSync47 } from "node:fs";
 import { resolve as resolve12 } from "node:path";
 function captureAgentPane2(opts) {
   const { agentName: agentName3, agentDir, reason } = opts;
@@ -37350,7 +37383,7 @@ function captureAgentPane2(opts) {
   const reasonSlug = sanitizeReason2(reason);
   const outPath = resolve12(outDir, `${ts}-${reasonSlug}.txt`);
   try {
-    mkdirSync45(outDir, { recursive: true, mode: 448 });
+    mkdirSync46(outDir, { recursive: true, mode: 448 });
   } catch (err) {
     const msg = `mkdir crash-reports failed: ${err.message}`;
     console.error(`[tmux-capture] ${agentName3}: ${msg}`);
@@ -37389,7 +37422,7 @@ function captureAgentPane2(opts) {
 ` + `
 `;
   try {
-    writeFileSync46(outPath, Buffer.concat([Buffer.from(header, "utf8"), body]), {
+    writeFileSync47(outPath, Buffer.concat([Buffer.from(header, "utf8"), body]), {
       mode: 384
     });
   } catch (err) {
@@ -38210,7 +38243,7 @@ function buildGrantedKeyboard(scope) {
   const btn = scopeToOpenInDriveButton(scope);
   if (btn === null)
     return;
-  return new import_grammy13.InlineKeyboard().url(btn.text, btn.url);
+  return new import_grammy14.InlineKeyboard().url(btn.text, btn.url);
 }
 async function handleApprovalCallback(ctx, data) {
   const parsed = parseApprovalCallback(data);
@@ -38256,11 +38289,11 @@ async function handleApprovalCallback(ctx, data) {
   } catch {}
   await ctx.answerCallbackQuery({ text: granted ? "Approved" : "Denied" });
 }
-var import_grammy13;
+var import_grammy14;
 var init_approval_callback = __esm(() => {
   init_approval_card();
   init_client3();
-  import_grammy13 = __toESM(require_mod2(), 1);
+  import_grammy14 = __toESM(require_mod2(), 1);
 });
 
 // ../src/telegram/materialize-bot-token.ts
@@ -38433,14 +38466,14 @@ var init_approvals_commands = __esm(() => {
 });
 
 // gateway/gateway.ts
-var import_grammy14 = __toESM(require_mod(), 1);
+var import_grammy15 = __toESM(require_mod(), 1);
 var import_runner3 = __toESM(require_mod3(), 1);
 import { randomBytes as randomBytes10, createHash as createHash4 } from "crypto";
 import { execFileSync as execFileSync9, execSync as execSync2, spawn as spawn2 } from "child_process";
 import {
   readFileSync as readFileSync58,
-  writeFileSync as writeFileSync47,
-  mkdirSync as mkdirSync46,
+  writeFileSync as writeFileSync48,
+  mkdirSync as mkdirSync47,
   readdirSync as readdirSync13,
   rmSync as rmSync6,
   statSync as statSync19,
@@ -38454,7 +38487,7 @@ import {
   appendFileSync as appendFileSync7
 } from "fs";
 import { homedir as homedir19 } from "os";
-import { join as join59, sep as sep4, basename as basename15 } from "path";
+import { join as join60, sep as sep4, basename as basename15 } from "path";
 
 // plugin-logger.ts
 import { appendFileSync, mkdirSync, renameSync, statSync, existsSync } from "fs";
@@ -50451,6 +50484,25 @@ function sweepPermissionTtl(deps) {
   return expired;
 }
 
+// gateway/hang-restart-decision.ts
+var HUMAN_WAIT_TOOLS = new Set(["ask_user"]);
+var BACKGROUND_TOOLS = new Set(["Task", "Agent"]);
+var HANG_PROTECTED_EXACT = new Set([
+  "Task",
+  "Agent",
+  "Bash",
+  "WebFetch",
+  "WebSearch"
+]);
+var DEFAULT_HANG_STALENESS_MS = 300000;
+function hangStalenessMs(env = process.env) {
+  const raw = env.TURN_HANG_SECS;
+  const n = Number(raw);
+  if (!Number.isFinite(n) || n <= 0)
+    return DEFAULT_HANG_STALENESS_MS;
+  return Math.floor(n * 1000);
+}
+
 // gateway/missed-approvals-store.ts
 import { readFileSync as readFileSync13, writeFileSync as writeFileSync11, unlinkSync as unlinkSync7 } from "node:fs";
 import { join as join13 } from "node:path";
@@ -73377,15 +73429,142 @@ function backOffOpenInline2(text4, cut) {
   return earliest;
 }
 
+// gateway/command-format.ts
+init_format();
+var import_grammy8 = __toESM(require_mod2(), 1);
+function formatSwitchroomOutput(output, maxLen = RICH_MESSAGE_MAX_CHARS) {
+  const trimmed = output.trim();
+  if (trimmed.length <= maxLen)
+    return trimmed;
+  return trimmed.slice(0, maxLen - 20) + `
+... (truncated)`;
+}
+function stripAnsi4(text4) {
+  return text4.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "");
+}
+function escapeHtmlForTg2(text4) {
+  return text4.replace(/([\\`*_~=\[\]|])/g, "\\$1");
+}
+function preBlock(text4) {
+  return "```\n" + text4.replace(/```/g, "`\u200b``") + "\n```";
+}
+function getCommandArgs(ctx) {
+  const fromMatch = typeof ctx.match === "string" ? ctx.match.trim() : "";
+  if (fromMatch)
+    return fromMatch;
+  const text4 = ctx.msg?.text ?? ctx.message?.text ?? "";
+  const m = text4.match(/^\/\S+\s+([\s\S]*)$/);
+  return m ? m[1].trim() : "";
+}
+function hasDemoFlag(args) {
+  return /(?:^|\s)demo$/i.test(args.trim());
+}
+function assertSafeAgentName(name) {
+  if (!/^[a-zA-Z0-9_-]{1,64}$/.test(name) && name !== "all") {
+    throw new Error(`invalid agent name: ${name}`);
+  }
+}
+function formatAuthOutputForTelegram(output) {
+  const trimmed = stripAnsi4(output).trim();
+  const url = trimmed.match(/https:\/\/\S+/)?.[0] ?? null;
+  const lines = trimmed.split(/\n+/).map((l) => l.trim()).filter(Boolean);
+  if (!url)
+    return { text: preBlock(formatSwitchroomOutput(trimmed)), url: null };
+  const body = lines.filter((line) => {
+    if (line === url)
+      return false;
+    if (line.startsWith("switchroom auth code"))
+      return false;
+    if (line.startsWith("switchroom auth cancel"))
+      return false;
+    if (line.startsWith("Use 'tmux attach"))
+      return false;
+    if (line.startsWith("After Claude shows you a browser code"))
+      return false;
+    if (line.startsWith("Then finish with:"))
+      return false;
+    if (line.startsWith("Cancel with:"))
+      return false;
+    return true;
+  });
+  const rendered = body.map((line) => {
+    if (line.startsWith("Started Claude auth") || line.startsWith("Auth session already running"))
+      return `**${escapeHtmlForTg2(line)}**`;
+    if (line.startsWith("Open this URL"))
+      return `_${escapeHtmlForTg2(line)}_`;
+    return escapeHtmlForTg2(line);
+  });
+  rendered.push("", "\uD83D\uDC47 Tap **\uD83D\uDD10 Open Claude auth** below, then **reply with the browser code**.", "", `_Wrong Anthropic account getting authorized? Long-press the URL below and choose "Copy Link" or "Open in Browser" \u2014 lands in your main browser where the right account is signed in, bypassing Telegram's in-app browser cookies._`, "", url);
+  return { text: rendered.join(`
+`), url };
+}
+function buildAuthUrlKeyboard(authorizeUrl) {
+  return new import_grammy8.InlineKeyboard().url("\uD83D\uDD10 Open Claude auth", authorizeUrl);
+}
+function buildDeferredSecretKeyboard(deferKey) {
+  const unlockData = `vd:unlock:${deferKey}`;
+  const cancelData = `vd:cancel:${deferKey}`;
+  if (unlockData.length > 64 || cancelData.length > 64) {
+    process.stderr.write(`telegram gateway: callback_data overflow \u2014 deferKey=${deferKey} unlockLen=${unlockData.length} cancelLen=${cancelData.length}
+`);
+    throw new Error(`callback_data overflow: deferKey too long (${deferKey.length} chars)`);
+  }
+  return new import_grammy8.InlineKeyboard().text("\uD83D\uDD13 Unlock vault & save", unlockData).text("\uD83D\uDDD1 Discard", cancelData);
+}
+function renderVaultOpFailure(verbLabel, cliOutput, key) {
+  const parsed = parseVaultCliError(cliOutput);
+  const verb = verbLabel === "delete" ? "remove" : verbLabel;
+  const rendered = renderVaultCliError(parsed, { verb, key });
+  if (rendered.suppressRaw)
+    return rendered.html;
+  return `**vault ${verbLabel} failed:**
+${preBlock(cliOutput)}`;
+}
+function statusIcon(status) {
+  if (status === "active" || status === "running")
+    return "\uD83D\uDFE2";
+  if (status === "inactive" || status === "stopped" || status === "dead")
+    return "\uD83D\uDD34";
+  if (status === "failed")
+    return "\u26a0\ufe0f";
+  return "\u26aa";
+}
+function renderAuthCodeOutcome(outcome) {
+  if (!outcome || outcome.kind === "success")
+    return null;
+  const tail = outcome.paneTailText ? `
+_${escapeHtmlForTg2(outcome.paneTailText)}_` : "";
+  switch (outcome.kind) {
+    case "invalid-code":
+    case "expired-code":
+      return `Code rejected by Claude \u2014 tap **Restart flow** for a fresh URL.${tail}`;
+    case "pane-not-ready":
+      return `Auth pane not ready \u2014 tap **Retry**.`;
+    case "timeout":
+      return `Still waiting after 2 min \u2014 tap **Retry** or check \`switchroom auth list\`.${tail}`;
+  }
+}
+function buildDoctorScopeKeyboard() {
+  return new import_grammy8.InlineKeyboard().text("\uD83E\uDE7A Whole fleet", "dr:fleet").text("\uD83E\uDE7A This agent", "dr:self");
+}
+function formatDoctorReport(raw) {
+  const trimmed = stripAnsi4(raw).trim();
+  if (!trimmed)
+    return "doctor: no output";
+  const pretty = trimmed.replace(/^( *)\u2713 /gm, "$1\uD83D\uDFE2 ").replace(/^( *)\u2717 /gm, "$1\uD83D\uDD34 ").replace(/^( *)! /gm, "$1\uD83D\uDFE1 ");
+  return preBlock(formatSwitchroomOutput(pretty));
+}
+
 // 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);
+var import_grammy9 = __toESM(require_mod2(), 1);
 function guardAccidentalFormatting2(markdown) {
   let out = markdown;
   out = guardAccidentalEmphasis(out);
+  out = guardAccidentalHeading(out);
   out = guardAccidentalBlockConstructs(out);
   out = guardAccidentalInlinePairs(out);
   out = guardDollarMath(out);
@@ -73537,7 +73716,7 @@ function scrubVoice2(text4) {
 // gateway/outbound-send-path.ts
 init_format();
 init_text_voice_scrub();
-var import_grammy9 = __toESM(require_mod2(), 1);
+var import_grammy10 = __toESM(require_mod2(), 1);
 import { statSync as statSync9 } from "fs";
 import { extname } from "path";
 
@@ -74326,7 +74505,7 @@ async function sendReplyChunks(deps, state3) {
   return { threadId, previewMessageId };
 }
 function classifyReadBackError(err) {
-  if (err instanceof import_grammy9.GrammyError && err.error_code === 400) {
+  if (err instanceof import_grammy10.GrammyError && err.error_code === 400) {
     const d = (err.description || "").toLowerCase();
     if (d.includes("message to edit not found"))
       return "absent";
@@ -74901,7 +75080,7 @@ ${url}`;
           opts.message_thread_id = tid;
         else
           delete opts.message_thread_id;
-        return lockedBot.api.sendVoice(chat_id, new import_grammy9.InputFile(Buffer.from(oggBytes)), opts);
+        return lockedBot.api.sendVoice(chat_id, new import_grammy10.InputFile(Buffer.from(oggBytes)), opts);
       }, { threadId, chat_id, verb: "sendVoice" });
       sentIds.push(sentVoice.message_id);
       logOutbound("reply", chat_id, sentVoice.message_id, voiceOutPlan?.ttsChunks[v]?.length ?? 0, `voice-note=${v + 1}/${voiceOggs.length}`);
@@ -74974,12 +75153,12 @@ ${url}`;
       ...replyParams,
       ...tid != null ? { message_thread_id: tid } : {}
     };
-    return lockedBot.api.sendDocument(chat_id, new import_grammy9.InputFile(f), baseOpts);
+    return lockedBot.api.sendDocument(chat_id, new import_grammy10.InputFile(f), baseOpts);
   }, { threadId, chat_id, verb: "sendDocument" });
   if (allPhotos) {
     const media = files.map((f) => ({
       type: "photo",
-      media: new import_grammy9.InputFile(f)
+      media: new import_grammy10.InputFile(f)
     }));
     let sent;
     try {
@@ -75012,7 +75191,7 @@ ${url}`;
       sentIds.push(m.message_id);
   } else {
     for (const f of files) {
-      const input = new import_grammy9.InputFile(f);
+      const input = new import_grammy10.InputFile(f);
       const isPhoto = sendableAsPhoto(f);
       let sent;
       try {
@@ -76202,6 +76381,15 @@ function removeTurnActiveMarker(stateDir) {
     unlinkSync13(join31(stateDir, TURN_ACTIVE_MARKER_FILE));
   } catch {}
 }
+function readTurnActiveMarkerAgeMs(stateDir, now) {
+  const path2 = join31(stateDir, TURN_ACTIVE_MARKER_FILE);
+  try {
+    const st = statSync10(path2);
+    return (now ?? Date.now()) - st.mtimeMs;
+  } catch {
+    return null;
+  }
+}
 
 // gateway/turn-end-gate-backstop.ts
 function withTurnEndGateBackstop(key, endingTurn, body, deps) {
@@ -77149,10 +77337,14 @@ function handleSessionEvent(deps, ev) {
             ended_via: outboundMetrics.outboundCount > 0 ? "reply" : "silent"
           });
           if (turnEndDecision === "reprompt") {
+            const gatewayCapturedEmpty = turn.capturedText.join(`
+
+`).trim().length === 0;
+            const proseMinChars = !turn.replyCalled && gatewayCapturedEmpty ? 1 : CAPTURED_PROSE_MIN_CHARS;
             const proseDecision = CAPTURED_PROSE_DELIVERY_ENABLED ? decideCapturedProseDelivery({
               turnKey: tKey,
               turnId: turn.turnId,
-              minChars: CAPTURED_PROSE_MIN_CHARS
+              minChars: proseMinChars
             }) : { deliver: false, reason: "no-state" };
             if (proseDecision.deliver && proseDecision.text != null) {
               process.stderr.write(`telegram gateway: captured-prose delivery engaged on first silent-end chat=${chatId} turnKey=${tKey} (#3227)
@@ -78555,7 +78747,7 @@ async function loadFromAuthBroker(options = {}) {
 }
 
 // gateway/folder-picker-handler.ts
-var import_grammy10 = __toESM(require_mod2(), 1);
+var import_grammy11 = __toESM(require_mod2(), 1);
 
 // ../src/drive/folder-picker.ts
 var DRIVE_ID_RE2 = /^[A-Za-z0-9_-]+$/;
@@ -78874,7 +79066,7 @@ async function recordGrantAndConfirm(ctx, deps, parsed) {
   const confirmText = `\u2705 Granted ${deps.agentName} access to folder ${parsed.folder_id}
 ` + `Scope: \`${scope}\`
 ` + `Revoke with: \`/approvals revoke ${decisionId}\``;
-  const kb = new import_grammy10.InlineKeyboard().url("\uD83D\uDCD6 Open in Drive", `https://drive.google.com/drive/folders/${parsed.folder_id}`);
+  const kb = new import_grammy11.InlineKeyboard().url("\uD83D\uDCD6 Open in Drive", `https://drive.google.com/drive/folders/${parsed.folder_id}`);
   try {
     await ctx.editMessageText({ markdown: confirmText }, {
       reply_markup: kb
@@ -78883,7 +79075,7 @@ async function recordGrantAndConfirm(ctx, deps, parsed) {
   await ctx.answerCallbackQuery({ text: "Allowed" });
 }
 function toKeyboard(spec) {
-  const kb = new import_grammy10.InlineKeyboard;
+  const kb = new import_grammy11.InlineKeyboard;
   for (let r = 0;r < spec.rows.length; r++) {
     const row = spec.rows[r];
     for (const btn of row) {
@@ -80346,6 +80538,9 @@ function writeSessionModelFile(agentDir, model, configuredDefaultAtWrite) {
   if (!isValidModelArg(model)) {
     throw new Error(`refusing to persist non-canonical session model token: ${JSON.stringify(model)}`);
   }
+  try {
+    rmSync4(join35(agentDir, SESSION_MODEL_BOOT_ATTEMPTS_FILE), { force: true });
+  } catch {}
   atomicWrite(join35(agentDir, SESSION_MODEL_FILE), serializeSessionModel({ model, configuredDefaultAtWrite, ts: Date.now() }));
 }
 function readSessionModelFileRaw(agentDir) {
@@ -81151,20 +81346,20 @@ function registerOpsInfoCommands(bot, deps) {
     isAuthorizedSender,
     getMyAgentName,
     switchroomReply,
-    buildDoctorScopeKeyboard,
+    buildDoctorScopeKeyboard: buildDoctorScopeKeyboard2,
     renderSelfDoctor,
-    preBlock,
-    formatSwitchroomOutput,
-    getCommandArgs,
-    assertSafeAgentName,
+    preBlock: preBlock2,
+    formatSwitchroomOutput: formatSwitchroomOutput2,
+    getCommandArgs: getCommandArgs2,
+    assertSafeAgentName: assertSafeAgentName2,
     runSwitchroomCommand,
     switchroomExecCombined,
-    stripAnsi: stripAnsi4,
-    hasDemoFlag,
-    escapeHtmlForTg: escapeHtmlForTg2
+    stripAnsi: stripAnsi5,
+    hasDemoFlag: hasDemoFlag2,
+    escapeHtmlForTg: escapeHtmlForTg3
   } = deps;
   function formatWhoamiCard(v, demo = false) {
-    const esc = escapeHtmlForTg2;
+    const esc = escapeHtmlForTg3;
     const yn = (b) => b ? "\u2713" : "\u2717";
     const lines = [];
     lines.push(`\uD83D\uDC64 **${esc(v.name ?? "?")}** \u00b7 ${esc(v.tier ?? "standard")}`);
@@ -81196,20 +81391,20 @@ function registerOpsInfoCommands(bot, deps) {
       if (AGENT_ADMIN && hostdWillBeUsed(getMyAgentName())) {
         await switchroomReply(ctx, "\uD83E\uDE7A **Doctor** \u2014 which scope?", {
           html: true,
-          reply_markup: buildDoctorScopeKeyboard()
+          reply_markup: buildDoctorScopeKeyboard2()
         });
         return;
       }
       await renderSelfDoctor(ctx);
     } catch (err) {
       await switchroomReply(ctx, `**doctor failed:**
-${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: true });
+${preBlock2(formatSwitchroomOutput2(err.message ?? "unknown error"))}`, { html: true });
     }
   });
   bot.command("grant", async (ctx) => {
     if (!isAuthorizedSender(ctx))
       return;
-    const parts = getCommandArgs(ctx).split(/\s+/).filter(Boolean);
+    const parts = getCommandArgs2(ctx).split(/\s+/).filter(Boolean);
     if (parts.length === 0) {
       await switchroomReply(ctx, "Usage: /grant <tool>  or  /grant <agent> <tool>");
       return;
@@ -81224,7 +81419,7 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
       tool = parts.slice(1).join(" ");
     }
     try {
-      assertSafeAgentName(agentName3);
+      assertSafeAgentName2(agentName3);
     } catch {
       await switchroomReply(ctx, "Invalid agent name.");
       return;
@@ -81234,7 +81429,7 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
   bot.command("dangerous", async (ctx) => {
     if (!isAuthorizedSender(ctx))
       return;
-    const parts = getCommandArgs(ctx).split(/\s+/).filter(Boolean);
+    const parts = getCommandArgs2(ctx).split(/\s+/).filter(Boolean);
     let agentName3;
     let off = false;
     if (parts.length === 0) {
@@ -81248,7 +81443,7 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
         off = true;
     }
     try {
-      assertSafeAgentName(agentName3);
+      assertSafeAgentName2(agentName3);
     } catch {
       await switchroomReply(ctx, "Invalid agent name.");
       return;
@@ -81263,7 +81458,7 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
       return;
     const agentName3 = (typeof ctx.match === "string" ? ctx.match : "").trim() || getMyAgentName();
     try {
-      assertSafeAgentName(agentName3);
+      assertSafeAgentName2(agentName3);
     } catch {
       await switchroomReply(ctx, "Invalid agent name.");
       return;
@@ -81280,21 +81475,21 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
       } catch (err) {
         output = err.stdout ?? err.message ?? "version failed";
       }
-      const trimmed = stripAnsi4(output).trim();
+      const trimmed = stripAnsi5(output).trim();
       if (!trimmed) {
         await switchroomReply(ctx, "version: no output");
         return;
       }
-      await switchroomReply(ctx, preBlock(formatSwitchroomOutput(trimmed)), { html: true });
+      await switchroomReply(ctx, preBlock2(formatSwitchroomOutput2(trimmed)), { html: true });
     } catch (err) {
       await switchroomReply(ctx, `**version failed:**
-${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: true });
+${preBlock2(formatSwitchroomOutput2(err.message ?? "unknown error"))}`, { html: true });
     }
   });
   bot.command("whoami", async (ctx) => {
     if (!isAuthorizedSender(ctx))
       return;
-    const demo = hasDemoFlag(getCommandArgs(ctx));
+    const demo = hasDemoFlag2(getCommandArgs2(ctx));
     try {
       let raw;
       try {
@@ -81302,18 +81497,18 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
       } catch (err) {
         raw = err.stdout ?? err.message ?? "whoami failed";
       }
-      const trimmed = stripAnsi4(raw).trim();
+      const trimmed = stripAnsi5(raw).trim();
       let card;
       try {
         card = formatWhoamiCard(JSON.parse(trimmed.split(`
 `).pop() ?? trimmed), demo);
       } catch {
-        card = preBlock(formatSwitchroomOutput(trimmed || "whoami: no output"));
+        card = preBlock2(formatSwitchroomOutput2(trimmed || "whoami: no output"));
       }
       await switchroomReply(ctx, card, { html: true });
     } catch (err) {
       await switchroomReply(ctx, `**whoami failed:**
-${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: true });
+${preBlock2(formatSwitchroomOutput2(err.message ?? "unknown error"))}`, { html: true });
     }
   });
   bot.command("commands", async (ctx) => {
@@ -84359,7 +84554,7 @@ async function handleRequestMs365Approval(client3, msg, deps) {
 
 // gateway/diff-preview-card.ts
 init_format();
-var import_grammy11 = __toESM(require_mod2(), 1);
+var import_grammy12 = __toESM(require_mod2(), 1);
 var REQUEST_ID_RE = /^[0-9a-f]{32}$/;
 var PENDING_FILE_ID_SENTINEL = "pending-create";
 function buildDiffPreviewCard(input) {
@@ -84377,7 +84572,7 @@ function buildDiffPreviewCard(input) {
   }
   const text4 = bodyLines.join(`
 `);
-  const kb = new import_grammy11.InlineKeyboard;
+  const kb = new import_grammy12.InlineKeyboard;
   const ROW_BREAK_AFTER = [
     "apply_suggestion"
   ];
@@ -87221,6 +87416,49 @@ function purgeStaleTurnsForChat(chatId, keys, purger, isStale = () => true) {
   return { purged };
 }
 
+// gateway/hang-restart-decision.ts
+var HUMAN_WAIT_TOOLS2 = new Set(["ask_user"]);
+var BACKGROUND_TOOLS2 = new Set(["Task", "Agent"]);
+function classifyToolClass(toolName, opts = {}) {
+  if (opts.awaitingApproval === true)
+    return "human";
+  if (HUMAN_WAIT_TOOLS2.has(toolName))
+    return "human";
+  if (BACKGROUND_TOOLS2.has(toolName))
+    return "background";
+  if (toolName === "Bash" && opts.backgroundBash === true)
+    return "background";
+  return "standard";
+}
+var HANG_PROTECTED_EXACT2 = new Set([
+  "Task",
+  "Agent",
+  "Bash",
+  "WebFetch",
+  "WebSearch"
+]);
+var HANG_PROTECTED_SUBSTRINGS = ["research", "perplexity", "crawl", "deep_research", "webkite"];
+function isHangRestartProtectedTool(toolName) {
+  if (HANG_PROTECTED_EXACT2.has(toolName))
+    return true;
+  if (classifyToolClass(toolName) !== "standard")
+    return true;
+  const lower = toolName.toLowerCase();
+  return HANG_PROTECTED_SUBSTRINGS.some((s) => lower.includes(s));
+}
+function decideHangRestart(input) {
+  if (input.inFlightToolNames.length === 0)
+    return { restart: false, reason: "not-mid-tool" };
+  const protectedName = input.inFlightToolNames.find(isHangRestartProtectedTool);
+  if (protectedName != null) {
+    return { restart: false, reason: `protected-long-tool:${protectedName}` };
+  }
+  if (input.markerAgeMs != null && input.markerAgeMs < input.stalenessThresholdMs) {
+    return { restart: false, reason: "marker-advancing" };
+  }
+  return { restart: true, reason: "mid-tool-marker-stale" };
+}
+
 // gateway/update-status-line.ts
 function latestHostdPhase(tail) {
   if (!tail)
@@ -87276,7 +87514,8 @@ function buildSilencePokeOptions(deps) {
     getPendingInboundBuffer,
     trackRedeliveredInbound,
     closeActivityLane,
-    closeProgressLane
+    closeProgressLane,
+    hangRestart
   } = deps;
   return {
     thresholdsMs: { fallback: SILENCE_FALLBACK_MS, fallbackHardCeiling: SILENCE_FALLBACK_HARD_MS, floor: SILENCE_FLOOR_MS },
@@ -87324,6 +87563,21 @@ function buildSilencePokeOptions(deps) {
         endTurn2(ctx.key);
         return;
       }
+      if (hangRestart != null && ctx.inFlightTools.length > 0) {
+        const markerAgeMs = readTurnActiveMarkerAgeMs(STATE_DIR);
+        const inFlightToolNames = ctx.inFlightTools.map((t) => t.name);
+        const decision = decideHangRestart({
+          inFlightToolNames,
+          markerAgeMs,
+          stalenessThresholdMs: hangRestart.stalenessThresholdMs
+        });
+        process.stderr.write(`telegram gateway: [hang-watchdog] fallback mid-tool chat=${ctx.chatId} ` + `thread=${ctx.threadId ?? "-"} silence_ms=${ctx.silenceMs} ` + `tools=${inFlightToolNames.join(",")} marker_age_ms=${markerAgeMs ?? "null"} ` + `restart=${decision.restart} reason=${decision.reason}
+`);
+        if (decision.restart) {
+          hangRestart.request(decision.reason, markerAgeMs ?? ctx.silenceMs);
+          return;
+        }
+      }
       let text4 = null;
       const blockedOnApproval = activeStatusReactions.get(statusKey(ctx.chatId, ctx.threadId))?.isAwaiting() ?? false;
       const upd = getInFlightUpdate();
@@ -93121,7 +93375,7 @@ function sweepStaleTurnActiveMarker(stateDir, opts) {
     return false;
   }
 }
-function readTurnActiveMarkerAgeMs(stateDir, now) {
+function readTurnActiveMarkerAgeMs2(stateDir, now) {
   const path2 = join56(stateDir, TURN_ACTIVE_MARKER_FILE2);
   try {
     const st = statSync16(path2);
@@ -93134,11 +93388,36 @@ function effectiveTurnAgeMs(markerAgeMs, turnStartedAt, now) {
   return markerAgeMs ?? now - turnStartedAt;
 }
 
+// gateway/gateway-heartbeat.ts
+import { mkdirSync as mkdirSync44, utimesSync as utimesSync3, writeFileSync as writeFileSync45 } from "node:fs";
+import { join as join57 } from "node:path";
+var GATEWAY_HEARTBEAT_FILE = "gateway-heartbeat";
+var GATEWAY_HEARTBEAT_INTERVAL_MS = 15000;
+function touchGatewayHeartbeat(stateDir) {
+  const path2 = join57(stateDir, GATEWAY_HEARTBEAT_FILE);
+  const now = new Date;
+  try {
+    utimesSync3(path2, now, now);
+  } catch {
+    try {
+      mkdirSync44(stateDir, { recursive: true });
+      writeFileSync45(path2, `${Date.now()}
+`, { mode: 384 });
+    } catch {}
+  }
+}
+function startGatewayHeartbeat(stateDir, intervalMs = GATEWAY_HEARTBEAT_INTERVAL_MS) {
+  touchGatewayHeartbeat(stateDir);
+  const timer3 = setInterval(() => touchGatewayHeartbeat(stateDir), intervalMs);
+  timer3.unref?.();
+  return timer3;
+}
+
 // ../src/build-info.ts
-var VERSION = "0.19.4";
-var COMMIT_SHA = "7cdf5428";
-var COMMIT_DATE = "2026-07-20T11:09:10+10:00";
-var LATEST_PR = 3457;
+var VERSION = "0.19.5";
+var COMMIT_SHA = "c5feaef8";
+var COMMIT_DATE = "2026-07-20T10:20:34Z";
+var LATEST_PR = 3474;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -93183,10 +93462,10 @@ function composeBootVersionString(inputs) {
 }
 
 // gateway/unhandled-rejection-policy.ts
-var import_grammy12 = __toESM(require_mod2(), 1);
+var import_grammy13 = __toESM(require_mod2(), 1);
 function classifyRejection(err, opts = {}) {
-  const isGrammy = opts.isGrammyError != null ? opts.isGrammyError(err) : err instanceof import_grammy12.GrammyError;
-  const isHttp = opts.isHttpError != null ? opts.isHttpError(err) : err instanceof import_grammy12.HttpError;
+  const isGrammy = opts.isGrammyError != null ? opts.isGrammyError(err) : err instanceof import_grammy13.GrammyError;
+  const isHttp = opts.isHttpError != null ? opts.isHttpError(err) : err instanceof import_grammy13.HttpError;
   if (isHttp)
     return "log_only";
   if (err instanceof Error && err.message === FLOOD_WAIT_ACTIVE)
@@ -93216,11 +93495,11 @@ init_peercred();
 import * as net5 from "node:net";
 import * as fs2 from "node:fs";
 import { homedir as homedir18 } from "node:os";
-import { join as join57 } from "node:path";
+import { join as join58 } from "node:path";
 var DEFAULT_TIMEOUT_MS4 = 2000;
 var UNLOCK_TIMEOUT_MS = 30000;
-var LEGACY_SOCKET_PATH2 = join57(homedir18(), ".switchroom", "vault-broker.sock");
-var OPERATOR_SOCKET_PATH2 = join57(homedir18(), ".switchroom", "broker-operator", "sock");
+var LEGACY_SOCKET_PATH2 = join58(homedir18(), ".switchroom", "vault-broker.sock");
+var OPERATOR_SOCKET_PATH2 = join58(homedir18(), ".switchroom", "broker-operator", "sock");
 function defaultBrokerSocketPath2() {
   if (fs2.existsSync(OPERATOR_SOCKET_PATH2))
     return OPERATOR_SOCKET_PATH2;
@@ -94102,8 +94381,8 @@ function resolveVaultApprovalPosture(broker) {
 }
 
 // registry/turns-schema.ts
-import { chmodSync as chmodSync12, mkdirSync as mkdirSync44 } from "fs";
-import { join as join58 } from "path";
+import { chmodSync as chmodSync12, mkdirSync as mkdirSync45 } from "fs";
+import { join as join59 } from "path";
 var DatabaseClass3 = null;
 function loadDatabaseClass3() {
   if (DatabaseClass3 != null)
@@ -94175,9 +94454,9 @@ function applySchema(db3) {
 }
 function openTurnsDb(agentDir) {
   const Database = loadDatabaseClass3();
-  const dir = join58(agentDir, "telegram");
-  mkdirSync44(dir, { recursive: true, mode: 448 });
-  const path2 = join58(dir, "registry.db");
+  const dir = join59(agentDir, "telegram");
+  mkdirSync45(dir, { recursive: true, mode: 448 });
+  const path2 = join59(dir, "registry.db");
   const db3 = new Database(path2, { create: true });
   applySchema(db3);
   try {
@@ -94521,7 +94800,7 @@ function selectResumeBuilder(endedVia, opts) {
 }
 
 // gateway/bridge-dead-watchdog.ts
-import { readFileSync as readFileSync56, writeFileSync as writeFileSync45, renameSync as renameSync20, unlinkSync as unlinkSync24 } from "node:fs";
+import { readFileSync as readFileSync56, writeFileSync as writeFileSync46, renameSync as renameSync20, unlinkSync as unlinkSync24 } from "node:fs";
 
 // gateway/cron-session.ts
 var CRON_IDENTITY_SUFFIX2 = "-cron";
@@ -94575,7 +94854,7 @@ function readFreshCrashLogTail(path2, opts = {}) {
 }
 function writeBridgeDeadEscalationMarker(path2, marker) {
   const tmp = `${path2}.tmp-${process.pid}-${Date.now()}`;
-  writeFileSync45(tmp, JSON.stringify(marker), "utf8");
+  writeFileSync46(tmp, JSON.stringify(marker), "utf8");
   renameSync20(tmp, path2);
 }
 function consumeBridgeDeadEscalationMarker(path2, nowMs3 = Date.now(), maxAgeMs = ESCALATION_MARKER_MAX_AGE_MS) {
@@ -94900,6 +95179,46 @@ function handleWorkerResume(feed, agentId, log) {
   }
   log(`telegram gateway: worker ${agentId} card RE-SURFACED \u2014 resumed via SendMessage after a genuine terminal (issue #3373)`);
 }
+function decideWorkerFeedOriginDefer(input) {
+  const { originResolved, cardExists, priorDeferrals, maxDeferrals } = input;
+  if (originResolved || cardExists)
+    return { defer: false, deferrals: 0 };
+  const deferrals = priorDeferrals + 1;
+  if (deferrals >= maxDeferrals)
+    return { defer: false, deferrals };
+  return { defer: true, deferrals };
+}
+function decideWorkerFeedDestination(input) {
+  const { origin, cardExists, priorDeferrals, maxDeferrals, fleetChatId, stampChatId, stampThreadId, ownerDm } = input;
+  const originResolved = origin != null;
+  const { defer, deferrals } = decideWorkerFeedOriginDefer({
+    originResolved,
+    cardExists,
+    priorDeferrals,
+    maxDeferrals
+  });
+  if (defer)
+    return { action: "defer", deferrals };
+  const exhausted = !originResolved && !cardExists;
+  const usingStampFallback = fleetChatId.length === 0;
+  const workerFleetChatId = usingStampFallback ? stampChatId ?? fleetChatId : fleetChatId;
+  const fallbackThreadId = usingStampFallback ? stampThreadId : undefined;
+  if (origin != null && origin.chatId.length > 0) {
+    return { action: "paint", chatId: origin.chatId, threadId: origin.threadId, deferrals, exhausted, ownerDmFallback: false };
+  }
+  if (workerFleetChatId.length > 0) {
+    return { action: "paint", chatId: workerFleetChatId, threadId: fallbackThreadId, deferrals, exhausted, ownerDmFallback: false };
+  }
+  const ownerDmFallback = origin == null && workerFleetChatId.length === 0 && ownerDm.length > 0;
+  return {
+    action: "paint",
+    chatId: ownerDm,
+    threadId: origin?.threadId ?? fallbackThreadId,
+    deferrals,
+    exhausted,
+    ownerDmFallback
+  };
+}
 function resolveWorkerFeedDispatch(sub, watcherDescription, entryBackground) {
   return {
     isBackground: sub?.background ?? entryBackground ?? false,
@@ -94952,7 +95271,7 @@ if (isGatewayMain) {
     shutdownAnalytics();
   });
 }
-var STATE_DIR = process.env.TELEGRAM_STATE_DIR ?? join59(homedir19(), ".claude", "channels", "telegram");
+var STATE_DIR = process.env.TELEGRAM_STATE_DIR ?? join60(homedir19(), ".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";
@@ -95052,11 +95371,11 @@ function scheduleAlwaysAllowPersistDrain() {
   }, ALWAYS_ALLOW_DRAIN_INTERVAL_MS);
   timer3.unref?.();
 }
-var ACCESS_FILE = join59(STATE_DIR, "access.json");
-var APPROVED_DIR = join59(STATE_DIR, "approved");
-var ENV_FILE = join59(STATE_DIR, ".env");
-var INBOX_DIR = join59(STATE_DIR, "inbox");
-var PEOPLE_FILE = join59(STATE_DIR, "people.json");
+var ACCESS_FILE = join60(STATE_DIR, "access.json");
+var APPROVED_DIR = join60(STATE_DIR, "approved");
+var ENV_FILE = join60(STATE_DIR, ".env");
+var INBOX_DIR = join60(STATE_DIR, "inbox");
+var PEOPLE_FILE = join60(STATE_DIR, "people.json");
 function triggerSelfRestart(targetAgent, reason, delayMs = 300) {
   const isDocker = process.env.SWITCHROOM_RUNTIME === "docker";
   const selfAgent = process.env.SWITCHROOM_AGENT_NAME;
@@ -95205,7 +95524,7 @@ function assertSendable(f) {
   } catch {
     throw new Error(`refusing to send file \u2014 cannot resolve real path: ${f}`);
   }
-  const inbox = join59(stateReal, "inbox");
+  const inbox = join60(stateReal, "inbox");
   if (real.startsWith(stateReal + sep4) && !real.startsWith(inbox + sep4)) {
     throw new Error(`refusing to send channel state: ${f}`);
   }
@@ -95308,9 +95627,9 @@ function assertAllowedChat(chat_id) {
 function saveAccess(a) {
   if (STATIC)
     return;
-  mkdirSync46(STATE_DIR, { recursive: true, mode: 448 });
+  mkdirSync47(STATE_DIR, { recursive: true, mode: 448 });
   const tmp = ACCESS_FILE + ".tmp";
-  writeFileSync47(tmp, JSON.stringify(a, null, 2) + `
+  writeFileSync48(tmp, JSON.stringify(a, null, 2) + `
 `, { mode: 384 });
   renameSync21(tmp, ACCESS_FILE);
 }
@@ -95330,7 +95649,7 @@ var HISTORY_ENABLED = HISTORY_ACCESS.historyEnabled !== false;
 if (isGatewayMain && HISTORY_ENABLED) {
   try {
     initHistory(STATE_DIR, HISTORY_ACCESS.historyRetentionDays ?? 30);
-    process.stderr.write(`telegram gateway: history capture enabled at ${join59(STATE_DIR, "history.db")}
+    process.stderr.write(`telegram gateway: history capture enabled at ${join60(STATE_DIR, "history.db")}
 `);
   } catch (err) {
     process.stderr.write(`telegram gateway: history init failed (${err.message}) \u2014 capture disabled
@@ -95349,7 +95668,7 @@ if (isGatewayMain)
     let markerTurnKey = null;
     let markerAgeMs = null;
     try {
-      const markerPath = join59(STATE_DIR, TURN_ACTIVE_MARKER_FILE2);
+      const markerPath = join60(STATE_DIR, TURN_ACTIVE_MARKER_FILE2);
       if (existsSync54(markerPath)) {
         const st = statSync19(markerPath);
         markerAgeMs = Date.now() - st.mtimeMs;
@@ -95374,10 +95693,10 @@ if (isGatewayMain)
       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 ${join59(agentDir, "telegram", "registry.db")}
+      process.stderr.write(`telegram gateway: turn-registry initialized at ${join60(agentDir, "telegram", "registry.db")}
 `);
     }
-    const bridgeDeadMarker = consumeBridgeDeadEscalationMarker(join59(STATE_DIR, "bridge-dead-escalation.json"));
+    const bridgeDeadMarker = consumeBridgeDeadEscalationMarker(join60(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}` : ""})
@@ -95390,7 +95709,7 @@ if (isGatewayMain)
     const pending2 = findLatestTurnIfInterrupted(turnsDb);
     const selfAgent = process.env.SWITCHROOM_AGENT_NAME ?? "";
     if (pending2 != null && selfAgent) {
-      const bootResumeMarkerPath = process.env.SWITCHROOM_GATEWAY_CLEAN_SHUTDOWN_MARKER ?? join59(STATE_DIR, "clean-shutdown.json");
+      const bootResumeMarkerPath = process.env.SWITCHROOM_GATEWAY_CLEAN_SHUTDOWN_MARKER ?? join60(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);
@@ -95503,7 +95822,7 @@ if (isGatewayMain)
 `);
       }
     }
-    const pendingEnvPath = join59(agentDir, ".pending-turn.env");
+    const pendingEnvPath = join60(agentDir, ".pending-turn.env");
     try {
       if (pending2 != null) {
         const lines = [
@@ -95517,7 +95836,7 @@ if (isGatewayMain)
           pending2.interrupt_reason != null ? `SWITCHROOM_PENDING_INTERRUPT_REASON=${pending2.interrupt_reason}` : `SWITCHROOM_PENDING_INTERRUPT_REASON=`
         ];
         const pendingEnvTmp = `${pendingEnvPath}.tmp-${process.pid}`;
-        writeFileSync47(pendingEnvTmp, lines.join(`
+        writeFileSync48(pendingEnvTmp, lines.join(`
 `) + `
 `, { mode: 384 });
         renameSync21(pendingEnvTmp, pendingEnvPath);
@@ -95564,26 +95883,31 @@ var WORKER_FEED_GROUP_MESSAGE_LIFETIME_CAP_MS = (() => {
   return Number.isFinite(v) && v > 0 ? v : 60 * 60000;
 })();
 var workerFeedOwnerDmFallbackLogged = new Set;
-function resolveWorkerFeedChat(agentId, fleetChatId) {
+function noteWorkerFeedOwnerDmFallback(agentId) {
+  if (workerFeedOwnerDmFallbackLogged.has(agentId))
+    return;
+  workerFeedOwnerDmFallbackLogged.add(agentId);
+  if (workerFeedOwnerDmFallbackLogged.size > WORKER_FEED_FALLBACK_LOG_CAP) {
+    const oldest = workerFeedOwnerDmFallbackLogged.values().next().value;
+    if (oldest != null)
+      workerFeedOwnerDmFallbackLogged.delete(oldest);
+  }
+  process.stderr.write(`telegram gateway: worker-feed origin unresolved agent=${agentId} \u2014 routing card to owner DM
+`);
+}
+var workerFeedOriginDeferrals = new Map;
+var WORKER_FEED_ORIGIN_DEFER_MAX = 10;
+function resolveWorkerFeedChat(agentId, fleetChatId, fallbackThreadId) {
   const origin = resolveSubagentOriginChat(agentId);
   if (origin != null && origin.chatId.length > 0)
     return origin;
   if (fleetChatId.length > 0)
-    return { chatId: fleetChatId };
+    return { chatId: fleetChatId, threadId: fallbackThreadId };
   const ownerDm = loadAccess().allowFrom[0] ?? "";
   if (origin == null && fleetChatId.length === 0 && ownerDm.length > 0) {
-    if (!workerFeedOwnerDmFallbackLogged.has(agentId)) {
-      workerFeedOwnerDmFallbackLogged.add(agentId);
-      if (workerFeedOwnerDmFallbackLogged.size > WORKER_FEED_FALLBACK_LOG_CAP) {
-        const oldest = workerFeedOwnerDmFallbackLogged.values().next().value;
-        if (oldest != null)
-          workerFeedOwnerDmFallbackLogged.delete(oldest);
-      }
-      process.stderr.write(`telegram gateway: worker-feed origin unresolved agent=${agentId} \u2014 routing card to owner DM
-`);
-    }
+    noteWorkerFeedOwnerDmFallback(agentId);
   }
-  return { chatId: ownerDm, threadId: origin?.threadId };
+  return { chatId: ownerDm, threadId: origin?.threadId ?? fallbackThreadId };
 }
 var REGISTRY_REAPER_INTERVAL_MS = 6 * 60 * 60 * 1000;
 function runHistoryReaperNow(reason) {
@@ -95626,7 +95950,7 @@ function checkApprovals() {
     return;
   }
   for (const senderId of files) {
-    const file = join59(APPROVED_DIR, senderId);
+    const file = join60(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}
 `);
@@ -95636,6 +95960,8 @@ function checkApprovals() {
 }
 if (isGatewayMain && !STATIC)
   setInterval(checkApprovals, 5000).unref();
+if (isGatewayMain && !STATIC)
+  startGatewayHeartbeat(STATE_DIR);
 var IDLE_CLEAR_CHECK_MS = Number(process.env.SWITCHROOM_IDLE_CLEAR_CHECK_MS ?? 60000);
 if (isGatewayMain && !STATIC && IDLE_CLEAR_CHECK_MS > 0)
   setInterval(maybeIdleClear, IDLE_CLEAR_CHECK_MS).unref();
@@ -95797,10 +96123,10 @@ function noteAgentOutputAt(key, ts) {
       lastAgentOutputAt.delete(oldest);
   }
 }
-var OBLIGATION_STORE_PATH = join59(STATE_DIR, "obligations.json");
+var OBLIGATION_STORE_PATH = join60(STATE_DIR, "obligations.json");
 var obligationStoreFs = {
   readFileSync: (p) => readFileSync58(p, "utf8"),
-  writeFileSync: (p, d) => writeFileSync47(p, d),
+  writeFileSync: (p, d) => writeFileSync48(p, d),
   renameSync: (a, b) => renameSync21(a, b),
   existsSync: (p) => existsSync54(p)
 };
@@ -95854,7 +96180,7 @@ function turnInFlightMachineOnly() {
 function liveTurnAgeMs(now) {
   if (currentTurn === null)
     return null;
-  return effectiveTurnAgeMs(readTurnActiveMarkerAgeMs(STATE_DIR, now), currentTurn.startedAt, now);
+  return effectiveTurnAgeMs(readTurnActiveMarkerAgeMs2(STATE_DIR, now), currentTurn.startedAt, now);
 }
 function oldestPendingApprovalAgeMs(now) {
   let oldest = null;
@@ -97061,7 +97387,7 @@ function wrapBootCardApi(threadId) {
         await lockedBot.api.editMessageText(cid, mid, richMessage2(text5), editOpts);
         return "edited";
       } catch (err) {
-        const desc = err instanceof import_grammy14.GrammyError ? err.description : err instanceof Error ? err.message : String(err);
+        const desc = err instanceof import_grammy15.GrammyError ? err.description : err instanceof Error ? err.message : String(err);
         if (typeof desc === "string" && desc.toLowerCase().includes("not modified"))
           return "edited";
         return "gone";
@@ -98141,26 +98467,26 @@ var statusPinState = new Map;
 var statusPinChatIds = new Map;
 var statusPinPinnedAt = new Map;
 var statusPinRightsCache = new PinRightsCache2;
-var STATUS_PIN_STORE_PATH = join59(STATE_DIR, "status-pins.json");
+var STATUS_PIN_STORE_PATH = join60(STATE_DIR, "status-pins.json");
 var statusPinStoreFs = {
   readFileSync: (p) => readFileSync58(p, "utf8"),
-  writeFileSync: (p, d) => writeFileSync47(p, d),
+  writeFileSync: (p, d) => writeFileSync48(p, d),
   renameSync: (a, b) => renameSync21(a, b),
   existsSync: (p) => existsSync54(p)
 };
 var statusPinPersistEnabled = !STATIC && PIN_STATUS_WHILE_WORKING;
-var ACTIVITY_CARD_STORE_PATH = join59(STATE_DIR, "activity-cards-pending.json");
+var ACTIVITY_CARD_STORE_PATH = join60(STATE_DIR, "activity-cards-pending.json");
 var activityCardStoreFs = {
   readFileSync: (p) => readFileSync58(p, "utf8"),
-  writeFileSync: (p, d) => writeFileSync47(p, d),
+  writeFileSync: (p, d) => writeFileSync48(p, d),
   renameSync: (a, b) => renameSync21(a, b),
   existsSync: (p) => existsSync54(p)
 };
 var activityCardPersistEnabled = !STATIC;
-var QUEUED_CARD_STORE_PATH = join59(STATE_DIR, "queued-cards-pending.json");
+var QUEUED_CARD_STORE_PATH = join60(STATE_DIR, "queued-cards-pending.json");
 var queuedCardStoreFs = {
   readFileSync: (p) => readFileSync58(p, "utf8"),
-  writeFileSync: (p, d) => writeFileSync47(p, d),
+  writeFileSync: (p, d) => writeFileSync48(p, d),
   renameSync: (a, b) => renameSync21(a, b),
   existsSync: (p) => existsSync54(p)
 };
@@ -98535,12 +98861,12 @@ var getPinnedProgressCardMessageId = null;
 var completeProgressCardTurn = null;
 var subagentWatcher = null;
 var workerActivityFeed = null;
-var SOCKET_PATH = process.env.SWITCHROOM_GATEWAY_SOCKET ?? join59(STATE_DIR, "gateway.sock");
+var SOCKET_PATH = process.env.SWITCHROOM_GATEWAY_SOCKET ?? join60(STATE_DIR, "gateway.sock");
 if (isGatewayMain)
-  mkdirSync46(STATE_DIR, { recursive: true, mode: 448 });
-var GATEWAY_PID_PATH = process.env.SWITCHROOM_GATEWAY_PID_FILE ?? join59(STATE_DIR, "gateway.pid.json");
-var GATEWAY_SESSION_MARKER_PATH = process.env.SWITCHROOM_GATEWAY_SESSION_MARKER ?? join59(STATE_DIR, "gateway-session.json");
-var GATEWAY_CLEAN_SHUTDOWN_MARKER_PATH = process.env.SWITCHROOM_GATEWAY_CLEAN_SHUTDOWN_MARKER ?? join59(STATE_DIR, "clean-shutdown.json");
+  mkdirSync47(STATE_DIR, { recursive: true, mode: 448 });
+var GATEWAY_PID_PATH = process.env.SWITCHROOM_GATEWAY_PID_FILE ?? join60(STATE_DIR, "gateway.pid.json");
+var GATEWAY_SESSION_MARKER_PATH = process.env.SWITCHROOM_GATEWAY_SESSION_MARKER ?? join60(STATE_DIR, "gateway-session.json");
+var GATEWAY_CLEAN_SHUTDOWN_MARKER_PATH = process.env.SWITCHROOM_GATEWAY_CLEAN_SHUTDOWN_MARKER ?? join60(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;
@@ -98569,7 +98895,7 @@ function ensureIssuesCard(chatId, threadId) {
     bot: botApi,
     log: (msg) => process.stderr.write(`telegram gateway: ${msg}
 `),
-    persistPath: join59(stateDir, "issues-card.json")
+    persistPath: join60(stateDir, "issues-card.json")
   });
   activeIssuesWatcher = startIssuesWatcher({
     stateDir,
@@ -98688,7 +99014,13 @@ function gatewayLivenessWiringDeps() {
     getPendingInboundBuffer: () => pendingInboundBuffer,
     trackRedeliveredInbound,
     closeActivityLane,
-    closeProgressLane
+    closeProgressLane,
+    hangRestart: {
+      stalenessThresholdMs: hangStalenessMs(),
+      request: (reason, idleMs) => {
+        triggerSelfRestart(getMyAgentName(), `hang-watchdog:${reason} idle=${Math.round(idleMs)}ms`);
+      }
+    }
   };
 }
 if (isGatewayMain)
@@ -98760,11 +99092,11 @@ if (isGatewayMain)
 var inboundSpool;
 if (isGatewayMain)
   inboundSpool = STATIC ? undefined : createInboundSpool({
-    path: join59(STATE_DIR, "inbound-spool.jsonl"),
+    path: join60(STATE_DIR, "inbound-spool.jsonl"),
     fs: {
       appendFileSync: (p, d) => appendFileSync7(p, d),
       readFileSync: (p) => readFileSync58(p, "utf8"),
-      writeFileSync: (p, d) => writeFileSync47(p, d),
+      writeFileSync: (p, d) => writeFileSync48(p, d),
       renameSync: (a, b) => renameSync21(a, b),
       existsSync: (p) => existsSync54(p),
       statSizeSync: (p) => statSync19(p).size
@@ -98794,7 +99126,7 @@ var pendingInboundBuffer = createPendingInboundBuffer({
 function agentHasInFlightBackgroundWork(now) {
   if (countRunningWorkers() > 0)
     return true;
-  const ageMs = readTurnActiveMarkerAgeMs(STATE_DIR, now);
+  const ageMs = readTurnActiveMarkerAgeMs2(STATE_DIR, now);
   return ageMs != null && ageMs < TURN_ACTIVE_MARKER_FRESH_MS;
 }
 async function deliverCapturedProse2(args) {
@@ -98827,7 +99159,7 @@ async function maybeRedeliverUndeliveredAnswer() {
   let transcriptText;
   try {
     const projectsDir = getProjectsDirForCwd();
-    const path2 = join59(projectsDir, `${sessionId}.jsonl`);
+    const path2 = join60(projectsDir, `${sessionId}.jsonl`);
     if (!existsSync54(path2)) {
       process.stderr.write(`telegram gateway: crash-redelivery \u2014 transcript not found for turnKey=${turn.turn_key} session=${sessionId} (${path2}); skipping
 `);
@@ -98930,7 +99262,7 @@ if (isGatewayMain && inboundSpool != null) {
 }
 var pendingPermissionBuffer = createPendingPermissionBuffer();
 function buildPermissionActionRow(requestId, showAlways) {
-  const kb = new import_grammy14.InlineKeyboard().text("\u274C Deny", `perm:deny:${requestId}`).text("\u2705 Allow", `perm:allow:${requestId}`);
+  const kb = new import_grammy15.InlineKeyboard().text("\u274C Deny", `perm:deny:${requestId}`).text("\u2705 Allow", `perm:allow:${requestId}`);
   if (showAlways)
     kb.text("\uD83D\uDD01 Always\u2026", `perm:always:${requestId}`);
   return kb;
@@ -98992,8 +99324,8 @@ var bridgeDeadWatchdog = createBridgeDeadWatchdog({
   isSessionAlive: () => findAgentProcessInContainer2()?.comm === "claude",
   isShuttingDown: () => shuttingDown,
   escalate: (reason) => triggerSelfRestart(process.env.SWITCHROOM_AGENT_NAME ?? "", reason, 1500),
-  crashLogPath: join59(STATE_DIR, "bridge-crash.log"),
-  markerPath: join59(STATE_DIR, "bridge-dead-escalation.json"),
+  crashLogPath: join60(STATE_DIR, "bridge-crash.log"),
+  markerPath: join60(STATE_DIR, "bridge-dead-escalation.json"),
   log: (line) => process.stderr.write(`${line}
 `),
   priorStreak: bridgeDeadPriorStreak,
@@ -99099,8 +99431,8 @@ if (isGatewayMain)
               probeQuotaViaBroker: (t) => probeQuotaForBootCard(agentSlug, t),
               tmuxSupervisor: process.env.SWITCHROOM_TMUX_SUPERVISOR === "1",
               dockerMode: process.env.SWITCHROOM_RUNTIME === "docker",
-              configSnapshotPath: join59(resolvedAgentDirForCard, ".config-snapshot.json"),
-              bootCardStatePath: join59(resolvedAgentDirForCard, ".boot-card-msgid.json"),
+              configSnapshotPath: join60(resolvedAgentDirForCard, ".config-snapshot.json"),
+              bootCardStatePath: join60(resolvedAgentDirForCard, ".boot-card-msgid.json"),
               floodStatePath: FLOOD_STATE_PATH,
               ...updateOutcomeLine ? { updateOutcomeLine } : {}
             }, ackMsgId).then((handle) => {
@@ -99453,7 +99785,7 @@ if (isGatewayMain)
     },
     async onRequestConfigApproval(client3, msg) {
       const { handleRequestConfigApproval: handleRequestConfigApproval2 } = await Promise.resolve().then(() => (init_config_approval_handler(), exports_config_approval_handler));
-      const { InlineKeyboard: InlineKeyboard7 } = await Promise.resolve().then(() => __toESM(require_mod(), 1));
+      const { InlineKeyboard: InlineKeyboard8 } = await Promise.resolve().then(() => __toESM(require_mod(), 1));
       await handleRequestConfigApproval2(client3, msg, {
         agentName: getMyAgentName(),
         loadTargetChat: () => {
@@ -99475,7 +99807,7 @@ if (isGatewayMain)
             ...cfgTopic != null ? { threadId: cfgTopic } : {}
           };
         },
-        buildKeyboard: (requestId, epoch) => new InlineKeyboard7().text("\u2705 Approve", `cfg:${requestId}:${epoch}:approve`).text("\uD83D\uDEAB Deny", `cfg:${requestId}:${epoch}:deny`),
+        buildKeyboard: (requestId, epoch) => new InlineKeyboard8().text("\u2705 Approve", `cfg:${requestId}:${epoch}:approve`).text("\uD83D\uDEAB Deny", `cfg:${requestId}:${epoch}:deny`),
         postCard: async (args) => {
           try {
             const sent = await robustApiCall(() => bot.api.sendRichMessage(args.chatId, richMessage2(args.text), {
@@ -99504,7 +99836,7 @@ if (isGatewayMain)
           }
         },
         postAttachment: async (args) => {
-          const input = new import_grammy14.InputFile(Buffer.from(args.content, "utf8"), args.filename);
+          const input = new import_grammy15.InputFile(Buffer.from(args.content, "utf8"), args.filename);
           await robustApiCall(() => bot.api.sendDocument(args.chatId, input, {
             ...args.threadId !== undefined ? { message_thread_id: args.threadId } : {}
           }), {
@@ -99782,7 +100114,7 @@ if (isGatewayMain)
       const receiverUid = receiverUidRaw ? Number(receiverUidRaw) : NaN;
       if (Number.isInteger(receiverUid))
         allowedUids.push(receiverUid);
-      const socketPath = join59(STATE_DIR, "webhook.sock");
+      const socketPath = join60(STATE_DIR, "webhook.sock");
       const webhookInject = (agentName3, inbound) => {
         const msg = inbound;
         const delivered = ipcServer.sendToAgent(agentName3, msg);
@@ -100010,9 +100342,9 @@ function redactOutboundText(text5, site) {
 var VOICE_OUT_DEFAULT_CHUNK_CHARS = 600;
 var VOICE_OUT_HARD_CHUNK_CAP = 4096;
 var voiceOnDemandCache = new VoiceOnDemandCache({
-  persistPath: join59(STATE_DIR, "voice-ondemand.json")
+  persistPath: join60(STATE_DIR, "voice-ondemand.json")
 });
-var VOICE_CACHE_DIR = join59(STATE_DIR, "voice-cache");
+var VOICE_CACHE_DIR = join60(STATE_DIR, "voice-cache");
 var voicePreSynthQueue = new PreSynthQueue({
   runJob: async (job) => {
     const sidecarToken = await materializeSidecarToken2();
@@ -100278,7 +100610,7 @@ async function executeAskUser(rawArgs) {
     }
   }
   const askId = generateAskId();
-  const keyboard = new import_grammy14.InlineKeyboard;
+  const keyboard = new import_grammy15.InlineKeyboard;
   for (let i = 0;i < args.options.length; i++) {
     keyboard.text(args.options[i], encodeAskCallback(askId, i));
     if (i < args.options.length - 1)
@@ -100413,7 +100745,7 @@ async function executeSendGif(rawArgs) {
   };
 }
 async function publishToTelegraph(text5, shortName, authorName) {
-  const accountPath = join59(STATE_DIR, "telegraph-account.json");
+  const accountPath = join60(STATE_DIR, "telegraph-account.json");
   let account = null;
   try {
     if (existsSync54(accountPath)) {
@@ -100436,8 +100768,8 @@ async function publishToTelegraph(text5, shortName, authorName) {
     }
     account = created.value;
     try {
-      mkdirSync46(STATE_DIR, { recursive: true, mode: 448 });
-      writeFileSync47(accountPath, JSON.stringify(account, null, 2), { mode: 384 });
+      mkdirSync47(STATE_DIR, { recursive: true, mode: 448 });
+      writeFileSync48(accountPath, JSON.stringify(account, null, 2), { mode: 384 });
     } catch (err) {
       process.stderr.write(`telegram gateway: telegraph cache write failed: ${err.message}
 `);
@@ -100592,9 +100924,9 @@ async function executeDownloadAttachment(args) {
     fileUniqueId: file.file_unique_id,
     now: Date.now()
   });
-  mkdirSync46(INBOX_DIR, { recursive: true, mode: 448 });
+  mkdirSync47(INBOX_DIR, { recursive: true, mode: 448 });
   assertInsideInbox2(INBOX_DIR, dlPath);
-  writeFileSync47(dlPath, buf, { mode: 384 });
+  writeFileSync48(dlPath, buf, { mode: 384 });
   return { content: [{ type: "text", text: dlPath }] };
 }
 async function executeEditMessage(args) {
@@ -101909,24 +102241,8 @@ function switchroomExecCombined(args, timeoutMs = 15000) {
     shell: "/bin/bash"
   });
 }
-function formatSwitchroomOutput(output, maxLen = RICH_MESSAGE_MAX_CHARS2) {
-  const trimmed = output.trim();
-  if (trimmed.length <= maxLen)
-    return trimmed;
-  return trimmed.slice(0, maxLen - 20) + `
-... (truncated)`;
-}
-function stripAnsi4(text5) {
-  return text5.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "");
-}
-function escapeHtmlForTg2(text5) {
-  return text5.replace(/([\\`*_~=\[\]|])/g, "\\$1");
-}
 var buttonConfirmParseModeWarned = new Set;
 var buttonConfirmSingleUseWarned = new Set;
-function preBlock(text5) {
-  return "```\n" + text5.replace(/```/g, "`\u200B``") + "\n```";
-}
 async function switchroomReply(ctx, text5, options = {}) {
   const chatId = String(ctx.chat.id);
   const baseThreadId = resolveThreadId(chatId, ctx.message?.message_thread_id);
@@ -101956,22 +102272,6 @@ Please delete message \`${msgId}\` manually so the value is not retained in chat
 _Reason: ${escapeHtmlForTg2(msg)}_`), {}), { chat_id: chatId, verb: "deleteSensitiveMessage.warning" });
   }
 }
-function getCommandArgs(ctx) {
-  const fromMatch = typeof ctx.match === "string" ? ctx.match.trim() : "";
-  if (fromMatch)
-    return fromMatch;
-  const text5 = ctx.msg?.text ?? ctx.message?.text ?? "";
-  const m = text5.match(/^\/\S+\s+([\s\S]*)$/);
-  return m ? m[1].trim() : "";
-}
-function hasDemoFlag(args) {
-  return /(?:^|\s)demo$/i.test(args.trim());
-}
-function assertSafeAgentName(name) {
-  if (!/^[a-zA-Z0-9_-]{1,64}$/.test(name) && name !== "all") {
-    throw new Error(`invalid agent name: ${name}`);
-  }
-}
 function getMyAgentName() {
   const fromEnv = process.env.SWITCHROOM_AGENT_NAME;
   if (fromEnv && fromEnv.trim().length > 0)
@@ -101989,14 +102289,14 @@ function restartMarkerPath() {
   const agentDir = resolveAgentDirFromEnv();
   if (!agentDir)
     return null;
-  return join59(agentDir, "restart-pending.json");
+  return join60(agentDir, "restart-pending.json");
 }
 function writeRestartMarker(marker) {
   const p = restartMarkerPath();
   if (!p)
     return;
   try {
-    writeFileSync47(p, JSON.stringify(marker));
+    writeFileSync48(p, JSON.stringify(marker));
     lastPlannedRestartAt = Date.now();
     process.stderr.write(`telegram gateway: restart-marker: write chat_id=${marker.chat_id} thread_id=${marker.thread_id ?? "-"} ack=${marker.ack_message_id ?? "-"} path=${p}
 `);
@@ -102181,12 +102481,12 @@ function _resetDockerReachableCache() {
 }
 function spawnSwitchroomDetached(args, onFailure) {
   const fullArgs = SWITCHROOM_CONFIG ? ["--config", SWITCHROOM_CONFIG, ...args] : args;
-  const logPath = join59(STATE_DIR, "detached-spawn.log");
+  const logPath = join60(STATE_DIR, "detached-spawn.log");
   let outFd = null;
   try {
-    mkdirSync46(STATE_DIR, { recursive: true });
+    mkdirSync47(STATE_DIR, { recursive: true });
     outFd = openSync12(logPath, "a");
-    writeFileSync47(logPath, `
+    writeFileSync48(logPath, `
 [${new Date().toISOString()}] spawn ${SWITCHROOM_CLI} ${fullArgs.join(" ")}
 `, { flag: "a" });
   } catch {}
@@ -102286,53 +102586,6 @@ function scheduleGrantRestart(agentName3, chatId, threadId, reason) {
   }
   return decision;
 }
-function formatAuthOutputForTelegram(output) {
-  const trimmed = stripAnsi4(output).trim();
-  const url = trimmed.match(/https:\/\/\S+/)?.[0] ?? null;
-  const lines = trimmed.split(/\n+/).map((l) => l.trim()).filter(Boolean);
-  if (!url)
-    return { text: preBlock(formatSwitchroomOutput(trimmed)), url: null };
-  const body = lines.filter((line) => {
-    if (line === url)
-      return false;
-    if (line.startsWith("switchroom auth code"))
-      return false;
-    if (line.startsWith("switchroom auth cancel"))
-      return false;
-    if (line.startsWith("Use 'tmux attach"))
-      return false;
-    if (line.startsWith("After Claude shows you a browser code"))
-      return false;
-    if (line.startsWith("Then finish with:"))
-      return false;
-    if (line.startsWith("Cancel with:"))
-      return false;
-    return true;
-  });
-  const rendered = body.map((line) => {
-    if (line.startsWith("Started Claude auth") || line.startsWith("Auth session already running"))
-      return `**${escapeHtmlForTg2(line)}**`;
-    if (line.startsWith("Open this URL"))
-      return `_${escapeHtmlForTg2(line)}_`;
-    return escapeHtmlForTg2(line);
-  });
-  rendered.push("", "\uD83D\uDC47 Tap **\uD83D\uDD10 Open Claude auth** below, then **reply with the browser code**.", "", `_Wrong Anthropic account getting authorized? Long-press the URL below and choose "Copy Link" or "Open in Browser" \u2014 lands in your main browser where the right account is signed in, bypassing Telegram's in-app browser cookies._`, "", url);
-  return { text: rendered.join(`
-`), url };
-}
-function buildAuthUrlKeyboard(authorizeUrl) {
-  return new import_grammy14.InlineKeyboard().url("\uD83D\uDD10 Open Claude auth", authorizeUrl);
-}
-function buildDeferredSecretKeyboard(deferKey) {
-  const unlockData = `vd:unlock:${deferKey}`;
-  const cancelData = `vd:cancel:${deferKey}`;
-  if (unlockData.length > 64 || cancelData.length > 64) {
-    process.stderr.write(`telegram gateway: callback_data overflow \u2014 deferKey=${deferKey} unlockLen=${unlockData.length} cancelLen=${cancelData.length}
-`);
-    throw new Error(`callback_data overflow: deferKey too long (${deferKey.length} chars)`);
-  }
-  return new import_grammy14.InlineKeyboard().text("\uD83D\uDD13 Unlock vault & save", unlockData).text("\uD83D\uDDD1 Discard", cancelData);
-}
 async function runSwitchroomAuthCommand(ctx, args, label) {
   try {
     const output = switchroomExecCombined(args, 30000);
@@ -102383,15 +102636,6 @@ function runVaultCli(args, passphrase, stdinValue) {
 `).trim() };
   }
 }
-function renderVaultOpFailure(verbLabel, cliOutput, key) {
-  const parsed = parseVaultCliError2(cliOutput);
-  const verb = verbLabel === "delete" ? "remove" : verbLabel;
-  const rendered = renderVaultCliError2(parsed, { verb, key });
-  if (rendered.suppressRaw)
-    return rendered.html;
-  return `**vault ${verbLabel} failed:**
-${preBlock(cliOutput)}`;
-}
 async function executeVaultOp(ctx, chatId, op, key, passphrase, setValue) {
   if (op === "list") {
     const r = runVaultCli(["list"], passphrase);
@@ -102495,30 +102739,6 @@ function switchroomExecJson(args) {
     return null;
   }
 }
-function statusIcon(status) {
-  if (status === "active" || status === "running")
-    return "\uD83D\uDFE2";
-  if (status === "inactive" || status === "stopped" || status === "dead")
-    return "\uD83D\uDD34";
-  if (status === "failed")
-    return "\u26A0\uFE0F";
-  return "\u26AA";
-}
-function renderAuthCodeOutcome(outcome) {
-  if (!outcome || outcome.kind === "success")
-    return null;
-  const tail = outcome.paneTailText ? `
-_${escapeHtmlForTg2(outcome.paneTailText)}_` : "";
-  switch (outcome.kind) {
-    case "invalid-code":
-    case "expired-code":
-      return `Code rejected by Claude \u2014 tap **Restart flow** for a fresh URL.${tail}`;
-    case "pane-not-ready":
-      return `Auth pane not ready \u2014 tap **Retry**.`;
-    case "timeout":
-      return `Still waiting after 2 min \u2014 tap **Retry** or check \`switchroom auth list\`.${tail}`;
-  }
-}
 function execAuthCode(agent, code2) {
   try {
     const output = switchroomExec(["auth", "code", agent, code2, "--json"], 150000);
@@ -102554,7 +102774,7 @@ ${preBlock(formatSwitchroomOutput(detail))}`, { html: true });
 }
 function readRecentDenialsForAgent(agentName3, windowMs, limit) {
   try {
-    const auditPath = join59(homedir19(), ".switchroom", "vault-audit.log");
+    const auditPath = join60(homedir19(), ".switchroom", "vault-audit.log");
     if (!existsSync54(auditPath))
       return [];
     const raw = readFileSync58(auditPath, "utf8");
@@ -102608,7 +102828,7 @@ async function buildAgentMetadata(agentName3) {
   try {
     const agentDir = resolveAgentDirFromEnv();
     if (agentDir) {
-      const raw = readFileSync58(join59(agentDir, ".claude", ".claude.json"), "utf8");
+      const raw = readFileSync58(join60(agentDir, ".claude", ".claude.json"), "utf8");
       claudeJson = JSON.parse(raw);
     }
   } catch {}
@@ -102737,7 +102957,7 @@ function buildModelDeps(restartCtx) {
       try {
         const agentDir = resolveAgentDirFromEnv();
         if (agentDir) {
-          const local = await fetchQuota2({ claudeConfigDir: join59(agentDir, ".claude") });
+          const local = await fetchQuota2({ claudeConfigDir: join60(agentDir, ".claude") });
           if (local.ok)
             return formatQuotaLine2(local.data);
         }
@@ -102832,7 +103052,7 @@ function buildModelDeps(restartCtx) {
 function modelMenuReplyMarkup(reply) {
   if (!reply.keyboard)
     return;
-  const kb = new import_grammy14.InlineKeyboard;
+  const kb = new import_grammy15.InlineKeyboard;
   for (const row of reply.keyboard) {
     for (const btn of row)
       kb.text(btn.text, btn.callback_data);
@@ -102972,7 +103192,7 @@ function buildEffortDeps() {
 function effortMenuReplyMarkup(reply) {
   if (!reply.keyboard)
     return;
-  const kb = new import_grammy14.InlineKeyboard;
+  const kb = new import_grammy15.InlineKeyboard;
   for (const row of reply.keyboard) {
     for (const btn of row)
       kb.text(btn.text, btn.callback_data);
@@ -102983,7 +103203,7 @@ function effortMenuReplyMarkup(reply) {
 function flushAgentHandoff(agentDir) {
   let removed = 0;
   for (const fname of [".handoff.md", ".handoff-topic"]) {
-    const p = join59(agentDir, fname);
+    const p = join60(agentDir, fname);
     try {
       if (existsSync54(p)) {
         unlinkSync26(p);
@@ -103041,7 +103261,7 @@ async function handleNewCommand(ctx) {
   writeRestartMarker({ chat_id: chatId, thread_id: threadId ?? null, ack_message_id: ackId, ts: Date.now() });
   if (agentDir != null) {
     try {
-      writeFileSync47(join59(agentDir, ".force-fresh-session"), `${kind} at ${new Date().toISOString()}
+      writeFileSync48(join60(agentDir, ".force-fresh-session"), `${kind} at ${new Date().toISOString()}
 `, "utf8");
     } catch (err) {
       process.stderr.write(`telegram gateway: failed to write force-fresh marker: ${err}
@@ -103155,10 +103375,10 @@ function buildFolderPickerDeps() {
 }
 var lockoutOps = {
   readFileSync: (p, enc) => readFileSync58(p, enc),
-  writeFileSync: (p, data, opts) => writeFileSync47(p, data, opts),
+  writeFileSync: (p, data, opts) => writeFileSync48(p, data, opts),
   existsSync: (p) => existsSync54(p),
-  mkdirSync: (p, opts) => mkdirSync46(p, opts),
-  joinPath: (...parts) => join59(...parts)
+  mkdirSync: (p, opts) => mkdirSync47(p, opts),
+  joinPath: (...parts) => join60(...parts)
 };
 var FLEET_FALLBACK_DEDUP_MS = 30000;
 function isAuthBrokerSocketReachable() {
@@ -103418,7 +103638,7 @@ async function runCreditWatch() {
   if (!agentDir)
     return;
   const agentName3 = getMyAgentName();
-  const claudeConfigDir = join59(agentDir, ".claude");
+  const claudeConfigDir = join60(agentDir, ".claude");
   const stateDir = STATE_DIR;
   const reason = readClaudeJsonOverage(claudeConfigDir);
   const prev = loadCreditState(stateDir);
@@ -103738,16 +103958,6 @@ async function probeQuotaForBootCard(agent, timeoutMs) {
 }
 var callbackQueryHandlers;
 var cardToolHandlers;
-function buildDoctorScopeKeyboard() {
-  return new import_grammy14.InlineKeyboard().text("\uD83E\uDE7A Whole fleet", "dr:fleet").text("\uD83E\uDE7A This agent", "dr:self");
-}
-function formatDoctorReport(raw) {
-  const trimmed = stripAnsi4(raw).trim();
-  if (!trimmed)
-    return "doctor: no output";
-  const pretty = trimmed.replace(/^( *)\u2713 /gm, "$1\uD83D\uDFE2 ").replace(/^( *)\u2717 /gm, "$1\uD83D\uDD34 ").replace(/^( *)! /gm, "$1\uD83D\uDFE1 ");
-  return preBlock(formatSwitchroomOutput(pretty));
-}
 async function renderSelfDoctor(ctx) {
   let output;
   try {
@@ -104635,7 +104845,7 @@ _Google accounts are connected from the host CLI._`, { html: true });
       return;
     }
     const appNote = started.source === "default" ? "_Using switchroom's shipped Microsoft app._" : "_Using your configured Microsoft app._";
-    const keyboard = new import_grammy14.InlineKeyboard().url("\uD83D\uDD10 Sign in to Microsoft", started.device.verification_uri).row().text("\u2716 Cancel", `cn:cancel:${key}`);
+    const keyboard = new import_grammy15.InlineKeyboard().url("\uD83D\uDD10 Sign in to Microsoft", started.device.verification_uri).row().text("\u2716 Cancel", `cn:cancel:${key}`);
     const sent = await ctx.replyWithRichMessage(richMessage2(`\uD83D\uDD17 **Connect a Microsoft account**
 
 ` + `1. Tap **Sign in to Microsoft** below.
@@ -104771,7 +104981,7 @@ Send \`/auth ${parsed.provider} cancel\` to abort.`, { html: true });
       tz: process.env.SWITCHROOM_TIMEZONE ?? process.env.TZ
     });
     if (reply.keyboard && reply.keyboard.length > 0) {
-      const kb = new import_grammy14.InlineKeyboard;
+      const kb = new import_grammy15.InlineKeyboard;
       for (let i = 0;i < reply.keyboard.length; i++) {
         const row = reply.keyboard[i];
         for (const b of row) {
@@ -104913,7 +105123,7 @@ Send \`/auth ${parsed.provider} cancel\` to abort.`, { html: true });
       }
       lines.push("");
       const denials = readRecentDenialsForAgent(targetAgent, 604800000, 5);
-      const denialKeyboard = new import_grammy14.InlineKeyboard;
+      const denialKeyboard = new import_grammy15.InlineKeyboard;
       if (denials.length > 0) {
         lines.push("**Recent denials (last 7d):**");
         for (const d of denials) {
@@ -104961,7 +105171,7 @@ Send \`/auth ${parsed.provider} cancel\` to abort.`, { html: true });
         byAgent.set(g.agent_slug, list3);
       }
       const lines = ["**\uD83D\uDCDC Active grants**", ""];
-      const keyboard = new import_grammy14.InlineKeyboard;
+      const keyboard = new import_grammy15.InlineKeyboard;
       for (const [agentName3, agentGrants] of byAgent) {
         lines.push(`**${escapeHtmlForTg2(agentName3)}:**`);
         for (const g of agentGrants) {
@@ -105158,7 +105368,7 @@ Send \`/auth ${parsed.provider} cancel\` to abort.`, { html: true });
           if (ctx.chat?.type !== "private") {
             kbRows = kbRows.filter((row) => !row.some((b) => b.callbackData?.startsWith("auth:use:")));
           }
-          const keyboard = new import_grammy14.InlineKeyboard;
+          const keyboard = new import_grammy15.InlineKeyboard;
           kbRows.forEach((row, ri) => {
             if (ri > 0)
               keyboard.row();
@@ -105184,7 +105394,7 @@ Send \`/auth ${parsed.provider} cancel\` to abort.`, { html: true });
       await switchroomReply(ctx, "**/usage:** cannot resolve agent dir.", { html: true });
       return;
     }
-    const result = await fetchQuota2({ claudeConfigDir: join59(agentDir, ".claude") });
+    const result = await fetchQuota2({ claudeConfigDir: join60(agentDir, ".claude") });
     if (!result.ok) {
       await switchroomReply(ctx, `**/usage:** ${escapeHtmlForTg2(result.reason)}`, { html: true });
       return;
@@ -105510,7 +105720,7 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
           await ctx.answerCallbackQuery({ text: "No always-allow rule for this tool." }).catch(() => {});
           return;
         }
-        keyboard = new import_grammy14.InlineKeyboard().text("\u2190 Back", `perm:back:${request_id}`);
+        keyboard = new import_grammy15.InlineKeyboard().text("\u2190 Back", `perm:back:${request_id}`);
         if (choices.specific)
           keyboard.text(choices.specific.buttonLabel, `perm:asn:${request_id}`);
         keyboard.text(`${choices.broad.buttonLabel} \u26A0\uFE0F`, `perm:asb:${request_id}`);
@@ -105812,7 +106022,7 @@ ${labelWithResume}` : labelWithResume,
       verb: "voice-ondemand.sendVoice",
       ...threadId != null ? { threadId } : {}
     }),
-    sendVoiceByUpload: (chatId, audio, sendOpts, threadId) => robustApiCall(() => bot2.api.sendVoice(chatId, new import_grammy14.InputFile(Buffer.from(audio)), sendOpts), {
+    sendVoiceByUpload: (chatId, audio, sendOpts, threadId) => robustApiCall(() => bot2.api.sendVoice(chatId, new import_grammy15.InputFile(Buffer.from(audio)), sendOpts), {
       chat_id: chatId,
       verb: "voice-ondemand.sendVoice",
       ...threadId != null ? { threadId } : {}
@@ -106071,7 +106281,7 @@ async function initGatewayBot() {
 `);
     process.exit(1);
   }
-  bot = new import_grammy14.Bot(TOKEN);
+  bot = new import_grammy15.Bot(TOKEN);
   installTgPostLogger(bot);
   installUpdateTap(bot, (line) => process.stderr.write(line));
   bot.api.config.use(async (prev, method, payload, signal) => {
@@ -106425,7 +106635,7 @@ async function startGateway() {
                         return;
                       }
                     })();
-                    const resolvedAgentDirForBootCard = agentDir ?? join59(homedir19(), ".switchroom", "agents", agentSlug);
+                    const resolvedAgentDirForBootCard = agentDir ?? join60(homedir19(), ".switchroom", "agents", agentSlug);
                     const handle = await startBootCard(chatId, threadId, botApiForCard, {
                       agentName: agentDisplayName,
                       agentSlug,
@@ -106439,8 +106649,8 @@ async function startGateway() {
                       probeQuotaViaBroker: (t) => probeQuotaForBootCard(agentSlug, t),
                       tmuxSupervisor: process.env.SWITCHROOM_TMUX_SUPERVISOR === "1",
                       dockerMode: process.env.SWITCHROOM_RUNTIME === "docker",
-                      configSnapshotPath: join59(resolvedAgentDirForBootCard, ".config-snapshot.json"),
-                      bootCardStatePath: join59(resolvedAgentDirForBootCard, ".boot-card-msgid.json"),
+                      configSnapshotPath: join60(resolvedAgentDirForBootCard, ".config-snapshot.json"),
+                      bootCardStatePath: join60(resolvedAgentDirForBootCard, ".boot-card-msgid.json"),
                       floodStatePath: FLOOD_STATE_PATH,
                       ...updateOutcomeLine ? { updateOutcomeLine } : {}
                     }, ackMsgId);
@@ -106471,7 +106681,7 @@ async function startGateway() {
         try {
           const smAgentDir = resolveAgentDirFromEnv();
           if (smAgentDir) {
-            const activePath = join59(smAgentDir, ".active-session-model");
+            const activePath = join60(smAgentDir, ".active-session-model");
             if (existsSync54(activePath)) {
               try {
                 const launched = readFileSync58(activePath, "utf8").trim();
@@ -106507,12 +106717,12 @@ async function startGateway() {
                   deliverModelSwitchBootNotice({
                     ...modelBootCardDeps,
                     confirmation,
-                    hasSessionModelAlert: existsSync54(join59(smAgentDir, ".session-model-alert"))
+                    hasSessionModelAlert: existsSync54(join60(smAgentDir, ".session-model-alert"))
                   });
                 }
               } catch {}
             }
-            const activeEffortPath = join59(smAgentDir, ".active-session-effort");
+            const activeEffortPath = join60(smAgentDir, ".active-session-effort");
             if (existsSync54(activeEffortPath)) {
               try {
                 const launchedEffort = readFileSync58(activeEffortPath, "utf8").trim();
@@ -106520,7 +106730,7 @@ async function startGateway() {
                 sessionEffortOverride = launchedEffort.length > 0 && launchedEffort !== configuredEffort ? launchedEffort : null;
               } catch {}
             }
-            const alertPath = join59(smAgentDir, ".session-model-alert");
+            const alertPath = join60(smAgentDir, ".session-model-alert");
             if (existsSync54(alertPath)) {
               let alertText = null;
               try {
@@ -106700,6 +106910,7 @@ async function startGateway() {
 `);
               },
               onTerminalCleanup: (agentId) => {
+                workerFeedOriginDeferrals.delete(agentId);
                 try {
                   workerActivityFeed?.terminate(agentId);
                 } catch (err) {
@@ -106708,6 +106919,7 @@ async function startGateway() {
                 }
               },
               onFinish: ({ agentId, outcome, description, resultText, toolCount, totalTokens, durationMs, background: entryBackground }) => {
+                workerFeedOriginDeferrals.delete(agentId);
                 deferredDoneReactions.promote();
                 let fleetChatId = "";
                 try {
@@ -106928,9 +107140,28 @@ async function startGateway() {
                   stampTurn.subagentActivityAt = Date.now();
                 }
                 if (workerFeedEnabled) {
-                  const wk = resolveWorkerFeedChat(agentId, fleetChatId);
-                  const wkChat = wk.chatId;
-                  workerActivityFeed?.update(agentId, wkChat, {
+                  const dest = decideWorkerFeedDestination({
+                    origin: resolveSubagentOriginChat(agentId),
+                    cardExists: workerActivityFeed?.has(agentId) === true,
+                    priorDeferrals: workerFeedOriginDeferrals.get(agentId) ?? 0,
+                    maxDeferrals: WORKER_FEED_ORIGIN_DEFER_MAX,
+                    fleetChatId,
+                    stampChatId: stampTurn?.sessionChatId,
+                    stampThreadId: stampTurn?.sessionThreadId,
+                    ownerDm: loadAccess().allowFrom[0] ?? ""
+                  });
+                  if (dest.action === "defer") {
+                    workerFeedOriginDeferrals.set(agentId, dest.deferrals);
+                    return;
+                  }
+                  workerFeedOriginDeferrals.delete(agentId);
+                  if (dest.exhausted) {
+                    process.stderr.write(`telegram gateway: worker-feed origin backfill never linked agent=${agentId} after ${dest.deferrals} deferrals \u2014 painting card
+`);
+                  }
+                  if (dest.ownerDmFallback)
+                    noteWorkerFeedOwnerDmFallback(agentId);
+                  workerActivityFeed?.update(agentId, dest.chatId, {
                     description: dispatch.feedDescription,
                     lastTool,
                     toolCount,
@@ -106939,7 +107170,7 @@ async function startGateway() {
                     state: "running",
                     model: feedModel,
                     totalTokens
-                  }, wk.threadId);
+                  }, dest.threadId);
                   return;
                 }
                 const progressOrigin = resolveSubagentOriginChat(agentId);
@@ -107004,7 +107235,7 @@ async function startGateway() {
       await runnerHandle.task();
       return;
     } catch (err) {
-      if (err instanceof import_grammy14.GrammyError && err.error_code === 409) {
+      if (err instanceof import_grammy15.GrammyError && err.error_code === 409) {
         const delay = Math.min(1000 * attempt, 15000);
         const agentName3 = process.env.SWITCHROOM_AGENT_NAME ?? "-";
         process.stderr.write(`telegram gateway: poll.409.detected attempt=${attempt} retry_in_ms=${delay} agent=${agentName3}