From 8a2348547251e7f96a2581381c656cacc264d1f3 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Wed, 6 May 2026 20:29:33 -0700
Subject: [PATCH] fix(reply): preserve queue metadata after perf cherry-picks

---
 src/auto-reply/reply/agent-runner-payloads.ts |  8 +++-----
 src/auto-reply/reply/queue/drain.ts           | 12 +++++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/auto-reply/reply/agent-runner-payloads.ts b/src/auto-reply/reply/agent-runner-payloads.ts
index b611344b93f..ac688407b0b 100644
--- a/src/auto-reply/reply/agent-runner-payloads.ts
+++ b/src/auto-reply/reply/agent-runner-payloads.ts
@@ -359,11 +359,9 @@ export async function buildReplyPayloads(params: {
         })
       : contentSuppressedPayloads;
   const replyPayloads: ReplyPayload[] = [];
-  if (!messagingToolPayloadDedupe.suppressReplies) {
-    for (const payload of filteredPayloads) {
-      if (isRenderablePayload(payload)) {
-        replyPayloads.push(payload);
-      }
+  for (const payload of filteredPayloads) {
+    if (isRenderablePayload(payload)) {
+      replyPayloads.push(payload);
     }
   }
 
diff --git a/src/auto-reply/reply/queue/drain.ts b/src/auto-reply/reply/queue/drain.ts
index 2bc1dc72f65..9c15e8d2601 100644
--- a/src/auto-reply/reply/queue/drain.ts
+++ b/src/auto-reply/reply/queue/drain.ts
@@ -51,9 +51,15 @@ type OriginRoutingMetadata = Pick<
 function resolveOriginRoutingMetadata(items: FollowupRun[]): OriginRoutingMetadata {
   const metadata: OriginRoutingMetadata = {};
   for (const item of items) {
-    metadata.originatingChannel ??= item.originatingChannel;
-    metadata.originatingTo ??= item.originatingTo;
-    metadata.originatingAccountId ??= item.originatingAccountId;
+    if (!metadata.originatingChannel && item.originatingChannel) {
+      metadata.originatingChannel = item.originatingChannel;
+    }
+    if (!metadata.originatingTo && item.originatingTo) {
+      metadata.originatingTo = item.originatingTo;
+    }
+    if (!metadata.originatingAccountId && item.originatingAccountId) {
+      metadata.originatingAccountId = item.originatingAccountId;
+    }
     // Support both number (Telegram topic) and string (Slack thread_ts) thread IDs.
     if (
       metadata.originatingThreadId == null &&