From 1c8a2787e1abd21eb854e33b55facc09eeb9840a Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]"
 <219766164+opencode-agent[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 18:22:28 +0000
Subject: [PATCH] fix(app): fall back to live permission server

---
 packages/app/src/context/permission.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/context/permission.tsx b/packages/app/src/context/permission.tsx
index d6d8019262a..ed44dbe32c6 100644
--- a/packages/app/src/context/permission.tsx
+++ b/packages/app/src/context/permission.tsx
@@ -117,14 +117,13 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
 
     onCleanup(() => states.forEach((value) => value.dispose()))
 
-    let lastSelected: PermissionState | undefined
     const selected = () => {
+      const list = global.servers.list()
       const key = activeServer()
-      if (global.servers.list().some((conn) => ServerConnection.key(conn) === key)) {
-        lastSelected = ensure(key)
-      }
-      if (lastSelected) return lastSelected
-      return ensure(server.key)
+      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("Permission server not found")
+      return ensure(ServerConnection.key(conn))
     }
     const activeDirectory = createMemo(() => {
       const directory = decode64(params.dir)