switchroom 0.16.47 → 0.17.1

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

@@ -6713,6 +6713,77 @@ function escapeMarkdown(text) {
 function codeSpanSafe(s) {
   return s.replace(/`/g, "`\u200b");
 }
+function maskCodeRegions(text, nonce) {
+  const FENCE_MASK_PH = `\x00RMF${nonce}_`;
+  const INLINE_MASK_PH = `\x00RMI${nonce}_`;
+  const codeMasks = [];
+  const masked = text.replace(/```[\s\S]*?```/g, (m) => {
+    const idx = codeMasks.length;
+    codeMasks.push(m);
+    return `${FENCE_MASK_PH}${idx}\x00`;
+  }).replace(/`[^`\n]+`/g, (m) => {
+    const idx = codeMasks.length;
+    codeMasks.push(m);
+    return `${INLINE_MASK_PH}${idx}\x00`;
+  });
+  const escNonce = nonce.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const anyMaskRe = new RegExp(`\x00RM[FI]${escNonce}_(\\d+)\x00`, "g");
+  const restore = (s) => s.replace(anyMaskRe, (_m, idx) => codeMasks[Number(idx)] ?? _m);
+  const stripPlaceholders = (s) => s.replace(anyMaskRe, "");
+  return { masked, restore, placeholder: FENCE_MASK_PH, stripPlaceholders };
+}
+function hardenCardBreaks(text) {
+  if (!text.includes(`
+`))
+    return text;
+  const nonce = Math.random().toString(36).slice(2);
+  const { masked, restore, placeholder } = maskCodeRegions(text, nonce);
+  const out = masked.replace(/\n{3,}/g, `
+
+`);
+  const isBlockConstructLine = (line) => isListItemLine(line) || isTableRowLine(line) || isTableDelimiterLine(line) || isBlockquoteLine(line) || isHeadingLine(line) || isFenceOpenLine(line, placeholder);
+  const lines = out.split(`
+`);
+  const pieces = [];
+  for (let i = 0;i < lines.length; i++) {
+    let line = lines[i];
+    const isLast = i === lines.length - 1;
+    const next = isLast ? "" : lines[i + 1];
+    const promote = !isLast && line.trim() !== "" && next.trim() !== "" && !isBlockConstructLine(line) && !isBlockConstructLine(next);
+    if (promote) {
+      line = line.replace(/[ \t\r]+$/, "");
+    }
+    pieces.push(line);
+    if (isLast)
+      break;
+    pieces.push(promote ? `  
+` : `
+`);
+  }
+  return restore(pieces.join(""));
+}
+function isListItemLine(line) {
+  const t = line.trimStart();
+  return /^[-*+]\s/.test(t) || /^\d+[.)]\s/.test(t);
+}
+function isTableRowLine(line) {
+  return /^\s*\|/.test(line);
+}
+function isTableDelimiterLine(line) {
+  return /^\s*\|?\s*:?-{1,}:?\s*(\|\s*:?-{1,}:?\s*)*\|?\s*$/.test(line);
+}
+function isFenceOpenLine(line, placeholder) {
+  const t = line.trimStart();
+  if (placeholder != null && placeholder.length > 0 && t.startsWith(placeholder))
+    return true;
+  return t.startsWith("```");
+}
+function isBlockquoteLine(line) {
+  return line.trimStart().startsWith(">");
+}
+function isHeadingLine(line) {
+  return /^#{1,6}\s/.test(line.trimStart());
+}
 var RICH_MESSAGE_MAX_CHARS = 32768;
 
 // text-voice-scrub.ts
@@ -16826,13 +16897,11 @@ var exports_client = {};
 __export(exports_client, {
   withAuthBrokerClient: () => withAuthBrokerClient,
   resolveAuthBrokerSocketPath: () => resolveAuthBrokerSocketPath,
-  authBrokerSocketExists: () => authBrokerSocketExists,
   AuthBrokerUnreachableError: () => AuthBrokerUnreachableError,
   AuthBrokerError: () => AuthBrokerError,
   AuthBrokerClient: () => AuthBrokerClient
 });
 import * as net from "node:net";
-import { existsSync as existsSync7 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
 import { randomUUID as randomUUID3 } from "node:crypto";
 import { join as join11 } from "node:path";
@@ -17133,9 +17202,6 @@ async function withAuthBrokerClient(fn, opts) {
     await client3.close();
   }
 }
-function authBrokerSocketExists(opts) {
-  return existsSync7(resolveAuthBrokerSocketPath(opts));
-}
 var DEFAULT_TIMEOUT_MS = 5000, AuthBrokerError, AuthBrokerUnreachableError;
 var init_client = __esm(() => {
   init_protocol();
@@ -17166,11 +17232,14 @@ var init_flock = () => {};
 import { randomBytes as randomBytes3, scryptSync, createCipheriv, createDecipheriv } from "node:crypto";
 import {
   readFileSync as readFileSync7,
-  writeFileSync as writeFileSync8,
-  existsSync as existsSync8,
+  writeSync,
+  existsSync as existsSync7,
   renameSync as renameSync4,
   mkdirSync as mkdirSync10,
   unlinkSync as unlinkSync4,
+  fsyncSync,
+  openSync,
+  closeSync,
   lstatSync,
   realpathSync
 } from "node:fs";
@@ -17205,7 +17274,7 @@ function normalizeSecrets(raw) {
   return out;
 }
 function openVault(passphrase, vaultPath) {
-  if (!existsSync8(vaultPath)) {
+  if (!existsSync7(vaultPath)) {
     throw new VaultError(`Vault file not found: ${vaultPath}`);
   }
   let vaultFile;
@@ -24385,7 +24454,9 @@ var init_schema = __esm(() => {
     enabled: exports_external.boolean().optional().describe("Master switch for the session-handoff briefing (default true)."),
     max_turns_in_briefing: exports_external.number().int().positive().optional().describe("Cap on recent user/assistant turn pairs fed to the summarizer."),
     resume_mode: exports_external.enum(["auto", "continue", "handoff", "none"]).optional().describe("How to resume the next session. 'handoff' (default as of #362) " + "never passes --continue; a fresh Claude starts each restart and " + "reads a briefing assembled from recent Telegram messages, Hindsight " + "recall, and today's daily memory file. 'auto' uses --continue when " + "the latest JSONL is smaller than resume_max_bytes, else falls back " + "to the handoff briefing. 'continue' always passes --continue. " + "'none' starts completely fresh every time."),
-    resume_max_bytes: exports_external.number().int().positive().optional().describe("Byte threshold above which 'auto' mode falls back to handoff " + "instead of --continue. Default 2_000_000 (~2MB). Large transcripts " + "can blow out the context window even with prefix caching, and " + "--continue replay is known-fragile at scale.")
+    resume_max_bytes: exports_external.number().int().positive().optional().describe("Byte threshold above which 'auto' mode falls back to handoff " + "instead of --continue. Default 2_000_000 (~2MB). Large transcripts " + "can blow out the context window even with prefix caching, and " + "--continue replay is known-fragile at scale."),
+    session_retention_max_count: exports_external.number().int().nonnegative().optional().describe("Session-JSONL retention (issue #2792): keep at most this many " + "newest session transcripts under .claude/projects; older ones " + "past both this count and the age bound are pruned by the Stop " + "hook. The newest sessions (and the handoff source) are always " + "kept. Default 20; set 0 to disable the count bound."),
+    session_retention_max_age_days: exports_external.number().int().nonnegative().optional().describe("Session-JSONL retention (issue #2792): prune session transcripts " + "older than this many days (a file is deleted only when it is BOTH " + "over the count bound and older than this). Default 30; set 0 to " + "disable the age bound.")
   }).optional();
   webhookDispatchRule = exports_external.object({
     description: exports_external.string().optional(),
@@ -24912,7 +24983,7 @@ var init_schema = __esm(() => {
 });
 
 // ../src/config/paths.ts
-import { existsSync as existsSync9 } from "node:fs";
+import { existsSync as existsSync8 } from "node:fs";
 import { resolve as resolve2 } from "node:path";
 function home() {
   return process.env.HOME ?? "/root";
@@ -24928,7 +24999,7 @@ function resolveStatePath2(fragment) {
   const h = home();
   const primary = resolve2(h, DEFAULT_STATE_DIR, fragment);
   const legacy = resolve2(h, LEGACY_STATE_DIR, fragment);
-  if (!existsSync9(primary) && existsSync9(legacy)) {
+  if (!existsSync8(primary) && existsSync8(legacy)) {
     warnLegacyStateOnce(legacy);
     return legacy;
   }
@@ -24941,9 +25012,9 @@ function resolveDualPath(pathStr) {
     const absolute = resolve2(h, rest);
     if (rest.startsWith(`${DEFAULT_STATE_DIR}/`)) {
       const frag = rest.slice(DEFAULT_STATE_DIR.length + 1);
-      if (!existsSync9(absolute)) {
+      if (!existsSync8(absolute)) {
         const legacy = resolve2(h, LEGACY_STATE_DIR, frag);
-        if (existsSync9(legacy)) {
+        if (existsSync8(legacy)) {
           warnLegacyStateOnce(legacy);
           return legacy;
         }
@@ -24968,7 +25039,7 @@ var init_overlay_schema = __esm(() => {
 });
 
 // ../src/config/overlay-loader.ts
-import { existsSync as existsSync10, readFileSync as readFileSync8, readdirSync as readdirSync2, statSync as statSync3 } from "node:fs";
+import { existsSync as existsSync9, readFileSync as readFileSync8, readdirSync as readdirSync2, statSync as statSync3 } from "node:fs";
 import { basename as basename4, resolve as resolve3 } from "node:path";
 function deriveOverlayTitle(raw, fileName) {
   const titleFromComment = raw.match(/^#[^\S\n]*name:[^\S\n]*(\S.*?)[^\S\n]*$/m)?.[1];
@@ -24984,7 +25055,7 @@ function overlayDirFor(agentName3, subdir) {
   return resolve3(base);
 }
 function listYamlFiles(dir) {
-  if (!existsSync10(dir))
+  if (!existsSync9(dir))
     return [];
   let entries;
   try {
@@ -25509,7 +25580,7 @@ function validateNotionWorkspaceConfig(config) {
 }
 
 // ../src/config/loader.ts
-import { readFileSync as readFileSync9, existsSync as existsSync11 } from "node:fs";
+import { readFileSync as readFileSync9, existsSync as existsSync10 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
 import { resolve as resolve4 } from "node:path";
 function formatZodErrors(error) {
@@ -25576,7 +25647,7 @@ function findConfigFile(startDir) {
     resolve4(userDir, "clerk.yml")
   ].filter(Boolean);
   for (const path of searchPaths) {
-    if (existsSync11(path)) {
+    if (existsSync10(path)) {
       return path;
     }
   }
@@ -25584,7 +25655,7 @@ function findConfigFile(startDir) {
 }
 function loadConfig(configPath) {
   const filePath = configPath ?? findConfigFile();
-  if (!existsSync11(filePath)) {
+  if (!existsSync10(filePath)) {
     throw new ConfigError(`Config file not found: ${filePath}`);
   }
   let raw;
@@ -25725,7 +25796,6 @@ function getPeerCred(fd) {
     return null;
   }
 }
-
 // ../src/vault/broker/peercred.ts
 function isReservedAgentName(name) {
   return RESERVED_AGENT_NAMES.has(name);
@@ -26258,7 +26328,7 @@ import {
   openSync as openSync2,
   rmSync,
   statSync as statSync5,
-  writeSync
+  writeSync as writeSync2
 } from "node:fs";
 import { join as join13 } from "node:path";
 import { tmpdir } from "node:os";
@@ -26325,7 +26395,7 @@ function writeFileExclusive(filePath, content) {
   const buf = typeof content === "string" ? Buffer.from(content, "utf8") : content;
   const fd = openSync2(filePath, fsConstants.O_WRONLY | fsConstants.O_CREAT | fsConstants.O_EXCL, 384);
   try {
-    writeSync(fd, buf);
+    writeSync2(fd, buf);
   } finally {
     closeSync2(fd);
   }
@@ -28861,7 +28931,7 @@ __export(exports_history, {
   checkpointWal: () => checkpointWal,
   _resetForTests: () => _resetForTests
 });
-import { chmodSync as chmodSync3, existsSync as existsSync18, mkdirSync as mkdirSync15 } from "fs";
+import { chmodSync as chmodSync3, existsSync as existsSync17, mkdirSync as mkdirSync15 } from "fs";
 import { join as join16 } from "path";
 function loadDatabaseClass() {
   if (DatabaseClass != null)
@@ -28890,6 +28960,7 @@ function initHistory(stateDir, retentionDays = 30) {
   db = new Database(path, { create: true });
   db.exec("PRAGMA journal_mode = WAL");
   db.exec("PRAGMA synchronous = NORMAL");
+  db.exec("PRAGMA busy_timeout = 5000");
   db.exec(`
     CREATE TABLE IF NOT EXISTS messages (
       chat_id        TEXT    NOT NULL,
@@ -28922,7 +28993,7 @@ function initHistory(stateDir, retentionDays = 30) {
   }
   for (const suffix of ["", "-shm", "-wal"]) {
     const f = path + suffix;
-    if (existsSync18(f)) {
+    if (existsSync17(f)) {
       try {
         chmodSync3(f, 420);
       } catch {}
@@ -28947,7 +29018,7 @@ function checkpointWal() {
     if (dbPath) {
       for (const suffix of ["-shm", "-wal"]) {
         const f = dbPath + suffix;
-        if (existsSync18(f)) {
+        if (existsSync17(f)) {
           try {
             chmodSync3(f, 420);
           } catch {}
@@ -29114,11 +29185,11 @@ var init_history = __esm(() => {
 });
 
 // quota-check.ts
-import { readFileSync as readFileSync14, existsSync as existsSync19 } from "fs";
+import { readFileSync as readFileSync14, existsSync as existsSync18 } from "fs";
 import { join as join17 } from "path";
 function readOauthToken(claudeConfigDir) {
   const tokenFile = join17(claudeConfigDir, ".oauth-token");
-  if (!existsSync19(tokenFile))
+  if (!existsSync18(tokenFile))
     return null;
   try {
     const raw = readFileSync14(tokenFile, "utf-8").trim();
@@ -29455,7 +29526,7 @@ function renderAuthLine(state4, agentName3, now = Date.now()) {
 }
 
 // gateway/quota-cache.ts
-import { existsSync as existsSync32, readFileSync as readFileSync29, writeFileSync as writeFileSync21, mkdirSync as mkdirSync22 } from "fs";
+import { existsSync as existsSync31, readFileSync as readFileSync29, writeFileSync as writeFileSync20, mkdirSync as mkdirSync22 } from "fs";
 import { join as join28, dirname as dirname9 } from "path";
 function defaultCachePath() {
   return process.env.SWITCHROOM_QUOTA_CACHE_PATH ?? join28(process.env.HOME ?? "/tmp", ".switchroom", "quota-cache.json");
@@ -29463,7 +29534,7 @@ function defaultCachePath() {
 function readQuotaCache(opts = {}) {
   const path = opts.path ?? defaultCachePath();
   const now = opts.now ?? Date.now();
-  if (!existsSync32(path))
+  if (!existsSync31(path))
     return null;
   let entry;
   try {
@@ -29494,7 +29565,7 @@ function writeQuotaCache(result, opts = {}) {
   };
   try {
     mkdirSync22(dirname9(path), { recursive: true });
-    writeFileSync21(path, JSON.stringify(entry, null, 2), { mode: 384 });
+    writeFileSync20(path, JSON.stringify(entry, null, 2), { mode: 384 });
   } catch {}
 }
 var DEFAULT_TTL_MS4, RATE_LIMIT_TTL_MS;
@@ -29504,10 +29575,10 @@ var init_quota_cache = __esm(() => {
 });
 
 // gateway/boot-probes.ts
-import { readFileSync as readFileSync30, readdirSync as readdirSync6, existsSync as existsSync33 } from "fs";
+import { readFileSync as readFileSync30, readdirSync as readdirSync6, existsSync as existsSync32 } from "fs";
 import { join as join29 } from "path";
 import { execFile as execFileCb } from "child_process";
-import { promisify as promisify3 } from "util";
+import { promisify } from "util";
 async function withTimeout(label, p, timeoutMs = PROBE_TIMEOUT_MS) {
   let timer3;
   const timeout = new Promise((resolve6) => {
@@ -29572,7 +29643,7 @@ async function probeAccount(agentDir) {
       join29(claudeDir, ".oauth-token.meta.json"),
       join29(claudeDir, "accounts", "default", ".oauth-token.meta.json")
     ]) {
-      if (existsSync33(candidate)) {
+      if (existsSync32(candidate)) {
         try {
           const meta = JSON.parse(readFileSync30(candidate, "utf8"));
           if (meta.expiresAt) {
@@ -29749,7 +29820,7 @@ async function resolveTmuxSupervisorPid(agentName3, execFileImpl) {
     if (!cgroup)
       return null;
     const procsPath = `/sys/fs/cgroup${cgroup}/cgroup.procs`;
-    if (!existsSync33(procsPath))
+    if (!existsSync32(procsPath))
       return null;
     const pidsRaw = readFileSync30(procsPath, "utf-8");
     const pids = pidsRaw.split(`
@@ -29826,7 +29897,7 @@ async function probeAgentProcess(agentName3, opts = {}) {
   const retryIntervalMs = opts.retryIntervalMs ?? AGENT_RETRY_INTERVAL_MS;
   const retryMaxMs = opts.retryMaxMs ?? AGENT_RETRY_MAX_MS;
   const sleep2 = opts.sleepImpl ?? ((ms) => new Promise((resolve6) => setTimeout(resolve6, ms)));
-  const execFileFn = opts.execFileImpl ?? execFile3;
+  const execFileFn = opts.execFileImpl ?? execFile;
   return withTimeout("Agent", (async () => {
     const startMs = Date.now();
     while (true) {
@@ -29868,7 +29939,7 @@ async function* watchAgentProcess(agentName3, opts = {}) {
   const pollIntervalMs = opts.pollIntervalMs ?? AGENT_LIVE_POLL_INTERVAL_MS;
   const followupRepollMs = opts.followupRepollMs ?? AGENT_LIVE_FOLLOWUP_REPOLL_MS;
   const sleep2 = opts.sleepImpl ?? ((ms) => new Promise((resolve6) => setTimeout(resolve6, ms)));
-  const execFileFn = opts.execFileImpl ?? execFile3;
+  const execFileFn = opts.execFileImpl ?? execFile;
   const now = opts.nowImpl ?? (() => Date.now());
   const startMs = now();
   let lastYieldedDetail = null;
@@ -29958,7 +30029,7 @@ async function probeQuota(claudeConfigDir, _agentDir, fetchImpl = fetch, opts =
         claudeConfigDir,
         join29(claudeConfigDir, "accounts", "default")
       ]) {
-        if (existsSync33(join29(candidate, ".oauth-token"))) {
+        if (existsSync32(join29(candidate, ".oauth-token"))) {
           claudeDirForProbe = candidate;
           break;
         }
@@ -30129,7 +30200,7 @@ async function probeUds(label, socketPath, opts = {}) {
   }
   return withTimeout(label, (async () => {
     if (!opts.connectImpl) {
-      if (!existsSync33(socketPath)) {
+      if (!existsSync32(socketPath)) {
         return {
           status: "fail",
           label,
@@ -30285,11 +30356,11 @@ async function probeConnections(agentDir, opts = {}) {
     };
   })());
 }
-var execFile3, PROBE_TIMEOUT_MS = 2000, QUOTA_BROKER_TIMEOUT_MS = 7000, QUOTA_DIRECT_FALLBACK_TIMEOUT_MS = 5000, QUOTA_PROBE_OUTER_TIMEOUT_MS = 9000, TOKEN_EXPIRING_SOON_DAYS = 7, AGENT_RETRY_INTERVAL_MS = 1500, AGENT_RETRY_MAX_MS = 12000, AGENT_LIVE_WINDOW_MS = 45000, AGENT_LIVE_POLL_INTERVAL_MS = 2000, AGENT_LIVE_FOLLOWUP_REPOLL_MS = 30000, realProcFs, SCHEDULER_LOCK_PATH_DEFAULT = "/state/agent/scheduler.lock", SCHEDULER_JSONL_PATH_DEFAULT = "/state/agent/scheduler.jsonl", SCHEDULER_FRESH_BOOT_MS = 30000, realSchedulerFs, realSkillsFs;
+var execFile, PROBE_TIMEOUT_MS = 2000, QUOTA_BROKER_TIMEOUT_MS = 7000, QUOTA_DIRECT_FALLBACK_TIMEOUT_MS = 5000, QUOTA_PROBE_OUTER_TIMEOUT_MS = 9000, TOKEN_EXPIRING_SOON_DAYS = 7, AGENT_RETRY_INTERVAL_MS = 1500, AGENT_RETRY_MAX_MS = 12000, AGENT_LIVE_WINDOW_MS = 45000, AGENT_LIVE_POLL_INTERVAL_MS = 2000, AGENT_LIVE_FOLLOWUP_REPOLL_MS = 30000, realProcFs, SCHEDULER_LOCK_PATH_DEFAULT = "/state/agent/scheduler.lock", SCHEDULER_JSONL_PATH_DEFAULT = "/state/agent/scheduler.jsonl", SCHEDULER_FRESH_BOOT_MS = 30000, realSchedulerFs, realSkillsFs;
 var init_boot_probes = __esm(() => {
   init_quota_cache();
   init_quota_check();
-  execFile3 = promisify3(execFileCb);
+  execFile = promisify(execFileCb);
   realProcFs = {
     readdir: (p) => readdirSync6(p),
     readFile: (p) => readFileSync30(p, "utf-8")
@@ -30300,16 +30371,16 @@ var init_boot_probes = __esm(() => {
       const { statSync: statSync10 } = __require("fs");
       return statSync10(p).mtimeMs;
     },
-    exists: (p) => existsSync33(p)
+    exists: (p) => existsSync32(p)
   };
   realSkillsFs = {
     readdir: (p) => readdirSync6(p),
-    exists: (p) => existsSync33(p)
+    exists: (p) => existsSync32(p)
   };
 });
 
 // gateway/boot-issue-cache.ts
-import { existsSync as existsSync34, readFileSync as readFileSync31, writeFileSync as writeFileSync22, mkdirSync as mkdirSync23, renameSync as renameSync11 } from "fs";
+import { existsSync as existsSync33, readFileSync as readFileSync31, writeFileSync as writeFileSync21, mkdirSync as mkdirSync23, renameSync as renameSync11 } from "fs";
 import { dirname as dirname10 } from "path";
 function fingerprintProbe(key, r) {
   if (r.status === "ok")
@@ -30389,7 +30460,7 @@ function diffProbes(probes, cache, opts = {}) {
   return out;
 }
 function loadCache(path, now = Date.now) {
-  if (!existsSync34(path))
+  if (!existsSync33(path))
     return { ...EMPTY_CACHE, probes: {} };
   let raw;
   try {
@@ -30438,7 +30509,7 @@ function applyAndSave(path, cache, diff) {
   try {
     mkdirSync23(dirname10(path), { recursive: true });
     const tmp = `${path}.tmp`;
-    writeFileSync22(tmp, JSON.stringify(next), { mode: 384 });
+    writeFileSync21(tmp, JSON.stringify(next), { mode: 384 });
     renameSync11(tmp, path);
   } catch {}
   return next;
@@ -30452,7 +30523,7 @@ var init_boot_issue_cache = __esm(() => {
 
 // gateway/config-snapshot.ts
 import { createHash as createHash2 } from "crypto";
-import { existsSync as existsSync35, readFileSync as readFileSync32, writeFileSync as writeFileSync23, mkdirSync as mkdirSync24, renameSync as renameSync12 } from "fs";
+import { existsSync as existsSync34, readFileSync as readFileSync32, writeFileSync as writeFileSync22, mkdirSync as mkdirSync24, renameSync as renameSync12 } from "fs";
 import { dirname as dirname11 } from "path";
 function hashStringArray(items) {
   if (!items || items.length === 0)
@@ -30517,7 +30588,7 @@ function renderConfigChangeDim(dim) {
   }
 }
 function loadSnapshot(path, now = Date.now) {
-  if (!existsSync35(path))
+  if (!existsSync34(path))
     return null;
   let raw;
   try {
@@ -30553,7 +30624,7 @@ function persistSnapshot(path, snapshot) {
   try {
     mkdirSync24(dirname11(path), { recursive: true });
     const tmp = `${path}.tmp`;
-    writeFileSync23(tmp, JSON.stringify(snapshot), { mode: 384 });
+    writeFileSync22(tmp, JSON.stringify(snapshot), { mode: 384 });
     renameSync12(tmp, path);
   } catch {}
 }
@@ -30562,7 +30633,7 @@ var init_config_snapshot = __esm(() => {
 });
 
 // gateway/boot-card-msgid.ts
-import { readFileSync as readFileSync33, writeFileSync as writeFileSync24 } from "node:fs";
+import { readFileSync as readFileSync33, writeFileSync as writeFileSync23 } from "node:fs";
 function bootCardChatKey(chatId, threadId) {
   return `${chatId}:${threadId ?? ""}`;
 }
@@ -30587,7 +30658,7 @@ function saveBootCardMsgId(path, chatKey3, messageId) {
     if (store2[chatKey3] === messageId)
       return;
     store2[chatKey3] = messageId;
-    writeFileSync24(path, JSON.stringify(store2), "utf8");
+    writeFileSync23(path, JSON.stringify(store2), "utf8");
   } catch {}
 }
 var init_boot_card_msgid = () => {};
@@ -31476,7 +31547,7 @@ __export(exports_materialize_bot_token, {
   materializeBotToken: () => materializeBotToken,
   BotTokenMaterializeError: () => BotTokenMaterializeError
 });
-import { existsSync as existsSync43 } from "node:fs";
+import { existsSync as existsSync42 } from "node:fs";
 function pickConfiguredToken(config, agentName3) {
   if (agentName3) {
     const agent = config.agents?.[agentName3];
@@ -31490,7 +31561,7 @@ function tryDirectVaultRead3(ref, config, passphrase) {
   if (!passphrase)
     return null;
   const vaultPath = resolvePath(config.vault?.path ?? "~/.switchroom/vault.enc");
-  if (!existsSync43(vaultPath))
+  if (!existsSync42(vaultPath))
     return null;
   try {
     const secrets = openVault(passphrase, vaultPath);
@@ -31582,7 +31653,7 @@ __export(exports_tmux, {
   captureAgentPane: () => captureAgentPane
 });
 import { execFileSync as execFileSync5 } from "node:child_process";
-import { mkdirSync as mkdirSync31, readdirSync as readdirSync8, statSync as statSync14, unlinkSync as unlinkSync15, writeFileSync as writeFileSync30 } from "node:fs";
+import { mkdirSync as mkdirSync31, readdirSync as readdirSync8, statSync as statSync14, unlinkSync as unlinkSync15, writeFileSync as writeFileSync29 } from "node:fs";
 import { resolve as resolve7 } from "node:path";
 function captureAgentPane(opts) {
   const { agentName: agentName3, agentDir, reason } = opts;
@@ -31628,7 +31699,7 @@ function captureAgentPane(opts) {
 ` + `
 `;
   try {
-    writeFileSync30(outPath, Buffer.concat([Buffer.from(header, "utf8"), body]), {
+    writeFileSync29(outPath, Buffer.concat([Buffer.from(header, "utf8"), body]), {
       mode: 420
     });
   } catch (err) {
@@ -32074,11 +32145,11 @@ function registerApprovalsCommands(bot, opts) {
         return `\`${d.id.slice(0, 8)}\` ` + `${escapeMarkdown(d.agent_unit)} \u2192 ` + `\`${codeSpanSafe(d.scope)}\` ` + `(${escapeMarkdown(d.action)}, ${ttl}) ` + `\u00b7 /approvals revoke ${escapeMarkdown(d.id)}`;
       }).join(`
 `);
-      await ctx.replyWithRichMessage(richMessage(`**Active approvals**
+      await ctx.replyWithRichMessage(richMessage(hardenCardBreaks(`**Active approvals**
 
 ${summary}
 
-${detail}`));
+${detail}`)));
       return;
     }
     if (sub === "revoke") {
@@ -32191,7 +32262,7 @@ import { randomBytes as randomBytes8 } from "crypto";
 import { execFileSync as execFileSync6, execSync as execSync2, spawn } from "child_process";
 import {
   readFileSync as readFileSync41,
-  writeFileSync as writeFileSync31,
+  writeFileSync as writeFileSync30,
   mkdirSync as mkdirSync32,
   readdirSync as readdirSync9,
   rmSync as rmSync4,
@@ -32201,7 +32272,7 @@ import {
   chmodSync as chmodSync7,
   openSync as openSync9,
   closeSync as closeSync9,
-  existsSync as existsSync44,
+  existsSync as existsSync43,
   unlinkSync as unlinkSync16,
   appendFileSync as appendFileSync6
 } from "fs";
@@ -34776,6 +34847,12 @@ function formatFeedElapsed(ms) {
   const m = Math.floor(s / 60);
   return `${m}m${(s % 60).toString().padStart(2, "0")}s`;
 }
+var STEP_TIMER_MIN_MS = 1e4;
+function formatStepSuffix(stepElapsedMs) {
+  if (stepElapsedMs < STEP_TIMER_MIN_MS)
+    return "";
+  return ` \u00b7 ${formatFeedElapsed(stepElapsedMs)}`;
+}
 function escapeStepLine(raw) {
   const cleaned = stripMarkdown(raw).replace(/\s+/g, " ").trim();
   return escapeMarkdown(truncate(cleaned, STATUS_LINE_MAX));
@@ -34976,9 +35053,10 @@ function createWorkerActivityFeed(opts) {
     const line = view.latestSummary.trim();
     if (line.length === 0)
       return;
-    if (h.narrative[h.narrative.length - 1] === line)
+    if (h.narrative.includes(line))
       return;
     h.narrative.push(line);
+    h.stepStartedAtMs = nowFn();
     if (h.narrative.length > STATUS_ROLLING_LINES) {
       h.narrative.splice(0, h.narrative.length - STATUS_ROLLING_LINES);
     }
@@ -35045,7 +35123,7 @@ function createWorkerActivityFeed(opts) {
   function heartbeatTick() {
     const now = nowFn();
     for (const h of handles.values()) {
-      if (h.messageId == null)
+      if (!handles.has(h.agentId))
         continue;
       if (h.lastView == null)
         continue;
@@ -35053,13 +35131,23 @@ function createWorkerActivityFeed(opts) {
         continue;
       if (now < h.cooldownUntil)
         continue;
+      const liveElapsed = h.dispatchAtMs != null ? now - h.dispatchAtMs : h.lastView.elapsedMs;
+      if (h.messageId == null) {
+        if (liveElapsed < firstPaintMin)
+          continue;
+        const view2 = { ...h.lastView, elapsedMs: Math.max(h.lastView.elapsedMs, liveElapsed) };
+        h.chain = h.chain.then(() => doUpdate(h, view2)).catch((err) => {
+          log(`worker-feed: heartbeat first-paint chain error ${h.agentId}: ${err.message}`);
+        });
+        continue;
+      }
       if (now - h.lastEditAt < minEditInterval)
         continue;
       const stale = now - h.lastEditAt >= heartbeatTickMs;
       if (!stale)
         continue;
-      const liveElapsed = h.dispatchAtMs != null ? now - h.dispatchAtMs : h.lastView.elapsedMs;
-      const liveSuffix = " \u00b7 " + formatFeedElapsed(liveElapsed);
+      const stepElapsed = h.stepStartedAtMs != null ? now - h.stepStartedAtMs : liveElapsed;
+      const liveSuffix = formatStepSuffix(stepElapsed);
       const view = { ...h.lastView, elapsedMs: Math.max(h.lastView.elapsedMs, liveElapsed) };
       h.chain = h.chain.then(() => doUpdate(h, view, liveSuffix)).catch((err) => {
         log(`worker-feed: heartbeat chain error ${h.agentId}: ${err.message}`);
@@ -35093,7 +35181,8 @@ function createWorkerActivityFeed(opts) {
           narrative: [],
           chain: Promise.resolve(),
           lastView: null,
-          dispatchAtMs: null
+          dispatchAtMs: null,
+          stepStartedAtMs: null
         };
         handles.set(agentId, h);
       }
@@ -35285,8 +35374,8 @@ function renderVaultRequestAccessCard(req) {
   }
   lines.push("");
   lines.push(`_Tap Approve to mint a scoped grant token (same flow as \`switchroom vault grant\`). Tap Deny to refuse \u2014 the agent will receive a denial result._`);
-  return lines.join(`
-`);
+  return hardenCardBreaks(lines.join(`
+`));
 }
 
 // gateway/permission-card-store.ts
@@ -35389,6 +35478,12 @@ function formatFeedElapsed2(ms) {
   const m = Math.floor(s / 60);
   return `${m}m${(s % 60).toString().padStart(2, "0")}s`;
 }
+var STEP_TIMER_MIN_MS2 = 1e4;
+function formatStepSuffix2(stepElapsedMs) {
+  if (stepElapsedMs < STEP_TIMER_MIN_MS2)
+    return "";
+  return ` \u00b7 ${formatFeedElapsed2(stepElapsedMs)}`;
+}
 function escapeStepLine2(raw) {
   const cleaned = stripMarkdown(raw).replace(/\s+/g, " ").trim();
   return escapeMarkdown(truncate(cleaned, STATUS_LINE_MAX));
@@ -35767,9 +35862,6 @@ function chatKey(chatId, threadId) {
   const t = threadId == null || threadId === 0 ? "_" : String(threadId);
   return `${chatId}:${t}`;
 }
-function chatKeyWithSuffix(chatId, threadId, suffix) {
-  return `${chatKey(chatId, threadId)}:${suffix}`;
-}
 function chatIdOfChatKey(key) {
   const idx = key.indexOf(":");
   return idx === -1 ? key : key.slice(0, idx);
@@ -36218,185 +36310,6 @@ function handlePtyPartialPure(text, state, deps) {
   stream.update(text).catch(() => {});
   return created ? "update-new" : "update-existing";
 }
-// stream-reply-handler.ts
-function buildAccentHeader(accent) {
-  switch (accent) {
-    case "in-progress":
-      return `\uD83D\uDD35 _In progress\u2026_
-
-`;
-    case "done":
-      return `\u2705 **Done**
-
-`;
-    case "issue":
-      return `\u26a0\ufe0f **Issue**
-
-`;
-    default:
-      return "";
-  }
-}
-function streamKey2(chatId, threadId, lane, turnKey) {
-  const base = lane != null && lane.length > 0 ? chatKeyWithSuffix(chatId, threadId ?? null, lane) : chatKey(chatId, threadId ?? null);
-  return turnKey != null && turnKey.length > 0 ? `${base}:${turnKey}` : base;
-}
-async function handleStreamReply(args, state, deps) {
-  const chat_id = args.chat_id;
-  let rawText = deps.normalizeParagraphBreaks ? deps.normalizeParagraphBreaks(deps.repairEscapedWhitespace(args.text)) : deps.repairEscapedWhitespace(args.text);
-  if (deps.normalizePunctuation)
-    rawText = deps.normalizePunctuation(rawText);
-  if (deps.stripExcessBold)
-    rawText = deps.stripExcessBold(rawText);
-  const done = Boolean(args.done);
-  const format = args.format ?? deps.defaultFormat;
-  if (done) {
-    process.stderr.write(`telegram channel: stream_reply: invoked done=true chatId=${chat_id} lane=${args.lane ?? "default"} charCount=${rawText.length}
-`);
-  }
-  deps.assertAllowedChat(chat_id);
-  const threadId = deps.resolveThreadId(chat_id, args.message_thread_id);
-  const literalText = format === "text";
-  let effectiveText = !literalText && deps.addParagraphSpacers ? deps.addParagraphSpacers(rawText) : rawText;
-  if (args.accent != null) {
-    const accentHeader = buildAccentHeader(args.accent);
-    if (accentHeader.length > 0) {
-      effectiveText = accentHeader + effectiveText;
-    }
-  }
-  if (effectiveText.length > RICH_MESSAGE_MAX_CHARS) {
-    throw new Error(`stream_reply rejected: text exceeds Telegram's ${RICH_MESSAGE_MAX_CHARS}-char rich-message limit ` + `(length=${effectiveText.length}, format=${format}). stream_reply does not ` + `auto-chunk \u2014 split the text or use \`reply\`, which chunks.`);
-  }
-  const sKey = streamKey2(chat_id, threadId, args.lane, args.turnKey);
-  state.suppressPtyPreview?.add(streamKey2(chat_id, threadId));
-  let stream = state.activeDraftStreams.get(sKey);
-  const streamExisted = stream != null;
-  deps.logStreamingEvent({
-    kind: "stream_reply_called",
-    chatId: chat_id,
-    charCount: effectiveText.length,
-    done,
-    streamExisted
-  });
-  if (!stream) {
-    let replyToMessageId;
-    if (args.reply_to != null) {
-      replyToMessageId = Number(args.reply_to);
-    } else if (args.quote !== false && deps.getLatestInboundMessageId != null) {
-      try {
-        const latest = deps.getLatestInboundMessageId(chat_id, threadId ?? null);
-        if (latest != null)
-          replyToMessageId = latest;
-      } catch (err) {
-        deps.writeError(`telegram channel: stream_reply quote-lookup failed: ${err}
-`);
-      }
-    }
-    let initialMessageId;
-    if (deps.lookupExistingMessageId != null) {
-      try {
-        const looked = deps.lookupExistingMessageId({
-          chatId: chat_id,
-          threadId,
-          lane: args.lane,
-          turnKey: args.turnKey
-        });
-        if (typeof looked === "number" && Number.isFinite(looked)) {
-          initialMessageId = looked;
-        }
-      } catch (err) {
-        deps.writeError(`telegram channel: stream_reply lookupExistingMessageId failed: ${err}
-`);
-      }
-    }
-    stream = createStreamController({
-      bot: deps.bot,
-      chatId: chat_id,
-      threadId,
-      literalText,
-      disableLinkPreview: deps.disableLinkPreview,
-      ...deps.throttleMs != null ? { throttleMs: deps.throttleMs } : {},
-      retry: deps.retry,
-      ...replyToMessageId != null ? { replyToMessageId } : {},
-      ...args.quote_text != null && replyToMessageId != null ? { quoteText: args.quote_text } : {},
-      ...args.protect_content === true ? { protectContent: true } : {},
-      ...args.disable_notification === true ? { disableNotification: true } : {},
-      ...args.reply_markup != null ? { replyMarkup: args.reply_markup } : {},
-      isPrivateChat: deps.isPrivateChat === true,
-      ...initialMessageId != null ? { initialMessageId } : {},
-      onSend: (messageId, charCount) => deps.logStreamingEvent({ kind: "draft_send", chatId: chat_id, messageId, charCount }),
-      onEdit: (messageId, charCount) => deps.logStreamingEvent({
-        kind: "draft_edit",
-        chatId: chat_id,
-        messageId,
-        charCount,
-        sameAsLast: false
-      }),
-      log: (msg) => {
-        if (msg.startsWith("stream \u2192 sent") || msg.startsWith("stream \u2192 edited") || msg.startsWith("stream \u2192 not modified") || msg.startsWith("stream finalized") || msg.startsWith("stream \u2192 materialized"))
-          return;
-        deps.writeError(`telegram channel: stream_reply ${msg}
-`);
-      },
-      warn: (msg) => {
-        deps.writeError(`telegram channel: stream_reply ${msg}
-`);
-      }
-    });
-    state.activeDraftStreams.set(sKey, stream);
-  }
-  await stream.update(effectiveText);
-  if (done) {
-    await stream.finalize();
-    state.activeDraftStreams.delete(sKey);
-    if (stream.getMessageId() == null) {
-      throw new Error(`stream_reply finalized without sending any message (length=${rawText.length}, ` + `max=${RICH_MESSAGE_MAX_CHARS}). Telegram's rich-message limit is ${RICH_MESSAGE_MAX_CHARS} chars and ` + `stream_reply does not auto-chunk. Split the text or use \`reply\` (which chunks).`);
-    }
-    if (deps.historyEnabled) {
-      const finalId = stream.getMessageId();
-      if (finalId != null) {
-        try {
-          deps.recordOutbound({
-            chat_id,
-            thread_id: threadId ?? null,
-            message_ids: [finalId],
-            texts: [rawText]
-          });
-        } catch (err) {
-          deps.writeError(`telegram channel: history recordOutbound (stream_reply) failed: ${err}
-`);
-        }
-      }
-    }
-  }
-  const finalMessageId = stream.getMessageId();
-  if (done) {
-    process.stderr.write(`telegram channel: stream_reply: finalized done=true chatId=${chat_id} lane=${args.lane ?? "default"} messageId=${finalMessageId ?? "null"}
-`);
-    const isDefaultLaneForCompletion = args.lane == null || args.lane.length === 0;
-    if (deps.recordOutboundDelivered != null && finalMessageId != null && isDefaultLaneForCompletion) {
-      try {
-        deps.recordOutboundDelivered(chat_id, threadId);
-      } catch (err) {
-        deps.writeError(`telegram channel: stream_reply: recordOutboundDelivered hook threw: ${err}
-`);
-      }
-    }
-    if (deps.forceCompleteTurn != null && isDefaultLaneForCompletion) {
-      try {
-        deps.forceCompleteTurn(chat_id, threadId);
-      } catch (err) {
-        deps.writeError(`telegram channel: stream_reply: forceCompleteTurn hook threw: ${err}
-`);
-      }
-    }
-  }
-  return {
-    messageId: finalMessageId,
-    status: done ? "finalized" : "updated"
-  };
-}
-
 // chat-lock.ts
 function createChatLock() {
   const chains = new Map;
@@ -43677,8 +43590,8 @@ function defaultAddAccount(label, credentials, opts) {
 }
 
 // ../src/auth/broker/client.ts
-import * as net3 from "node:net";
 init_protocol();
+import * as net3 from "node:net";
 import { homedir as homedir6 } from "node:os";
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { join as join14 } from "node:path";
@@ -43997,13 +43910,13 @@ class AuthBrokerClient2 {
 init_loader();
 init_resolver();
 init_vault();
-import { existsSync as existsSync13 } from "node:fs";
+import { existsSync as existsSync12 } from "node:fs";
 var DEFAULT_VOICE_API_KEY_REF = "vault:openai/api-key";
 function tryDirectVaultRead(ref, config, passphrase) {
   if (!passphrase)
     return null;
   const vaultPath = resolvePath(config.vault?.path ?? "~/.switchroom/vault.enc");
-  if (!existsSync13(vaultPath))
+  if (!existsSync12(vaultPath))
     return null;
   try {
     const secrets = openVault(passphrase, vaultPath);
@@ -44059,14 +43972,14 @@ async function materializeVoiceKey(opts = {}, logger2 = (line) => process.stderr
 init_loader();
 init_resolver();
 init_vault();
-import { existsSync as existsSync14 } from "node:fs";
+import { existsSync as existsSync13 } from "node:fs";
 var VOICE_SIDECAR_TOKEN_KEY = "voice/sidecar-token";
 var DEFAULT_VOICE_SIDECAR_TOKEN_REF = `vault:${VOICE_SIDECAR_TOKEN_KEY}`;
 function tryDirectVaultRead2(ref, config, passphrase) {
   if (!passphrase)
     return null;
   const vaultPath = resolvePath(config.vault?.path ?? "~/.switchroom/vault.enc");
-  if (!existsSync14(vaultPath))
+  if (!existsSync13(vaultPath))
     return null;
   try {
     const secrets = openVault(passphrase, vaultPath);
@@ -44119,14 +44032,14 @@ async function materializeSidecarToken(opts = {}, logger2 = (line) => process.st
 }
 
 // ../src/setup/host-capabilities.ts
-import { existsSync as existsSync15, mkdirSync as mkdirSync12, readFileSync as readFileSync11, writeFileSync as writeFileSync9 } from "node:fs";
+import { existsSync as existsSync14, mkdirSync as mkdirSync12, readFileSync as readFileSync11, writeFileSync as writeFileSync8 } from "node:fs";
 init_paths();
 function hostCapabilitiesPath() {
   return resolveStatePath2("host-capabilities.json");
 }
 function loadHostCapabilities() {
   const path = hostCapabilitiesPath();
-  if (!existsSync15(path))
+  if (!existsSync14(path))
     return null;
   try {
     const parsed = JSON.parse(readFileSync11(path, "utf-8"));
@@ -44227,7 +44140,7 @@ function resolveExhaustUntil(resetAtMs, now = Date.now()) {
 
 // gateway/auth-add-flow.ts
 import { execFileSync } from "node:child_process";
-import { existsSync as existsSync17, mkdirSync as mkdirSync14, readFileSync as readFileSync13, readdirSync as readdirSync4, rmSync as rmSync3, statSync as statSync7, writeFileSync as writeFileSync11 } from "node:fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync14, readFileSync as readFileSync13, readdirSync as readdirSync4, rmSync as rmSync3, statSync as statSync7, writeFileSync as writeFileSync10 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
 import { join as join15 } from "node:path";
 import { randomBytes as randomBytes4 } from "node:crypto";
@@ -44236,8 +44149,8 @@ import { randomBytes as randomBytes4 } from "node:crypto";
 import {
   readFileSync as readFileSync12,
   readdirSync as readdirSync3,
-  existsSync as existsSync16,
-  writeFileSync as writeFileSync10,
+  existsSync as existsSync15,
+  writeFileSync as writeFileSync9,
   mkdirSync as mkdirSync13,
   mkdtempSync as mkdtempSync2,
   rmSync as rmSync2,
@@ -44263,7 +44176,7 @@ function parseSetupTokenUrl(output) {
 }
 function readTokenFromCredentialsFile(credentialsFilePath) {
   try {
-    if (!existsSync16(credentialsFilePath))
+    if (!existsSync15(credentialsFilePath))
       return null;
     const raw = readFileSync12(credentialsFilePath, "utf-8");
     const parsed = JSON.parse(raw);
@@ -44335,7 +44248,7 @@ function cleanScratchDir(scratchDir) {
 var AUTH_TMUX_SESSION_FILE = ".auth-tmux-session";
 function sweepOrphanSessions(home2, tmux, nowMs2 = Date.now()) {
   const inProgressDir = join15(home2, ".switchroom", "accounts", ".in-progress");
-  if (!existsSync17(inProgressDir))
+  if (!existsSync16(inProgressDir))
     return;
   let entries;
   try {
@@ -44347,7 +44260,7 @@ function sweepOrphanSessions(home2, tmux, nowMs2 = Date.now()) {
   for (const entry of entries) {
     const dir = join15(inProgressDir, entry);
     const sessionFile = join15(dir, AUTH_TMUX_SESSION_FILE);
-    if (!existsSync17(sessionFile))
+    if (!existsSync16(sessionFile))
       continue;
     let fileContents;
     let fileMtime;
@@ -44386,7 +44299,7 @@ async function startAccountAuthSession(label, opts = {}) {
   const tmuxSocket = `switchroom-${agentName3}`;
   const tmuxSession = `auth-add-${label}-${hexSuffix}`.slice(0, 64);
   try {
-    writeFileSync11(join15(scratchDir, AUTH_TMUX_SESSION_FILE), `${tmuxSocket}
+    writeFileSync10(join15(scratchDir, AUTH_TMUX_SESSION_FILE), `${tmuxSocket}
 ${tmuxSession}`, "utf8");
   } catch {}
   const sessionEnv = {
@@ -44445,7 +44358,7 @@ async function submitAccountAuthCode(flow, code, opts = {}) {
   const deadline = Date.now() + pollTimeoutMs;
   while (Date.now() < deadline) {
     await new Promise((r) => setTimeout(r, pollIntervalMs));
-    if (existsSync17(credentialsPath)) {
+    if (existsSync16(credentialsPath)) {
       const token = readTokenFromCredentialsFile(credentialsPath);
       if (token) {
         try {
@@ -44459,7 +44372,7 @@ async function submitAccountAuthCode(flow, code, opts = {}) {
       }
     }
     if (!tmux.hasSession(flow.tmuxSocket, flow.tmuxSession)) {
-      if (!existsSync17(credentialsPath)) {
+      if (!existsSync16(credentialsPath)) {
         cleanScratchDir(flow.scratchDir);
         throw new Error("claude setup-token exited without writing credentials \u2014 the code may be invalid or expired");
       }
@@ -45220,26 +45133,29 @@ function repairEscapedWhitespace(text) {
     return text;
   const nonce = Math.random().toString(36).slice(2);
   const BACKSLASH_PH = `\x00BK${nonce}_`;
-  const { masked, restore: restore2 } = maskCodeRegions(text, nonce);
+  const { masked, restore: restore2 } = maskCodeRegions2(text, nonce);
   const unescaped = masked.replace(/\\\\/g, BACKSLASH_PH).replace(/\\n/g, `
 `).replace(/\\r/g, "\r").replace(/\\t/g, "\t").replace(/\\"/g, '"').replace(new RegExp(BACKSLASH_PH.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "g"), "\\");
   return restore2(unescaped);
 }
-function maskCodeRegions(text, nonce) {
-  const CODE_MASK_PH = `\x00RM${nonce}_`;
+function maskCodeRegions2(text, nonce) {
+  const FENCE_MASK_PH = `\x00RMF${nonce}_`;
+  const INLINE_MASK_PH = `\x00RMI${nonce}_`;
   const codeMasks = [];
   const masked = text.replace(/```[\s\S]*?```/g, (m) => {
     const idx = codeMasks.length;
     codeMasks.push(m);
-    return `${CODE_MASK_PH}${idx}\x00`;
+    return `${FENCE_MASK_PH}${idx}\x00`;
   }).replace(/`[^`\n]+`/g, (m) => {
     const idx = codeMasks.length;
     codeMasks.push(m);
-    return `${CODE_MASK_PH}${idx}\x00`;
+    return `${INLINE_MASK_PH}${idx}\x00`;
   });
-  const restoreRe = new RegExp(`${CODE_MASK_PH.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(\\d+)\x00`, "g");
-  const restore2 = (s) => s.replace(restoreRe, (_m, idx) => codeMasks[Number(idx)] ?? _m);
-  return { masked, restore: restore2, placeholder: CODE_MASK_PH };
+  const escNonce = nonce.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const anyMaskRe = new RegExp(`\x00RM[FI]${escNonce}_(\\d+)\x00`, "g");
+  const restore2 = (s) => s.replace(anyMaskRe, (_m, idx) => codeMasks[Number(idx)] ?? _m);
+  const stripPlaceholders = (s) => s.replace(anyMaskRe, "");
+  return { masked, restore: restore2, placeholder: FENCE_MASK_PH, stripPlaceholders };
 }
 function splitCollapsedInlineBullets(text) {
   if (!/[\u2022\u00b7]/.test(text))
@@ -45261,7 +45177,7 @@ function normalizeParagraphBreaks(text) {
 `) && !/[\u2022\u00b7]/.test(text))
     return text;
   const nonce = Math.random().toString(36).slice(2);
-  const { masked: maskedRaw, restore: restore2, placeholder } = maskCodeRegions(text, nonce);
+  const { masked: maskedRaw, restore: restore2, placeholder } = maskCodeRegions2(text, nonce);
   const masked = splitCollapsedInlineBullets(maskedRaw);
   let out = masked.replace(/\n[ \t\r]+\n(?:[ \t\r]*\n)*/g, `
 
@@ -45290,6 +45206,36 @@ function normalizeParagraphBreaks(text) {
   out = ensureBlockBoundaries(out, placeholder);
   return restore2(out);
 }
+function hardenCardBreaks2(text) {
+  if (!text.includes(`
+`))
+    return text;
+  const nonce = Math.random().toString(36).slice(2);
+  const { masked, restore: restore2, placeholder } = maskCodeRegions2(text, nonce);
+  const out = masked.replace(/\n{3,}/g, `
+
+`);
+  const isBlockConstructLine = (line) => isListItemLine2(line) || isTableRowLine2(line) || isTableDelimiterLine2(line) || isBlockquoteLine2(line) || isHeadingLine2(line) || isFenceOpenLine2(line, placeholder);
+  const lines = out.split(`
+`);
+  const pieces = [];
+  for (let i = 0;i < lines.length; i++) {
+    let line = lines[i];
+    const isLast = i === lines.length - 1;
+    const next = isLast ? "" : lines[i + 1];
+    const promote = !isLast && line.trim() !== "" && next.trim() !== "" && !isBlockConstructLine(line) && !isBlockConstructLine(next);
+    if (promote) {
+      line = line.replace(/[ \t\r]+$/, "");
+    }
+    pieces.push(line);
+    if (isLast)
+      break;
+    pieces.push(promote ? `  
+` : `
+`);
+  }
+  return restore2(pieces.join(""));
+}
 var PARAGRAPH_SPACER = "\u00a0";
 function addParagraphSpacers(text) {
   if (!text.includes(`
@@ -45297,7 +45243,7 @@ function addParagraphSpacers(text) {
 `))
     return text;
   const nonce = Math.random().toString(36).slice(2);
-  const { masked, restore: restore2, placeholder } = maskCodeRegions(text, nonce);
+  const { masked, restore: restore2, placeholder } = maskCodeRegions2(text, nonce);
   if (!masked.includes(`
 
 `))
@@ -45308,15 +45254,15 @@ function addParagraphSpacers(text) {
   const blockKind = (line) => {
     if (asciiTrim(line) === spacerLine)
       return "spacer";
-    if (isFenceOpenLine(line, placeholder))
+    if (isFenceOpenLine2(line, placeholder))
       return "fence";
-    if (isListItemLine(line))
+    if (isListItemLine2(line))
       return "list";
-    if (isTableRowLine(line) || isTableDelimiterLine(line))
+    if (isTableRowLine2(line) || isTableDelimiterLine2(line))
       return "table";
-    if (isBlockquoteLine(line))
+    if (isBlockquoteLine2(line))
       return "quote";
-    if (isHeadingLine(line))
+    if (isHeadingLine2(line))
       return "heading";
     if (/^(-{3,}|\*{3,}|_{3,})\s*$/.test(line.trimStart()))
       return "divider";
@@ -45382,7 +45328,7 @@ function normalizePunctuation(text) {
   if (!/[\u2014\u2013\u2022\u00b7]/.test(text))
     return text;
   const nonce = Math.random().toString(36).slice(2);
-  const { masked, restore: restore2 } = maskCodeRegions(text, nonce);
+  const { masked, restore: restore2 } = maskCodeRegions2(text, nonce);
   let out = masked.replace(/(\S)[ \t][\u2014\u2013][ \t](?=(\S))/g, (_m, a, b) => /\d/.test(a) && /\d/.test(b) ? `${a}-` : `${a}, `).replace(/(\w)\u2014(?=(\w))/g, (_m, a, b) => /\d/.test(a) && /\d/.test(b) ? `${a}-` : `${a}, `).replace(/(\w)\u2013(?=\w)/g, "$1-");
   out = out.split(`
 `).map((line) => line.replace(/^([ \t]*)[\u2022\u00b7][ \t]+/, "$1- ")).join(`
@@ -45402,9 +45348,8 @@ function stripExcessBold(text) {
   if (!text.includes("**"))
     return text;
   const nonce = Math.random().toString(36).slice(2);
-  const { masked, restore: restore2, placeholder } = maskCodeRegions(text, nonce);
-  const placeholderRe = new RegExp(`${placeholder.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\d+\x00`, "g");
-  const visible = masked.replace(placeholderRe, "");
+  const { masked, restore: restore2, placeholder, stripPlaceholders } = maskCodeRegions2(text, nonce);
+  const visible = stripPlaceholders(masked);
   if (visible.length < 100)
     return restore2(masked);
   let boldChars = 0;
@@ -45419,7 +45364,7 @@ function stripExcessBold(text) {
 `).filter((l) => l.trim() !== "");
     if (lines.length === 0 || !block.includes("**"))
       return block;
-    const listLines = lines.filter((l) => isListItemLine(l));
+    const listLines = lines.filter((l) => isListItemLine2(l));
     if (listLines.length >= 2 && listLines.length === lines.length) {
       if (lines.every((l) => isFullyBolded(listItemContent(l))))
         return unbold(block);
@@ -45442,26 +45387,26 @@ function stripExcessBold(text) {
 `) + rebuilt[i];
   return restore2(out);
 }
-function isListItemLine(line) {
+function isListItemLine2(line) {
   const t = line.trimStart();
   return /^[-*+]\s/.test(t) || /^\d+[.)]\s/.test(t);
 }
-function isTableRowLine(line) {
+function isTableRowLine2(line) {
   return /^\s*\|/.test(line);
 }
-function isTableDelimiterLine(line) {
+function isTableDelimiterLine2(line) {
   return /^\s*\|?\s*:?-{1,}:?\s*(\|\s*:?-{1,}:?\s*)*\|?\s*$/.test(line);
 }
-function isFenceOpenLine(line, placeholder) {
+function isFenceOpenLine2(line, placeholder) {
   const t = line.trimStart();
   if (placeholder != null && placeholder.length > 0 && t.startsWith(placeholder))
     return true;
   return t.startsWith("```");
 }
-function isBlockquoteLine(line) {
+function isBlockquoteLine2(line) {
   return line.trimStart().startsWith(">");
 }
-function isHeadingLine(line) {
+function isHeadingLine2(line) {
   return /^#{1,6}\s/.test(line.trimStart());
 }
 function ensureBlockBoundaries(text, placeholder) {
@@ -45478,24 +45423,24 @@ function ensureBlockBoundaries(text, placeholder) {
     const curBlank = line.trim() === "";
     if (prevNonBlank && !curBlank) {
       const next = i + 1 < lines.length ? lines[i + 1] : "";
-      const prevIsTable = isTableRowLine(prev);
-      const startsTableHere = !prevIsTable && (line.includes("|") && isTableDelimiterLine(next) || isTableRowLine(line) && isTableDelimiterLine(next));
-      const startsFence = isFenceOpenLine(line, placeholder) && !isFenceOpenLine(prev, placeholder);
-      const startsQuote = isBlockquoteLine(line) && !isBlockquoteLine(prev);
-      const startsHeading = isHeadingLine(line) && !isHeadingLine(prev);
-      const startsList = isListItemLine(line) && !isListItemLine(prev);
+      const prevIsTable = isTableRowLine2(prev);
+      const startsTableHere = !prevIsTable && (line.includes("|") && isTableDelimiterLine2(next) || isTableRowLine2(line) && isTableDelimiterLine2(next));
+      const startsFence = isFenceOpenLine2(line, placeholder) && !isFenceOpenLine2(prev, placeholder);
+      const startsQuote = isBlockquoteLine2(line) && !isBlockquoteLine2(prev);
+      const startsHeading = isHeadingLine2(line) && !isHeadingLine2(prev);
+      const startsList = isListItemLine2(line) && !isListItemLine2(prev);
       if (startsTableHere || startsFence || startsQuote || startsHeading || startsList) {
         result.push("");
       }
     }
-    if (prevNonBlank && !curBlank && isFenceOpenLine(prev, placeholder)) {
+    if (prevNonBlank && !curBlank && isFenceOpenLine2(prev, placeholder)) {
       const alreadySeparated = result.length > 0 && result[result.length - 1].trim() === "";
-      const curIsBlockStart = isFenceOpenLine(line, placeholder) || isBlockquoteLine(line) || isHeadingLine(line) || isTableRowLine(line) || isTableDelimiterLine(line);
+      const curIsBlockStart = isFenceOpenLine2(line, placeholder) || isBlockquoteLine2(line) || isHeadingLine2(line) || isTableRowLine2(line) || isTableDelimiterLine2(line);
       if (!alreadySeparated && !curIsBlockStart) {
         result.push("");
       }
     }
-    if (prevNonBlank && !curBlank && isListItemLine(prev) && !isListItemLine(line)) {
+    if (prevNonBlank && !curBlank && isListItemLine2(prev) && !isListItemLine2(line)) {
       const isIndentedContinuation = /^(\t| {4,})\S/.test(line);
       const alreadySeparated = result.length > 0 && result[result.length - 1].trim() === "";
       if (!isIndentedContinuation && !alreadySeparated) {
@@ -45513,7 +45458,7 @@ function isMarkerLine(line, placeholder) {
   const t = line.trimStart();
   if (placeholder != null && placeholder.length > 0 && t.startsWith(placeholder))
     return true;
-  return /^[-*+]\s/.test(t) || /^\d+[.)]\s/.test(t) || t.startsWith(">") || /^#{1,6}\s/.test(t) || isTableRowLine(line) || isTableDelimiterLine(line) || t.startsWith("```") || /^(-{3,}|\*{3,}|_{3,})\s*$/.test(t);
+  return /^[-*+]\s/.test(t) || /^\d+[.)]\s/.test(t) || t.startsWith(">") || /^#{1,6}\s/.test(t) || isTableRowLine2(line) || isTableDelimiterLine2(line) || t.startsWith("```") || /^(-{3,}|\*{3,}|_{3,})\s*$/.test(t);
 }
 function shouldPromoteBreak(prev, next, placeholder) {
   if (isMarkerLine(prev, placeholder) || isMarkerLine(next, placeholder))
@@ -45944,7 +45889,7 @@ function formatAgentLine(meta) {
 function startText(agentName3, dmDisabled) {
   if (dmDisabled)
     return "This bot isn't accepting new connections.";
-  return [
+  return stackCardLines([
     `**Switchroom** \u2014 Telegram on your Claude Pro or Max subscription.`,
     ``,
     `This bot is the **${escapeHtml(agentName3)}** agent. Pair first, then send messages here and they reach the agent; replies and reactions come back.`,
@@ -45954,11 +45899,10 @@ function startText(agentName3, dmDisabled) {
     `2. In Claude Code: \`/telegram:access pair <code>\``,
     ``,
     `After pairing, try \`/status\` or \`/commands\`.`
-  ].join(`
-`);
+  ]);
 }
 function helpText(agentName3) {
-  return [
+  return stackCardLines([
     `**Switchroom** \u2014 your Pro/Max subscription, wired to Telegram.`,
     ``,
     `This bot is the **${escapeHtml(agentName3)}** agent. Text and photos route through to it; replies, reactions and progress cards come back.`,
@@ -45969,8 +45913,7 @@ function helpText(agentName3) {
     `\`/status\` \u2014 agent, model, auth`,
     `\`/vault audit <agent>\` \u2014 admin: review agent's vault access + one-tap [\uD83D\uDD13 Allow] on recent denials`,
     `\`/commands\` \u2014 full command list`
-  ].join(`
-`);
+  ]);
 }
 var STATUS_DOT = {
   ok: "\uD83D\uDFE2",
@@ -46016,13 +45959,14 @@ function statusPairedText(params) {
     if (audit.memoryBank)
       lines.push(`**Memory** ${escapeHtml(audit.memoryBank)}`);
   }
-  return lines.join(`
-`);
+  return stackCardLines(lines);
 }
 function statusPendingText(code) {
-  return `Pending pairing \u2014 run in Claude Code:
-
-\`/telegram:access pair ${code}\``;
+  return stackCardLines([
+    `Pending pairing \u2014 run in Claude Code:`,
+    ``,
+    `\`/telegram:access pair ${code}\``
+  ]);
 }
 function statusUnpairedText() {
   return "Not paired. Send me a message to get a pairing code.";
@@ -46053,7 +45997,7 @@ var TELEGRAM_MENU_COMMANDS = [
 var TELEGRAM_BASE_COMMANDS = TELEGRAM_MENU_COMMANDS.slice(0, 3);
 var TELEGRAM_SWITCHROOM_COMMANDS = TELEGRAM_MENU_COMMANDS.slice(3);
 function switchroomHelpText(agentName3) {
-  return [
+  return stackCardLines([
     `**Switchroom bot** \u2014 commands for the **${escapeHtml(agentName3)}** agent.`,
     ``,
     `**Session & approvals**`,
@@ -46103,8 +46047,7 @@ function switchroomHelpText(agentName3) {
     `\`/commands\` \u2014 this help`,
     ``,
     `_Tip: \`/update\` shows the plan; \`/update apply\` executes it; \`/restart\` bounces a stuck agent; \`/version\` checks what's running._`
-  ].join(`
-`);
+  ]);
 }
 function restartAckText(agentName3) {
   return `\uD83D\uDD04 Restarting **${escapeHtml(agentName3)}**\u2026`;
@@ -46228,6 +46171,7 @@ function decideTurnFlush(input) {
   if (input.chatId == null)
     return { kind: "skip", reason: "no-inbound-chat" };
   const joined = input.capturedText.join(`
+
 `).trim();
   if (joined.length === 0)
     return { kind: "skip", reason: "empty-text" };
@@ -46259,7 +46203,7 @@ function resolveAgentDirFromEnv() {
 }
 
 // active-reactions.ts
-import { readFileSync as readFileSync15, writeFileSync as writeFileSync12, renameSync as renameSync5, existsSync as existsSync20, unlinkSync as unlinkSync5 } from "node:fs";
+import { readFileSync as readFileSync15, writeFileSync as writeFileSync11, renameSync as renameSync5, existsSync as existsSync19, unlinkSync as unlinkSync5 } from "node:fs";
 import { join as join18 } from "node:path";
 var ACTIVE_REACTIONS_FILENAME = ".active-reactions.json";
 function reactionsPath(agentDir) {
@@ -46267,7 +46211,7 @@ function reactionsPath(agentDir) {
 }
 function readActiveReactions(agentDir) {
   const p = reactionsPath(agentDir);
-  if (!existsSync20(p))
+  if (!existsSync19(p))
     return [];
   let raw;
   try {
@@ -46303,7 +46247,7 @@ function writeActiveReactions(agentDir, reactions) {
   }
   const tmp = `${p}.tmp-${process.pid}-${Date.now()}`;
   try {
-    writeFileSync12(tmp, JSON.stringify(reactions) + `
+    writeFileSync11(tmp, JSON.stringify(reactions) + `
 `, "utf-8");
     renameSync5(tmp, p);
   } catch {}
@@ -46327,7 +46271,7 @@ function clearActiveReactions(agentDir) {
 }
 
 // active-reactions.ts
-import { readFileSync as readFileSync16, writeFileSync as writeFileSync13, renameSync as renameSync6, existsSync as existsSync21, unlinkSync as unlinkSync6 } from "node:fs";
+import { readFileSync as readFileSync16, writeFileSync as writeFileSync12, renameSync as renameSync6, existsSync as existsSync20, unlinkSync as unlinkSync6 } from "node:fs";
 import { join as join19 } from "node:path";
 var ACTIVE_REACTIONS_FILENAME2 = ".active-reactions.json";
 function reactionsPath2(agentDir) {
@@ -46335,7 +46279,7 @@ function reactionsPath2(agentDir) {
 }
 function readActiveReactions2(agentDir) {
   const p = reactionsPath2(agentDir);
-  if (!existsSync21(p))
+  if (!existsSync20(p))
     return [];
   let raw;
   try {
@@ -46399,6 +46343,7 @@ function flushOnAgentDisconnect(deps) {
     activeReactionMsgIds,
     activeTurnStartedAt,
     claudeBusyKeys,
+    claudeBusyKeySince,
     activeDraftStreams,
     clearActiveReactions: clearActiveReactions3,
     disposeProgressDriver,
@@ -46415,6 +46360,7 @@ function flushOnAgentDisconnect(deps) {
     activeReactionMsgIds.delete(key);
     activeTurnStartedAt.delete(key);
     claudeBusyKeys.delete(key);
+    claudeBusyKeySince.delete(key);
   }
   clearActiveReactions3();
   const danglingKeys = [...activeTurnStartedAt.keys()];
@@ -46423,6 +46369,7 @@ function flushOnAgentDisconnect(deps) {
       activeTurnStartedAt.delete(k);
       activeReactionMsgIds.delete(k);
       claudeBusyKeys.delete(k);
+      claudeBusyKeySince.delete(k);
     }
     log(`telegram gateway: disconnect-flush swept ${danglingKeys.length} dangling turn key(s) ` + `post-bridge-death (controller loop missed \u2014 finalize raced disconnect)`);
     onDanglingTurnsSwept?.(danglingKeys);
@@ -46431,6 +46378,8 @@ function flushOnAgentDisconnect(deps) {
     const orphanCount = claudeBusyKeys.size;
     const orphanKeys = [...claudeBusyKeys];
     claudeBusyKeys.clear();
+    for (const k of orphanKeys)
+      claudeBusyKeySince.delete(k);
     log(`telegram gateway: disconnect-flush cleared ${orphanCount} orphan claudeBusyKeys ` + `entr${orphanCount === 1 ? "y" : "ies"} (synthetic-inbound deliveries that never turn_ended)` + ` keys=${orphanKeys.join(",")}`);
   }
   disposeProgressDriver();
@@ -46442,6 +46391,33 @@ function flushOnAgentDisconnect(deps) {
   return true;
 }
 
+// gateway/busy-key-reaper.ts
+function markBusyKeyLockstep(keys, since, key, now) {
+  const wasBusy = keys.has(key);
+  keys.add(key);
+  if (!wasBusy)
+    since.set(key, now);
+}
+function reapOrphanBusyKeys(keys, since, now, opts) {
+  const reaped = [];
+  for (const key of [...since.keys()]) {
+    if (!keys.has(key)) {
+      since.delete(key);
+      continue;
+    }
+    if (opts.hasPendingDelivery(key))
+      continue;
+    const stampedAt = since.get(key) ?? now;
+    if (now - stampedAt >= opts.ttlMs) {
+      keys.delete(key);
+      since.delete(key);
+      reaped.push(key);
+      opts.log?.(`telegram gateway: reaped orphan busy key=${key} (no turn in flight, ` + `no pending delivery, >${opts.ttlMs}ms) \u2014 unwedging idle-drain`);
+    }
+  }
+  return reaped;
+}
+
 // gateway/preamble-suppressor.ts
 var DEFAULT_BUFFER_MS = 150;
 
@@ -47214,14 +47190,14 @@ async function approvalRecord(args, opts) {
 }
 
 // quota-check.ts
-import { readFileSync as readFileSync17, existsSync as existsSync22 } from "fs";
+import { readFileSync as readFileSync17, existsSync as existsSync21 } from "fs";
 import { join as join20 } from "path";
 var OAUTH_BETA2 = "oauth-2025-04-20";
 var DEFAULT_USER_AGENT2 = "claude-cli/1.0.0 (external, cli)";
 var DEFAULT_PROBE_MODEL2 = "claude-haiku-4-5-20251001";
 function readOauthToken2(claudeConfigDir) {
   const tokenFile = join20(claudeConfigDir, ".oauth-token");
-  if (!existsSync22(tokenFile))
+  if (!existsSync21(tokenFile))
     return null;
   try {
     const raw = readFileSync17(tokenFile, "utf-8").trim();
@@ -47401,8 +47377,7 @@ init_loader();
 var TOKEN_VALIDITY_MS2 = 365 * 24 * 60 * 60000;
 
 // ../src/agents/inject.ts
-import { execFile, execFileSync as execFileSync2 } from "node:child_process";
-import { promisify } from "node:util";
+import { execFileSync as execFileSync2 } from "node:child_process";
 
 // ../src/agents/pane-lock.ts
 var tails = new Map;
@@ -47419,7 +47394,6 @@ function withPaneLock(key, fn) {
 }
 
 // ../src/agents/inject.ts
-var execFileAsync = promisify(execFile);
 var INJECT_COMMANDS = new Map([
   ["/cost", { description: "Show session cost", expectsOutput: true, dialog: true }],
   ["/status", { description: "Show session status", expectsOutput: true, dialog: true }],
@@ -47715,9 +47689,7 @@ async function injectSlashCommandWith(runner, args) {
 }
 
 // ../src/agents/inject.ts
-import { execFile as execFile2, execFileSync as execFileSync3 } from "node:child_process";
-import { promisify as promisify2 } from "node:util";
-var execFileAsync2 = promisify2(execFile2);
+import { execFileSync as execFileSync3 } from "node:child_process";
 var INJECT_COMMANDS2 = new Map([
   ["/cost", { description: "Show session cost", expectsOutput: true, dialog: true }],
   ["/status", { description: "Show session status", expectsOutput: true, dialog: true }],
@@ -47785,7 +47757,7 @@ function makeTmuxRunner2(tmuxBin) {
   };
 }
 // stream-reply-handler.ts
-function buildAccentHeader2(accent) {
+function buildAccentHeader(accent) {
   switch (accent) {
     case "in-progress":
       return `\uD83D\uDD35 _In progress\u2026_
@@ -47909,7 +47881,7 @@ Allowed: \`${deps.escapeHtml(allow)}\``, { html: true });
     }
   }
   const { body, accent } = shapeReply(result, slashCommand, deps);
-  const finalText = buildAccentHeader2(accent) + body;
+  const finalText = buildAccentHeader(accent) + body;
   await deps.reply(ctx, finalText, { html: true, accent });
 }
 
@@ -48023,11 +47995,22 @@ async function handleModelCommand(parsed, deps) {
     };
   }
   if (result.outcome === "ok") {
+    const confirmation = modelSwitchConfirmationLine(result.output);
+    if (confirmation) {
+      return {
+        text: [
+          `${verbHtml}`,
+          deps.preBlock(confirmation),
+          ...result.truncated ? ["_truncated_"] : [],
+          PERSIST_NOTE
+        ].join(`
+`),
+        html: true
+      };
+    }
     return {
       text: [
-        `${verbHtml}`,
-        deps.preBlock(result.output),
-        ...result.truncated ? ["_truncated_"] : [],
+        `${verbHtml} \u2014 switched (session).`,
         PERSIST_NOTE
       ].join(`
 `),
@@ -48321,6 +48304,12 @@ async function handleModelMenuCallback(data, deps) {
 function isSrToClaudeTransition(prevModel, nextModel) {
   return !!prevModel?.startsWith("sr-") && !nextModel.startsWith("sr-");
 }
+function modelSwitchConfirmationLine(output) {
+  const line = output.split(`
+`).map((l) => l.trim()).find((l) => MODEL_SWITCH_CONFIRMATION_PREFIX.test(l));
+  return line && line.length > 0 ? line : null;
+}
+var MODEL_SWITCH_CONFIRMATION_PREFIX = /^\s*[\u23fa\u25cf\u2022>-]?\s*(?:Set model to|Switched to|Kept model as)\b/i;
 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();
@@ -48781,7 +48770,7 @@ init_schema();
 init_paths();
 init_overlay_loader();
 init_merge();
-import { readFileSync as readFileSync18, existsSync as existsSync23 } from "node:fs";
+import { readFileSync as readFileSync18, existsSync as existsSync22 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
 import { resolve as resolve5 } from "node:path";
 
@@ -48857,7 +48846,7 @@ function findConfigFile2(startDir) {
     resolve5(userDir, "clerk.yml")
   ].filter(Boolean);
   for (const path of searchPaths) {
-    if (existsSync23(path)) {
+    if (existsSync22(path)) {
       return path;
     }
   }
@@ -48865,7 +48854,7 @@ function findConfigFile2(startDir) {
 }
 function loadConfig2(configPath) {
   const filePath = configPath ?? findConfigFile2();
-  if (!existsSync23(filePath)) {
+  if (!existsSync22(filePath)) {
     throw new ConfigError2(`Config file not found: ${filePath}`);
   }
   let raw;
@@ -49363,9 +49352,9 @@ function topicForRecipient(args) {
 }
 
 // ../src/agents/perf.ts
-import { existsSync as existsSync24, readFileSync as readFileSync19 } from "node:fs";
+import { existsSync as existsSync23, readFileSync as readFileSync19 } from "node:fs";
 function readTurnUsages(jsonlPath, lastN) {
-  if (!existsSync24(jsonlPath))
+  if (!existsSync23(jsonlPath))
     return [];
   if (lastN <= 0)
     return [];
@@ -49462,7 +49451,7 @@ function numField(obj, key) {
 }
 
 // gateway/context-occupancy.ts
-import { mkdirSync as mkdirSync16, writeFileSync as writeFileSync14 } from "node:fs";
+import { mkdirSync as mkdirSync16, writeFileSync as writeFileSync13 } from "node:fs";
 import { join as join21 } from "node:path";
 var CONTEXT_OCCUPANCY_FILENAME = "context-occupancy.json";
 var TIGHT_FRACTION = 0.8;
@@ -49488,7 +49477,7 @@ function writeContextOccupancySnapshot(stateDir, snapshot, deps) {
   try {
     const path = join21(stateDir, CONTEXT_OCCUPANCY_FILENAME);
     (deps?.mkdir ?? ((p, o) => mkdirSync16(p, o)))(stateDir, { recursive: true });
-    (deps?.writeFile ?? ((p, d) => writeFileSync14(p, d)))(path, JSON.stringify(snapshot, null, 2) + `
+    (deps?.writeFile ?? ((p, d) => writeFileSync13(p, d)))(path, JSON.stringify(snapshot, null, 2) + `
 `);
   } catch {}
 }
@@ -49571,7 +49560,7 @@ function nextCompactNotify(state3, ev) {
 }
 
 // gateway/hostd-dispatch.ts
-import { existsSync as existsSync25 } from "node:fs";
+import { existsSync as existsSync24 } from "node:fs";
 import { randomBytes as randomBytes5 } from "node:crypto";
 
 // ../src/host-control/client.ts
@@ -49896,13 +49885,13 @@ function hostdSocketPath(agentName3) {
 function hostdWillBeUsed(agentName3) {
   if (!isHostdEnabled())
     return false;
-  return existsSync25(hostdSocketPath(agentName3));
+  return existsSync24(hostdSocketPath(agentName3));
 }
 async function tryHostdDispatch(agentName3, req, timeoutMs = 5000) {
   if (!isHostdEnabled())
     return "not-configured";
   const sockPath = hostdSocketPath(agentName3);
-  if (!existsSync25(sockPath))
+  if (!existsSync24(sockPath))
     return "not-configured";
   try {
     return await hostdRequest({ socketPath: sockPath, timeoutMs }, req);
@@ -49926,7 +49915,7 @@ async function hostdGetStatusOnce(agentName3, targetRequestId) {
   if (!isHostdEnabled())
     return "not-configured";
   const sockPath = hostdSocketPath(agentName3);
-  if (!existsSync25(sockPath))
+  if (!existsSync24(sockPath))
     return "not-configured";
   try {
     const resp = await hostdRequest({ socketPath: sockPath, timeoutMs: 3000 }, {
@@ -49947,7 +49936,7 @@ async function pollHostdStatus(agentName3, targetRequestId, opts) {
   if (!isHostdEnabled())
     return "not-configured";
   const sockPath = hostdSocketPath(agentName3);
-  if (!existsSync25(sockPath))
+  if (!existsSync24(sockPath))
     return "not-configured";
   const now = opts.now ?? Date.now;
   const sleep2 = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
@@ -50026,7 +50015,7 @@ function shouldSweepChatAtBoot(chatId) {
 
 // gateway/webhook-ingest-server.ts
 import net4 from "node:net";
-import { chmodSync as chmodSync4, existsSync as existsSync26, unlinkSync as unlinkSync7 } from "node:fs";
+import { chmodSync as chmodSync4, existsSync as existsSync25, unlinkSync as unlinkSync7 } from "node:fs";
 var MAX_REQUEST_BYTES = 1024 * 1024;
 function fdOf(conn) {
   const handle = conn._handle;
@@ -50038,7 +50027,7 @@ function startWebhookIngestServer(opts) {
   const log = opts.log ?? ((s) => process.stderr.write(s));
   const allowed = new Set(opts.allowedUids);
   try {
-    if (existsSync26(opts.socketPath))
+    if (existsSync25(opts.socketPath))
       unlinkSync7(opts.socketPath);
   } catch (err) {
     log(`webhook-ingest-server: could not unlink stale socket: ${err.message}
@@ -50131,7 +50120,7 @@ function startWebhookIngestServer(opts) {
         server.close();
       } catch {}
       try {
-        if (existsSync26(opts.socketPath))
+        if (existsSync25(opts.socketPath))
           unlinkSync7(opts.socketPath);
       } catch {}
     }
@@ -50144,13 +50133,13 @@ import { join as join24 } from "path";
 import { homedir as homedir10 } from "os";
 
 // ../src/web/webhook-handler.ts
-import { appendFileSync as appendFileSync4, existsSync as existsSync27, mkdirSync as mkdirSync17, readFileSync as readFileSync20, writeFileSync as writeFileSync15 } from "fs";
+import { appendFileSync as appendFileSync4, existsSync as existsSync26, mkdirSync as mkdirSync17, readFileSync as readFileSync20, writeFileSync as writeFileSync14 } from "fs";
 import { join as join22 } from "path";
 var DEDUP_MAX = 1000;
 var DEDUP_TTL_MS = 24 * 60 * 60 * 1000;
 function loadDedupFile(path) {
   try {
-    if (!existsSync27(path))
+    if (!existsSync26(path))
       return {};
     const raw = JSON.parse(readFileSync20(path, "utf-8"));
     return typeof raw.deliveries === "object" && raw.deliveries !== null ? raw.deliveries : {};
@@ -50166,7 +50155,7 @@ function saveDedupFile(path, deliveries, now) {
   }
   const sorted = Object.entries(pruned).sort((a, b) => b[1] - a[1]).slice(0, DEDUP_MAX);
   const final = Object.fromEntries(sorted);
-  writeFileSync15(path, JSON.stringify({ deliveries: final }), {
+  writeFileSync14(path, JSON.stringify({ deliveries: final }), {
     mode: 384
   });
 }
@@ -50196,7 +50185,7 @@ var tokenBuckets = new Map;
 var throttleIssueWindow = new Map;
 
 // ../src/web/webhook-dispatch.ts
-import { existsSync as existsSync28, mkdirSync as mkdirSync18, readFileSync as readFileSync21, writeFileSync as writeFileSync16 } from "fs";
+import { existsSync as existsSync27, mkdirSync as mkdirSync18, readFileSync as readFileSync21, writeFileSync as writeFileSync15 } from "fs";
 import { join as join23 } from "path";
 import { homedir as homedir9 } from "os";
 
@@ -50496,7 +50485,7 @@ function cooldownKey(source, eventType, repo, number, ruleIndex) {
 }
 function loadCooldownFile(path) {
   try {
-    if (!existsSync28(path))
+    if (!existsSync27(path))
       return {};
     const raw = JSON.parse(readFileSync21(path, "utf-8"));
     return typeof raw.dispatches === "object" && raw.dispatches !== null ? raw.dispatches : {};
@@ -50506,7 +50495,7 @@ function loadCooldownFile(path) {
 }
 function saveCooldownFile(path, dispatches) {
   try {
-    writeFileSync16(path, JSON.stringify({ dispatches }), {
+    writeFileSync15(path, JSON.stringify({ dispatches }), {
       mode: 384
     });
   } catch {}
@@ -51689,8 +51678,8 @@ function buildMs365CardText(p) {
   }
   lines.push("");
   lines.push("\u26a0\ufe0f Weak attestation (RFC \u00a78 v1): operator should click through to verify the actual change before approving. Structural diff coming v1.5.");
-  return lines.join(`
-`);
+  return hardenCardBreaks(lines.join(`
+`));
 }
 function truncate3(s, n) {
   if (s.length <= n)
@@ -51971,6 +51960,11 @@ function createPendingInboundBuffer(opts = {}) {
         evicted = true;
         log(`pending-inbound-buffer: agent=${agent} cap=${cap} reached \u2014 ` + `dropped oldest entry source=${dropped?.meta?.source ?? "-"} ts=${dropped?.ts ?? "-"}
 `);
+        if (dropped != null && opts.onEvict != null) {
+          try {
+            opts.onEvict(agent, dropped);
+          } catch {}
+        }
       }
       q.push(msg);
       spool?.put(agent, msg);
@@ -52265,28 +52259,41 @@ async function runStatusPinBootCleanup(args) {
   persistStatusPins(args.path, args.fs, [], log);
   return { cleared, total: persisted.length };
 }
-async function reconcileAndPersistStatusPin(args) {
+var storeLockTails = new Map;
+function withStoreLock(path, fn) {
+  const prev = storeLockTails.get(path) ?? Promise.resolve();
+  const run3 = prev.then(fn, fn);
+  storeLockTails.set(path, run3.then(() => {
+    return;
+  }, () => {
+    return;
+  }));
+  return run3;
+}
+function applyStatusPinRow(path, fs2, pinKey, row, log) {
+  const current = loadStatusPins(path, fs2);
+  const others = current.filter((p) => p.pinKey !== pinKey);
+  const next = row == null ? others : [...others, row];
+  persistStatusPins(path, fs2, next, log);
+}
+function reconcileAndPersistStatusPin(args) {
   const { path, fs: fs2, pinKey, chatId, op } = args;
   const log = args.log ?? ((l) => process.stderr.write(l));
-  if (op.kind === "pin") {
-    persistStatusPins(path, fs2, [
-      ...args.snapshotOthers(),
-      { pinKey, chatId, messageId: op.messageId, pending: true }
-    ], log);
-    const next2 = await args.applyPin();
-    if (next2 == null) {
-      persistStatusPins(path, fs2, args.snapshotOthers(), log);
-      return null;
+  return withStoreLock(path, async () => {
+    if (op.kind === "pin") {
+      applyStatusPinRow(path, fs2, pinKey, { pinKey, chatId, messageId: op.messageId, pending: true }, log);
+      const next2 = await args.applyPin();
+      if (next2 == null) {
+        applyStatusPinRow(path, fs2, pinKey, null, log);
+        return null;
+      }
+      applyStatusPinRow(path, fs2, pinKey, { pinKey, chatId, messageId: next2.messageId }, log);
+      return next2;
     }
-    persistStatusPins(path, fs2, [
-      ...args.snapshotOthers(),
-      { pinKey, chatId, messageId: next2.messageId }
-    ], log);
-    return next2;
-  }
-  const next = await args.applyPin();
-  persistStatusPins(path, fs2, args.snapshotOthers(), log);
-  return next;
+    const next = await args.applyPin();
+    applyStatusPinRow(path, fs2, pinKey, null, log);
+    return next;
+  });
 }
 
 // gateway/with-deadline.ts
@@ -52336,11 +52343,19 @@ function driveEscalation(args) {
 function shouldSuppressRepresent(o, deps) {
   if (!deps.historyEnabled)
     return false;
-  if (o.lastRepresentedAt == null)
-    return false;
+  if (o.lastRepresentedAt == null) {
+    if (o.openedAt == null)
+      return false;
+    return deps.hasOutboundDeliveredSince(o.chatId, o.openedAt, o.threadId);
+  }
   return deps.hasOutboundDeliveredSince(o.chatId, o.lastRepresentedAt, o.threadId);
 }
 
+// gateway/escalation-bridge-gate.ts
+function shouldDeferEscalationForBridge(deps) {
+  return !deps.bridgeAlive;
+}
+
 // gateway/inbound-spool.ts
 function spoolId(msg) {
   if (msg.meta?.source === "subagent_handback" && typeof msg.meta?.subagent_jsonl_id === "string" && msg.meta.subagent_jsonl_id.length > 0) {
@@ -52372,6 +52387,8 @@ function createInboundSpool(opts) {
   const escalateNoticeCooldownMs = opts.escalateNoticeCooldownMs ?? 30 * 60 * 1000;
   const live = new Map;
   const escAttemptByChat = new Map;
+  let consecutiveAppendFailures = 0;
+  let degraded = false;
   function parseLine(line) {
     const s = line.trim();
     if (!s)
@@ -52439,9 +52456,33 @@ function createInboundSpool(opts) {
     try {
       fs2.appendFileSync(path, JSON.stringify(rec) + `
 `);
+      if (consecutiveAppendFailures > 0) {
+        log(`inbound-spool: append recovered path=${path} after ` + `${consecutiveAppendFailures} failure(s) \u2014 durability restored
+`);
+        consecutiveAppendFailures = 0;
+        if (degraded) {
+          degraded = false;
+          try {
+            opts.onDegraded?.({ degraded: false, consecutiveFailures: 0, path });
+          } catch {}
+        }
+      }
     } catch (err) {
-      log(`inbound-spool: append FAILED path=${path} id=${rec.id} t=${rec.t}: ` + `${err.message} \u2014 durability degraded to in-memory
+      consecutiveAppendFailures++;
+      const message = err.message;
+      log(`inbound-spool: append FAILED path=${path} id=${rec.id} t=${rec.t}: ` + `${message} \u2014 durability degraded to in-memory ` + `(consecutive failures=${consecutiveAppendFailures})
 `);
+      if (!degraded) {
+        degraded = true;
+        try {
+          opts.onDegraded?.({
+            degraded: true,
+            consecutiveFailures: consecutiveAppendFailures,
+            path,
+            error: message
+          });
+        } catch {}
+      }
     }
   }
   function maybeCompact() {
@@ -52531,11 +52572,18 @@ function createInboundSpool(opts) {
     sweepEscalations(onEscalate) {
       const tNow = now();
       const cutoff = tNow - escalateAfterMs;
-      let dropped = 0;
-      let posted = 0;
-      for (const [id, e] of [...live.entries()]) {
+      const toDrop = [];
+      const perChatCount = new Map;
+      for (const [id, e] of live.entries()) {
         if (e.firstAt > cutoff)
           continue;
+        toDrop.push({ id, e });
+        const key = escChatKey(e.msg);
+        perChatCount.set(key, (perChatCount.get(key) ?? 0) + 1);
+      }
+      let dropped = 0;
+      let posted = 0;
+      for (const { id, e } of toDrop) {
         live.delete(id);
         appendRecord({ t: "ack", id });
         const key = escChatKey(e.msg);
@@ -52546,7 +52594,7 @@ function createInboundSpool(opts) {
         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 }, { postNotice });
+          onEscalate({ agent: e.agent, msg: e.msg }, { postNotice, droppedCount: perChatCount.get(key) ?? 1 });
         } catch (err) {
           log(`inbound-spool: onEscalate threw id=${id}: ${err.message}
 `);
@@ -52565,6 +52613,12 @@ function createInboundSpool(opts) {
     },
     liveCount() {
       return live.size;
+    },
+    isDegraded() {
+      return degraded;
+    },
+    appendFailureCount() {
+      return consecutiveAppendFailures;
     }
   };
 }
@@ -52931,12 +52985,23 @@ function createDeliveryQueue() {
 function trackDelivery(q, key, inbound, now, messageId = null) {
   q.pending.set(key, { key, inbound, messageId, lastAttemptAt: now });
 }
-function ackDelivery(q, key, enqueueMessageId = null) {
+function extractEnqueueMessageIds(content) {
+  const ids = [];
+  const re = /(?:^|[\s"'])message_id="([^"]+)"/g;
+  let m;
+  while ((m = re.exec(content)) != null)
+    ids.push(m[1]);
+  return ids;
+}
+function ackDelivery(q, key, enqueueMessageId = null, enqueueContent = null) {
   const entry = q.pending.get(key);
   if (!entry)
     return false;
-  if (entry.messageId != null && entry.messageId !== enqueueMessageId)
-    return false;
+  if (entry.messageId != null) {
+    const matches = entry.messageId === enqueueMessageId || enqueueContent != null && extractEnqueueMessageIds(enqueueContent).includes(entry.messageId);
+    if (!matches)
+      return false;
+  }
   q.pending.delete(key);
   return true;
 }
@@ -52950,6 +53015,13 @@ function sweep(q, now, timeoutMs) {
   }
   return redeliver;
 }
+function isRedeliverySuspended(key, suspended) {
+  if (suspended.keys.has(key))
+    return true;
+  const idx = key.indexOf(":");
+  const chatId = idx < 0 ? key : key.slice(0, idx);
+  return suspended.chats.has(chatId);
+}
 function forgetDelivery(q, key) {
   q.pending.delete(key);
 }
@@ -53426,6 +53498,27 @@ function dispatchOne(effect, ctx) {
   }
 }
 
+// gateway/gate-parity-probe.ts
+function gateParityDivergence(machineInTurn, busyKeysSize) {
+  const busy = busyKeysSize > 0;
+  if (machineInTurn === busy)
+    return "none";
+  if (!machineInTurn && busy)
+    return "busykeys_dangle";
+  return "machine_over_holds";
+}
+function isDangerousGateDivergence(d) {
+  return d === "machine_over_holds";
+}
+function probeGateParity(machineInTurn, busyKeysSize, log = (line) => process.stderr.write(line)) {
+  const d = gateParityDivergence(machineInTurn, busyKeysSize);
+  if (isDangerousGateDivergence(d)) {
+    log(`gw-trace gate-drift kind=${d} machineInTurn=${machineInTurn} ` + `busyKeys=${busyKeysSize} note=machine-authoritative-gate-holds-while-imperative-idle
+`);
+  }
+  return machineInTurn;
+}
+
 // gateway/prefix-warmup.ts
 var WARMUP_COOLDOWN_MS = 5 * 60000;
 var lastWarmupAtPerAgent = new Map;
@@ -53686,11 +53779,11 @@ function buildSkillProposalApplyInbound(opts) {
 // ../src/self-improve/skill-proposals.ts
 import {
   closeSync as closeSync3,
-  existsSync as existsSync29,
+  existsSync as existsSync28,
   mkdirSync as mkdirSync20,
   openSync as openSync3,
   readFileSync as readFileSync22,
-  writeSync as writeSync2
+  writeSync as writeSync3
 } from "node:fs";
 import { join as join25 } from "node:path";
 import { randomUUID as randomUUID5 } from "node:crypto";
@@ -53705,21 +53798,21 @@ function rejectedPath(stateDir) {
   return join25(stateDir, REJECTED_FILE);
 }
 function ensureDir2(stateDir) {
-  if (!existsSync29(stateDir)) {
+  if (!existsSync28(stateDir)) {
     mkdirSync20(stateDir, { recursive: true, mode: 493 });
   }
 }
 function appendLine(path, obj) {
   const fd = openSync3(path, "a");
   try {
-    writeSync2(fd, JSON.stringify(obj) + `
+    writeSync3(fd, JSON.stringify(obj) + `
 `);
   } finally {
     closeSync3(fd);
   }
 }
 function readLines(path, isValid2) {
-  if (!existsSync29(path))
+  if (!existsSync28(path))
     return [];
   let raw;
   try {
@@ -54352,10 +54445,10 @@ function escapeBody2(s) {
 }
 
 // gateway/pid-file.ts
-import { writeFileSync as writeFileSync17, readFileSync as readFileSync23, unlinkSync as unlinkSync9, renameSync as renameSync8 } from "node:fs";
+import { writeFileSync as writeFileSync16, readFileSync as readFileSync23, unlinkSync as unlinkSync9, renameSync as renameSync8 } from "node:fs";
 function writePidFile(path, record) {
   const tmp = `${path}.tmp-${process.pid}-${Date.now()}`;
-  writeFileSync17(tmp, JSON.stringify(record), "utf-8");
+  writeFileSync16(tmp, JSON.stringify(record), "utf-8");
   renameSync8(tmp, path);
 }
 function clearPidFile(path) {
@@ -54577,10 +54670,10 @@ function safeCount(fn) {
 }
 
 // gateway/session-marker.ts
-import { writeFileSync as writeFileSync18, readFileSync as readFileSync25, renameSync as renameSync9, unlinkSync as unlinkSync10 } from "node:fs";
+import { writeFileSync as writeFileSync17, readFileSync as readFileSync25, renameSync as renameSync9, unlinkSync as unlinkSync10 } from "node:fs";
 function writeSessionMarker(path, marker) {
   const tmp = `${path}.tmp-${process.pid}-${Date.now()}`;
-  writeFileSync18(tmp, JSON.stringify(marker), "utf-8");
+  writeFileSync17(tmp, JSON.stringify(marker), "utf-8");
   renameSync9(tmp, path);
 }
 function readSessionMarker(path) {
@@ -54607,11 +54700,11 @@ function shouldFireRestartBanner(input) {
 }
 
 // gateway/clean-shutdown-marker.ts
-import { writeFileSync as writeFileSync19, readFileSync as readFileSync26, renameSync as renameSync10, unlinkSync as unlinkSync11 } from "node:fs";
+import { writeFileSync as writeFileSync18, readFileSync as readFileSync26, renameSync as renameSync10, unlinkSync as unlinkSync11 } from "node:fs";
 var DEFAULT_MAX_AGE_MS = 60000;
 function writeCleanShutdownMarker(path, marker) {
   const tmp = `${path}.tmp-${process.pid}-${Date.now()}`;
-  writeFileSync19(tmp, JSON.stringify(marker), "utf-8");
+  writeFileSync18(tmp, JSON.stringify(marker), "utf-8");
   renameSync10(tmp, path);
 }
 function readCleanShutdownMarker(path) {
@@ -55207,7 +55300,7 @@ function classifyAdminGate(text, myAgentName) {
 
 // subagent-watcher.ts
 import {
-  existsSync as existsSync31,
+  existsSync as existsSync30,
   openSync as openSync5,
   readSync,
   statSync as statSync9,
@@ -55408,7 +55501,12 @@ function projectSubagentLine(line, agentId, state4) {
       if (ct === "tool_use") {
         const name = c.name ?? "";
         if (name === "Agent" || name === "Task") {
-          events.push({ kind: "sub_agent_nested_spawn", agentId });
+          events.push({
+            kind: "sub_agent_nested_spawn",
+            agentId,
+            toolUseId: c.id ?? null,
+            input: c.input ?? undefined
+          });
         } else {
           events.push({
             kind: "sub_agent_tool_use",
@@ -55657,24 +55755,43 @@ function bumpSubagentActivity(db2, args) {
     WHERE id = ?
   `).run(args.ts, args.id);
 }
+function recordNestedSubagentDispatch(db2, args) {
+  db2.prepare(`
+    INSERT OR IGNORE INTO subagents
+      (id, parent_session_id, parent_turn_key, agent_type, description,
+       background, started_at, last_activity_at, status, jsonl_agent_id,
+       parent_agent_id)
+    VALUES (?, NULL, NULL, ?, ?, ?, ?, ?, 'running', NULL, ?)
+  `).run(args.toolUseId, args.agentType ?? null, args.description ?? null, args.background ? 1 : 0, args.now, args.now, args.parentJsonlAgentId);
+  db2.prepare(`
+    UPDATE subagents
+    SET parent_agent_id = COALESCE(parent_agent_id, ?),
+        parent_turn_key = COALESCE(
+          parent_turn_key,
+          (SELECT p.parent_turn_key FROM subagents p
+           WHERE p.jsonl_agent_id = ? LIMIT 1)
+        )
+    WHERE id = ?
+  `).run(args.parentJsonlAgentId, args.parentJsonlAgentId, args.toolUseId);
+}
 
 // gateway/turn-active-marker.ts
 import {
   closeSync as closeSync4,
-  existsSync as existsSync30,
+  existsSync as existsSync29,
   mkdirSync as mkdirSync21,
   openSync as openSync4,
   readFileSync as readFileSync27,
   statSync as statSync8,
   unlinkSync as unlinkSync12,
   utimesSync,
-  writeFileSync as writeFileSync20
+  writeFileSync as writeFileSync19
 } from "node:fs";
 import { join as join26 } from "node:path";
 var TURN_ACTIVE_MARKER_FILE = "turn-active.json";
 function touchTurnActiveMarker(stateDir) {
   const path = join26(stateDir, TURN_ACTIVE_MARKER_FILE);
-  if (!existsSync30(path))
+  if (!existsSync29(path))
     return;
   const now = new Date;
   try {
@@ -55692,6 +55809,10 @@ var DEFAULT_RESCAN_MS = 1000;
 var DEFAULT_STALL_THRESHOLD_MS = 60000;
 var DEFAULT_SILENT_SYNTHESIS_STALL_THRESHOLD_MS = 300000;
 var DEFAULT_SILENT_STALL_TERMINAL_MS = 300000;
+var LONG_RUNNING_TOOLS = new Set(["Bash"]);
+function isLongRunningTool(name) {
+  return name != null && LONG_RUNNING_TOOLS.has(name);
+}
 var DEFAULT_INFLIGHT_PROMOTE_MAX_AGE_MS = 15 * 60000;
 var SUBAGENT_RESULT_TEXT_MAX = 3000;
 function parseEnvMs(varName) {
@@ -55706,6 +55827,7 @@ function parseEnvMs(varName) {
 var DEFAULT_REAPER_TTL_MS = 60 * 60000;
 var DEFAULT_REAPER_INTERVAL_MS = 15 * 60000;
 var TERMINAL_CLEANUP_GRACE_MS = 30000;
+var BACKFILL_RETRY_INTERVAL_MS = 3000;
 function backfillJsonlAgentId(db2, jsonlPath, agentId, log) {
   const metaPath = jsonlPath.replace(/\.jsonl$/, ".meta.json");
   let meta;
@@ -55754,14 +55876,38 @@ function backfillJsonlAgentId(db2, jsonlPath, agentId, log) {
   db2.prepare("UPDATE subagents SET jsonl_agent_id = ? WHERE id = ?").run(agentId, candidateId);
   log?.(`subagent-watcher: backfill linked ${agentId} \u2192 ${candidateId}`);
   try {
-    const linkedRow = db2.prepare("SELECT started_at, parent_turn_key FROM subagents WHERE id = ?").get(candidateId);
+    const linkedRow = db2.prepare("SELECT started_at, parent_turn_key, parent_agent_id FROM subagents WHERE id = ?").get(candidateId);
     if (linkedRow != null && linkedRow.parent_turn_key == null) {
-      const turn = db2.prepare(`SELECT turn_key FROM turns
-           WHERE started_at <= ? AND (ended_at IS NULL OR ended_at >= ?)
-           ORDER BY started_at DESC LIMIT 1`).get(linkedRow.started_at, linkedRow.started_at);
-      if (turn?.turn_key != null) {
-        db2.prepare("UPDATE subagents SET parent_turn_key = ? WHERE id = ?").run(turn.turn_key, candidateId);
-        log?.(`subagent-watcher: backfill parent_turn_key ${candidateId} \u2192 ${turn.turn_key}`);
+      let resolvedKey = null;
+      if (linkedRow.parent_agent_id != null && linkedRow.parent_agent_id.length > 0) {
+        const seen = new Set([agentId]);
+        let cursor = linkedRow.parent_agent_id;
+        for (let hop = 0;hop < 5 && cursor != null && !seen.has(cursor); hop++) {
+          seen.add(cursor);
+          const parentRow = db2.prepare("SELECT parent_turn_key, parent_agent_id FROM subagents WHERE jsonl_agent_id = ? LIMIT 1").get(cursor);
+          if (parentRow == null)
+            break;
+          if (parentRow.parent_turn_key != null && parentRow.parent_turn_key.length > 0) {
+            resolvedKey = parentRow.parent_turn_key;
+            break;
+          }
+          cursor = parentRow.parent_agent_id ?? null;
+        }
+        if (resolvedKey != null) {
+          log?.(`subagent-watcher: backfill parent_turn_key ${candidateId} \u2192 ${resolvedKey} (inherited via nested-parent chain)`);
+        }
+      }
+      if (resolvedKey == null) {
+        const turn = db2.prepare(`SELECT turn_key FROM turns
+             WHERE started_at <= ? AND (ended_at IS NULL OR ended_at >= ?)
+             ORDER BY started_at DESC LIMIT 1`).get(linkedRow.started_at, linkedRow.started_at);
+        if (turn?.turn_key != null) {
+          resolvedKey = turn.turn_key;
+          log?.(`subagent-watcher: backfill parent_turn_key ${candidateId} \u2192 ${resolvedKey}`);
+        }
+      }
+      if (resolvedKey != null) {
+        db2.prepare("UPDATE subagents SET parent_turn_key = ? WHERE id = ?").run(resolvedKey, candidateId);
       }
     }
   } catch (err) {
@@ -55791,6 +55937,14 @@ function readSubTail(entry, tail, now, onDescriptionUpdate, fs2, log, db2, paren
         const existing = db2.prepare("SELECT id, background FROM subagents WHERE jsonl_agent_id = ?").get(entry.agentId);
         if (existing == null) {
           log?.(`subagent-watcher: liveness skip ${entry.agentId} \u2014 row not in DB yet (Phase 2 Pre hook pending)`);
+          if (entry.lastBackfillAttemptAt == null || now - entry.lastBackfillAttemptAt >= BACKFILL_RETRY_INTERVAL_MS) {
+            entry.lastBackfillAttemptAt = now;
+            try {
+              backfillJsonlAgentId(db2, entry.filePath, entry.agentId, log);
+            } catch (bfErr) {
+              log?.(`subagent-watcher: backfill retry error ${entry.agentId}: ${bfErr.message}`);
+            }
+          }
         } else {
           bumpSubagentActivity(db2, { id: existing.id, ts: now });
           isForeground = existing.background === 0;
@@ -55913,6 +56067,23 @@ function readSubTail(entry, tail, now, onDescriptionUpdate, fs2, log, db2, paren
               }
             }
           }
+        } else if (ev.kind === "sub_agent_nested_spawn") {
+          if (db2 != null && ev.toolUseId != null && ev.toolUseId.length > 0) {
+            try {
+              const nestedInput = ev.input ?? {};
+              recordNestedSubagentDispatch(db2, {
+                toolUseId: ev.toolUseId,
+                parentJsonlAgentId: entry.agentId,
+                agentType: typeof nestedInput.subagent_type === "string" ? nestedInput.subagent_type : null,
+                description: typeof nestedInput.description === "string" ? nestedInput.description : null,
+                background: nestedInput.run_in_background === true,
+                now
+              });
+              log?.(`subagent-watcher: nested dispatch recorded parent=${entry.agentId} toolUseId=${ev.toolUseId}`);
+            } catch (dbErr) {
+              log?.(`subagent-watcher: nested dispatch record error ${entry.agentId}: ${dbErr.message}`);
+            }
+          }
         } else if (ev.kind === "sub_agent_text") {
           entry.lastSummaryLine = clipNarrative(ev.text);
           entry.lastResultText = ev.text.trim().slice(0, SUBAGENT_RESULT_TEXT_MAX);
@@ -55984,7 +56155,7 @@ function startSubagentWatcher(config) {
     clearTimeout(ref.ref);
   });
   const fs2 = config.fs ?? {
-    existsSync: existsSync31,
+    existsSync: existsSync30,
     readdirSync: readdirSync5,
     statSync: statSync9,
     openSync: openSync5,
@@ -56064,6 +56235,15 @@ function startSubagentWatcher(config) {
             log?.(`subagent-watcher: backfill error for ${agentId}: ${err.message}`);
           }
         }
+        entry.toolCount = 0;
+        entry.lastTool = null;
+        entry.pendingNarrative = null;
+        tail.cursor = 0;
+        tail.pendingPartial = "";
+        tail.hasEmittedStart = false;
+        readSubTail(entry, tail, n, (desc) => {
+          log?.(`subagent-watcher: description updated for ${agentId}: ${desc}`);
+        }, fs2, log, db2, parentStateDir, config.onUnstall, undefined, config.onProgress);
       }
     }
     if (isHistorical && entry.state === "done") {
@@ -56172,7 +56352,7 @@ function startSubagentWatcher(config) {
       if (entry.stallNotified)
         continue;
       const idleMs = n - entry.lastActivityAt;
-      const threshold = entry.toolCount === 0 ? silentSynthesisStallThresholdMs : stallThresholdMs;
+      const threshold = entry.toolCount === 0 || isLongRunningTool(entry.lastTool?.name) ? silentSynthesisStallThresholdMs : stallThresholdMs;
       if (idleMs >= threshold) {
         entry.stallNotified = true;
         entry.stalledAt = n;
@@ -56448,7 +56628,7 @@ function determineRestartReason(opts) {
 init_boot_card();
 
 // gateway/update-announce.ts
-import { existsSync as existsSync36, mkdirSync as mkdirSync25, openSync as openSync6, closeSync as closeSync6, readFileSync as readFileSync34 } from "node:fs";
+import { existsSync as existsSync35, mkdirSync as mkdirSync25, openSync as openSync6, closeSync as closeSync6, readFileSync as readFileSync34 } from "node:fs";
 import { join as join32 } from "node:path";
 import { homedir as homedir12 } from "node:os";
 
@@ -56577,7 +56757,7 @@ function readAndFilter(raw, filters, limit) {
 var DEFAULT_LOOKBACK_MS = 10 * 60 * 1000;
 function readLastTerminalUpdateAudit(opts = {}) {
   const path = opts.auditLogPath ?? defaultAuditLogPath();
-  const exists = opts.exists ?? existsSync36;
+  const exists = opts.exists ?? existsSync35;
   const readFile = opts.readFile ?? ((p) => readFileSync34(p, "utf-8"));
   if (!exists(path))
     return null;
@@ -56667,7 +56847,7 @@ function maybeRenderUpdateAnnouncement(opts = {}) {
 
 // issues-card.ts
 init_card_format();
-import { readFileSync as readFileSync35, writeFileSync as writeFileSync25 } from "node:fs";
+import { readFileSync as readFileSync35, writeFileSync as writeFileSync24 } from "node:fs";
 var SEVERITY_EMOJI = {
   info: "\u2139\ufe0f",
   warn: "\u26a0\ufe0f",
@@ -56775,7 +56955,7 @@ function readPersistedMessageId(path, log) {
 }
 function writePersistedMessageId(path, messageId, log) {
   try {
-    writeFileSync25(path, JSON.stringify({ messageId }) + `
+    writeFileSync24(path, JSON.stringify({ messageId }) + `
 `, { mode: 384 });
   } catch (err) {
     log(`issues-card: persist write failed (${err.message})`);
@@ -56868,13 +57048,13 @@ function createIssuesCardHandle(opts) {
 }
 
 // issues-watcher.ts
-import { existsSync as existsSync38, statSync as statSync11 } from "node:fs";
+import { existsSync as existsSync37, statSync as statSync11 } from "node:fs";
 import { join as join34 } from "node:path";
 
 // ../src/issues/store.ts
 import {
   closeSync as closeSync7,
-  existsSync as existsSync37,
+  existsSync as existsSync36,
   mkdirSync as mkdirSync26,
   openSync as openSync7,
   readdirSync as readdirSync7,
@@ -56882,8 +57062,8 @@ import {
   renameSync as renameSync13,
   statSync as statSync10,
   unlinkSync as unlinkSync13,
-  writeFileSync as writeFileSync26,
-  writeSync as writeSync3
+  writeFileSync as writeFileSync25,
+  writeSync as writeSync4
 } from "node:fs";
 import { join as join33 } from "node:path";
 import { randomBytes as randomBytes6 } from "node:crypto";
@@ -56905,7 +57085,7 @@ var ISSUES_FILE = "issues.jsonl";
 var ISSUES_LOCK = "issues.lock";
 function readAll(stateDir) {
   const path = join33(stateDir, ISSUES_FILE);
-  if (!existsSync37(path))
+  if (!existsSync36(path))
     return [];
   let raw;
   try {
@@ -56941,7 +57121,7 @@ function list(stateDir, opts = {}) {
   });
 }
 function resolve6(stateDir, fingerprint, nowFn = Date.now) {
-  if (!existsSync37(join33(stateDir, ISSUES_FILE)))
+  if (!existsSync36(join33(stateDir, ISSUES_FILE)))
     return 0;
   return withLock(stateDir, () => {
     const all = readAll(stateDir);
@@ -56965,7 +57145,7 @@ function writeAll(stateDir, events) {
   const body = events.length === 0 ? "" : events.map((e) => JSON.stringify(e)).join(`
 `) + `
 `;
-  writeFileSync26(tmp, body, "utf-8");
+  writeFileSync25(tmp, body, "utf-8");
   renameSync13(tmp, path);
 }
 var ORPHAN_TMP_TTL_MS = 60000;
@@ -57000,7 +57180,7 @@ function withLock(stateDir, fn) {
     try {
       fd = openSync7(lockPath, "wx");
       try {
-        writeSync3(fd, String(process.pid));
+        writeSync4(fd, String(process.pid));
       } catch {}
     } catch (err) {
       const e = err;
@@ -57126,7 +57306,7 @@ function startIssuesWatcher(opts) {
   };
 }
 function defaultSignatureProvider(path) {
-  if (!existsSync38(path))
+  if (!existsSync37(path))
     return null;
   try {
     const stat = statSync11(path);
@@ -58127,7 +58307,7 @@ function extractFlowItems(line) {
 
 // credits-watch.ts
 init_card_format();
-import { readFileSync as readFileSync37, writeFileSync as writeFileSync27, existsSync as existsSync39, mkdirSync as mkdirSync27 } from "fs";
+import { readFileSync as readFileSync37, writeFileSync as writeFileSync26, existsSync as existsSync38, mkdirSync as mkdirSync27 } from "fs";
 import { join as join35 } from "path";
 var STATE_FILE = "credits-watch.json";
 var DEFAULT_CREDIT_FATAL_REASONS = new Set;
@@ -58151,7 +58331,7 @@ function emptyCreditState() {
 }
 function readClaudeJsonOverage(claudeConfigDir) {
   const path = join35(claudeConfigDir, ".claude.json");
-  if (!existsSync39(path))
+  if (!existsSync38(path))
     return null;
   let raw;
   try {
@@ -58234,7 +58414,7 @@ function humanizeReason(reason) {
 }
 function loadCreditState(stateDir) {
   const path = join35(stateDir, STATE_FILE);
-  if (!existsSync39(path))
+  if (!existsSync38(path))
     return emptyCreditState();
   try {
     const raw = readFileSync37(path, "utf-8");
@@ -58251,12 +58431,12 @@ function loadCreditState(stateDir) {
 function saveCreditState(stateDir, state4) {
   mkdirSync27(stateDir, { recursive: true });
   const path = join35(stateDir, STATE_FILE);
-  writeFileSync27(path, JSON.stringify(state4, null, 2) + `
+  writeFileSync26(path, JSON.stringify(state4, null, 2) + `
 `, { mode: 384 });
 }
 
 // quota-watch.ts
-import { readFileSync as readFileSync38, writeFileSync as writeFileSync28, existsSync as existsSync40, mkdirSync as mkdirSync28 } from "fs";
+import { readFileSync as readFileSync38, writeFileSync as writeFileSync27, existsSync as existsSync39, mkdirSync as mkdirSync28 } from "fs";
 import { join as join36 } from "path";
 init_card_format();
 var STATE_FILE2 = "quota-watch.json";
@@ -58453,7 +58633,7 @@ function buildRecoveryMessage(agentName3, snap) {
 }
 function loadQuotaWatchState(stateDir) {
   const path = join36(stateDir, STATE_FILE2);
-  if (!existsSync40(path))
+  if (!existsSync39(path))
     return emptyQuotaWatchState();
   try {
     const raw = readFileSync38(path, "utf-8");
@@ -58475,7 +58655,7 @@ function loadQuotaWatchState(stateDir) {
 function saveQuotaWatchState(stateDir, state4) {
   mkdirSync28(stateDir, { recursive: true });
   const path = join36(stateDir, STATE_FILE2);
-  writeFileSync28(path, JSON.stringify(state4, null, 2) + `
+  writeFileSync27(path, JSON.stringify(state4, null, 2) + `
 `, { mode: 384 });
 }
 function patchQuotaWatchState(current, accountLabel, accountState) {
@@ -58505,27 +58685,27 @@ function maskVaultKey(name) {
 // gateway/turn-active-marker.ts
 import {
   closeSync as closeSync8,
-  existsSync as existsSync41,
+  existsSync as existsSync40,
   mkdirSync as mkdirSync29,
   openSync as openSync8,
   readFileSync as readFileSync39,
   statSync as statSync12,
   unlinkSync as unlinkSync14,
   utimesSync as utimesSync2,
-  writeFileSync as writeFileSync29
+  writeFileSync as writeFileSync28
 } from "node:fs";
 import { join as join37 } from "node:path";
 var TURN_ACTIVE_MARKER_FILE2 = "turn-active.json";
 function writeTurnActiveMarker(stateDir, marker) {
   try {
     mkdirSync29(stateDir, { recursive: true });
-    writeFileSync29(join37(stateDir, TURN_ACTIVE_MARKER_FILE2), JSON.stringify(marker, null, 2) + `
+    writeFileSync28(join37(stateDir, TURN_ACTIVE_MARKER_FILE2), JSON.stringify(marker, null, 2) + `
 `, { mode: 384 });
   } catch {}
 }
 function touchTurnActiveMarker2(stateDir) {
   const path = join37(stateDir, TURN_ACTIVE_MARKER_FILE2);
-  if (!existsSync41(path))
+  if (!existsSync40(path))
     return;
   const now = new Date;
   try {
@@ -58544,7 +58724,7 @@ function removeTurnActiveMarker(stateDir) {
 }
 function sweepStaleTurnActiveMarker(stateDir, opts) {
   const path = join37(stateDir, TURN_ACTIVE_MARKER_FILE2);
-  if (!existsSync41(path))
+  if (!existsSync40(path))
     return false;
   const now = opts.now ?? Date.now();
   try {
@@ -58584,11 +58764,11 @@ function readTurnActiveMarkerAgeMs(stateDir, now) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.15.48";
-var COMMIT_SHA = "eee77212";
-var COMMIT_DATE = "2026-07-04T12:23:42+10:00";
-var LATEST_PR = null;
-var COMMITS_AHEAD_OF_TAG = 2;
+var VERSION = "0.17.1";
+var COMMIT_SHA = "d7162c0";
+var COMMIT_DATE = "2026-07-05T05:44:23Z";
+var LATEST_PR = 2831;
+var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
 function formatRelativeAgo(iso) {
@@ -59630,6 +59810,7 @@ var SCHEMA_SQL = `
     assistant_reply_preview TEXT,
     tool_call_count         INTEGER,
     interrupt_reason        TEXT,
+    resumed_at              INTEGER,
     created_at              INTEGER NOT NULL,
     updated_at              INTEGER NOT NULL
   );
@@ -59643,12 +59824,15 @@ var PHASE1_MIGRATIONS = [
 var PHASE2_MIGRATIONS = [
   `ALTER TABLE turns ADD COLUMN interrupt_reason TEXT`
 ];
+var PHASE3_MIGRATIONS = [
+  `ALTER TABLE turns ADD COLUMN resumed_at INTEGER`
+];
 function applySchema(db2) {
   db2.exec("PRAGMA journal_mode = WAL");
   db2.exec("PRAGMA synchronous = NORMAL");
   db2.exec("PRAGMA busy_timeout = 5000");
   db2.exec(SCHEMA_SQL);
-  for (const sql of [...PHASE1_MIGRATIONS, ...PHASE2_MIGRATIONS]) {
+  for (const sql of [...PHASE1_MIGRATIONS, ...PHASE2_MIGRATIONS, ...PHASE3_MIGRATIONS]) {
     try {
       db2.exec(sql);
     } catch (err) {
@@ -59690,6 +59874,7 @@ function mapRow(row) {
     assistant_reply_preview: row.assistant_reply_preview,
     tool_call_count: row.tool_call_count,
     interrupt_reason: row.interrupt_reason,
+    resumed_at: row.resumed_at,
     created_at: row.created_at,
     updated_at: row.updated_at
   };
@@ -59753,6 +59938,14 @@ var INTERRUPTED_VIA = new Set([
   "timeout",
   "unknown"
 ]);
+function markTurnResumed(db2, turnKey, now = Date.now()) {
+  db2.prepare(`
+    UPDATE turns
+    SET resumed_at = ?,
+        updated_at = ?
+    WHERE turn_key = ? AND resumed_at IS NULL
+  `).run(now, now, turnKey);
+}
 function findLatestTurnIfInterrupted(db2) {
   const row = db2.prepare(`
     SELECT * FROM turns
@@ -59762,6 +59955,8 @@ function findLatestTurnIfInterrupted(db2) {
   if (!row)
     return null;
   const turn = mapRow(row);
+  if (turn.resumed_at != null)
+    return null;
   if (turn.ended_at == null)
     return turn;
   if (turn.ended_via != null && INTERRUPTED_VIA.has(turn.ended_via))
@@ -59885,7 +60080,8 @@ var SUBAGENTS_SCHEMA_SQL = `
     ended_at          INTEGER,
     status            TEXT    NOT NULL,
     result_summary    TEXT,
-    jsonl_agent_id    TEXT
+    jsonl_agent_id    TEXT,
+    parent_agent_id   TEXT
   );
   CREATE INDEX IF NOT EXISTS subagents_turn      ON subagents(parent_turn_key);
   CREATE INDEX IF NOT EXISTS subagents_status    ON subagents(status);
@@ -59897,6 +60093,10 @@ function applySubagentsSchema(db2) {
   if (!hasJsonlId) {
     db2.exec("ALTER TABLE subagents ADD COLUMN jsonl_agent_id TEXT");
   }
+  const hasParentAgentId = cols.some((c) => c.name === "parent_agent_id");
+  if (!hasParentAgentId) {
+    db2.exec("ALTER TABLE subagents ADD COLUMN parent_agent_id TEXT");
+  }
   db2.exec("CREATE INDEX IF NOT EXISTS subagents_jsonl_id ON subagents(jsonl_agent_id)");
 }
 function mapSubagentRow(row) {
@@ -59912,19 +60112,38 @@ function mapSubagentRow(row) {
     ended_at: row.ended_at,
     status: row.status,
     result_summary: row.result_summary,
-    jsonl_agent_id: row.jsonl_agent_id
+    jsonl_agent_id: row.jsonl_agent_id,
+    parent_agent_id: row.parent_agent_id ?? null
   };
 }
 function getSubagentByJsonlId(db2, jsonlAgentId) {
   const row = db2.prepare("SELECT * FROM subagents WHERE jsonl_agent_id = ?").get(jsonlAgentId);
   return row ? mapSubagentRow(row) : null;
 }
+function resolveSubagentOriginTurnKey(db2, jsonlAgentId, maxHops = 5) {
+  const seen = new Set;
+  let currentJsonlId = jsonlAgentId;
+  for (let hop = 0;hop <= maxHops && currentJsonlId != null; hop++) {
+    if (seen.has(currentJsonlId))
+      return null;
+    seen.add(currentJsonlId);
+    const row = db2.prepare("SELECT parent_turn_key, parent_agent_id FROM subagents WHERE jsonl_agent_id = ? LIMIT 1").get(currentJsonlId);
+    if (row == null)
+      return null;
+    if (row.parent_turn_key != null && row.parent_turn_key.length > 0)
+      return row.parent_turn_key;
+    currentJsonlId = row.parent_agent_id ?? null;
+  }
+  return null;
+}
 
 // gateway/worker-feed-dispatch.ts
 function resolveWorkerFeedDispatch(sub, watcherDescription) {
   return {
     isBackground: sub?.background ?? false,
-    feedDescription: (sub?.description ?? "") || watcherDescription
+    feedDescription: (sub?.description ?? "") || watcherDescription,
+    hasRow: sub != null,
+    isNested: sub?.parent_agent_id != null
   };
 }
 
@@ -59943,35 +60162,19 @@ function isOrphanSubagentStatusEnabled(envVal) {
   return envVal !== "0";
 }
 
-// gateway/resolve-calling-subagent.ts
-function resolveCallingSubagent(opts) {
-  if (opts.db == null)
-    return null;
-  try {
-    if (opts.agentIdHint != null) {
-      const row = opts.db.prepare("SELECT jsonl_agent_id FROM subagents WHERE jsonl_agent_id = ? AND status = 'running'").get(opts.agentIdHint);
-      if (row?.jsonl_agent_id)
-        return { agentId: row.jsonl_agent_id };
-    }
-    if (opts.toolUseIdHint != null) {
-      const row = opts.db.prepare("SELECT jsonl_agent_id FROM subagents WHERE id = ? AND status = 'running'").get(opts.toolUseIdHint);
-      if (row?.jsonl_agent_id)
-        return { agentId: row.jsonl_agent_id };
-    }
-    const turnRow = opts.db.prepare("SELECT turn_key FROM turns WHERE chat_id = ? AND ended_at IS NULL ORDER BY started_at DESC LIMIT 1").get(opts.chatId);
-    if (turnRow?.turn_key == null)
-      return null;
-    const candidates = opts.db.prepare("SELECT jsonl_agent_id FROM subagents WHERE parent_turn_key = ? AND status = 'running' AND jsonl_agent_id IS NOT NULL ORDER BY started_at DESC").all(turnRow.turn_key);
-    if (candidates.length === 0)
-      return null;
-    if (candidates.length > 1) {
-      console.warn(`progress_update: heuristic resolution selected most-recent of ${candidates.length} running sub-agents (chat=${opts.chatId}); pass agent_id explicitly to avoid mis-attribution`);
-    }
-    return { agentId: candidates[0].jsonl_agent_id };
-  } catch (err) {
-    console.warn("progress_update: resolveCallingSubagent SQL error", err);
-    return null;
-  }
+// status-query-telemetry.ts
+function deriveStatusQueryTelemetry(s) {
+  const idle = !s.turnActive && s.runningWorkers <= 0 && s.workerFeedSize <= 0 && s.pendingAsync <= 0;
+  const stage = idle ? "idle" : s.turnActive ? "turn-active" : "background-work";
+  return { stage, idle };
+}
+function formatStatusQueryLine(agentName3, chatId, thread, s, t) {
+  return `telegram gateway: status-query agent=${agentName3} chat_id=${chatId} thread=${thread} ` + `stage=${t.stage} turn_age_s=${s.turnAgeS} running_workers=${s.runningWorkers} ` + `worker_feed=${s.workerFeedSize} pending_async=${s.pendingAsync}
+`;
+}
+function formatStatusQueryUxFailureLine(agentName3, chatId, thread) {
+  return `telegram gateway: ux-failure: status-query agent=${agentName3} chat_id=${chatId} thread=${thread} ` + `stage=idle turn_age_s=-1 running_workers=0 worker_feed=0 pending_async=0
+`;
 }
 
 // gateway/gateway.ts
@@ -60277,7 +60480,7 @@ function saveAccess(a) {
     return;
   mkdirSync32(STATE_DIR, { recursive: true, mode: 448 });
   const tmp = ACCESS_FILE + ".tmp";
-  writeFileSync31(tmp, JSON.stringify(a, null, 2) + `
+  writeFileSync30(tmp, JSON.stringify(a, null, 2) + `
 `, { mode: 384 });
   renameSync14(tmp, ACCESS_FILE);
 }
@@ -60314,7 +60517,7 @@ try {
   let markerAgeMs = null;
   try {
     const markerPath = join40(STATE_DIR, TURN_ACTIVE_MARKER_FILE2);
-    if (existsSync44(markerPath)) {
+    if (existsSync43(markerPath)) {
       const st = statSync15(markerPath);
       markerAgeMs = Date.now() - st.mtimeMs;
       try {
@@ -60400,13 +60603,13 @@ try {
         pending2.interrupt_reason != null ? `SWITCHROOM_PENDING_INTERRUPT_REASON=${pending2.interrupt_reason}` : `SWITCHROOM_PENDING_INTERRUPT_REASON=`
       ];
       const pendingEnvTmp = `${pendingEnvPath}.tmp-${process.pid}`;
-      writeFileSync31(pendingEnvTmp, lines.join(`
+      writeFileSync30(pendingEnvTmp, lines.join(`
 `) + `
 `, { mode: 384 });
       renameSync14(pendingEnvTmp, pendingEnvPath);
       process.stderr.write(`telegram gateway: pending-turn env written to ${pendingEnvPath} turnKey=${pending2.turn_key} endedVia=${pending2.ended_via ?? "open"}
 `);
-    } else if (existsSync44(pendingEnvPath)) {
+    } else if (existsSync43(pendingEnvPath)) {
       rmSync4(pendingEnvPath, { force: true });
       process.stderr.write(`telegram gateway: pending-turn env cleared (clean previous shutdown)
 `);
@@ -60424,10 +60627,10 @@ function resolveSubagentOriginChat(agentId) {
   if (turnsDb == null)
     return null;
   try {
-    const sub = getSubagentByJsonlId(turnsDb, agentId);
-    if (sub?.parent_turn_key == null)
+    const originKey = resolveSubagentOriginTurnKey(turnsDb, agentId);
+    if (originKey == null)
       return null;
-    const turn = getTurnByKey(turnsDb, sub.parent_turn_key);
+    const turn = getTurnByKey(turnsDb, originKey);
     if (turn == null || turn.chat_id.length === 0)
       return null;
     const threadNum = turn.thread_id != null && turn.thread_id.length > 0 ? Number(turn.thread_id) : NaN;
@@ -60506,6 +60709,7 @@ var chatAvailableReactions = new Map;
 var chatProbesInFlight = new Set;
 var activeTurnStartedAt = new Map;
 var claudeBusyKeys = new Set;
+var claudeBusyKeySince = new Map;
 var reactionTransitionCounts = new Map;
 var firstTextReplyLogged = new Set;
 function markClaudeBusyForInbound(m) {
@@ -60516,9 +60720,20 @@ function markClaudeBusyForInbound(m) {
       tid = n;
   }
   const key = chatKey2(m.chatId, tid);
-  claudeBusyKeys.add(key);
+  markBusyKeyLockstep(claudeBusyKeys, claudeBusyKeySince, key, Date.now());
   return key;
 }
+var _busyOrphanTtlRaw = process.env.SWITCHROOM_BUSY_ORPHAN_TTL_MS;
+var _busyOrphanTtlParsed = _busyOrphanTtlRaw != null && _busyOrphanTtlRaw !== "" ? Number(_busyOrphanTtlRaw) : 360000;
+var CLAUDE_BUSY_ORPHAN_TTL_MS = Number.isFinite(_busyOrphanTtlParsed) && _busyOrphanTtlParsed > 0 ? _busyOrphanTtlParsed : 360000;
+function reapOrphanBusyKeysNow(now) {
+  reapOrphanBusyKeys(claudeBusyKeys, claudeBusyKeySince, now, {
+    ttlMs: CLAUDE_BUSY_ORPHAN_TTL_MS,
+    hasPendingDelivery: (key) => deliveryQueue.pending.has(key),
+    log: (msg) => process.stderr.write(`${msg}
+`)
+  });
+}
 var DELIVERY_CONFIRM_ENABLED = process.env.SWITCHROOM_INBOUND_DELIVERY_CONFIRM !== "0";
 var _deliveryTimeoutRaw = process.env.SWITCHROOM_INBOUND_DELIVERY_TIMEOUT_MS;
 var _deliveryTimeoutParsed = _deliveryTimeoutRaw != null && _deliveryTimeoutRaw !== "" ? Number(_deliveryTimeoutRaw) : 15000;
@@ -60572,9 +60787,9 @@ function noteAgentOutputAt(key, ts) {
 var OBLIGATION_STORE_PATH = join40(STATE_DIR, "obligations.json");
 var obligationStoreFs = {
   readFileSync: (p) => readFileSync41(p, "utf8"),
-  writeFileSync: (p, d) => writeFileSync31(p, d),
+  writeFileSync: (p, d) => writeFileSync30(p, d),
   renameSync: (a, b) => renameSync14(a, b),
-  existsSync: (p) => existsSync44(p)
+  existsSync: (p) => existsSync43(p)
 };
 var obligationLedger = new ObligationLedger(OBLIGATION_REPRESENT_MAX, {
   onChange: STATIC || !OBLIGATION_LEDGER_ENABLED ? undefined : (snapshot) => persistObligations(OBLIGATION_STORE_PATH, obligationStoreFs, snapshot)
@@ -60608,15 +60823,10 @@ var FEED_LIVENESS_OPEN_MS = (() => {
   return Number.isFinite(n) && n > 0 ? n : 1200;
 })();
 var POST_ANSWER_LIVENESS_STALE_MS = parsePostAnswerLivenessMs(process.env.SWITCHROOM_POST_ANSWER_LIVENESS_STALE_MS) || 30000;
-function formatFeedElapsed3(ms) {
-  const s = Math.floor(ms / 1000);
-  if (s < 60)
-    return `${s}s`;
-  const m = Math.floor(s / 60);
-  return `${m}m${(s % 60).toString().padStart(2, "0")}s`;
-}
 function turnInFlightForGate() {
-  return isDeliveryCutoverEnabled() ? isMachineInTurn() : claudeBusyKeys.size > 0;
+  if (!isDeliveryCutoverEnabled())
+    return claudeBusyKeys.size > 0;
+  return probeGateParity(isMachineInTurn(), claudeBusyKeys.size);
 }
 function deliverResumeSyntheticOrBuffer(agent, inbound) {
   const decision = decideInboundDelivery({
@@ -60936,7 +61146,7 @@ var pendingPtyPartial = null;
 function statusKey(chatId, threadId) {
   return chatKey2(chatId, threadId);
 }
-function streamKey3(chatId, threadId) {
+function streamKey2(chatId, threadId) {
   return chatKey2(chatId, threadId);
 }
 var pendingCrossTurnGate = new Map;
@@ -61002,6 +61212,7 @@ function purgeReactionTracking(key, endingTurn) {
     reapQueuedStatus(pqChatId, Number.isFinite(pqThread) ? pqThread : undefined);
   }
   claudeBusyKeys.delete(key);
+  claudeBusyKeySince.delete(key);
   reactionTransitionCounts.delete(key);
   firstTextReplyLogged.delete(key);
   if (endingTurn != null) {
@@ -61064,6 +61275,7 @@ function releaseTurnBufferGate(key, endingTurn) {
     return;
   activeTurnStartedAt.delete(key);
   claudeBusyKeys.delete(key);
+  claudeBusyKeySince.delete(key);
   shadowEmit({ kind: "turnEnd", key, at: Date.now(), outboundEmitted: true });
   drainBufferedIfAllowed(endingTurn, "reply-released-gate");
 }
@@ -62024,24 +62236,12 @@ var statusPinChatIds = new Map;
 var STATUS_PIN_STORE_PATH = join40(STATE_DIR, "status-pins.json");
 var statusPinStoreFs = {
   readFileSync: (p) => readFileSync41(p, "utf8"),
-  writeFileSync: (p, d) => writeFileSync31(p, d),
+  writeFileSync: (p, d) => writeFileSync30(p, d),
   renameSync: (a, b) => renameSync14(a, b),
-  existsSync: (p) => existsSync44(p)
+  existsSync: (p) => existsSync43(p)
 };
 var statusPinPersistEnabled = !STATIC && PIN_STATUS_WHILE_WORKING;
-function snapshotStatusPins() {
-  const snapshot = [];
-  for (const [pinKey, state4] of statusPinState) {
-    const chatId = statusPinChatIds.get(pinKey);
-    if (chatId == null)
-      continue;
-    snapshot.push({ pinKey, chatId, messageId: state4.messageId });
-  }
-  return snapshot;
-}
-function snapshotStatusPinsExcept(exceptKey) {
-  return snapshotStatusPins().filter((p) => p.pinKey !== exceptKey);
-}
+var bannerPinPersistEnabled = !STATIC;
 function statusPinApi() {
   return {
     pinChatMessage: (chat_id, message_id, opts) => robustApiCall(() => lockedBot.api.pinChatMessage(chat_id, message_id, opts), { chat_id: String(chat_id), verb: "status-pin.pin" }),
@@ -62049,7 +62249,7 @@ function statusPinApi() {
   };
 }
 async function statusPinBootCleanup() {
-  if (!statusPinPersistEnabled)
+  if (!statusPinPersistEnabled && !bannerPinPersistEnabled)
     return;
   const api = statusPinApi();
   const { cleared, total } = await runStatusPinBootCleanup({
@@ -62107,7 +62307,6 @@ async function reconcileStatusPinInner(pinKey, chatId, desired) {
     pinKey,
     chatId,
     op,
-    snapshotOthers: () => snapshotStatusPinsExcept(pinKey),
     applyPin: runReconcile
   });
   if (next == null) {
@@ -62459,14 +62658,35 @@ async function redeliverStrandedInbound(p) {
     forgetDelivery(deliveryQueue, p.key);
   }
 }
+function sweepSuspendedTargets() {
+  const keys = new Set;
+  const chats = new Set;
+  for (const p of pendingPermissions.values()) {
+    for (const c of p.cards) {
+      if (c.threadId != null)
+        keys.add(chatKey2(c.chatId, c.threadId));
+      else
+        chats.add(c.chatId);
+    }
+  }
+  for (const a of pendingAskUser.values()) {
+    if (a.threadId != null)
+      keys.add(chatKey2(a.chatId, a.threadId));
+    else
+      chats.add(a.chatId);
+  }
+  return { keys, chats };
+}
 var _deliveryConfirmSweep = setInterval(() => {
   if (!DELIVERY_CONFIRM_ENABLED)
     return;
   if (currentTurn != null)
     return;
-  if (pendingPermissions.size > 0 || pendingAskUser.size > 0)
-    return;
+  reapOrphanBusyKeysNow(Date.now());
+  const suspended = sweepSuspendedTargets();
   for (const p of sweep(deliveryQueue, Date.now(), DELIVERY_CONFIRM_TIMEOUT_MS)) {
+    if (isRedeliverySuspended(p.key, suspended))
+      continue;
     redeliverStrandedInbound(p);
   }
 }, DELIVERY_CONFIRM_SWEEP_MS);
@@ -62490,13 +62710,33 @@ var inboundSpool = STATIC ? undefined : createInboundSpool({
   fs: {
     appendFileSync: (p, d) => appendFileSync6(p, d),
     readFileSync: (p) => readFileSync41(p, "utf8"),
-    writeFileSync: (p, d) => writeFileSync31(p, d),
+    writeFileSync: (p, d) => writeFileSync30(p, d),
     renameSync: (a, b) => renameSync14(a, b),
-    existsSync: (p) => existsSync44(p),
+    existsSync: (p) => existsSync43(p),
     statSizeSync: (p) => statSync15(p).size
+  },
+  onDegraded: (info) => {
+    process.stderr.write(`telegram gateway: inbound-spool durability ${info.degraded ? "DEGRADED to in-memory-only" : "RECOVERED"} path=${info.path} consecutiveFailures=${info.consecutiveFailures}${info.error != null ? ` error=${info.error}` : ""}
+`);
+  }
+});
+var EVICT_NOTICE_COOLDOWN_MS = 300000;
+var evictNoticeByChat = new Map;
+var pendingInboundBuffer = createPendingInboundBuffer({
+  spool: inboundSpool,
+  onEvict: (_agent, evicted) => {
+    const chat = evicted.chatId;
+    const evThread = typeof evicted.meta?.threadId === "string" && evicted.meta.threadId ? Number(evicted.meta.threadId) : undefined;
+    const key = `${chat}:${evThread ?? "-"}`;
+    const last = evictNoticeByChat.get(key);
+    const nowMs2 = Date.now();
+    if (last != null && nowMs2 - last < EVICT_NOTICE_COOLDOWN_MS)
+      return;
+    evictNoticeByChat.set(key, nowMs2);
+    const threadOpts = evThread != null ? { message_thread_id: evThread } : {};
+    swallowingApiCall(() => bot.api.sendMessage(chat, "\u23F3 Messages are arriving faster than I can process them. Your messages are saved and will be handled once I finish the current turn \u2014 if any can't be picked up, I'll ask you to resend it.", { ...threadOpts }), { chat_id: chat, verb: "inbound-buffer-eviction" });
   }
 });
-var pendingInboundBuffer = createPendingInboundBuffer({ spool: inboundSpool });
 function agentHasInFlightBackgroundWork(now) {
   if (countRunningWorkers() > 0)
     return true;
@@ -62546,6 +62786,11 @@ function obligationSweep() {
     pendingCrossTurnGate.set(o.originTurnId, { sinceMs: o.openedAt });
     const attempt = obligationLedger.markRepresented(o.originTurnId);
     process.stderr.write(`telegram gateway: obligation re-presented origin=${o.originTurnId} attempt=${attempt}/${OBLIGATION_REPRESENT_MAX}
+`);
+    return;
+  }
+  if (shouldDeferEscalationForBridge({ bridgeAlive: ipcServer.getClient(agent)?.isAlive() === true })) {
+    process.stderr.write(`telegram gateway: obligation escalation deferred \u2014 bridge down (nudge waits for reconnect) origin=${o.originTurnId}
 `);
     return;
   }
@@ -62575,6 +62820,15 @@ if (bootResumeInbound != null) {
   } else {
     pendingInboundBuffer.push(bootResumeInbound.agent, bootResumeInbound.msg);
   }
+  const resumeTurnKey = bootResumeInbound.msg.meta?.resume_turn_key;
+  if (turnsDb != null && typeof resumeTurnKey === "string" && resumeTurnKey.length > 0) {
+    try {
+      markTurnResumed(turnsDb, resumeTurnKey);
+    } catch (err) {
+      process.stderr.write(`telegram gateway: markTurnResumed failed turnKey=${resumeTurnKey}: ${err.message}
+`);
+    }
+  }
 }
 if (inboundSpool != null) {
   const replay = inboundSpool.liveEntries();
@@ -62759,6 +63013,7 @@ var ipcServer = createIpcServer({
       activeReactionMsgIds,
       activeTurnStartedAt,
       claudeBusyKeys,
+      claudeBusyKeySince,
       activeDraftStreams,
       clearActiveReactions: () => {
         const ad = resolveAgentDirFromEnv();
@@ -62800,9 +63055,6 @@ var ipcServer = createIpcServer({
     if (msg.activeFile)
       lastSessionActiveFile = msg.activeFile;
     const ev = msg.event;
-    const chatHint = msg.chatId || null;
-    const threadHint = msg.threadId != null ? String(msg.threadId) : undefined;
-    progressDriver?.ingest(ev, chatHint, threadHint);
     handleSessionEvent(ev);
     toolFlightTracker.onEvent(ev);
     if (pendingDeferredInterrupt != null && !toolFlightTracker.isMidToolCall()) {
@@ -62872,7 +63124,8 @@ var ipcServer = createIpcServer({
       }), { threadId, chat_id: chatId, verb: "permission_request" }).then((sent) => {
         const pend = pendingPermissions.get(requestId);
         if (pend && sent && typeof sent.message_id === "number") {
-          pend.cards.push({ chatId, messageId: sent.message_id });
+          const landedThreadId = sent.message_thread_id ?? undefined;
+          pend.cards.push({ chatId, messageId: sent.message_id, threadId: landedThreadId });
           permCardStore.add({
             requestId,
             chatId,
@@ -63383,20 +63636,21 @@ 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, { postNotice }) => {
+    inboundSpool?.sweepEscalations((e, { postNotice, droppedCount }) => {
       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" });
+      const n = droppedCount > 0 ? droppedCount : 1;
+      const noticeText = n === 1 ? "\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." : `\u26A0\uFE0F I couldn't deliver ${n} earlier messages to the agent after repeated retries (they survived restarts but the agent never picked them up). Please resend them.`;
+      swallowingApiCall(() => bot.api.sendMessage(chat, noticeText, { ...threadOpts }), { chat_id: chat, verb: "inbound-spool-escalation" });
     });
   }, IDLE_DRAIN_INTERVAL_MS).unref();
 }
 var ALLOWED_TOOLS = new Set([
   "reply",
-  "stream_reply",
   "progress_update",
   "react",
   "download_attachment",
@@ -63425,8 +63679,6 @@ async function executeToolCall(tool, args) {
   switch (tool) {
     case "reply":
       return executeReply(args);
-    case "stream_reply":
-      return executeStreamReply(args);
     case "progress_update":
       return executeProgressUpdate(args);
     case "react":
@@ -63895,7 +64147,7 @@ ${url}`;
       }
     }
   }
-  const replySKey = streamKey3(chat_id, threadId);
+  const replySKey = streamKey2(chat_id, threadId);
   suppressPtyPreview.add(replySKey);
   let previewMessageId = null;
   const openStream = activeDraftStreams.get(replySKey);
@@ -64293,221 +64545,6 @@ ${url}`;
   }
   return { content: [{ type: "text", text: result }] };
 }
-async function executeStreamReply(args) {
-  const turn = currentTurn;
-  if (!args.chat_id)
-    throw new Error("stream_reply: chat_id is required");
-  if (args.text == null || args.text === "")
-    throw new Error("stream_reply: text is required and cannot be empty");
-  {
-    const _rawChatId = String(args.chat_id ?? "");
-    const resolved = resolveChatIdFallback(_rawChatId, loadAccess(), turn?.sessionChatId, lastActiveTurnChatId, turn != null);
-    if (resolved.tier !== "raw") {
-      process.stderr.write(`telegram gateway: stream_reply: model passed chat_id "${_rawChatId}" (not allowlisted) \u2014 ` + `routing to ${resolved.tier} turn chat "${resolved.chatId}"
-`);
-      args.chat_id = resolved.chatId;
-    }
-  }
-  let streamRoutedOriginTurn = null;
-  let streamOriginVia = null;
-  if (TURN_ORIGIN_ROUTING_ENABLED) {
-    const echoedTurn = findTurnByOriginId(args.origin_turn_id);
-    const quotedTurn = echoedTurn == null ? findTurnByQuotedMessageId(String(args.chat_id), args.reply_to) : null;
-    const originTurn = echoedTurn ?? quotedTurn;
-    streamRoutedOriginTurn = originTurn ?? null;
-    streamOriginVia = originTurn == null ? null : echoedTurn != null ? "echo" : "quoted";
-  }
-  if (args.message_thread_id == null) {
-    let injected;
-    if (TURN_ORIGIN_ROUTING_ENABLED) {
-      injected = resolveAnswerThreadWithLog(String(args.chat_id), undefined, streamRoutedOriginTurn, streamOriginVia, turn, "stream_reply");
-    } else {
-      injected = turn?.sessionThreadId;
-    }
-    if (injected != null)
-      args.message_thread_id = String(injected);
-  }
-  args.text = redactOutboundText(args.text, "stream_reply");
-  {
-    args.text = normalizePunctuation(args.text);
-    const scrub = scrubVoice(args.text);
-    if (scrub.replaced > 0) {
-      args.text = scrub.scrubbed;
-      emitRuntimeMetric({
-        kind: "voice_scrub_applied",
-        chatKey: statusKey(String(args.chat_id ?? ""), args.message_thread_id != null ? Number(args.message_thread_id) : undefined),
-        replaced: scrub.replaced,
-        site: "stream_reply"
-      });
-    }
-  }
-  if (args.done === true) {
-    const sChatId = String(args.chat_id ?? "");
-    const sThreadId = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
-    const sText = args.text;
-    const dup = outboundDedup.check(sChatId, sThreadId, sText, Date.now(), currentTurn?.registryKey ?? null);
-    if (dup != null) {
-      process.stderr.write(`telegram gateway: stream_reply: deduped (#546) chatId=${sChatId} ageMs=${dup.ageMs} preview=${JSON.stringify(dup.preview)}
-`);
-      return { content: [{ type: "text", text: "sent (deduped \u2014 same content sent via earlier path)" }] };
-    }
-  }
-  const access = loadAccess();
-  const streamChatId = String(args.chat_id ?? "");
-  const streamIsPrivate = isDmChatId(streamChatId);
-  const streamIsForumTopic = args.message_thread_id != null && args.message_thread_id !== "";
-  let streamReplyMarkup;
-  let streamButtonMeta;
-  const rawStreamKeyboard = args.inline_keyboard;
-  if (rawStreamKeyboard != null && Boolean(args.done)) {
-    const validationErrors = validateInlineKeyboard(rawStreamKeyboard);
-    if (validationErrors.length > 0) {
-      const summary = validationErrors.map((e) => `${e.path}.${e.field}: ${e.reason}`).join("; ");
-      throw new Error(`inline_keyboard validation failed: ${summary}`);
-    }
-    streamButtonMeta = extractAgentButtonMeta(rawStreamKeyboard);
-    streamReplyMarkup = { inline_keyboard: wrapAgentCallbacks(rawStreamKeyboard) };
-  }
-  {
-    const streamThreadId = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
-    const sKeyBefore = streamKey3(streamChatId, streamThreadId);
-    if (!activeDraftStreams.has(sKeyBefore)) {
-      const sKey = statusKey(streamChatId, streamThreadId);
-      noteOutbound(sKey, Date.now());
-      noteOutbound2(sKey, Date.now());
-      shadowEmit({ kind: "modelOutbound", key: sKey, at: Date.now() });
-      if (turn != null && !firstTextReplyLogged.has(sKey)) {
-        firstTextReplyLogged.add(sKey);
-        logStreamingEvent({
-          kind: "turn_reply_timing",
-          chatId: streamChatId,
-          threadId: streamThreadId,
-          turnId: turn.turnId,
-          timeToFirstTextReplyMs: Date.now() - turn.gatewayReceiveAt
-        });
-      }
-      if (isFinalAnswerReply({
-        text: args.text ?? "",
-        disableNotification: args.disable_notification === true,
-        done: args.done === true
-      })) {
-        clearSilentEndState(sKey);
-      }
-    }
-  }
-  if (turn != null && isSubstantiveFinalReply({
-    text: args.text ?? "",
-    disableNotification: args.disable_notification === true,
-    done: args.done === true
-  })) {
-    const ea = emissionAuthorityFor(turn);
-    ea.markSubstantiveFinalDelivered(() => {
-      turn.finalAnswerEverDelivered = true;
-      if (turn.finalAnswerDeliveredAt == null)
-        turn.finalAnswerDeliveredAt = Date.now();
-    });
-    ea.finalizeCard(() => {
-      clearActivitySummary(turn);
-    });
-  }
-  const result = await handleStreamReply({
-    chat_id: streamChatId,
-    text: args.text,
-    done: Boolean(args.done),
-    message_thread_id: args.message_thread_id,
-    format: args.format,
-    reply_to: args.reply_to,
-    quote: args.quote,
-    ...args.protect_content === true ? { protect_content: true } : {},
-    ...args.quote_text != null ? { quote_text: args.quote_text } : {},
-    ...streamReplyMarkup != null ? { reply_markup: streamReplyMarkup } : {},
-    ...args.disable_notification === true ? { disable_notification: true } : {}
-  }, { activeDraftStreams, suppressPtyPreview }, {
-    bot: lockedBot,
-    retry: robustApiCall,
-    repairEscapedWhitespace,
-    normalizeParagraphBreaks,
-    normalizePunctuation,
-    stripExcessBold,
-    addParagraphSpacers,
-    assertAllowedChat,
-    resolveThreadId,
-    disableLinkPreview: access.disableLinkPreview !== false,
-    defaultFormat: access.parseMode ?? "html",
-    logStreamingEvent,
-    isPrivateChat: streamIsPrivate,
-    isForumTopic: streamIsForumTopic,
-    recordOutboundDelivered: (chatId, threadId) => {
-      progressDriver?.recordOutboundDelivered(chatId, threadId != null ? String(threadId) : undefined);
-    },
-    forceCompleteTurn: (chatId, threadId) => {
-      progressDriver?.forceCompleteTurn({
-        chatId,
-        threadId: threadId != null ? String(threadId) : undefined
-      });
-    },
-    historyEnabled: HISTORY_ENABLED,
-    recordOutbound,
-    ...HISTORY_ENABLED ? { getLatestInboundMessageId } : {},
-    writeError: (line) => process.stderr.write(line),
-    ...STREAM_THROTTLE_MS_OVERRIDE != null ? { throttleMs: STREAM_THROTTLE_MS_OVERRIDE } : {},
-    progressCardActive: streamMode === "checklist"
-  });
-  if (result.messageId != null) {
-    try {
-      progressDriver?.recordOutboundDelivered(String(args.chat_id ?? ""), args.message_thread_id);
-    } catch {}
-    try {
-      const threadIdNum2 = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
-      noteSignal(statusKey(String(args.chat_id ?? ""), threadIdNum2), Date.now());
-    } catch {}
-  }
-  if (args.done === true && result.messageId != null && streamButtonMeta != null && streamButtonMeta.size > 0) {
-    rememberAgentButtonMeta(String(args.chat_id ?? ""), result.messageId, streamButtonMeta);
-  }
-  if (args.done === true && result.messageId != null) {
-    const sChatId = String(args.chat_id ?? "");
-    const sThreadId = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
-    outboundDedup.record(sChatId, sThreadId, args.text, Date.now(), currentTurn?.registryKey ?? null);
-    const streamFormat = args.format ?? (access.parseMode ?? "html");
-    const streamLiteralText = streamFormat === "text";
-    clearPending(statusKey(sChatId, sThreadId), "reply_finalize");
-    noteOutbound3(statusKey(sChatId, sThreadId), {
-      messageId: result.messageId,
-      text: args.text,
-      literalText: streamLiteralText
-    });
-  }
-  if (turn != null && isFinalAnswerReply({
-    text: args.text ?? "",
-    disableNotification: args.disable_notification === true,
-    done: args.done === true
-  })) {
-    turn.finalAnswerDelivered = true;
-    turn.finalAnswerSubstantive = isSubstantiveFinalReply({
-      text: args.text ?? "",
-      disableNotification: args.disable_notification === true,
-      done: args.done === true
-    });
-    if (turn.finalAnswerSubstantive)
-      turn.finalAnswerEverDelivered = true;
-    if (turn.finalAnswerSubstantive && turn.finalAnswerDeliveredAt == null)
-      turn.finalAnswerDeliveredAt = Date.now();
-    if (turn.finalAnswerSubstantive)
-      closeObligationOnSubstantiveReply(args, turn, streamRoutedOriginTurn);
-    const streamThreadIdForClear = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
-    clearSilentEndState(statusKey(streamChatId, streamThreadIdForClear));
-  }
-  {
-    const sChat = String(args.chat_id ?? "");
-    const sThread = resolveThreadId(sChat, args.message_thread_id);
-    releaseTurnBufferGate(statusKey(sChat, sThread), turn ?? undefined);
-    if (turn?.finalAnswerDelivered === true) {
-      reapQueuedStatus(turn.sessionChatId, turn.sessionThreadId);
-    }
-  }
-  return { content: [{ type: "text", text: `${result.status} (id: ${result.messageId ?? "pending"})` }] };
-}
 async function executeProgressUpdate(args) {
   if (!args.chat_id)
     throw new Error("progress_update: chat_id is required");
@@ -64518,6 +64555,7 @@ async function executeProgressUpdate(args) {
   const threadId = resolveThreadId(chat_id, args.message_thread_id);
   const key = statusKey(chat_id, threadId);
   assertAllowedChat(chat_id);
+  text2 = redactOutboundText(text2, "progress_update");
   if (text2.length > 300) {
     text2 = text2.slice(0, 299) + "\u2026";
   }
@@ -64551,38 +64589,6 @@ async function executeProgressUpdate(args) {
     }
     progressUpdateTurnCount.set(key, currentCount + 1);
   }
-  const agentIdHint = typeof args.agent_id === "string" && args.agent_id || null;
-  const toolUseIdHint = typeof args.tool_use_id === "string" && args.tool_use_id || null;
-  const subAgent = resolveCallingSubagent({
-    db: turnsDb,
-    chatId: chat_id,
-    threadId,
-    agentIdHint,
-    toolUseIdHint
-  });
-  if (subAgent != null && progressDriver != null) {
-    const cardText = text2.length > 200 ? text2.slice(0, 199) + "\u2026" : text2;
-    const result = progressDriver.recordSubAgentNarrative({
-      chatId: chat_id,
-      threadId: threadId != null ? String(threadId) : undefined,
-      agentId: subAgent.agentId,
-      text: cardText
-    });
-    if (result.ok) {
-      progressUpdateLastSent.set(key, now);
-      try {
-        noteSignal(key, Date.now());
-      } catch {}
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({ ok: true, mode: "card", agent_id: subAgent.agentId })
-          }
-        ]
-      };
-    }
-  }
   const access = loadAccess();
   const literalText = (access.parseMode ?? "html") === "text";
   const sendOpts = {
@@ -64764,7 +64770,7 @@ async function publishToTelegraph(text2, shortName, authorName) {
   const accountPath = join40(STATE_DIR, "telegraph-account.json");
   let account = null;
   try {
-    if (existsSync44(accountPath)) {
+    if (existsSync43(accountPath)) {
       const raw = readFileSync41(accountPath, "utf-8");
       const parsed = JSON.parse(raw);
       if (parsed.shortName && parsed.accessToken) {
@@ -64785,7 +64791,7 @@ async function publishToTelegraph(text2, shortName, authorName) {
     account = created.value;
     try {
       mkdirSync32(STATE_DIR, { recursive: true, mode: 448 });
-      writeFileSync31(accountPath, JSON.stringify(account, null, 2), { mode: 384 });
+      writeFileSync30(accountPath, JSON.stringify(account, null, 2), { mode: 384 });
     } catch (err) {
       process.stderr.write(`telegram gateway: telegraph cache write failed: ${err.message}
 `);
@@ -64830,8 +64836,8 @@ function renderVaultRequestSaveCard(req, agentSlug) {
   }
   lines.push("");
   lines.push(`_Tap Save to write to the host vault, Rename to change the key name, or Discard to drop it. The value is held in this chat's gateway memory until you decide._`);
-  return lines.join(`
-`);
+  return hardenCardBreaks2(lines.join(`
+`));
 }
 async function executeVaultRequestSave(args) {
   const chat_id = String(args.chat_id ?? "");
@@ -65227,7 +65233,7 @@ async function executeDownloadAttachment(args) {
   });
   mkdirSync32(INBOX_DIR, { recursive: true, mode: 448 });
   assertInsideInbox(INBOX_DIR, dlPath);
-  writeFileSync31(dlPath, buf, { mode: 384 });
+  writeFileSync30(dlPath, buf, { mode: 384 });
   return { content: [{ type: "text", text: dlPath }] };
 }
 async function executeEditMessage(args) {
@@ -65402,7 +65408,7 @@ function resetOrphanedReplyTimeout() {
     currentSessionChatId: turn.sessionChatId,
     capturedTextCount: turn.capturedText.length,
     replyCalled: turn.replyCalled,
-    progressCardActive: progressDriver != null
+    progressCardActive: false
   })) {
     turn.orphanedReplyTimeoutId = setTimeout(() => {
       const t = currentTurn;
@@ -65413,7 +65419,7 @@ function resetOrphanedReplyTimeout() {
         currentSessionChatId: t.sessionChatId,
         capturedTextCount: t.capturedText.length,
         replyCalled: t.replyCalled,
-        progressCardActive: progressDriver != null
+        progressCardActive: false
       })) {
         const turnKey = statusKey(t.sessionChatId, t.sessionThreadId);
         const working = isLegitimatelyWorking(turnKey);
@@ -65583,7 +65589,7 @@ function openLivenessFeedIfDue(turn) {
     toolCount: turn.labeledToolCount,
     state: "running"
   };
-  const rendered = renderActivityFeedWithNested(lines, [], false, ` \xB7 ${formatFeedElapsed3(age)}`, undefined, livenessHeader);
+  const rendered = renderActivityFeedWithNested(lines, [], false, formatStepSuffix2(age), undefined, livenessHeader);
   if (rendered == null)
     return;
   turn.activityPendingRender = rendered;
@@ -65646,7 +65652,7 @@ function feedHeartbeatTick() {
     };
     const lines = turn.mirrorLines.length > 0 ? turn.mirrorLines : ["Working in background\u2026"];
     const elapsed2 = Date.now() - subagentAt;
-    const rendered2 = renderActivityFeedWithNested(lines, [], false, ` \xB7 ${formatFeedElapsed3(elapsed2)}`, undefined, livenessHeader);
+    const rendered2 = renderActivityFeedWithNested(lines, [], false, formatStepSuffix2(elapsed2), undefined, livenessHeader);
     if (rendered2 == null)
       return;
     turn.activityPendingRender = rendered2;
@@ -65671,7 +65677,7 @@ function feedHeartbeatTick() {
   const elapsed = Date.now() - turn.lastToolLabelAt;
   if (elapsed < FEED_HEARTBEAT_MIN_STALE_MS)
     return;
-  const rendered = composeTurnActivity(turn, false, ` \xB7 ${formatFeedElapsed3(elapsed)}`);
+  const rendered = composeTurnActivity(turn, false, formatStepSuffix2(elapsed));
   if (rendered == null)
     return;
   turn.activityPendingRender = rendered;
@@ -65799,7 +65805,7 @@ function handleSessionEvent(ev) {
         rememberRecentTurn(next);
         promoteQueuedStatus(ev.chatId, enqThreadIdNum);
         if (DELIVERY_CONFIRM_ENABLED) {
-          ackDelivery(deliveryQueue, chatKey2(ev.chatId, ev.threadId != null ? Number(ev.threadId) : null), ev.messageId);
+          ackDelivery(deliveryQueue, chatKey2(ev.chatId, ev.threadId != null ? Number(ev.threadId) : null), ev.messageId, ev.rawContent);
         }
         shadowEmit({
           kind: "turnStart",
@@ -66149,7 +66155,7 @@ function handleSessionEvent(ev) {
         unpinProgressCardForChat?.(chatId, threadId);
         finalizeStatusReaction(chatId, threadId, "done");
         {
-          const sKey = streamKey3(chatId, threadId);
+          const sKey = streamKey2(chatId, threadId);
           const turnDurationMs = turn.startedAt > 0 ? Date.now() - turn.startedAt : 0;
           logStreamingEvent({
             kind: "turn_end",
@@ -66194,10 +66200,12 @@ function handleSessionEvent(ev) {
       }
       if (flushDecision.kind === "flush") {
         let capturedText = flushDecision.text;
+        capturedText = normalizeParagraphBreaks(repairEscapedWhitespace(capturedText));
         const backstopChatId = chatId;
         const backstopThreadId = threadId;
         const backstopCtrl = ctrl;
         capturedText = redactOutboundText(capturedText, "turn_flush");
+        capturedText = stripExcessBold(normalizePunctuation(capturedText));
         {
           const scrub = scrubVoice(capturedText);
           if (scrub.replaced > 0) {
@@ -66247,7 +66255,8 @@ function handleSessionEvent(ev) {
             link_preview_options: { is_disabled: true }
           };
           const limit = RICH_MESSAGE_MAX_CHARS2;
-          const htmlChunks = splitMarkdownChunks(capturedText, limit);
+          const renderedText = addParagraphSpacers(capturedText);
+          const htmlChunks = splitMarkdownChunks(renderedText, limit);
           const sentIds = [];
           try {
             let firstSendUsedEdit = false;
@@ -66336,7 +66345,7 @@ function handleSessionEvent(ev) {
       }
       finalizeStatusReaction(chatId, threadId, terminalReason);
       {
-        const sKey = streamKey3(chatId, threadId);
+        const sKey = streamKey2(chatId, threadId);
         const turnDurationMs = turn.startedAt > 0 ? Date.now() - turn.startedAt : 0;
         logStreamingEvent({
           kind: "turn_end",
@@ -66736,15 +66745,23 @@ async function handleInbound(ctx, text2, downloadImage, attachment, extraAttachm
   }
   if (STATUS_QUERY_RE.test(text2)) {
     try {
-      const threadKey = messageThreadId != null ? String(messageThreadId) : undefined;
-      const cardState = progressDriver?.peek(chat_id, threadKey);
-      const turnAgeS = cardState?.turnStartedAt ? Math.max(0, Math.floor((Date.now() - cardState.turnStartedAt) / 1000)) : -1;
-      const stage = cardState?.stage ?? "idle";
-      const itemCount = cardState?.items.length ?? 0;
-      const subAgentCount = cardState?.subAgents.size ?? 0;
+      const thread = messageThreadId != null ? String(messageThreadId) : "none";
+      const key = statusKey(chat_id, messageThreadId);
+      const turnStartedAt = activeTurnStartedAt.get(key);
+      const turnActive = turnStartedAt != null;
+      const surfaces = {
+        turnActive,
+        turnAgeS: turnActive ? Math.max(0, Math.floor((Date.now() - turnStartedAt) / 1000)) : -1,
+        runningWorkers: countRunningWorkers(),
+        workerFeedSize: workerActivityFeed?.size ?? 0,
+        pendingAsync: hasPendingAsyncDispatch(key) ? 1 : 0
+      };
+      const telemetry = deriveStatusQueryTelemetry(surfaces);
       const agentName3 = process.env.SWITCHROOM_AGENT_NAME ?? "-";
-      process.stderr.write(`telegram gateway: ux-failure: status-query agent=${agentName3} chat_id=${chat_id} thread=${threadKey ?? "none"} card_stage=${stage} card_turn_age_s=${turnAgeS} card_items=${itemCount} card_subagents=${subAgentCount}
-`);
+      process.stderr.write(formatStatusQueryLine(agentName3, String(chat_id), thread, surfaces, telemetry));
+      if (telemetry.idle) {
+        process.stderr.write(formatStatusQueryUxFailureLine(agentName3, String(chat_id), thread));
+      }
     } catch (err) {
       process.stderr.write(`telegram gateway: status-query telemetry failed: ${err.message}
 `);
@@ -67113,7 +67130,7 @@ ${preBlock(write.output)}`;
         bot.api.setMessageReaction(chat_id, msgId, [{ type: "emoji", emoji: "\uD83D\uDC40" }]).catch(() => {});
         logStreamingEvent({ kind: "inbound_ack", chatId: chat_id, messageId: msgId, ackDelayMs: Date.now() - inboundReceivedAt });
       } else {
-        const sKey = streamKey3(chat_id, messageThreadId);
+        const sKey = streamKey2(chat_id, messageThreadId);
         const priorStream = activeDraftStreams.get(sKey);
         if (priorStream && !priorStream.isFinal()) {
           activeDraftStreams.delete(sKey);
@@ -67427,7 +67444,7 @@ async function switchroomReply(ctx, text2, options = {}) {
     ...options.reply_markup ? { reply_markup: options.reply_markup } : {}
   };
   if (options.html) {
-    await ctx.replyWithRichMessage(richMessage2(text2), replyOpts);
+    await ctx.replyWithRichMessage(richMessage2(hardenCardBreaks2(text2)), replyOpts);
   } else {
     await ctx.reply(text2, replyOpts);
   }
@@ -67486,7 +67503,7 @@ function writeRestartMarker(marker) {
   if (!p)
     return;
   try {
-    writeFileSync31(p, JSON.stringify(marker));
+    writeFileSync30(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}
 `);
@@ -67654,7 +67671,7 @@ var _dockerReachable;
 function isDockerReachable() {
   if (_dockerReachable !== undefined)
     return _dockerReachable;
-  if (!existsSync44("/var/run/docker.sock")) {
+  if (!existsSync43("/var/run/docker.sock")) {
     _dockerReachable = false;
     return _dockerReachable;
   }
@@ -67676,7 +67693,7 @@ function spawnSwitchroomDetached(args, onFailure) {
   try {
     mkdirSync32(STATE_DIR, { recursive: true });
     outFd = openSync9(logPath, "a");
-    writeFileSync31(logPath, `
+    writeFileSync30(logPath, `
 [${new Date().toISOString()}] spawn ${SWITCHROOM_CLI} ${fullArgs.join(" ")}
 `, { flag: "a" });
   } catch {}
@@ -68070,7 +68087,7 @@ bot.use(async (ctx, next) => {
 function readRecentDenialsForAgent(agentName3, windowMs, limit) {
   try {
     const auditPath = join40(homedir14(), ".switchroom", "vault-audit.log");
-    if (!existsSync44(auditPath))
+    if (!existsSync43(auditPath))
       return [];
     const raw = readFileSync41(auditPath, "utf8");
     return recentDenialsFromAuditLog(raw, { agentName: agentName3, windowMs, limit });
@@ -68498,7 +68515,7 @@ function flushAgentHandoff(agentDir) {
   for (const fname of [".handoff.md", ".handoff-topic"]) {
     const p = join40(agentDir, fname);
     try {
-      if (existsSync44(p)) {
+      if (existsSync43(p)) {
         unlinkSync16(p);
         removed++;
       }
@@ -68554,7 +68571,7 @@ async function handleNewCommand(ctx) {
   writeRestartMarker({ chat_id: chatId, thread_id: threadId ?? null, ack_message_id: ackId, ts: Date.now() });
   if (agentDir != null) {
     try {
-      writeFileSync31(join40(agentDir, ".force-fresh-session"), `${kind} at ${new Date().toISOString()}
+      writeFileSync30(join40(agentDir, ".force-fresh-session"), `${kind} at ${new Date().toISOString()}
 `, "utf8");
     } catch (err) {
       process.stderr.write(`telegram gateway: failed to write force-fresh marker: ${err}
@@ -68918,15 +68935,15 @@ bot.command("interrupt", async (ctx) => {
 });
 var lockoutOps = {
   readFileSync: (p, enc) => readFileSync41(p, enc),
-  writeFileSync: (p, data, opts) => writeFileSync31(p, data, opts),
-  existsSync: (p) => existsSync44(p),
+  writeFileSync: (p, data, opts) => writeFileSync30(p, data, opts),
+  existsSync: (p) => existsSync43(p),
   mkdirSync: (p, opts) => mkdirSync32(p, opts),
   joinPath: (...parts) => join40(...parts)
 };
 var FLEET_FALLBACK_DEDUP_MS = 30000;
 function isAuthBrokerSocketReachable() {
   try {
-    return existsSync44(resolveAuthBrokerSocketPath2());
+    return existsSync43(resolveAuthBrokerSocketPath2());
   } catch {
     return false;
   }
@@ -69582,7 +69599,7 @@ async function handleVaultRecentDenialCallback(ctx, data) {
   const tokenPath = join40(homedir14(), ".switchroom", "agents", agentName3, ".vault-token");
   try {
     mkdirSync32(join40(homedir14(), ".switchroom", "agents", agentName3), { recursive: true });
-    writeFileSync31(tokenPath, token, { mode: 384 });
+    writeFileSync30(tokenPath, token, { mode: 384 });
   } catch (err) {
     await switchroomReply(ctx, `**Grant created (${escapeHtmlForTg2(id)}) but token write failed:** ${escapeHtmlForTg2(String(err))}
 _Recover with: \`switchroom vault grant ${escapeHtmlForTg2(agentName3)} --keys ${escapeHtmlForTg2(keyName)} --duration 30d\` on the host._`, { html: true });
@@ -69660,7 +69677,7 @@ async function performVaultAccessApproval(ctx, pending2, stageId, senderId, atte
   const tokenPath = join40(homedir14(), ".switchroom", "agents", pending2.agent, ".vault-token");
   try {
     mkdirSync32(join40(homedir14(), ".switchroom", "agents", pending2.agent), { recursive: true });
-    writeFileSync31(tokenPath, token, { mode: 384 });
+    writeFileSync30(tokenPath, token, { mode: 384 });
   } catch (err) {
     await switchroomReply(ctx, `**Grant created (${escapeHtmlForTg2(id)}) but token write failed:** ${escapeHtmlForTg2(String(err))}
 _Recover with: \`switchroom vault grant ${escapeHtmlForTg2(pending2.agent)} --keys ${escapeHtmlForTg2(pending2.key)} --duration ${Math.round(pending2.ttl_seconds / 86400)}d\` on the host._`, { html: true });
@@ -70232,7 +70249,7 @@ async function executeGrantWizard(ctx, chatId, state4) {
   const tokenPath = join40(homedir14(), ".switchroom", "agents", state4.agent, ".vault-token");
   try {
     mkdirSync32(join40(homedir14(), ".switchroom", "agents", state4.agent), { recursive: true });
-    writeFileSync31(tokenPath, token, { mode: 384 });
+    writeFileSync30(tokenPath, token, { mode: 384 });
   } catch (err) {
     await switchroomReply(ctx, `**Grant created but token write failed:** ${escapeHtmlForTg2(String(err))}`, { html: true });
     return;
@@ -71962,7 +71979,7 @@ bot.on("message:photo", async (ctx) => {
       });
       mkdirSync32(INBOX_DIR, { recursive: true, mode: 448 });
       assertInsideInbox(INBOX_DIR, dlPath);
-      writeFileSync31(dlPath, buf, { mode: 384 });
+      writeFileSync30(dlPath, buf, { mode: 384 });
       return dlPath;
     } catch (err) {
       const msg = err instanceof Error ? err.message : "unknown error";
@@ -73152,28 +73169,6 @@ var didOneTimeSetup = false;
               parentStateDir: STATE_DIR,
               log: (msg) => process.stderr.write(`telegram gateway: ${msg}
 `),
-              onStall: (agentId, idleMs, description) => {
-                progressDriver?.onSubAgentStall(agentId, idleMs, description);
-              },
-              onUnstall: (agentId, description) => {
-                progressDriver?.onSubAgentUnstall?.(agentId, description);
-              },
-              onStallTerminal: (agentId) => {
-                try {
-                  const fleets = progressDriver?.peekAllFleets() ?? [];
-                  for (const f of fleets) {
-                    if (f.fleet.has(agentId)) {
-                      progressDriver?.ingest({ kind: "sub_agent_turn_end", agentId }, f.chatId ?? null, undefined);
-                      return;
-                    }
-                  }
-                  process.stderr.write(`telegram gateway: subagent-watcher: onStallTerminal ${agentId} \u2014 no fleet entry to retarget; synthetic sub_agent_turn_end skipped
-`);
-                } catch (err) {
-                  process.stderr.write(`telegram gateway: subagent-watcher: onStallTerminal ${agentId} ingest error: ${err.message}
-`);
-                }
-              },
               onFinish: ({ agentId, outcome, description, resultText, toolCount, durationMs }) => {
                 deferredDoneReactions.promote();
                 let fleetChatId = "";
@@ -73193,6 +73188,20 @@ var didOneTimeSetup = false;
                   } catch {}
                 }
                 const isBackground = dispatch.isBackground;
+                if (dispatch.isNested) {
+                  if (workerFeedEnabled) {
+                    workerActivityFeed?.finish(agentId, {
+                      description: dispatch.feedDescription,
+                      lastTool: null,
+                      toolCount,
+                      latestSummary: resultText,
+                      elapsedMs: durationMs,
+                      state: outcome === "failed" ? "failed" : "done"
+                    });
+                    reconcileWorkerPin(agentId, null, false);
+                  }
+                  return;
+                }
                 if (!isBackground) {
                   const turn = currentTurn;
                   if (turn != null && turn.foregroundSubAgents.has(agentId)) {
@@ -73302,11 +73311,12 @@ var didOneTimeSetup = false;
                     dispatch = resolveWorkerFeedDispatch(getSubagentByJsonlId(turnsDb, agentId), description);
                   } catch {}
                 }
-                const isBackground = dispatch.isBackground;
+                const isBackground = dispatch.isBackground || dispatch.isNested;
+                const stepLine = progressLine != null && progressLine.length > 0 ? progressLine : latestSummary;
                 if (!isBackground) {
                   const surface = resolveSubagentStatusSurface({
                     isBackground: false,
-                    liveTurnPresent: currentTurn != null,
+                    liveTurnPresent: currentTurn != null && dispatch.hasRow,
                     workerFeedEnabled,
                     orphanStatusEnabled
                   });
@@ -73317,7 +73327,7 @@ var didOneTimeSetup = false;
                       description: dispatch.feedDescription,
                       lastTool,
                       toolCount,
-                      latestSummary,
+                      latestSummary: stepLine,
                       elapsedMs,
                       state: "running"
                     }, origin?.threadId)?.then(() => reconcileWorkerPin(agentId, wkChat, true));
@@ -73341,7 +73351,7 @@ var didOneTimeSetup = false;
                     narrative = [];
                     turn.foregroundSubAgents.set(agentId, narrative);
                   }
-                  if (narrative[narrative.length - 1] !== child) {
+                  if (!narrative.includes(child)) {
                     narrative.push(child);
                     if (narrative.length > FOREGROUND_SUBAGENT_ACCUM_MAX) {
                       narrative.splice(0, narrative.length - FOREGROUND_SUBAGENT_ACCUM_MAX);
@@ -73375,7 +73385,7 @@ var didOneTimeSetup = false;
                     description: dispatch.feedDescription,
                     lastTool,
                     toolCount,
-                    latestSummary,
+                    latestSummary: stepLine,
                     elapsedMs,
                     state: "running"
                   }, origin?.threadId)?.then(() => reconcileWorkerPin(agentId, wkChat, true));