fix(queue): preserve queued platform message ids in collect drains

deepujain · deepujain · commit a332c2630940 · 2026-06-07T17:04:51.000-07:00
Keep the latest queued platform message id when collect-mode followups synthesize a combined deferred turn. Fixes #36212
diff --git a/src/auto-reply/reply/queue.collect.test.ts b/src/auto-reply/reply/queue.collect.test.ts
@@ -97,6 +97,50 @@ describe("followup queue collect routing", () => {
     expect(calls[0]?.originatingTo).toBe("channel:A");
   });
 
+  it("preserves the latest queued message id on collected followups", async () => {
+    const key = `test-collect-message-id-${Date.now()}`;
+    const calls: FollowupRun[] = [];
+    const done = createDeferred<void>();
+    const runFollowup = async (run: FollowupRun) => {
+      calls.push(run);
+      done.resolve();
+    };
+    const settings: QueueSettings = {
+      mode: "collect",
+      debounceMs: 0,
+      cap: 50,
+      dropPolicy: "summarize",
+    };
+
+    enqueueFollowupRun(
+      key,
+      createRun({
+        prompt: "first",
+        messageId: "platform-msg-1",
+        originatingChannel: "feishu",
+        originatingTo: "chat:123",
+      }),
+      settings,
+    );
+    enqueueFollowupRun(
+      key,
+      createRun({
+        prompt: "second",
+        messageId: "platform-msg-2",
+        originatingChannel: "feishu",
+        originatingTo: "chat:123",
+      }),
+      settings,
+    );
+
+    scheduleFollowupDrain(key, runFollowup);
+    await done.promise;
+
+    expect(calls).toHaveLength(1);
+    expect(calls[0]?.prompt).toContain("[Queued messages while agent was busy]");
+    expect(calls[0]?.messageId).toBe("platform-msg-2");
+  });
+
   it("collects compatible items after one cross-channel drain", async () => {
     const key = `test-collect-after-cross-${Date.now()}`;
     const calls: FollowupRun[] = [];
diff --git a/src/auto-reply/reply/queue/drain.ts b/src/auto-reply/reply/queue/drain.ts
@@ -54,6 +54,8 @@ type OriginRoutingMetadata = Pick<
   "originatingChannel" | "originatingTo" | "originatingAccountId" | "originatingThreadId"
 >;
 
+type OriginMessageMetadata = Pick<FollowupRun, "messageId" | "originatingReplyToId">;
+
 function resolveOriginRoutingMetadata(items: FollowupRun[]): OriginRoutingMetadata {
   const metadata: OriginRoutingMetadata = {};
   for (const item of items) {
@@ -86,6 +88,23 @@ function resolveOriginRoutingMetadata(items: FollowupRun[]): OriginRoutingMetada
   return metadata;
 }
 
+function resolveOriginMessageMetadata(items: FollowupRun[]): OriginMessageMetadata {
+  const metadata: OriginMessageMetadata = {};
+  for (let index = items.length - 1; index >= 0; index -= 1) {
+    const item = items[index];
+    if (!metadata.messageId && item.messageId) {
+      metadata.messageId = item.messageId;
+    }
+    if (!metadata.originatingReplyToId && item.originatingReplyToId) {
+      metadata.originatingReplyToId = item.originatingReplyToId;
+    }
+    if (metadata.messageId && metadata.originatingReplyToId) {
+      break;
+    }
+  }
+  return metadata;
+}
+
 // Keep this key aligned with the fields that affect per-message authorization or
 // exec-context propagation in collect-mode batching. Display-only sender fields
 // stay out of the key so profile/name drift does not force conservative splits.
@@ -474,6 +493,7 @@ export function scheduleFollowupDrain(
             }
 
             const routing = resolveOriginRoutingMetadata(groupItems);
+            const messageMetadata = resolveOriginMessageMetadata(groupItems);
             const prompt = buildCollectPrompt({
               title: "[Queued messages while agent was busy]",
               items: groupItems,
@@ -486,6 +506,7 @@ export function scheduleFollowupDrain(
                 run,
                 enqueuedAt: Date.now(),
                 ...routing,
+                ...messageMetadata,
                 ...collectRuntimeMetadata(groupItems),
                 ...collectQueuedImages(groupItems),
               });
@@ -525,10 +546,12 @@ export function scheduleFollowupDrain(
                     prompt: summaryPrompt,
                     run,
                     enqueuedAt: Date.now(),
+                    messageId: item.messageId,
                     originatingChannel: item.originatingChannel,
                     originatingTo: item.originatingTo,
                     originatingAccountId: item.originatingAccountId,
                     originatingThreadId: item.originatingThreadId,
+                    originatingReplyToId: item.originatingReplyToId,
                     ...collectSummaryRuntimeMetadata([item]),
                     ...collectQueuedImages([item]),
                   });
