switchroom 0.14.55 → 0.14.57

package/dist/cli/switchroom.js

@@ -49463,8 +49463,8 @@ var {
 } = import__.default;
 
 // src/build-info.ts
-var VERSION = "0.14.55";
-var COMMIT_SHA = "dc589fea";
+var VERSION = "0.14.57";
+var COMMIT_SHA = "ddb0b353";
 
 // src/cli/agent.ts
 init_source();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "switchroom",
-  "version": "0.14.55",
+  "version": "0.14.57",
   "description": "Run Claude Code 24/7 on your Claude Pro/Max subscription over Telegram. Open-source alternative to OpenClaw and NanoClaw — no API keys.",
   "type": "module",
   "bin": {

package/telegram-plugin/bridge/bridge.ts

@@ -78,7 +78,7 @@ const mcp = new Server(
       '',
       'reply accepts file paths (files: ["/abs/path.png"]) for attachments. Use react to add emoji reactions, edit_message for interim progress updates, and delete_message when you need to truly remove a message (prefer edit_message if you just want to change text — delete is for retraction). Edits don\'t trigger push notifications — when a long task completes, send a new reply so the user\'s device pings. Use send_typing to show a typing indicator during long operations. Use pin_message to pin important outputs. Use forward_message to quote/resurface earlier messages.',
       '',
-      'If a message includes message_thread_id, it came from a forum topic. The reply tool will automatically route replies back to the same topic — no need to pass message_thread_id manually unless you want to override.',
+      'If a message includes message_thread_id, it came from a forum topic. The reply tool will automatically route replies back to the same topic — no need to pass message_thread_id manually unless you want to override. Each <channel> message is the current topic — answer ONLY this message\'s question; do not also answer a pending message from another topic. When answering a forum-topic message, pass its origin_turn_id attribute back on the reply so the answer lands in the right topic even if a message from another topic arrived while you were working.',
       '',
       'The default format is "html" — write natural markdown and it is auto-converted to Telegram HTML (bold, italic, code, links, code blocks). Use format: "markdownv2" for MarkdownV2 with auto-escaping, or "text" for plain text.',
       '',
@@ -104,6 +104,7 @@ const TOOL_SCHEMAS = [
         reply_to: { type: 'string', description: 'Message ID to thread under. Overrides the default (latest inbound).' },
         quote: { type: 'boolean', description: 'Opt out of the default quote-reply behavior. Default: true. Pass false to send a bare message with no quote reference. Ignored when reply_to is explicitly set.' },
         message_thread_id: { type: 'string', description: 'Forum topic thread ID. Auto-applied from the last inbound message in the same chat if not specified.' },
+        origin_turn_id: { type: 'string', description: 'In a forum supergroup, pass back the origin_turn_id attribute from the <channel> message you are answering. It pins the reply to that message\'s topic even if another topic\'s turn started meanwhile. Omit in DMs / single-topic chats.' },
         files: { type: 'array', items: { type: 'string' }, description: 'Absolute file paths to attach. Images send as photos; other types as documents. Max 50MB each.' },
         format: { type: 'string', enum: ['html', 'markdownv2', 'text'], description: "Rendering mode. 'html' (default) converts markdown to Telegram HTML." },
         disable_web_page_preview: { type: 'boolean', description: 'Disable link preview thumbnails. Default: true.' },
@@ -143,6 +144,7 @@ const TOOL_SCHEMAS = [
         text: { type: 'string', description: 'Full text snapshot. NOT a delta — pass the complete current content each call.' },
         done: { type: 'boolean', description: 'Must be true. Posts this text as the final answer for the turn and locks the message.' },
         message_thread_id: { type: 'string', description: 'Forum topic thread ID. Auto-applied from the last inbound message if not specified.' },
+        origin_turn_id: { type: 'string', description: 'In a forum supergroup, pass back the origin_turn_id attribute from the <channel> message you are answering. It pins the reply to that message\'s topic even if another topic\'s turn started meanwhile. Omit in DMs / single-topic chats.' },
         format: { type: 'string', enum: ['html', 'markdownv2', 'text'], description: "Rendering mode. 'html' (default) converts markdown to Telegram HTML." },
         reply_to: { type: 'string', description: 'Message ID to quote-reply to. Overrides the default (latest inbound).' },
         quote: { type: 'boolean', description: 'Opt out of the default quote-reply behavior. Default: true. Ignored when reply_to is explicitly set.' },

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

@@ -24571,7 +24571,7 @@ var mcp = new Server({ name: "telegram", version: "1.0.0" }, {
     "",
     `reply accepts file paths (files: ["/abs/path.png"]) for attachments. Use react to add emoji reactions, edit_message for interim progress updates, and delete_message when you need to truly remove a message (prefer edit_message if you just want to change text \u2014 delete is for retraction). Edits don't trigger push notifications \u2014 when a long task completes, send a new reply so the user's device pings. Use send_typing to show a typing indicator during long operations. Use pin_message to pin important outputs. Use forward_message to quote/resurface earlier messages.`,
     "",
-    "If a message includes message_thread_id, it came from a forum topic. The reply tool will automatically route replies back to the same topic \u2014 no need to pass message_thread_id manually unless you want to override.",
+    "If a message includes message_thread_id, it came from a forum topic. The reply tool will automatically route replies back to the same topic \u2014 no need to pass message_thread_id manually unless you want to override. Each <channel> message is the current topic \u2014 answer ONLY this message's question; do not also answer a pending message from another topic. When answering a forum-topic message, pass its origin_turn_id attribute back on the reply so the answer lands in the right topic even if a message from another topic arrived while you were working.",
     "",
     'The default format is "html" \u2014 write natural markdown and it is auto-converted to Telegram HTML (bold, italic, code, links, code blocks). Use format: "markdownv2" for MarkdownV2 with auto-escaping, or "text" for plain text.',
     "",
@@ -24593,6 +24593,7 @@ var TOOL_SCHEMAS = [
         reply_to: { type: "string", description: "Message ID to thread under. Overrides the default (latest inbound)." },
         quote: { type: "boolean", description: "Opt out of the default quote-reply behavior. Default: true. Pass false to send a bare message with no quote reference. Ignored when reply_to is explicitly set." },
         message_thread_id: { type: "string", description: "Forum topic thread ID. Auto-applied from the last inbound message in the same chat if not specified." },
+        origin_turn_id: { type: "string", description: "In a forum supergroup, pass back the origin_turn_id attribute from the <channel> message you are answering. It pins the reply to that message's topic even if another topic's turn started meanwhile. Omit in DMs / single-topic chats." },
         files: { type: "array", items: { type: "string" }, description: "Absolute file paths to attach. Images send as photos; other types as documents. Max 50MB each." },
         format: { type: "string", enum: ["html", "markdownv2", "text"], description: "Rendering mode. 'html' (default) converts markdown to Telegram HTML." },
         disable_web_page_preview: { type: "boolean", description: "Disable link preview thumbnails. Default: true." },
@@ -24631,6 +24632,7 @@ var TOOL_SCHEMAS = [
         text: { type: "string", description: "Full text snapshot. NOT a delta \u2014 pass the complete current content each call." },
         done: { type: "boolean", description: "Must be true. Posts this text as the final answer for the turn and locks the message." },
         message_thread_id: { type: "string", description: "Forum topic thread ID. Auto-applied from the last inbound message if not specified." },
+        origin_turn_id: { type: "string", description: "In a forum supergroup, pass back the origin_turn_id attribute from the <channel> message you are answering. It pins the reply to that message's topic even if another topic's turn started meanwhile. Omit in DMs / single-topic chats." },
         format: { type: "string", enum: ["html", "markdownv2", "text"], description: "Rendering mode. 'html' (default) converts markdown to Telegram HTML." },
         reply_to: { type: "string", description: "Message ID to quote-reply to. Overrides the default (latest inbound)." },
         quote: { type: "boolean", description: "Opt out of the default quote-reply behavior. Default: true. Ignored when reply_to is explicitly set." },

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

@@ -47347,6 +47347,34 @@ function decideInboundDelivery(input) {
   return "deliver";
 }
 
+// gateway/serialize-drain-gate.ts
+function mayDrainBufferedInbound(input) {
+  if (input.turnInFlight)
+    return false;
+  if (!input.enabled)
+    return true;
+  const delivered = input.endingTurnFinalAnswerDelivered;
+  if (delivered == null)
+    return true;
+  return delivered === true;
+}
+function shouldArmNoReplyDrain(input) {
+  if (!input.enabled)
+    return false;
+  if (input.finalAnswerDelivered === true)
+    return false;
+  return input.bufferedDepth > 0;
+}
+
+// gateway/answer-thread-resolve.ts
+function resolveAnswerThreadId(input) {
+  if (input.explicitThreadId != null)
+    return input.explicitThreadId;
+  if (input.originResolved)
+    return input.originThreadId;
+  return input.liveThreadId;
+}
+
 // gateway/inbound-delivery-confirm.ts
 function createDeliveryQueue() {
   return { pending: new Map };
@@ -52167,10 +52195,10 @@ function sweepStaleTurnActiveMarker(stateDir, opts) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.14.55";
-var COMMIT_SHA = "dc589fea";
-var COMMIT_DATE = "2026-06-03T21:05:15Z";
-var LATEST_PR = 2136;
+var VERSION = "0.14.57";
+var COMMIT_SHA = "ddb0b353";
+var COMMIT_DATE = "2026-06-03T22:37:37Z";
+var LATEST_PR = 2140;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -53340,6 +53368,7 @@ if (!STATIC)
 var chatThreadMap = new Map;
 var activeStatusReactions = new Map;
 var activeReactionMsgIds = new Map;
+var queuedStatusMsgIds = new Map;
 var deferredDoneReactions = new DeferredDoneReactions({
   countRunningWorkers: () => countRunningWorkers(),
   getActive: (key) => activeStatusReactions.get(key),
@@ -53367,6 +53396,13 @@ var _deliveryTimeoutParsed = _deliveryTimeoutRaw != null && _deliveryTimeoutRaw
 var DELIVERY_CONFIRM_TIMEOUT_MS = Number.isFinite(_deliveryTimeoutParsed) && _deliveryTimeoutParsed > 0 ? _deliveryTimeoutParsed : 15000;
 var DELIVERY_CONFIRM_SWEEP_MS = 5000;
 var deliveryQueue = createDeliveryQueue();
+var SERIALIZE_UNTIL_REPLIED_ENABLED = process.env.SWITCHROOM_SERIALIZE_UNTIL_REPLIED !== "0";
+var _noReplyDrainRaw = process.env.SWITCHROOM_SERIALIZE_NOREPLY_DRAIN_MS;
+var _noReplyDrainParsed = _noReplyDrainRaw != null && _noReplyDrainRaw !== "" ? Number(_noReplyDrainRaw) : 2500;
+var SERIALIZE_NOREPLY_DRAIN_MS = Number.isFinite(_noReplyDrainParsed) && _noReplyDrainParsed > 0 ? _noReplyDrainParsed : 2500;
+var TURN_ORIGIN_ROUTING_ENABLED = process.env.SWITCHROOM_TURN_ORIGIN_ROUTING !== "0";
+var TOPIC_FRAMING_ENABLED = process.env.SWITCHROOM_TOPIC_FRAMING !== "0";
+var QUEUED_STATUS_UX_ENABLED = process.env.SWITCHROOM_QUEUED_STATUS_UX !== "0";
 function turnInFlightForGate() {
   return isDeliveryCutoverEnabled() ? isMachineInTurn() : claudeBusyKeys.size > 0;
 }
@@ -53384,6 +53420,68 @@ var lastPtyPreviewByChat = new Map;
 var progressUpdateLastSent = new Map;
 var progressUpdateTurnCount = new Map;
 var currentTurn = null;
+var RECENT_TURNS_MAX = 32;
+var recentTurnsById = new Map;
+function rememberRecentTurn(turn) {
+  recentTurnsById.set(turn.turnId, turn);
+  while (recentTurnsById.size > RECENT_TURNS_MAX) {
+    const oldest = recentTurnsById.keys().next().value;
+    if (oldest === undefined)
+      break;
+    recentTurnsById.delete(oldest);
+  }
+}
+function deriveTurnId(chatId, threadId, messageId) {
+  if (messageId == null || messageId === "" || String(messageId) === "0")
+    return null;
+  return `${chatKey2(chatId, threadId ?? null)}#${messageId}`;
+}
+function findTurnByOriginId(originTurnId) {
+  if (originTurnId == null || originTurnId === "")
+    return null;
+  if (currentTurn != null && currentTurn.turnId === originTurnId)
+    return currentTurn;
+  return recentTurnsById.get(originTurnId) ?? null;
+}
+function postQueuedStatus(chatId, bufferedThread, inFlightThread) {
+  if (!QUEUED_STATUS_UX_ENABLED)
+    return;
+  const key = statusKey(chatId, bufferedThread);
+  if (queuedStatusMsgIds.has(key))
+    return;
+  const otherTopic = inFlightThread != null ? `another topic` : `another conversation`;
+  const text = `\u23F3 Queued \u2014 replying in ${otherTopic} first, then I'll get to this.`;
+  (async () => {
+    const sent = await swallowingApiCall(() => bot.api.sendMessage(chatId, text, { message_thread_id: bufferedThread }), { chat_id: chatId, verb: "queued-status.post", threadId: bufferedThread });
+    const messageId = sent?.message_id;
+    if (typeof messageId !== "number")
+      return;
+    if (queuedStatusMsgIds.has(key)) {
+      swallowingApiCall(() => bot.api.deleteMessage(chatId, messageId), { chat_id: chatId, verb: "queued-status.post-race-cleanup", threadId: bufferedThread });
+      return;
+    }
+    queuedStatusMsgIds.set(key, { chatId, threadId: bufferedThread, messageId });
+  })();
+}
+function promoteQueuedStatus(chatId, thread) {
+  if (!QUEUED_STATUS_UX_ENABLED)
+    return;
+  if (thread == null)
+    return;
+  const key = statusKey(chatId, thread);
+  const entry = queuedStatusMsgIds.get(key);
+  if (entry == null)
+    return;
+  swallowingApiCall(() => bot.api.editMessageText(chatId, entry.messageId, "\u270D\uFE0F On it \u2014 replying now.", {}), { chat_id: chatId, verb: "queued-status.promote", threadId: thread });
+}
+function reapQueuedStatus(chatId, thread) {
+  const key = statusKey(chatId, thread ?? null);
+  const entry = queuedStatusMsgIds.get(key);
+  if (entry == null)
+    return;
+  queuedStatusMsgIds.delete(key);
+  swallowingApiCall(() => bot.api.deleteMessage(chatId, entry.messageId), { chat_id: chatId, verb: "queued-status.reap", ...entry.threadId != null ? { threadId: entry.threadId } : {} });
+}
 var toolFlightTracker = new ToolFlightTracker;
 var pendingDeferredInterrupt = null;
 async function fireDeferredInterrupt(reason) {
@@ -53448,6 +53546,52 @@ function statusKey(chatId, threadId) {
 function streamKey3(chatId, threadId) {
   return chatKey2(chatId, threadId);
 }
+function performBufferDrain(reason) {
+  const selfAgentForFlush = process.env.SWITCHROOM_AGENT_NAME ?? "";
+  if (pendingInboundBuffer.depth(selfAgentForFlush) <= 0)
+    return;
+  const fr = redeliverBufferedInbound(pendingInboundBuffer, selfAgentForFlush, (m) => {
+    const d = ipcServer.sendToAgent(selfAgentForFlush, m);
+    if (d)
+      markClaudeBusyForInbound(m);
+    return d;
+  }, inboundSpool, trackRedeliveredInbound);
+  if (fr.redelivered > 0) {
+    process.stderr.write(`telegram gateway: ${reason} flushed ${fr.redelivered}/${fr.drained} held inbound for ${selfAgentForFlush}${fr.rebuffered > 0 ? ` (${fr.rebuffered} re-buffered)` : ""}
+`);
+  }
+}
+function drainBufferedIfAllowed(endingTurn, reason) {
+  if (!mayDrainBufferedInbound({
+    turnInFlight: turnInFlightForGate(),
+    endingTurnFinalAnswerDelivered: endingTurn?.finalAnswerDelivered ?? null,
+    enabled: SERIALIZE_UNTIL_REPLIED_ENABLED
+  })) {
+    return;
+  }
+  performBufferDrain(reason);
+}
+function armNoReplyDrainTimer(turn) {
+  const selfAgent = process.env.SWITCHROOM_AGENT_NAME ?? "";
+  if (!shouldArmNoReplyDrain({
+    enabled: SERIALIZE_UNTIL_REPLIED_ENABLED,
+    finalAnswerDelivered: turn.finalAnswerDelivered,
+    bufferedDepth: pendingInboundBuffer.depth(selfAgent)
+  })) {
+    return;
+  }
+  if (turn.noReplyDrainTimer != null) {
+    clearTimeout(turn.noReplyDrainTimer);
+    turn.noReplyDrainTimer = null;
+  }
+  turn.noReplyDrainTimer = setTimeout(() => {
+    turn.noReplyDrainTimer = null;
+    process.stderr.write(`telegram gateway: no-reply bounded drain (${SERIALIZE_NOREPLY_DRAIN_MS}ms) \u2014 ` + `turn ${turn.turnId} ended without a reply; force-draining buffered inbound
+`);
+    performBufferDrain("no-reply-bounded-drain");
+  }, SERIALIZE_NOREPLY_DRAIN_MS);
+  turn.noReplyDrainTimer.unref?.();
+}
 function purgeReactionTracking(key, endingTurn) {
   const outboundEmitted = endingTurn != null ? endingTurn.replyCalled === true : currentTurn?.replyCalled === true;
   shadowEmit({ kind: "turnEnd", key, at: Date.now(), outboundEmitted });
@@ -53455,6 +53599,14 @@ function purgeReactionTracking(key, endingTurn) {
   activeStatusReactions.delete(key);
   activeReactionMsgIds.delete(key);
   activeTurnStartedAt.delete(key);
+  if (endingTurn != null) {
+    reapQueuedStatus(endingTurn.sessionChatId, endingTurn.sessionThreadId);
+  } else {
+    const pqChatId = chatIdOfChatKey(key);
+    const pqThreadPart = key.slice(pqChatId.length + 1);
+    const pqThread = pqThreadPart === "_" || pqThreadPart === "" ? null : Number(pqThreadPart);
+    reapQueuedStatus(pqChatId, Number.isFinite(pqThread) ? pqThread : undefined);
+  }
   claudeBusyKeys.delete(key);
   if (endingTurn != null) {
     stopTurnTypingLoop(endingTurn.sessionChatId, endingTurn.sessionThreadId ?? null);
@@ -53469,20 +53621,8 @@ function purgeReactionTracking(key, endingTurn) {
     if (agentDir != null)
       removeActiveReaction(agentDir, msgInfo.chatId, msgInfo.messageId);
   }
+  drainBufferedIfAllowed(endingTurn, "turn-complete");
   if (!turnInFlightForGate()) {
-    const selfAgentForFlush = process.env.SWITCHROOM_AGENT_NAME ?? "";
-    if (pendingInboundBuffer.depth(selfAgentForFlush) > 0) {
-      const fr = redeliverBufferedInbound(pendingInboundBuffer, selfAgentForFlush, (m) => {
-        const d = ipcServer.sendToAgent(selfAgentForFlush, m);
-        if (d)
-          markClaudeBusyForInbound(m);
-        return d;
-      }, inboundSpool, trackRedeliveredInbound);
-      if (fr.redelivered > 0) {
-        process.stderr.write(`telegram gateway: turn-complete flushed ${fr.redelivered}/${fr.drained} held inbound for ${selfAgentForFlush}${fr.rebuffered > 0 ? ` (${fr.rebuffered} re-buffered)` : ""}
-`);
-      }
-    }
     if (pendingRestarts.size > 0) {
       for (const [agentName3, _timestamp] of pendingRestarts.entries()) {
         triggerSelfRestart(agentName3, "turn-complete-pending-restart");
@@ -53493,33 +53633,24 @@ function purgeReactionTracking(key, endingTurn) {
     }
   }
 }
-function releaseTurnBufferGate(key) {
+function releaseTurnBufferGate(key, endingTurn) {
   if (!activeTurnStartedAt.has(key))
     return;
   activeTurnStartedAt.delete(key);
   claudeBusyKeys.delete(key);
   shadowEmit({ kind: "turnEnd", key, at: Date.now(), outboundEmitted: true });
-  if (!turnInFlightForGate()) {
-    const selfAgentForFlush = process.env.SWITCHROOM_AGENT_NAME ?? "";
-    if (pendingInboundBuffer.depth(selfAgentForFlush) > 0) {
-      const fr = redeliverBufferedInbound(pendingInboundBuffer, selfAgentForFlush, (m) => {
-        const d = ipcServer.sendToAgent(selfAgentForFlush, m);
-        if (d)
-          markClaudeBusyForInbound(m);
-        return d;
-      }, inboundSpool, trackRedeliveredInbound);
-      if (fr.redelivered > 0) {
-        process.stderr.write(`telegram gateway: reply-released-gate flushed ${fr.redelivered}/${fr.drained} held inbound for ${selfAgentForFlush}${fr.rebuffered > 0 ? ` (${fr.rebuffered} re-buffered)` : ""}
-`);
-      }
-    }
-  }
+  drainBufferedIfAllowed(endingTurn, "reply-released-gate");
 }
 function endCurrentTurnAtomic(turn) {
   if (currentTurn !== turn)
     return;
   currentTurn = null;
+  if (turn.noReplyDrainTimer != null) {
+    clearTimeout(turn.noReplyDrainTimer);
+    turn.noReplyDrainTimer = null;
+  }
   purgeReactionTracking(statusKey(turn.sessionChatId, turn.sessionThreadId), turn);
+  armNoReplyDrainTimer(turn);
 }
 function maybeProactiveCompact() {
   if (compactDispatching)
@@ -55207,7 +55338,9 @@ if (!STATIC) {
     }
     inboundSpool?.sweepEscalations((e) => {
       const chat = e.msg.chatId;
-      const threadOpts = typeof e.msg.meta?.threadId === "string" && e.msg.meta.threadId ? { message_thread_id: Number(e.msg.meta.threadId) } : {};
+      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);
       swallowingApiCall(() => bot.api.sendMessage(chat, "\u26A0\uFE0F I couldn't deliver an earlier message to the agent after repeated retries (it survived restarts but the agent never picked it up). Please resend it.", { ...threadOpts }), { chat_id: chat, verb: "inbound-spool-escalation" });
     });
   }, IDLE_DRAIN_INTERVAL_MS).unref();
@@ -55422,7 +55555,19 @@ ${url}`;
     effectiveText = text;
   }
   assertAllowedChat(chat_id);
-  let threadId = resolveThreadId(chat_id, args.message_thread_id ?? (turn?.sessionThreadId != null ? turn.sessionThreadId : undefined));
+  let threadId;
+  if (TURN_ORIGIN_ROUTING_ENABLED) {
+    const explicit = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
+    const originTurn = findTurnByOriginId(args.origin_turn_id);
+    threadId = resolveAnswerThreadId({
+      explicitThreadId: Number.isFinite(explicit) ? explicit : undefined,
+      originResolved: originTurn != null,
+      originThreadId: originTurn?.sessionThreadId,
+      liveThreadId: turn?.sessionThreadId
+    });
+  } else {
+    threadId = resolveThreadId(chat_id, args.message_thread_id ?? (turn?.sessionThreadId != null ? turn.sessionThreadId : undefined));
+  }
   if (reply_to == null && quoteOptIn && HISTORY_ENABLED) {
     try {
       const latest = getLatestInboundMessageId(chat_id, threadId ?? null);
@@ -55746,7 +55891,10 @@ ${url}`;
       turn.finalAnswerDelivered = true;
       finalizeStatusReaction(chat_id, threadId, "done");
     }
-    releaseTurnBufferGate(statusKey(chat_id, threadId));
+    releaseTurnBufferGate(statusKey(chat_id, threadId), turn ?? undefined);
+    if (turn?.finalAnswerDelivered === true) {
+      reapQueuedStatus(turn.sessionChatId, turn.sessionThreadId);
+    }
   }
   process.stderr.write(`telegram channel: reply: finalized chatId=${chat_id} messageIds=[${sentIds.join(",")}] chunks=${chunks.length}
 `);
@@ -55761,8 +55909,21 @@ async function executeStreamReply(args) {
     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");
-  if (args.message_thread_id == null && turn?.sessionThreadId != null) {
-    args.message_thread_id = String(turn.sessionThreadId);
+  if (args.message_thread_id == null) {
+    let injected;
+    if (TURN_ORIGIN_ROUTING_ENABLED) {
+      const originTurn = findTurnByOriginId(args.origin_turn_id);
+      injected = resolveAnswerThreadId({
+        explicitThreadId: undefined,
+        originResolved: originTurn != null,
+        originThreadId: originTurn?.sessionThreadId,
+        liveThreadId: turn?.sessionThreadId
+      });
+    } else {
+      injected = turn?.sessionThreadId;
+    }
+    if (injected != null)
+      args.message_thread_id = String(injected);
   }
   args.text = redactOutboundText(args.text, "stream_reply");
   {
@@ -55900,7 +56061,10 @@ async function executeStreamReply(args) {
   {
     const sChat = args.chat_id;
     const sThread = resolveThreadId(sChat, args.message_thread_id);
-    releaseTurnBufferGate(statusKey(sChat, sThread));
+    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"})` }] };
 }
@@ -56926,7 +57090,7 @@ async function drainActivitySummary(turn) {
     turn.activityInFlight = null;
   }
 }
-function clearActivitySummary(turn) {
+function clearActivitySummary(turn, finalHtmlOverride) {
   const chat = turn.sessionChatId;
   const thread = turn.sessionThreadId;
   const inFlight = turn.activityInFlight ?? Promise.resolve();
@@ -56944,7 +57108,7 @@ function clearActivitySummary(turn) {
       }
       return;
     }
-    const finalHtml = composeTurnActivity(turn, true);
+    const finalHtml = finalHtmlOverride !== undefined ? finalHtmlOverride : composeTurnActivity(turn, true);
     if (finalHtml == null)
       return;
     try {
@@ -56974,9 +57138,11 @@ function handleSessionEvent(ev) {
           prior.answerStream = null;
         }
         const startedAt = Date.now();
+        const enqThreadIdNum = ev.threadId != null ? Number(ev.threadId) : undefined;
+        const turnId = deriveTurnId(ev.chatId, enqThreadIdNum ?? null, ev.messageId) ?? `${chatKey2(ev.chatId, enqThreadIdNum ?? null)}#synthetic-${startedAt}`;
         const next = {
           sessionChatId: ev.chatId,
-          sessionThreadId: ev.threadId != null ? Number(ev.threadId) : undefined,
+          sessionThreadId: enqThreadIdNum,
           sourceMessageId: ev.messageId != null && /^\d+$/.test(ev.messageId) ? Number(ev.messageId) : null,
           startedAt,
           gatewayReceiveAt: startedAt,
@@ -56987,7 +57153,9 @@ function handleSessionEvent(ev) {
           silentAnchorText: "",
           capturedText: [],
           orphanedReplyTimeoutId: null,
+          turnId,
           registryKey: null,
+          noReplyDrainTimer: null,
           lastAssistantMsgId: null,
           lastAssistantDone: false,
           toolCallCount: 0,
@@ -57001,6 +57169,8 @@ function handleSessionEvent(ev) {
           isDm: isDmChatId(ev.chatId)
         };
         currentTurn = next;
+        rememberRecentTurn(next);
+        promoteQueuedStatus(ev.chatId, enqThreadIdNum);
         if (DELIVERY_CONFIRM_ENABLED) {
           ackDelivery(deliveryQueue, chatKey2(ev.chatId, ev.threadId != null ? Number(ev.threadId) : null), ev.messageId);
         }
@@ -58342,6 +58512,8 @@ ${preBlock(write.output)}`;
       } catch {}
     }
   }
+  const originTurnId = deriveTurnId(chat_id, messageThreadId ?? null, msgId);
+  const topicScope = TOPIC_FRAMING_ENABLED && messageThreadId != null ? "This message belongs to the current topic only \u2014 answer ONLY this question, in this topic. Do not also answer a pending message from another topic." : undefined;
   const inboundMsg = {
     type: "inbound",
     chatId: chat_id,
@@ -58366,6 +58538,8 @@ ${preBlock(write.output)}`;
       user_id: String(from.id),
       ts: new Date((ctx.message?.date ?? 0) * 1000).toISOString(),
       ...messageThreadId != null ? { message_thread_id: String(messageThreadId) } : {},
+      ...originTurnId != null ? { origin_turn_id: originTurnId } : {},
+      ...topicScope != null ? { topic_scope: topicScope } : {},
       ...imagePath ? { image_path: imagePath } : {},
       ...replyToMessageId != null ? { reply_to_message_id: String(replyToMessageId) } : {},
       ...replyToTextEscaped != null && replyToTextEscaped.length > 0 ? { reply_to_text: replyToTextEscaped } : {},
@@ -58419,6 +58593,10 @@ ${preBlock(write.output)}`;
     pendingInboundBuffer.push(selfAgent, inboundMsg);
     process.stderr.write(`telegram gateway: inbound held mid-turn agent=${selfAgent} chat=${chat_id} msg=${msgId ?? "-"} \u2014 will flush on turn-complete
 `);
+    const inFlightThread = currentTurn?.sessionThreadId;
+    if (QUEUED_STATUS_UX_ENABLED && !isDmChatId(chat_id) && messageThreadId != null && messageThreadId !== inFlightThread) {
+      postQueuedStatus(chat_id, messageThreadId, inFlightThread);
+    }
     return;
   }
   if (selfAgent) {
@@ -63238,16 +63416,18 @@ var didOneTimeSetup = false;
                 const isBackground = dispatch.isBackground;
                 if (!isBackground) {
                   const turn = currentTurn;
-                  const removed = turn != null && turn.foregroundSubAgents.delete(agentId);
-                  if (turn != null && removed) {
+                  if (turn != null && turn.foregroundSubAgents.has(agentId)) {
                     const action = foregroundFinishAction({
-                      removed,
+                      removed: true,
                       replyCalled: turn.replyCalled,
-                      remainingForeground: turn.foregroundSubAgents.size
+                      remainingForeground: turn.foregroundSubAgents.size - 1
                     });
                     if (action === "handoff-clear") {
-                      clearActivitySummary(turn);
+                      const finalHtml = composeTurnActivity(turn, true);
+                      turn.foregroundSubAgents.delete(agentId);
+                      clearActivitySummary(turn, finalHtml);
                     } else if (action === "recompose") {
+                      turn.foregroundSubAgents.delete(agentId);
                       const rendered = composeTurnActivity(turn);
                       if (rendered != null) {
                         turn.activityPendingRender = rendered;

package/telegram-plugin/dist/server.js

@@ -24268,7 +24268,7 @@ var init_bridge = __esm(async () => {
       "",
       `reply accepts file paths (files: ["/abs/path.png"]) for attachments. Use react to add emoji reactions, edit_message for interim progress updates, and delete_message when you need to truly remove a message (prefer edit_message if you just want to change text \u2014 delete is for retraction). Edits don't trigger push notifications \u2014 when a long task completes, send a new reply so the user's device pings. Use send_typing to show a typing indicator during long operations. Use pin_message to pin important outputs. Use forward_message to quote/resurface earlier messages.`,
       "",
-      "If a message includes message_thread_id, it came from a forum topic. The reply tool will automatically route replies back to the same topic \u2014 no need to pass message_thread_id manually unless you want to override.",
+      "If a message includes message_thread_id, it came from a forum topic. The reply tool will automatically route replies back to the same topic \u2014 no need to pass message_thread_id manually unless you want to override. Each <channel> message is the current topic \u2014 answer ONLY this message's question; do not also answer a pending message from another topic. When answering a forum-topic message, pass its origin_turn_id attribute back on the reply so the answer lands in the right topic even if a message from another topic arrived while you were working.",
       "",
       'The default format is "html" \u2014 write natural markdown and it is auto-converted to Telegram HTML (bold, italic, code, links, code blocks). Use format: "markdownv2" for MarkdownV2 with auto-escaping, or "text" for plain text.',
       "",
@@ -24290,6 +24290,7 @@ var init_bridge = __esm(async () => {
           reply_to: { type: "string", description: "Message ID to thread under. Overrides the default (latest inbound)." },
           quote: { type: "boolean", description: "Opt out of the default quote-reply behavior. Default: true. Pass false to send a bare message with no quote reference. Ignored when reply_to is explicitly set." },
           message_thread_id: { type: "string", description: "Forum topic thread ID. Auto-applied from the last inbound message in the same chat if not specified." },
+          origin_turn_id: { type: "string", description: "In a forum supergroup, pass back the origin_turn_id attribute from the <channel> message you are answering. It pins the reply to that message's topic even if another topic's turn started meanwhile. Omit in DMs / single-topic chats." },
           files: { type: "array", items: { type: "string" }, description: "Absolute file paths to attach. Images send as photos; other types as documents. Max 50MB each." },
           format: { type: "string", enum: ["html", "markdownv2", "text"], description: "Rendering mode. 'html' (default) converts markdown to Telegram HTML." },
           disable_web_page_preview: { type: "boolean", description: "Disable link preview thumbnails. Default: true." },
@@ -24328,6 +24329,7 @@ var init_bridge = __esm(async () => {
           text: { type: "string", description: "Full text snapshot. NOT a delta \u2014 pass the complete current content each call." },
           done: { type: "boolean", description: "Must be true. Posts this text as the final answer for the turn and locks the message." },
           message_thread_id: { type: "string", description: "Forum topic thread ID. Auto-applied from the last inbound message if not specified." },
+          origin_turn_id: { type: "string", description: "In a forum supergroup, pass back the origin_turn_id attribute from the <channel> message you are answering. It pins the reply to that message's topic even if another topic's turn started meanwhile. Omit in DMs / single-topic chats." },
           format: { type: "string", enum: ["html", "markdownv2", "text"], description: "Rendering mode. 'html' (default) converts markdown to Telegram HTML." },
           reply_to: { type: "string", description: "Message ID to quote-reply to. Overrides the default (latest inbound)." },
           quote: { type: "boolean", description: "Opt out of the default quote-reply behavior. Default: true. Ignored when reply_to is explicitly set." },

package/telegram-plugin/gateway/answer-thread-resolve.ts

@@ -0,0 +1,79 @@
+/**
+ * Turn-origin answer-thread resolution (multitopic reply-routing,
+ * component 3).
+ *
+ * Pure decision: which forum-topic thread should an ANSWER reply
+ * (`reply` / `stream_reply`) land in?
+ *
+ * ## The bug this closes
+ *
+ * In a forum supergroup one sequential `claude` CLI owns every topic with
+ * a singleton `currentTurn`. The Brevo turn's reply landed ~42s after its
+ * turn-end event; by then `currentTurn` had flipped to the Meta turn.
+ * `executeReply` captured `const turn = currentTurn` at execution and, when
+ * the model omitted `message_thread_id`, resolved the thread from
+ * `turn.sessionThreadId` (Meta's thread) — so Brevo's answer landed in
+ * Meta. A successor turn stole a predecessor's late reply.
+ *
+ * ## The precedence (answer paths)
+ *
+ *   1. An explicit `message_thread_id` the MODEL passed wins outright —
+ *      the model is asserting the destination topic.
+ *   2. Else the ORIGIN turn's thread: the turn matched by the reply's
+ *      `origin_turn_id` (the meta field the model echoes back). This is
+ *      authoritative even when `currentTurn` has flipped, because the
+ *      origin turn is looked up in a recently-ended registry.
+ *   3. Else the LIVE turn's thread — but ONLY when the live turn IS the
+ *      origin turn (no flip happened) OR no origin turn could be resolved
+ *      at all (origin id absent/unknown; legacy / pre-stamp path).
+ *   4. Else (origin resolved AND it differs from the live turn) we pin to
+ *      the origin thread and explicitly DO NOT fall through to the chat's
+ *      last-seen `chatThreadMap` thread. For answer surfaces the chat
+ *      last-seen heuristic is exactly what produced the wrong-topic bug.
+ *
+ * The `chatThreadMap` last-seen fallback is preserved for NON-answer
+ * surfaces (`send_typing`, `forward_message`, `progress_update`) by NOT
+ * routing them through this function — they keep calling `resolveThreadId`
+ * directly.
+ */
+
+export interface AnswerThreadInput {
+  /** Explicit `message_thread_id` the model passed (already coerced to a
+   *  number), or undefined when omitted. */
+  explicitThreadId?: number | undefined
+  /** Thread of the turn matched by `origin_turn_id`, or undefined when the
+   *  origin turn is a DM (no thread). Only meaningful when
+   *  `originResolved` is true. */
+  originThreadId?: number | undefined
+  /** Whether an origin turn was resolved at all. Distinguishes
+   *  "origin turn exists and its thread is undefined (a DM origin)" from
+   *  "no origin turn" — both surface as `originThreadId === undefined`. */
+  originResolved: boolean
+  /** Thread of the LIVE `currentTurn` at execution time, or undefined
+   *  (no live turn, or a DM live turn). The legacy (#1664) fallback when
+   *  no origin turn is resolvable. */
+  liveThreadId?: number | undefined
+}
+
+/**
+ * Pure. Returns the thread id to send the answer to, or undefined for the
+ * main chat (DM / no thread).
+ *
+ * Precedence: explicit model thread → origin turn's thread (authoritative
+ * across a currentTurn flip; this is the wrong-topic fix) → live turn's
+ * thread (legacy #1664 fallback when origin can't be resolved). Crucially
+ * the chat last-seen `chatThreadMap` heuristic is NOT in this chain — that
+ * heuristic is what produced the Brevo→Meta wrong-topic bug, so answer
+ * paths never reach it.
+ */
+export function resolveAnswerThreadId(input: AnswerThreadInput): number | undefined {
+  // (1) explicit model thread wins.
+  if (input.explicitThreadId != null) return input.explicitThreadId
+  // (2) origin turn resolved → pin to its thread (authoritative even when
+  //     currentTurn has flipped to a successor). A DM origin yields
+  //     undefined, which is correct.
+  if (input.originResolved) return input.originThreadId
+  // (3) no origin resolved (legacy / pre-stamp / evicted) → fall back to
+  //     the live turn's thread, the existing turn-pinned behaviour (#1664).
+  return input.liveThreadId
+}