switchroom 0.14.19 → 0.14.21

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

@@ -23738,8 +23738,13 @@ var init_schema = __esm(() => {
       author_name: exports_external.string().optional().describe("Telegraph article byline. Defaults to soul.name when set.")
     }).optional().describe("Long-reply publishing via Telegraph (#579). When enabled, replies " + "above the threshold publish as a Telegraph article rendered in " + "Telegram via native Instant View. Off by default \u2014 content " + "residency is real for some personas (lawyer, health-coach with PHI). " + "Cascades from defaults.channels.telegram.telegraph. " + "(Migrated from per-agent root in #596.)"),
     coalesce: exports_external.object({
-      window_ms: exports_external.number().int().nonnegative().optional().describe("Sliding-window (ms) for merging consecutive inbound messages from " + "the same sender+topic into ONE Claude turn. Each new message resets " + "the timer; the turn starts once the sender pauses for this long. " + "Catches forwarded bursts, pasted text the Telegram client split " + "into several messages, and mixed text+media forwards. Default 500. " + "Set 0 to disable (every message becomes its own turn). Raise for " + "users who think in multiple short messages; the trade-off is the " + "single-message turn start is delayed by this much (the \uD83D\uDC40 ack still " + "fires immediately, so perceived latency is unchanged).")
+      window_ms: exports_external.number().int().nonnegative().optional().describe("Sliding-window (ms) for merging consecutive inbound messages from " + "the same sender+topic into ONE Claude turn. Each new message resets " + "the timer; the turn starts once the sender pauses for this long. " + "Catches forwarded bursts, pasted text the Telegram client split " + "into several messages, and mixed text+media forwards. Default 500. " + "Set 0 to disable (every message becomes its own turn). Raise for " + "users who think in multiple short messages; the trade-off is the " + "single-message turn start is delayed by this much (the \uD83D\uDC40 ack still " + "fires immediately, so perceived latency is unchanged)."),
+      max_attachments: exports_external.number().int().positive().optional().describe("Maximum number of media attachments carried into ONE coalesced " + "Claude turn. Default 10 \u2014 a full Telegram album (media_group caps " + "at 10) or a text+multi-image forwarded burst arrives as a single " + "turn; the agent sees numbered attachment fields (image_path, " + "image_path_2, \u2026). Set 1 to restore the historical " + "single-attachment-per-turn behaviour. Excess attachments beyond " + "the cap spill into the next turn. Each attachment is downloaded, " + "so a high cap on a slow link delays turn start.")
     }).optional().describe("Inbound coalescing \u2014 how the gateway groups rapid consecutive messages " + "into a single turn so a forwarded album or split paste doesn't fan out " + "into N separate turns. Cascades from defaults.channels.telegram.coalesce."),
+    interrupt: exports_external.object({
+      safe_boundary: exports_external.boolean().optional().describe("When true (the default), a `!`-prefix interrupt that arrives while " + "the agent is mid-tool-call is DEFERRED: the SIGINT and the " + "replacement turn wait until the in-flight tool call finishes (a " + "clean boundary) instead of C-c'ing the agent mid-write/mid-bash. If " + "no tool is in flight the interrupt still fires immediately. Bounded " + "by max_wait_ms so a long tool never strands the user. Set false to " + "fire synchronously the moment `!` is received (historical " + "behaviour). Rapid repeated `!` while one is pending coalesce into a " + "single deferred interrupt carrying the latest body."),
+      max_wait_ms: exports_external.number().int().positive().optional().describe("Upper bound (ms) the gateway waits for a safe boundary before firing " + "a deferred `!` interrupt anyway. Only consulted when safe_boundary is " + "true. Default 8000. Keep it short \u2014 the user explicitly asked to " + "interrupt, so a long in-flight tool shouldn't ghost them; the cap " + "trades a tiny risk of a mid-tool C-c for a guaranteed response.")
+    }).optional().describe("Interrupt timing \u2014 how a `!`-prefix interrupt behaves when it lands " + "mid-tool-call. Off by default (fire immediately). Cascades from " + "defaults.channels.telegram.interrupt."),
     webhook_sources: exports_external.array(exports_external.enum(["github", "generic"])).optional().describe("External webhook sources allowed to ingest events into this agent's " + "log. POST /webhook/<agent>/<source> on the switchroom web server. " + "Each source has its own signature verification ('github' = " + "X-Hub-Signature-256 HMAC-SHA256, 'generic' = Bearer token). " + "Per-source secret read from ~/.switchroom/webhook-secrets.json " + "keyed by [agent][source]. Verified events append to " + "<agent>/telegram/webhook-events.jsonl for the agent to read on " + "demand. Off by default \u2014 webhook is the only untrusted-inbound " + "surface in the system, so opt-in is mandatory. " + "Cascades from defaults.channels.telegram.webhook_sources. " + "(Migrated from per-agent root in #596 \u2014 see #577.)"),
     webhook_dispatch: exports_external.object({
       github: exports_external.array(exports_external.object({
@@ -30154,6 +30159,136 @@ var init_materialize_bot_token = __esm(() => {
   };
 });
 
+// ../src/agents/tmux.ts
+var exports_tmux = {};
+__export(exports_tmux, {
+  sendAgentInterrupt: () => sendAgentInterrupt,
+  captureAgentPane: () => captureAgentPane
+});
+import { execFileSync as execFileSync4 } from "node:child_process";
+import { mkdirSync as mkdirSync25, readdirSync as readdirSync6, statSync as statSync12, unlinkSync as unlinkSync14, writeFileSync as writeFileSync24 } from "node:fs";
+import { resolve as resolve7 } from "node:path";
+function captureAgentPane(opts) {
+  const { agentName: agentName3, agentDir, reason } = opts;
+  const scrollback = opts.scrollback !== false;
+  const retain = typeof opts.retain === "number" && opts.retain > 0 ? opts.retain : 20;
+  const socket = `switchroom-${agentName3}`;
+  const outDir = resolve7(agentDir, "crash-reports");
+  const ts = isoStamp(new Date);
+  const reasonSlug = sanitizeReason(reason);
+  const outPath = resolve7(outDir, `${ts}-${reasonSlug}.txt`);
+  try {
+    mkdirSync25(outDir, { recursive: true, mode: 493 });
+  } catch (err) {
+    const msg = `mkdir crash-reports failed: ${err.message}`;
+    console.error(`[tmux-capture] ${agentName3}: ${msg}`);
+    return { error: msg };
+  }
+  const args = ["-L", socket, "capture-pane", "-p"];
+  if (scrollback) {
+    args.push("-S", "-");
+  }
+  args.push("-t", agentName3);
+  let pane;
+  try {
+    pane = execFileSync4("tmux", args, {
+      timeout: 5000,
+      maxBuffer: 64 * 1024 * 1024,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+  } catch (err) {
+    const msg = `tmux capture-pane failed: ${err.message}`;
+    console.error(`[tmux-capture] ${agentName3}: ${msg}`);
+    return { error: msg };
+  }
+  let body = pane;
+  if (body.byteLength > MAX_BYTES) {
+    body = body.subarray(body.byteLength - MAX_BYTES);
+  }
+  const header = `# agent: ${agentName3}
+` + `# reason: ${reason}
+` + `# captured-at: ${ts}
+` + `# tmux-socket: ${socket}
+` + `
+`;
+  try {
+    writeFileSync24(outPath, Buffer.concat([Buffer.from(header, "utf8"), body]), {
+      mode: 420
+    });
+  } catch (err) {
+    const msg = `write crash-report failed: ${err.message}`;
+    console.error(`[tmux-capture] ${agentName3}: ${msg}`);
+    return { error: msg };
+  }
+  try {
+    pruneOldReports(outDir, retain);
+  } catch (err) {
+    console.error(`[tmux-capture] ${agentName3}: retention prune failed: ${err.message}`);
+  }
+  return { path: outPath };
+}
+function isoStamp(d) {
+  return d.toISOString().replace(/\.\d+Z$/, "Z").replace(/:/g, "-");
+}
+function sanitizeReason(reason) {
+  const slug = reason.trim().toLowerCase().replace(/[^a-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "");
+  return slug || "unknown";
+}
+function sendAgentInterrupt(opts) {
+  const { agentName: agentName3 } = opts;
+  const attempts = typeof opts.attempts === "number" && opts.attempts > 0 ? opts.attempts : 1;
+  const retryDelayMs = typeof opts.retryDelayMs === "number" && opts.retryDelayMs >= 0 ? opts.retryDelayMs : 100;
+  const socket = `switchroom-${agentName3}`;
+  const args = ["-L", socket, "send-keys", "-t", agentName3, "C-c"];
+  let lastError = null;
+  for (let i = 0;i < attempts; i++) {
+    try {
+      execFileSync4("tmux", args, {
+        timeout: 3000,
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      return { ok: true };
+    } catch (err) {
+      lastError = `tmux send-keys C-c failed: ${err.message}`;
+      console.error(`[tmux-interrupt] ${agentName3}: ${lastError}`);
+    }
+    if (i < attempts - 1 && retryDelayMs > 0) {
+      sleepSync2(retryDelayMs);
+    }
+  }
+  return { error: lastError ?? "tmux send-keys C-c failed" };
+}
+function sleepSync2(ms) {
+  const sab = new SharedArrayBuffer(4);
+  const view = new Int32Array(sab);
+  Atomics.wait(view, 0, 0, ms);
+}
+function pruneOldReports(dir, retain) {
+  let entries;
+  try {
+    entries = readdirSync6(dir);
+  } catch {
+    return;
+  }
+  const files = entries.filter((n) => n.endsWith(".txt")).map((n) => {
+    const full = resolve7(dir, n);
+    let mtimeMs = 0;
+    try {
+      mtimeMs = statSync12(full).mtimeMs;
+    } catch {}
+    return { full, mtimeMs };
+  }).sort((a, b) => b.mtimeMs - a.mtimeMs);
+  for (const stale of files.slice(retain)) {
+    try {
+      unlinkSync14(stale.full);
+    } catch {}
+  }
+}
+var MAX_BYTES;
+var init_tmux = __esm(() => {
+  MAX_BYTES = 10 * 1024 * 1024;
+});
+
 // gateway/config-approval-handler.ts
 var exports_config_approval_handler = {};
 __export(exports_config_approval_handler, {
@@ -30372,136 +30507,6 @@ var init_config_approval_handler = __esm(() => {
   pending = new Map;
 });
 
-// ../src/agents/tmux.ts
-var exports_tmux = {};
-__export(exports_tmux, {
-  sendAgentInterrupt: () => sendAgentInterrupt,
-  captureAgentPane: () => captureAgentPane
-});
-import { execFileSync as execFileSync4 } from "node:child_process";
-import { mkdirSync as mkdirSync25, readdirSync as readdirSync6, statSync as statSync12, unlinkSync as unlinkSync14, writeFileSync as writeFileSync24 } from "node:fs";
-import { resolve as resolve7 } from "node:path";
-function captureAgentPane(opts) {
-  const { agentName: agentName3, agentDir, reason } = opts;
-  const scrollback = opts.scrollback !== false;
-  const retain = typeof opts.retain === "number" && opts.retain > 0 ? opts.retain : 20;
-  const socket = `switchroom-${agentName3}`;
-  const outDir = resolve7(agentDir, "crash-reports");
-  const ts = isoStamp(new Date);
-  const reasonSlug = sanitizeReason(reason);
-  const outPath = resolve7(outDir, `${ts}-${reasonSlug}.txt`);
-  try {
-    mkdirSync25(outDir, { recursive: true, mode: 493 });
-  } catch (err) {
-    const msg = `mkdir crash-reports failed: ${err.message}`;
-    console.error(`[tmux-capture] ${agentName3}: ${msg}`);
-    return { error: msg };
-  }
-  const args = ["-L", socket, "capture-pane", "-p"];
-  if (scrollback) {
-    args.push("-S", "-");
-  }
-  args.push("-t", agentName3);
-  let pane;
-  try {
-    pane = execFileSync4("tmux", args, {
-      timeout: 5000,
-      maxBuffer: 64 * 1024 * 1024,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-  } catch (err) {
-    const msg = `tmux capture-pane failed: ${err.message}`;
-    console.error(`[tmux-capture] ${agentName3}: ${msg}`);
-    return { error: msg };
-  }
-  let body = pane;
-  if (body.byteLength > MAX_BYTES) {
-    body = body.subarray(body.byteLength - MAX_BYTES);
-  }
-  const header = `# agent: ${agentName3}
-` + `# reason: ${reason}
-` + `# captured-at: ${ts}
-` + `# tmux-socket: ${socket}
-` + `
-`;
-  try {
-    writeFileSync24(outPath, Buffer.concat([Buffer.from(header, "utf8"), body]), {
-      mode: 420
-    });
-  } catch (err) {
-    const msg = `write crash-report failed: ${err.message}`;
-    console.error(`[tmux-capture] ${agentName3}: ${msg}`);
-    return { error: msg };
-  }
-  try {
-    pruneOldReports(outDir, retain);
-  } catch (err) {
-    console.error(`[tmux-capture] ${agentName3}: retention prune failed: ${err.message}`);
-  }
-  return { path: outPath };
-}
-function isoStamp(d) {
-  return d.toISOString().replace(/\.\d+Z$/, "Z").replace(/:/g, "-");
-}
-function sanitizeReason(reason) {
-  const slug = reason.trim().toLowerCase().replace(/[^a-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "");
-  return slug || "unknown";
-}
-function sendAgentInterrupt(opts) {
-  const { agentName: agentName3 } = opts;
-  const attempts = typeof opts.attempts === "number" && opts.attempts > 0 ? opts.attempts : 1;
-  const retryDelayMs = typeof opts.retryDelayMs === "number" && opts.retryDelayMs >= 0 ? opts.retryDelayMs : 100;
-  const socket = `switchroom-${agentName3}`;
-  const args = ["-L", socket, "send-keys", "-t", agentName3, "C-c"];
-  let lastError = null;
-  for (let i = 0;i < attempts; i++) {
-    try {
-      execFileSync4("tmux", args, {
-        timeout: 3000,
-        stdio: ["ignore", "pipe", "pipe"]
-      });
-      return { ok: true };
-    } catch (err) {
-      lastError = `tmux send-keys C-c failed: ${err.message}`;
-      console.error(`[tmux-interrupt] ${agentName3}: ${lastError}`);
-    }
-    if (i < attempts - 1 && retryDelayMs > 0) {
-      sleepSync2(retryDelayMs);
-    }
-  }
-  return { error: lastError ?? "tmux send-keys C-c failed" };
-}
-function sleepSync2(ms) {
-  const sab = new SharedArrayBuffer(4);
-  const view = new Int32Array(sab);
-  Atomics.wait(view, 0, 0, ms);
-}
-function pruneOldReports(dir, retain) {
-  let entries;
-  try {
-    entries = readdirSync6(dir);
-  } catch {
-    return;
-  }
-  const files = entries.filter((n) => n.endsWith(".txt")).map((n) => {
-    const full = resolve7(dir, n);
-    let mtimeMs = 0;
-    try {
-      mtimeMs = statSync12(full).mtimeMs;
-    } catch {}
-    return { full, mtimeMs };
-  }).sort((a, b) => b.mtimeMs - a.mtimeMs);
-  for (const stale of files.slice(retain)) {
-    try {
-      unlinkSync14(stale.full);
-    } catch {}
-  }
-}
-var MAX_BYTES;
-var init_tmux = __esm(() => {
-  MAX_BYTES = 10 * 1024 * 1024;
-});
-
 // ../src/vault/approvals/client.ts
 function resolveKernelSocketPath2(opts) {
   if (opts?.socket)
@@ -31025,6 +31030,54 @@ function parseInterruptMarker(text) {
   };
 }
 
+// gateway/interrupt-defer.ts
+class ToolFlightTracker {
+  inFlight = new Set;
+  onEvent(ev) {
+    switch (ev.kind) {
+      case "tool_use":
+        if (typeof ev.toolUseId === "string" && ev.toolUseId.length > 0) {
+          this.inFlight.add(ev.toolUseId);
+        }
+        break;
+      case "tool_result":
+        if (typeof ev.toolUseId === "string" && ev.toolUseId.length > 0) {
+          this.inFlight.delete(ev.toolUseId);
+        }
+        break;
+      case "turn_end":
+      case "enqueue":
+        this.inFlight.clear();
+        break;
+      default:
+        break;
+    }
+  }
+  isMidToolCall() {
+    return this.inFlight.size > 0;
+  }
+  inFlightCount() {
+    return this.inFlight.size;
+  }
+  clear() {
+    this.inFlight.clear();
+  }
+}
+function decideInterruptTiming(opts) {
+  if (!opts.safeBoundaryEnabled)
+    return "fire-now";
+  return opts.midToolCall ? "defer" : "fire-now";
+}
+var DEFAULT_INTERRUPT_MAX_WAIT_MS = 8000;
+function resolveInterruptMaxWaitMs(configured) {
+  if (typeof configured === "number" && configured > 0)
+    return configured;
+  return DEFAULT_INTERRUPT_MAX_WAIT_MS;
+}
+function resolveSafeBoundaryEnabled(configured) {
+  return configured !== false;
+}
+
 // sticker-aliases.ts
 function looksLikeFileId(s) {
   return /^[A-Za-z0-9_-]{10,200}$/.test(s);
@@ -31562,6 +31615,37 @@ function inboundCoalesceKey(chatId, threadId, userId) {
   return `${chatId}:${t}:${userId}`;
 }
 
+// gateway/coalesce-attachments.ts
+var DEFAULT_MAX_ATTACHMENTS = 10;
+function resolveCoalesceMaxAttachments(configured) {
+  return Math.max(1, configured ?? DEFAULT_MAX_ATTACHMENTS);
+}
+function splitCoalescedAttachments(entries, hasAttachment, maxAttachments) {
+  const withAttachment = entries.filter(hasAttachment);
+  const capped = withAttachment.slice(0, Math.max(1, maxAttachments));
+  const [primary, ...extras] = capped;
+  return { primary, extras };
+}
+function buildExtraAttachmentMeta(resolved) {
+  const out = {};
+  resolved.forEach((ex, i) => {
+    const n = i + 2;
+    if (ex.imagePath)
+      out[`image_path_${n}`] = ex.imagePath;
+    if (ex.attachment) {
+      out[`attachment_kind_${n}`] = ex.attachment.kind;
+      out[`attachment_file_id_${n}`] = ex.attachment.file_id;
+      if (ex.attachment.size != null)
+        out[`attachment_size_${n}`] = String(ex.attachment.size);
+      if (ex.attachment.mime)
+        out[`attachment_mime_${n}`] = ex.attachment.mime;
+      if (ex.attachment.name)
+        out[`attachment_name_${n}`] = ex.attachment.name;
+    }
+  });
+  return out;
+}
+
 // status-reactions.ts
 var TELEGRAM_REACTION_WHITELIST = new Set([
   "\uD83D\uDC4D",
@@ -31879,9 +31963,13 @@ class DeferredDoneReactions {
 }
 
 // worker-activity-feed.ts
+function isWorkerActivityFeedEnabled(envVal) {
+  return envVal !== "0";
+}
 var DESC_MAX = 80;
 var TOOL_ARG_MAX = 64;
 var SUMMARY_MAX = 100;
+var NARRATIVE_MAX_LINES = 6;
 function renderWorkerActivity(v) {
   const desc = truncate(v.description.trim() || "background task", DESC_MAX);
   const elapsed = formatDuration(v.elapsedMs);
@@ -31900,10 +31988,17 @@ function renderWorkerActivity(v) {
   } else {
     activity = `<i>starting\u2026 (${elapsed})</i>`;
   }
-  const summary = v.latestSummary.trim();
   const lines = [header, activity];
-  if (summary.length > 0) {
-    lines.push(`  \u21b3 <i>${escapeHtml(truncate(summary, SUMMARY_MAX))}</i>`);
+  const narrative = (v.narrativeLines ?? []).map((s) => s.trim()).filter((s) => s.length > 0);
+  if (narrative.length > 0) {
+    for (const line of narrative) {
+      lines.push(`  \u21b3 <i>${escapeHtml(truncate(line, SUMMARY_MAX))}</i>`);
+    }
+  } else {
+    const summary = v.latestSummary.trim();
+    if (summary.length > 0) {
+      lines.push(`  \u21b3 <i>${escapeHtml(truncate(summary, SUMMARY_MAX))}</i>`);
+    }
   }
   return lines.join(`
 `);
@@ -31940,10 +32035,22 @@ function createWorkerActivityFeed(opts) {
     h.cooldownUntil = nowFn() + retryAfter * 1000 + COOLDOWN_JITTER_MS;
     log(`worker-feed: ${label} 429 \u2014 backing off ${retryAfter}s`);
   }
+  function accumulateNarrative(h, view) {
+    const line = view.latestSummary.trim();
+    if (line.length === 0)
+      return;
+    if (h.narrative[h.narrative.length - 1] === line)
+      return;
+    h.narrative.push(line);
+    if (h.narrative.length > NARRATIVE_MAX_LINES) {
+      h.narrative.splice(0, h.narrative.length - NARRATIVE_MAX_LINES);
+    }
+  }
   async function doUpdate(h, view) {
+    accumulateNarrative(h, view);
     if (nowFn() < h.cooldownUntil)
       return;
-    const body = renderWorkerActivity(view);
+    const body = renderWorkerActivity({ ...view, narrativeLines: h.narrative });
     if (h.messageId == null) {
       if (view.elapsedMs < firstPaintMin)
         return;
@@ -32010,6 +32117,7 @@ function createWorkerActivityFeed(opts) {
           lastBody: null,
           lastEditAt: 0,
           cooldownUntil: 0,
+          narrative: [],
           chain: Promise.resolve()
         };
         handles.set(agentId, h);
@@ -46399,6 +46507,7 @@ function planBufferedRedelivery(pending) {
   flush();
   return out;
 }
+var ATTACHMENT_META_RE = /^(image_path|attachment_)/;
 function mergeRun(run2) {
   const last = run2[run2.length - 1];
   const mediaEntry = run2.find(inboundHasMedia);
@@ -46409,6 +46518,14 @@ function mergeRun(run2) {
   };
   delete merged.imagePath;
   delete merged.attachment;
+  if (mediaEntry != null && mediaEntry !== last) {
+    const splicedMeta = { ...merged.meta };
+    for (const [k, v] of Object.entries(mediaEntry.meta)) {
+      if (ATTACHMENT_META_RE.test(k))
+        splicedMeta[k] = v;
+    }
+    merged.meta = splicedMeta;
+  }
   if (mediaEntry?.imagePath != null)
     merged.imagePath = mediaEntry.imagePath;
   if (mediaEntry?.attachment != null)
@@ -47037,6 +47154,7 @@ function planBufferedRedelivery2(pending) {
   flush();
   return out;
 }
+var ATTACHMENT_META_RE2 = /^(image_path|attachment_)/;
 function mergeRun2(run2) {
   const last = run2[run2.length - 1];
   const mediaEntry = run2.find(inboundHasMedia2);
@@ -47047,6 +47165,14 @@ function mergeRun2(run2) {
   };
   delete merged.imagePath;
   delete merged.attachment;
+  if (mediaEntry != null && mediaEntry !== last) {
+    const splicedMeta = { ...merged.meta };
+    for (const [k, v] of Object.entries(mediaEntry.meta)) {
+      if (ATTACHMENT_META_RE2.test(k))
+        splicedMeta[k] = v;
+    }
+    merged.meta = splicedMeta;
+  }
   if (mediaEntry?.imagePath != null)
     merged.imagePath = mediaEntry.imagePath;
   if (mediaEntry?.attachment != null)
@@ -51244,10 +51370,10 @@ function sweepStaleTurnActiveMarker(stateDir, opts) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.14.19";
-var COMMIT_SHA = "21863276";
-var COMMIT_DATE = "2026-05-31T00:15:08Z";
-var LATEST_PR = 2013;
+var VERSION = "0.14.21";
+var COMMIT_SHA = "62ddded0";
+var COMMIT_DATE = "2026-05-31T02:54:29Z";
+var LATEST_PR = 2024;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -52015,6 +52141,9 @@ function readAccessFile() {
       parseMode: parsed.parseMode,
       disableLinkPreview: parsed.disableLinkPreview,
       coalescingGapMs: parsed.coalescingGapMs,
+      coalesceMaxAttachments: parsed.coalesceMaxAttachments,
+      interruptSafeBoundary: parsed.interruptSafeBoundary,
+      interruptMaxWaitMs: parsed.interruptMaxWaitMs,
       statusReactions: parsed.statusReactions,
       historyEnabled: parsed.historyEnabled,
       historyRetentionDays: parsed.historyRetentionDays,
@@ -52222,6 +52351,40 @@ var lastPtyPreviewByChat = new Map;
 var progressUpdateLastSent = new Map;
 var progressUpdateTurnCount = new Map;
 var currentTurn = null;
+var toolFlightTracker = new ToolFlightTracker;
+var pendingDeferredInterrupt = null;
+async function fireDeferredInterrupt(reason) {
+  const pending2 = pendingDeferredInterrupt;
+  if (pending2 == null)
+    return;
+  pendingDeferredInterrupt = null;
+  clearTimeout(pending2.deadlineTimer);
+  const waitedMs = Date.now() - pending2.registeredAt;
+  process.stderr.write(`telegram gateway: deferred-interrupt firing reason=${reason} agent=${pending2.agentName} chat=${pending2.chatId} waited_ms=${waitedMs} in_flight=${toolFlightTracker.inFlightCount()}
+`);
+  try {
+    const { sendAgentInterrupt: sendAgentInterrupt2 } = await Promise.resolve().then(() => (init_tmux(), exports_tmux));
+    const r = sendAgentInterrupt2({ agentName: pending2.agentName });
+    if ("ok" in r) {
+      process.stderr.write(`telegram gateway: deferred-interrupt SIGINT delivered via tmux send-keys agent=${pending2.agentName}
+`);
+    } else {
+      process.stderr.write(`telegram gateway: deferred-interrupt SIGINT via tmux failed agent=${pending2.agentName}: ${r.error}
+`);
+    }
+  } catch (err) {
+    process.stderr.write(`telegram gateway: deferred-interrupt SIGINT failed: ${err.message}
+`);
+  }
+  const delivered = ipcServer.sendToAgent(pending2.agentName, pending2.inboundMsg);
+  if (delivered) {
+    markClaudeBusyForInbound(pending2.inboundMsg);
+  } else {
+    pendingInboundBuffer.push(pending2.agentName, pending2.inboundMsg);
+    process.stderr.write(`telegram gateway: deferred-interrupt body buffered (bridge miss) agent=${pending2.agentName} chat=${pending2.chatId}
+`);
+  }
+}
 var preambleSuppressor = new PreambleSuppressor({
   emitAnswer: (cumulative) => {
     const stream = currentTurn?.answerStream ?? null;
@@ -52963,23 +53126,27 @@ function looksLikeAuthCode(text) {
     return true;
   return false;
 }
-var bufferedAttachmentKeys = new Set;
+var bufferedAttachmentKeys = new Map;
+function coalesceMaxAttachments() {
+  return resolveCoalesceMaxAttachments(loadAccess().coalesceMaxAttachments);
+}
 var inboundCoalescer = createInboundCoalescer({
   gapMs: () => loadAccess().coalescingGapMs ?? 500,
   merge: (entries) => {
     const last = entries[entries.length - 1];
-    const withAttachment = entries.find((e) => e.downloadImage != null || e.attachment != null);
+    const { primary, extras } = splitCoalescedAttachments(entries, (e) => e.downloadImage != null || e.attachment != null, coalesceMaxAttachments());
     return {
-      text: entries.map((e) => e.text).join(`
+      text: entries.map((e) => e.text).filter((t) => t.length > 0).join(`
 `),
       ctx: last.ctx,
-      downloadImage: withAttachment?.downloadImage,
-      attachment: withAttachment?.attachment
+      downloadImage: primary?.downloadImage,
+      attachment: primary?.attachment,
+      extraAttachments: extras.length > 0 ? extras.map((e) => ({ downloadImage: e.downloadImage, attachment: e.attachment })) : undefined
     };
   },
   onFlush: (key, merged) => {
     bufferedAttachmentKeys.delete(key);
-    handleInbound(merged.ctx, merged.text, merged.downloadImage, merged.attachment);
+    handleInbound(merged.ctx, merged.text, merged.downloadImage, merged.attachment, merged.extraAttachments);
   }
 });
 function emitGatewayOperatorEvent(event) {
@@ -53498,6 +53665,10 @@ var ipcServer = createIpcServer({
     const threadHint = msg.threadId != null ? String(msg.threadId) : undefined;
     progressDriver?.ingest(ev, chatHint, threadHint);
     handleSessionEvent(ev);
+    toolFlightTracker.onEvent(ev);
+    if (pendingDeferredInterrupt != null && !toolFlightTracker.isMidToolCall()) {
+      fireDeferredInterrupt("boundary");
+    }
     if (currentTurn != null) {
       const key = statusKey(currentTurn.sessionChatId, currentTurn.sessionThreadId);
       if (ev.kind === "thinking") {
@@ -56141,7 +56312,8 @@ async function handleInboundCoalesced(ctx, text, downloadImage, attachment) {
     return handleInbound(ctx, text, downloadImage, attachment);
   }
   const hasAttachment = downloadImage != null || attachment != null;
-  if (hasAttachment && ctx.message?.media_group_id != null) {
+  const maxAttachments = coalesceMaxAttachments();
+  if (hasAttachment && ctx.message?.media_group_id != null && maxAttachments <= 1) {
     return handleInbound(ctx, text, downloadImage, attachment);
   }
   const from = ctx.from;
@@ -56149,7 +56321,7 @@ async function handleInboundCoalesced(ctx, text, downloadImage, attachment) {
     return;
   if (hasAttachment) {
     const probeKey = inboundCoalesceKey(String(ctx.chat.id), ctx.message?.message_thread_id, String(from.id));
-    if (bufferedAttachmentKeys.has(probeKey)) {
+    if ((bufferedAttachmentKeys.get(probeKey) ?? 0) >= maxAttachments) {
       return handleInbound(ctx, text, downloadImage, attachment);
     }
   }
@@ -56159,7 +56331,7 @@ async function handleInboundCoalesced(ctx, text, downloadImage, attachment) {
   if (result.bypass)
     return handleInbound(ctx, text, downloadImage, attachment);
   if (hasAttachment)
-    bufferedAttachmentKeys.add(key);
+    bufferedAttachmentKeys.set(key, (bufferedAttachmentKeys.get(key) ?? 0) + 1);
 }
 function maybeEarlyAckReaction(ctx, from) {
   const msgId = ctx.message?.message_id;
@@ -56180,7 +56352,7 @@ function maybeEarlyAckReaction(ctx, from) {
   ]).catch(() => {});
   bot.api.sendChatAction(chatId, "typing").catch(() => {});
 }
-async function handleInbound(ctx, text, downloadImage, attachment) {
+async function handleInbound(ctx, text, downloadImage, attachment, extraAttachments) {
   const isTopicMessage = ctx.message?.is_topic_message ?? false;
   const messageThreadId = ctx.message?.message_thread_id;
   if (TOPIC_ID != null) {
@@ -56240,16 +56412,22 @@ async function handleInbound(ctx, text, downloadImage, attachment) {
 `);
   }
   const interrupt = parseInterruptMarker(text);
+  let deferInterrupt = false;
   if (interrupt.isInterrupt) {
     const agentName3 = process.env.SWITCHROOM_AGENT_NAME;
-    process.stderr.write(`telegram gateway: interrupt-marker received chat_id=${chat_id} agent=${agentName3 ?? "-"} body_len=${interrupt.body.length} empty=${interrupt.emptyBody}
+    const access2 = loadAccess();
+    deferInterrupt = !interrupt.emptyBody && decideInterruptTiming({
+      safeBoundaryEnabled: resolveSafeBoundaryEnabled(access2.interruptSafeBoundary),
+      midToolCall: toolFlightTracker.isMidToolCall()
+    }) === "defer";
+    process.stderr.write(`telegram gateway: interrupt-marker received chat_id=${chat_id} agent=${agentName3 ?? "-"} body_len=${interrupt.body.length} empty=${interrupt.emptyBody} defer=${deferInterrupt} in_flight=${toolFlightTracker.inFlightCount()}
 `);
     if (msgId != null) {
       bot.api.setMessageReaction(chat_id, msgId, [
         { type: "emoji", emoji: "\u26A1" }
       ]).catch(() => {});
     }
-    if (agentName3) {
+    if (agentName3 && !deferInterrupt) {
       try {
         const { sendAgentInterrupt: sendAgentInterrupt2 } = await Promise.resolve().then(() => (init_tmux(), exports_tmux));
         const r = sendAgentInterrupt2({ agentName: agentName3 });
@@ -56688,6 +56866,16 @@ ${preBlock(write.output)}`;
     }
   }
   const imagePath = downloadImage ? await downloadImage() : undefined;
+  const extraResolved = [];
+  if (extraAttachments && extraAttachments.length > 0) {
+    for (const ex of extraAttachments) {
+      const exImagePath = ex.downloadImage ? await ex.downloadImage() : undefined;
+      extraResolved.push({ imagePath: exImagePath, attachment: ex.attachment });
+    }
+  }
+  const extraMeta = buildExtraAttachmentMeta(extraResolved);
+  const primaryHasAttachment = imagePath != null || attachment != null;
+  const attachmentCount = (primaryHasAttachment ? 1 : 0) + extraResolved.length;
   const replyToMsg = ctx.message?.reply_to_message;
   const replyToMessageId = replyToMsg?.message_id;
   const replyToTextRaw = replyToMsg ? replyToMsg.text ?? replyToMsg.caption ?? undefined : undefined;
@@ -56771,10 +56959,37 @@ ${preBlock(write.output)}`;
         ...attachment.size != null ? { attachment_size: String(attachment.size) } : {},
         ...attachment.mime ? { attachment_mime: attachment.mime } : {},
         ...attachment.name ? { attachment_name: attachment.name } : {}
-      } : {}
+      } : {},
+      ...attachmentCount > 1 ? { attachment_count: String(attachmentCount) } : {},
+      ...extraMeta
     }
   };
   const selfAgent = process.env.SWITCHROOM_AGENT_NAME ?? "";
+  if (deferInterrupt) {
+    const selfAgentDefer = process.env.SWITCHROOM_AGENT_NAME ?? "";
+    if (pendingDeferredInterrupt != null) {
+      pendingDeferredInterrupt.inboundMsg = inboundMsg;
+      pendingDeferredInterrupt.msgId = msgId ?? null;
+      process.stderr.write(`telegram gateway: deferred-interrupt coalesced (replacing pending body) agent=${selfAgentDefer} chat=${chat_id} msg=${msgId ?? "-"}
+`);
+    } else {
+      const maxWaitMs = resolveInterruptMaxWaitMs(loadAccess().interruptMaxWaitMs);
+      pendingDeferredInterrupt = {
+        agentName: selfAgentDefer,
+        inboundMsg,
+        chatId: chat_id,
+        msgId: msgId ?? null,
+        threadId: messageThreadId ?? undefined,
+        registeredAt: Date.now(),
+        deadlineTimer: setTimeout(() => {
+          fireDeferredInterrupt("timeout");
+        }, maxWaitMs)
+      };
+      process.stderr.write(`telegram gateway: deferred-interrupt parked agent=${selfAgentDefer} chat=${chat_id} msg=${msgId ?? "-"} max_wait_ms=${maxWaitMs} in_flight=${toolFlightTracker.inFlightCount()}
+`);
+    }
+    return;
+  }
   if (decideInboundDelivery({
     turnInFlight: turnInFlightAtReceipt,
     isSteering,
@@ -61449,7 +61664,7 @@ var didOneTimeSetup = false;
         if (streamMode === "checklist") {
           const watcherAgentDir = resolveAgentDirFromEnv();
           if (watcherAgentDir != null) {
-            const workerFeedEnabled = process.env.SWITCHROOM_WORKER_ACTIVITY_FEED === "1";
+            const workerFeedEnabled = isWorkerActivityFeedEnabled(process.env.SWITCHROOM_WORKER_ACTIVITY_FEED);
             const workerActivityFeed = createWorkerActivityFeed({
               bot: {
                 sendMessage: async (cid, text, sendOpts) => {