From e0eb460fc85562089af21abf6e36af8858e59270 Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Mon, 12 Jan 2026 13:21:17 +0800 Subject: [PATCH] app: resolve defaultServerUrl inside AppInterface The desktop app sometimes modified __OPENCODE__.serverUrl after the window is created. Previously this was ignored since defaultServerUrl was created at module scope, now it isn't created until desktop's ensure_server_started query complete, after which point serverUrl is guaranteed to be updated. --- packages/app/src/app.tsx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/app/src/app.tsx b/packages/app/src/app.tsx index bf6da3b4d..91e4ae39b 100644 --- a/packages/app/src/app.tsx +++ b/packages/app/src/app.tsx @@ -37,16 +37,6 @@ declare global { } } -const defaultServerUrl = iife(() => { - if (location.hostname.includes("opencode.ai")) return "http://localhost:4096" - if (window.__OPENCODE__?.serverUrl) return window.__OPENCODE__.serverUrl - if (window.__OPENCODE__?.port) return `http://127.0.0.1:${window.__OPENCODE__.port}` - if (import.meta.env.DEV) - return `http://${import.meta.env.VITE_OPENCODE_SERVER_HOST ?? "localhost"}:${import.meta.env.VITE_OPENCODE_SERVER_PORT ?? "4096"}` - - return window.location.origin -}) - export function AppBaseProviders(props: ParentProps) { return ( @@ -76,6 +66,16 @@ function ServerKey(props: ParentProps) { } export function AppInterface() { + const defaultServerUrl = iife(() => { + if (location.hostname.includes("opencode.ai")) return "http://localhost:4096" + if (window.__OPENCODE__?.serverUrl) return window.__OPENCODE__.serverUrl + if (window.__OPENCODE__?.port) return `http://127.0.0.1:${window.__OPENCODE__.port}` + if (import.meta.env.DEV) + return `http://${import.meta.env.VITE_OPENCODE_SERVER_HOST ?? "localhost"}:${import.meta.env.VITE_OPENCODE_SERVER_PORT ?? "4096"}` + + return window.location.origin + }) + return (