From 1f4c8728c807647736dd6c3f9d31c5017ed706d1 Mon Sep 17 00:00:00 2001
From: Val Alexander <68980965+BunsDev@users.noreply.github.com>
Date: Sat, 2 May 2026 10:35:27 -0500
Subject: [PATCH] fix(gateway): use request context for session run state

---
 src/gateway/server-methods/sessions.ts | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/gateway/server-methods/sessions.ts b/src/gateway/server-methods/sessions.ts
index 14d08309f8c..8a1270de621 100644
--- a/src/gateway/server-methods/sessions.ts
+++ b/src/gateway/server-methods/sessions.ts
@@ -677,22 +677,17 @@ export const sessionsHandlers: GatewayRequestHandlers = {
       modelCatalog,
       opts: p,
     });
-    const activeSessionKeys = new Set<string>();
-    if (chatHandlers.chatAbortControllers.size > 0) {
-      for (const run of chatHandlers.chatAbortControllers.values()) {
-        const sessionKey = resolveSessionKeyForRun(run);
-        if (typeof sessionKey === "string" && sessionKey.length > 0) {
-          activeSessionKeys.add(sessionKey);
-        }
-      }
-    }
     respond(
       true,
       {
         ...result,
         sessions: result.sessions.map((session) =>
           Object.assign({}, session, {
-            hasActiveRun: activeSessionKeys.has(session.key),
+            hasActiveRun: hasTrackedActiveSessionRun({
+              context,
+              requestedKey: session.key,
+              canonicalKey: session.key,
+            }),
           }),
         ),
       },