From 2ba18b84a5853ff42a51848b81af2fe65f025e32 Mon Sep 17 00:00:00 2001
From: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Date: Wed, 24 Jun 2026 01:54:43 +0800
Subject: [PATCH] fix(app): use correct server sdk for titlebar session lookup
 (#33536)

---
 packages/app/src/components/titlebar.tsx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/app/src/components/titlebar.tsx b/packages/app/src/components/titlebar.tsx
index f019e839b..8e266ad84 100644
--- a/packages/app/src/components/titlebar.tsx
+++ b/packages/app/src/components/titlebar.tsx
@@ -524,10 +524,16 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                           }
 
                           const [session] = createResource(
-                            () => tab.sessionId,
-                            (sessionID) =>
-                              serverSdk()
-                                .client.session.get({ sessionID })
+                            () => {
+                              const id = tab.sessionId
+                              const conn = server.list.find((s) => ServerConnection.key(s) === tab.server)
+                              if (!conn) return null
+                              const { sdk } = global.createServerCtx(conn)
+                              return { id, sdk }
+                            },
+                            ({ id, sdk }) =>
+                              sdk.client.session
+                                .get({ sessionID: id })
                                 .then((x) => x.data)
                                 .catch(() => undefined),
                           )