From 4a81e8392b4c18cbcc0914527bdab8ff94b9a434 Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" <219766164+opencode-agent[bot]@users.noreply.github.com> Date: Mon, 20 Jul 2026 09:22:18 +0000 Subject: [PATCH] fix(app): gate notification server selection (#37890) Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com> --- packages/app/src/context/notification.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/app/src/context/notification.tsx b/packages/app/src/context/notification.tsx index e12f8f1250..9bfa13d854 100644 --- a/packages/app/src/context/notification.tsx +++ b/packages/app/src/context/notification.tsx @@ -176,7 +176,14 @@ export const { use: useNotification, provider: NotificationProvider } = createSi onCleanup(() => states.forEach((value) => value.dispose())) - const selected = () => ensure(activeServer()) + const selected = () => { + const list = global.servers.list() + const key = activeServer() + if (list.some((conn) => ServerConnection.key(conn) === key)) return ensure(key) + const conn = list.find((conn) => ServerConnection.key(conn) === server.key) ?? list[0] + if (!conn) throw new Error("Notification server not found") + return ensure(ServerConnection.key(conn)) + } return { ready: () => selected().ready(),