switchroom 0.18.20 → 0.18.22

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

@@ -39283,6 +39283,92 @@ function normalizeForDedup(text) {
   return text.replace(/<\/?[a-zA-Z][^>]*>/g, "").replace(/&[a-zA-Z]+;|&#\d+;/g, " ").replace(/(\*\*|__|`)+/g, "").replace(/^[#>\-*+]\s+/gm, "").replace(/\s+/g, " ").trim().toLowerCase();
 }
 
+// flushed-turn-supersede.ts
+var DEFAULT_SUPERSEDE_TTL_MS = 60000;
+function decideSupersede(record, args) {
+  const ttlMs = args.ttlMs ?? DEFAULT_SUPERSEDE_TTL_MS;
+  if (record == null)
+    return { supersede: false, deleteMessageIds: [], reason: "no-record" };
+  if (args.now - record.ts > ttlMs) {
+    return { supersede: false, deleteMessageIds: [], reason: "expired" };
+  }
+  const sameTurn = record.turnId != null ? record.turnId === args.liveTurnId : args.liveTurnId == null;
+  if (!sameTurn) {
+    return { supersede: false, deleteMessageIds: [], reason: "different-turn" };
+  }
+  return { supersede: true, deleteMessageIds: [...record.messageIds], reason: "supersede" };
+}
+var NULL_TURN_KEY = "<<null-turn>>";
+function turnKey(turnId) {
+  return turnId == null ? NULL_TURN_KEY : turnId;
+}
+
+class FlushedTurnSupersedeRegistry {
+  entries = new Map;
+  ttlMs;
+  constructor(opts = {}) {
+    this.ttlMs = opts.ttlMs ?? DEFAULT_SUPERSEDE_TTL_MS;
+  }
+  record(chatId, threadId, rec, now) {
+    if (rec.messageIds.length === 0)
+      return;
+    this.sweep(now);
+    const lane = makeKey2(chatId, threadId);
+    let laneMap = this.entries.get(lane);
+    if (laneMap == null) {
+      laneMap = new Map;
+      this.entries.set(lane, laneMap);
+    }
+    laneMap.set(turnKey(rec.turnId), {
+      turnId: rec.turnId,
+      messageIds: [...rec.messageIds],
+      text: rec.text,
+      ts: now
+    });
+  }
+  peek(chatId, threadId, args) {
+    const rec = this.entries.get(makeKey2(chatId, threadId))?.get(turnKey(args.liveTurnId));
+    return decideSupersede(rec, { liveTurnId: args.liveTurnId, now: args.now, ttlMs: this.ttlMs });
+  }
+  take(chatId, threadId, args) {
+    const lane = makeKey2(chatId, threadId);
+    const decision = this.peek(chatId, threadId, args);
+    if (decision.supersede) {
+      const laneMap = this.entries.get(lane);
+      laneMap?.delete(turnKey(args.liveTurnId));
+      if (laneMap != null && laneMap.size === 0)
+        this.entries.delete(lane);
+    }
+    return decision;
+  }
+  forget(chatId, threadId) {
+    this.entries.delete(makeKey2(chatId, threadId));
+  }
+  clear() {
+    this.entries.clear();
+  }
+  sweep(now) {
+    for (const [lane, laneMap] of this.entries) {
+      for (const [tk, rec] of laneMap) {
+        if (now - rec.ts > this.ttlMs)
+          laneMap.delete(tk);
+      }
+      if (laneMap.size === 0)
+        this.entries.delete(lane);
+    }
+  }
+  size(now) {
+    this.sweep(now);
+    let total = 0;
+    for (const laneMap of this.entries.values())
+      total += laneMap.size;
+    return total;
+  }
+}
+function makeKey2(chatId, threadId) {
+  return threadId == null ? chatId : `${chatId}|${threadId}`;
+}
+
 // gateway/inbound-coalesce.ts
 function createInboundCoalescer(opts) {
   const buffer = new Map;
@@ -40593,44 +40679,63 @@ function createWorkerActivityFeed(opts) {
   function removeWorker(g, agentId) {
     g.workers.delete(agentId);
     agentIndex.delete(agentId);
-    if (g.workers.size === 0)
+    maybeDeleteGroup(g);
+  }
+  function maybeDeleteGroup(g) {
+    if (g.workers.size === 0 && g.pendingFinalize.size === 0)
       groups.delete(g.feedKey);
   }
+  function hasLiveWorker(g) {
+    for (const w of g.workers.values())
+      if (!w.finished)
+        return true;
+    return false;
+  }
   function syncPin(g) {
-    const messageId = g.messageId != null && g.workers.size > 0 ? g.messageId : null;
+    const messageId = g.messageId != null && hasLiveWorker(g) ? g.messageId : null;
     reconcilePinFn({ feedKey: g.feedKey, chatId: g.chatId, threadId: g.threadId, messageId });
   }
   async function doRender(g, opts2 = {}) {
     const now = nowFn();
     const isTerminal = opts2.terminalRecap != null;
-    const settleTerminal = () => {
-      g.pendingFinalize = null;
-      if (opts2.finishingAgentId != null)
-        removeWorker(g, opts2.finishingAgentId);
+    const finishingAgentId = opts2.finishingAgentId;
+    const stageRecap = () => {
+      if (isTerminal && finishingAgentId != null && opts2.terminalRecap != null) {
+        g.pendingFinalize.set(finishingAgentId, opts2.terminalRecap);
+      }
+    };
+    const clearStaged = () => {
+      if (finishingAgentId != null)
+        g.pendingFinalize.delete(finishingAgentId);
+      maybeDeleteGroup(g);
       syncPin(g);
     };
+    if (isTerminal) {
+      stageRecap();
+      if (finishingAgentId != null && g.workers.has(finishingAgentId)) {
+        removeWorker(g, finishingAgentId);
+      }
+      g.terminalPainted = !hasLiveWorker(g);
+      syncPin(g);
+    }
     if (now < g.cooldownUntil) {
-      if (isTerminal && opts2.terminalRecap != null)
-        g.pendingFinalize = opts2.terminalRecap;
       return;
     }
     if (parkIfFloodWindowOpen(g)) {
-      if (isTerminal && opts2.terminalRecap != null)
-        g.pendingFinalize = opts2.terminalRecap;
       return;
     }
     const body = renderGroupBody(g, now, opts2.terminalRecap ?? null, opts2.heartbeat ?? false);
     if (body == null) {
       if (isTerminal)
-        settleTerminal();
+        clearStaged();
       return;
     }
     if (g.messageId == null) {
-      const maxElapsed = Math.max(0, ...runningRows(g).map((r) => liveElapsed(r, now)));
       if (isTerminal) {
-        settleTerminal();
+        clearStaged();
         return;
       }
+      const maxElapsed = Math.max(0, ...runningRows(g).map((r) => liveElapsed(r, now)));
       if (maxElapsed < firstPaintMin)
         return;
       try {
@@ -40643,6 +40748,7 @@ function createWorkerActivityFeed(opts) {
         g.messageId = sent.message_id;
         g.lastBody = body;
         g.lastEditAt = now;
+        g.terminalPainted = false;
         syncPin(g);
         log(`worker-feed: paint feed=${g.feedKey} chat=${g.chatId} ` + `thread=${g.threadId ?? "-"} msgId=${g.messageId} workers=${g.workers.size} bytes=${body.length}`);
       } catch (err) {
@@ -40653,7 +40759,7 @@ function createWorkerActivityFeed(opts) {
     }
     if (body === g.lastBody) {
       if (isTerminal)
-        settleTerminal();
+        clearStaged();
       return;
     }
     if (!opts2.force && now - g.lastEditAt < minEditInterval)
@@ -40662,45 +40768,39 @@ function createWorkerActivityFeed(opts) {
       const res = await opts.bot.editMessageText(g.chatId, g.messageId, body, sendOptsFor(g));
       if (isSendGateShed(res)) {
         parkIfFloodWindowOpen(g);
-        if (isTerminal && opts2.terminalRecap != null)
-          g.pendingFinalize = opts2.terminalRecap;
         return;
       }
       g.lastBody = body;
       g.lastEditAt = now;
       if (isTerminal) {
-        log(`worker-feed: finish feed=${g.feedKey} chat=${g.chatId} thread=${g.threadId ?? "-"} ` + `msgId=${g.messageId} agent=${opts2.finishingAgentId ?? "-"} ` + `state=${opts2.terminalRecap?.state ?? "done"} bytes=${body.length}`);
+        log(`worker-feed: finish feed=${g.feedKey} chat=${g.chatId} thread=${g.threadId ?? "-"} ` + `msgId=${g.messageId} agent=${finishingAgentId ?? "-"} ` + `state=${opts2.terminalRecap?.state ?? "done"} bytes=${body.length}`);
       } else {
         log(`worker-feed: edit feed=${g.feedKey} chat=${g.chatId} ` + `thread=${g.threadId ?? "-"} msgId=${g.messageId} workers=${g.workers.size} bytes=${body.length}`);
       }
       if (isTerminal)
-        settleTerminal();
+        clearStaged();
     } catch (err) {
       const outcome = classifyEditError(err);
       if (outcome === "rate_limited") {
         noteRateLimited(g, err, isTerminal ? "finish" : "edit");
-        if (isTerminal && opts2.terminalRecap != null)
-          g.pendingFinalize = opts2.terminalRecap;
         return;
       }
       if (outcome === "not_modified") {
         g.lastBody = body;
         g.lastEditAt = now;
         if (isTerminal)
-          settleTerminal();
+          clearStaged();
         return;
       }
       if (outcome === "gone") {
         g.messageId = null;
         g.lastBody = null;
         if (isTerminal)
-          settleTerminal();
+          clearStaged();
         else
           syncPin(g);
         return;
       }
-      if (isTerminal && opts2.terminalRecap != null)
-        g.pendingFinalize = opts2.terminalRecap;
       log(`worker-feed: edit transient error feed=${g.feedKey}: ${err.message}`);
     }
   }
@@ -40747,24 +40847,34 @@ function createWorkerActivityFeed(opts) {
   function heartbeatTick() {
     const now = nowFn();
     const staleAgentIds = [];
+    const staleFinished = [];
     for (const g of groups.values()) {
       for (const row of g.workers.values()) {
-        if (!row.finished && now - row.lastUpdateAt >= staleWorkerTtlMs) {
-          staleAgentIds.push(row.agentId);
+        if (now - row.lastUpdateAt >= staleWorkerTtlMs) {
+          if (row.finished)
+            staleFinished.push({ g, agentId: row.agentId });
+          else
+            staleAgentIds.push(row.agentId);
         }
       }
     }
+    for (const { g, agentId } of staleFinished) {
+      log(`worker-feed: TTL GC finished row agent=${agentId} feed=${g.feedKey} \u2014 reaping leaked finished row`);
+      g.pendingFinalize.delete(agentId);
+      removeWorker(g, agentId);
+      syncPin(g);
+    }
     for (const agentId of staleAgentIds) {
       log(`worker-feed: TTL reap agent=${agentId} \u2014 no update in ${Math.floor((now - (groupOfAgent(agentId)?.workers.get(agentId)?.lastUpdateAt ?? now)) / 1000)}s (>= ${Math.floor(staleWorkerTtlMs / 1000)}s); force-terminating leaked row`);
       terminateWorker(agentId);
     }
     for (const g of [...groups.values()]) {
-      if (g.pendingFinalize != null && now >= g.cooldownUntil) {
-        const recap = g.pendingFinalize;
-        const finishingAgentId = [...g.workers.values()].find((w) => w.finished)?.agentId;
-        g.chain = g.chain.then(() => doRender(g, { force: true, terminalRecap: recap, finishingAgentId })).catch((err) => {
-          log(`worker-feed: heartbeat finalize re-drive error feed=${g.feedKey}: ${err.message}`);
-        });
+      if (g.pendingFinalize.size > 0 && now >= g.cooldownUntil) {
+        for (const [agentId, recap] of [...g.pendingFinalize]) {
+          g.chain = g.chain.then(() => doRender(g, { force: true, terminalRecap: recap, finishingAgentId: agentId })).catch((err) => {
+            log(`worker-feed: heartbeat finalize re-drive error feed=${g.feedKey}: ${err.message}`);
+          });
+        }
         continue;
       }
       if (now < g.cooldownUntil)
@@ -40802,7 +40912,7 @@ function createWorkerActivityFeed(opts) {
     },
     hasRunningInFeed(feedKey) {
       const g = groups.get(feedKey);
-      return g != null && g.workers.size > 0;
+      return g != null && hasLiveWorker(g);
     },
     get size() {
       let n = 0;
@@ -40831,10 +40941,18 @@ function createWorkerActivityFeed(opts) {
           cooldownUntil: 0,
           chain: Promise.resolve(),
           workers: new Map,
-          pendingFinalize: null
+          pendingFinalize: new Map,
+          terminalPainted: false
         };
         groups.set(feedKey, g);
       }
+      if (!g.workers.has(agentId) && g.terminalPainted && !hasLiveWorker(g)) {
+        g.messageId = null;
+        g.lastBody = null;
+        g.pendingFinalize.clear();
+        g.terminalPainted = false;
+        syncPin(g);
+      }
       let row = g.workers.get(agentId);
       if (row == null) {
         row = {
@@ -62236,16 +62354,16 @@ function writeSilentEndState(args, deps) {
 `);
   }
 }
-function clearSilentEndState(turnKey, deps) {
+function clearSilentEndState(turnKey2, deps) {
   const statePath = resolveStatePath2(deps);
   if (!existsSync14(statePath))
     return;
   try {
     const prev = JSON.parse(readFileSync16(statePath, "utf8"));
-    if (prev.turnKey != null && prev.turnKey !== turnKey)
+    if (prev.turnKey != null && prev.turnKey !== turnKey2)
       return;
     unlinkSync9(statePath);
-    emitLog(deps, `silent-end: cleared state file turnKey=${turnKey}
+    emitLog(deps, `silent-end: cleared state file turnKey=${turnKey2}
 `);
   } catch {}
 }
@@ -62407,6 +62525,23 @@ function endsWithSilentMarker(text4) {
     return false;
   return isSilentFlushMarker(lines[lines.length - 1]);
 }
+function selectFlushDeliveryText(blocks) {
+  const candidates = blocks.map((b) => b.trim()).filter((b) => b.length > 0);
+  if (candidates.length === 0)
+    return "";
+  if (candidates.length === 1)
+    return candidates[0];
+  const answer = candidates[candidates.length - 1];
+  const preceding = candidates.slice(0, -1);
+  const allNarration = preceding.every(isNarrationBlock);
+  return allNarration ? answer : candidates.join(`
+
+`);
+}
+var NARRATION_OPENER = /^(let me\b|lemme\b|i'?ll\b|i will\b|i am going to\b|i'?m going to\b|i'?m about to\b|going to\b|first,?\s+(?:let me|i'?ll|i will)\b|now,?\s+(?:let me|i'?ll|i will)\b|next,?\s+(?:let me|i'?ll|i will)\b|let'?s\b)/i;
+function isNarrationBlock(block) {
+  return NARRATION_OPENER.test(block.trimStart());
+}
 function decideTurnFlush(input) {
   const flushEnabled = input.flushEnabled !== false;
   if (!flushEnabled)
@@ -62426,7 +62561,7 @@ function decideTurnFlush(input) {
     return { kind: "skip", reason: "silent-marker" };
   if (endsWithSilentMarker(joined))
     return { kind: "skip", reason: "silent-marker" };
-  return { kind: "flush", text: joined };
+  return { kind: "flush", text: selectFlushDeliveryText(input.capturedText) };
 }
 
 // answer-stream.ts
@@ -68030,6 +68165,23 @@ function endsWithSilentMarker2(text4) {
     return false;
   return isSilentFlushMarker2(lines[lines.length - 1]);
 }
+function selectFlushDeliveryText2(blocks) {
+  const candidates = blocks.map((b) => b.trim()).filter((b) => b.length > 0);
+  if (candidates.length === 0)
+    return "";
+  if (candidates.length === 1)
+    return candidates[0];
+  const answer = candidates[candidates.length - 1];
+  const preceding = candidates.slice(0, -1);
+  const allNarration = preceding.every(isNarrationBlock2);
+  return allNarration ? answer : candidates.join(`
+
+`);
+}
+var NARRATION_OPENER2 = /^(let me\b|lemme\b|i'?ll\b|i will\b|i am going to\b|i'?m going to\b|i'?m about to\b|going to\b|first,?\s+(?:let me|i'?ll|i will)\b|now,?\s+(?:let me|i'?ll|i will)\b|next,?\s+(?:let me|i'?ll|i will)\b|let'?s\b)/i;
+function isNarrationBlock2(block) {
+  return NARRATION_OPENER2.test(block.trimStart());
+}
 function decideTurnFlush2(input) {
   const flushEnabled = input.flushEnabled !== false;
   if (!flushEnabled)
@@ -68049,7 +68201,7 @@ function decideTurnFlush2(input) {
     return { kind: "skip", reason: "silent-marker" };
   if (endsWithSilentMarker2(joined))
     return { kind: "skip", reason: "silent-marker" };
-  return { kind: "flush", text: joined };
+  return { kind: "flush", text: selectFlushDeliveryText2(input.capturedText) };
 }
 function isTurnFlushSafetyEnabled(env = process.env) {
   const raw = env.SWITCHROOM_TG_TURN_FLUSH_SAFETY;
@@ -75253,11 +75405,11 @@ function writeActivityCardRecord(path2, fs2, record, log = (l) => process.stderr
   const others = current.filter((c) => c.turnKey !== record.turnKey);
   persistActivityCards(path2, fs2, [...others, record], log);
 }
-function clearActivityCardRecord(path2, fs2, turnKey, activityMessageId, log = (l) => process.stderr.write(l)) {
+function clearActivityCardRecord(path2, fs2, turnKey2, activityMessageId, log = (l) => process.stderr.write(l)) {
   const current = loadActivityCards(path2, fs2);
   if (current.length === 0)
     return;
-  const next = current.filter((c) => c.turnKey !== turnKey || activityMessageId !== undefined && c.activityMessageId !== activityMessageId);
+  const next = current.filter((c) => c.turnKey !== turnKey2 || activityMessageId !== undefined && c.activityMessageId !== activityMessageId);
   if (next.length === current.length)
     return;
   persistActivityCards(path2, fs2, next, log);
@@ -77259,6 +77411,9 @@ function decideSubagentProgress(input) {
   if (isEnvFlagOn(input.disableEnvValue)) {
     return { deliver: false, reason: "env-disabled" };
   }
+  if (input.skeleton === true) {
+    return { deliver: false, reason: "skeleton-liveness" };
+  }
   if (!input.isBackground) {
     return { deliver: false, reason: "foreground" };
   }
@@ -79121,8 +79276,40 @@ function readSubTail(entry, tail, now, onDescriptionUpdate, fs2, log, db2, paren
       tail.cursor = 0;
       tail.pendingPartial = "";
     }
-    if (stat.size === tail.cursor)
+    if (stat.size === tail.cursor) {
+      if (onProgress != null && entry.state === "running" && !entry.historical) {
+        let hasChild = false;
+        if (db2 != null) {
+          try {
+            const kid = db2.prepare("SELECT 1 FROM subagents WHERE parent_agent_id = ? LIMIT 1").get(entry.agentId);
+            hasChild = kid != null;
+          } catch (kidErr) {
+            log?.(`subagent-watcher: skeleton child-check error ${entry.agentId}: ${kidErr.message}`);
+          }
+        }
+        if (!hasChild) {
+          try {
+            onProgress({
+              agentId: entry.agentId,
+              description: entry.description,
+              latestSummary: "",
+              elapsedMs: now - entry.dispatchedAt,
+              prevBucketIdx: entry.lastProgressBucketIdx,
+              setBucketIdx: (b) => {
+                entry.lastProgressBucketIdx = b;
+              },
+              lastTool: entry.lastTool,
+              toolCount: entry.toolCount,
+              model: entry.currentModel,
+              skeleton: true
+            });
+          } catch (cbErr) {
+            log?.(`subagent-watcher: onProgress (skeleton) callback error ${entry.agentId}: ${cbErr.message}`);
+          }
+        }
+      }
       return;
+    }
     const buf = Buffer.alloc(stat.size - tail.cursor);
     const fd = fs2.openSync(entry.filePath, "r");
     try {
@@ -82723,10 +82910,10 @@ function readTurnActiveMarkerAgeMs(stateDir, now) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.18.20";
-var COMMIT_SHA = "f82e440f";
-var COMMIT_DATE = "2026-07-13T22:44:46+10:00";
-var LATEST_PR = 3230;
+var VERSION = "0.18.22";
+var COMMIT_SHA = "5da23264";
+var COMMIT_DATE = "2026-07-14T09:12:02+10:00";
+var LATEST_PR = 3236;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -83818,8 +84005,8 @@ function recordTurnEnd(db2, args) {
     WHERE turn_key = ?
   `).run(now, args.endedVia, args.lastAssistantMsgId ?? null, args.lastAssistantDone !== undefined ? args.lastAssistantDone ? 1 : 0 : null, args.assistantReplyPreview ?? null, args.toolCallCount !== undefined ? args.toolCallCount : null, now, args.turnKey);
 }
-function getTurnByKey(db2, turnKey) {
-  const row = db2.prepare(`SELECT * FROM turns WHERE turn_key = ?`).get(turnKey);
+function getTurnByKey(db2, turnKey2) {
+  const row = db2.prepare(`SELECT * FROM turns WHERE turn_key = ?`).get(turnKey2);
   return row ? mapRow(row) : null;
 }
 function markOrphanedWithTimeoutClassification(db2, opts) {
@@ -83877,13 +84064,13 @@ var INTERRUPTED_VIA = new Set([
   "timeout",
   "unknown"
 ]);
-function markTurnResumed(db2, turnKey, now = Date.now()) {
+function markTurnResumed(db2, turnKey2, now = Date.now()) {
   db2.prepare(`
     UPDATE turns
     SET resumed_at = ?,
         updated_at = ?
     WHERE turn_key = ? AND resumed_at IS NULL
-  `).run(now, now, turnKey);
+  `).run(now, now, turnKey2);
 }
 function findLatestTurnIfInterrupted(db2) {
   const row = db2.prepare(`
@@ -84414,6 +84601,7 @@ function applySubagentsSchema(db2) {
     db2.exec("ALTER TABLE subagents ADD COLUMN model TEXT");
   }
   db2.exec("CREATE INDEX IF NOT EXISTS subagents_jsonl_id ON subagents(jsonl_agent_id)");
+  db2.exec("CREATE INDEX IF NOT EXISTS subagents_parent_agent ON subagents(parent_agent_id)");
 }
 function mapSubagentRow(row) {
   return {
@@ -85239,6 +85427,7 @@ var deferredDoneReactions = new DeferredDoneReactions({
   purge: (key) => purgeReactionTracking(key)
 });
 var outboundDedup = new OutboundDedupCache;
+var flushedTurnSupersede = new FlushedTurnSupersedeRegistry;
 var chatAvailableReactions = new Map;
 var chatProbesInFlight = new Set;
 var activeTurnStartedAt = new Map;
@@ -86920,10 +87109,10 @@ function summariseMarkerPayload(payload) {
     return "payload=missing";
   try {
     const parsed = JSON.parse(payload);
-    const turnKey = typeof parsed.turnKey === "string" ? parsed.turnKey : "unknown";
+    const turnKey2 = typeof parsed.turnKey === "string" ? parsed.turnKey : "unknown";
     const chatId = typeof parsed.chatId === "string" ? parsed.chatId : "unknown";
     const startedAt = typeof parsed.startedAt === "number" ? parsed.startedAt : 0;
-    return `turnKey=${turnKey} chat=${chatId} started=${new Date(startedAt).toISOString()}`;
+    return `turnKey=${turnKey2} chat=${chatId} started=${new Date(startedAt).toISOString()}`;
   } catch {
     return "payload=unparseable";
   }
@@ -89853,6 +90042,18 @@ async function executeReply(args) {
       return { content: [{ type: "text", text: "sent (deduped \u2014 same content sent via earlier path)" }] };
     }
   }
+  {
+    const replyThreadId = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
+    const resolvedTurnId = turn?.turnId ?? findTurnByOriginId(args.origin_turn_id)?.turnId ?? null;
+    const decision = flushedTurnSupersede.take(chat_id, replyThreadId, { liveTurnId: resolvedTurnId, now: Date.now() });
+    if (decision.supersede) {
+      process.stderr.write(`telegram gateway: reply: superseding flushed turn message(s) chatId=${chat_id} ids=${JSON.stringify(decision.deleteMessageIds)}
+`);
+      for (const id of decision.deleteMessageIds) {
+        await swallowingApiCall(() => lockedBot.api.deleteMessage(chat_id, id), { chat_id, verb: "reply.supersedeFlushed" });
+      }
+    }
+  }
   const files = args.files ?? [];
   const quoteOptIn = args.quote !== false;
   let reply_to = args.reply_to != null ? Number(args.reply_to) : undefined;
@@ -91465,8 +91666,8 @@ function resetOrphanedReplyTimeout() {
         replyCalled: t.replyCalled,
         progressCardActive: false
       })) {
-        const turnKey = statusKey(t.sessionChatId, t.sessionThreadId);
-        const working = isLegitimatelyWorking(turnKey);
+        const turnKey2 = statusKey(t.sessionChatId, t.sessionThreadId);
+        const working = isLegitimatelyWorking(turnKey2);
         const humanWaiting = (() => {
           for (const entry of pendingAskUser.values()) {
             if (entry.chatId === t.sessionChatId)
@@ -91484,7 +91685,7 @@ function resetOrphanedReplyTimeout() {
           maxRearms: ORPHANED_REPLY_MAX_REARMS
         });
         if (decision.rearm) {
-          process.stderr.write(`telegram gateway: orphaned-reply fuse expired \u2014 re-arming` + ` (rearm ${t.liveness.orphanedReplyRearmCount}/${ORPHANED_REPLY_MAX_REARMS}, in_flight=${toolFlightTracker.inFlightCount()}, human_wait=${humanWaiting}, recently_streaming=${recentlyStreaming}, bg_work=${hasPendingAsyncDispatch(turnKey)})
+          process.stderr.write(`telegram gateway: orphaned-reply fuse expired \u2014 re-arming` + ` (rearm ${t.liveness.orphanedReplyRearmCount}/${ORPHANED_REPLY_MAX_REARMS}, in_flight=${toolFlightTracker.inFlightCount()}, human_wait=${humanWaiting}, recently_streaming=${recentlyStreaming}, bg_work=${hasPendingAsyncDispatch(turnKey2)})
 `);
           resetOrphanedReplyTimeout();
           return;
@@ -92048,23 +92249,23 @@ function handleSessionEvent(ev) {
         clearSilentEndState(statusKey(ev.chatId, ev.threadId != null ? Number(ev.threadId) : null));
         if (turnsDb != null) {
           const evThreadIdNum = ev.threadId != null ? Number(ev.threadId) : null;
-          const turnKey = chatKeyWithSuffix2(ev.chatId, evThreadIdNum, String(startedAt));
-          next.registryKey = turnKey;
+          const turnKey2 = chatKeyWithSuffix2(ev.chatId, evThreadIdNum, String(startedAt));
+          next.registryKey = turnKey2;
           const userPromptPreview = extractUserPromptPreview(ev.rawContent);
           try {
             recordTurnStart(turnsDb, {
-              turnKey,
+              turnKey: turnKey2,
               chatId: String(ev.chatId),
               threadId: ev.threadId != null ? String(ev.threadId) : null,
               lastUserMsgId: ev.messageId != null ? String(ev.messageId) : null,
               userPromptPreview
             });
           } catch (err) {
-            process.stderr.write(`telegram gateway: recordTurnStart failed turnKey=${turnKey}: ${err.message}
+            process.stderr.write(`telegram gateway: recordTurnStart failed turnKey=${turnKey2}: ${err.message}
 `);
           }
           writeTurnActiveMarker(STATE_DIR, {
-            turnKey,
+            turnKey: turnKey2,
             chatId: String(ev.chatId),
             threadId: ev.threadId != null ? String(ev.threadId) : null,
             startedAt
@@ -92570,6 +92771,9 @@ function handleSessionEvent(ev) {
                 } catch {}
               }
               outboundDedup.record(backstopChatId, backstopThreadId, capturedText, Date.now(), currentTurn?.registryKey ?? null);
+              if (sentIds.length > 0) {
+                flushedTurnSupersede.record(backstopChatId, backstopThreadId, { turnId: turn.turnId, messageIds: sentIds, text: capturedText }, Date.now());
+              }
               if (backstopCtrl)
                 backstopCtrl.finalize("done");
               if (backstopCardTurnKey != null) {
@@ -99333,7 +99537,7 @@ var didOneTimeSetup = false;
                 process.stderr.write(`telegram gateway: subagent-handback queued agent=${agentId} outcome=${outcome} chat=${decision.chatId} resultChars=${resultText.length}
 `);
               },
-              onProgress: ({ agentId, description, latestSummary, elapsedMs, prevBucketIdx, setBucketIdx, lastTool, toolCount, progressLine, model }) => {
+              onProgress: ({ agentId, description, latestSummary, elapsedMs, prevBucketIdx, setBucketIdx, lastTool, toolCount, progressLine, model, skeleton }) => {
                 let fleetChatId = "";
                 try {
                   const fleets = progressDriver?.peekAllFleets() ?? [];
@@ -99376,6 +99580,8 @@ var didOneTimeSetup = false;
                   }
                   if (surface !== "nest")
                     return;
+                  if (skeleton)
+                    return;
                   const turn = currentTurn;
                   if (turn == null)
                     return;
@@ -99435,6 +99641,7 @@ var didOneTimeSetup = false;
                 }
                 const progressOrigin = resolveSubagentOriginChat(agentId);
                 const decision = decideSubagentProgress({
+                  skeleton: skeleton === true,
                   disableEnvValue: process.env.SWITCHROOM_DISABLE_SUBAGENT_PROGRESS,
                   isBackground,
                   fleetChatId: progressOrigin?.chatId || fleetChatId,