fix: preserve delivery thread fallback (#4911) (thanks @yevhen)

src/utils/delivery-context.test.ts

@@ -88,6 +88,20 @@ describe("delivery context helpers", () => {
       accountId: undefined,
       threadId: 42,
     });
+
+    expect(
+      deliveryContextFromSession({
+        channel: "telegram",
+        lastTo: " -1001 ",
+        deliveryContext: { threadId: " 777 " },
+        origin: { threadId: 42 },
+      }),
+    ).toEqual({
+      channel: "telegram",
+      to: "-1001",
+      accountId: undefined,
+      threadId: "777",
+    });
   });
 
   it("normalizes delivery fields and mirrors them on session entries", () => {

src/utils/delivery-context.ts

@@ -98,7 +98,7 @@ export function deliveryContextFromSession(
     lastChannel: entry.lastChannel,
     lastTo: entry.lastTo,
     lastAccountId: entry.lastAccountId,
-    lastThreadId: entry.lastThreadId ?? entry.origin?.threadId,
+    lastThreadId: entry.lastThreadId ?? entry.deliveryContext?.threadId ?? entry.origin?.threadId,
     deliveryContext: entry.deliveryContext,
   };
   return normalizeSessionDeliveryFields(source).deliveryContext;