From 00312b7ee869db564ce09ef1fa4341b63d67bada Mon Sep 17 00:00:00 2001
From: Dotta <bippadotta@protonmail.com>
Date: Sun, 16 Aug 2026 21:44:15 +0000
Subject: [PATCH] fix: require same-root feedback coalescing

Co-Authored-By: Paperclip <noreply@paperclip.ing>
---
 server/src/services/recovery/feedback-delivery.test.ts | 7 +++++++
 server/src/services/recovery/feedback-delivery.ts      | 5 +----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/src/services/recovery/feedback-delivery.test.ts b/server/src/services/recovery/feedback-delivery.test.ts
index c9a05c7d8ac..3e8eab383cb 100644
--- a/server/src/services/recovery/feedback-delivery.test.ts
+++ b/server/src/services/recovery/feedback-delivery.test.ts
@@ -263,6 +263,13 @@ describe("feedback retry coalescing", () => {
       liveRootWakeupRequestId: "wake-root-2",
     })).toBe(false);
   });
+
+  it("keeps queued non-feedback work in a separate delivery lane", () => {
+    expect(canCoalesceFeedbackDeliveryRetry({
+      ...base,
+      liveRootWakeupRequestId: null,
+    })).toBe(false);
+  });
 });
 
 describe("stranded feedback delivery backstop", () => {
diff --git a/server/src/services/recovery/feedback-delivery.ts b/server/src/services/recovery/feedback-delivery.ts
index ac2ef880884..57dcb9fef0f 100644
--- a/server/src/services/recovery/feedback-delivery.ts
+++ b/server/src/services/recovery/feedback-delivery.ts
@@ -106,10 +106,7 @@ export function canCoalesceFeedbackDeliveryRetry(input: {
 }) {
   return input.liveAgentId === input.sourceAgentId
     && input.liveStatus !== "running"
-    && (
-      input.liveRootWakeupRequestId === null
-      || input.liveRootWakeupRequestId === input.sourceRootWakeupRequestId
-    );
+    && input.liveRootWakeupRequestId === input.sourceRootWakeupRequestId;
 }
 
 export function hasCompleteFeedbackDispositionCoverage(input: {