From 1fee91e431c73e0bf6430b39b10ea27d664837f8 Mon Sep 17 00:00:00 2001
From: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>
Date: Fri, 27 Mar 2026 20:19:13 -0500
Subject: [PATCH] fix: preserve session thread ids in sessions changed events

---
 src/gateway/server-methods/sessions.ts                    | 1 +
 .../server.sessions.gateway-server-sessions-a.test.ts     | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/src/gateway/server-methods/sessions.ts b/src/gateway/server-methods/sessions.ts
index 19f67af45cb..05ca9994f87 100644
--- a/src/gateway/server-methods/sessions.ts
+++ b/src/gateway/server-methods/sessions.ts
@@ -173,6 +173,7 @@ function emitSessionsChanged(
             lastChannel: sessionRow.lastChannel,
             lastTo: sessionRow.lastTo,
             lastAccountId: sessionRow.lastAccountId,
+            lastThreadId: sessionRow.lastThreadId,
             totalTokens: sessionRow.totalTokens,
             totalTokensFresh: sessionRow.totalTokensFresh,
             contextTokens: sessionRow.contextTokens,
diff --git a/src/gateway/server.sessions.gateway-server-sessions-a.test.ts b/src/gateway/server.sessions.gateway-server-sessions-a.test.ts
index e2f5360693d..26e0238d01b 100644
--- a/src/gateway/server.sessions.gateway-server-sessions-a.test.ts
+++ b/src/gateway/server.sessions.gateway-server-sessions-a.test.ts
@@ -607,6 +607,10 @@ describe("gateway server sessions", () => {
           verboseLevel: "on",
           responseUsage: "full",
           fastMode: true,
+          lastChannel: "telegram",
+          lastTo: "-100123",
+          lastAccountId: "acct-1",
+          lastThreadId: 42,
         },
       },
     });
@@ -643,6 +647,10 @@ describe("gateway server sessions", () => {
         verboseLevel: "on",
         responseUsage: "full",
         fastMode: true,
+        lastChannel: "telegram",
+        lastTo: "-100123",
+        lastAccountId: "acct-1",
+        lastThreadId: 42,
       }),
       new Set(["conn-1"]),
       { dropIfSlow: true },