Merge branch 'dev' into update-acp-sdk

bun.lock

@@ -361,7 +361,7 @@
       "dependencies": {
         "@actions/core": "1.11.1",
         "@actions/github": "6.0.1",
-        "@agentclientprotocol/sdk": "0.16.1",
+        "@agentclientprotocol/sdk": "0.21.0",
         "@ai-sdk/alibaba": "1.0.17",
         "@ai-sdk/amazon-bedrock": "4.0.96",
         "@ai-sdk/anthropic": "3.0.71",
@@ -754,7 +754,7 @@
 
     "@adobe/css-tools": ["@adobe/css-tools@4.4.4", "", {}, "sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg=="],
 
-    "@agentclientprotocol/sdk": ["@agentclientprotocol/sdk@0.16.1", "", { "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-1ad+Sc/0sCtZGHthxxvgEUo5Wsbw16I+aF+YwdiLnPwkZG8KAGUEAPK6LM6Pf69lCyJPt1Aomk1d+8oE3C4ZEw=="],
+    "@agentclientprotocol/sdk": ["@agentclientprotocol/sdk@0.21.0", "", { "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-ONj+Q8qOdNQp5XbH5jnMwzT9IKZJsSN0p0lkceS4GtUtNOPVLpNzSS8gqQdGMKfBvA0ESbkL8BTaSN1Rc9miEw=="],
 
     "@ai-sdk/alibaba": ["@ai-sdk/alibaba@1.0.17", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.41", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ZbE+U5bWz2JBc5DERLowx5+TKbjGBE93LqKZAWvuEn7HOSQMraxFMZuc0ST335QZJAyfBOzh7m1mPQ+y7EaaoA=="],
 

packages/app/src/app.tsx

@@ -42,7 +42,6 @@ import { PromptProvider } from "@/context/prompt"
 import { ServerConnection, ServerProvider, serverName, useServer } from "@/context/server"
 import { SettingsProvider } from "@/context/settings"
 import { TerminalProvider } from "@/context/terminal"
-import { WslServersProvider } from "@/context/wsl-servers"
 import DirectoryLayout from "@/pages/directory-layout"
 import Layout from "@/pages/layout"
 import { ErrorPage } from "./pages/error"
@@ -75,7 +74,7 @@ declare global {
     __OPENCODE__?: {
       updaterEnabled?: boolean
       deepLinks?: string[]
-      activeServer?: string
+      wsl?: boolean
     }
     api?: {
       setTitlebar?: (theme: { mode: "light" | "dark" }) => Promise<void>
@@ -157,13 +156,11 @@ export function AppBaseProviders(props: ParentProps<{ locale?: Locale }>) {
               }}
             >
               <QueryProvider>
-                <WslServersProvider>
-                  <DialogProvider>
-                    <MarkedProvider>
-                      <FileComponentProvider component={File}>{props.children}</FileComponentProvider>
-                    </MarkedProvider>
-                  </DialogProvider>
-                </WslServersProvider>
+                <DialogProvider>
+                  <MarkedProvider>
+                    <FileComponentProvider component={File}>{props.children}</FileComponentProvider>
+                  </MarkedProvider>
+                </DialogProvider>
               </QueryProvider>
             </ErrorBoundary>
           </UiI18nBridge>
@@ -286,11 +283,11 @@ function ConnectionError(props: { onRetry?: () => void; onServerSelected?: (key:
   )
 }
 
-function ServerKey(props: { children: (key: ServerConnection.Key) => JSX.Element }) {
+function ServerKey(props: ParentProps) {
   const server = useServer()
   return (
     <Show when={server.key} keyed>
-      {(key) => props.children(key)}
+      {props.children}
     </Show>
   )
 }
@@ -310,24 +307,22 @@ export function AppInterface(props: {
     >
       <ConnectionGate disableHealthCheck={props.disableHealthCheck}>
         <ServerKey>
-          {() => (
-            <QueryProvider>
-              <GlobalSDKProvider>
-                <GlobalSyncProvider>
-                  <Dynamic
-                    component={props.router ?? Router}
-                    root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>}
-                  >
-                    <Route path="/" component={HomeRoute} />
-                    <Route path="/:dir" component={DirectoryLayout}>
-                      <Route path="/" component={SessionIndexRoute} />
-                      <Route path="/session/:id?" component={SessionRoute} />
-                    </Route>
-                  </Dynamic>
-                </GlobalSyncProvider>
-              </GlobalSDKProvider>
-            </QueryProvider>
-          )}
+          <QueryProvider>
+            <GlobalSDKProvider>
+              <GlobalSyncProvider>
+                <Dynamic
+                  component={props.router ?? Router}
+                  root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>}
+                >
+                  <Route path="/" component={HomeRoute} />
+                  <Route path="/:dir" component={DirectoryLayout}>
+                    <Route path="/" component={SessionIndexRoute} />
+                    <Route path="/session/:id?" component={SessionRoute} />
+                  </Route>
+                </Dynamic>
+              </GlobalSyncProvider>
+            </GlobalSDKProvider>
+          </QueryProvider>
         </ServerKey>
       </ConnectionGate>
     </ServerProvider>

packages/app/src/components/dialog-select-server.tsx

@@ -8,22 +8,17 @@ import { List } from "@opencode-ai/ui/list"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { useMutation } from "@tanstack/solid-query"
 import { showToast } from "@opencode-ai/ui/toast"
-import { batch, createEffect, createMemo, createResource, For, onCleanup, Show, untrack } from "solid-js"
+import { useNavigate } from "@solidjs/router"
+import { createEffect, createMemo, createResource, onCleanup, Show } from "solid-js"
 import { createStore, reconcile } from "solid-js/store"
-import { DialogWslServer } from "@/components/dialog-wsl-server"
 import { ServerHealthIndicator, ServerRow } from "@/components/server/server-row"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
 import { normalizeServerUrl, ServerConnection, useServer } from "@/context/server"
-import { useWslServers } from "@/context/wsl-servers"
 import { type ServerHealth, useCheckServerHealth } from "@/utils/server-health"
 
 const DEFAULT_USERNAME = "opencode"
 
-interface DialogSelectServerProps {
-  onNavigateHome?: () => void
-}
-
 interface ServerFormProps {
   value: string
   name: string
@@ -32,6 +27,7 @@ interface ServerFormProps {
   placeholder: string
   busy: boolean
   error: string
+  status: boolean | undefined
   onChange: (value: string) => void
   onNameChange: (value: string) => void
   onUsernameChange: (value: string) => void
@@ -48,17 +44,15 @@ function showRequestError(language: ReturnType<typeof useLanguage>, err: unknown
   })
 }
 
-function isWslSidecar(conn: ServerConnection.Any): conn is ServerConnection.Sidecar & { variant: "wsl" } {
-  return conn.type === "sidecar" && conn.variant === "wsl"
-}
-
 function useDefaultServer() {
   const language = useLanguage()
   const platform = usePlatform()
-  const [defaultKey, defaultActions] = createResource(
+  const [defaultKey, defaultUrlActions] = createResource(
     async () => {
       try {
-        return (await platform.getDefaultServer?.()) ?? null
+        const key = await platform.getDefaultServer?.()
+        if (!key) return null
+        return key
       } catch (err) {
         showRequestError(language, err)
         return null
@@ -66,18 +60,52 @@ function useDefaultServer() {
     },
     { initialValue: null },
   )
+
   const canDefault = createMemo(() => !!platform.getDefaultServer && !!platform.setDefaultServer)
   const setDefault = async (key: ServerConnection.Key | null) => {
     try {
       await platform.setDefaultServer?.(key)
-      defaultActions.mutate(key)
+      defaultUrlActions.mutate(key)
     } catch (err) {
       showRequestError(language, err)
     }
   }
+
   return { defaultKey, canDefault, setDefault }
 }
 
+function useServerPreview() {
+  const checkServerHealth = useCheckServerHealth()
+
+  const looksComplete = (value: string) => {
+    const normalized = normalizeServerUrl(value)
+    if (!normalized) return false
+    const host = normalized.replace(/^https?:\/\//, "").split("/")[0]
+    if (!host) return false
+    if (host.includes("localhost") || host.startsWith("127.0.0.1")) return true
+    return host.includes(".") || host.includes(":")
+  }
+
+  const previewStatus = async (
+    value: string,
+    username: string,
+    password: string,
+    setStatus: (value: boolean | undefined) => void,
+  ) => {
+    setStatus(undefined)
+    if (!looksComplete(value)) return
+    const normalized = normalizeServerUrl(value)
+    if (!normalized) return
+    const http: ServerConnection.HttpBase = { url: normalized }
+    if (username) http.username = username
+    if (password) http.password = password
+    const result = await checkServerHealth(http)
+    setStatus(result.healthy)
+  }
+
+  return { previewStatus }
+}
+
 function ServerForm(props: ServerFormProps) {
   const language = useLanguage()
   const keyDown = (event: KeyboardEvent) => {
@@ -143,18 +171,15 @@ function ServerForm(props: ServerFormProps) {
   )
 }
 
-export function DialogSelectServer(props: DialogSelectServerProps = {}) {
+export function DialogSelectServer() {
+  const navigate = useNavigate()
   const dialog = useDialog()
   const server = useServer()
   const platform = usePlatform()
   const language = useLanguage()
-  const wslServers = useWslServers()
-  const defaultServer = useDefaultServer()
+  const { defaultKey, canDefault, setDefault } = useDefaultServer()
+  const { previewStatus } = useServerPreview()
   const checkServerHealth = useCheckServerHealth()
-  let disposed = false
-  onCleanup(() => {
-    disposed = true
-  })
   const [store, setStore] = createStore({
     status: {} as Record<ServerConnection.Key, ServerHealth | undefined>,
     addServer: {
@@ -164,9 +189,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       password: "",
       error: "",
       showForm: false,
-    },
-    addWsl: {
-      showWizard: false,
+      status: undefined as boolean | undefined,
     },
     editServer: {
       id: undefined as string | undefined,
@@ -175,6 +198,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       username: "",
       password: "",
       error: "",
+      status: undefined as boolean | undefined,
     },
   })
 
@@ -186,6 +210,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       password: "",
       error: "",
       showForm: false,
+      status: undefined,
     })
   }
   const resetEdit = () => {
@@ -196,6 +221,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       username: "",
       password: "",
       error: "",
+      status: undefined,
     })
   }
 
@@ -268,31 +294,6 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
     },
   }))
 
-  const removeWslMutation = useMutation(() => ({
-    mutationFn: async (key: ServerConnection.Key) => {
-      await platform.wslServers?.removeServer(key)
-      return key
-    },
-    onSuccess: async (key) => {
-      server.remove(key)
-    },
-    onError: (err) => showRequestError(language, err),
-  }))
-
-  const retryWslMutation = useMutation(() => ({
-    mutationFn: async (key: ServerConnection.Key) => {
-      await platform.wslServers?.startServer(key)
-    },
-    onError: (err) => showRequestError(language, err),
-  }))
-
-  const updateWslMutation = useMutation(() => ({
-    mutationFn: async (distro: string) => {
-      await platform.wslServers?.installOpencode(distro)
-    },
-    onError: (err) => showRequestError(language, err),
-  }))
-
   const replaceServer = (original: ServerConnection.Http, next: ServerConnection.Http) => {
     const active = server.key
     const newConn = server.add(next)
@@ -311,32 +312,6 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
   })
 
   const current = createMemo(() => items().find((x) => ServerConnection.key(x) === server.key) ?? items()[0])
-  const wslState = () => wslServers.data
-  const healthPollKey = createMemo(() =>
-    items()
-      .map((conn) =>
-        [ServerConnection.key(conn), conn.http.url, conn.http.username ?? "", conn.http.password ?? ""].join("\n"),
-      )
-      .join("\n\n"),
-  )
-  const health = (key: ServerConnection.Key) => store.status[key]
-  const wslRuntime = (conn: ServerConnection.Any) => {
-    if (!isWslSidecar(conn)) return
-    return wslState()?.servers.find((item) => item.config.id === ServerConnection.key(conn))?.runtime
-  }
-  const nonReadyWslServers = createMemo(() =>
-    (wslState()?.servers ?? []).filter((item) => item.runtime.kind !== "ready"),
-  )
-  const canRetryWsl = (conn: ServerConnection.Any) => {
-    const runtime = wslRuntime(conn)
-    return runtime?.kind === "failed" || runtime?.kind === "stopped"
-  }
-  const canRetryWslRuntime = (kind: string) => kind === "failed" || kind === "stopped"
-  const wslRuntimeLabel = (kind: string) => {
-    if (kind === "starting") return "Starting"
-    if (kind === "failed") return "Failed"
-    return "Stopped"
-  }
 
   const sortedItems = createMemo(() => {
     const list = items()
@@ -351,7 +326,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
     return list.slice().sort((a, b) => {
       if (a === active) return -1
       if (b === active) return 1
-      const diff = rank(health(ServerConnection.key(a))) - rank(health(ServerConnection.key(b)))
+      const diff = rank(store.status[ServerConnection.key(a)]) - rank(store.status[ServerConnection.key(b)])
       if (diff !== 0) return diff
       return (order.get(a) ?? 0) - (order.get(b) ?? 0)
     })
@@ -359,60 +334,39 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
 
   async function refreshHealth() {
     const results: Record<ServerConnection.Key, ServerHealth> = {}
-    const list = untrack(items)
     await Promise.all(
-      list.map(async (conn) => {
+      items().map(async (conn) => {
         results[ServerConnection.key(conn)] = await checkServerHealth(conn.http)
       }),
     )
-    if (disposed) return
     setStore("status", reconcile(results))
   }
 
   createEffect(() => {
-    healthPollKey()
+    items()
     void refreshHealth()
     const interval = setInterval(refreshHealth, 10_000)
     onCleanup(() => clearInterval(interval))
   })
 
-  const wslCheck = (conn: ServerConnection.Any) => {
-    if (!isWslSidecar(conn)) return null
-    return wslState()?.opencodeChecks[conn.distro] ?? null
-  }
-
   async function select(conn: ServerConnection.Any, persist?: boolean) {
-    if (!persist && health(ServerConnection.key(conn))?.healthy === false) return
-    const nextKey = ServerConnection.key(conn)
-    const changed = server.key !== nextKey
-
-    const navigateHome = () => props.onNavigateHome?.()
-
-    const apply = () => {
-      dialog.close()
-      if (persist && conn.type === "http") {
-        server.add(conn)
-        navigateHome()
-        return
-      }
-
-      batch(() => {
-        navigateHome()
-        server.setActive(nextKey)
-      })
-    }
-
-    if (!changed) {
-      await apply()
+    if (!persist && store.status[ServerConnection.key(conn)]?.healthy === false) return
+    dialog.close()
+    if (persist && conn.type === "http") {
+      server.add(conn)
+      navigate("/")
       return
     }
-
-    apply()
+    navigate("/")
+    queueMicrotask(() => server.setActive(ServerConnection.key(conn)))
   }
 
   const handleAddChange = (value: string) => {
     if (addMutation.isPending) return
     setStore("addServer", { url: value, error: "" })
+    void previewStatus(value, store.addServer.username, store.addServer.password, (next) =>
+      setStore("addServer", { status: next }),
+    )
   }
 
   const handleAddNameChange = (value: string) => {
@@ -423,16 +377,25 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
   const handleAddUsernameChange = (value: string) => {
     if (addMutation.isPending) return
     setStore("addServer", { username: value, error: "" })
+    void previewStatus(store.addServer.url, value, store.addServer.password, (next) =>
+      setStore("addServer", { status: next }),
+    )
   }
 
   const handleAddPasswordChange = (value: string) => {
     if (addMutation.isPending) return
     setStore("addServer", { password: value, error: "" })
+    void previewStatus(store.addServer.url, store.addServer.username, value, (next) =>
+      setStore("addServer", { status: next }),
+    )
   }
 
   const handleEditChange = (value: string) => {
     if (editMutation.isPending) return
     setStore("editServer", { value, error: "" })
+    void previewStatus(value, store.editServer.username, store.editServer.password, (next) =>
+      setStore("editServer", { status: next }),
+    )
   }
 
   const handleEditNameChange = (value: string) => {
@@ -443,15 +406,20 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
   const handleEditUsernameChange = (value: string) => {
     if (editMutation.isPending) return
     setStore("editServer", { username: value, error: "" })
+    void previewStatus(store.editServer.value, value, store.editServer.password, (next) =>
+      setStore("editServer", { status: next }),
+    )
   }
 
   const handleEditPasswordChange = (value: string) => {
     if (editMutation.isPending) return
     setStore("editServer", { password: value, error: "" })
+    void previewStatus(store.editServer.value, store.editServer.username, value, (next) =>
+      setStore("editServer", { status: next }),
+    )
   }
 
-  const mode = createMemo<"list" | "add-wsl" | "add" | "edit">(() => {
-    if (store.addWsl.showWizard) return "add-wsl"
+  const mode = createMemo<"list" | "add" | "edit">(() => {
     if (store.editServer.id) return "edit"
     if (store.addServer.showForm) return "add"
     return "list"
@@ -465,11 +433,9 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
   const resetForm = () => {
     resetAdd()
     resetEdit()
-    setStore("addWsl", "showWizard", false)
   }
 
   const startAdd = () => {
-    setStore("addWsl", "showWizard", false)
     resetEdit()
     setStore("addServer", {
       showForm: true,
@@ -478,11 +444,11 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       username: DEFAULT_USERNAME,
       password: "",
       error: "",
+      status: undefined,
     })
   }
 
   const startEdit = (conn: ServerConnection.Http) => {
-    setStore("addWsl", "showWizard", false)
     resetAdd()
     setStore("editServer", {
       id: conn.http.url,
@@ -491,22 +457,10 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       username: conn.http.username ?? "",
       password: conn.http.password ?? "",
       error: "",
+      status: store.status[ServerConnection.key(conn)]?.healthy,
     })
   }
 
-  const startAddWsl = () => {
-    resetAdd()
-    resetEdit()
-    setStore("addWsl", "showWizard", true)
-  }
-
-  const handleAddedWsl = async (distro: string) => {
-    const key = ServerConnection.Key.make(`wsl:${distro}`)
-    setStore("addWsl", "showWizard", false)
-    const conn = items().find((item) => ServerConnection.key(item) === key)
-    if (conn) await select(conn)
-  }
-
   const submitForm = () => {
     if (mode() === "add") {
       if (addMutation.isPending) return
@@ -523,22 +477,14 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
 
   const isFormMode = createMemo(() => mode() !== "list")
   const isAddMode = createMemo(() => mode() === "add")
-  const isAddWslMode = createMemo(() => mode() === "add-wsl")
   const formBusy = createMemo(() => (isAddMode() ? addMutation.isPending : editMutation.isPending))
-  const canAddWsl = createMemo(() => !!platform.wslServers && platform.os === "windows")
 
   const formTitle = createMemo(() => {
     if (!isFormMode()) return language.t("dialog.server.title")
     return (
       <div class="flex items-center gap-2 -ml-2">
         <IconButton icon="arrow-left" variant="ghost" onClick={resetForm} aria-label={language.t("common.goBack")} />
-        <span>
-          {isAddWslMode()
-            ? "Add WSL server"
-            : isAddMode()
-              ? language.t("dialog.server.add.title")
-              : language.t("dialog.server.edit.title")}
-        </span>
+        <span>{isAddMode() ? language.t("dialog.server.add.title") : language.t("dialog.server.edit.title")}</span>
       </div>
     )
   })
@@ -549,107 +495,37 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
     resetEdit()
   })
 
-  async function handleRemove(key: ServerConnection.Key) {
-    server.remove(key)
-    if (defaultServer.defaultKey() === key) await defaultServer.setDefault(null)
+  async function handleRemove(url: ServerConnection.Key) {
+    server.remove(url)
+    if ((await platform.getDefaultServer?.()) === url) {
+      void platform.setDefaultServer?.(null)
+    }
   }
 
   return (
-    <Dialog
-      title={formTitle()}
-      fit={isAddWslMode()}
-      class={isAddWslMode() ? "[&_[data-slot=dialog-body]]:flex-none [&_[data-slot=dialog-body]]:overflow-visible" : undefined}
-    >
-      <div class={isAddWslMode() ? "flex flex-col gap-2" : "flex flex-1 min-h-0 flex-col gap-2"}>
+    <Dialog title={formTitle()}>
+      <div class="flex flex-1 min-h-0 flex-col gap-2">
         <Show
           when={!isFormMode()}
           fallback={
-            <Show
-              when={isAddWslMode()}
-              fallback={
-                <ServerForm
-                  value={isAddMode() ? store.addServer.url : store.editServer.value}
-                  name={isAddMode() ? store.addServer.name : store.editServer.name}
-                  username={isAddMode() ? store.addServer.username : store.editServer.username}
-                  password={isAddMode() ? store.addServer.password : store.editServer.password}
-                  placeholder={language.t("dialog.server.add.placeholder")}
-                  busy={formBusy()}
-                  error={isAddMode() ? store.addServer.error : store.editServer.error}
-                  onChange={isAddMode() ? handleAddChange : handleEditChange}
-                  onNameChange={isAddMode() ? handleAddNameChange : handleEditNameChange}
-                  onUsernameChange={isAddMode() ? handleAddUsernameChange : handleEditUsernameChange}
-                  onPasswordChange={isAddMode() ? handleAddPasswordChange : handleEditPasswordChange}
-                  onSubmit={submitForm}
-                  onBack={resetForm}
-                />
-              }
-            >
-              <DialogWslServer onAdded={handleAddedWsl} />
-            </Show>
+            <ServerForm
+              value={isAddMode() ? store.addServer.url : store.editServer.value}
+              name={isAddMode() ? store.addServer.name : store.editServer.name}
+              username={isAddMode() ? store.addServer.username : store.editServer.username}
+              password={isAddMode() ? store.addServer.password : store.editServer.password}
+              placeholder={language.t("dialog.server.add.placeholder")}
+              busy={formBusy()}
+              error={isAddMode() ? store.addServer.error : store.editServer.error}
+              status={isAddMode() ? store.addServer.status : store.editServer.status}
+              onChange={isAddMode() ? handleAddChange : handleEditChange}
+              onNameChange={isAddMode() ? handleAddNameChange : handleEditNameChange}
+              onUsernameChange={isAddMode() ? handleAddUsernameChange : handleEditUsernameChange}
+              onPasswordChange={isAddMode() ? handleAddPasswordChange : handleEditPasswordChange}
+              onSubmit={submitForm}
+              onBack={resetForm}
+            />
           }
         >
-          <Show when={nonReadyWslServers().length > 0}>
-            <div class="px-5">
-              <div class="bg-surface-base rounded-md overflow-hidden">
-                <For each={nonReadyWslServers()}>
-                  {(item) => {
-                    const key = ServerConnection.Key.make(item.config.id)
-                    const retryable = () => canRetryWslRuntime(item.runtime.kind)
-                    return (
-                      <div class="min-h-14 p-3 flex items-center gap-3 border-b border-border-weak-base last:border-b-0">
-                        <div
-                          classList={{
-                            "size-1.5 rounded-full shrink-0": true,
-                            "bg-icon-critical-base": item.runtime.kind === "failed",
-                            "bg-border-weak-base": item.runtime.kind !== "failed",
-                          }}
-                        />
-                        <div class="flex items-center gap-2 min-w-0 flex-1">
-                          <span class="text-14-medium text-text-base truncate">{item.config.distro}</span>
-                          <span class="text-11-regular text-text-weak border border-border-weak-base bg-surface-base px-1.5 py-0.5 rounded-md shrink-0">
-                            WSL
-                          </span>
-                          <span class="text-12-regular text-text-weak truncate">
-                            {wslRuntimeLabel(item.runtime.kind)}
-                          </span>
-                        </div>
-                        <DropdownMenu>
-                          <DropdownMenu.Trigger
-                            as={IconButton}
-                            icon="dot-grid"
-                            variant="ghost"
-                            class="shrink-0 size-8 hover:bg-surface-base-hover data-[expanded]:bg-surface-base-active"
-                            onClick={(e: MouseEvent) => e.stopPropagation()}
-                            onPointerDown={(e: PointerEvent) => e.stopPropagation()}
-                          />
-                          <DropdownMenu.Portal>
-                            <DropdownMenu.Content class="mt-1">
-                              <Show when={retryable()}>
-                                <DropdownMenu.Item onSelect={() => retryWslMutation.mutate(key)}>
-                                  <DropdownMenu.ItemLabel>Retry start</DropdownMenu.ItemLabel>
-                                </DropdownMenu.Item>
-                              </Show>
-                              <Show when={retryable()}>
-                                <DropdownMenu.Separator />
-                              </Show>
-                              <DropdownMenu.Item
-                                onSelect={() => removeWslMutation.mutate(key)}
-                                class="text-text-on-critical-base hover:bg-surface-critical-weak"
-                              >
-                                <DropdownMenu.ItemLabel>
-                                  {language.t("dialog.server.menu.delete")}
-                                </DropdownMenu.ItemLabel>
-                              </DropdownMenu.Item>
-                            </DropdownMenu.Content>
-                          </DropdownMenu.Portal>
-                        </DropdownMenu>
-                      </div>
-                    )
-                  }}
-                </For>
-              </div>
-            </div>
-          </Show>
           <List
             search={{
               placeholder: language.t("dialog.server.search.placeholder"),
@@ -658,7 +534,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
             noInitialSelection
             emptyMessage={language.t("dialog.server.empty")}
             items={sortedItems}
-            key={(x) => ServerConnection.key(x)}
+            key={(x) => x.http.url}
             onSelect={(x) => {
               if (x) void select(x)
             }}
@@ -667,35 +543,18 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
           >
             {(i) => {
               const key = ServerConnection.key(i)
-              const wsl = isWslSidecar(i)
-              const wslDistro = wsl ? i.distro : undefined
-              const blocked = () => health(key)?.healthy === false
-              const canChangeDefault = () => defaultServer.canDefault() && i.type === "http"
-              const canRemove = () => i.type === "http" || wsl
-              const opencodeAction = () => {
-                const check = wslCheck(i)
-                if (!check) return null
-                if (!check.resolvedPath) return "Install OpenCode"
-                if (check.matchesDesktop === false) return "Update OpenCode"
-                return null
-              }
-              const updating = () => {
-                const job = wslState()?.job
-                return job?.kind === "install-opencode" && job.distro === wslDistro
-              }
               return (
                 <div class="flex items-center gap-3 min-w-0 flex-1 w-full group/item">
                   <div class="flex flex-col h-full items-start w-5">
-                    <ServerHealthIndicator health={health(key)} />
+                    <ServerHealthIndicator health={store.status[key]} />
                   </div>
                   <ServerRow
                     conn={i}
-                    dimmed={blocked()}
-                    status={health(key)}
-                    version={wslCheck(i)?.version ?? undefined}
+                    dimmed={store.status[key]?.healthy === false}
+                    status={store.status[key]}
                     class="flex items-center gap-3 min-w-0 flex-1"
                     badge={
-                      <Show when={defaultServer.defaultKey() === ServerConnection.key(i)}>
+                      <Show when={defaultKey() === ServerConnection.key(i)}>
                         <span class="text-text-base bg-surface-base text-14-regular px-1.5 rounded-xs">
                           {language.t("dialog.server.status.default")}
                         </span>
@@ -703,29 +562,12 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
                     }
                     showCredentials
                   />
-                  <div class="flex items-center justify-center gap-3 pl-4">
-                    <Show when={wsl && opencodeAction()}>
-                      {(label) => (
-                        <Button
-                          variant="secondary"
-                          size="small"
-                          disabled={!!wslState()?.job}
-                          class="shrink-0"
-                          onPointerDown={(e: PointerEvent) => e.stopPropagation()}
-                          onClick={(e: MouseEvent) => {
-                            e.stopPropagation()
-                            if (wslDistro) updateWslMutation.mutate(wslDistro)
-                          }}
-                        >
-                          {updating() ? "Updating OpenCode..." : label()}
-                        </Button>
-                      )}
-                    </Show>
+                  <div class="flex items-center justify-center gap-4 pl-4">
                     <Show when={ServerConnection.key(current()) === key}>
                       <Icon name="check" class="h-6" />
                     </Show>
 
-                    <Show when={i.type === "http" || i.type === "sidecar"}>
+                    <Show when={i.type === "http"}>
                       <DropdownMenu>
                         <DropdownMenu.Trigger
                           as={IconButton}
@@ -737,54 +579,35 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
                         />
                         <DropdownMenu.Portal>
                           <DropdownMenu.Content class="mt-1">
-                            <Show when={i.type === "http"}>
-                              <DropdownMenu.Item
-                                onSelect={() => {
-                                  if (i.type !== "http") return
-                                  startEdit(i)
-                                }}
-                              >
-                                <DropdownMenu.ItemLabel>{language.t("dialog.server.menu.edit")}</DropdownMenu.ItemLabel>
-                              </DropdownMenu.Item>
-                            </Show>
-                            <Show when={wsl && canRetryWsl(i)}>
-                              <DropdownMenu.Item onSelect={() => retryWslMutation.mutate(key)}>
-                                <DropdownMenu.ItemLabel>Retry start</DropdownMenu.ItemLabel>
-                              </DropdownMenu.Item>
-                            </Show>
-                            <Show when={canChangeDefault() && defaultServer.defaultKey() !== key}>
-                              <DropdownMenu.Item onSelect={() => void defaultServer.setDefault(key)}>
+                            <DropdownMenu.Item
+                              onSelect={() => {
+                                if (i.type !== "http") return
+                                startEdit(i)
+                              }}
+                            >
+                              <DropdownMenu.ItemLabel>{language.t("dialog.server.menu.edit")}</DropdownMenu.ItemLabel>
+                            </DropdownMenu.Item>
+                            <Show when={canDefault() && defaultKey() !== key}>
+                              <DropdownMenu.Item onSelect={() => setDefault(key)}>
                                 <DropdownMenu.ItemLabel>
                                   {language.t("dialog.server.menu.default")}
                                 </DropdownMenu.ItemLabel>
                               </DropdownMenu.Item>
                             </Show>
-                            <Show when={canChangeDefault() && defaultServer.defaultKey() === key}>
-                              <DropdownMenu.Item onSelect={() => void defaultServer.setDefault(null)}>
+                            <Show when={canDefault() && defaultKey() === key}>
+                              <DropdownMenu.Item onSelect={() => setDefault(null)}>
                                 <DropdownMenu.ItemLabel>
                                   {language.t("dialog.server.menu.defaultRemove")}
                                 </DropdownMenu.ItemLabel>
                               </DropdownMenu.Item>
                             </Show>
-                            <Show when={canRemove() && (i.type === "http" || canChangeDefault() || canRetryWsl(i))}>
-                              <DropdownMenu.Separator />
-                            </Show>
-                            <Show when={canRemove()}>
-                              <DropdownMenu.Item
-                                onSelect={() => {
-                                  if (wsl) {
-                                    removeWslMutation.mutate(key)
-                                    return
-                                  }
-                                  void handleRemove(key)
-                                }}
-                                class="text-text-on-critical-base hover:bg-surface-critical-weak"
-                              >
-                                <DropdownMenu.ItemLabel>
-                                  {language.t("dialog.server.menu.delete")}
-                                </DropdownMenu.ItemLabel>
-                              </DropdownMenu.Item>
-                            </Show>
+                            <DropdownMenu.Separator />
+                            <DropdownMenu.Item
+                              onSelect={() => handleRemove(ServerConnection.key(i))}
+                              class="text-text-on-critical-base hover:bg-surface-critical-weak"
+                            >
+                              <DropdownMenu.ItemLabel>{language.t("dialog.server.menu.delete")}</DropdownMenu.ItemLabel>
+                            </DropdownMenu.Item>
                           </DropdownMenu.Content>
                         </DropdownMenu.Portal>
                       </DropdownMenu>
@@ -798,32 +621,17 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
 
         <div class="shrink-0 px-5 pb-5">
           <Show
-            when={!isAddWslMode() && isFormMode()}
+            when={isFormMode()}
             fallback={
-              <Show when={!isAddWslMode()}>
-                <div class="flex items-center gap-2">
-                  <Button
-                    variant="secondary"
-                    icon="plus-small"
-                    size="large"
-                    onClick={startAdd}
-                    class="py-1.5 pl-1.5 pr-3 flex items-center gap-1.5"
-                  >
-                    {language.t("dialog.server.add.button")}
-                  </Button>
-                  <Show when={canAddWsl()}>
-                    <Button
-                      variant="secondary"
-                      icon="plus-small"
-                      size="large"
-                      onClick={startAddWsl}
-                      class="py-1.5 pl-1.5 pr-3 flex items-center gap-1.5"
-                    >
-                      Add WSL
-                    </Button>
-                  </Show>
-                </div>
-              </Show>
+              <Button
+                variant="secondary"
+                icon="plus-small"
+                size="large"
+                onClick={startAdd}
+                class="py-1.5 pl-1.5 pr-3 flex items-center gap-1.5"
+              >
+                {language.t("dialog.server.add.button")}
+              </Button>
             }
           >
             <Button variant="primary" size="large" onClick={submitForm} disabled={formBusy()} class="px-3 py-1.5">

packages/app/src/components/dialog-wsl-server.tsx

@@ -1,575 +0,0 @@
-import { Button } from "@opencode-ai/ui/button"
-import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { Spinner } from "@opencode-ai/ui/spinner"
-import { showToast } from "@opencode-ai/ui/toast"
-import { createEffect, createMemo, For, Match, onCleanup, Show, Switch } from "solid-js"
-import { createStore } from "solid-js/store"
-import { useLanguage } from "@/context/language"
-import { usePlatform } from "@/context/platform"
-import { useWslServers } from "@/context/wsl-servers"
-
-type WslServerStep = "wsl" | "distro" | "opencode"
-
-const STEPS: WslServerStep[] = ["wsl", "distro", "opencode"]
-
-function isHiddenDistro(name: string) {
-  return /^docker-desktop(?:-data)?$/i.test(name)
-}
-
-interface DialogWslServerProps {
-  onAdded?: (distro: string) => void | Promise<void>
-}
-
-export function DialogWslServer(props: DialogWslServerProps = {}) {
-  const language = useLanguage()
-  const platform = usePlatform()
-  const dialog = useDialog()
-  const wslServers = useWslServers()
-  const api = platform.wslServers!
-  const [store, setStore] = createStore({
-    step: undefined as WslServerStep | undefined,
-    selectedDistro: null as string | null,
-    installTarget: undefined as string | undefined,
-    adding: false,
-  })
-  const current = () => wslServers.data
-  let disposed = false
-  onCleanup(() => {
-    disposed = true
-  })
-  const busy = createMemo(() => !!current()?.job || store.adding)
-  const selectedProbe = createMemo(() => {
-    const distro = store.selectedDistro
-    if (!distro) return null
-    return current()?.distroProbes[distro] ?? null
-  })
-  const selectedInstalled = createMemo(() => {
-    const distro = store.selectedDistro
-    if (!distro) return null
-    return (current()?.installed ?? []).find((item) => item.name === distro) ?? null
-  })
-  const visibleInstalledDistros = createMemo(() =>
-    (current()?.installed ?? []).filter((item) => !isHiddenDistro(item.name)),
-  )
-  const visibleOnlineDistros = createMemo(() => (current()?.online ?? []).filter((item) => !isHiddenDistro(item.name)))
-  const defaultInstalledDistro = createMemo(() => visibleInstalledDistros().find((item) => item.isDefault) ?? null)
-  const opencodeCheck = createMemo(() => {
-    const distro = store.selectedDistro
-    if (!distro) return null
-    return current()?.opencodeChecks[distro] ?? null
-  })
-  const distroWarningProbe = createMemo(() => {
-    const probe = selectedProbe()
-    if (!probe) return null
-    if (distroReady()) return null
-    return probe
-  })
-  const distroUnavailableMessage = createMemo(() => {
-    const probe = distroWarningProbe()
-    const distro = store.selectedDistro
-    if (!probe || probe.canExecute || !distro) return null
-    if (!selectedInstalled()) return `${distro} is not installed yet.`
-    return `Open ${distro} once to finish setup.`
-  })
-  const distroMissingTools = createMemo(() => {
-    const probe = distroWarningProbe()
-    if (!probe?.canExecute) return null
-    if (probe.hasBash && probe.hasCurl) return null
-    return probe
-  })
-  const existingServerDistros = createMemo(() => new Set((current()?.servers ?? []).map((item) => item.config.distro)))
-  const addableInstalledDistros = createMemo(() => {
-    return visibleInstalledDistros().filter((item) => !existingServerDistros().has(item.name))
-  })
-  const installableDistros = createMemo(() => {
-    const online = visibleOnlineDistros()
-    const installed = new Set(visibleInstalledDistros().map((item) => item.name))
-    const hasVersionedUbuntu = online.some((item) => /^Ubuntu-\d/.test(item.name))
-    return online
-      .filter((item) => !installed.has(item.name))
-      .filter((item) => !(item.name === "Ubuntu" && hasVersionedUbuntu))
-  })
-  const installTarget = createMemo(() => installableDistros().find((item) => item.name === store.installTarget) ?? null)
-  const installingDistro = createMemo(() => current()?.job?.kind === "install-distro")
-  const wslReady = createMemo(() => !!current()?.runtime?.available && !current()?.pendingRestart)
-  const distroReady = createMemo(() => {
-    const probe = selectedProbe()
-    if (!probe || !store.selectedDistro) return false
-    if (selectedInstalled()?.version === 1) return false
-    return probe.canExecute && probe.hasBash && probe.hasCurl
-  })
-  const opencodeReady = createMemo(() => {
-    const check = opencodeCheck()
-    return !!check?.resolvedPath && !check.error
-  })
-  const allReady = createMemo(() => wslReady() && distroReady() && opencodeReady())
-  const addDisabled = createMemo(() => {
-    const job = current()?.job
-    if (!job) return store.adding
-    return store.adding || job.kind !== "probe-opencode"
-  })
-  const recommendedStep = createMemo<WslServerStep>(() => {
-    if (!wslReady()) return "wsl"
-    if (!distroReady()) return "distro"
-    return "opencode"
-  })
-  // activeStep falls back to recommendedStep when the user hasn't picked one.
-  // Once the user clicks a step tab we respect their choice rather than snapping
-  // them back when a probe result updates recommendedStep.
-  const activeStep = createMemo(() => store.step ?? recommendedStep())
-
-  const autoProbe = createMemo(() => {
-    const state = current()
-    if (!state || busy()) return null
-    if (state.pendingRestart) return null
-    if (!state.runtime) return { key: "runtime", run: () => api.probeRuntime() }
-    if (!wslReady()) return null
-    if (!state.installed.length && !state.online.length) {
-      return { key: "distros", run: () => api.refreshDistros() }
-    }
-    const distro = store.selectedDistro
-    if (distro && !state.distroProbes[distro]) {
-      return { key: `probe-distro:${distro}`, run: () => api.probeDistro(distro) }
-    }
-    if (!distro || !distroReady()) return null
-    if (!state.opencodeChecks[distro]) {
-      return { key: `probe-opencode:${distro}`, run: () => api.probeOpencode(distro) }
-    }
-    return null
-  })
-
-  let lastAutoProbe: string | null = null
-  createEffect(() => {
-    const probe = autoProbe()
-    if (!probe || probe.key === lastAutoProbe) return
-    const key = probe.key
-    lastAutoProbe = key
-    void (async () => {
-      try {
-        await probe.run()
-      } catch (err) {
-        if (disposed) return
-        // Allow the same probe to run again when reactive inputs next change
-        // (e.g. user reselects a distro). Without this the user would be stuck
-        // on a transient wsl.exe failure until they pick a different distro.
-        if (lastAutoProbe === key) lastAutoProbe = null
-        requestError(language, err)
-      }
-    })()
-  })
-
-  createEffect(() => {
-    const state = current()
-    const distro = defaultInstalledDistro()
-    if (!state || !distro || busy()) return
-    if (store.selectedDistro) return
-    if (existingServerDistros().has(distro.name)) return
-    setStore("selectedDistro", distro.name)
-  })
-
-  createEffect(() => {
-    const distros = installableDistros()
-    if (!distros.length) {
-      if (store.installTarget) setStore("installTarget", undefined)
-      return
-    }
-    if (store.installTarget && distros.some((item) => item.name === store.installTarget)) return
-    setStore("installTarget", distros[0]!.name)
-  })
-
-  const wslMessage = createMemo(() => {
-    const state = current()
-    if (!state || state.job?.kind === "runtime") return "Checking WSL..."
-    if (state.pendingRestart) return "Windows needs a restart to finish installing WSL."
-    if (state.runtime?.available) return state.runtime.version ?? "WSL is ready."
-    return state.runtime?.error ?? "WSL is required to continue."
-  })
-
-  const distroMessage = createMemo(() => {
-    const state = current()
-    if (!state) return "Checking distros..."
-    const distro = store.selectedDistro
-    if (state.job?.kind === "install-distro") return `Installing ${state.job.distro}...`
-    if (state.job?.kind === "probe-distro") return `Checking ${state.job.distro}...`
-    if (state.job?.kind === "distros") return "Listing distros..."
-    if (distroUnavailableMessage()) return distroUnavailableMessage()!
-    if (selectedProbe() && distroReady()) return `${selectedProbe()!.name} is ready.`
-    if (distro) return `Finishing setup for ${distro}.`
-    return "Pick a distro or install one below."
-  })
-
-  const opencodeMessage = createMemo(() => {
-    const state = current()
-    if (!state) return "Checking OpenCode..."
-    const distro = store.selectedDistro
-    if (state.job?.kind === "probe-opencode" || state.job?.kind === "install-opencode") {
-      return distro ? `Checking OpenCode in ${distro}...` : "Checking OpenCode..."
-    }
-    if (opencodeCheck()?.error) return opencodeCheck()!.error
-    if (opencodeCheck()?.matchesDesktop === false) {
-      return distro ? `Update OpenCode in ${distro}.` : "Update OpenCode."
-    }
-    if (opencodeReady()) return distro ? `OpenCode is ready in ${distro}.` : "OpenCode is ready."
-    return distro ? `Install OpenCode in ${distro}.` : "Choose a distro first."
-  })
-
-  const run = async (action: () => Promise<unknown>) => {
-    try {
-      await action()
-    } catch (err) {
-      requestError(language, err)
-    }
-  }
-
-  const runSelectedDistro = (action: (distro: string) => Promise<unknown>) => {
-    const distro = store.selectedDistro
-    if (!distro) return
-    void run(() => action(distro))
-  }
-
-  const selectDistro = (name: string) => {
-    setStore("selectedDistro", name)
-    setStore("step", undefined)
-  }
-
-  const finish = async () => {
-    const distro = store.selectedDistro
-    if (!distro) return
-    setStore("adding", true)
-    try {
-      await api.addServer(distro)
-      if (props.onAdded) {
-        await props.onAdded(distro)
-      } else {
-        dialog.close()
-      }
-    } catch (err) {
-      requestError(language, err)
-    } finally {
-      setStore("adding", false)
-    }
-  }
-
-  const steps = createMemo(() => {
-    const active = activeStep()
-    const activeIndex = STEPS.indexOf(active)
-    const recommendedIndex = STEPS.indexOf(recommendedStep())
-    return STEPS.map((step) => {
-      const index = STEPS.indexOf(step)
-      return {
-        step,
-        title: step === "wsl" ? "WSL" : step === "distro" ? "Choose distro" : "OpenCode",
-        state:
-          active === step
-            ? "current"
-            : step === "wsl"
-              ? wslReady()
-                ? "done"
-                : "warning"
-              : step === "distro"
-                ? distroReady()
-                  ? "done"
-                  : index > activeIndex
-                    ? "locked"
-                    : "warning"
-                : opencodeCheck()?.matchesDesktop === false
-                  ? "warning"
-                  : opencodeReady()
-                    ? "done"
-                    : index > activeIndex
-                      ? "locked"
-                      : "warning",
-        locked: index > recommendedIndex,
-      }
-    })
-  })
-  const loadError = createMemo(() => {
-    const error = wslServers.error
-    if (!error) return "Failed to load WSL state."
-    return error instanceof Error ? error.message : String(error)
-  })
-
-  return (
-    <div class="px-5 pb-5 flex flex-col gap-4">
-      <Show when={!wslServers.isPending} fallback={<div class="px-1 py-6 text-14-regular text-text-weak">Loading...</div>}>
-        <Show when={!wslServers.isError} fallback={<div class="px-1 py-6 text-14-regular text-text-weak">{loadError()}</div>}>
-          <div class="flex gap-2 pb-1">
-            <For each={steps()}>
-              {(item) => (
-                <button
-                  type="button"
-                  class="basis-0 flex-1 min-w-0 rounded-md border px-3 py-2 text-left transition-colors"
-                  classList={{
-                    "border-border-strong-base bg-surface-base-hover": item.state === "current",
-                    "border-icon-success-base/40 bg-surface-base": item.state === "done",
-                    "border-border-weak-base bg-background-base opacity-60": item.state === "locked",
-                    "border-icon-warning-base/40 bg-surface-base": item.state === "warning",
-                  }}
-                  disabled={item.locked}
-                  onClick={() => setStore("step", item.step)}
-                >
-                  <div class="text-13-medium text-text-strong">{item.title}</div>
-                </button>
-              )}
-            </For>
-          </div>
-
-          <Switch>
-          <Match when={activeStep() === "wsl"}>
-            <div class="rounded-md bg-surface-base p-4 flex flex-col gap-3">
-              <div class="flex items-center justify-between gap-3">
-                <div class="text-14-medium text-text-strong">WSL</div>
-                <Show when={current()?.runtime && !wslReady() && !current()?.pendingRestart}>
-                  <Button
-                    variant="secondary"
-                    size="large"
-                    disabled={busy()}
-                    onClick={() => void run(() => api.installWsl())}
-                  >
-                    Install WSL
-                  </Button>
-                </Show>
-              </div>
-              <div class="text-12-regular text-text-weak whitespace-pre-wrap break-words">{wslMessage()}</div>
-              <Show when={current()?.pendingRestart}>
-                <div class="rounded-md border border-border-weak-base px-3 py-3 flex items-center justify-between gap-3">
-                  <div class="text-12-regular text-text-warning-base">Windows restart required.</div>
-                  <Button variant="secondary" size="large" onClick={() => void platform.restart()}>
-                    Relaunch OpenCode
-                  </Button>
-                </div>
-              </Show>
-              <div class="flex items-center justify-end">
-                <Button variant="secondary" size="large" disabled={busy() || !wslReady()} onClick={() => setStore("step", "distro")}>
-                  Next
-                </Button>
-              </div>
-            </div>
-          </Match>
-
-          <Match when={activeStep() === "distro"}>
-            <div class="rounded-md bg-surface-base p-4 flex flex-col gap-3">
-              <div class="flex items-center justify-between gap-3">
-                <div class="text-14-medium text-text-strong">Choose a distro</div>
-                <Show when={store.selectedDistro}>
-                  <Button
-                    variant="ghost"
-                    size="small"
-                    disabled={busy()}
-                    onClick={() => runSelectedDistro((distro) => api.probeDistro(distro))}
-                  >
-                    Refresh
-                  </Button>
-                </Show>
-              </div>
-              <div class="text-12-regular text-text-weak whitespace-pre-wrap break-words">{distroMessage()}</div>
-
-              <div class="flex flex-col gap-2">
-                <Show
-                  when={addableInstalledDistros().length > 0}
-                  fallback={
-                    <div class="text-12-regular text-text-weak">
-                      {visibleInstalledDistros().length
-                        ? "All installed distros are already added."
-                        : current()?.runtime?.available
-                          ? "No distros detected yet."
-                          : "Checking distros..."}
-                    </div>
-                  }
-                >
-                  <For each={addableInstalledDistros()}>
-                    {(item) => (
-                      <button
-                        type="button"
-                        class="rounded-md border border-border-weak-base px-3 py-2 text-left transition-colors"
-                        classList={{ "bg-surface-raised-base": store.selectedDistro === item.name }}
-                        onClick={() => selectDistro(item.name)}
-                      >
-                        <div class="text-13-medium text-text-strong">{item.name}</div>
-                        <Show when={item.isDefault}>
-                          <div class="text-12-regular text-text-weak">Default</div>
-                        </Show>
-                      </button>
-                    )}
-                  </For>
-                </Show>
-              </div>
-
-              <Show when={installableDistros().length > 0}>
-                <div class="rounded-md border border-border-weak-base p-2 flex flex-col gap-2">
-                  <div class="px-1 flex items-center justify-between gap-3">
-                    <div class="text-12-medium text-text-weak">Install</div>
-                    <div class="flex items-center gap-2 shrink-0">
-                      <Show when={installingDistro()}>
-                        <Spinner class="h-4 w-4 text-icon-info-base shrink-0" />
-                      </Show>
-                      <Button
-                        variant="secondary"
-                        size="small"
-                        disabled={busy() || !installTarget()}
-                        onClick={() => void run(() => api.installDistro(installTarget()!.name))}
-                      >
-                        {installingDistro() ? "Installing..." : "Install"}
-                      </Button>
-                    </div>
-                  </div>
-                  <div
-                    role="radiogroup"
-                    aria-label="Install distro"
-                    class="max-h-52 overflow-y-auto rounded-md bg-background-base"
-                  >
-                    <For each={installableDistros()}>
-                      {(item) => {
-                        const selected = () => store.installTarget === item.name
-                        return (
-                          <button
-                            type="button"
-                            role="radio"
-                            aria-checked={selected()}
-                            disabled={busy()}
-                            class="w-full px-3 py-2 flex items-center gap-3 text-left border-b border-border-weak-base last:border-b-0 transition-colors"
-                            classList={{
-                              "bg-surface-raised-base": selected(),
-                              "hover:bg-surface-base": !selected(),
-                            }}
-                            onClick={() => setStore("installTarget", item.name)}
-                          >
-                            <div
-                              class="mt-0.5 h-4 w-4 rounded-full border border-border-strong-base flex items-center justify-center shrink-0"
-                              classList={{ "border-text-strong": selected() }}
-                            >
-                              <div class="h-2 w-2 rounded-full bg-text-strong" classList={{ hidden: !selected() }} />
-                            </div>
-                            <div class="min-w-0 flex-1 text-13-medium text-text-strong truncate">{item.label}</div>
-                          </button>
-                        )
-                      }}
-                    </For>
-                  </div>
-                </div>
-              </Show>
-
-              <Show
-                when={
-                  selectedInstalled()?.version === 1 ||
-                  distroUnavailableMessage() ||
-                  distroMissingTools()
-                }
-              >
-                <div class="rounded-md border border-border-weak-base px-3 py-3 flex flex-col gap-1">
-                  <Show when={selectedInstalled()?.version === 1}>
-                    <div class="text-12-regular text-text-warning-base">WSL 2 is required.</div>
-                  </Show>
-                  <Show when={distroUnavailableMessage()}>
-                    {(message) => <div class="text-12-regular text-text-warning-base">{message()}</div>}
-                  </Show>
-                  <Show when={distroMissingTools()}>
-                    <div class="text-12-regular text-text-warning-base">This distro needs bash and curl.</div>
-                  </Show>
-                </div>
-              </Show>
-
-              <div class="flex items-center gap-2">
-                <Button
-                  variant="secondary"
-                  size="large"
-                  disabled={busy() || !selectedInstalled()}
-                  onClick={() => runSelectedDistro((distro) => api.openTerminal(distro))}
-                >
-                  Open terminal
-                </Button>
-                <Button
-                  variant="ghost"
-                  size="large"
-                  disabled={busy() || !store.selectedDistro}
-                  onClick={() => runSelectedDistro((distro) => api.probeDistro(distro))}
-                >
-                  Refresh
-                </Button>
-              </div>
-
-              <div class="flex items-center justify-end">
-                <Button
-                  variant="secondary"
-                  size="large"
-                  disabled={busy() || !store.selectedDistro || !distroReady()}
-                  onClick={() => setStore("step", "opencode")}
-                >
-                  Next
-                </Button>
-              </div>
-            </div>
-          </Match>
-
-          <Match when={activeStep() === "opencode"}>
-            <div class="rounded-md bg-surface-base p-4 flex flex-col gap-3">
-              <div class="flex items-center justify-between gap-3">
-                <div class="text-14-medium text-text-strong">OpenCode</div>
-                <div class="flex items-center gap-2">
-                  <Show when={store.selectedDistro}>
-                    <Button
-                      variant="ghost"
-                      size="large"
-                      disabled={busy()}
-                      onClick={() => runSelectedDistro((distro) => api.probeOpencode(distro))}
-                    >
-                      Refresh
-                    </Button>
-                  </Show>
-                  <Show when={!opencodeReady() || opencodeCheck()?.matchesDesktop === false}>
-                    <Button
-                      variant="secondary"
-                      size="large"
-                      disabled={busy()}
-                      onClick={() => runSelectedDistro((distro) => api.installOpencode(distro))}
-                    >
-                      {opencodeCheck()?.resolvedPath ? "Update OpenCode" : "Install OpenCode"}
-                    </Button>
-                  </Show>
-                </div>
-              </div>
-              <div class="text-12-regular text-text-weak whitespace-pre-wrap break-words">{opencodeMessage()}</div>
-              <Show when={opencodeCheck()?.matchesDesktop === false ? opencodeCheck() : null}>
-                {(check) => (
-                  <div class="rounded-md border border-border-weak-base px-3 py-3 flex flex-col gap-1">
-                    <div class="text-12-regular text-text-weak">Path: {check().resolvedPath ?? "not found"}</div>
-                    <div class="text-12-regular text-text-weak">
-                      Version: {check().version ?? "unknown"}
-                      <Show when={check().expectedVersion}>
-                        {(expected) => <span>{` · desktop ${expected()}`}</span>}
-                      </Show>
-                    </div>
-                    <div class="text-12-regular text-text-warning-base">
-                      Installed version does not match the desktop app version.
-                    </div>
-                  </div>
-                )}
-              </Show>
-            </div>
-          </Match>
-          </Switch>
-
-          <Show when={activeStep() === "opencode" && allReady() && store.selectedDistro}>
-            <div class="flex items-center justify-end gap-2">
-              <Button variant="ghost" size="large" disabled={store.adding} onClick={() => dialog.close()}>
-                Cancel
-              </Button>
-              <Button variant="primary" size="large" disabled={addDisabled()} onClick={() => void finish()}>
-                {store.adding ? "Adding..." : "Add WSL server"}
-              </Button>
-            </div>
-          </Show>
-        </Show>
-      </Show>
-    </div>
-  )
-}
-
-function requestError(language: ReturnType<typeof useLanguage>, err: unknown) {
-  console.error("WSL servers request failed", err instanceof Error ? (err.stack ?? err.message) : String(err))
-  showToast({
-    variant: "error",
-    title: language.t("common.requestFailed"),
-    description: err instanceof Error ? err.message : String(err),
-  })
-}

packages/app/src/components/server/server-row.tsx

@@ -17,7 +17,6 @@ import type { ServerHealth } from "@/utils/server-health"
 interface ServerRowProps extends ParentProps {
   conn: ServerConnection.Any
   status?: ServerHealth
-  version?: string
   class?: string
   nameClass?: string
   versionClass?: string
@@ -32,8 +31,6 @@ export function ServerRow(props: ServerRowProps) {
   let nameRef: HTMLSpanElement | undefined
   let versionRef: HTMLSpanElement | undefined
   const name = createMemo(() => serverName(props.conn))
-  const isWsl = createMemo(() => props.conn.type === "sidecar" && props.conn.variant === "wsl")
-  const version = createMemo(() => props.version ?? props.status?.version)
 
   const check = () => {
     const nameTruncated = nameRef ? nameRef.scrollWidth > nameRef.clientWidth : false
@@ -44,7 +41,7 @@ export function ServerRow(props: ServerRowProps) {
   createEffect(() => {
     name()
     props.conn.http.url
-    version()
+    props.status?.version
     queueMicrotask(check)
   })
 
@@ -57,11 +54,8 @@ export function ServerRow(props: ServerRowProps) {
   const tooltipValue = () => (
     <span class="flex items-center gap-2">
       <span>{serverName(props.conn, true)}</span>
-      <Show when={isWsl()}>
-        <span class="text-text-invert-weak">WSL</span>
-      </Show>
-      <Show when={version()}>
-        <span class="text-text-invert-weak">v{version()}</span>
+      <Show when={props.status?.version}>
+        <span class="text-text-invert-weak">v{props.status?.version}</span>
       </Show>
     </span>
   )
@@ -82,20 +76,15 @@ export function ServerRow(props: ServerRowProps) {
             <span ref={nameRef} class={`${props.nameClass ?? "truncate"} min-w-0`}>
               {name()}
             </span>
-            <Show when={isWsl()}>
-              <span class="text-11-regular text-text-weak border border-border-weak-base bg-surface-base px-1.5 py-0.5 rounded-md shrink-0">
-                WSL
-              </span>
-            </Show>
             <Show
               when={badge()}
               fallback={
-                <Show when={version()}>
+                <Show when={props.status?.version}>
                   <span
                     ref={versionRef}
                     class={`${props.versionClass ?? "text-text-weak text-14-regular truncate"} min-w-0`}
                   >
-                    v{version()}
+                    v{props.status?.version}
                   </span>
                 </Show>
               }

packages/app/src/components/status-popover-body.tsx

@@ -5,7 +5,7 @@ import { Switch } from "@opencode-ai/ui/switch"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { useMutation, useQueryClient } from "@tanstack/solid-query"
 import { showToast } from "@opencode-ai/ui/toast"
-import { useLocation, useNavigate } from "@solidjs/router"
+import { useNavigate } from "@solidjs/router"
 import { type Accessor, createEffect, createMemo, For, type JSXElement, onCleanup, Show } from "solid-js"
 import { createStore, reconcile } from "solid-js/store"
 import { ServerHealthIndicator, ServerRow } from "@/components/server/server-row"
@@ -156,14 +156,13 @@ const useMcpToggleMutation = () => {
   }))
 }
 
-export function StatusPopoverBody(props: { shown: Accessor<boolean>; close?: () => void }) {
+export function StatusPopoverBody(props: { shown: Accessor<boolean> }) {
   const sync = useSync()
   const server = useServer()
   const platform = usePlatform()
   const dialog = useDialog()
   const language = useLanguage()
   const navigate = useNavigate()
-  const location = useLocation()
 
   const fail = (err: unknown) => {
     showToast({
@@ -252,16 +251,8 @@ export function StatusPopoverBody(props: { shown: Accessor<boolean>; close?: ()
                       aria-disabled={blocked()}
                       onClick={() => {
                         if (blocked()) return
-                        props.close?.()
                         navigate("/")
-                        const activate = () => {
-                          if (location.pathname !== "/") {
-                            setTimeout(activate, 16)
-                            return
-                          }
-                          setTimeout(() => server.setActive(key), 0)
-                        }
-                        setTimeout(activate, 0)
+                        queueMicrotask(() => server.setActive(key))
                       }}
                     >
                       <ServerHealthIndicator health={health[key]} />

packages/app/src/components/status-popover.tsx

@@ -58,7 +58,7 @@ export function StatusPopover() {
             <div class="w-[360px] h-14 rounded-xl bg-background-strong shadow-[var(--shadow-lg-border-base)]" />
           }
         >
-          <Body shown={shown} close={() => setShown(false)} />
+          <Body shown={shown} />
         </Suspense>
       </Show>
     </Popover>

packages/app/src/context/global-sync.tsx

@@ -371,7 +371,11 @@ function createGlobalSync() {
   onCleanup(() => {
     queue.dispose()
   })
-  onCleanup(children.disposeAll)
+  onCleanup(() => {
+    for (const directory of Object.keys(children.children)) {
+      children.disposeDirectory(directoryKey(directory))
+    }
+  })
 
   onMount(() => {
     if (typeof requestAnimationFrame === "function") {

packages/app/src/context/global-sync/child-store.ts

@@ -92,22 +92,6 @@ export function createChildStoreManager(input: {
     })
   }
 
-  function disposeChild(key: DirectoryKey) {
-    const dispose = disposers.get(key)
-    if (!key || !children[key]) return false
-    vcsCache.delete(key)
-    metaCache.delete(key)
-    iconCache.delete(key)
-    lifecycle.delete(key)
-    disposers.delete(key)
-    delete children[key]
-    input.onDispose(key)
-    if (dispose) {
-      dispose()
-    }
-    return true
-  }
-
   function disposeDirectory(directory: DirectoryKey) {
     const key = directory
     if (
@@ -122,13 +106,18 @@ export function createChildStoreManager(input: {
       return false
     }
 
-    return disposeChild(key)
-  }
-
-  function disposeAll() {
-    for (const directory of Object.keys(children)) {
-      disposeChild(directoryKey(directory))
+    vcsCache.delete(key)
+    metaCache.delete(key)
+    iconCache.delete(key)
+    lifecycle.delete(key)
+    const dispose = disposers.get(key)
+    if (dispose) {
+      dispose()
+      disposers.delete(key)
     }
+    delete children[key]
+    input.onDispose(key)
+    return true
   }
 
   function runEviction(skip?: string) {
@@ -340,7 +329,6 @@ export function createChildStoreManager(input: {
     unpin,
     pinned,
     disposeDirectory,
-    disposeAll,
     runEviction,
     vcsCache,
     metaCache,

packages/app/src/context/platform.tsx

@@ -9,88 +9,6 @@ type OpenFilePickerOptions = { title?: string; multiple?: boolean; accept?: stri
 type SaveFilePickerOptions = { title?: string; defaultPath?: string }
 type UpdateInfo = { updateAvailable: boolean; version?: string }
 
-export type WslRuntimeCheck = {
-  available: boolean
-  version: string | null
-  error: string | null
-}
-export type WslInstalledDistro = {
-  name: string
-  version: number | null
-  isDefault: boolean
-}
-export type WslOnlineDistro = {
-  name: string
-  label: string
-}
-export type WslDistroProbe = {
-  name: string
-  canExecute: boolean
-  hasBash: boolean
-  hasCurl: boolean
-  error: string | null
-}
-export type WslOpencodeCheck = {
-  distro: string
-  resolvedPath: string | null
-  version: string | null
-  expectedVersion: string | null
-  matchesDesktop: boolean | null
-  error: string | null
-}
-export type WslServerConfig = {
-  id: string
-  distro: string
-}
-
-export type WslServerRuntime =
-  | { kind: "starting" }
-  | { kind: "ready"; url: string; username: string | null; password: string | null }
-  | { kind: "failed"; message: string }
-  | { kind: "stopped" }
-
-export type WslServerItem = {
-  config: WslServerConfig
-  runtime: WslServerRuntime
-}
-
-export type WslJob =
-  | { kind: "runtime"; startedAt: number }
-  | { kind: "distros"; startedAt: number }
-  | { kind: "install-wsl"; startedAt: number }
-  | { kind: "install-distro"; distro: string; startedAt: number }
-  | { kind: "probe-distro"; distro: string; startedAt: number }
-  | { kind: "probe-opencode"; distro: string; startedAt: number }
-  | { kind: "install-opencode"; distro: string; startedAt: number }
-
-export type WslServersState = {
-  runtime: WslRuntimeCheck | null
-  installed: WslInstalledDistro[]
-  online: WslOnlineDistro[]
-  distroProbes: Record<string, WslDistroProbe>
-  opencodeChecks: Record<string, WslOpencodeCheck>
-  pendingRestart: boolean
-  servers: WslServerItem[]
-  job: WslJob | null
-}
-export type WslServersEvent = { type: "state"; state: WslServersState }
-
-export type WslServersPlatform = {
-  getState(): Promise<WslServersState>
-  subscribe(cb: (event: WslServersEvent) => void): () => void
-  probeRuntime(): Promise<void>
-  refreshDistros(): Promise<void>
-  installWsl(): Promise<void>
-  installDistro(name: string): Promise<void>
-  probeDistro(name: string): Promise<void>
-  probeOpencode(name: string): Promise<void>
-  installOpencode(name: string): Promise<void>
-  openTerminal(name: string): Promise<void>
-  addServer(distro: string): Promise<WslServerConfig>
-  removeServer(id: string): Promise<void>
-  startServer(id: string): Promise<void>
-}
-
 export type Platform = {
   /** Platform discriminator */
   platform: "web" | "desktop"
@@ -146,8 +64,11 @@ export type Platform = {
   /** Set the default server URL to use on app startup (platform-specific) */
   setDefaultServer?(url: ServerConnection.Key | null): Promise<void> | void
 
-  /** Manage WSL sidecar servers (Electron on Windows only) */
-  wslServers?: WslServersPlatform
+  /** Get the configured WSL integration (desktop only) */
+  getWslEnabled?(): Promise<boolean>
+
+  /** Set the configured WSL integration (desktop only) */
+  setWslEnabled?(config: boolean): Promise<void> | void
 
   /** Get the preferred display backend (desktop only) */
   getDisplayBackend?(): Promise<DisplayBackend | null> | DisplayBackend | null

packages/app/src/context/server.tsx

@@ -180,12 +180,6 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
       if (state.active !== input) setState("active", input)
     }
 
-    createEffect(() => {
-      if (typeof window === "undefined") return
-      window.__OPENCODE__ ??= {}
-      window.__OPENCODE__.activeServer = state.active
-    })
-
     function add(input: ServerConnection.Http) {
       const url_ = normalizeServerUrl(input.http.url)
       if (!url_) return
@@ -236,7 +230,7 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
     )
     const isLocal = createMemo(() => {
       const c = current()
-      return c?.type === "sidecar" || (c?.type === "http" && isLocalHost(c.http.url))
+      return (c?.type === "sidecar" && c.variant === "base") || (c?.type === "http" && isLocalHost(c.http.url))
     })
 
     return {

packages/app/src/context/wsl-servers.tsx

@@ -1,35 +0,0 @@
-import { createSimpleContext } from "@opencode-ai/ui/context"
-import { queryOptions, skipToken, useQuery, useQueryClient } from "@tanstack/solid-query"
-import { createEffect, onCleanup } from "solid-js"
-import type { WslServersPlatform, WslServersState } from "./platform"
-import { usePlatform } from "./platform"
-
-const wslServersQueryKey = ["platform", "wslServers"] as const
-
-export const { use: useWslServers, provider: WslServersProvider } = createSimpleContext({
-  name: "WslServers",
-  init: () => {
-    const platform = usePlatform()
-    const queryClient = useQueryClient()
-    const query = useQuery(() => {
-      const api = platform.wslServers
-      return queryOptions<WslServersState>({
-        queryKey: wslServersQueryKey,
-        queryFn: api ? () => api.getState() : skipToken,
-        staleTime: Number.POSITIVE_INFINITY,
-        gcTime: Number.POSITIVE_INFINITY,
-      })
-    })
-
-    createEffect(() => {
-      const api = platform.wslServers
-      if (!api) return
-      const off = api.subscribe((event) => {
-        queryClient.setQueryData(wslServersQueryKey, event.state)
-      })
-      onCleanup(off)
-    })
-
-    return query
-  },
-})

packages/app/src/index.ts

@@ -2,19 +2,6 @@ export { AppBaseProviders, AppInterface } from "./app"
 export { ACCEPTED_FILE_EXTENSIONS, ACCEPTED_FILE_TYPES, filePickerFilters } from "./constants/file-picker"
 export { useCommand } from "./context/command"
 export { loadLocaleDict, normalizeLocale, type Locale } from "./context/language"
-export { useWslServers } from "./context/wsl-servers"
-export {
-  type DisplayBackend,
-  type Platform,
-  PlatformProvider,
-  type WslInstalledDistro,
-  type WslOnlineDistro,
-  type WslOpencodeCheck,
-  type WslServerConfig,
-  type WslServerItem,
-  type WslServersEvent,
-  type WslServersPlatform,
-  type WslServersState,
-} from "./context/platform"
+export { type DisplayBackend, type Platform, PlatformProvider } from "./context/platform"
 export { ServerConnection } from "./context/server"
 export { handleNotificationClick } from "./utils/notification-click"

packages/app/src/pages/home.tsx

@@ -36,7 +36,6 @@ export default function Home() {
     if (healthy === false) return "bg-icon-critical-base"
     return "bg-border-weak-base"
   })
-  const useWebDirectoryPicker = createMemo(() => server.current?.type === "sidecar" && server.current.variant === "wsl")
 
   function openProject(directory: string) {
     layout.projects.open(directory)
@@ -55,7 +54,7 @@ export default function Home() {
       }
     }
 
-    if (platform.openDirectoryPickerDialog && server.isLocal() && !useWebDirectoryPicker()) {
+    if (platform.openDirectoryPickerDialog && server.isLocal()) {
       const result = await platform.openDirectoryPickerDialog?.({
         title: language.t("command.project.open"),
         multiple: true,
@@ -76,7 +75,7 @@ export default function Home() {
         size="large"
         variant="ghost"
         class="mt-4 mx-auto text-14-regular text-text-weak"
-        onClick={() => dialog.show(() => <DialogSelectServer onNavigateHome={() => navigate("/")} />)}
+        onClick={() => dialog.show(() => <DialogSelectServer />)}
       >
         <div
           classList={{

packages/app/src/pages/layout.tsx

@@ -149,7 +149,6 @@ export default function Layout(props: ParentProps) {
   }
   const colorSchemeLabel = (scheme: ColorScheme) => language.t(colorSchemeKey[scheme])
   const currentDir = createMemo(() => route().dir)
-  const useWebDirectoryPicker = createMemo(() => server.current?.type === "sidecar" && server.current.variant === "wsl")
 
   const [state, setState] = createStore({
     autoselect: !initialDirectory,
@@ -1208,7 +1207,7 @@ export default function Layout(props: ParentProps) {
     const run = ++dialogRun
     void import("@/components/dialog-select-server").then((x) => {
       if (dialogDead || dialogRun !== run) return
-      dialog.show(() => <x.DialogSelectServer onNavigateHome={() => navigate("/")} />)
+      dialog.show(() => <x.DialogSelectServer />)
     })
   }
 
@@ -1460,7 +1459,7 @@ export default function Layout(props: ParentProps) {
       }
     }
 
-    if (platform.openDirectoryPickerDialog && server.isLocal() && !useWebDirectoryPicker()) {
+    if (platform.openDirectoryPickerDialog && server.isLocal()) {
       const result = await platform.openDirectoryPickerDialog?.({
         title: language.t("command.project.open"),
         multiple: true,

packages/app/src/utils/solid-dnd.tsx

@@ -1,6 +1,6 @@
 import { useDragDropContext } from "@thisbeyond/solid-dnd"
 import type { Transformer } from "@thisbeyond/solid-dnd"
-import type { JSXElement } from "solid-js"
+import { createRoot, onCleanup, type JSXElement } from "solid-js"
 
 type DragEvent = { draggable?: { id?: unknown } }
 
@@ -27,16 +27,20 @@ const createAxisConstraint = (axis: "x" | "y", transformerId: string) => (): JSX
   if (!context) return null
   const [, { onDragStart, onDragEnd, addTransformer, removeTransformer }] = context
   const transformer = createTransformer(transformerId, axis)
-  onDragStart((event) => {
-    const id = getDraggableId(event)
-    if (!id) return
-    addTransformer("draggables", id, transformer)
-  })
-  onDragEnd((event) => {
-    const id = getDraggableId(event)
-    if (!id) return
-    removeTransformer("draggables", id, transformer.id)
+  const dispose = createRoot((dispose) => {
+    onDragStart((event) => {
+      const id = getDraggableId(event)
+      if (!id) return
+      addTransformer("draggables", id, transformer)
+    })
+    onDragEnd((event) => {
+      const id = getDraggableId(event)
+      if (!id) return
+      removeTransformer("draggables", id, transformer.id)
+    })
+    return dispose
   })
+  onCleanup(dispose)
   return null
 }
 

packages/console/app/src/routes/zen/util/handler.ts

@@ -919,13 +919,6 @@ export async function handler(
       "tokens.cache_read": cacheReadTokens,
       "tokens.cache_write_5m": cacheWrite5mTokens,
       "tokens.cache_write_1h": cacheWrite1hTokens,
-      "cost.input.microcents": centsToMicroCents(inputCost),
-      "cost.output.microcents": centsToMicroCents(outputCost),
-      "cost.reasoning.microcents": reasoningCost ? centsToMicroCents(reasoningCost) : undefined,
-      "cost.cache_read.microcents": cacheReadCost ? centsToMicroCents(cacheReadCost) : undefined,
-      "cost.cache_write.microcents": cacheWrite5mCost ? centsToMicroCents(cacheWrite5mCost) : undefined,
-      "cost.total.microcents": centsToMicroCents(totalCostInCent),
-      // deprecated - remove after May 20, 2026
       "cost.input": Math.round(inputCost),
       "cost.output": Math.round(outputCost),
       "cost.reasoning": reasoningCost ? Math.round(reasoningCost) : undefined,

packages/desktop-electron/src/main/apps.ts

@@ -1,7 +1,6 @@
 import { execFileSync } from "node:child_process"
 import { existsSync, readFileSync, readdirSync } from "node:fs"
 import { dirname, extname, join } from "node:path"
-import { resolveWslHome, runWslInDistro } from "./wsl"
 
 export function checkAppExists(appName: string): boolean {
   if (process.platform === "win32") return true
@@ -14,44 +13,20 @@ export function resolveAppPath(appName: string): string | null {
   return resolveWindowsAppPath(appName)
 }
 
-// Parses `\\wsl$\<distro>\...` and `\\wsl.localhost\<distro>\...` UNC paths that
-// point *into* a WSL distro's rootfs. `wslpath -u` cannot handle these reliably:
-// backslashes get shell-collapsed when passed through `wsl.exe`, turning
-// `\\wsl.localhost\Debian\home\luke` into `/mnt/c/wsl.localhostDebianhomeluke`,
-// which is a valid-looking path that wedges opencode on DrvFs stat calls.
-function parseWslUncPath(value: string): { distro: string; subpath: string } | null {
-  // Normalise separators; both `\\` and `//` prefixes mean UNC.
-  const normalised = value.replace(/\\/g, "/").replace(/^\/+/, "//")
-  const match = /^\/\/(wsl\$|wsl\.localhost)\/([^/]+)(?:\/(.*))?$/i.exec(normalised)
-  if (!match) return null
-  const distro = match[2]
-  const subpath = match[3] ?? ""
-  return { distro, subpath }
-}
-
-export async function wslPath(path: string, mode: "windows" | "linux" | null, distro?: string | null): Promise<string> {
+export function wslPath(path: string, mode: "windows" | "linux" | null): string {
   if (process.platform !== "win32") return path
 
-  // `\\wsl$\<distro>\...` / `\\wsl.localhost\<distro>\...` -> `/<subpath>` in
-  // the target distro. Do the conversion in-process rather than shelling out
-  // to `wslpath -u`, which mangles backslashes via wsl.exe's command-line
-  // joiner. If the requested distro differs from the UNC distro, we still
-  // translate literally — callers are responsible for only picking paths
-  // inside the active distro.
-  if (mode === "linux") {
-    const unc = parseWslUncPath(path)
-    if (unc) return `/${unc.subpath}`
-  }
-
   const flag = mode === "windows" ? "-w" : "-u"
   try {
-    const resolved = path.startsWith("~") ? `${await resolveWslHome(distro)}${path.slice(1)}` : path
-    const input = mode === "linux" ? resolved.replace(/\\/g, "/") : resolved
-    const output = await runWslInDistro(["wslpath", flag, input], distro)
-    if (output.code !== 0) {
-      throw new Error(output.stderr || output.stdout || `wslpath exited with code ${output.code}`)
+    if (path.startsWith("~")) {
+      const suffix = path.slice(1)
+      const cmd = `wslpath ${flag} "$HOME${suffix.replace(/"/g, '\\"')}"`
+      const output = execFileSync("wsl", ["-e", "sh", "-lc", cmd])
+      return output.toString().trim()
     }
-    return output.stdout.trim()
+
+    const output = execFileSync("wsl", ["-e", "wslpath", flag, path])
+    return output.toString().trim()
   } catch (error) {
     throw new Error(`Failed to run wslpath: ${String(error)}`, { cause: error })
   }

packages/desktop-electron/src/main/constants.ts

@@ -6,5 +6,5 @@ export const CHANNEL: Channel = raw === "dev" || raw === "beta" || raw === "prod
 
 export const SETTINGS_STORE = "opencode.settings"
 export const DEFAULT_SERVER_URL_KEY = "defaultServerUrl"
-export const WSL_SERVERS_KEY = "wslServers"
+export const WSL_ENABLED_KEY = "wslEnabled"
 export const UPDATER_ENABLED = app.isPackaged && CHANNEL !== "dev"

packages/desktop-electron/src/main/index.ts

@@ -1,13 +1,12 @@
 import { randomUUID } from "node:crypto"
 import { EventEmitter } from "node:events"
 import { existsSync } from "node:fs"
+import { createServer } from "node:net"
 import { homedir } from "node:os"
 import { join } from "node:path"
 import type { Event } from "electron"
 import { app, BrowserWindow, dialog } from "electron"
 import pkg from "electron-updater"
-import { drizzle } from "drizzle-orm/node-sqlite/driver"
-import type { Server } from "virtual:opencode-server"
 
 import contextMenu from "electron-context-menu"
 contextMenu({ showSaveImageAs: true, showLookUpSelection: false, showSearchWithGoogle: false })
@@ -35,15 +34,14 @@ app.setAppUserModelId(appId)
 app.setPath("userData", join(app.getPath("appData"), appId))
 const { autoUpdater } = pkg
 
-import type { InitStep, ServerReadyData, SqliteMigrationProgress } from "../preload/types"
+import type { InitStep, ServerReadyData, SqliteMigrationProgress, WslConfig } from "../preload/types"
 import { checkAppExists, resolveAppPath, wslPath } from "./apps"
 import { CHANNEL, UPDATER_ENABLED } from "./constants"
 import { registerIpcHandlers, sendDeepLinks, sendMenuCommand, sendSqliteMigrationProgress } from "./ipc"
 import { initLogging } from "./logging"
 import { parseMarkdown } from "./markdown"
 import { createMenu } from "./menu"
-import { allocatePort, getDefaultServerUrl, setDefaultServerUrl, spawnLocalServer, spawnWslSidecar } from "./server"
-import { createWslServersController } from "./wsl-servers"
+import { getDefaultServerUrl, getWslConfig, setDefaultServerUrl, setWslConfig, spawnLocalServer } from "./server"
 import {
   createLoadingWindow,
   createMainWindow,
@@ -51,6 +49,8 @@ import {
   setBackgroundColor,
   setDockIcon,
 } from "./windows"
+import { drizzle } from "drizzle-orm/node-sqlite/driver"
+import type { Server } from "virtual:opencode-server"
 
 const initEmitter = new EventEmitter()
 let initStep: InitStep = { phase: "server_waiting" }
@@ -63,19 +63,6 @@ const pendingDeepLinks: string[] = []
 
 const serverReady = defer<ServerReadyData>()
 const logger = initLogging()
-const wslServers = createWslServersController(
-  app.getVersion(),
-  async (distro) => {
-    logger.log("spawning wsl sidecar", { distro })
-    return spawnWslSidecar(distro, {
-      onLine: (line) => logger.log("wsl sidecar", { distro, stream: line.stream, text: line.text }),
-    })
-  },
-  {
-    log: (message, meta) => logger.log(message, meta),
-    error: (message, meta) => logger.error(message, meta),
-  },
-)
 
 logger.log("app starting", {
   version: app.getVersion(),
@@ -87,7 +74,6 @@ setupApp()
 function setupApp() {
   ensureLoopbackNoProxy()
   app.commandLine.appendSwitch("proxy-bypass-list", "<-loopback>")
-  if (!app.isPackaged) app.commandLine.appendSwitch("remote-debugging-port", "9222")
 
   if (!app.requestSingleInstanceLock()) {
     app.quit()
@@ -111,18 +97,15 @@ function setupApp() {
 
   app.on("before-quit", () => {
     killSidecar()
-    wslServers.stopAll()
   })
 
   app.on("will-quit", () => {
     killSidecar()
-    wslServers.stopAll()
   })
 
   for (const signal of ["SIGINT", "SIGTERM"] as const) {
     process.on(signal, () => {
       killSidecar()
-      wslServers.stopAll()
       app.exit(0)
     })
   }
@@ -156,9 +139,10 @@ function setInitStep(step: InitStep) {
 
 async function initialize() {
   const needsMigration = !sqliteFileExists()
+  const sqliteDone = needsMigration ? defer<void>() : undefined
   let overlay: BrowserWindow | null = null
 
-  const port = await allocatePort()
+  const port = await getSidecarPort()
   const hostname = "127.0.0.1"
   const url = `http://${hostname}:${port}`
   const password = randomUUID()
@@ -170,17 +154,24 @@ async function initialize() {
       setInitStep({ phase: "sqlite_waiting" })
       if (overlay) sendSqliteMigrationProgress(overlay, progress)
       if (mainWindow) sendSqliteMigrationProgress(mainWindow, progress)
+      if (progress.type === "Done") sqliteDone?.resolve()
     })
 
     if (needsMigration) {
       const { Database, JsonMigration } = await import("virtual:opencode-server")
       await JsonMigration.run(drizzle({ client: Database.Client().$client }), {
         progress: (event: { current: number; total: number }) => {
-          const percent = Math.round((event.current / event.total) * 100)
+          const percent = Math.round(event.current / event.total) * 100
           initEmitter.emit("sqlite", { type: "InProgress", value: percent })
         },
       })
       initEmitter.emit("sqlite", { type: "Done" })
+
+      sqliteDone?.resolve()
+    }
+
+    if (needsMigration) {
+      await sqliteDone?.promise
     }
 
     logger.log("spawning sidecar", { url })
@@ -192,9 +183,6 @@ async function initialize() {
       password,
     })
 
-    // Initialize WSL sidecars in parallel; failures do not block app startup.
-    void wslServers.initialize().catch((error) => logger.error("wsl server initialization failed", error))
-
     await Promise.race([
       health.wait,
       delay(30_000).then(() => {
@@ -236,13 +224,16 @@ function wireMenu() {
       void checkForUpdates(true)
     },
     reload: () => mainWindow?.reload(),
-    relaunch: () => relaunchApp(),
+    relaunch: () => {
+      killSidecar()
+      app.relaunch()
+      app.exit(0)
+    },
   })
 }
 
 registerIpcHandlers({
   killSidecar: () => killSidecar(),
-  relaunch: () => relaunchApp(),
   awaitInitialization: async (sendStep) => {
     sendStep(initStep)
     const listener = (step: InitStep) => sendStep(step)
@@ -256,28 +247,17 @@ registerIpcHandlers({
       initEmitter.off("step", listener)
     }
   },
-  getWslServersState: () => wslServers.getState(),
-  onWslServersEvent: (listener) => wslServers.subscribe(listener),
-  wslServersProbeRuntime: () => wslServers.probeRuntime(),
-  wslServersRefreshDistros: () => wslServers.refreshDistros(),
-  wslServersInstallWsl: () => wslServers.installWsl(),
-  wslServersInstallDistro: (name) => wslServers.installDistro(name),
-  wslServersProbeDistro: (name) => wslServers.probeDistro(name),
-  wslServersProbeOpencode: (name) => wslServers.probeOpencode(name),
-  wslServersInstallOpencode: (name) => wslServers.installOpencode(name),
-  wslServersOpenTerminal: (name) => wslServers.openTerminal(name),
-  wslServersAddServer: (distro) => wslServers.addServer(distro),
-  wslServersRemoveServer: (id) => wslServers.removeServer(id),
-  wslServersStartServer: (id) => wslServers.startServer(id),
   getWindowConfig: () => ({ updaterEnabled: UPDATER_ENABLED }),
   consumeInitialDeepLinks: () => pendingDeepLinks.splice(0),
   getDefaultServerUrl: () => getDefaultServerUrl(),
   setDefaultServerUrl: (url) => setDefaultServerUrl(url),
+  getWslConfig: () => Promise.resolve(getWslConfig()),
+  setWslConfig: (config: WslConfig) => setWslConfig(config),
   getDisplayBackend: async () => null,
   setDisplayBackend: async () => undefined,
   parseMarkdown: async (markdown) => parseMarkdown(markdown),
   checkAppExists: async (appName) => checkAppExists(appName),
-  wslPath: async (path, mode, distro) => wslPath(path, mode, distro),
+  wslPath: async (path, mode) => wslPath(path, mode),
   resolveAppPath: async (appName) => resolveAppPath(appName),
   loadingWindowComplete: () => loadingComplete.resolve(),
   runUpdater: async (alertOnFail) => checkForUpdates(alertOnFail),
@@ -292,15 +272,6 @@ function killSidecar() {
   server = null
 }
 
-function relaunchApp() {
-  // app.exit() skips before-quit / will-quit, so relaunch callers must
-  // explicitly stop sidecars here rather than relying on process hooks.
-  killSidecar()
-  wslServers.stopAll()
-  app.relaunch()
-  app.exit(0)
-}
-
 function ensureLoopbackNoProxy() {
   const loopback = ["127.0.0.1", "localhost", "::1"]
   const upsert = (key: string) => {
@@ -321,6 +292,29 @@ function ensureLoopbackNoProxy() {
   upsert("no_proxy")
 }
 
+async function getSidecarPort() {
+  const fromEnv = process.env.OPENCODE_PORT
+  if (fromEnv) {
+    const parsed = Number.parseInt(fromEnv, 10)
+    if (!Number.isNaN(parsed)) return parsed
+  }
+
+  return await new Promise<number>((resolve, reject) => {
+    const server = createServer()
+    server.on("error", reject)
+    server.listen(0, "127.0.0.1", () => {
+      const address = server.address()
+      if (typeof address !== "object" || !address) {
+        server.close()
+        reject(new Error("Failed to get port"))
+        return
+      }
+      const port = address.port
+      server.close(() => resolve(port))
+    })
+  })
+}
+
 function sqliteFileExists() {
   const xdg = process.env.XDG_DATA_HOME
   const base = xdg && xdg.length > 0 ? xdg : join(homedir(), ".local", "share")
@@ -397,7 +391,6 @@ async function installUpdate() {
     version: downloadedUpdateVersion,
   })
   killSidecar()
-  wslServers.stopAll()
   autoUpdater.quitAndInstall()
 }
 

packages/desktop-electron/src/main/ipc.ts

@@ -8,9 +8,7 @@ import type {
   SqliteMigrationProgress,
   TitlebarTheme,
   WindowConfig,
-  WslServerConfig,
-  WslServersEvent,
-  WslServersState,
+  WslConfig,
 } from "../preload/types"
 import { getStore } from "./store"
 import { setTitlebar } from "./windows"
@@ -22,30 +20,18 @@ const pickerFilters = (ext?: string[]) => {
 
 type Deps = {
   killSidecar: () => void
-  relaunch: () => void
   awaitInitialization: (sendStep: (step: InitStep) => void) => Promise<ServerReadyData>
-  getWslServersState: () => Promise<WslServersState> | WslServersState
-  onWslServersEvent: (listener: (event: WslServersEvent) => void) => () => void
-  wslServersProbeRuntime: () => Promise<void> | void
-  wslServersRefreshDistros: () => Promise<void> | void
-  wslServersInstallWsl: () => Promise<void> | void
-  wslServersInstallDistro: (name: string) => Promise<void> | void
-  wslServersProbeDistro: (name: string) => Promise<void> | void
-  wslServersProbeOpencode: (name: string) => Promise<void> | void
-  wslServersInstallOpencode: (name: string) => Promise<void> | void
-  wslServersOpenTerminal: (name: string) => Promise<void> | void
-  wslServersAddServer: (distro: string) => Promise<WslServerConfig> | WslServerConfig
-  wslServersRemoveServer: (id: string) => Promise<void> | void
-  wslServersStartServer: (id: string) => Promise<void> | void
   getWindowConfig: () => Promise<WindowConfig> | WindowConfig
   consumeInitialDeepLinks: () => Promise<string[]> | string[]
   getDefaultServerUrl: () => Promise<string | null> | string | null
   setDefaultServerUrl: (url: string | null) => Promise<void> | void
+  getWslConfig: () => Promise<WslConfig>
+  setWslConfig: (config: WslConfig) => Promise<void> | void
   getDisplayBackend: () => Promise<string | null>
   setDisplayBackend: (backend: string | null) => Promise<void> | void
   parseMarkdown: (markdown: string) => Promise<string> | string
   checkAppExists: (appName: string) => Promise<boolean> | boolean
-  wslPath: (path: string, mode: "windows" | "linux" | null, distro?: string | null) => Promise<string>
+  wslPath: (path: string, mode: "windows" | "linux" | null) => Promise<string>
   resolveAppPath: (appName: string) => Promise<string | null>
   loadingWindowComplete: () => void
   runUpdater: (alertOnFail: boolean) => Promise<void> | void
@@ -55,89 +41,27 @@ type Deps = {
 }
 
 export function registerIpcHandlers(deps: Deps) {
-  const requireString = (name: string, value: unknown) => {
-    if (typeof value === "string" && value.length > 0) return value
-    throw new Error(`Invalid ${name}`)
-  }
-
-  const wslSubscriptions = new Map<number, () => void>()
-  const unsubscribeWsl = (id: number) => {
-    const off = wslSubscriptions.get(id)
-    if (!off) return
-    off()
-    wslSubscriptions.delete(id)
-  }
-
-  app.once("will-quit", () => {
-    for (const off of wslSubscriptions.values()) off()
-    wslSubscriptions.clear()
-  })
-
   ipcMain.handle("kill-sidecar", () => deps.killSidecar())
   ipcMain.handle("await-initialization", (event: IpcMainInvokeEvent) => {
     const send = (step: InitStep) => event.sender.send("init-step", step)
     return deps.awaitInitialization(send)
   })
-  ipcMain.handle("wsl-servers-subscribe", (event) => {
-    const id = event.sender.id
-    if (wslSubscriptions.has(id)) return
-    wslSubscriptions.set(
-      id,
-      deps.onWslServersEvent((payload) => {
-        if (event.sender.isDestroyed()) {
-          unsubscribeWsl(id)
-          return
-        }
-        event.sender.send("wsl-servers-event", payload)
-      }),
-    )
-    event.sender.once("destroyed", () => unsubscribeWsl(id))
-  })
-  ipcMain.handle("wsl-servers-unsubscribe", (event) => unsubscribeWsl(event.sender.id))
-  ipcMain.handle("wsl-servers-get-state", () => deps.getWslServersState())
-  ipcMain.handle("wsl-servers-probe-runtime", () => deps.wslServersProbeRuntime())
-  ipcMain.handle("wsl-servers-refresh-distros", () => deps.wslServersRefreshDistros())
-  ipcMain.handle("wsl-servers-install-wsl", () => deps.wslServersInstallWsl())
-  ipcMain.handle("wsl-servers-install-distro", (_event: IpcMainInvokeEvent, name: string) =>
-    deps.wslServersInstallDistro(requireString("distro", name)),
-  )
-  ipcMain.handle("wsl-servers-probe-distro", (_event: IpcMainInvokeEvent, name: string) =>
-    deps.wslServersProbeDistro(requireString("distro", name)),
-  )
-  ipcMain.handle("wsl-servers-probe-opencode", (_event: IpcMainInvokeEvent, name: string) =>
-    deps.wslServersProbeOpencode(requireString("distro", name)),
-  )
-  ipcMain.handle("wsl-servers-install-opencode", (_event: IpcMainInvokeEvent, name: string) =>
-    deps.wslServersInstallOpencode(requireString("distro", name)),
-  )
-  ipcMain.handle("wsl-servers-open-terminal", (_event: IpcMainInvokeEvent, name: string) =>
-    deps.wslServersOpenTerminal(requireString("distro", name)),
-  )
-  ipcMain.handle("wsl-servers-add", (_event: IpcMainInvokeEvent, distro: string) =>
-    deps.wslServersAddServer(requireString("distro", distro)),
-  )
-  ipcMain.handle("wsl-servers-remove", (_event: IpcMainInvokeEvent, id: string) =>
-    deps.wslServersRemoveServer(requireString("server id", id)),
-  )
-  ipcMain.handle("wsl-servers-start", (_event: IpcMainInvokeEvent, id: string) =>
-    deps.wslServersStartServer(requireString("server id", id)),
-  )
   ipcMain.handle("get-window-config", () => deps.getWindowConfig())
   ipcMain.handle("consume-initial-deep-links", () => deps.consumeInitialDeepLinks())
   ipcMain.handle("get-default-server-url", () => deps.getDefaultServerUrl())
   ipcMain.handle("set-default-server-url", (_event: IpcMainInvokeEvent, url: string | null) =>
     deps.setDefaultServerUrl(url),
   )
+  ipcMain.handle("get-wsl-config", () => deps.getWslConfig())
+  ipcMain.handle("set-wsl-config", (_event: IpcMainInvokeEvent, config: WslConfig) => deps.setWslConfig(config))
   ipcMain.handle("get-display-backend", () => deps.getDisplayBackend())
   ipcMain.handle("set-display-backend", (_event: IpcMainInvokeEvent, backend: string | null) =>
     deps.setDisplayBackend(backend),
   )
   ipcMain.handle("parse-markdown", (_event: IpcMainInvokeEvent, markdown: string) => deps.parseMarkdown(markdown))
   ipcMain.handle("check-app-exists", (_event: IpcMainInvokeEvent, appName: string) => deps.checkAppExists(appName))
-  ipcMain.handle(
-    "wsl-path",
-    (_event: IpcMainInvokeEvent, path: string, mode: "windows" | "linux" | null, distro?: string | null) =>
-      deps.wslPath(path, mode, distro),
+  ipcMain.handle("wsl-path", (_event: IpcMainInvokeEvent, path: string, mode: "windows" | "linux" | null) =>
+    deps.wslPath(path, mode),
   )
   ipcMain.handle("resolve-app-path", (_event: IpcMainInvokeEvent, appName: string) => deps.resolveAppPath(appName))
   ipcMain.on("loading-window-complete", () => deps.loadingWindowComplete())
@@ -254,7 +178,8 @@ export function registerIpcHandlers(deps: Deps) {
   })
 
   ipcMain.on("relaunch", () => {
-    deps.relaunch()
+    app.relaunch()
+    app.exit(0)
   })
 
   ipcMain.handle("get-zoom-factor", (event: IpcMainInvokeEvent) => event.sender.getZoomFactor())

packages/desktop-electron/src/main/server.ts

@@ -1,11 +1,9 @@
-import { spawn } from "node:child_process"
-import { randomUUID } from "node:crypto"
-import { createServer } from "node:net"
 import { app } from "electron"
-import { DEFAULT_SERVER_URL_KEY } from "./constants"
+import { DEFAULT_SERVER_URL_KEY, WSL_ENABLED_KEY } from "./constants"
 import { getUserShell, loadShellEnv } from "./shell-env"
 import { getStore } from "./store"
-import { type WslCommandLine, resolveWslOpencode, shellEscape, wslArgs } from "./wsl"
+
+export type WslConfig = { enabled: boolean }
 
 export type HealthCheck = { wait: Promise<void> }
 
@@ -23,26 +21,13 @@ export function setDefaultServerUrl(url: string | null) {
   getStore().delete(DEFAULT_SERVER_URL_KEY)
 }
 
-export async function allocatePort() {
-  const fromEnv = process.env.OPENCODE_PORT
-  if (fromEnv) {
-    const parsed = Number.parseInt(fromEnv, 10)
-    if (!Number.isNaN(parsed)) return parsed
-  }
-  return new Promise<number>((resolve, reject) => {
-    const server = createServer()
-    server.on("error", reject)
-    server.listen(0, "127.0.0.1", () => {
-      const address = server.address()
-      if (typeof address !== "object" || !address) {
-        server.close()
-        reject(new Error("Failed to get port"))
-        return
-      }
-      const port = address.port
-      server.close(() => resolve(port))
-    })
-  })
+export function getWslConfig(): WslConfig {
+  const value = getStore().get(WSL_ENABLED_KEY)
+  return { enabled: typeof value === "boolean" ? value : false }
+}
+
+export function setWslConfig(config: WslConfig) {
+  getStore().set(WSL_ENABLED_KEY, config.enabled)
 }
 
 export async function spawnLocalServer(hostname: string, port: number, password: string) {
@@ -73,133 +58,6 @@ export async function spawnLocalServer(hostname: string, port: number, password:
   return { listener, health: { wait } }
 }
 
-export type WslSidecar = {
-  listener: { stop: () => void; onExit: (cb: (code: number | null, signal: NodeJS.Signals | null) => void) => void }
-  url: string
-  username: string | null
-  password: string
-}
-
-export async function spawnWslSidecar(
-  distro: string,
-  opts: { onLine?: (line: WslCommandLine) => void; healthTimeoutMs?: number } = {},
-): Promise<WslSidecar> {
-  // Do not pass --user here: the sidecar should inherit the distro's
-  // default user so config, auth, git, ssh, and file ownership match the
-  // user's normal WSL environment. If that default user is root, WSL will
-  // choose root itself.
-  const opencode = await resolveWslOpencode(distro)
-  if (!opencode) throw new Error(`OpenCode is not installed in ${distro}`)
-
-  const port = await allocatePort()
-  const password = randomUUID()
-  const username = "opencode"
-  const logLevel = app.isPackaged ? "WARN" : "INFO"
-
-  const script = [
-    "set -euo pipefail",
-    // wsl.exe inherits the Windows-side cwd (e.g. C:\Users\Lukem) and maps it
-    // to the distro as /mnt/c/Users/Lukem — a DrvFs/9p path. opencode's
-    // instance middleware falls back to `process.cwd()` when a request
-    // arrives without a `directory=` query or `x-opencode-directory` header
-    // (see opencode server.ts InstanceMiddleware), and then calls
-    // `realpathSync(process.cwd())` synchronously on the main thread. A
-    // statx against a 9p path can wedge the whole event loop in kernel
-    // uninterruptible sleep, freezing the accept loop. Move cwd to the
-    // user's native Linux home so the fallback can't land on DrvFs.
-    'cd "$HOME" || cd /',
-    // wsl.exe by default splices the Windows %PATH% into the distro's $PATH
-    // via the interop layer (every `/mnt/c/Program Files/...` entry). Anything
-    // the sidecar spawns — PTY login shells, plugin helpers, etc. — then
-    // inherits it, which means `which pwsh.exe` resolves to the Windows
-    // PowerShell binary and bash-l profiles that end with
-    //   eval "$(oh-my-posh init bash)"   (or similar)
-    // silently run Windows pwsh for prompt rendering, whose banner
-    // ("Loading personal and system profiles took Xms.") then shows up in
-    // opencode's terminal pane. We want a clean, Linux-only environment in
-    // the sidecar, so filter every /mnt/* segment out of PATH and clear
-    // WSLENV so no further Windows vars leak in. Users who really need
-    // Windows binaries in the sidecar can invoke them by absolute path.
-    'PATH=$(awk -v RS=: -v ORS=: \'$0 !~ /^\\/mnt\\//\' <<<"$PATH" | sed "s/:$//")',
-    "export PATH",
-    "export WSLENV=",
-    // WSL sidecars often target /mnt/* worktrees. Keep the desktop-only
-    // watcher/discovery features off there because DrvFs/9p stalls can wedge
-    // the server process after it starts listening.
-    "export OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER=true",
-    "export OPENCODE_CLIENT=desktop",
-    `export OPENCODE_SERVER_USERNAME=${shellEscape(username)}`,
-    `export OPENCODE_SERVER_PASSWORD=${shellEscape(password)}`,
-    'export XDG_STATE_HOME="$HOME/.local/state"',
-    `exec ${shellEscape(opencode)} --print-logs --log-level ${logLevel} serve --hostname 0.0.0.0 --port ${port}`,
-  ].join("\n")
-
-  const child = spawn("wsl", wslArgs(["bash", "-se"], distro), {
-    stdio: ["pipe", "pipe", "pipe"],
-    windowsHide: true,
-  })
-  child.stdin.end(script)
-
-  let settled = false
-  const recentOutput: string[] = []
-  const emit = (line: WslCommandLine) => {
-    if (settled || !line.text.trim()) return
-    recentOutput.push(`[${line.stream}] ${line.text}`)
-    if (recentOutput.length > 12) recentOutput.shift()
-    opts.onLine?.(line)
-  }
-
-  forwardLines(child.stdout, "stdout", emit)
-  forwardLines(child.stderr, "stderr", emit)
-
-  const exit = new Promise<never>((_, reject) => {
-    child.once("error", reject)
-    child.once("exit", (code, signal) => {
-      reject(new Error(startupFailure(code, signal, recentOutput)))
-    })
-  })
-
-  const url = `http://127.0.0.1:${port}`
-  const healthPromise = (async () => {
-    while (true) {
-      await new Promise((resolve) => setTimeout(resolve, 100))
-      if (await checkHealth(url, password)) return
-    }
-  })()
-
-  const timeoutMs = opts.healthTimeoutMs ?? 30_000
-  const timeout = new Promise<never>((_, reject) => {
-    const id = setTimeout(
-      () => reject(new Error(`Sidecar for ${distro} health check timed out after ${timeoutMs}ms`)),
-      timeoutMs,
-    )
-    void healthPromise.finally(() => clearTimeout(id))
-  })
-
-  try {
-    await Promise.race([healthPromise, exit, timeout])
-  } catch (error) {
-    child.kill()
-    throw error
-  } finally {
-    settled = true
-  }
-
-  return {
-    listener: {
-      stop() {
-        child.kill()
-      },
-      onExit(cb) {
-        child.once("exit", cb)
-      },
-    },
-    url,
-    username,
-    password,
-  }
-}
-
 function prepareServerEnv(password: string) {
   const shell = process.platform === "win32" ? null : getUserShell()
   const shellEnv = shell ? (loadShellEnv(shell) ?? {}) : {}
@@ -216,29 +74,6 @@ function prepareServerEnv(password: string) {
   Object.assign(process.env, env)
 }
 
-function forwardLines(
-  stream: NodeJS.ReadableStream,
-  source: WslCommandLine["stream"],
-  onLine: (line: WslCommandLine) => void,
-) {
-  let pending = ""
-  stream.setEncoding("utf8")
-  stream.on("data", (chunk: string) => {
-    pending += chunk
-    const lines = pending.split(/\r?\n/g)
-    pending = lines.pop() ?? ""
-    for (const line of lines) onLine({ stream: source, text: line })
-  })
-  stream.on("end", () => {
-    if (pending) onLine({ stream: source, text: pending })
-  })
-}
-
-function startupFailure(code: number | null, signal: NodeJS.Signals | null, recentOutput: string[]) {
-  const suffix = recentOutput.length ? `\n${recentOutput.join("\n")}` : ""
-  return `WSL server exited before becoming healthy (code=${code ?? "null"} signal=${signal ?? "null"})${suffix}`
-}
-
 export async function checkHealth(url: string, password?: string | null): Promise<boolean> {
   let healthUrl: URL
   try {

packages/desktop-electron/src/main/wsl-servers.ts

@@ -1,447 +0,0 @@
-import type {
-  WslDistroProbe,
-  WslInstalledDistro,
-  WslJob,
-  WslOnlineDistro,
-  WslOpencodeCheck,
-  WslRuntimeCheck,
-  WslServerConfig,
-  WslServerItem,
-  WslServerRuntime,
-  WslServersEvent,
-  WslServersState,
-} from "../preload/types"
-import { WSL_SERVERS_KEY } from "./constants"
-import { getStore } from "./store"
-import {
-  installWslDistro,
-  installWslOpencode,
-  installWslRuntimeElevated,
-  listInstalledWslDistros,
-  listOnlineWslDistros,
-  openWslTerminal,
-  probeWslDistro,
-  probeWslRuntime,
-  readWslCommandVersion,
-  resolveWslOpencode,
-  summarize,
-  upgradeWslOpencode,
-  wslNeedsRestart,
-} from "./wsl"
-
-type RunningSidecar = {
-  listener: { stop: () => void; onExit: (cb: (code: number | null, signal: NodeJS.Signals | null) => void) => void }
-  url: string
-  username: string | null
-  password: string
-}
-
-type SpawnSidecar = (distro: string) => Promise<RunningSidecar>
-
-type ControllerLogger = {
-  log: (message: string, meta?: unknown) => void
-  error: (message: string, meta?: unknown) => void
-}
-
-export type WslServersController = ReturnType<typeof createWslServersController>
-
-export function wslServerIdForDistro(distro: string) {
-  return `wsl:${distro}`
-}
-
-export function createWslServersController(appVersion: string, spawnSidecar: SpawnSidecar, logger?: ControllerLogger) {
-  let state: WslServersState = initialState()
-  const listeners = new Set<(event: WslServersEvent) => void>()
-  const sidecars = new Map<string, RunningSidecar>()
-  const startAttempts = new Map<string, number>()
-  let jobAbort: AbortController | undefined
-
-  const emit = () => {
-    for (const listener of listeners) listener({ type: "state", state })
-  }
-
-  const setState = (next: Partial<WslServersState>) => {
-    state = { ...state, ...next }
-    emit()
-  }
-
-  const persistServers = (servers: WslServerConfig[]) => {
-    getStore().set(WSL_SERVERS_KEY, { servers })
-  }
-
-  const updateServer = (id: string, update: (item: WslServerItem) => WslServerItem) => {
-    const next = state.servers.map((item) => (item.config.id === id ? update(item) : item))
-    setState({ servers: next })
-  }
-
-  const beginJob = (job: WslJob): AbortController => {
-    jobAbort?.abort()
-    const abort = new AbortController()
-    jobAbort = abort
-    setState({ job })
-    return abort
-  }
-
-  const endJob = (abort: AbortController) => {
-    if (jobAbort !== abort) return
-    jobAbort = undefined
-    setState({ job: null })
-  }
-
-  const refreshFromStore = () => {
-    const persisted = readPersistedServers()
-    const items: WslServerItem[] = persisted.map((config) => {
-      const existing = state.servers.find((item) => item.config.id === config.id)
-      return {
-        config,
-        runtime: existing?.runtime ?? { kind: "stopped" },
-      }
-    })
-    setState({ servers: items })
-  }
-
-  const setRuntime = (id: string, runtime: WslServerRuntime) => {
-    updateServer(id, (item) => ({ ...item, runtime }))
-  }
-
-  const setOpencodeCheck = (distro: string, check: WslOpencodeCheck) => {
-    setState({
-      opencodeChecks: {
-        ...state.opencodeChecks,
-        [distro]: check,
-      },
-    })
-  }
-
-  const refreshOpencodeCheck = async (distro: string, opts?: { signal?: AbortSignal }) => {
-    const resolved = await resolveWslOpencode(distro, opts)
-    const version = resolved ? await readWslCommandVersion(resolved, distro, opts) : null
-    setOpencodeCheck(distro, opencodeCheck(distro, resolved, version, appVersion))
-  }
-
-  const refreshDistroLists = async (opts: { signal?: AbortSignal }) => {
-    const [installed, online] = await Promise.all([
-      listInstalledWslDistros(opts),
-      listOnlineWslDistros(opts),
-    ])
-    return { installed, online }
-  }
-
-  const nextStartAttempt = (id: string) => {
-    const next = (startAttempts.get(id) ?? 0) + 1
-    startAttempts.set(id, next)
-    return next
-  }
-
-  const invalidateStartAttempt = (id: string) => {
-    startAttempts.set(id, (startAttempts.get(id) ?? 0) + 1)
-  }
-
-  const isCurrentStartAttempt = (id: string, attempt: number) => {
-    return startAttempts.get(id) === attempt && state.servers.some((item) => item.config.id === id)
-  }
-
-  const startServer = async (id: string) => {
-    const item = state.servers.find((x) => x.config.id === id)
-    if (!item) return
-    const attempt = nextStartAttempt(id)
-    await stopServerInternal(id)
-    if (!isCurrentStartAttempt(id, attempt)) return
-    setRuntime(id, { kind: "starting" })
-    logger?.log("wsl sidecar starting", { id, distro: item.config.distro })
-    try {
-      const sidecar = await spawnSidecar(item.config.distro)
-      if (!isCurrentStartAttempt(id, attempt)) {
-        try {
-          sidecar.listener.stop()
-        } catch {
-          // ignore stop errors for stale sidecars
-        }
-        return
-      }
-      sidecars.set(id, sidecar)
-      setRuntime(id, {
-        kind: "ready",
-        url: sidecar.url,
-        username: sidecar.username,
-        password: sidecar.password,
-      })
-      sidecar.listener.onExit((code, signal) => {
-        if (sidecars.get(id) !== sidecar) return
-        sidecars.delete(id)
-        const message = startupFailure(code, signal)
-        setRuntime(id, { kind: "failed", message })
-        logger?.error("wsl sidecar exited", { id, distro: item.config.distro, code, signal })
-      })
-      void refreshOpencodeCheck(item.config.distro).catch((error) => {
-        const message = error instanceof Error ? error.message : String(error)
-        logger?.error("wsl opencode check failed", { id, distro: item.config.distro, message })
-      })
-      logger?.log("wsl sidecar ready", { id, distro: item.config.distro, url: sidecar.url })
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error)
-      if (!isCurrentStartAttempt(id, attempt)) return
-      setRuntime(id, { kind: "failed", message })
-      // Without this, an Ubuntu-style silent failure leaves no trace in
-      // main.log — the controller captures the message in its state but
-      // nothing surfaces unless the user opens the WSL servers dialog.
-      logger?.error("wsl sidecar failed to start", { id, distro: item.config.distro, message })
-    }
-  }
-
-  const stopServerInternal = async (id: string) => {
-    const existing = sidecars.get(id)
-    if (!existing) return
-    sidecars.delete(id)
-    try {
-      existing.listener.stop()
-    } catch {
-      // ignore stop errors
-    }
-  }
-
-  const runJob = async <T>(job: WslJob, runner: (abort: AbortController) => Promise<T>) => {
-    const abort = beginJob(job)
-    try {
-      const value = await runner(abort)
-      endJob(abort)
-      return value
-    } catch (error) {
-      if (error instanceof Error && error.name === "AbortError") {
-        endJob(abort)
-        return undefined
-      }
-      const err = error instanceof Error ? error : new Error(String(error))
-      endJob(abort)
-      throw err
-    }
-  }
-
-  return {
-    getState() {
-      return state
-    },
-    subscribe(listener: (event: WslServersEvent) => void) {
-      listeners.add(listener)
-      return () => listeners.delete(listener)
-    },
-
-    async initialize() {
-      refreshFromStore()
-      await Promise.all(state.servers.map((item) => startServer(item.config.id)))
-    },
-
-    async probeRuntime() {
-      await runJob({ kind: "runtime", startedAt: Date.now() }, async (abort) => {
-        const runtime = await probeWslRuntime({ signal: abort.signal })
-        setState({
-          runtime,
-          pendingRestart: state.pendingRestart && !runtime.available ? state.pendingRestart : false,
-        })
-      })
-    },
-
-    async refreshDistros() {
-      await runJob({ kind: "distros", startedAt: Date.now() }, async (abort) => {
-        setState(await refreshDistroLists({ signal: abort.signal }))
-      })
-    },
-
-    async installWsl() {
-      await runJob({ kind: "install-wsl", startedAt: Date.now() }, async (abort) => {
-        const result = await installWslRuntimeElevated({ signal: abort.signal })
-        if (result.code !== 0) {
-          const message = summarize(result.stderr || result.stdout) || "WSL installation failed"
-          throw new Error(message)
-        }
-        const pendingRestart = wslNeedsRestart(result)
-        setState({ pendingRestart })
-        if (!pendingRestart) {
-          const runtime = await probeWslRuntime({ signal: abort.signal })
-          setState({ runtime })
-        }
-      })
-    },
-
-    async installDistro(name: string) {
-      await runJob({ kind: "install-distro", distro: name, startedAt: Date.now() }, async (abort) => {
-        const result = await installWslDistro(name, { signal: abort.signal })
-        if (result.code !== 0) {
-          const message = summarize(result.stderr || result.stdout) || `Failed to install distro: ${name}`
-          throw new Error(message)
-        }
-        const distros = await refreshDistroLists({ signal: abort.signal })
-        const probe = await probeWslDistro(name, { signal: abort.signal })
-        setState({
-          ...distros,
-          distroProbes: { ...state.distroProbes, [name]: probe },
-        })
-      })
-    },
-
-    async probeDistro(name: string) {
-      await runJob({ kind: "probe-distro", distro: name, startedAt: Date.now() }, async (abort) => {
-        const probe = await probeWslDistro(name, { signal: abort.signal })
-        setState({ distroProbes: { ...state.distroProbes, [name]: probe } })
-      })
-    },
-
-    async probeOpencode(name: string) {
-      await runJob({ kind: "probe-opencode", distro: name, startedAt: Date.now() }, async (abort) => {
-        await refreshOpencodeCheck(name, { signal: abort.signal })
-      })
-    },
-
-    async installOpencode(name: string) {
-      await runJob({ kind: "install-opencode", distro: name, startedAt: Date.now() }, async (abort) => {
-        const resolved = await resolveWslOpencode(name, { signal: abort.signal })
-        const existingVersion = resolved
-          ? await readWslCommandVersion(resolved, name, { signal: abort.signal })
-          : null
-        const result =
-          resolved && existingVersion
-            ? await upgradeWslOpencode(appVersion, resolved, name, { signal: abort.signal })
-            : await installWslOpencode(appVersion, name, { signal: abort.signal })
-        if (result.code !== 0) {
-          throw new Error(summarize(result.stderr || result.stdout) || "OpenCode installation failed")
-        }
-        await refreshOpencodeCheck(name, { signal: abort.signal })
-      })
-    },
-
-    async openTerminal(name: string) {
-      await openWslTerminal(name)
-    },
-
-    async addServer(distro: string): Promise<WslServerConfig> {
-      const id = wslServerIdForDistro(distro)
-      if (state.servers.some((item) => item.config.id === id)) {
-        throw new Error(`${distro} is already added`)
-      }
-      const config: WslServerConfig = {
-        id,
-        distro,
-      }
-      persistServers([...readPersistedServers(), config])
-      setState({
-        servers: [...state.servers, { config, runtime: { kind: "starting" } }],
-      })
-      void startServer(id)
-      return config
-    },
-
-    async removeServer(id: string) {
-      invalidateStartAttempt(id)
-      await stopServerInternal(id)
-      const remaining = readPersistedServers().filter((item) => item.id !== id)
-      persistServers(remaining)
-      setState({ servers: state.servers.filter((item) => item.config.id !== id) })
-    },
-
-    startServer,
-
-    stopAll() {
-      for (const item of state.servers) invalidateStartAttempt(item.config.id)
-      for (const existing of sidecars.values()) {
-        try {
-          existing.listener.stop()
-        } catch {
-          // ignore
-        }
-      }
-      sidecars.clear()
-    },
-  }
-}
-
-function initialState(): WslServersState {
-  return {
-    runtime: null,
-    installed: [],
-    online: [],
-    distroProbes: {},
-    opencodeChecks: {},
-    pendingRestart: false,
-    servers: [],
-    job: null,
-  }
-}
-
-function readPersistedServers(): WslServerConfig[] {
-  const store = getStore()
-  const existing = store.get(WSL_SERVERS_KEY)
-  if (existing && typeof existing === "object") {
-    const record = existing as { servers?: unknown }
-    const list = Array.isArray(record.servers) ? record.servers : []
-    return list.flatMap(normalizePersistedServer)
-  }
-  return []
-}
-
-function normalizePersistedServer(value: unknown): WslServerConfig[] {
-  if (!value || typeof value !== "object") return []
-  const record = value as Record<string, unknown>
-  const distro = typeof record.distro === "string" && record.distro.length > 0 ? record.distro : null
-  if (!distro) return []
-  const id = typeof record.id === "string" && record.id.length > 0 ? record.id : wslServerIdForDistro(distro)
-  return [
-    {
-      id,
-      distro,
-    },
-  ]
-}
-
-function opencodeCheck(
-  distro: string,
-  resolvedPath: string | null,
-  version: string | null,
-  expectedVersion: string,
-): WslOpencodeCheck {
-  if (!resolvedPath) {
-    return {
-      distro,
-      resolvedPath: null,
-      version: null,
-      expectedVersion,
-      matchesDesktop: null,
-      error: "opencode is not installed in this distro",
-    }
-  }
-  if (!version) {
-    return {
-      distro,
-      resolvedPath,
-      version: null,
-      expectedVersion,
-      matchesDesktop: null,
-      error: "opencode is installed but could not run",
-    }
-  }
-  return {
-    distro,
-    resolvedPath,
-    version,
-    expectedVersion,
-    matchesDesktop: version === expectedVersion,
-    error: null,
-  }
-}
-
-function startupFailure(code: number | null, signal: NodeJS.Signals | null) {
-  return `WSL server exited after startup (code=${code ?? "null"} signal=${signal ?? "null"})`
-}
-
-// Re-export types used by callers
-export type {
-  WslInstalledDistro,
-  WslOnlineDistro,
-  WslRuntimeCheck,
-  WslDistroProbe,
-  WslOpencodeCheck,
-  WslServerConfig,
-  WslServerItem,
-  WslServerRuntime,
-  WslServersEvent,
-  WslServersState,
-}

packages/desktop-electron/src/main/wsl.ts

@@ -1,423 +0,0 @@
-import { spawn } from "node:child_process"
-import { existsSync } from "node:fs"
-import { join } from "node:path"
-/** @ts-expect-error */
-import * as pty from "@lydell/node-pty"
-import type { WslDistroProbe, WslInstalledDistro, WslOnlineDistro, WslRuntimeCheck } from "../preload/types"
-
-export type WslCommandLine = {
-  stream: "stdout" | "stderr"
-  text: string
-}
-
-export type WslCommandResult = {
-  code: number | null
-  signal: NodeJS.Signals | null
-  stdout: string
-  stderr: string
-}
-
-export type RunWslOptions = {
-  signal?: AbortSignal
-  /**
-   * Ceiling on how long we wait for the child process to exit. When the
-   * LXSS service or a specific distro wedges (e.g. Ubuntu-24.04 with a
-   * pending first-run prompt), `wsl.exe` never returns and any command
-   * that doesn't specify a timeout hangs the entire startup flow. Default
-   * is 20s — enough for slow cold-starts, short enough to fail fast on
-   * a wedge. Callers can override for longer-running jobs.
-   */
-  timeoutMs?: number
-}
-
-const DEFAULT_WSL_TIMEOUT_MS = 20_000
-const DEFAULT_WSL_INSTALL_TIMEOUT_MS = 15 * 60_000
-
-export function wslArgs(args: string[], distro?: string | null) {
-  if (distro) return ["-d", distro, "--", ...args]
-  return ["--", ...args]
-}
-
-export function runWsl(args: string[], opts: RunWslOptions = {}) {
-  return runCommand("wsl", args, opts)
-}
-
-function runPowerShell(command: string, opts: RunWslOptions = {}) {
-  return runCommand(
-    "powershell.exe",
-    ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", command],
-    opts,
-  )
-}
-
-function runCommand(command: string, args: string[], opts: RunWslOptions = {}) {
-  return new Promise<WslCommandResult>((resolve, reject) => {
-    const child = spawn(command, args, {
-      stdio: ["ignore", "pipe", "pipe"],
-      windowsHide: true,
-      signal: opts.signal,
-    })
-
-    // Guard every wsl.exe invocation with a timeout. When the distro or
-    // the LXSS service is wedged (Ubuntu first-run state, Windows update
-    // pending, etc.) wsl.exe produces no output and never exits; without
-    // this the whole sidecar spawn flow stalls the app forever.
-    const timeoutMs = opts.timeoutMs ?? DEFAULT_WSL_TIMEOUT_MS
-    const timeoutId = setTimeout(() => {
-      try {
-        child.kill()
-      } catch {
-        /* ignore */
-      }
-      reject(new Error(`${command} ${args.join(" ")} timed out after ${timeoutMs}ms`))
-    }, timeoutMs)
-
-    let stdout = ""
-    let stderr = ""
-    const stdoutDecoder = createOutputDecoder()
-    const stderrDecoder = createOutputDecoder()
-
-    const append = (stream: WslCommandLine["stream"], chunk: string) => {
-      if (!chunk) return
-      if (stream === "stdout") {
-        stdout += chunk
-        return
-      }
-      stderr += chunk
-    }
-
-    child.stdout.on("data", (chunk: Buffer) => {
-      append("stdout", stdoutDecoder.decode(chunk))
-    })
-    child.stdout.on("end", () => {
-      append("stdout", stdoutDecoder.flush())
-    })
-
-    child.stderr.on("data", (chunk: Buffer) => {
-      append("stderr", stderrDecoder.decode(chunk))
-    })
-    child.stderr.on("end", () => {
-      append("stderr", stderrDecoder.flush())
-    })
-
-    child.once("error", (error) => {
-      clearTimeout(timeoutId)
-      reject(error)
-    })
-    child.once("close", (code, signal) => {
-      clearTimeout(timeoutId)
-      resolve({ code, signal, stdout, stderr })
-    })
-  })
-}
-
-function runInteractiveCommand(command: string, args: string[], opts: RunWslOptions = {}, defaultTimeoutMs: number) {
-  return new Promise<WslCommandResult>((resolve, reject) => {
-    const child = pty.spawn(command, args, {
-      name: "xterm-color",
-      cols: 80,
-      rows: 24,
-      cwd: process.cwd(),
-      env: process.env,
-      useConpty: true,
-    })
-
-    let settled = false
-    let stdout = ""
-
-    const cleanup = () => {
-      clearTimeout(timeoutId)
-      abortCleanup?.()
-    }
-
-    const timeoutMs = opts.timeoutMs ?? defaultTimeoutMs
-    const timeoutId = setTimeout(() => {
-      try {
-        child.kill()
-      } catch {
-        /* ignore */
-      }
-      if (settled) return
-      settled = true
-      cleanup()
-      reject(new Error(`${command} ${args.join(" ")} timed out after ${timeoutMs}ms`))
-    }, timeoutMs)
-
-    const abortHandler = () => {
-      try {
-        child.kill()
-      } catch {
-        /* ignore */
-      }
-      if (settled) return
-      settled = true
-      cleanup()
-      reject(new DOMException("Aborted", "AbortError"))
-    }
-    const abortCleanup = opts.signal
-      ? (() => {
-          opts.signal?.addEventListener("abort", abortHandler, { once: true })
-          return () => opts.signal?.removeEventListener("abort", abortHandler)
-        })()
-      : undefined
-
-    child.onData((data: string) => {
-      stdout += data
-    })
-    child.onExit((event: { exitCode: number }) => {
-      if (settled) return
-      settled = true
-      cleanup()
-      resolve({ code: event.exitCode, signal: null, stdout, stderr: "" })
-    })
-  })
-}
-
-function createOutputDecoder() {
-  let decoder: TextDecoder | undefined
-  return {
-    decode(chunk: Buffer) {
-      decoder ??= new TextDecoder(detectOutputEncoding(chunk))
-      return decoder.decode(chunk, { stream: true })
-    },
-    flush() {
-      return decoder?.decode() ?? ""
-    },
-  }
-}
-
-function detectOutputEncoding(chunk: Uint8Array) {
-  if (chunk[0] === 0xff && chunk[1] === 0xfe) return "utf-16le"
-  const pairs = Math.floor(chunk.length / 2)
-  if (pairs < 2) return "utf-8"
-  const oddZeroes = Array.from({ length: pairs }).filter((_, index) => chunk[index * 2 + 1] === 0).length
-  const evenZeroes = Array.from({ length: pairs }).filter((_, index) => chunk[index * 2] === 0).length
-  return oddZeroes >= Math.ceil(pairs / 3) && evenZeroes * 2 <= oddZeroes ? "utf-16le" : "utf-8"
-}
-
-export function runWslInDistro(args: string[], distro?: string | null, opts?: RunWslOptions) {
-  return runWsl(wslArgs(args, distro), opts)
-}
-
-export function runWslSh(script: string, distro?: string | null, opts?: RunWslOptions) {
-  return runWslInDistro(["sh", "-lc", script], distro, opts)
-}
-
-export async function probeWslRuntime(opts?: RunWslOptions): Promise<WslRuntimeCheck> {
-  const version = await runWsl(["--version"], opts).catch((error) => ({
-    code: 1,
-    signal: null,
-    stdout: "",
-    stderr: error instanceof Error ? error.message : String(error),
-  }))
-
-  if (version.code !== 0) {
-    return {
-      available: false,
-      version: null,
-      error: summarize(version.stderr || version.stdout) || "WSL is unavailable",
-    }
-  }
-
-  return {
-    available: true,
-    version: firstLine(version.stdout),
-    error: null,
-  }
-}
-
-export async function listInstalledWslDistros(opts?: RunWslOptions) {
-  const result = await runWsl(["--list", "--verbose"], opts)
-  if (result.code !== 0) {
-    throw new Error(summarize(result.stderr || result.stdout) || "Failed to list installed WSL distros")
-  }
-  return parseInstalledDistros(result.stdout)
-}
-
-export async function listOnlineWslDistros(opts?: RunWslOptions) {
-  const result = await runWsl(["--list", "--online"], opts)
-  if (result.code !== 0) {
-    throw new Error(summarize(result.stderr || result.stdout) || "Failed to list online WSL distros")
-  }
-  return parseOnlineDistros(result.stdout)
-}
-
-export async function installWslRuntimeElevated(opts?: RunWslOptions) {
-  const script = [
-    "$ErrorActionPreference = 'Stop'",
-    "$process = Start-Process -FilePath 'wsl.exe' -Verb RunAs -ArgumentList @('--install','--no-distribution') -Wait -PassThru",
-    "if ($null -ne $process.ExitCode) { exit $process.ExitCode }",
-  ].join("; ")
-  return runPowerShell(script, withTimeout(opts, DEFAULT_WSL_INSTALL_TIMEOUT_MS))
-}
-
-export async function installWslDistro(name: string, opts?: RunWslOptions) {
-  return runInteractiveCommand(
-    resolveSystem32Command("wsl.exe"),
-    ["--install", "-d", name, "--web-download", "--no-launch"],
-    withTimeout(opts, DEFAULT_WSL_INSTALL_TIMEOUT_MS),
-    DEFAULT_WSL_INSTALL_TIMEOUT_MS,
-  )
-}
-
-export async function installWslOpencode(version: string, distro: string, opts?: RunWslOptions) {
-  return runInteractiveCommand(
-    resolveSystem32Command("wsl.exe"),
-    wslArgs(["bash", "-lc", `curl -fsSL https://opencode.ai/install | bash -s -- --version ${shellEscape(version)}`], distro),
-    withTimeout(opts, DEFAULT_WSL_INSTALL_TIMEOUT_MS),
-    DEFAULT_WSL_INSTALL_TIMEOUT_MS,
-  )
-}
-
-export function wslNeedsRestart(result: WslCommandResult) {
-  return /restart|reboot/i.test(`${result.stdout}\n${result.stderr}`)
-}
-
-export async function probeWslDistro(name: string, opts?: RunWslOptions): Promise<WslDistroProbe> {
-  const executable = await runWslInDistro(["/bin/true"], name, opts).catch((error) => ({
-    code: 1,
-    signal: null,
-    stdout: "",
-    stderr: error instanceof Error ? error.message : String(error),
-  }))
-  if (executable.code !== 0) {
-    return {
-      name,
-      canExecute: false,
-      hasBash: false,
-      hasCurl: false,
-      error: summarize(executable.stderr || executable.stdout) || "Cannot execute commands in distro",
-    }
-  }
-
-  const [bash, curl] = await Promise.all([
-    runWslSh("command -v bash >/dev/null && printf yes || printf no", name, opts),
-    runWslSh("command -v curl >/dev/null && printf yes || printf no", name, opts),
-  ])
-
-  return {
-    name,
-    canExecute: true,
-    hasBash: bash.code === 0 && summarize(bash.stdout) === "yes",
-    hasCurl: curl.code === 0 && summarize(curl.stdout) === "yes",
-    error: null,
-  }
-}
-
-export async function resolveWslHome(distro?: string | null, opts?: RunWslOptions) {
-  return firstLine((await runWslSh('printf "%s\\n" "$HOME"', distro, opts)).stdout) ?? "/"
-}
-
-export async function resolveWslOpencode(distro: string, opts?: RunWslOptions) {
-  const command = firstLine((await runWslSh("command -v opencode 2>/dev/null | grep -v '^/mnt/' | head -n 1 || true", distro, opts)).stdout)
-  if (command) return command
-
-  for (const candidate of [
-    'if [ -x "${XDG_BIN_DIR:-$HOME/.local/bin}/opencode" ]; then printf "%s\\n" "${XDG_BIN_DIR:-$HOME/.local/bin}/opencode"; fi',
-    'if [ -x "$HOME/bin/opencode" ]; then printf "%s\\n" "$HOME/bin/opencode"; fi',
-    'if [ -x "$HOME/.opencode/bin/opencode" ]; then printf "%s\\n" "$HOME/.opencode/bin/opencode"; fi',
-    'if [ -x "/usr/local/bin/opencode" ]; then printf "%s\\n" "/usr/local/bin/opencode"; fi',
-  ]) {
-    const resolved = firstLine((await runWslSh(candidate, distro, opts)).stdout)
-    if (resolved) return resolved
-  }
-
-  return null
-}
-
-export async function readWslCommandVersion(command: string, distro: string, opts?: RunWslOptions) {
-  const result = await runWslSh(`${shellEscape(command)} --version 2>/dev/null || true`, distro, opts)
-  return firstLine(result.stdout)
-}
-
-export async function upgradeWslOpencode(target: string, command: string, distro: string, opts?: RunWslOptions) {
-  return runInteractiveCommand(
-    resolveSystem32Command("wsl.exe"),
-    wslArgs(["bash", "-lc", `${shellEscape(command)} upgrade ${shellEscape(target)}`], distro),
-    withTimeout(opts, DEFAULT_WSL_INSTALL_TIMEOUT_MS),
-    DEFAULT_WSL_INSTALL_TIMEOUT_MS,
-  )
-}
-
-export function openWslTerminal(distro?: string | null) {
-  if (distro && !/^[a-zA-Z0-9_.-]+$/.test(distro)) {
-    return Promise.reject(new Error("Invalid distro name"))
-  }
-  return new Promise<void>((resolve, reject) => {
-    const child = spawn("cmd.exe", ["/c", "start", "", "wsl", ...(distro ? ["-d", distro] : [])], {
-      detached: true,
-      stdio: "ignore",
-      windowsHide: true,
-    })
-    child.once("error", reject)
-    child.once("spawn", () => {
-      child.unref()
-      resolve()
-    })
-  })
-}
-
-function parseInstalledDistros(output: string) {
-  return output.split(/\r?\n/g).flatMap((line) => {
-    const trimmed = line.trim()
-    if (!trimmed) return []
-    const match = line.match(/^\s*(\*)?\s*(.*?)\s{2,}\S+\s+(\d+)\s*$/)
-    if (!match) return []
-    const [, marker, name, version] = match
-    if (!name || /^name$/i.test(name)) return []
-    return [
-      {
-        name: name.trim(),
-        version: Number.isNaN(Number.parseInt(version, 10)) ? null : Number.parseInt(version, 10),
-        isDefault: marker === "*",
-      } satisfies WslInstalledDistro,
-    ]
-  })
-}
-
-function parseOnlineDistros(output: string) {
-  return output.split(/\r?\n/g).flatMap((line) => {
-    const trimmed = line.trim()
-    if (!trimmed) return []
-    const match = trimmed.match(/^([A-Za-z0-9._-]+)\s{2,}(.+)$/)
-    if (!match) return []
-    const [, name, label] = match
-    if (/^name$/i.test(name)) return []
-    return [{ name, label: label.trim() } satisfies WslOnlineDistro]
-  })
-}
-
-function firstLine(value: string) {
-  return (
-    value
-      .split(/\r?\n/g)
-      .map((line) => line.trim())
-      .find(Boolean) ?? null
-  )
-}
-
-export function summarize(value: string) {
-  return value
-    .split(/\r?\n/g)
-    .map((line) => line.trim())
-    .filter(Boolean)
-    .join("\n")
-}
-
-export function shellEscape(value: string) {
-  return `'${value.replace(/'/g, `'"'"'`)}'`
-}
-
-function resolveSystem32Command(command: string) {
-  const root = process.env.SystemRoot ?? process.env.windir
-  if (!root) return command
-  const resolved = join(root, "System32", command)
-  return existsSync(resolved) ? resolved : command
-}
-
-function withTimeout(opts: RunWslOptions | undefined, timeoutMs: number): RunWslOptions {
-  return {
-    ...opts,
-    timeoutMs: opts?.timeoutMs ?? timeoutMs,
-  }
-}

packages/desktop-electron/src/preload/index.ts

@@ -1,5 +1,5 @@
 import { contextBridge, ipcRenderer } from "electron"
-import type { ElectronAPI, InitStep, SqliteMigrationProgress, WslServersEvent } from "./types"
+import type { ElectronAPI, InitStep, SqliteMigrationProgress } from "./types"
 
 const api: ElectronAPI = {
   killSidecar: () => ipcRenderer.invoke("kill-sidecar"),
@@ -11,38 +11,17 @@ const api: ElectronAPI = {
       ipcRenderer.removeListener("init-step", handler)
     })
   },
-  wslServers: {
-    getState: () => ipcRenderer.invoke("wsl-servers-get-state"),
-    subscribe: (cb) => {
-      const handler = (_: unknown, event: WslServersEvent) => cb(event)
-      ipcRenderer.on("wsl-servers-event", handler)
-      void ipcRenderer.invoke("wsl-servers-subscribe")
-      return () => {
-        ipcRenderer.removeListener("wsl-servers-event", handler)
-        void ipcRenderer.invoke("wsl-servers-unsubscribe")
-      }
-    },
-    probeRuntime: () => ipcRenderer.invoke("wsl-servers-probe-runtime"),
-    refreshDistros: () => ipcRenderer.invoke("wsl-servers-refresh-distros"),
-    installWsl: () => ipcRenderer.invoke("wsl-servers-install-wsl"),
-    installDistro: (name) => ipcRenderer.invoke("wsl-servers-install-distro", name),
-    probeDistro: (name) => ipcRenderer.invoke("wsl-servers-probe-distro", name),
-    probeOpencode: (name) => ipcRenderer.invoke("wsl-servers-probe-opencode", name),
-    installOpencode: (name) => ipcRenderer.invoke("wsl-servers-install-opencode", name),
-    openTerminal: (name) => ipcRenderer.invoke("wsl-servers-open-terminal", name),
-    addServer: (distro) => ipcRenderer.invoke("wsl-servers-add", distro),
-    removeServer: (id) => ipcRenderer.invoke("wsl-servers-remove", id),
-    startServer: (id) => ipcRenderer.invoke("wsl-servers-start", id),
-  },
   getWindowConfig: () => ipcRenderer.invoke("get-window-config"),
   consumeInitialDeepLinks: () => ipcRenderer.invoke("consume-initial-deep-links"),
   getDefaultServerUrl: () => ipcRenderer.invoke("get-default-server-url"),
   setDefaultServerUrl: (url) => ipcRenderer.invoke("set-default-server-url", url),
+  getWslConfig: () => ipcRenderer.invoke("get-wsl-config"),
+  setWslConfig: (config) => ipcRenderer.invoke("set-wsl-config", config),
   getDisplayBackend: () => ipcRenderer.invoke("get-display-backend"),
   setDisplayBackend: (backend) => ipcRenderer.invoke("set-display-backend", backend),
   parseMarkdownCommand: (markdown) => ipcRenderer.invoke("parse-markdown", markdown),
   checkAppExists: (appName) => ipcRenderer.invoke("check-app-exists", appName),
-  wslPath: (path, mode, distro) => ipcRenderer.invoke("wsl-path", path, mode, distro),
+  wslPath: (path, mode) => ipcRenderer.invoke("wsl-path", path, mode),
   resolveAppPath: (appName) => ipcRenderer.invoke("resolve-app-path", appName),
   storeGet: (name, key) => ipcRenderer.invoke("store-get", name, key),
   storeSet: (name, key, value) => ipcRenderer.invoke("store-set", name, key, value),

packages/desktop-electron/src/preload/types.ts

@@ -8,87 +8,7 @@ export type ServerReadyData = {
 
 export type SqliteMigrationProgress = { type: "InProgress"; value: number } | { type: "Done" }
 
-export type WslRuntimeCheck = {
-  available: boolean
-  version: string | null
-  error: string | null
-}
-export type WslInstalledDistro = {
-  name: string
-  version: number | null
-  isDefault: boolean
-}
-export type WslOnlineDistro = {
-  name: string
-  label: string
-}
-export type WslDistroProbe = {
-  name: string
-  canExecute: boolean
-  hasBash: boolean
-  hasCurl: boolean
-  error: string | null
-}
-export type WslOpencodeCheck = {
-  distro: string
-  resolvedPath: string | null
-  version: string | null
-  expectedVersion: string | null
-  matchesDesktop: boolean | null
-  error: string | null
-}
-export type WslServerConfig = {
-  id: string
-  distro: string
-}
-
-export type WslServerRuntime =
-  | { kind: "starting" }
-  | { kind: "ready"; url: string; username: string | null; password: string | null }
-  | { kind: "failed"; message: string }
-  | { kind: "stopped" }
-
-export type WslServerItem = {
-  config: WslServerConfig
-  runtime: WslServerRuntime
-}
-
-export type WslJob =
-  | { kind: "runtime"; startedAt: number }
-  | { kind: "distros"; startedAt: number }
-  | { kind: "install-wsl"; startedAt: number }
-  | { kind: "install-distro"; distro: string; startedAt: number }
-  | { kind: "probe-distro"; distro: string; startedAt: number }
-  | { kind: "probe-opencode"; distro: string; startedAt: number }
-  | { kind: "install-opencode"; distro: string; startedAt: number }
-
-export type WslServersState = {
-  runtime: WslRuntimeCheck | null
-  installed: WslInstalledDistro[]
-  online: WslOnlineDistro[]
-  distroProbes: Record<string, WslDistroProbe>
-  opencodeChecks: Record<string, WslOpencodeCheck>
-  pendingRestart: boolean
-  servers: WslServerItem[]
-  job: WslJob | null
-}
-export type WslServersEvent = { type: "state"; state: WslServersState }
-
-export type WslServersAPI = {
-  getState: () => Promise<WslServersState>
-  subscribe: (cb: (event: WslServersEvent) => void) => () => void
-  probeRuntime: () => Promise<void>
-  refreshDistros: () => Promise<void>
-  installWsl: () => Promise<void>
-  installDistro: (name: string) => Promise<void>
-  probeDistro: (name: string) => Promise<void>
-  probeOpencode: (name: string) => Promise<void>
-  installOpencode: (name: string) => Promise<void>
-  openTerminal: (name: string) => Promise<void>
-  addServer: (distro: string) => Promise<WslServerConfig>
-  removeServer: (id: string) => Promise<void>
-  startServer: (id: string) => Promise<void>
-}
+export type WslConfig = { enabled: boolean }
 
 export type LinuxDisplayBackend = "wayland" | "auto"
 export type TitlebarTheme = {
@@ -103,16 +23,17 @@ export type ElectronAPI = {
   killSidecar: () => Promise<void>
   installCli: () => Promise<string>
   awaitInitialization: (onStep: (step: InitStep) => void) => Promise<ServerReadyData>
-  wslServers: WslServersAPI
   getWindowConfig: () => Promise<WindowConfig>
   consumeInitialDeepLinks: () => Promise<string[]>
   getDefaultServerUrl: () => Promise<string | null>
   setDefaultServerUrl: (url: string | null) => Promise<void>
+  getWslConfig: () => Promise<WslConfig>
+  setWslConfig: (config: WslConfig) => Promise<void>
   getDisplayBackend: () => Promise<LinuxDisplayBackend | null>
   setDisplayBackend: (backend: LinuxDisplayBackend | null) => Promise<void>
   parseMarkdownCommand: (markdown: string) => Promise<string>
   checkAppExists: (appName: string) => Promise<boolean>
-  wslPath: (path: string, mode: "windows" | "linux" | null, distro?: string | null) => Promise<string>
+  wslPath: (path: string, mode: "windows" | "linux" | null) => Promise<string>
   resolveAppPath: (appName: string) => Promise<string | null>
   storeGet: (name: string, key: string) => Promise<string | null>
   storeSet: (name: string, key: string, value: string) => Promise<void>

packages/desktop-electron/src/renderer/env.d.ts

@@ -5,7 +5,6 @@ declare global {
     api: ElectronAPI
     __OPENCODE__?: {
       deepLinks?: string[]
-      activeServer?: string
     }
   }
 }

packages/desktop-electron/src/renderer/index.tsx

@@ -13,18 +13,16 @@ import {
   PlatformProvider,
   ServerConnection,
   useCommand,
-  useWslServers,
 } from "@opencode-ai/app"
 import * as Sentry from "@sentry/solid"
 import type { AsyncStorage } from "@solid-primitives/storage"
 import { MemoryRouter } from "@solidjs/router"
-import { createEffect, createMemo, createResource, onCleanup, onMount } from "solid-js"
+import { createEffect, createResource, onCleanup, onMount, Show } from "solid-js"
 import { render } from "solid-js/web"
 import pkg from "../../package.json"
 import { initI18n, t } from "./i18n"
 import { webviewZoom } from "./webview-zoom"
 import "./styles.css"
-import { Splash } from "@opencode-ai/ui/logo"
 import { useTheme } from "@opencode-ai/ui/theme"
 
 const root = document.getElementById("root")
@@ -77,26 +75,25 @@ const createPlatform = (): Platform => {
     return undefined
   })()
 
-  const activeWslDistro = () => {
-    const key = window.__OPENCODE__?.activeServer
-    if (!key || !key.startsWith("wsl:")) return undefined
-    return key.slice("wsl:".length)
+  const isWslEnabled = async () => {
+    if (os !== "windows") return false
+    return window.api
+      .getWslConfig()
+      .then((config) => config.enabled)
+      .catch(() => false)
   }
 
   const wslHome = async () => {
-    const distro = activeWslDistro()
-    if (!distro) return undefined
-    return window.api.wslPath("~", "windows", distro)
+    if (!(await isWslEnabled())) return undefined
+    return window.api.wslPath("~", "windows").catch(() => undefined)
   }
 
-  const handleWslPicker = async <T extends string | string[] | null>(result: T): Promise<T> => {
-    const distro = activeWslDistro()
-    if (!result || !distro) return result
-    const convert = (path: string) => window.api.wslPath(path, "linux", distro)
+  const handleWslPicker = async <T extends string | string[]>(result: T | null): Promise<T | null> => {
+    if (!result || !(await isWslEnabled())) return result
     if (Array.isArray(result)) {
-      return (await Promise.all(result.map(convert))) as T
+      return Promise.all(result.map((path) => window.api.wslPath(path, "linux").catch(() => path))) as any
     }
-    return (await convert(result)) as T
+    return window.api.wslPath(result, "linux").catch(() => result) as any
   }
 
   const storage = (() => {
@@ -126,8 +123,6 @@ const createPlatform = (): Platform => {
     }
   })()
 
-  const wslServersApi = os === "windows" ? window.api.wslServers : undefined
-
   return {
     platform: "desktop",
     os,
@@ -168,8 +163,10 @@ const createPlatform = (): Platform => {
       if (os === "windows") {
         const resolvedApp = app ? await window.api.resolveAppPath(app).catch(() => null) : null
         const resolvedPath = await (async () => {
-          const distro = activeWslDistro()
-          if (distro) return window.api.wslPath(path, "windows", distro)
+          if (await isWslEnabled()) {
+            const converted = await window.api.wslPath(path, "windows").catch(() => null)
+            if (converted) return converted
+          }
           return path
         })()
         return window.api.openPath(resolvedPath, resolvedApp ?? undefined)
@@ -220,7 +217,16 @@ const createPlatform = (): Platform => {
       }
     },
 
-    fetch,
+    fetch: (input, init) => {
+      if (input instanceof Request) return fetch(input)
+      return fetch(input, init)
+    },
+
+    getWslEnabled: () => isWslEnabled(),
+
+    setWslEnabled: async (enabled) => {
+      await window.api.setWslConfig({ enabled })
+    },
 
     getDefaultServer: async () => {
       const url = await window.api.getDefaultServerUrl().catch(() => null)
@@ -232,8 +238,6 @@ const createPlatform = (): Platform => {
       await window.api.setDefaultServerUrl(url)
     },
 
-    wslServers: wslServersApi,
-
     getDisplayBackend: async () => {
       return window.api.getDisplayBackend().catch(() => null)
     },
@@ -269,6 +273,7 @@ listenForDeepLinks()
 
 render(() => {
   const platform = createPlatform()
+  const [windowConfig] = createResource(() => window.api.getWindowConfig().catch(() => ({ updaterEnabled: false })))
   const loadLocale = async () => {
     const current = await platform.storage?.("opencode.global.dat").getItem("language")
     const legacy = current ? undefined : await platform.storage?.().getItem("language.v1")
@@ -283,11 +288,32 @@ render(() => {
 
   const [windowCount] = createResource(() => window.api.getWindowCount())
 
+  // Fetch sidecar credentials (available immediately, before health check)
   const [sidecar] = createResource(() => window.api.awaitInitialization(() => undefined))
 
-  const [defaultServer] = createResource(() => platform.getDefaultServer?.())
+  const [defaultServer] = createResource(() =>
+    platform.getDefaultServer?.().then((url) => {
+      if (url) return ServerConnection.key({ type: "http", http: { url } })
+    }),
+  )
   const [locale] = createResource(loadLocale)
 
+  const servers = () => {
+    const data = sidecar()
+    if (!data) return []
+    const server: ServerConnection.Sidecar = {
+      displayName: "Local Server",
+      type: "sidecar",
+      variant: "base",
+      http: {
+        url: data.url,
+        username: data.username ?? undefined,
+        password: data.password ?? undefined,
+      },
+    }
+    return [server] as ServerConnection.Any[]
+  }
+
   function handleClick(e: MouseEvent) {
     const link = (e.target as HTMLElement).closest("a.external-link") as HTMLAnchorElement | null
     if (link?.href) {
@@ -314,66 +340,6 @@ render(() => {
     return null
   }
 
-  function App() {
-    const wslServers = useWslServers()
-    const splash = (
-      <div class="h-dvh w-screen flex flex-col items-center justify-center bg-background-base">
-        <Splash class="w-16 h-20 opacity-50 animate-pulse" />
-      </div>
-    )
-
-    const ready = createMemo(
-      () =>
-        !defaultServer.loading &&
-        !sidecar.loading &&
-        !windowCount.loading &&
-        !locale.loading,
-    )
-    const servers = createMemo(() => {
-      const data = sidecar()
-      const list: ServerConnection.Any[] = []
-      if (data) {
-        list.push({
-          displayName: "Local Server",
-          type: "sidecar",
-          variant: "base",
-          http: {
-            url: data.url,
-            username: data.username ?? undefined,
-            password: data.password ?? undefined,
-          },
-        })
-      }
-      for (const item of wslServers.data?.servers ?? []) {
-        const runtime = item.runtime
-        if (runtime.kind !== "ready") continue
-        list.push({
-          displayName: item.config.distro,
-          type: "sidecar",
-          variant: "wsl",
-          distro: item.config.distro,
-          http: {
-            url: runtime.url,
-            username: runtime.username ?? undefined,
-            password: runtime.password ?? undefined,
-          },
-        })
-      }
-      return list
-    })
-    if (!ready()) return splash
-
-    return (
-      <AppInterface
-        defaultServer={defaultServer.latest ?? ServerConnection.Key.make("sidecar")}
-        servers={servers()}
-        router={MemoryRouter}
-      >
-        <Inner />
-      </AppInterface>
-    )
-  }
-
   onMount(() => {
     document.addEventListener("click", handleClick)
     onCleanup(() => {
@@ -384,7 +350,27 @@ render(() => {
   return (
     <PlatformProvider value={platform}>
       <AppBaseProviders locale={locale.latest}>
-        <App />
+        <Show
+          when={
+            !defaultServer.loading &&
+            !sidecar.loading &&
+            !windowConfig.loading &&
+            !windowCount.loading &&
+            !locale.loading
+          }
+        >
+          {(_) => {
+            return (
+              <AppInterface
+                defaultServer={defaultServer.latest ?? ServerConnection.Key.make("sidecar")}
+                servers={servers()}
+                router={MemoryRouter}
+              >
+                <Inner />
+              </AppInterface>
+            )
+          }}
+        </Show>
       </AppBaseProviders>
     </PlatformProvider>
   )

packages/desktop/src/index.tsx

@@ -71,11 +71,16 @@ const createPlatform = (): Platform => {
   })()
 
   const wslHome = async () => {
-    return undefined
+    if (os !== "windows" || !window.__OPENCODE__?.wsl) return undefined
+    return commands.wslPath("~", "windows").catch(() => undefined)
   }
 
   const handleWslPicker = async <T extends string | string[]>(result: T | null): Promise<T | null> => {
-    return result
+    if (!result || !window.__OPENCODE__?.wsl) return result
+    if (Array.isArray(result)) {
+      return Promise.all(result.map((path) => commands.wslPath(path, "linux").catch(() => path))) as any
+    }
+    return commands.wslPath(result, "linux").catch(() => result) as any
   }
 
   return {
@@ -344,6 +349,16 @@ const createPlatform = (): Platform => {
       }
     },
 
+    getWslEnabled: async () => {
+      const next = await commands.getWslConfig().catch(() => null)
+      if (next) return next.enabled
+      return window.__OPENCODE__!.wsl ?? false
+    },
+
+    setWslEnabled: async (enabled) => {
+      await commands.setWslConfig({ enabled })
+    },
+
     getDefaultServer: async () => {
       const url = await commands.getDefaultServerUrl().catch(() => null)
       if (!url) return null

packages/opencode/package.json

@@ -80,7 +80,7 @@
   "dependencies": {
     "@actions/core": "1.11.1",
     "@actions/github": "6.0.1",
-    "@agentclientprotocol/sdk": "0.16.1",
+    "@agentclientprotocol/sdk": "0.21.0",
     "@ai-sdk/alibaba": "1.0.17",
     "@ai-sdk/amazon-bedrock": "4.0.96",
     "@ai-sdk/anthropic": "3.0.71",

packages/opencode/src/acp/agent.ts

@@ -5,6 +5,8 @@ import {
   type AuthenticateRequest,
   type AuthMethod,
   type CancelNotification,
+  type CloseSessionRequest,
+  type CloseSessionResponse,
   type ForkSessionRequest,
   type ForkSessionResponse,
   type InitializeRequest,
@@ -565,6 +567,7 @@ export class Agent implements ACPAgent {
           image: true,
         },
         sessionCapabilities: {
+          close: {},
           fork: {},
           list: {},
           resume: {},
@@ -797,7 +800,7 @@ export class Agent implements ACPAgent {
     }
   }
 
-  async unstable_resumeSession(params: ResumeSessionRequest): Promise<ResumeSessionResponse> {
+  async resumeSession(params: ResumeSessionRequest): Promise<ResumeSessionResponse> {
     const directory = params.cwd
     const sessionId = params.sessionId
     const mcpServers = params.mcpServers ?? []
@@ -828,6 +831,27 @@ export class Agent implements ACPAgent {
     }
   }
 
+  async closeSession(params: CloseSessionRequest): Promise<CloseSessionResponse> {
+    const session = this.sessionManager.remove(params.sessionId)
+    if (!session) return {}
+
+    await this.sdk.session
+      .abort(
+        {
+          sessionID: params.sessionId,
+          directory: session.cwd,
+        },
+        { throwOnError: true },
+      )
+      .catch((error) => {
+        log.error("failed to abort session while closing ACP session", { error, sessionID: params.sessionId })
+      })
+
+    this.permissionQueues.delete(params.sessionId)
+    log.info("close_session", { sessionId: params.sessionId })
+    return {}
+  }
+
   private async processMessage(message: SessionMessageResponse) {
     log.debug("process message", message)
     if (message.info.role !== "assistant" && message.info.role !== "user") return

packages/opencode/src/acp/session.ts

@@ -113,4 +113,10 @@ export class ACPSessionManager {
     this.sessions.set(sessionId, session)
     return session
   }
+
+  remove(sessionId: string): ACPSessionState | undefined {
+    const session = this.sessions.get(sessionId)
+    this.sessions.delete(sessionId)
+    return session
+  }
 }

packages/opencode/src/cli/cmd/serve.ts

@@ -2,7 +2,6 @@ import { Effect } from "effect"
 import { Server } from "../../server/server"
 import { effectCmd } from "../effect-cmd"
 import { withNetworkOptions, resolveNetworkOptions } from "../network"
-import { bootstrap } from "../bootstrap"
 import { Flag } from "@opencode-ai/core/flag/flag"
 
 export const ServeCommand = effectCmd({
@@ -16,7 +15,7 @@ export const ServeCommand = effectCmd({
     if (!Flag.OPENCODE_SERVER_PASSWORD) {
       console.log("Warning: OPENCODE_SERVER_PASSWORD is not set; server is unsecured.")
     }
-    const opts = yield* Effect.promise(() => bootstrap(process.cwd(), () => resolveNetworkOptions(args)))
+    const opts = yield* Effect.promise(() => resolveNetworkOptions(args))
     const server = yield* Effect.promise(() => Server.listen(opts))
     console.log(`opencode server listening on http://${server.hostname}:${server.port}`)
 

packages/opencode/src/cli/cmd/tui/app.tsx

@@ -779,15 +779,6 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
         dialog.clear()
       },
     },
-    {
-      title: kv.get("clear_prompt_save_history", false) ? "Don't include cleared prompts in history" : "Include cleared prompts in history",
-      value: "app.toggle.clear_prompt_history",
-      category: "System",
-      onSelect: (dialog) => {
-        kv.set("clear_prompt_save_history", !kv.get("clear_prompt_save_history", false))
-        dialog.clear()
-      },
-    },
   ])
 
   event.on(TuiEvent.CommandExecute.type, (evt) => {

packages/opencode/src/cli/cmd/tui/component/prompt/history.tsx

@@ -82,7 +82,6 @@ export const { use: usePromptHistory, provider: PromptHistoryProvider } = create
         return store.history.at(store.index)
       },
       append(item: PromptInfo) {
-        if (store.history.at(-1)?.input === item.input) return
         const entry = structuredClone(unwrap(item))
         let trimmed = false
         setStore(

packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx

@@ -136,7 +136,6 @@ export function Prompt(props: PromptProps) {
   const dimensions = useTerminalDimensions()
   const { theme, syntax } = useTheme()
   const kv = useKV()
-  const [autoaccept, setAutoaccept] = kv.signal<"none" | "edit">("permission_auto_accept", "edit")
   const animationsEnabled = createMemo(() => kv.get("animations_enabled", true))
   const list = createMemo(() => props.placeholders?.normal ?? [])
   const shell = createMemo(() => props.placeholders?.shell ?? [])
@@ -175,7 +174,7 @@ export function Prompt(props: PromptProps) {
   let lastSubmittedEditorSelectionKey: string | undefined
   const [auto, setAuto] = createSignal<AutocompleteRef>()
   const currentProviderLabel = createMemo(() => local.model.parsed().provider)
-  const hasRightContent = createMemo(() => Boolean(props.right) || autoaccept() === "edit")
+  const hasRightContent = createMemo(() => Boolean(props.right))
 
   function promptModelWarning() {
     toast.show({
@@ -297,17 +296,6 @@ export function Prompt(props: PromptProps) {
 
   command.register(() => {
     return [
-      {
-        title: autoaccept() === "none" ? "Enable autoedit" : "Disable autoedit",
-        value: "permission.auto_accept.toggle",
-        search: "toggle permissions",
-        keybind: "permission_auto_accept_toggle",
-        category: "Agent",
-        onSelect: (dialog) => {
-          setAutoaccept(() => (autoaccept() === "none" ? "edit" : "none"))
-          dialog.clear()
-        },
-      },
       {
         title: "Clear prompt",
         value: "prompt.clear",
@@ -1136,12 +1124,6 @@ export function Prompt(props: PromptProps) {
                   // If no image, let the default paste behavior continue
                 }
                 if (keybind.match("input_clear", e) && store.prompt.input !== "") {
-                  if (kv.get("clear_prompt_save_history", false)) {
-                    history.append({
-                      ...store.prompt,
-                      mode: store.mode,
-                    })
-                  }
                   input.clear()
                   input.extmarks.clear()
                   setStore("prompt", {
@@ -1337,11 +1319,6 @@ export function Prompt(props: PromptProps) {
               <Show when={hasRightContent()}>
                 <box flexDirection="row" gap={1} alignItems="center">
                   {props.right}
-                  <Show when={autoaccept() === "edit"}>
-                    <text>
-                      <span style={{ fg: theme.warning }}>autoedit</span>
-                    </text>
-                  </Show>
                 </box>
               </Show>
             </box>

packages/opencode/src/cli/cmd/tui/context/sync.tsx

@@ -110,7 +110,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
     const project = useProject()
     const sdk = useSDK()
     const kv = useKV()
-    const [autoaccept] = kv.signal<"none" | "edit">("permission_auto_accept", "edit")
 
     const fullSyncedSessions = new Set<string>()
     let syncedWorkspace = project.workspace.current()
@@ -153,13 +152,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
 
         case "permission.asked": {
           const request = event.properties
-          if (autoaccept() === "edit" && request.permission === "edit") {
-            void sdk.client.permission.reply({
-              reply: "once",
-              requestID: request.id,
-            })
-            break
-          }
           const requests = store.permission[request.sessionID]
           if (!requests) {
             setStore("permission", request.sessionID, [request])

packages/opencode/src/cli/cmd/tui/thread.ts

@@ -8,7 +8,6 @@ import { UI } from "@/cli/ui"
 import * as Log from "@opencode-ai/core/util/log"
 import { errorMessage } from "@/util/error"
 import { withTimeout } from "@/util/timeout"
-import { WithInstance } from "@/project/with-instance"
 import { withNetworkOptions, resolveNetworkOptionsNoConfig } from "@/cli/network"
 import { Filesystem } from "@/util/filesystem"
 import type { GlobalEvent } from "@opencode-ai/sdk/v2"
@@ -191,11 +190,7 @@ export const TuiThreadCommand = cmd({
       const prompt = await input(args.prompt)
       const config = await TuiConfig.get()
 
-      const network = await WithInstance.provide({
-        directory: cwd,
-        fn: () => resolveNetworkOptionsNoConfig(args),
-      })
-
+      const network = resolveNetworkOptionsNoConfig(args)
       const external =
         process.argv.includes("--port") ||
         process.argv.includes("--hostname") ||

packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx

@@ -37,7 +37,6 @@ export interface DialogSelectOption<T = any> {
   title: string
   value: T
   description?: string
-  search?: string
   footer?: JSX.Element | string
   category?: string
   categoryView?: JSX.Element
@@ -94,8 +93,8 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
     // users typically search by the item name, and not its category.
     const result = fuzzysort
       .go(needle, options, {
-        keys: ["title", "category", "search"],
-        scoreFn: (r) => r[0].score * 2 + r[1].score + r[2].score,
+        keys: ["title", "category"],
+        scoreFn: (r) => r[0].score * 2 + r[1].score,
       })
       .map((x) => x.obj)
 

packages/opencode/src/cli/cmd/web.ts

@@ -6,7 +6,6 @@ import { withNetworkOptions, resolveNetworkOptions } from "../network"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import open from "open"
 import { networkInterfaces } from "os"
-import { bootstrap } from "../bootstrap"
 
 function getNetworkIPs() {
   const nets = networkInterfaces()
@@ -41,7 +40,7 @@ export const WebCommand = effectCmd({
     if (!Flag.OPENCODE_SERVER_PASSWORD) {
       UI.println(UI.Style.TEXT_WARNING_BOLD + "!  OPENCODE_SERVER_PASSWORD is not set; server is unsecured.")
     }
-    const opts = yield* Effect.promise(() => bootstrap(process.cwd(), () => resolveNetworkOptions(args)))
+    const opts = yield* Effect.promise(() => resolveNetworkOptions(args))
     const server = yield* Effect.promise(() => Server.listen(opts))
     UI.empty()
     UI.println(UI.logo("  "))

packages/opencode/src/effect/app-runtime.ts

@@ -48,37 +48,19 @@ import { Worktree } from "@/worktree"
 import { Pty } from "@/pty"
 import { PtyTicket } from "@/pty/ticket"
 import { Installation } from "@/installation"
-import * as Effect from "effect/Effect"
 import { ShareNext } from "@/share/share-next"
 import { SessionShare } from "@/share/session"
 import { SyncEvent } from "@/sync"
 import { Npm } from "@opencode-ai/core/npm"
 import { memoMap } from "@opencode-ai/core/effect/memo-map"
 
-// Adjusts the default Config layer to ensure that plugins are always initialised before
-// any other layers read the current config
-const ConfigWithPluginPriority = Layer.effect(
-  Config.Service,
-  Effect.gen(function* () {
-    const config = yield* Config.Service
-    const plugin = yield* Plugin.Service
-
-    return {
-      ...config,
-      get: () => Effect.andThen(plugin.init(), config.get),
-      getGlobal: () => Effect.andThen(plugin.init(), config.getGlobal),
-      getConsoleState: () => Effect.andThen(plugin.init(), config.getConsoleState),
-    }
-  }),
-).pipe(Layer.provide(Layer.merge(Plugin.defaultLayer, Config.defaultLayer)))
-
 export const AppLayer = Layer.mergeAll(
   Npm.defaultLayer,
   AppFileSystem.defaultLayer,
   Bus.defaultLayer,
   Auth.defaultLayer,
   Account.defaultLayer,
-  ConfigWithPluginPriority,
+  Config.defaultLayer,
   Git.defaultLayer,
   Ripgrep.defaultLayer,
   File.defaultLayer,

packages/opencode/src/project/bootstrap.ts

@@ -1,3 +1,4 @@
+import { Plugin } from "../plugin"
 import { Format } from "../format"
 import { LSP } from "@/lsp/lsp"
 import { File } from "../file"
@@ -5,7 +6,6 @@ import { Snapshot } from "../snapshot"
 import * as Project from "./project"
 import * as Vcs from "./vcs"
 import { Bus } from "../bus"
-import { Plugin } from "../plugin"
 import { InstanceState } from "@/effect/instance-state"
 import { FileWatcher } from "@/file/watcher"
 import { ShareNext } from "@/share/share-next"

packages/opencode/src/server/routes/instance/httpapi/middleware/error.ts

@@ -1,58 +0,0 @@
-import { Provider } from "@/provider/provider"
-import { Session } from "@/session/session"
-import { NotFoundError } from "@/storage/storage"
-import { iife } from "@/util/iife"
-import { NamedError } from "@opencode-ai/core/util/error"
-import * as Log from "@opencode-ai/core/util/log"
-import { Cause, Effect } from "effect"
-import { HttpRouter, HttpServerError, HttpServerRespondable, HttpServerResponse } from "effect/unstable/http"
-
-const log = Log.create({ service: "server" })
-
-// Keep typed HttpApi failures on their declared error path; this boundary only replaces defect-only empty 500s.
-export const errorLayer = HttpRouter.middleware<{ handles: unknown }>()((effect) =>
-  effect.pipe(
-    Effect.catchCause((cause) => {
-      const defect = cause.reasons.filter(Cause.isDieReason).find((reason) => {
-        if (HttpServerResponse.isHttpServerResponse(reason.defect)) return false
-        if (HttpServerError.isHttpServerError(reason.defect)) return false
-        if (HttpServerRespondable.isRespondable(reason.defect)) return false
-        return true
-      })
-      if (!defect) return Effect.failCause(cause)
-
-      const error = defect.defect
-      log.error("failed", { error, cause: Cause.pretty(cause) })
-
-      if (error instanceof NamedError) {
-        return Effect.succeed(
-          HttpServerResponse.jsonUnsafe(error.toObject(), {
-            status: iife(() => {
-              if (error instanceof NotFoundError) return 404
-              if (error instanceof Provider.ModelNotFoundError) return 400
-              if (error.name === "ProviderAuthValidationFailed") return 400
-              if (error.name.startsWith("Worktree")) return 400
-              return 500
-            }),
-          }),
-        )
-      }
-      if (error instanceof Session.BusyError) {
-        return Effect.succeed(
-          HttpServerResponse.jsonUnsafe(new NamedError.Unknown({ message: error.message }).toObject(), {
-            status: 400,
-          }),
-        )
-      }
-
-      return Effect.succeed(
-        HttpServerResponse.jsonUnsafe(
-          new NamedError.Unknown({
-            message: error instanceof Error && error.stack ? error.stack : String(error),
-          }).toObject(),
-          { status: 500 },
-        ),
-      )
-    }),
-  ),
-).layer

packages/opencode/src/server/routes/instance/httpapi/server.ts

@@ -73,7 +73,6 @@ import { workspaceRouterMiddleware, workspaceRoutingLayer } from "./middleware/w
 import { disposeMiddleware } from "./lifecycle"
 import { memoMap } from "@opencode-ai/core/effect/memo-map"
 import * as ServerBackend from "@/server/backend"
-import { errorLayer } from "./middleware/error"
 
 export const context = Context.makeUnsafe<unknown>(new Map())
 
@@ -145,7 +144,6 @@ const uiRoute = HttpRouter.use((router) =>
 export function createRoutes(corsOptions?: CorsOptions) {
   return Layer.mergeAll(rootApiRoutes, eventApiRoutes, instanceRoutes, uiRoute).pipe(
     Layer.provide([
-      errorLayer,
       cors(corsOptions),
       runtime,
       Account.defaultLayer,

packages/opencode/src/session/session.ts

@@ -339,8 +339,7 @@ export const Event = {
       sessionID: Schema.optional(SessionID),
       // Reuses MessageV2.Assistant.fields.error (already Schema.optional) so
       // the derived zod keeps the same discriminated-union shape on the bus.
-      // Schema.suspend defers access to break circular init in compiled binaries.
-      error: Schema.suspend(() => MessageV2.Assistant.fields.error),
+      error: MessageV2.Assistant.fields.error,
     }),
   ),
 }

packages/opencode/src/util/effect-zod.ts

@@ -256,8 +256,6 @@ function body(ast: SchemaAST.AST): z.ZodTypeAny {
       return array(ast)
     case "Declaration":
       return decl(ast)
-    case "Suspend":
-      return z.lazy(() => walk(ast.thunk()))
     default:
       return fail(ast)
   }

packages/opencode/test/acp/agent-interface.test.ts

@@ -34,10 +34,11 @@ describe("acp.agent interface compliance", () => {
     "loadSession",
     "setSessionMode",
     "authenticate",
-    // Unstable - SDK checks these with unstable_ prefix
+    // Capability-gated methods checked by the SDK router
     "listSessions",
+    "resumeSession",
+    "closeSession",
     "unstable_forkSession",
-    "unstable_resumeSession",
     "unstable_setSessionModel",
   ]
 

packages/opencode/test/agent/agent.test.ts

@@ -229,8 +229,8 @@ test("agent permission config merges with defaults", async () => {
       expect(build).toBeDefined()
       // Specific pattern is denied
       expect(Permission.evaluate("bash", "rm -rf *", build!.permission).action).toBe("deny")
-      // Edit still asks (default behavior)
-      expect(evalPerm(build, "edit")).toBe("ask")
+      // Edit still allowed
+      expect(evalPerm(build, "edit")).toBe("allow")
     },
   })
 })

packages/ui/src/components/file-ssr.tsx

@@ -1,4 +1,4 @@
-import { DIFFS_TAG_NAME, FileDiff } from "@pierre/diffs"
+import { DIFFS_TAG_NAME, FileDiff, VirtualizedFileDiff } from "@pierre/diffs"
 import { type PreloadFileDiffResult, type PreloadMultiFileDiffResult } from "@pierre/diffs/ssr"
 import { createEffect, onCleanup, onMount, Show, splitProps } from "solid-js"
 import { Dynamic, isServer } from "solid-js/web"
@@ -13,6 +13,7 @@ import {
   notifyShadowReady,
   observeViewerScheme,
 } from "../pierre/file-runtime"
+import { acquireVirtualizer, virtualMetrics } from "../pierre/virtualizer"
 import { File, type DiffFileProps, type FileProps } from "./file"
 
 type DiffPreload<T> = PreloadMultiFileDiffResult<T> | PreloadFileDiffResult<T>
@@ -25,6 +26,7 @@ function DiffSSRViewer<T>(props: SSRDiffFileProps<T>) {
   let container!: HTMLDivElement
   let fileDiffRef!: HTMLElement
   let fileDiffInstance: FileDiff<T> | undefined
+  let sharedVirtualizer: NonNullable<ReturnType<typeof acquireVirtualizer>> | undefined
 
   const ready = createReadyWatcher()
   const workerPool = useWorkerPool(props.diffStyle)
@@ -49,6 +51,14 @@ function DiffSSRViewer<T>(props: SSRDiffFileProps<T>) {
 
   const getRoot = () => fileDiffRef?.shadowRoot ?? undefined
 
+  const getVirtualizer = () => {
+    if (sharedVirtualizer) return sharedVirtualizer.virtualizer
+    const result = acquireVirtualizer(container)
+    if (!result) return
+    sharedVirtualizer = result
+    return result.virtualizer
+  }
+
   const setSelectedLines = (range: DiffFileProps<T>["selectedLines"], attempt = 0) => {
     const diff = fileDiffInstance
     if (!diff) return
@@ -82,15 +92,27 @@ function DiffSSRViewer<T>(props: SSRDiffFileProps<T>) {
 
     onCleanup(observeViewerScheme(() => fileDiffRef))
 
+    const virtualizer = getVirtualizer()
     const annotations = local.annotations ?? local.preloadedDiff.annotations ?? []
-    fileDiffInstance = new FileDiff<T>(
-      {
-        ...createDefaultOptions(props.diffStyle),
-        ...others,
-        ...(local.preloadedDiff.options ?? {}),
-      },
-      workerPool,
-    )
+    fileDiffInstance = virtualizer
+      ? new VirtualizedFileDiff<T>(
+          {
+            ...createDefaultOptions(props.diffStyle),
+            ...others,
+            ...local.preloadedDiff.options,
+          },
+          virtualizer,
+          virtualMetrics,
+          workerPool,
+        )
+      : new FileDiff<T>(
+          {
+            ...createDefaultOptions(props.diffStyle),
+            ...others,
+            ...local.preloadedDiff.options,
+          },
+          workerPool,
+        )
 
     applyViewerScheme(fileDiffRef)
 
@@ -141,6 +163,8 @@ function DiffSSRViewer<T>(props: SSRDiffFileProps<T>) {
   onCleanup(() => {
     clearReadyWatcher(ready)
     fileDiffInstance?.cleanUp()
+    sharedVirtualizer?.release()
+    sharedVirtualizer = undefined
   })
 
   return (

packages/ui/src/components/file.tsx

@@ -1,5 +1,6 @@
 import { sampledChecksum } from "@opencode-ai/core/util/encode"
 import {
+  DEFAULT_VIRTUAL_FILE_METRICS,
   type DiffLineAnnotation,
   type FileContents,
   type FileDiffMetadata,
@@ -9,6 +10,10 @@ import {
   type FileOptions,
   type LineAnnotation,
   type SelectedLineRange,
+  type VirtualFileMetrics,
+  VirtualizedFile,
+  VirtualizedFileDiff,
+  Virtualizer,
 } from "@pierre/diffs"
 import { type PreloadFileDiffResult, type PreloadMultiFileDiffResult } from "@pierre/diffs/ssr"
 import { createMediaQuery } from "@solid-primitives/media"
@@ -35,10 +40,19 @@ import {
   readShadowLineSelection,
 } from "../pierre/file-selection"
 import { createLineNumberSelectionBridge, restoreShadowTextSelection } from "../pierre/selection-bridge"
+import { acquireVirtualizer, virtualMetrics } from "../pierre/virtualizer"
 import { getWorkerPool } from "../pierre/worker"
 import { FileMedia, type FileMediaOptions } from "./file-media"
 import { FileSearchBar } from "./file-search"
 
+const VIRTUALIZE_BYTES = 500_000
+
+const codeMetrics = {
+  ...DEFAULT_VIRTUAL_FILE_METRICS,
+  lineHeight: 24,
+  fileGap: 0,
+} satisfies Partial<VirtualFileMetrics>
+
 type SharedProps<T> = {
   annotations?: LineAnnotation<T>[] | DiffLineAnnotation<T>[]
   selectedLines?: SelectedLineRange | null
@@ -372,6 +386,11 @@ type AnnotationTarget<A> = {
   rerender: () => void
 }
 
+type VirtualStrategy = {
+  get: () => Virtualizer | undefined
+  cleanup: () => void
+}
+
 function useModeViewer(config: ModeConfig, adapter: ModeAdapter) {
   return useFileViewer({
     enableLineSelection: config.enableLineSelection,
@@ -513,6 +532,64 @@ function scrollParent(el: HTMLElement): HTMLElement | undefined {
   }
 }
 
+function createLocalVirtualStrategy(host: () => HTMLDivElement | undefined, enabled: () => boolean): VirtualStrategy {
+  let virtualizer: Virtualizer | undefined
+  let root: Document | HTMLElement | undefined
+
+  const release = () => {
+    virtualizer?.cleanUp()
+    virtualizer = undefined
+    root = undefined
+  }
+
+  return {
+    get: () => {
+      if (!enabled()) {
+        release()
+        return
+      }
+      if (typeof document === "undefined") return
+
+      const wrapper = host()
+      if (!wrapper) return
+
+      const next = scrollParent(wrapper) ?? document
+      if (virtualizer && root === next) return virtualizer
+
+      release()
+      virtualizer = new Virtualizer()
+      root = next
+      virtualizer.setup(next, next instanceof Document ? undefined : wrapper)
+      return virtualizer
+    },
+    cleanup: release,
+  }
+}
+
+function createSharedVirtualStrategy(host: () => HTMLDivElement | undefined): VirtualStrategy {
+  let shared: NonNullable<ReturnType<typeof acquireVirtualizer>> | undefined
+
+  const release = () => {
+    shared?.release()
+    shared = undefined
+  }
+
+  return {
+    get: () => {
+      if (shared) return shared.virtualizer
+
+      const container = host()
+      if (!container) return
+
+      const result = acquireVirtualizer(container)
+      if (!result) return
+      shared = result
+      return result.virtualizer
+    },
+    cleanup: release,
+  }
+}
+
 function parseLine(node: HTMLElement) {
   if (!node.dataset.line) return
   const value = parseInt(node.dataset.line, 10)
@@ -611,7 +688,7 @@ function ViewerShell(props: {
 // ---------------------------------------------------------------------------
 
 function TextViewer<T>(props: TextFileProps<T>) {
-  let instance: PierreFile<T> | undefined
+  let instance: PierreFile<T> | VirtualizedFile<T> | undefined
   let viewer!: Viewer
 
   const [local, others] = splitProps(props, textKeys)
@@ -631,12 +708,36 @@ function TextViewer<T>(props: TextFileProps<T>) {
     return Math.max(1, total)
   }
 
+  const bytes = createMemo(() => {
+    const value = local.file.contents as unknown
+    if (typeof value === "string") return value.length
+    if (Array.isArray(value)) {
+      return value.reduce(
+        // oxlint-disable-next-line no-base-to-string -- array parts coerced intentionally
+        (sum, part) => sum + (typeof part === "string" ? part.length + 1 : String(part).length + 1),
+        0,
+      )
+    }
+    if (value == null) return 0
+    // oxlint-disable-next-line no-base-to-string -- file contents cast to unknown, coercion is intentional
+    return String(value).length
+  })
+
+  const virtual = createMemo(() => bytes() > VIRTUALIZE_BYTES)
+
+  const virtuals = createLocalVirtualStrategy(() => viewer.wrapper, virtual)
+
   const lineFromMouseEvent = (event: MouseEvent): MouseHit => mouseHit(event, parseLine)
 
   const applySelection = (range: SelectedLineRange | null) => {
     const current = instance
     if (!current) return false
 
+    if (virtual()) {
+      current.setSelectedLines(range)
+      return true
+    }
+
     const root = viewer.getRoot()
     if (!root) return false
 
@@ -735,7 +836,10 @@ function TextViewer<T>(props: TextFileProps<T>) {
   const notify = () => {
     notifyRendered({
       viewer,
-      isReady: (root) => root.querySelectorAll("[data-line]").length >= lineCount(),
+      isReady: (root) => {
+        if (virtual()) return root.querySelector("[data-line]") != null
+        return root.querySelectorAll("[data-line]").length >= lineCount()
+      },
       onReady: () => {
         applySelection(viewer.lastSelection)
         viewer.find.refresh({ reset: true })
@@ -754,11 +858,17 @@ function TextViewer<T>(props: TextFileProps<T>) {
   createEffect(() => {
     const opts = options()
     const workerPool = getWorkerPool("unified")
+    const isVirtual = virtual()
+
+    const virtualizer = virtuals.get()
 
     renderViewer({
       viewer,
       current: instance,
-      create: () => new PierreFile<T>(opts, workerPool),
+      create: () =>
+        isVirtual && virtualizer
+          ? new VirtualizedFile<T>(opts, virtualizer, codeMetrics, workerPool)
+          : new PierreFile<T>(opts, workerPool),
       assign: (value) => {
         instance = value
       },
@@ -785,6 +895,7 @@ function TextViewer<T>(props: TextFileProps<T>) {
   onCleanup(() => {
     instance?.cleanUp()
     instance = undefined
+    virtuals.cleanup()
   })
 
   return <ViewerShell mode="text" viewer={viewer} class={local.class} classList={local.classList} />
@@ -880,6 +991,8 @@ function DiffViewer<T>(props: DiffFileProps<T>) {
     adapter,
   )
 
+  const virtuals = createSharedVirtualStrategy(() => viewer.container)
+
   const large = createMemo(() => {
     if (local.fileDiff) {
       const before = local.fileDiff.deletionLines.join("")
@@ -942,6 +1055,7 @@ function DiffViewer<T>(props: DiffFileProps<T>) {
   createEffect(() => {
     const opts = options()
     const workerPool = large() ? getWorkerPool("unified") : getWorkerPool(props.diffStyle)
+    const virtualizer = virtuals.get()
     const beforeContents = typeof local.before?.contents === "string" ? local.before.contents : ""
     const afterContents = typeof local.after?.contents === "string" ? local.after.contents : ""
     const done = preserve(viewer)
@@ -956,7 +1070,10 @@ function DiffViewer<T>(props: DiffFileProps<T>) {
     renderViewer({
       viewer,
       current: instance,
-      create: () => new FileDiff<T>(opts, workerPool),
+      create: () =>
+        virtualizer
+          ? new VirtualizedFileDiff<T>(opts, virtualizer, virtualMetrics, workerPool)
+          : new FileDiff<T>(opts, workerPool),
       assign: (value) => {
         instance = value
       },
@@ -994,6 +1111,7 @@ function DiffViewer<T>(props: DiffFileProps<T>) {
   onCleanup(() => {
     instance?.cleanUp()
     instance = undefined
+    virtuals.cleanup()
     dragSide = undefined
     dragEndSide = undefined
   })

packages/ui/src/components/session-review.tsx

@@ -26,6 +26,7 @@ import type { LineCommentEditorProps } from "./line-comment"
 import { normalize, text, type ViewDiff } from "./session-diff"
 
 const MAX_DIFF_CHANGED_LINES = 500
+const REVIEW_MOUNT_MARGIN = 300
 
 export type SessionReviewDiffStyle = "unified" | "split"
 
@@ -158,11 +159,14 @@ type SessionReviewSelection = {
 export const SessionReview = (props: SessionReviewProps) => {
   let scroll: HTMLDivElement | undefined
   let focusToken = 0
+  let frame: number | undefined
   const i18n = useI18n()
   const fileComponent = useFileComponent()
   const anchors = new Map<string, HTMLElement>()
+  const nodes = new Map<string, HTMLDivElement>()
   const [store, setStore] = createStore({
     open: [] as string[],
+    visible: {} as Record<string, boolean>,
     force: {} as Record<string, boolean>,
     selection: null as SessionReviewSelection | null,
     commenting: null as SessionReviewSelection | null,
@@ -192,7 +196,44 @@ export const SessionReview = (props: SessionReviewProps) => {
   const diffStyle = () => props.diffStyle ?? (props.split ? "split" : "unified")
   const hasDiffs = () => files().length > 0
 
+  const syncVisible = () => {
+    frame = undefined
+    if (!scroll) return
+
+    const root = scroll.getBoundingClientRect()
+    const top = root.top - REVIEW_MOUNT_MARGIN
+    const bottom = root.bottom + REVIEW_MOUNT_MARGIN
+    const openSet = new Set(open())
+    const next: Record<string, boolean> = {}
+
+    for (const [file, el] of nodes) {
+      if (!openSet.has(file)) continue
+      const rect = el.getBoundingClientRect()
+      if (rect.bottom < top || rect.top > bottom) continue
+      next[file] = true
+    }
+
+    const prev = untrack(() => store.visible)
+    const prevKeys = Object.keys(prev)
+    const nextKeys = Object.keys(next)
+    if (prevKeys.length === nextKeys.length && nextKeys.every((file) => prev[file])) return
+    setStore("visible", next)
+  }
+
+  const queue = () => {
+    if (frame !== undefined) return
+    frame = requestAnimationFrame(syncVisible)
+  }
+
+  const pinned = (file: string) =>
+    props.focusedComment?.file === file ||
+    props.focusedFile === file ||
+    selection()?.file === file ||
+    commenting()?.file === file ||
+    opened()?.file === file
+
   const handleScroll: JSX.EventHandler<HTMLDivElement, Event> = (event) => {
+    queue()
     const next = props.onScroll
     if (!next) return
     if (Array.isArray(next)) {
@@ -203,9 +244,21 @@ export const SessionReview = (props: SessionReviewProps) => {
     ;(next as JSX.EventHandler<HTMLDivElement, Event>)(event)
   }
 
+  onCleanup(() => {
+    if (frame === undefined) return
+    cancelAnimationFrame(frame)
+  })
+
+  createEffect(() => {
+    props.open
+    files()
+    queue()
+  })
+
   const handleChange = (next: string[]) => {
     props.onOpenChange?.(next)
     if (props.open === undefined) setStore("open", next)
+    queue()
   }
 
   const handleExpandOrCollapseAll = () => {
@@ -319,6 +372,7 @@ export const SessionReview = (props: SessionReviewProps) => {
         viewportRef={(el) => {
           scroll = el
           props.scrollRef?.(el)
+          queue()
         }}
         onScroll={handleScroll}
         classList={{
@@ -337,6 +391,7 @@ export const SessionReview = (props: SessionReviewProps) => {
                     const diffCanRender = () => diff.additions !== 0 || diff.deletions !== 0
 
                     const expanded = createMemo(() => open().includes(file))
+                    const mounted = createMemo(() => expanded() && (!!store.visible[file] || pinned(file)))
                     const force = () => !!store.force[file]
 
                     const comments = createMemo(() => grouped().get(file) ?? [])
@@ -427,6 +482,8 @@ export const SessionReview = (props: SessionReviewProps) => {
 
                     onCleanup(() => {
                       anchors.delete(file)
+                      nodes.delete(file)
+                      queue()
                     })
 
                     const handleLineSelected = (range: SelectedLineRange | null) => {
@@ -512,10 +569,19 @@ export const SessionReview = (props: SessionReviewProps) => {
                             data-slot="session-review-diff-wrapper"
                             ref={(el) => {
                               anchors.set(file, el)
+                              nodes.set(file, el)
+                              queue()
                             }}
                           >
                             <Show when={expanded()}>
                               <Switch>
+                                <Match when={!mounted() && !tooLarge()}>
+                                  <div
+                                    data-slot="session-review-diff-placeholder"
+                                    class="rounded-lg border border-border-weak-base bg-background-stronger/40"
+                                    style={{ height: "160px" }}
+                                  />
+                                </Match>
                                 <Match when={tooLarge()}>
                                   <div data-slot="session-review-large-diff">
                                     <div data-slot="session-review-large-diff-title">

packages/ui/src/pierre/virtualizer.ts

@@ -0,0 +1,100 @@
+import { type VirtualFileMetrics, Virtualizer } from "@pierre/diffs"
+
+type Target = {
+  key: Document | HTMLElement
+  root: Document | HTMLElement
+  content: HTMLElement | undefined
+}
+
+type Entry = {
+  virtualizer: Virtualizer
+  refs: number
+}
+
+const cache = new WeakMap<Document | HTMLElement, Entry>()
+
+export const virtualMetrics: Partial<VirtualFileMetrics> = {
+  lineHeight: 24,
+  hunkSeparatorHeight: 24,
+  fileGap: 0,
+}
+
+function scrollable(value: string) {
+  return value === "auto" || value === "scroll" || value === "overlay"
+}
+
+function scrollRoot(container: HTMLElement) {
+  let node = container.parentElement
+  while (node) {
+    const style = getComputedStyle(node)
+    if (scrollable(style.overflowY)) return node
+    node = node.parentElement
+  }
+}
+
+function target(container: HTMLElement): Target | undefined {
+  if (typeof document === "undefined") return
+
+  const review = container.closest("[data-component='session-review']")
+  if (review instanceof HTMLElement) {
+    const root = scrollRoot(container) ?? review
+    const content = review.querySelector("[data-slot='session-review-container']")
+    return {
+      key: review,
+      root,
+      content: content instanceof HTMLElement ? content : undefined,
+    }
+  }
+
+  const root = scrollRoot(container)
+  if (root) {
+    const content = root.querySelector("[role='log']")
+    return {
+      key: root,
+      root,
+      content: content instanceof HTMLElement ? content : undefined,
+    }
+  }
+
+  return {
+    key: document,
+    root: document,
+    content: undefined,
+  }
+}
+
+export function acquireVirtualizer(container: HTMLElement) {
+  const resolved = target(container)
+  if (!resolved) return
+
+  let entry = cache.get(resolved.key)
+  if (!entry) {
+    const virtualizer = new Virtualizer()
+    virtualizer.setup(resolved.root, resolved.content)
+    entry = {
+      virtualizer,
+      refs: 0,
+    }
+    cache.set(resolved.key, entry)
+  }
+
+  entry.refs += 1
+  let done = false
+
+  return {
+    virtualizer: entry.virtualizer,
+    release() {
+      if (done) return
+      done = true
+
+      const current = cache.get(resolved.key)
+      if (!current) return
+
+      current.refs -= 1
+      if (current.refs > 0) return
+
+      current.virtualizer.cleanUp()
+      cache.delete(resolved.key)
+    },
+  }
+}