fix(reply): preserve queue metadata after perf cherry-picks

vincentkoc · vincentkoc · commit 8a2348547251 · 2026-05-06T22:22:39.000-07:00
diff --git 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
@@ -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 &&

Original file line number	Diff line number	Diff line change
`@@ -359,11 +359,9 @@ export async function buildReplyPayloads(params: {`
`359`	`359`	`})`
`360`	`360`	`: contentSuppressedPayloads;`
`361`	`361`	`const replyPayloads: ReplyPayload[] = [];`
`362`		`- if (!messagingToolPayloadDedupe.suppressReplies) {`
`363`		`- for (const payload of filteredPayloads) {`
`364`		`- if (isRenderablePayload(payload)) {`
`365`		`- replyPayloads.push(payload);`
`366`		`- }`
	`362`	`+ for (const payload of filteredPayloads) {`
	`363`	`+ if (isRenderablePayload(payload)) {`
	`364`	`+ replyPayloads.push(payload);`
`367`	`365`	`}`
`368`	`366`	`}`
`369`	`367`