perf: trim session render work

.github/workflows/publish.yml

@@ -149,10 +149,6 @@ jobs:
 
       - uses: ./.github/actions/setup-bun
 
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "24"
-
       - name: Cache apt packages
         if: contains(matrix.settings.host, 'ubuntu')
         uses: actions/cache@v4

.opencode/.gitignore

@@ -1,6 +1,4 @@
-node_modules
-plans
-package.json
+plans/
 bun.lock
-.gitignore
+package.json
 package-lock.json

.opencode/tool/github-pr-search.ts

@@ -1,5 +1,6 @@
 /// <reference path="../env.d.ts" />
 import { tool } from "@opencode-ai/plugin"
+import DESCRIPTION from "./github-pr-search.txt"
 
 async function githubFetch(endpoint: string, options: RequestInit = {}) {
   const response = await fetch(`https://api.github.com${endpoint}`, {
@@ -23,16 +24,7 @@ interface PR {
 }
 
 export default tool({
-  description: `Use this tool to search GitHub pull requests by title and description.
-
-This tool searches PRs in the anomalyco/opencode repository and returns LLM-friendly results including:
-- PR number and title
-- Author
-- State (open/closed/merged)
-- Labels
-- Description snippet
-
-Use the query parameter to search for keywords that might appear in PR titles or descriptions.`,
+  description: DESCRIPTION,
   args: {
     query: tool.schema.string().describe("Search query for PR titles and descriptions"),
     limit: tool.schema.number().describe("Maximum number of results to return").default(10),

.opencode/tool/github-pr-search.txt

@@ -0,0 +1,10 @@
+Use this tool to search GitHub pull requests by title and description.
+
+This tool searches PRs in the anomalyco/opencode repository and returns LLM-friendly results including:
+- PR number and title
+- Author
+- State (open/closed/merged)
+- Labels
+- Description snippet
+
+Use the query parameter to search for keywords that might appear in PR titles or descriptions.

.opencode/tool/github-triage.ts

@@ -1,5 +1,6 @@
 /// <reference path="../env.d.ts" />
 import { tool } from "@opencode-ai/plugin"
+import DESCRIPTION from "./github-triage.txt"
 
 const TEAM = {
   desktop: ["adamdotdevin", "iamdavidhill", "Brendonovich", "nexxeln"],
@@ -39,12 +40,7 @@ async function githubFetch(endpoint: string, options: RequestInit = {}) {
 }
 
 export default tool({
-  description: `Use this tool to assign and/or label a GitHub issue.
-
-Choose labels and assignee using the current triage policy and ownership rules.
-Pick the most fitting labels for the issue and assign one owner.
-
-If unsure, choose the team/section with the most overlap with the issue and assign a member from that team at random.`,
+  description: DESCRIPTION,
   args: {
     assignee: tool.schema
       .enum(ASSIGNEES as [string, ...string[]])

.opencode/tool/github-triage.txt

@@ -0,0 +1,6 @@
+Use this tool to assign and/or label a GitHub issue.
+
+Choose labels and assignee using the current triage policy and ownership rules.
+Pick the most fitting labels for the issue and assign one owner.
+
+If unsure, choose the team/section with the most overlap with the issue and assign a member from that team at random.

README.md

@@ -128,7 +128,7 @@ If you are working on a project that's related to OpenCode and is using "opencod
 
 #### How is this different from Claude Code?
 
-It's very similar to Claude Code in terms of capability. Here are the key differences::
+It's very similar to Claude Code in terms of capability. Here are the key differences:
 
 - 100% open source
 - Not coupled to any provider. Although we recommend the models we provide through [OpenCode Zen](https://opencode.ai/zen), OpenCode can be used with Claude, OpenAI, Google, or even local models. As models evolve, the gaps between them will close and pricing will drop, so being provider-agnostic is important.

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-6Ewwu0N43+0Enh4ysDQqqNYv96pB0gV5fuxfd39EcKA=",
-    "aarch64-linux": "sha256-/InxjE7x2hgOd2wWaro7xiQpO8FTW8UCRn2eA4KDBbs=",
-    "aarch64-darwin": "sha256-gVZAsbaGMi/DnMyUmMywcumF3D8stnj1M13imURvp1s=",
-    "x86_64-darwin": "sha256-+siFJfPi819iGJU0MI2HBTXZFuBHaAoMzTxbKUwuejE="
+    "x86_64-linux": "sha256-dhL4YeSi4Lm9yDp919Fx7N2hyLUbZQa2qWoCf/50ce8=",
+    "aarch64-linux": "sha256-//YxCsrvYlxuvd0MtFFO+pLxjmuemyrvGzSIPxzO+rA=",
+    "aarch64-darwin": "sha256-c65kSWteQNaBcQUsjbXNqT61vt98JPNYo9yMNvUygCw=",
+    "x86_64-darwin": "sha256-hlTzEFv3nZHwlDXU65LfMC+NaqYjjyZqagdJ366CNxY="
   }
 }

package.json

@@ -41,9 +41,9 @@
       "@tailwindcss/vite": "4.1.11",
       "diff": "8.0.2",
       "dompurify": "3.3.1",
+      "drizzle-kit": "1.0.0-beta.16-ea816b6",
+      "drizzle-orm": "1.0.0-beta.16-ea816b6",
       "effect": "4.0.0-beta.29",
-      "drizzle-kit": "1.0.0-beta.16-c2458b2",
-      "drizzle-orm": "1.0.0-beta.16-c2458b2",
       "ai": "5.0.124",
       "hono": "4.10.7",
       "hono-openapi": "1.1.2",
@@ -101,7 +101,6 @@
     "protobufjs",
     "tree-sitter",
     "tree-sitter-bash",
-    "tree-sitter-powershell",
     "web-tree-sitter",
     "electron"
   ],

packages/app/e2e/terminal/terminal-tabs.spec.ts

@@ -27,8 +27,6 @@ async function run(page: Page, cmd: string) {
   await terminal.click()
   await page.keyboard.type(cmd)
   await page.keyboard.press("Enter")
-  // powershell + windows just isnt that fast... we need to wait
-  await page.waitForTimeout(3_000)
 }
 
 async function store(page: Page, key: string) {

packages/app/package.json

@@ -45,8 +45,8 @@
     "@shikijs/transformers": "3.9.2",
     "@solid-primitives/active-element": "2.1.3",
     "@solid-primitives/audio": "1.4.2",
-    "@solid-primitives/event-bus": "1.1.2",
     "@solid-primitives/i18n": "2.2.1",
+    "@solid-primitives/event-bus": "1.1.2",
     "@solid-primitives/media": "2.3.3",
     "@solid-primitives/resize-observer": "2.1.3",
     "@solid-primitives/scroll": "2.1.3",
@@ -56,7 +56,6 @@
     "@solidjs/router": "catalog:",
     "@thisbeyond/solid-dnd": "0.7.5",
     "diff": "catalog:",
-    "effect": "4.0.0-beta.29",
     "fuzzysort": "catalog:",
     "ghostty-web": "github:anomalyco/ghostty-web#main",
     "luxon": "catalog:",

packages/app/src/app.tsx

@@ -1,29 +1,14 @@
 import "@/index.css"
+import { File } from "@opencode-ai/ui/file"
 import { I18nProvider } from "@opencode-ai/ui/context"
 import { DialogProvider } from "@opencode-ai/ui/context/dialog"
 import { FileComponentProvider } from "@opencode-ai/ui/context/file"
 import { MarkedProvider } from "@opencode-ai/ui/context/marked"
-import { File } from "@opencode-ai/ui/file"
 import { Font } from "@opencode-ai/ui/font"
-import { Splash } from "@opencode-ai/ui/logo"
 import { ThemeProvider } from "@opencode-ai/ui/theme"
 import { MetaProvider } from "@solidjs/meta"
-import { type BaseRouterProps, Navigate, Route, Router } from "@solidjs/router"
-import { type Duration, Effect } from "effect"
-import {
-  type Component,
-  createResource,
-  createSignal,
-  ErrorBoundary,
-  For,
-  type JSX,
-  lazy,
-  onCleanup,
-  type ParentProps,
-  Show,
-  Suspense,
-} from "solid-js"
-import { Dynamic } from "solid-js/web"
+import { BaseRouterProps, Navigate, Route, Router } from "@solidjs/router"
+import { Component, ErrorBoundary, type JSX, lazy, type ParentProps, Show, Suspense } from "solid-js"
 import { CommandProvider } from "@/context/command"
 import { CommentsProvider } from "@/context/comments"
 import { FileProvider } from "@/context/file"
@@ -37,13 +22,13 @@ import { NotificationProvider } from "@/context/notification"
 import { PermissionProvider } from "@/context/permission"
 import { usePlatform } from "@/context/platform"
 import { PromptProvider } from "@/context/prompt"
-import { ServerConnection, ServerProvider, serverName, useServer } from "@/context/server"
+import { type ServerConnection, ServerProvider, useServer } from "@/context/server"
 import { SettingsProvider } from "@/context/settings"
 import { TerminalProvider } from "@/context/terminal"
 import DirectoryLayout from "@/pages/directory-layout"
 import Layout from "@/pages/layout"
 import { ErrorPage } from "./pages/error"
-import { useCheckServerHealth } from "./utils/server-health"
+import { Dynamic } from "solid-js/web"
 
 const Home = lazy(() => import("@/pages/home"))
 const Session = lazy(() => import("@/pages/session"))
@@ -147,108 +132,15 @@ export function AppBaseProviders(props: ParentProps) {
   )
 }
 
-const effectMinDuration =
-  (duration: Duration.Input) =>
-  <A, E, R>(e: Effect.Effect<A, E, R>) =>
-    Effect.all([e, Effect.sleep(duration)], { concurrency: "unbounded" }).pipe(Effect.map((v) => v[0]))
-
-function ConnectionGate(props: ParentProps) {
+function ServerKey(props: ParentProps) {
   const server = useServer()
-  const checkServerHealth = useCheckServerHealth()
-
-  const [checkMode, setCheckMode] = createSignal<"blocking" | "background">("blocking")
-
-  // performs repeated health check with a grace period for
-  // non-http connections, otherwise fails instantly
-  const [startupHealthCheck, healthCheckActions] = createResource(() =>
-    Effect.gen(function* () {
-      if (!server.current) return true
-      const { http, type } = server.current
-
-      while (true) {
-        const res = yield* Effect.promise(() => checkServerHealth(http))
-        if (res.healthy) return true
-        if (checkMode() === "background" || type === "http") return false
-      }
-    }).pipe(
-      effectMinDuration(checkMode() === "blocking" ? "1.2 seconds" : 0),
-      Effect.timeoutOrElse({ duration: "10 seconds", onTimeout: () => Effect.succeed(false) }),
-      Effect.ensuring(Effect.sync(() => setCheckMode("background"))),
-      Effect.runPromise,
-    ),
-  )
-
   return (
-    <Show
-      when={checkMode() === "blocking" ? !startupHealthCheck.loading : startupHealthCheck.state !== "pending"}
-      fallback={
-        <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>
-      }
-    >
-      <Show
-        when={startupHealthCheck()}
-        fallback={
-          <ConnectionError
-            onRetry={() => {
-              if (checkMode() === "background") healthCheckActions.refetch()
-            }}
-            onServerSelected={(key) => {
-              setCheckMode("blocking")
-              server.setActive(key)
-              healthCheckActions.refetch()
-            }}
-          />
-        }
-      >
-        {props.children}
-      </Show>
+    <Show when={server.key} keyed>
+      {props.children}
     </Show>
   )
 }
 
-function ConnectionError(props: { onRetry?: () => void; onServerSelected?: (key: ServerConnection.Key) => void }) {
-  const server = useServer()
-  const others = () => server.list.filter((s) => ServerConnection.key(s) !== server.key)
-
-  const timer = setInterval(() => props.onRetry?.(), 1000)
-  onCleanup(() => clearInterval(timer))
-
-  return (
-    <div class="h-dvh w-screen flex flex-col items-center justify-center bg-background-base gap-6 p-6">
-      <div class="flex flex-col items-center max-w-md text-center">
-        <Splash class="w-12 h-15 mb-4" />
-        <p class="text-14-regular text-text-base">
-          Could not reach <span class="text-text-strong font-medium">{server.name || server.key}</span>
-        </p>
-        <p class="mt-1 text-12-regular text-text-weak">Retrying automatically...</p>
-      </div>
-      <Show when={others().length > 0}>
-        <div class="flex flex-col gap-2 w-full max-w-sm">
-          <span class="text-12-regular text-text-base text-center">Other servers</span>
-          <div class="flex flex-col gap-1 bg-surface-base rounded-lg p-2">
-            <For each={others()}>
-              {(conn) => {
-                const key = ServerConnection.key(conn)
-                return (
-                  <button
-                    type="button"
-                    class="flex items-center gap-3 w-full px-3 py-2 rounded-md hover:bg-surface-raised-base-hover transition-colors text-left"
-                    onClick={() => props.onServerSelected?.(key)}
-                  >
-                    <span class="text-14-regular text-text-strong truncate">{serverName(conn)}</span>
-                  </button>
-                )
-              }}
-            </For>
-          </div>
-        </div>
-      </Show>
-    </div>
-  )
-}
-
 export function AppInterface(props: {
   children?: JSX.Element
   defaultServer: ServerConnection.Key
@@ -257,7 +149,7 @@ export function AppInterface(props: {
 }) {
   return (
     <ServerProvider defaultServer={props.defaultServer} servers={props.servers}>
-      <ConnectionGate>
+      <ServerKey>
         <GlobalSDKProvider>
           <GlobalSyncProvider>
             <Dynamic
@@ -272,7 +164,7 @@ export function AppInterface(props: {
             </Dynamic>
           </GlobalSyncProvider>
         </GlobalSDKProvider>
-      </ConnectionGate>
+      </ServerKey>
     </ServerProvider>
   )
 }

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

@@ -14,7 +14,7 @@ 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 { useCheckServerHealth, type ServerHealth } from "@/utils/server-health"
+import { checkServerHealth, type ServerHealth } from "@/utils/server-health"
 
 interface ServerFormProps {
   value: string
@@ -41,15 +41,13 @@ function showRequestError(language: ReturnType<typeof useLanguage>, err: unknown
   })
 }
 
-function useDefaultServer() {
-  const language = useLanguage()
-  const platform = usePlatform()
-  const [defaultKey, defaultUrlActions] = createResource(
+function useDefaultServer(platform: ReturnType<typeof usePlatform>, language: ReturnType<typeof useLanguage>) {
+  const [defaultUrl, defaultUrlActions] = createResource(
     async () => {
       try {
-        const key = await platform.getDefaultServer?.()
-        if (!key) return null
-        return key
+        const url = await platform.getDefaultServerUrl?.()
+        if (!url) return null
+        return normalizeServerUrl(url) ?? null
       } catch (err) {
         showRequestError(language, err)
         return null
@@ -58,22 +56,20 @@ function useDefaultServer() {
     { initialValue: null },
   )
 
-  const canDefault = createMemo(() => !!platform.getDefaultServer && !!platform.setDefaultServer)
-  const setDefault = async (key: ServerConnection.Key | null) => {
+  const canDefault = createMemo(() => !!platform.getDefaultServerUrl && !!platform.setDefaultServerUrl)
+  const setDefault = async (url: string | null) => {
     try {
-      await platform.setDefaultServer?.(key)
-      defaultUrlActions.mutate(key)
+      await platform.setDefaultServerUrl?.(url)
+      defaultUrlActions.mutate(url)
     } catch (err) {
       showRequestError(language, err)
     }
   }
 
-  return { defaultKey, canDefault, setDefault }
+  return { defaultUrl, canDefault, setDefault }
 }
 
-function useServerPreview() {
-  const checkServerHealth = useCheckServerHealth()
-
+function useServerPreview(fetcher: typeof fetch) {
   const looksComplete = (value: string) => {
     const normalized = normalizeServerUrl(value)
     if (!normalized) return false
@@ -96,7 +92,7 @@ function useServerPreview() {
     const http: ServerConnection.HttpBase = { url: normalized }
     if (username) http.username = username
     if (password) http.password = password
-    const result = await checkServerHealth(http)
+    const result = await checkServerHealth(http, fetcher)
     setStatus(result.healthy)
   }
 
@@ -174,9 +170,9 @@ export function DialogSelectServer() {
   const server = useServer()
   const platform = usePlatform()
   const language = useLanguage()
-  const { defaultKey, canDefault, setDefault } = useDefaultServer()
-  const { previewStatus } = useServerPreview()
-  const checkServerHealth = useCheckServerHealth()
+  const fetcher = platform.fetch ?? globalThis.fetch
+  const { defaultUrl, canDefault, setDefault } = useDefaultServer(platform, language)
+  const { previewStatus } = useServerPreview(fetcher)
   const [store, setStore] = createStore({
     status: {} as Record<ServerConnection.Key, ServerHealth | undefined>,
     addServer: {
@@ -268,7 +264,7 @@ export function DialogSelectServer() {
     const results: Record<ServerConnection.Key, ServerHealth> = {}
     await Promise.all(
       items().map(async (conn) => {
-        results[ServerConnection.key(conn)] = await checkServerHealth(conn.http)
+        results[ServerConnection.key(conn)] = await checkServerHealth(conn.http, fetcher)
       }),
     )
     setStore("status", reconcile(results))
@@ -368,7 +364,7 @@ export function DialogSelectServer() {
     if (store.addServer.name.trim()) conn.displayName = store.addServer.name.trim()
     if (store.addServer.username) conn.http.username = store.addServer.username
     if (store.addServer.password) conn.http.password = store.addServer.password
-    const result = await checkServerHealth(conn.http)
+    const result = await checkServerHealth(conn.http, fetcher)
     setStore("addServer", { adding: false })
     if (!result.healthy) {
       setStore("addServer", { error: language.t("dialog.server.add.error") })
@@ -408,7 +404,7 @@ export function DialogSelectServer() {
       displayName: name,
       http: { url: normalized, username, password },
     }
-    const result = await checkServerHealth(conn.http)
+    const result = await checkServerHealth(conn.http, fetcher)
     setStore("editServer", { busy: false })
     if (!result.healthy) {
       setStore("editServer", { error: language.t("dialog.server.add.error") })
@@ -498,8 +494,8 @@ export function DialogSelectServer() {
 
   async function handleRemove(url: ServerConnection.Key) {
     server.remove(url)
-    if ((await platform.getDefaultServer?.()) === url) {
-      platform.setDefaultServer?.(null)
+    if ((await platform.getDefaultServerUrl?.()) === url) {
+      platform.setDefaultServerUrl?.(null)
     }
   }
 
@@ -555,7 +551,7 @@ export function DialogSelectServer() {
                     status={store.status[key]}
                     class="flex items-center gap-3 min-w-0 flex-1"
                     badge={
-                      <Show when={defaultKey() === i.http.url}>
+                      <Show when={defaultUrl() === i.http.url}>
                         <span class="text-text-base bg-surface-base text-14-regular px-1.5 rounded-xs">
                           {language.t("dialog.server.status.default")}
                         </span>
@@ -588,14 +584,14 @@ export function DialogSelectServer() {
                             >
                               <DropdownMenu.ItemLabel>{language.t("dialog.server.menu.edit")}</DropdownMenu.ItemLabel>
                             </DropdownMenu.Item>
-                            <Show when={canDefault() && defaultKey() !== key}>
-                              <DropdownMenu.Item onSelect={() => setDefault(key)}>
+                            <Show when={canDefault() && defaultUrl() !== i.http.url}>
+                              <DropdownMenu.Item onSelect={() => setDefault(i.http.url)}>
                                 <DropdownMenu.ItemLabel>
                                   {language.t("dialog.server.menu.default")}
                                 </DropdownMenu.ItemLabel>
                               </DropdownMenu.Item>
                             </Show>
-                            <Show when={canDefault() && defaultKey() === key}>
+                            <Show when={canDefault() && defaultUrl() === i.http.url}>
                               <DropdownMenu.Item onSelect={() => setDefault(null)}>
                                 <DropdownMenu.ItemLabel>
                                   {language.t("dialog.server.menu.defaultRemove")}

packages/app/src/components/session/find-assistant-messages.test.ts

@@ -1,81 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import type { Message } from "@opencode-ai/sdk/v2/client"
-import { findAssistantMessages } from "@opencode-ai/ui/find-assistant-messages"
-
-function user(id: string): Message {
-  return {
-    id,
-    role: "user",
-    sessionID: "session-1",
-    time: { created: 1 },
-  } as unknown as Message
-}
-
-function assistant(id: string, parentID: string): Message {
-  return {
-    id,
-    role: "assistant",
-    sessionID: "session-1",
-    parentID,
-    time: { created: 1 },
-  } as unknown as Message
-}
-
-describe("findAssistantMessages", () => {
-  test("normal ordering: assistant after user in array → found via forward scan", () => {
-    const messages = [user("u1"), assistant("a1", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("clock skew: assistant before user in array → found via backward scan", () => {
-    // When client clock is ahead, user ID sorts after assistant ID,
-    // so assistant appears earlier in the ID-sorted message array
-    const messages = [assistant("a1", "u1"), user("u1")]
-    const result = findAssistantMessages(messages, 1, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("no assistant messages → returns empty array", () => {
-    const messages = [user("u1"), user("u2")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(0)
-  })
-
-  test("multiple assistant messages with matching parentID → all found", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), assistant("a2", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(2)
-    expect(result[0].id).toBe("a1")
-    expect(result[1].id).toBe("a2")
-  })
-
-  test("does not return assistant messages with different parentID", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), assistant("a2", "other")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("stops forward scan at next user message", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), user("u2"), assistant("a2", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("stops backward scan at previous user message", () => {
-    const messages = [assistant("a0", "u1"), user("u0"), assistant("a1", "u1"), user("u1")]
-    const result = findAssistantMessages(messages, 3, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("invalid index returns empty array", () => {
-    const messages = [user("u1")]
-    expect(findAssistantMessages(messages, -1, "u1")).toHaveLength(0)
-    expect(findAssistantMessages(messages, 5, "u1")).toHaveLength(0)
-  })
-})

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

@@ -14,7 +14,7 @@ import { usePlatform } from "@/context/platform"
 import { useSDK } from "@/context/sdk"
 import { normalizeServerUrl, ServerConnection, useServer } from "@/context/server"
 import { useSync } from "@/context/sync"
-import { useCheckServerHealth, type ServerHealth } from "@/utils/server-health"
+import { checkServerHealth, type ServerHealth } from "@/utils/server-health"
 import { DialogSelectServer } from "./dialog-select-server"
 
 const pollMs = 10_000
@@ -53,8 +53,7 @@ const listServersByHealth = (
   })
 }
 
-const useServerHealth = (servers: Accessor<ServerConnection.Any[]>) => {
-  const checkServerHealth = useCheckServerHealth()
+const useServerHealth = (servers: Accessor<ServerConnection.Any[]>, fetcher: typeof fetch) => {
   const [status, setStatus] = createStore({} as Record<ServerConnection.Key, ServerHealth | undefined>)
 
   createEffect(() => {
@@ -65,7 +64,7 @@ const useServerHealth = (servers: Accessor<ServerConnection.Any[]>) => {
       const results: Record<string, ServerHealth> = {}
       await Promise.all(
         list.map(async (conn) => {
-          results[ServerConnection.key(conn)] = await checkServerHealth(conn.http)
+          results[ServerConnection.key(conn)] = await checkServerHealth(conn.http, fetcher)
         }),
       )
       if (dead) return
@@ -169,6 +168,7 @@ export function StatusPopover() {
   const language = useLanguage()
   const navigate = useNavigate()
 
+  const fetcher = platform.fetch ?? globalThis.fetch
   const servers = createMemo(() => {
     const current = server.current
     const list = server.list
@@ -176,10 +176,10 @@ export function StatusPopover() {
     if (list.every((item) => ServerConnection.key(item) !== ServerConnection.key(current))) return [current, ...list]
     return [current, ...list.filter((item) => ServerConnection.key(item) !== ServerConnection.key(current))]
   })
-  const health = useServerHealth(servers)
+  const health = useServerHealth(servers, fetcher)
   const sortedServers = createMemo(() => listServersByHealth(servers(), server.key, health))
   const mcp = useMcpToggle({ sync, sdk, language })
-  const defaultServer = useDefaultServerKey(platform.getDefaultServer)
+  const defaultServer = useDefaultServerKey(platform.getDefaultServerUrl)
   const mcpNames = createMemo(() => Object.keys(sync.data.mcp ?? {}).sort((a, b) => a.localeCompare(b)))
   const mcpStatus = (name: string) => sync.data.mcp?.[name]?.status
   const mcpConnected = createMemo(() => mcpNames().filter((name) => mcpStatus(name) === "connected").length)

packages/app/src/components/titlebar.tsx

@@ -266,9 +266,6 @@ export function Titlebar() {
           </div>
         </div>
         <div id="opencode-titlebar-left" class="flex items-center gap-3 min-w-0 px-2" />
-        <div class="bg-icon-interactive-base text-background-base font-medium px-2 rounded-sm uppercase font-mono">
-          BETA
-        </div>
       </div>
 
       <div class="min-w-0 flex items-center justify-center pointer-events-none">

packages/app/src/context/platform.tsx

@@ -1,7 +1,6 @@
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import type { AsyncStorage, SyncStorage } from "@solid-primitives/storage"
 import type { Accessor } from "solid-js"
-import { ServerConnection } from "./server"
 
 type PickerPaths = string | string[] | null
 type OpenDirectoryPickerOptions = { title?: string; multiple?: boolean }
@@ -59,10 +58,10 @@ export type Platform = {
   fetch?: typeof fetch
 
   /** Get the configured default server URL (platform-specific) */
-  getDefaultServer?(): Promise<ServerConnection.Key | null>
+  getDefaultServerUrl?(): Promise<string | null>
 
   /** Set the default server URL to use on app startup (platform-specific) */
-  setDefaultServer?(url: ServerConnection.Key | null): Promise<void> | void
+  setDefaultServerUrl?(url: string | null): Promise<void> | void
 
   /** Get the configured WSL integration (desktop only) */
   getWslEnabled?(): Promise<boolean>

packages/app/src/context/server.tsx

@@ -1,8 +1,9 @@
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { type Accessor, batch, createEffect, createMemo, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
+import { usePlatform } from "@/context/platform"
 import { Persist, persisted } from "@/utils/persist"
-import { useCheckServerHealth } from "@/utils/server-health"
+import { checkServerHealth } from "@/utils/server-health"
 
 type StoredProject = { worktree: string; expanded: boolean }
 type StoredServer = string | ServerConnection.HttpBase | ServerConnection.Http
@@ -95,7 +96,7 @@ export namespace ServerConnection {
 export const { use: useServer, provider: ServerProvider } = createSimpleContext({
   name: "Server",
   init: (props: { defaultServer: ServerConnection.Key; servers?: Array<ServerConnection.Any> }) => {
-    const checkServerHealth = useCheckServerHealth()
+    const platform = usePlatform()
 
     const [store, setStore, _, ready] = persisted(
       Persist.global("server", ["server.v3"]),
@@ -196,7 +197,8 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
 
     const isReady = createMemo(() => ready() && !!state.active)
 
-    const check = (conn: ServerConnection.Any) => checkServerHealth(conn.http).then((x) => x.healthy)
+    const fetcher = platform.fetch ?? globalThis.fetch
+    const check = (conn: ServerConnection.Any) => checkServerHealth(conn.http, fetcher).then((x) => x.healthy)
 
     createEffect(() => {
       const current_ = current()

packages/app/src/entry.tsx

@@ -98,15 +98,6 @@ if (!(root instanceof HTMLElement) && import.meta.env.DEV) {
   throw new Error(getRootNotFoundError())
 }
 
-const defaultUrl = iife(() => {
-  const lsDefault = readDefaultServerUrl()
-  if (lsDefault) return lsDefault
-  if (location.hostname.includes("opencode.ai")) return "http://localhost:4096"
-  if (import.meta.env.DEV)
-    return `http://${import.meta.env.VITE_OPENCODE_SERVER_HOST ?? "localhost"}:${import.meta.env.VITE_OPENCODE_SERVER_PORT ?? "4096"}`
-  return location.origin
-})
-
 const platform: Platform = {
   platform: "web",
   version: pkg.version,
@@ -115,10 +106,19 @@ const platform: Platform = {
   forward,
   restart,
   notify,
-  getDefaultServer: async () => ServerConnection.Key.make(defaultUrl),
-  setDefaultServer: writeDefaultServerUrl,
+  getDefaultServerUrl: async () => readDefaultServerUrl(),
+  setDefaultServerUrl: writeDefaultServerUrl,
 }
 
+const defaultUrl = iife(() => {
+  const lsDefault = readDefaultServerUrl()
+  if (lsDefault) return lsDefault
+  if (location.hostname.includes("opencode.ai")) return "http://localhost:4096"
+  if (import.meta.env.DEV)
+    return `http://${import.meta.env.VITE_OPENCODE_SERVER_HOST ?? "localhost"}:${import.meta.env.VITE_OPENCODE_SERVER_PORT ?? "4096"}`
+  return location.origin
+})
+
 if (root instanceof HTMLElement) {
   const server: ServerConnection.Http = { type: "http", http: { url: defaultUrl } }
   render(

packages/app/src/pages/session/composer/session-question-dock.tsx

@@ -3,7 +3,6 @@ import { createStore } from "solid-js/store"
 import { Button } from "@opencode-ai/ui/button"
 import { DockPrompt } from "@opencode-ai/ui/dock-prompt"
 import { Icon } from "@opencode-ai/ui/icon"
-import { IconButton } from "@opencode-ai/ui/icon-button"
 import { showToast } from "@opencode-ai/ui/toast"
 import type { QuestionAnswer, QuestionRequest } from "@opencode-ai/sdk/v2"
 import { useLanguage } from "@/context/language"
@@ -26,7 +25,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
     customOn: cached?.customOn ?? ([] as boolean[]),
     editing: false,
     sending: false,
-    collapsed: false,
   })
 
   let root: HTMLDivElement | undefined
@@ -37,7 +35,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
   const input = createMemo(() => store.custom[store.tab] ?? "")
   const on = createMemo(() => store.customOn[store.tab] === true)
   const multi = createMemo(() => question()?.multiple === true)
-  const picked = createMemo(() => store.answers[store.tab]?.length ?? 0)
 
   const summary = createMemo(() => {
     const n = Math.min(store.tab + 1, total())
@@ -46,8 +43,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
 
   const last = createMemo(() => store.tab >= total() - 1)
 
-  const fold = () => setStore("collapsed", (value) => !value)
-
   const customUpdate = (value: string, selected: boolean = on()) => {
     const prev = input().trim()
     const next = value.trim()
@@ -262,21 +257,9 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
       kind="question"
       ref={(el) => (root = el)}
       header={
-        <div
-          data-action="session-question-toggle"
-          class="flex flex-1 min-w-0 items-center gap-2 cursor-default select-none"
-          role="button"
-          tabIndex={0}
-          style={{ margin: "0 -10px", padding: "0 0 0 10px" }}
-          onClick={fold}
-          onKeyDown={(event) => {
-            if (event.key !== "Enter" && event.key !== " ") return
-            event.preventDefault()
-            fold()
-          }}
-        >
+        <>
           <div data-slot="question-header-title">{summary()}</div>
-          <div data-slot="question-progress" class="ml-auto mr-1">
+          <div data-slot="question-progress">
             <For each={questions()}>
               {(_, i) => (
                 <button
@@ -288,38 +271,13 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
                     (store.customOn[i()] === true && (store.custom[i()] ?? "").trim().length > 0)
                   }
                   disabled={store.sending}
-                  onMouseDown={(event) => {
-                    event.preventDefault()
-                    event.stopPropagation()
-                  }}
-                  onClick={(event) => {
-                    event.stopPropagation()
-                    jump(i())
-                  }}
+                  onClick={() => jump(i())}
                   aria-label={`${language.t("ui.tool.questions")} ${i() + 1}`}
                 />
               )}
             </For>
           </div>
-          <div>
-            <IconButton
-              data-action="session-question-toggle-button"
-              icon="chevron-down"
-              size="normal"
-              variant="ghost"
-              classList={{ "rotate-180": store.collapsed }}
-              onMouseDown={(event) => {
-                event.preventDefault()
-                event.stopPropagation()
-              }}
-              onClick={(event) => {
-                event.stopPropagation()
-                fold()
-              }}
-              aria-label={store.collapsed ? language.t("session.todo.expand") : language.t("session.todo.collapse")}
-            />
-          </div>
-        </div>
+        </>
       }
       footer={
         <>
@@ -339,121 +297,56 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
         </>
       }
     >
-      <div
-        data-slot="question-text"
-        class="cursor-default"
-        classList={{
-          "mb-6": store.collapsed && picked() === 0,
-        }}
-        role={store.collapsed ? "button" : undefined}
-        tabIndex={store.collapsed ? 0 : undefined}
-        onClick={fold}
-        onKeyDown={(event) => {
-          if (!store.collapsed) return
-          if (event.key !== "Enter" && event.key !== " ") return
-          event.preventDefault()
-          fold()
-        }}
-      >
-        {question()?.question}
-      </div>
-      <Show when={store.collapsed && picked() > 0}>
-        <div data-slot="question-hint" class="cursor-default mb-6">
-          {picked()} answer{picked() === 1 ? "" : "s"} selected
-        </div>
+      <div data-slot="question-text">{question()?.question}</div>
+      <Show when={multi()} fallback={<div data-slot="question-hint">{language.t("ui.question.singleHint")}</div>}>
+        <div data-slot="question-hint">{language.t("ui.question.multiHint")}</div>
       </Show>
-      <div data-slot="question-answers" hidden={store.collapsed} aria-hidden={store.collapsed}>
-        <Show when={multi()} fallback={<div data-slot="question-hint">{language.t("ui.question.singleHint")}</div>}>
-          <div data-slot="question-hint">{language.t("ui.question.multiHint")}</div>
-        </Show>
-        <div data-slot="question-options">
-          <For each={options()}>
-            {(opt, i) => {
-              const picked = () => store.answers[store.tab]?.includes(opt.label) ?? false
-              return (
-                <button
-                  data-slot="question-option"
-                  data-picked={picked()}
-                  role={multi() ? "checkbox" : "radio"}
-                  aria-checked={picked()}
-                  disabled={store.sending}
-                  onClick={() => selectOption(i())}
-                >
-                  <span data-slot="question-option-check" aria-hidden="true">
-                    <span
-                      data-slot="question-option-box"
-                      data-type={multi() ? "checkbox" : "radio"}
-                      data-picked={picked()}
-                    >
-                      <Show when={multi()} fallback={<span data-slot="question-option-radio-dot" />}>
-                        <Icon name="check-small" size="small" />
-                      </Show>
-                    </span>
-                  </span>
-                  <span data-slot="question-option-main">
-                    <span data-slot="option-label">{opt.label}</span>
-                    <Show when={opt.description}>
-                      <span data-slot="option-description">{opt.description}</span>
-                    </Show>
-                  </span>
-                </button>
-              )
-            }}
-          </For>
-
-          <Show
-            when={store.editing}
-            fallback={
+      <div data-slot="question-options">
+        <For each={options()}>
+          {(opt, i) => {
+            const picked = () => store.answers[store.tab]?.includes(opt.label) ?? false
+            return (
               <button
                 data-slot="question-option"
-                data-custom="true"
-                data-picked={on()}
+                data-picked={picked()}
                 role={multi() ? "checkbox" : "radio"}
-                aria-checked={on()}
+                aria-checked={picked()}
                 disabled={store.sending}
-                onClick={customOpen}
+                onClick={() => selectOption(i())}
               >
-                <span
-                  data-slot="question-option-check"
-                  aria-hidden="true"
-                  onClick={(e) => {
-                    e.preventDefault()
-                    e.stopPropagation()
-                    customToggle()
-                  }}
-                >
-                  <span data-slot="question-option-box" data-type={multi() ? "checkbox" : "radio"} data-picked={on()}>
+                <span data-slot="question-option-check" aria-hidden="true">
+                  <span
+                    data-slot="question-option-box"
+                    data-type={multi() ? "checkbox" : "radio"}
+                    data-picked={picked()}
+                  >
                     <Show when={multi()} fallback={<span data-slot="question-option-radio-dot" />}>
                       <Icon name="check-small" size="small" />
                     </Show>
                   </span>
                 </span>
                 <span data-slot="question-option-main">
-                  <span data-slot="option-label">{language.t("ui.messagePart.option.typeOwnAnswer")}</span>
-                  <span data-slot="option-description">{input() || language.t("ui.question.custom.placeholder")}</span>
+                  <span data-slot="option-label">{opt.label}</span>
+                  <Show when={opt.description}>
+                    <span data-slot="option-description">{opt.description}</span>
+                  </Show>
                 </span>
               </button>
-            }
-          >
-            <form
+            )
+          }}
+        </For>
+
+        <Show
+          when={store.editing}
+          fallback={
+            <button
               data-slot="question-option"
               data-custom="true"
               data-picked={on()}
               role={multi() ? "checkbox" : "radio"}
               aria-checked={on()}
-              onMouseDown={(e) => {
-                if (store.sending) {
-                  e.preventDefault()
-                  return
-                }
-                if (e.target instanceof HTMLTextAreaElement) return
-                const input = e.currentTarget.querySelector('[data-slot="question-custom-input"]')
-                if (input instanceof HTMLTextAreaElement) input.focus()
-              }}
-              onSubmit={(e) => {
-                e.preventDefault()
-                commitCustom()
-              }}
+              disabled={store.sending}
+              onClick={customOpen}
             >
               <span
                 data-slot="question-option-check"
@@ -472,39 +365,80 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
               </span>
               <span data-slot="question-option-main">
                 <span data-slot="option-label">{language.t("ui.messagePart.option.typeOwnAnswer")}</span>
-                <textarea
-                  ref={(el) =>
-                    setTimeout(() => {
-                      el.focus()
-                      el.style.height = "0px"
-                      el.style.height = `${el.scrollHeight}px`
-                    }, 0)
-                  }
-                  data-slot="question-custom-input"
-                  placeholder={language.t("ui.question.custom.placeholder")}
-                  value={input()}
-                  rows={1}
-                  disabled={store.sending}
-                  onKeyDown={(e) => {
-                    if (e.key === "Escape") {
-                      e.preventDefault()
-                      setStore("editing", false)
-                      return
-                    }
-                    if (e.key !== "Enter" || e.shiftKey) return
-                    e.preventDefault()
-                    commitCustom()
-                  }}
-                  onInput={(e) => {
-                    customUpdate(e.currentTarget.value)
-                    e.currentTarget.style.height = "0px"
-                    e.currentTarget.style.height = `${e.currentTarget.scrollHeight}px`
-                  }}
-                />
+                <span data-slot="option-description">{input() || language.t("ui.question.custom.placeholder")}</span>
               </span>
-            </form>
-          </Show>
-        </div>
+            </button>
+          }
+        >
+          <form
+            data-slot="question-option"
+            data-custom="true"
+            data-picked={on()}
+            role={multi() ? "checkbox" : "radio"}
+            aria-checked={on()}
+            onMouseDown={(e) => {
+              if (store.sending) {
+                e.preventDefault()
+                return
+              }
+              if (e.target instanceof HTMLTextAreaElement) return
+              const input = e.currentTarget.querySelector('[data-slot="question-custom-input"]')
+              if (input instanceof HTMLTextAreaElement) input.focus()
+            }}
+            onSubmit={(e) => {
+              e.preventDefault()
+              commitCustom()
+            }}
+          >
+            <span
+              data-slot="question-option-check"
+              aria-hidden="true"
+              onClick={(e) => {
+                e.preventDefault()
+                e.stopPropagation()
+                customToggle()
+              }}
+            >
+              <span data-slot="question-option-box" data-type={multi() ? "checkbox" : "radio"} data-picked={on()}>
+                <Show when={multi()} fallback={<span data-slot="question-option-radio-dot" />}>
+                  <Icon name="check-small" size="small" />
+                </Show>
+              </span>
+            </span>
+            <span data-slot="question-option-main">
+              <span data-slot="option-label">{language.t("ui.messagePart.option.typeOwnAnswer")}</span>
+              <textarea
+                ref={(el) =>
+                  setTimeout(() => {
+                    el.focus()
+                    el.style.height = "0px"
+                    el.style.height = `${el.scrollHeight}px`
+                  }, 0)
+                }
+                data-slot="question-custom-input"
+                placeholder={language.t("ui.question.custom.placeholder")}
+                value={input()}
+                rows={1}
+                disabled={store.sending}
+                onKeyDown={(e) => {
+                  if (e.key === "Escape") {
+                    e.preventDefault()
+                    setStore("editing", false)
+                    return
+                  }
+                  if (e.key !== "Enter" || e.shiftKey) return
+                  e.preventDefault()
+                  commitCustom()
+                }}
+                onInput={(e) => {
+                  customUpdate(e.currentTarget.value)
+                  e.currentTarget.style.height = "0px"
+                  e.currentTarget.style.height = `${e.currentTarget.scrollHeight}px`
+                }}
+              />
+            </span>
+          </form>
+        </Show>
       </div>
     </DockPrompt>
   )

packages/app/src/pages/session/message-timeline.tsx

@@ -764,6 +764,7 @@ export function MessageTimeline(props: {
                         "min-w-0 w-full max-w-full": true,
                         "md:max-w-200 2xl:max-w-[1000px]": props.centered,
                       }}
+                      style={{ "content-visibility": "auto", "contain-intrinsic-size": "auto 500px" }}
                     >
                       <Show when={commentCount() > 0}>
                         <div class="w-full px-4 md:px-5 pb-2">

packages/app/src/utils/server-health.ts

@@ -1,4 +1,3 @@
-import { usePlatform } from "@/context/platform"
 import type { ServerConnection } from "@/context/server"
 import { createSdkForServer } from "./server"
 
@@ -82,10 +81,3 @@ export async function checkServerHealth(
       .catch((error) => next(count, error))
   return attempt(0).finally(() => timeout?.clear?.())
 }
-
-export function useCheckServerHealth() {
-  const platform = usePlatform()
-  const fetcher = platform.fetch ?? globalThis.fetch
-
-  return (http: ServerConnection.HttpBase) => checkServerHealth(http, fetcher)
-}

packages/desktop-electron/package.json

@@ -30,7 +30,6 @@
     "@solid-primitives/storage": "catalog:",
     "@solidjs/meta": "catalog:",
     "@solidjs/router": "0.15.4",
-    "effect": "4.0.0-beta.29",
     "electron-log": "^5",
     "electron-store": "^10",
     "electron-updater": "^6",

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

@@ -31,13 +31,35 @@ import { registerIpcHandlers, sendDeepLinks, sendMenuCommand, sendSqliteMigratio
 import { initLogging } from "./logging"
 import { parseMarkdown } from "./markdown"
 import { createMenu } from "./menu"
-import { getDefaultServerUrl, getWslConfig, setDefaultServerUrl, setWslConfig, spawnLocalServer } from "./server"
+import {
+  checkHealth,
+  checkHealthOrAskRetry,
+  getDefaultServerUrl,
+  getSavedServerUrl,
+  getWslConfig,
+  setDefaultServerUrl,
+  setWslConfig,
+  spawnLocalServer,
+} from "./server"
 import { createLoadingWindow, createMainWindow, setDockIcon } from "./windows"
 
+type ServerConnection =
+  | { variant: "existing"; url: string }
+  | {
+      variant: "cli"
+      url: string
+      password: null | string
+      health: {
+        wait: Promise<void>
+      }
+      events: any
+    }
+
 const initEmitter = new EventEmitter()
 let initStep: InitStep = { phase: "server_waiting" }
 
 let mainWindow: BrowserWindow | null = null
+const loadingWindow: BrowserWindow | null = null
 let sidecar: CommandChild | null = null
 const loadingComplete = defer<void>()
 
@@ -109,48 +131,77 @@ function setInitStep(step: InitStep) {
   initEmitter.emit("step", step)
 }
 
-async function initialize() {
-  const needsMigration = !sqliteFileExists()
-  const sqliteDone = needsMigration ? defer<void>() : undefined
-  let overlay: BrowserWindow | null = null
+async function setupServerConnection(): Promise<ServerConnection> {
+  const customUrl = await getSavedServerUrl()
+
+  if (customUrl && (await checkHealthOrAskRetry(customUrl))) {
+    serverReady.resolve({ url: customUrl, password: null })
+    return { variant: "existing", url: customUrl }
+  }
 
   const port = await getSidecarPort()
   const hostname = "127.0.0.1"
-  const url = `http://${hostname}:${port}`
-  const password = randomUUID()
+  const localUrl = `http://${hostname}:${port}`
 
-  logger.log("spawning sidecar", { url })
+  if (await checkHealth(localUrl)) {
+    serverReady.resolve({ url: localUrl, password: null })
+    return { variant: "existing", url: localUrl }
+  }
+
+  const password = randomUUID()
   const { child, health, events } = spawnLocalServer(hostname, port, password)
   sidecar = child
-  serverReady.resolve({
-    url,
-    username: "opencode",
+
+  return {
+    variant: "cli",
+    url: localUrl,
     password,
-  })
+    health,
+    events,
+  }
+}
+
+async function initialize() {
+  const needsMigration = !sqliteFileExists()
+  const sqliteDone = needsMigration ? defer<void>() : undefined
 
   const loadingTask = (async () => {
-    logger.log("sidecar connection started", { url })
-
-    events.on("sqlite", (progress: SqliteMigrationProgress) => {
-      setInitStep({ phase: "sqlite_waiting" })
-      if (overlay) sendSqliteMigrationProgress(overlay, progress)
-      if (mainWindow) sendSqliteMigrationProgress(mainWindow, progress)
-      if (progress.type === "Done") sqliteDone?.resolve()
+    logger.log("setting up server connection")
+    const serverConnection = await setupServerConnection()
+    logger.log("server connection ready", {
+      variant: serverConnection.variant,
+      url: serverConnection.url,
     })
 
-    if (needsMigration) {
-      await sqliteDone?.promise
+    const cliHealthCheck = (() => {
+      if (serverConnection.variant == "cli") {
+        return async () => {
+          const { events, health } = serverConnection
+          events.on("sqlite", (progress: SqliteMigrationProgress) => {
+            setInitStep({ phase: "sqlite_waiting" })
+            if (loadingWindow) sendSqliteMigrationProgress(loadingWindow, progress)
+            if (mainWindow) sendSqliteMigrationProgress(mainWindow, progress)
+            if (progress.type === "Done") sqliteDone?.resolve()
+          })
+          await health.wait
+          serverReady.resolve({
+            url: serverConnection.url,
+            password: serverConnection.password,
+          })
+        }
+      } else {
+        serverReady.resolve({ url: serverConnection.url, password: null })
+        return null
+      }
+    })()
+
+    logger.log("server connection started")
+
+    if (cliHealthCheck) {
+      if (needsMigration) await sqliteDone?.promise
+      cliHealthCheck?.()
     }
 
-    await Promise.race([
-      health.wait,
-      delay(30_000).then(() => {
-        throw new Error("Sidecar health check timed out")
-      }),
-    ]).catch((error) => {
-      logger.error("sidecar health check failed", error)
-    })
-
     logger.log("loading task finished")
   })()
 
@@ -160,25 +211,32 @@ async function initialize() {
     deepLinks: pendingDeepLinks,
   }
 
-  mainWindow = createMainWindow(globals)
-  wireMenu()
-
-  if (needsMigration) {
-    const show = await Promise.race([loadingTask.then(() => false), delay(1_000).then(() => true)])
-    if (show) {
-      overlay = createLoadingWindow(globals)
-      await delay(1_000)
+  const loadingWindow = await (async () => {
+    if (needsMigration /** TOOD: 1 second timeout */) {
+      // showLoading = await Promise.race([init.then(() => false).catch(() => false), delay(1000).then(() => true)])
+      const loadingWindow = createLoadingWindow(globals)
+      await delay(1000)
+      return loadingWindow
+    } else {
+      logger.log("showing main window without loading window")
+      mainWindow = createMainWindow(globals)
+      wireMenu()
     }
-  }
+  })()
 
   await loadingTask
   setInitStep({ phase: "done" })
 
-  if (overlay) {
+  if (loadingWindow) {
     await loadingComplete.promise
   }
 
-  overlay?.close()
+  if (!mainWindow) {
+    mainWindow = createMainWindow(globals)
+    wireMenu()
+  }
+
+  loadingWindow?.close()
 }
 
 function wireMenu() {

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

@@ -1,4 +1,6 @@
-import { serve, type CommandChild } from "./cli"
+import { dialog } from "electron"
+
+import { getConfig, serve, type CommandChild, type Config } from "./cli"
 import { DEFAULT_SERVER_URL_KEY, WSL_ENABLED_KEY } from "./constants"
 import { store } from "./store"
 
@@ -29,6 +31,15 @@ export function setWslConfig(config: WslConfig) {
   store.set(WSL_ENABLED_KEY, config.enabled)
 }
 
+export async function getSavedServerUrl(): Promise<string | null> {
+  const direct = getDefaultServerUrl()
+  if (direct) return direct
+
+  const config = await getConfig().catch(() => null)
+  if (!config) return null
+  return getServerUrlFromConfig(config)
+}
+
 export function spawnLocalServer(hostname: string, port: number, password: string) {
   const { child, exit, events } = serve(hostname, port, password)
 
@@ -83,4 +94,36 @@ export async function checkHealth(url: string, password?: string | null): Promis
   }
 }
 
+export async function checkHealthOrAskRetry(url: string): Promise<boolean> {
+  while (true) {
+    if (await checkHealth(url)) return true
+
+    const result = await dialog.showMessageBox({
+      type: "warning",
+      message: `Could not connect to configured server:\n${url}\n\nWould you like to retry or start a local server instead?`,
+      title: "Connection Failed",
+      buttons: ["Retry", "Start Local"],
+      defaultId: 0,
+      cancelId: 1,
+    })
+
+    if (result.response === 0) continue
+    return false
+  }
+}
+
+export function normalizeHostnameForUrl(hostname: string) {
+  if (hostname === "0.0.0.0") return "127.0.0.1"
+  if (hostname === "::") return "[::1]"
+  if (hostname.includes(":") && !hostname.startsWith("[")) return `[${hostname}]`
+  return hostname
+}
+
+export function getServerUrlFromConfig(config: Config) {
+  const server = config.server
+  if (!server?.port) return null
+  const host = server.hostname ? normalizeHostnameForUrl(server.hostname) : "127.0.0.1"
+  return `http://${host}:${server.port}`
+}
+
 export type { CommandChild }

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

@@ -2,7 +2,6 @@ export type InitStep = { phase: "server_waiting" } | { phase: "sqlite_waiting" }
 
 export type ServerReadyData = {
   url: string
-  username: string | null
   password: string | null
 }
 

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

@@ -9,8 +9,9 @@ import {
   ServerConnection,
   useCommand,
 } from "@opencode-ai/app"
+import { Splash } from "@opencode-ai/ui/logo"
 import type { AsyncStorage } from "@solid-primitives/storage"
-import { createResource, onCleanup, onMount, Show } from "solid-js"
+import { type Accessor, createResource, type JSX, onCleanup, onMount, Show } from "solid-js"
 import { render } from "solid-js/web"
 import { MemoryRouter } from "@solidjs/router"
 import pkg from "../../package.json"
@@ -18,6 +19,7 @@ import { initI18n, t } from "./i18n"
 import { UPDATER_ENABLED } from "./updater"
 import { webviewZoom } from "./webview-zoom"
 import "./styles.css"
+import type { ServerReadyData } from "../preload/types"
 
 const root = document.getElementById("root")
 if (import.meta.env.DEV && !(root instanceof HTMLElement)) {
@@ -196,13 +198,11 @@ const createPlatform = (): Platform => {
       await window.api.setWslConfig({ enabled })
     },
 
-    getDefaultServer: async () => {
-      const url = await window.api.getDefaultServerUrl().catch(() => null)
-      if (!url) return null
-      return ServerConnection.Key.make(url)
+    getDefaultServerUrl: async () => {
+      return window.api.getDefaultServerUrl().catch(() => null)
     },
 
-    setDefaultServer: async (url: string | null) => {
+    setDefaultServerUrl: async (url: string | null) => {
       await window.api.setDefaultServerUrl(url)
     },
 
@@ -240,31 +240,6 @@ listenForDeepLinks()
 render(() => {
   const platform = createPlatform()
 
-  // Fetch sidecar credentials (available immediately, before health check)
-  const [sidecar] = createResource(() => window.api.awaitInitialization(() => undefined))
-
-  const [defaultServer] = createResource(() =>
-    platform.getDefaultServer?.().then((url) => {
-      if (url) return ServerConnection.key({ type: "http", http: { url } })
-    }),
-  )
-
-  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) {
@@ -273,12 +248,6 @@ render(() => {
     }
   }
 
-  function Inner() {
-    const cmd = useCommand()
-    menuTrigger = (id) => cmd.trigger(id)
-    return null
-  }
-
   onMount(() => {
     document.addEventListener("click", handleClick)
     onCleanup(() => {
@@ -289,20 +258,55 @@ render(() => {
   return (
     <PlatformProvider value={platform}>
       <AppBaseProviders>
-        <Show when={!defaultServer.loading && !sidecar.loading}>
-          {(_) => {
+        <ServerGate>
+          {(data) => {
+            const server: ServerConnection.Sidecar = {
+              displayName: "Local Server",
+              type: "sidecar",
+              variant: "base",
+              http: {
+                url: data().url,
+                username: "opencode",
+                password: data().password ?? undefined,
+              },
+            }
+
+            function Inner() {
+              const cmd = useCommand()
+
+              menuTrigger = (id) => cmd.trigger(id)
+
+              return null
+            }
+
             return (
-              <AppInterface
-                defaultServer={defaultServer.latest ?? ServerConnection.Key.make("sidecar")}
-                servers={servers()}
-                router={MemoryRouter}
-              >
+              <AppInterface defaultServer={ServerConnection.key(server)} servers={[server]} router={MemoryRouter}>
                 <Inner />
               </AppInterface>
             )
           }}
-        </Show>
+        </ServerGate>
       </AppBaseProviders>
     </PlatformProvider>
   )
 }, root!)
+
+// Gate component that waits for the server to be ready
+function ServerGate(props: { children: (data: Accessor<ServerReadyData>) => JSX.Element }) {
+  const [serverData] = createResource(() => window.api.awaitInitialization(() => undefined))
+  console.log({ serverData })
+  if (serverData.state === "errored") throw serverData.error
+
+  return (
+    <Show
+      when={serverData.state !== "pending" && serverData()}
+      fallback={
+        <div class="h-screen w-screen flex flex-col items-center justify-center bg-background-base">
+          <Splash class="w-16 h-20 opacity-50 animate-pulse" />
+        </div>
+      }
+    >
+      {(data) => props.children(data)}
+    </Show>
+  )
+}

packages/desktop/src-tauri/src/lib.rs

@@ -12,10 +12,12 @@ mod window_customizer;
 mod windows;
 
 use crate::cli::CommandChild;
-use futures::{FutureExt, TryFutureExt};
+use futures::{
+    FutureExt, TryFutureExt,
+    future::{self, Shared},
+};
 use std::{
     env,
-    future::Future,
     net::TcpListener,
     path::PathBuf,
     process::Command,
@@ -33,6 +35,7 @@ use tokio::{
 
 use crate::cli::{sqlite_migration::SqliteMigrationProgress, sync_cli};
 use crate::constants::*;
+use crate::server::get_saved_server_url;
 use crate::windows::{LoadingWindow, MainWindow};
 
 #[derive(Clone, serde::Serialize, specta::Type, Debug)]
@@ -40,6 +43,7 @@ struct ServerReadyData {
     url: String,
     username: Option<String>,
     password: Option<String>,
+    is_sidecar: bool,
 }
 
 #[derive(Clone, Copy, serde::Serialize, specta::Type, Debug)]
@@ -61,12 +65,27 @@ struct InitState {
     current: watch::Receiver<InitStep>,
 }
 
+#[derive(Clone)]
 struct ServerState {
     child: Arc<Mutex<Option<CommandChild>>>,
+    status: future::Shared<oneshot::Receiver<Result<ServerReadyData, String>>>,
 }
 
-/// Resolves with sidecar credentials as soon as the sidecar is spawned (before health check).
-struct SidecarReady(futures::future::Shared<oneshot::Receiver<ServerReadyData>>);
+impl ServerState {
+    pub fn new(
+        child: Option<CommandChild>,
+        status: Shared<oneshot::Receiver<Result<ServerReadyData, String>>>,
+    ) -> Self {
+        Self {
+            child: Arc::new(Mutex::new(child)),
+            status,
+        }
+    }
+
+    pub fn set_child(&self, child: Option<CommandChild>) {
+        *self.child.lock().unwrap() = child;
+    }
+}
 
 #[tauri::command]
 #[specta::specta]
@@ -91,21 +110,26 @@ fn kill_sidecar(app: AppHandle) {
     tracing::info!("Killed server");
 }
 
+fn get_logs() -> String {
+    logging::tail()
+}
+
 #[tauri::command]
 #[specta::specta]
 async fn await_initialization(
-    state: State<'_, SidecarReady>,
+    state: State<'_, ServerState>,
     init_state: State<'_, InitState>,
     events: Channel<InitStep>,
 ) -> Result<ServerReadyData, String> {
     let mut rx = init_state.current.clone();
 
-    let stream = async {
+    let events = async {
         let e = *rx.borrow();
         let _ = events.send(e);
 
         while rx.changed().await.is_ok() {
             let step = *rx.borrow_and_update();
+
             let _ = events.send(step);
 
             if matches!(step, InitStep::Done) {
@@ -114,18 +138,10 @@ async fn await_initialization(
         }
     };
 
-    // Wait for sidecar credentials (available immediately after spawn, before health check)
-    let data = async {
-        state
-            .inner()
-            .0
-            .clone()
-            .await
-            .map_err(|_| "Failed to get sidecar data".to_string())
-    };
-
-    let (result, _) = futures::future::join(data, stream).await;
-    result
+    future::join(state.status.clone(), events)
+        .await
+        .0
+        .map_err(|_| "Failed to get server status".to_string())?
 }
 
 #[tauri::command]
@@ -423,35 +439,22 @@ async fn initialize(app: AppHandle) {
     setup_app(&app, init_rx);
     spawn_cli_sync_task(app.clone());
 
-    // Spawn sidecar immediately - credentials are known before health check
-    let port = get_sidecar_port();
-    let hostname = "127.0.0.1";
-    let url = format!("http://{hostname}:{port}");
-    let password = uuid::Uuid::new_v4().to_string();
-
-    tracing::info!("Spawning sidecar on {url}");
-    let (child, health_check) =
-        server::spawn_local_server(app.clone(), hostname.to_string(), port, password.clone());
-
-    // Make sidecar credentials available immediately (before health check completes)
-    let (ready_tx, ready_rx) = oneshot::channel();
-    let _ = ready_tx.send(ServerReadyData {
-        url: url.clone(),
-        username: Some("opencode".to_string()),
-        password: Some(password),
-    });
-    app.manage(SidecarReady(ready_rx.shared()));
-    app.manage(ServerState {
-        child: Arc::new(Mutex::new(Some(child))),
-    });
+    let (server_ready_tx, server_ready_rx) = oneshot::channel();
+    let server_ready_rx = server_ready_rx.shared();
+    app.manage(ServerState::new(None, server_ready_rx.clone()));
 
     let loading_window_complete = event_once_fut::<LoadingWindowComplete>(&app);
 
+    tracing::info!("Main and loading windows created");
+
     // SQLite migration handling:
-    // We only do this if the sqlite db doesn't exist, and we're expecting the sidecar to create it.
-    // A separate loading window is shown for long migrations.
-    let needs_migration = !sqlite_file_exists();
-    let sqlite_done = needs_migration.then(|| {
+    // We only do this if the sqlite db doesn't exist, and we're expecting the sidecar to create it
+    // First, we spawn a task that listens for SqliteMigrationProgress events that can
+    // come from any invocation of the sidecar CLI. The progress is captured by a stdout stream interceptor.
+    // Then in the loading task, we wait for sqlite migration to complete before
+    // starting our health check against the server, otherwise long migrations could result in a timeout.
+    let needs_sqlite_migration = !sqlite_file_exists();
+    let sqlite_done = needs_sqlite_migration.then(|| {
         tracing::info!(
             path = %opencode_db_path().expect("failed to get db path").display(),
             "Sqlite file not found, waiting for it to be generated"
@@ -477,22 +480,80 @@ async fn initialize(app: AppHandle) {
         }))
     });
 
-    // The loading task waits for SQLite migration (if needed) then for the sidecar health check.
-    // This is only used to drive the loading window progress - the main window is shown immediately.
     let loading_task = tokio::spawn({
+        let app = app.clone();
+
         async move {
-            if let Some(sqlite_done_rx) = sqlite_done {
-                let _ = sqlite_done_rx.await;
+            tracing::info!("Setting up server connection");
+            let server_connection = setup_server_connection(app.clone()).await;
+            tracing::info!("Server connection setup");
+
+            // we delay spawning this future so that the timeout is created lazily
+            let cli_health_check = match server_connection {
+                ServerConnection::CLI {
+                    child,
+                    health_check,
+                    url,
+                    username,
+                    password,
+                } => {
+                    let app = app.clone();
+                    Some(
+                        async move {
+                            let res = timeout(Duration::from_secs(30), health_check.0).await;
+                            let err = match res {
+                                Ok(Ok(Ok(()))) => None,
+                                Ok(Ok(Err(e))) => Some(e),
+                                Ok(Err(e)) => Some(format!("Health check task failed: {e}")),
+                                Err(_) => Some("Health check timed out".to_string()),
+                            };
+
+                            if let Some(err) = err {
+                                let _ = child.kill();
+
+                                return Err(format!(
+                                    "Failed to spawn OpenCode Server ({err}). Logs:\n{}",
+                                    get_logs()
+                                ));
+                            }
+
+                            tracing::info!("CLI health check OK");
+
+                            app.state::<ServerState>().set_child(Some(child));
+
+                            Ok(ServerReadyData {
+                                url,
+                                username,
+                                password,
+                                is_sidecar: true,
+                            })
+                        }
+                        .map(move |res| {
+                            let _ = server_ready_tx.send(res);
+                        }),
+                    )
+                }
+                ServerConnection::Existing { url } => {
+                    let _ = server_ready_tx.send(Ok(ServerReadyData {
+                        url: url.to_string(),
+                        username: None,
+                        password: None,
+                        is_sidecar: false,
+                    }));
+                    None
+                }
+            };
+
+            tracing::info!("server connection started");
+
+            if let Some(cli_health_check) = cli_health_check {
+                if let Some(sqlite_done_rx) = sqlite_done {
+                    let _ = sqlite_done_rx.await;
+                }
+                tokio::spawn(cli_health_check);
             }
 
-            // Wait for sidecar to become healthy (for loading window progress)
-            let res = timeout(Duration::from_secs(30), health_check.0).await;
-            match res {
-                Ok(Ok(Ok(()))) => tracing::info!("Sidecar health check OK"),
-                Ok(Ok(Err(e))) => tracing::error!("Sidecar health check failed: {e}"),
-                Ok(Err(e)) => tracing::error!("Sidecar health check task failed: {e}"),
-                Err(_) => tracing::error!("Sidecar health check timed out"),
-            }
+            let _ = server_ready_rx.await;
 
             tracing::info!("Loading task finished");
         }
@@ -500,8 +561,7 @@ async fn initialize(app: AppHandle) {
     .map_err(|_| ())
     .shared();
 
-    // Show loading window for SQLite migrations if they take >1s
-    let loading_window = if needs_migration
+    let loading_window = if needs_sqlite_migration
         && timeout(Duration::from_secs(1), loading_task.clone())
             .await
             .is_err()
@@ -511,12 +571,12 @@ async fn initialize(app: AppHandle) {
         sleep(Duration::from_secs(1)).await;
         Some(loading_window)
     } else {
+        tracing::debug!("Showing main window without loading window");
+        MainWindow::create(&app).expect("Failed to create main window");
+
         None
     };
 
-    // Create main window immediately - the web app handles its own loading/health gate
-    MainWindow::create(&app).expect("Failed to create main window");
-
     let _ = loading_task.await;
 
     tracing::info!("Loading done, completing initialisation");
@@ -524,9 +584,12 @@ async fn initialize(app: AppHandle) {
 
     if loading_window.is_some() {
         loading_window_complete.await;
+
         tracing::info!("Loading window completed");
     }
 
+    MainWindow::create(&app).expect("Failed to create main window");
+
     if let Some(loading_window) = loading_window {
         let _ = loading_window.close();
     }
@@ -547,6 +610,59 @@ fn spawn_cli_sync_task(app: AppHandle) {
     });
 }
 
+enum ServerConnection {
+    Existing {
+        url: String,
+    },
+    CLI {
+        url: String,
+        username: Option<String>,
+        password: Option<String>,
+        child: CommandChild,
+        health_check: server::HealthCheck,
+    },
+}
+
+async fn setup_server_connection(app: AppHandle) -> ServerConnection {
+    let custom_url = get_saved_server_url(&app).await;
+
+    tracing::info!(?custom_url, "Attempting server connection");
+
+    if let Some(url) = &custom_url
+        && server::check_health_or_ask_retry(&app, url).await
+    {
+        tracing::info!(%url, "Connected to custom server");
+        // If the default server is already local, no need to also spawn a sidecar
+        if server::is_localhost_url(url) {
+            return ServerConnection::Existing { url: url.clone() };
+        }
+        // Remote default server: fall through and also spawn a local sidecar
+    }
+
+    let local_port = get_sidecar_port();
+    let hostname = "127.0.0.1";
+    let local_url = format!("http://{hostname}:{local_port}");
+
+    tracing::debug!(url = %local_url, "Checking health of local server");
+    if server::check_health(&local_url, None).await {
+        tracing::info!(url = %local_url, "Health check OK, using existing server");
+        return ServerConnection::Existing { url: local_url };
+    }
+
+    let password = uuid::Uuid::new_v4().to_string();
+
+    tracing::info!("Spawning new local server");
+    let (child, health_check) =
+        server::spawn_local_server(app, hostname.to_string(), local_port, password.clone());
+
+    ServerConnection::CLI {
+        url: local_url,
+        username: Some("opencode".to_string()),
+        password: Some(password),
+        child,
+        health_check,
+    }
+}
 
 fn get_sidecar_port() -> u32 {
     option_env!("OPENCODE_PORT")

packages/desktop/src-tauri/src/server.rs

@@ -1,6 +1,7 @@
 use std::time::{Duration, Instant};
 
 use tauri::AppHandle;
+use tauri_plugin_dialog::{DialogExt, MessageDialogButtons, MessageDialogResult};
 use tauri_plugin_store::StoreExt;
 use tokio::task::JoinHandle;
 
@@ -84,6 +85,22 @@ pub fn set_wsl_config(app: AppHandle, config: WslConfig) -> Result<(), String> {
     Ok(())
 }
 
+pub async fn get_saved_server_url(app: &tauri::AppHandle) -> Option<String> {
+    if let Some(url) = get_default_server_url(app.clone()).ok().flatten() {
+        tracing::info!(%url, "Using desktop-specific custom URL");
+        return Some(url);
+    }
+
+    if let Some(cli_config) = cli::get_config(app).await
+        && let Some(url) = get_server_url_from_config(&cli_config)
+    {
+        tracing::info!(%url, "Using custom server URL from config");
+        return Some(url);
+    }
+
+    None
+}
+
 pub fn spawn_local_server(
     app: AppHandle,
     hostname: String,
@@ -128,27 +145,19 @@ pub fn spawn_local_server(
 
 pub struct HealthCheck(pub JoinHandle<Result<(), String>>);
 
-async fn check_health(url: &str, password: Option<&str>) -> bool {
+pub async fn check_health(url: &str, password: Option<&str>) -> bool {
     let Ok(url) = reqwest::Url::parse(url) else {
         return false;
     };
 
     let mut builder = reqwest::Client::builder().timeout(Duration::from_secs(7));
 
-    if url
-        .host_str()
-        .is_some_and(|host| {
-            host.eq_ignore_ascii_case("localhost")
-                || host
-                    .parse::<std::net::IpAddr>()
-                    .is_ok_and(|ip| ip.is_loopback())
-        })
-    {
+    if url_is_localhost(&url) {
         // Some environments set proxy variables (HTTP_PROXY/HTTPS_PROXY/ALL_PROXY) without
         // excluding loopback. reqwest respects these by default, which can prevent the desktop
         // app from reaching its own local sidecar server.
         builder = builder.no_proxy();
-    }
+    };
 
     let Ok(client) = builder.build() else {
         return false;
@@ -168,3 +177,77 @@ async fn check_health(url: &str, password: Option<&str>) -> bool {
         .map(|r| r.status().is_success())
         .unwrap_or(false)
 }
+
+pub fn is_localhost_url(url: &str) -> bool {
+    reqwest::Url::parse(url).is_ok_and(|u| url_is_localhost(&u))
+}
+
+fn url_is_localhost(url: &reqwest::Url) -> bool {
+    url.host_str().is_some_and(|host| {
+        host.eq_ignore_ascii_case("localhost")
+            || host
+                .parse::<std::net::IpAddr>()
+                .is_ok_and(|ip| ip.is_loopback())
+    })
+}
+
+/// Converts a bind address hostname to a valid URL hostname for connection.
+/// - `0.0.0.0` and `::` are wildcard bind addresses, not valid connect targets
+/// - IPv6 addresses need brackets in URLs (e.g., `::1` -> `[::1]`)
+fn normalize_hostname_for_url(hostname: &str) -> String {
+    // Wildcard bind addresses -> localhost equivalents
+    if hostname == "0.0.0.0" {
+        return "127.0.0.1".to_string();
+    }
+    if hostname == "::" {
+        return "[::1]".to_string();
+    }
+
+    // IPv6 addresses need brackets in URLs
+    if hostname.contains(':') && !hostname.starts_with('[') {
+        return format!("[{}]", hostname);
+    }
+
+    hostname.to_string()
+}
+
+fn get_server_url_from_config(config: &cli::Config) -> Option<String> {
+    let server = config.server.as_ref()?;
+    let port = server.port?;
+    tracing::debug!(port, "server.port found in OC config");
+    let hostname = server
+        .hostname
+        .as_ref()
+        .map(|v| normalize_hostname_for_url(v))
+        .unwrap_or_else(|| "127.0.0.1".to_string());
+
+    Some(format!("http://{}:{}", hostname, port))
+}
+
+pub async fn check_health_or_ask_retry(app: &AppHandle, url: &str) -> bool {
+    tracing::debug!(%url, "Checking health");
+    loop {
+        if check_health(url, None).await {
+            return true;
+        }
+
+        const RETRY: &str = "Retry";
+
+        let res = app.dialog()
+    		  .message(format!("Could not connect to configured server:\n{}\n\nWould you like to retry or start a local server instead?", url))
+    		  .title("Connection Failed")
+    		  .buttons(MessageDialogButtons::OkCancelCustom(RETRY.to_string(), "Start Local".to_string()))
+    		  .blocking_show_with_result();
+
+        match res {
+            MessageDialogResult::Custom(name) if name == RETRY => {
+                continue;
+            }
+            _ => {
+                break;
+            }
+        }
+    }
+
+    false
+}

packages/desktop/src/bindings.ts

@@ -38,6 +38,7 @@ export type ServerReadyData = {
 		url: string,
 		username: string | null,
 		password: string | null,
+		is_sidecar: boolean,
 	};
 
 export type SqliteMigrationProgress = { type: "InProgress"; value: number } | { type: "Done" };

packages/desktop/src/index.tsx

@@ -9,6 +9,7 @@ import {
   ServerConnection,
   useCommand,
 } from "@opencode-ai/app"
+import { Splash } from "@opencode-ai/ui/logo"
 import type { AsyncStorage } from "@solid-primitives/storage"
 import { getCurrentWindow } from "@tauri-apps/api/window"
 import { readImage } from "@tauri-apps/plugin-clipboard-manager"
@@ -21,7 +22,7 @@ import { relaunch } from "@tauri-apps/plugin-process"
 import { open as shellOpen } from "@tauri-apps/plugin-shell"
 import { Store } from "@tauri-apps/plugin-store"
 import { check, type Update } from "@tauri-apps/plugin-updater"
-import { createResource, onCleanup, onMount, Show } from "solid-js"
+import { createResource, type JSX, onCleanup, onMount, Show } from "solid-js"
 import { render } from "solid-js/web"
 import pkg from "../package.json"
 import { initI18n, t } from "./i18n"
@@ -29,7 +30,7 @@ import { UPDATER_ENABLED } from "./updater"
 import { webviewZoom } from "./webview-zoom"
 import "./styles.css"
 import { Channel } from "@tauri-apps/api/core"
-import { commands, type InitStep } from "./bindings"
+import { commands, ServerReadyData, type InitStep } from "./bindings"
 import { createMenu } from "./menu"
 
 const root = document.getElementById("root")
@@ -347,13 +348,12 @@ const createPlatform = (): Platform => {
       await commands.setWslConfig({ enabled })
     },
 
-    getDefaultServer: async () => {
-      const url = await commands.getDefaultServerUrl().catch(() => null)
-      if (!url) return null
-      return ServerConnection.Key.make(url)
+    getDefaultServerUrl: async () => {
+      const result = await commands.getDefaultServerUrl().catch(() => null)
+      return result
     },
 
-    setDefaultServer: async (url: string | null) => {
+    setDefaultServerUrl: async (url: string | null) => {
       await commands.setDefaultServerUrl(url)
     },
 
@@ -412,33 +412,12 @@ void listenForDeepLinks()
 render(() => {
   const platform = createPlatform()
 
-  // Fetch sidecar credentials from Rust (available immediately, before health check)
-  const [sidecar] = createResource(() => commands.awaitInitialization(new Channel<InitStep>() as any))
-
   const [defaultServer] = createResource(() =>
-    platform.getDefaultServer?.().then((url) => {
+    platform.getDefaultServerUrl?.().then((url) => {
       if (url) return ServerConnection.key({ type: "http", http: { url } })
     }),
   )
 
-  // Build the sidecar server connection once credentials arrive
-  const servers = () => {
-    const data = sidecar()
-    if (!data) return []
-    const http = {
-      url: data.url,
-      username: data.username ?? undefined,
-      password: data.password ?? undefined,
-    }
-    const server: ServerConnection.Sidecar = {
-      displayName: t("desktop.server.local"),
-      type: "sidecar",
-      variant: "base",
-      http,
-    }
-    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) {
@@ -447,12 +426,6 @@ render(() => {
     }
   }
 
-  function Inner() {
-    const cmd = useCommand()
-    menuTrigger = (id) => cmd.trigger(id)
-    return null
-  }
-
   onMount(() => {
     document.addEventListener("click", handleClick)
     onCleanup(() => {
@@ -463,19 +436,60 @@ render(() => {
   return (
     <PlatformProvider value={platform}>
       <AppBaseProviders>
-        <Show when={!defaultServer.loading && !sidecar.loading}>
-          {(_) => {
+        <ServerGate>
+          {(data) => {
+            const http = {
+              url: data.url,
+              username: data.username ?? undefined,
+              password: data.password ?? undefined,
+            }
+            const server: ServerConnection.Any = data.is_sidecar
+              ? {
+                  displayName: t("desktop.server.local"),
+                  type: "sidecar",
+                  variant: "base",
+                  http,
+                }
+              : { type: "http", http }
+
+            function Inner() {
+              const cmd = useCommand()
+
+              menuTrigger = (id) => cmd.trigger(id)
+
+              return null
+            }
+
             return (
-              <AppInterface
-                defaultServer={defaultServer.latest ?? ServerConnection.Key.make("sidecar")}
-                servers={servers()}
-              >
-                <Inner />
-              </AppInterface>
+              <Show when={!defaultServer.loading}>
+                <AppInterface defaultServer={defaultServer.latest ?? ServerConnection.key(server)} servers={[server]}>
+                  <Inner />
+                </AppInterface>
+              </Show>
             )
           }}
-        </Show>
+        </ServerGate>
       </AppBaseProviders>
     </PlatformProvider>
   )
 }, root!)
+
+// Gate component that waits for the server to be ready
+function ServerGate(props: { children: (data: ServerReadyData) => JSX.Element }) {
+  const [serverData] = createResource(() => commands.awaitInitialization(new Channel<InitStep>() as any))
+  if (serverData.state === "errored") throw serverData.error
+
+  return (
+    <Show
+      when={serverData.state !== "pending" && serverData()}
+      fallback={
+        <div class="h-screen w-screen flex flex-col items-center justify-center bg-background-base">
+          <Splash class="w-16 h-20 opacity-50 animate-pulse" />
+          <div data-tauri-decorum-tb class="flex flex-row absolute top-0 right-0 z-10 h-10" />
+        </div>
+      }
+    >
+      {(data) => props.children(data())}
+    </Show>
+  )
+}

packages/opencode/package.json

@@ -7,7 +7,7 @@
   "private": true,
   "scripts": {
     "typecheck": "tsgo --noEmit",
-    "test": "bun test --timeout 30000 registry",
+    "test": "bun test --timeout 30000",
     "build": "bun run script/build.ts",
     "dev": "bun run --conditions=browser ./src/index.ts",
     "random": "echo 'Random script updated at $(date)' && echo 'Change queued successfully' && echo 'Another change made' && echo 'Yet another change' && echo 'One more change' && echo 'Final change' && echo 'Another final change' && echo 'Yet another final change'",
@@ -25,15 +25,9 @@
   "exports": {
     "./*": "./src/*.ts"
   },
-  "imports": {
-    "#db": {
-      "bun": "./src/storage/db.bun.ts",
-      "node": "./src/storage/db.node.ts",
-      "default": "./src/storage/db.bun.ts"
-    }
-  },
   "devDependencies": {
     "@babel/core": "7.28.4",
+    "@effect/language-service": "0.79.0",
     "@octokit/webhooks-types": "7.6.1",
     "@opencode-ai/script": "workspace:*",
     "@parcel/watcher-darwin-arm64": "2.5.1",
@@ -48,14 +42,13 @@
     "@types/babel__core": "7.20.5",
     "@types/bun": "catalog:",
     "@types/mime-types": "3.0.1",
-    "@types/npmcli__arborist": "6.3.3",
     "@types/semver": "^7.5.8",
     "@types/turndown": "5.0.5",
-    "@types/which": "3.0.4",
     "@types/yargs": "17.0.33",
+    "@types/which": "3.0.4",
     "@typescript/native-preview": "catalog:",
-    "effect": "catalog:",
-    "drizzle-kit": "catalog:",
+    "drizzle-kit": "1.0.0-beta.16-ea816b6",
+    "drizzle-orm": "1.0.0-beta.16-ea816b6",
     "typescript": "catalog:",
     "vscode-languageserver-types": "3.17.5",
     "why-is-node-running": "3.2.2",
@@ -88,12 +81,9 @@
     "@clack/prompts": "1.0.0-alpha.1",
     "@gitlab/gitlab-ai-provider": "3.6.0",
     "@gitlab/opencode-gitlab-auth": "1.3.3",
-    "@hono/node-server": "1.19.11",
-    "@hono/node-ws": "1.3.0",
     "@hono/standard-validator": "0.1.5",
     "@hono/zod-validator": "catalog:",
     "@modelcontextprotocol/sdk": "1.25.2",
-    "@npmcli/arborist": "9.4.0",
     "@octokit/graphql": "9.0.2",
     "@octokit/rest": "catalog:",
     "@openauthjs/openauth": "catalog:",
@@ -102,8 +92,8 @@
     "@opencode-ai/sdk": "workspace:*",
     "@opencode-ai/util": "workspace:*",
     "@openrouter/ai-sdk-provider": "1.5.4",
-    "@opentui/core": "0.1.86",
-    "@opentui/solid": "0.1.86",
+    "@opentui/core": "0.1.87",
+    "@opentui/solid": "0.1.87",
     "@parcel/watcher": "2.5.1",
     "@pierre/diffs": "catalog:",
     "@solid-primitives/event-bus": "1.1.2",
@@ -118,7 +108,8 @@
     "clipboardy": "4.0.0",
     "decimal.js": "10.5.0",
     "diff": "catalog:",
-    "drizzle-orm": "catalog:",
+    "drizzle-orm": "1.0.0-beta.16-ea816b6",
+    "effect": "catalog:",
     "fuzzysort": "3.1.0",
     "glob": "13.0.5",
     "google-auth-library": "10.5.0",
@@ -137,7 +128,6 @@
     "solid-js": "catalog:",
     "strip-ansi": "7.1.2",
     "tree-sitter-bash": "0.25.0",
-    "tree-sitter-powershell": "0.25.10",
     "turndown": "7.2.0",
     "ulid": "catalog:",
     "vscode-jsonrpc": "8.2.1",

packages/opencode/script/build-node.ts

@@ -1,54 +0,0 @@
-#!/usr/bin/env bun
-
-import fs from "fs"
-import path from "path"
-import { fileURLToPath } from "url"
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-const dir = path.resolve(__dirname, "..")
-
-process.chdir(dir)
-
-// Load migrations from migration directories
-const migrationDirs = (
-  await fs.promises.readdir(path.join(dir, "migration"), {
-    withFileTypes: true,
-  })
-)
-  .filter((entry) => entry.isDirectory() && /^\d{4}\d{2}\d{2}\d{2}\d{2}\d{2}/.test(entry.name))
-  .map((entry) => entry.name)
-  .sort()
-
-const migrations = await Promise.all(
-  migrationDirs.map(async (name) => {
-    const file = path.join(dir, "migration", name, "migration.sql")
-    const sql = await Bun.file(file).text()
-    const match = /^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/.exec(name)
-    const timestamp = match
-      ? Date.UTC(
-          Number(match[1]),
-          Number(match[2]) - 1,
-          Number(match[3]),
-          Number(match[4]),
-          Number(match[5]),
-          Number(match[6]),
-        )
-      : 0
-    return { sql, timestamp, name }
-  }),
-)
-console.log(`Loaded ${migrations.length} migrations`)
-
-await Bun.build({
-  target: "node",
-  entrypoints: ["./src/node.ts"],
-  outdir: "./dist",
-  format: "esm",
-  external: ["jsonc-parser"],
-  define: {
-    OPENCODE_MIGRATIONS: JSON.stringify(migrations),
-  },
-})
-
-console.log("Build complete")

packages/opencode/script/seed-e2e.ts

@@ -12,7 +12,6 @@ const seed = async () => {
   const { InstanceBootstrap } = await import("../src/project/bootstrap")
   const { Session } = await import("../src/session")
   const { Identifier } = await import("../src/id/id")
-  const { MessageID } = await import("../src/session/schema")
   const { Project } = await import("../src/project/project")
 
   await Instance.provide({
@@ -20,7 +19,7 @@ const seed = async () => {
     init: InstanceBootstrap,
     fn: async () => {
       const session = await Session.create({ title })
-      const messageID = MessageID.ascending()
+      const messageID = Identifier.descending("message")
       const partID = Identifier.descending("part")
       const message = {
         id: messageID,

packages/opencode/src/agent/agent.ts

@@ -63,7 +63,6 @@ export namespace Agent {
       question: "deny",
       plan_enter: "deny",
       plan_exit: "deny",
-      edit: "ask",
       // mirrors github.com/github/gitignore Node.gitignore pattern for .env files
       read: {
         "*": "allow",

packages/opencode/src/bun/index.ts

@@ -1,5 +1,13 @@
+import z from "zod"
+import { Global } from "../global"
 import { Log } from "../util/log"
+import path from "path"
+import { Filesystem } from "../util/filesystem"
+import { NamedError } from "@opencode-ai/util/error"
 import { text } from "node:stream/consumers"
+import { Lock } from "../util/lock"
+import { PackageRegistry } from "./registry"
+import { proxied } from "@/util/proxied"
 import { Process } from "../util/process"
 
 export namespace BunProc {
@@ -37,4 +45,87 @@ export namespace BunProc {
   export function which() {
     return process.execPath
   }
+
+  export const InstallFailedError = NamedError.create(
+    "BunInstallFailedError",
+    z.object({
+      pkg: z.string(),
+      version: z.string(),
+    }),
+  )
+
+  export async function install(pkg: string, version = "latest") {
+    // Use lock to ensure only one install at a time
+    using _ = await Lock.write("bun-install")
+
+    const mod = path.join(Global.Path.cache, "node_modules", pkg)
+    const pkgjsonPath = path.join(Global.Path.cache, "package.json")
+    const parsed = await Filesystem.readJson<{ dependencies: Record<string, string> }>(pkgjsonPath).catch(async () => {
+      const result = { dependencies: {} as Record<string, string> }
+      await Filesystem.writeJson(pkgjsonPath, result)
+      return result
+    })
+    if (!parsed.dependencies) parsed.dependencies = {} as Record<string, string>
+    const dependencies = parsed.dependencies
+    const modExists = await Filesystem.exists(mod)
+    const cachedVersion = dependencies[pkg]
+
+    if (!modExists || !cachedVersion) {
+      // continue to install
+    } else if (version !== "latest" && cachedVersion === version) {
+      return mod
+    } else if (version === "latest") {
+      const isOutdated = await PackageRegistry.isOutdated(pkg, cachedVersion, Global.Path.cache)
+      if (!isOutdated) return mod
+      log.info("Cached version is outdated, proceeding with install", { pkg, cachedVersion })
+    }
+
+    // Build command arguments
+    const args = [
+      "add",
+      "--force",
+      "--exact",
+      // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
+      ...(proxied() || process.env.CI ? ["--no-cache"] : []),
+      "--cwd",
+      Global.Path.cache,
+      pkg + "@" + version,
+    ]
+
+    // Let Bun handle registry resolution:
+    // - If .npmrc files exist, Bun will use them automatically
+    // - If no .npmrc files exist, Bun will default to https://registry.npmjs.org
+    // - No need to pass --registry flag
+    log.info("installing package using Bun's default registry resolution", {
+      pkg,
+      version,
+    })
+
+    await BunProc.run(args, {
+      cwd: Global.Path.cache,
+    }).catch((e) => {
+      throw new InstallFailedError(
+        { pkg, version },
+        {
+          cause: e,
+        },
+      )
+    })
+
+    // Resolve actual version from installed package when using "latest"
+    // This ensures subsequent starts use the cached version until explicitly updated
+    let resolvedVersion = version
+    if (version === "latest") {
+      const installedPkg = await Filesystem.readJson<{ version?: string }>(path.join(mod, "package.json")).catch(
+        () => null,
+      )
+      if (installedPkg?.version) {
+        resolvedVersion = installedPkg.version
+      }
+    }
+
+    parsed.dependencies[pkg] = resolvedVersion
+    await Filesystem.writeJson(pkgjsonPath, parsed)
+    return mod
+  }
 }

packages/opencode/src/bun/registry.ts

@@ -1,3 +1,4 @@
+import semver from "semver"
 import { text } from "node:stream/consumers"
 import { Log } from "../util/log"
 import { Process } from "../util/process"
@@ -33,4 +34,17 @@ export namespace PackageRegistry {
     if (!value) return null
     return value
   }
+
+  export async function isOutdated(pkg: string, cachedVersion: string, cwd?: string): Promise<boolean> {
+    const latestVersion = await info(pkg, "version", cwd)
+    if (!latestVersion) {
+      log.warn("Failed to resolve latest version, using cached", { pkg, cachedVersion })
+      return false
+    }
+
+    const isRange = /[\s^~*xX<>|=]/.test(cachedVersion)
+    if (isRange) return !semver.satisfies(latestVersion, cachedVersion)
+
+    return semver.lt(cachedVersion, latestVersion)
+  }
 }

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

@@ -11,11 +11,6 @@ const openBrowser = (url: string) => Effect.promise(() => open(url).catch(() =>
 
 const println = (msg: string) => Effect.sync(() => UI.println(msg))
 
-const isActiveOrgChoice = (
-  active: Option.Option<{ id: AccountID; active_org_id: OrgID | null }>,
-  choice: { accountID: AccountID; orgID: OrgID },
-) => Option.isSome(active) && active.value.id === choice.accountID && active.value.active_org_id === choice.orgID
-
 const loginEffect = Effect.fn("login")(function* (url: string) {
   const service = yield* AccountService
 
@@ -104,10 +99,11 @@ const switchEffect = Effect.fn("switch")(function* () {
   if (groups.length === 0) return yield* println("Not logged in")
 
   const active = yield* service.active()
+  const activeOrgID = Option.flatMap(active, (a) => Option.fromNullishOr(a.active_org_id))
 
   const opts = groups.flatMap((group) =>
     group.orgs.map((org) => {
-      const isActive = isActiveOrgChoice(active, { accountID: group.account.id, orgID: org.id })
+      const isActive = Option.isSome(activeOrgID) && activeOrgID.value === org.id
       return {
         value: { orgID: org.id, accountID: group.account.id, label: org.name },
         label: isActive
@@ -136,10 +132,11 @@ const orgsEffect = Effect.fn("orgs")(function* () {
   if (!groups.some((group) => group.orgs.length > 0)) return yield* println("No orgs found")
 
   const active = yield* service.active()
+  const activeOrgID = Option.flatMap(active, (a) => Option.fromNullishOr(a.active_org_id))
 
   for (const group of groups) {
     for (const org of group.orgs) {
-      const isActive = isActiveOrgChoice(active, { accountID: group.account.id, orgID: org.id })
+      const isActive = Option.isSome(activeOrgID) && activeOrgID.value === org.id
       const dot = isActive ? UI.Style.TEXT_SUCCESS + "●" + UI.Style.TEXT_NORMAL : " "
       const name = isActive ? UI.Style.TEXT_HIGHLIGHT_BOLD + org.name + UI.Style.TEXT_NORMAL : org.name
       const email = UI.Style.TEXT_DIM + group.account.email + UI.Style.TEXT_NORMAL

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

@@ -23,7 +23,7 @@ export const AcpCommand = cmd({
     process.env.OPENCODE_CLIENT = "acp"
     await bootstrap(process.cwd(), async () => {
       const opts = await resolveNetworkOptions(args)
-      const server = await Server.listen(opts)
+      const server = Server.listen(opts)
 
       const sdk = createOpencodeClient({
         baseUrl: `http://${server.hostname}:${server.port}`,

packages/opencode/src/cli/cmd/debug/agent.ts

@@ -5,7 +5,6 @@ import { Provider } from "../../../provider/provider"
 import { Session } from "../../../session"
 import type { MessageV2 } from "../../../session/message-v2"
 import { Identifier } from "../../../id/id"
-import { MessageID } from "../../../session/schema"
 import { ToolRegistry } from "../../../tool/registry"
 import { Instance } from "../../../project/instance"
 import { PermissionNext } from "../../../permission/next"
@@ -114,7 +113,7 @@ function parseToolParams(input?: string) {
 
 async function createToolContext(agent: Agent.Info) {
   const session = await Session.create({ title: `Debug tool run (${agent.name})` })
-  const messageID = MessageID.ascending()
+  const messageID = Identifier.ascending("message")
   const model = agent.model ?? (await Provider.defaultModel())
   const now = Date.now()
   const message: MessageV2.Assistant = {

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

@@ -1,6 +1,5 @@
 import type { Argv } from "yargs"
 import { Session } from "../../session"
-import { SessionID } from "../../session/schema"
 import { cmd } from "./cmd"
 import { bootstrap } from "../bootstrap"
 import { UI } from "../ui"
@@ -18,7 +17,7 @@ export const ExportCommand = cmd({
   },
   handler: async (args) => {
     await bootstrap(process.cwd(), async () => {
-      let sessionID = args.sessionID ? SessionID.make(args.sessionID) : undefined
+      let sessionID = args.sessionID
       process.stderr.write(`Exporting session: ${sessionID ?? "latest"}\n`)
 
       if (!sessionID) {
@@ -59,7 +58,7 @@ export const ExportCommand = cmd({
           throw new UI.CancelledError()
         }
 
-        sessionID = selectedSession
+        sessionID = selectedSession as string
 
         prompts.outro("Exporting session...", {
           output: process.stderr,
@@ -68,7 +67,7 @@ export const ExportCommand = cmd({
 
       try {
         const sessionInfo = await Session.get(sessionID!)
-        const messages = await Session.messages({ sessionID: sessionInfo.id })
+        const messages = await Session.messages({ sessionID: sessionID! })
 
         const exportData = {
           info: sessionInfo,

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

@@ -22,9 +22,7 @@ import { ModelsDev } from "../../provider/models"
 import { Instance } from "@/project/instance"
 import { bootstrap } from "../bootstrap"
 import { Session } from "../../session"
-import type { SessionID } from "../../session/schema"
 import { Identifier } from "../../id/id"
-import { MessageID } from "../../session/schema"
 import { Provider } from "../../provider/provider"
 import { Bus } from "../../bus"
 import { MessageV2 } from "../../session/message-v2"
@@ -483,7 +481,7 @@ export const GithubRunCommand = cmd({
       let octoRest: Octokit
       let octoGraph: typeof graphql
       let gitConfig: string
-      let session: { id: SessionID; title: string; version: string }
+      let session: { id: string; title: string; version: string }
       let shareId: string | undefined
       let exitCode = 0
       type PromptFiles = Awaited<ReturnType<typeof getUserPrompt>>["promptFiles"]
@@ -936,7 +934,7 @@ export const GithubRunCommand = cmd({
 
         const result = await SessionPrompt.prompt({
           sessionID: session.id,
-          messageID: MessageID.ascending(),
+          messageID: Identifier.ascending("message"),
           variant,
           model: {
             providerID,
@@ -990,7 +988,7 @@ export const GithubRunCommand = cmd({
         console.log("Requesting summary from agent...")
         const summary = await SessionPrompt.prompt({
           sessionID: session.id,
-          messageID: MessageID.ascending(),
+          messageID: Identifier.ascending("message"),
           variant,
           model: {
             providerID,

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

@@ -1,7 +1,6 @@
 import type { Argv } from "yargs"
 import type { Session as SDKSession, Message, Part } from "@opencode-ai/sdk/v2"
 import { Session } from "../../session"
-import { SessionID, MessageID } from "../../session/schema"
 import { cmd } from "./cmd"
 import { bootstrap } from "../bootstrap"
 import { Database } from "../../storage/db"
@@ -87,7 +86,7 @@ export const ImportCommand = cmd({
     await bootstrap(process.cwd(), async () => {
       let exportData:
         | {
-            info: SDKSession
+            info: Session.Info
             messages: Array<{
               info: Message
               parts: Part[]
@@ -153,15 +152,7 @@ export const ImportCommand = cmd({
         return
       }
 
-      const row = Session.toRow({
-        ...exportData.info,
-        id: SessionID.make(exportData.info.id),
-        parentID: exportData.info.parentID ? SessionID.make(exportData.info.parentID) : undefined,
-        projectID: Instance.project.id,
-        revert: exportData.info.revert
-          ? { ...exportData.info.revert, messageID: MessageID.make(exportData.info.revert.messageID) }
-          : undefined,
-      })
+      const row = { ...Session.toRow(exportData.info), project_id: Instance.project.id }
       Database.use((db) =>
         db
           .insert(SessionTable)
@@ -171,30 +162,28 @@ export const ImportCommand = cmd({
       )
 
       for (const msg of exportData.messages) {
-        const { id: _mid, sessionID: _msid, ...msgData } = msg.info
         Database.use((db) =>
           db
             .insert(MessageTable)
             .values({
-              id: MessageID.make(msg.info.id),
-              session_id: row.id,
+              id: msg.info.id,
+              session_id: exportData.info.id,
               time_created: msg.info.time?.created ?? Date.now(),
-              data: msgData,
+              data: msg.info,
             })
             .onConflictDoNothing()
             .run(),
         )
 
         for (const part of msg.parts) {
-          const { id: _pid, sessionID: _psid, messageID: _pmid, ...partData } = part
           Database.use((db) =>
             db
               .insert(PartTable)
               .values({
                 id: part.id,
-                message_id: MessageID.make(msg.info.id),
-                session_id: row.id,
-                data: partData,
+                message_id: msg.info.id,
+                session_id: exportData.info.id,
+                data: part,
               })
               .onConflictDoNothing()
               .run(),

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

@@ -370,11 +370,6 @@ export const RunCommand = cmd({
         action: "deny",
         pattern: "*",
       },
-      {
-        permission: "edit",
-        action: "allow",
-        pattern: "*",
-      },
     ]
 
     function title() {

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

@@ -15,7 +15,7 @@ export const ServeCommand = cmd({
       console.log("Warning: OPENCODE_SERVER_PASSWORD is not set; server is unsecured.")
     }
     const opts = await resolveNetworkOptions(args)
-    const server = await Server.listen(opts)
+    const server = Server.listen(opts)
     console.log(`opencode server listening on http://${server.hostname}:${server.port}`)
 
     await new Promise(() => {})

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

@@ -1,7 +1,6 @@
 import type { Argv } from "yargs"
 import { cmd } from "./cmd"
 import { Session } from "../../session"
-import { SessionID } from "../../session/schema"
 import { bootstrap } from "../bootstrap"
 import { UI } from "../ui"
 import { Locale } from "../../util/locale"
@@ -58,14 +57,13 @@ export const SessionDeleteCommand = cmd({
   },
   handler: async (args) => {
     await bootstrap(process.cwd(), async () => {
-      const sessionID = SessionID.make(args.sessionID)
       try {
-        await Session.get(sessionID)
+        await Session.get(args.sessionID)
       } catch {
         UI.error(`Session not found: ${args.sessionID}`)
         process.exit(1)
       }
-      await Session.remove(sessionID)
+      await Session.remove(args.sessionID)
       UI.println(UI.Style.TEXT_SUCCESS_BOLD + `Session ${args.sessionID} deleted` + UI.Style.TEXT_NORMAL)
     })
   },

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

@@ -480,7 +480,6 @@ function App() {
     {
       title: "Toggle MCPs",
       value: "mcp.list",
-      search: "toggle mcps",
       category: "Agent",
       slash: {
         name: "mcps",
@@ -556,9 +555,8 @@ function App() {
       category: "System",
     },
     {
-      title: mode() === "dark" ? "Light mode" : "Dark mode",
+      title: "Toggle appearance",
       value: "theme.switch_mode",
-      search: "toggle appearance",
       onSelect: (dialog) => {
         setMode(mode() === "dark" ? "light" : "dark")
         dialog.clear()
@@ -597,7 +595,6 @@ function App() {
     },
     {
       title: "Toggle debug panel",
-      search: "toggle debug",
       category: "System",
       value: "app.debug",
       onSelect: (dialog) => {
@@ -607,7 +604,6 @@ function App() {
     },
     {
       title: "Toggle console",
-      search: "toggle console",
       category: "System",
       value: "app.console",
       onSelect: (dialog) => {
@@ -648,7 +644,6 @@ function App() {
     {
       title: terminalTitleEnabled() ? "Disable terminal title" : "Enable terminal title",
       value: "terminal.title.toggle",
-      search: "toggle terminal title",
       keybind: "terminal_title_toggle",
       category: "System",
       onSelect: (dialog) => {
@@ -664,7 +659,6 @@ function App() {
     {
       title: kv.get("animations_enabled", true) ? "Disable animations" : "Enable animations",
       value: "app.toggle.animations",
-      search: "toggle animations",
       category: "System",
       onSelect: (dialog) => {
         kv.set("animations_enabled", !kv.get("animations_enabled", true))
@@ -674,7 +668,6 @@ function App() {
     {
       title: kv.get("diff_wrap_mode", "word") === "word" ? "Disable diff wrapping" : "Enable diff wrapping",
       value: "app.toggle.diffwrap",
-      search: "toggle diff wrapping",
       category: "System",
       onSelect: (dialog) => {
         const current = kv.get("diff_wrap_mode", "word")

packages/opencode/src/cli/cmd/tui/component/dialog-model.tsx

@@ -7,27 +7,6 @@ import { useDialog } from "@tui/ui/dialog"
 import { createDialogProviderOptions, DialogProvider } from "./dialog-provider"
 import { useKeybind } from "../context/keybind"
 import * as fuzzysort from "fuzzysort"
-import type { Provider } from "@opencode-ai/sdk/v2"
-
-function pickLatest(models: [string, Provider["models"][string]][]) {
-  const picks: Record<string, [string, Provider["models"][string]]> = {}
-  for (const item of models) {
-    const model = item[0]
-    const info = item[1]
-    const key = info.family ?? model
-    const prev = picks[key]
-    if (!prev) {
-      picks[key] = item
-      continue
-    }
-    if (info.release_date !== prev[1].release_date) {
-      if (info.release_date > prev[1].release_date) picks[key] = item
-      continue
-    }
-    if (model > prev[0]) picks[key] = item
-  }
-  return Object.values(picks)
-}
 
 export function useConnected() {
   const sync = useSync()
@@ -42,7 +21,6 @@ export function DialogModel(props: { providerID?: string }) {
   const dialog = useDialog()
   const keybind = useKeybind()
   const [query, setQuery] = createSignal("")
-  const [all, setAll] = createSignal(false)
 
   const connected = useConnected()
   const providers = createDialogProviderOptions()
@@ -94,8 +72,8 @@ export function DialogModel(props: { providerID?: string }) {
         (provider) => provider.id !== "opencode",
         (provider) => provider.name,
       ),
-      flatMap((provider) => {
-        const items = pipe(
+      flatMap((provider) =>
+        pipe(
           provider.models,
           entries(),
           filter(([_, info]) => info.status !== "deprecated"),
@@ -126,9 +104,8 @@ export function DialogModel(props: { providerID?: string }) {
             (x) => x.footer !== "Free",
             (x) => x.title,
           ),
-        )
-        return items
-      }),
+        ),
+      ),
     )
 
     const popularProviders = !connected()
@@ -177,13 +154,6 @@ export function DialogModel(props: { providerID?: string }) {
             local.model.toggleFavorite(option.value as { providerID: string; modelID: string })
           },
         },
-        {
-          keybind: keybind.all.model_show_all_toggle?.[0],
-          title: all() ? "Show latest only" : "Show all models",
-          onTrigger: () => {
-            setAll((value) => !value)
-          },
-        },
       ]}
       onFilter={setQuery}
       flat={true}

packages/opencode/src/cli/cmd/tui/component/dialog-workspace-list.tsx

@@ -9,7 +9,6 @@ import { useToast } from "../ui/toast"
 import { useKeybind } from "../context/keybind"
 import { DialogSessionList } from "./workspace/dialog-session-list"
 import { createOpencodeClient } from "@opencode-ai/sdk/v2"
-import { setTimeout as sleep } from "node:timers/promises"
 
 async function openWorkspace(input: {
   dialog: ReturnType<typeof useDialog>
@@ -57,7 +56,7 @@ async function openWorkspace(input: {
       return
     }
     if (result.response.status >= 500 && result.response.status < 600) {
-      await sleep(1000)
+      await Bun.sleep(1000)
       continue
     }
     if (!result.data) {

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

@@ -10,7 +10,6 @@ import { useSDK } from "@tui/context/sdk"
 import { useRoute } from "@tui/context/route"
 import { useSync } from "@tui/context/sync"
 import { Identifier } from "@/id/id"
-import { MessageID } from "@/session/schema"
 import { createStore, produce } from "solid-js/store"
 import { useKeybind } from "@tui/context/keybind"
 import { usePromptHistory, type PromptInfo } from "./history"
@@ -79,7 +78,6 @@ export function Prompt(props: PromptProps) {
   const renderer = useRenderer()
   const { theme, syntax } = useTheme()
   const kv = useKV()
-  const [autoaccept, setAutoaccept] = kv.signal<"none" | "edit">("permission_auto_accept", "edit")
 
   function promptModelWarning() {
     toast.show({
@@ -173,17 +171,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",
@@ -574,7 +561,7 @@ export function Prompt(props: PromptProps) {
       sessionID = res.data.id
     }
 
-    const messageID = MessageID.ascending()
+    const messageID = Identifier.ascending("message")
     let inputText = store.prompt.input
 
     // Expand pasted text inline before submitting
@@ -1025,30 +1012,23 @@ export function Prompt(props: PromptProps) {
               cursorColor={theme.text}
               syntaxStyle={syntax()}
             />
-            <box flexDirection="row" flexShrink={0} paddingTop={1} gap={1} justifyContent="space-between">
-              <box flexDirection="row" gap={1}>
-                <text fg={highlight()}>
-                  {store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
-                </text>
-                <Show when={store.mode === "normal"}>
-                  <box flexDirection="row" gap={1}>
-                    <text flexShrink={0} fg={keybind.leader ? theme.textMuted : theme.text}>
-                      {local.model.parsed().model}
+            <box flexDirection="row" flexShrink={0} paddingTop={1} gap={1}>
+              <text fg={highlight()}>
+                {store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
+              </text>
+              <Show when={store.mode === "normal"}>
+                <box flexDirection="row" gap={1}>
+                  <text flexShrink={0} fg={keybind.leader ? theme.textMuted : theme.text}>
+                    {local.model.parsed().model}
+                  </text>
+                  <text fg={theme.textMuted}>{local.model.parsed().provider}</text>
+                  <Show when={showVariant()}>
+                    <text fg={theme.textMuted}>·</text>
+                    <text>
+                      <span style={{ fg: theme.warning, bold: true }}>{local.model.variant.current()}</span>
                     </text>
-                    <text fg={theme.textMuted}>{local.model.parsed().provider}</text>
-                    <Show when={showVariant()}>
-                      <text fg={theme.textMuted}>·</text>
-                      <text>
-                        <span style={{ fg: theme.warning, bold: true }}>{local.model.variant.current()}</span>
-                      </text>
-                    </Show>
-                  </box>
-                </Show>
-              </box>
-              <Show when={autoaccept() === "edit"}>
-                <text>
-                  <span style={{ fg: theme.warning }}>autoedit</span>
-                </text>
+                  </Show>
+                </box>
               </Show>
             </box>
           </box>

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

@@ -25,7 +25,6 @@ import { createSimpleContext } from "./helper"
 import type { Snapshot } from "@/snapshot"
 import { useExit } from "./exit"
 import { useArgs } from "./args"
-import { useKV } from "./kv"
 import { batch, onMount } from "solid-js"
 import { Log } from "@/util/log"
 import type { Path } from "@opencode-ai/sdk"
@@ -107,8 +106,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
     })
 
     const sdk = useSDK()
-    const kv = useKV()
-    const [autoaccept] = kv.signal<"none" | "edit">("permission_auto_accept", "edit")
 
     async function syncWorkspaces() {
       const result = await sdk.client.experimental.workspace.list().catch(() => undefined)
@@ -139,13 +136,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
 
         case "permission.asked": {
           const request = event.properties
-          if (autoaccept() === "edit" && request.permission === "edit") {
-            sdk.client.permission.reply({
-              reply: "once",
-              requestID: request.id,
-            })
-            break
-          }
           const requests = store.permission[request.sessionID]
           if (!requests) {
             setStore("permission", request.sessionID, [request])
@@ -461,7 +451,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
       get ready() {
         return store.status !== "loading"
       },
-
       session: {
         get(sessionID: string) {
           const match = Binary.search(store.session, sessionID, (s) => s.id)

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

@@ -1,6 +1,5 @@
 import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
-import { SessionID } from "@/session/schema"
 import z from "zod"
 
 export const TuiEvent = {
@@ -43,7 +42,7 @@ export const TuiEvent = {
   SessionSelect: BusEvent.define(
     "tui.session.select",
     z.object({
-      sessionID: SessionID.zod.describe("Session ID to navigate to"),
+      sessionID: z.string().regex(/^ses/).describe("Session ID to navigate to"),
     }),
   ),
 }

packages/opencode/src/cli/cmd/tui/routes/home.tsx

@@ -47,7 +47,6 @@ export function Home() {
     {
       title: tipsHidden() ? "Show tips" : "Hide tips",
       value: "tips.toggle",
-      search: "toggle tips",
       keybind: "tips_toggle",
       category: "System",
       onSelect: (dialog) => {

packages/opencode/src/cli/cmd/tui/routes/session/index.tsx

@@ -568,7 +568,6 @@ export function Session() {
     {
       title: sidebarVisible() ? "Hide sidebar" : "Show sidebar",
       value: "session.sidebar.toggle",
-      search: "toggle sidebar",
       keybind: "sidebar_toggle",
       category: "Session",
       onSelect: (dialog) => {
@@ -583,7 +582,6 @@ export function Session() {
     {
       title: conceal() ? "Disable code concealment" : "Enable code concealment",
       value: "session.toggle.conceal",
-      search: "toggle code concealment",
       keybind: "messages_toggle_conceal" as any,
       category: "Session",
       onSelect: (dialog) => {
@@ -594,7 +592,6 @@ export function Session() {
     {
       title: showTimestamps() ? "Hide timestamps" : "Show timestamps",
       value: "session.toggle.timestamps",
-      search: "toggle timestamps",
       category: "Session",
       slash: {
         name: "timestamps",
@@ -608,7 +605,6 @@ export function Session() {
     {
       title: showThinking() ? "Hide thinking" : "Show thinking",
       value: "session.toggle.thinking",
-      search: "toggle thinking",
       keybind: "display_thinking",
       category: "Session",
       slash: {
@@ -623,7 +619,6 @@ export function Session() {
     {
       title: showDetails() ? "Hide tool details" : "Show tool details",
       value: "session.toggle.actions",
-      search: "toggle tool details",
       keybind: "tool_details",
       category: "Session",
       onSelect: (dialog) => {
@@ -632,9 +627,8 @@ export function Session() {
       },
     },
     {
-      title: showScrollbar() ? "Hide session scrollbar" : "Show session scrollbar",
+      title: "Toggle session scrollbar",
       value: "session.toggle.scrollbar",
-      search: "toggle session scrollbar",
       keybind: "scrollbar_toggle",
       category: "Session",
       onSelect: (dialog) => {
@@ -913,12 +907,12 @@ export function Session() {
             const filename = options.filename.trim()
             const filepath = path.join(exportDir, filename)
 
-            await Filesystem.write(filepath, transcript)
+            await Bun.write(filepath, transcript)
 
             // Open with EDITOR if available
             const result = await Editor.open({ value: transcript, renderer })
             if (result !== undefined) {
-              await Filesystem.write(filepath, result)
+              await Bun.write(filepath, result)
             }
 
             toast.show({ message: `Session exported to ${filename}`, variant: "success" })

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

@@ -34,7 +34,6 @@ export interface DialogSelectOption<T = any> {
   title: string
   value: T
   description?: string
-  search?: string
   footer?: JSX.Element | string
   category?: string
   disabled?: boolean
@@ -86,8 +85,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/tui/worker.ts

@@ -8,6 +8,7 @@ import { upgrade } from "@/cli/upgrade"
 import { Config } from "@/config/config"
 import { GlobalBus } from "@/bus/global"
 import { createOpencodeClient, type Event } from "@opencode-ai/sdk/v2"
+import type { BunWebSocketData } from "hono/bun"
 import { Flag } from "@/flag/flag"
 import { setTimeout as sleep } from "node:timers/promises"
 
@@ -37,7 +38,7 @@ GlobalBus.on("event", (event) => {
   Rpc.emit("global.event", event)
 })
 
-let server: Awaited<ReturnType<typeof Server.listen>> | undefined
+let server: Bun.Server<BunWebSocketData> | undefined
 
 const eventStream = {
   abort: undefined as AbortController | undefined,
@@ -119,7 +120,7 @@ export const rpc = {
   },
   async server(input: { port: number; hostname: string; mdns?: boolean; cors?: string[] }) {
     if (server) await server.stop(true)
-    server = await Server.listen(input)
+    server = Server.listen(input)
     return { url: server.url.toString() }
   },
   async checkUpgrade(input: { directory: string }) {
@@ -142,7 +143,7 @@ export const rpc = {
     Log.Default.info("worker shutting down")
     if (eventStream.abort) eventStream.abort.abort()
     await Instance.disposeAll()
-    if (server) await server.stop(true)
+    if (server) server.stop(true)
   },
 }
 

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

@@ -37,7 +37,7 @@ export const WebCommand = cmd({
       UI.println(UI.Style.TEXT_WARNING_BOLD + "!  " + "OPENCODE_SERVER_PASSWORD is not set; server is unsecured.")
     }
     const opts = await resolveNetworkOptions(args)
-    const server = await Server.listen(opts)
+    const server = Server.listen(opts)
     UI.empty()
     UI.println(UI.logo("  "))
     UI.empty()

packages/opencode/src/command/index.ts

@@ -1,5 +1,4 @@
 import { BusEvent } from "@/bus/bus-event"
-import { SessionID, MessageID } from "@/session/schema"
 import z from "zod"
 import { Config } from "../config/config"
 import { Instance } from "../project/instance"
@@ -15,9 +14,9 @@ export namespace Command {
       "command.executed",
       z.object({
         name: z.string(),
-        sessionID: SessionID.zod,
+        sessionID: Identifier.schema("session"),
         arguments: z.string(),
-        messageID: MessageID.zod,
+        messageID: Identifier.schema("message"),
       }),
     ),
   }

packages/opencode/src/config/config.ts

@@ -1,6 +1,6 @@
 import { Log } from "../util/log"
 import path from "path"
-import { pathToFileURL } from "url"
+import { pathToFileURL, fileURLToPath } from "url"
 import { createRequire } from "module"
 import os from "os"
 import z from "zod"
@@ -22,6 +22,7 @@ import {
 } from "jsonc-parser"
 import { Instance } from "../project/instance"
 import { LSPServer } from "../lsp/server"
+import { BunProc } from "@/bun"
 import { Installation } from "@/installation"
 import { ConfigMarkdown } from "./markdown"
 import { constants, existsSync } from "fs"
@@ -29,11 +30,12 @@ import { Bus } from "@/bus"
 import { GlobalBus } from "@/bus/global"
 import { Event } from "../server/event"
 import { Glob } from "../util/glob"
+import { PackageRegistry } from "@/bun/registry"
+import { proxied } from "@/util/proxied"
 import { iife } from "@/util/iife"
 import { Account } from "@/account"
 import { ConfigPaths } from "./paths"
 import { Filesystem } from "@/util/filesystem"
-import { Npm } from "@/npm"
 
 export namespace Config {
   const ModelId = z.string().meta({ $ref: "https://models.dev/model-schema.json#/$defs/Model" })
@@ -150,7 +152,8 @@ export namespace Config {
 
       deps.push(
         iife(async () => {
-          await installDependencies(dir)
+          const shouldInstall = await needsInstall(dir)
+          if (shouldInstall) await installDependencies(dir)
         }),
       )
 
@@ -266,10 +269,6 @@ export namespace Config {
   }
 
   export async function installDependencies(dir: string) {
-    if (!(await isWritable(dir))) {
-      log.info("config dir is not writable, skipping dependency install", { dir })
-      return
-    }
     const pkg = path.join(dir, "package.json")
     const targetVersion = Installation.isLocal() ? "*" : Installation.VERSION
 
@@ -283,15 +282,22 @@ export namespace Config {
     await Filesystem.writeJson(pkg, json)
 
     const gitignore = path.join(dir, ".gitignore")
-    if (!(await Filesystem.exists(gitignore)))
-      await Filesystem.write(
-        gitignore,
-        ["node_modules", "plans", "package.json", "bun.lock", ".gitignore", "package-lock.json"].join("\n"),
-      )
+    const hasGitIgnore = await Filesystem.exists(gitignore)
+    if (!hasGitIgnore)
+      await Filesystem.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))
 
     // Install any additional dependencies defined in the package.json
     // This allows local plugins and custom tools to use external packages
-    await Npm.install(dir)
+    await BunProc.run(
+      [
+        "install",
+        // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
+        ...(proxied() || process.env.CI ? ["--no-cache"] : []),
+      ],
+      { cwd: dir },
+    ).catch((err) => {
+      log.warn("failed to install dependencies", { dir, error: err })
+    })
   }
 
   async function isWritable(dir: string) {
@@ -303,6 +309,41 @@ export namespace Config {
     }
   }
 
+  export async function needsInstall(dir: string) {
+    // Some config dirs may be read-only.
+    // Installing deps there will fail; skip installation in that case.
+    const writable = await isWritable(dir)
+    if (!writable) {
+      log.debug("config dir is not writable, skipping dependency install", { dir })
+      return false
+    }
+
+    const nodeModules = path.join(dir, "node_modules")
+    if (!existsSync(nodeModules)) return true
+
+    const pkg = path.join(dir, "package.json")
+    const pkgExists = await Filesystem.exists(pkg)
+    if (!pkgExists) return true
+
+    const parsed = await Filesystem.readJson<{ dependencies?: Record<string, string> }>(pkg).catch(() => null)
+    const dependencies = parsed?.dependencies ?? {}
+    const depVersion = dependencies["@opencode-ai/plugin"]
+    if (!depVersion) return true
+
+    const targetVersion = Installation.isLocal() ? "latest" : Installation.VERSION
+    if (targetVersion === "latest") {
+      const isOutdated = await PackageRegistry.isOutdated("@opencode-ai/plugin", depVersion, dir)
+      if (!isOutdated) return false
+      log.info("Cached version is outdated, proceeding with install", {
+        pkg: "@opencode-ai/plugin",
+        cachedVersion: depVersion,
+      })
+      return true
+    }
+    if (depVersion === targetVersion) return false
+    return true
+  }
+
   function rel(item: string, patterns: string[]) {
     const normalizedItem = item.replaceAll("\\", "/")
     for (const pattern of patterns) {
@@ -754,7 +795,6 @@ export namespace Config {
       stash_delete: z.string().optional().default("ctrl+d").describe("Delete stash entry"),
       model_provider_list: z.string().optional().default("ctrl+a").describe("Open provider list from model dialog"),
       model_favorite_toggle: z.string().optional().default("ctrl+f").describe("Toggle model favorite status"),
-      model_show_all_toggle: z.string().optional().default("ctrl+o").describe("Toggle showing all models"),
       session_share: z.string().optional().default("none").describe("Share current session"),
       session_unshare: z.string().optional().default("none").describe("Unshare current session"),
       session_interrupt: z.string().optional().default("escape").describe("Interrupt current session"),
@@ -795,12 +835,7 @@ export namespace Config {
       command_list: z.string().optional().default("ctrl+p").describe("List available commands"),
       agent_list: z.string().optional().default("<leader>a").describe("List agents"),
       agent_cycle: z.string().optional().default("tab").describe("Next agent"),
-      agent_cycle_reverse: z.string().optional().default("none").describe("Previous agent"),
-      permission_auto_accept_toggle: z
-        .string()
-        .optional()
-        .default("shift+tab")
-        .describe("Toggle auto-accept mode for permissions"),
+      agent_cycle_reverse: z.string().optional().default("shift+tab").describe("Previous agent"),
       variant_cycle: z.string().optional().default("ctrl+t").describe("Cycle model variants"),
       input_clear: z.string().optional().default("ctrl+c").describe("Clear input field"),
       input_paste: z.string().optional().default("ctrl+v").describe("Paste from clipboard"),

packages/opencode/src/control-plane/types.ts

@@ -1,6 +1,5 @@
 import z from "zod"
 import { Identifier } from "@/id/id"
-import { ProjectID } from "@/project/schema"
 
 export const WorkspaceInfo = z.object({
   id: Identifier.schema("workspace"),
@@ -9,7 +8,7 @@ export const WorkspaceInfo = z.object({
   name: z.string().nullable(),
   directory: z.string().nullable(),
   extra: z.unknown().nullable(),
-  projectID: ProjectID.zod,
+  projectID: z.string(),
 })
 export type WorkspaceInfo = z.infer<typeof WorkspaceInfo>
 

packages/opencode/src/control-plane/workspace-server/server.ts

@@ -1,4 +1,3 @@
-import { createAdaptorServer } from "@hono/node-server"
 import { Hono } from "hono"
 import { Instance } from "../../project/instance"
 import { InstanceBootstrap } from "../../project/bootstrap"
@@ -56,24 +55,10 @@ export namespace WorkspaceServer {
   }
 
   export function Listen(opts: { hostname: string; port: number }) {
-    const server = createAdaptorServer({
-      fetch: App().fetch,
-    })
-    server.listen(opts.port, opts.hostname)
-    return {
+    return Bun.serve({
       hostname: opts.hostname,
       port: opts.port,
-      stop() {
-        return new Promise<void>((resolve, reject) => {
-          server.close((err) => {
-            if (err) {
-              reject(err)
-              return
-            }
-            resolve()
-          })
-        })
-      },
-    }
+      fetch: App().fetch,
+    })
   }
 }

packages/opencode/src/control-plane/workspace.sql.ts

@@ -1,6 +1,5 @@
 import { sqliteTable, text } from "drizzle-orm/sqlite-core"
 import { ProjectTable } from "../project/project.sql"
-import type { ProjectID } from "../project/schema"
 
 export const WorkspaceTable = sqliteTable("workspace", {
   id: text().primaryKey(),
@@ -10,7 +9,6 @@ export const WorkspaceTable = sqliteTable("workspace", {
   directory: text(),
   extra: text({ mode: "json" }),
   project_id: text()
-    .$type<ProjectID>()
     .notNull()
     .references(() => ProjectTable.id, { onDelete: "cascade" }),
 })

packages/opencode/src/control-plane/workspace.ts

@@ -1,5 +1,4 @@
 import z from "zod"
-import { setTimeout as sleep } from "node:timers/promises"
 import { Identifier } from "@/id/id"
 import { fn } from "@/util/fn"
 import { Database, eq } from "@/storage/db"
@@ -7,7 +6,6 @@ import { Project } from "@/project/project"
 import { BusEvent } from "@/bus/bus-event"
 import { GlobalBus } from "@/bus/global"
 import { Log } from "@/util/log"
-import { ProjectID } from "@/project/schema"
 import { WorkspaceTable } from "./workspace.sql"
 import { getAdaptor } from "./adaptors"
 import { WorkspaceInfo } from "./types"
@@ -50,7 +48,7 @@ export namespace Workspace {
     id: Identifier.schema("workspace").optional(),
     type: Info.shape.type,
     branch: Info.shape.branch,
-    projectID: ProjectID.zod,
+    projectID: Info.shape.projectID,
     extra: Info.shape.extra,
   })
 
@@ -118,7 +116,7 @@ export namespace Workspace {
       const adaptor = await getAdaptor(space.type)
       const res = await adaptor.fetch(space, "/event", { method: "GET", signal: stop }).catch(() => undefined)
       if (!res || !res.ok || !res.body) {
-        await sleep(1000)
+        await Bun.sleep(1000)
         continue
       }
       await parseSSE(res.body, stop, (event) => {
@@ -128,7 +126,7 @@ export namespace Workspace {
         })
       })
       // Wait 250ms and retry if SSE connection fails
-      await sleep(250)
+      await Bun.sleep(250)
     }
   }
 

packages/opencode/src/format/formatter.ts

@@ -1,40 +1,40 @@
 import { text } from "node:stream/consumers"
+import { BunProc } from "../bun"
 import { Instance } from "../project/instance"
 import { Filesystem } from "../util/filesystem"
 import { Process } from "../util/process"
 import { which } from "../util/which"
 import { Flag } from "@/flag/flag"
-import { Npm } from "@/npm"
 
 export interface Info {
   name: string
+  command: string[]
   environment?: Record<string, string>
   extensions: string[]
-  enabled(): Promise<string[] | false>
+  enabled(): Promise<boolean>
 }
 
 export const gofmt: Info = {
   name: "gofmt",
+  command: ["gofmt", "-w", "$FILE"],
   extensions: [".go"],
   async enabled() {
-    const p = which("gofmt")
-    if (p === null) return false
-    return [p, "-w", "$FILE"]
+    return which("gofmt") !== null
   },
 }
 
 export const mix: Info = {
   name: "mix",
+  command: ["mix", "format", "$FILE"],
   extensions: [".ex", ".exs", ".eex", ".heex", ".leex", ".neex", ".sface"],
   async enabled() {
-    const p = which("mix")
-    if (p === null) return false
-    return [p, "format", "$FILE"]
+    return which("mix") !== null
   },
 }
 
 export const prettier: Info = {
   name: "prettier",
+  command: [BunProc.which(), "x", "prettier", "--write", "$FILE"],
   environment: {
     BUN_BE_BUN: "1",
   },
@@ -73,9 +73,8 @@ export const prettier: Info = {
         dependencies?: Record<string, string>
         devDependencies?: Record<string, string>
       }>(item)
-      if (json.dependencies?.prettier || json.devDependencies?.prettier) {
-        return [await Npm.which("prettier"), "--write", "$FILE"]
-      }
+      if (json.dependencies?.prettier) return true
+      if (json.devDependencies?.prettier) return true
     }
     return false
   },
@@ -83,6 +82,7 @@ export const prettier: Info = {
 
 export const oxfmt: Info = {
   name: "oxfmt",
+  command: [BunProc.which(), "x", "oxfmt", "$FILE"],
   environment: {
     BUN_BE_BUN: "1",
   },
@@ -95,9 +95,8 @@ export const oxfmt: Info = {
         dependencies?: Record<string, string>
         devDependencies?: Record<string, string>
       }>(item)
-      if (json.dependencies?.oxfmt || json.devDependencies?.oxfmt) {
-        return [await Npm.which("oxfmt"), "$FILE"]
-      }
+      if (json.dependencies?.oxfmt) return true
+      if (json.devDependencies?.oxfmt) return true
     }
     return false
   },
@@ -105,6 +104,7 @@ export const oxfmt: Info = {
 
 export const biome: Info = {
   name: "biome",
+  command: [BunProc.which(), "x", "@biomejs/biome", "check", "--write", "$FILE"],
   environment: {
     BUN_BE_BUN: "1",
   },
@@ -141,7 +141,7 @@ export const biome: Info = {
     for (const config of configs) {
       const found = await Filesystem.findUp(config, Instance.directory, Instance.worktree)
       if (found.length > 0) {
-        return [await Npm.which("@biomejs/biome"), "check", "--write", "$FILE"]
+        return true
       }
     }
     return false
@@ -150,49 +150,47 @@ export const biome: Info = {
 
 export const zig: Info = {
   name: "zig",
+  command: ["zig", "fmt", "$FILE"],
   extensions: [".zig", ".zon"],
   async enabled() {
-    const p = which("zig")
-    if (p === null) return false
-    return [p, "fmt", "$FILE"]
+    return which("zig") !== null
   },
 }
 
 export const clang: Info = {
   name: "clang-format",
+  command: ["clang-format", "-i", "$FILE"],
   extensions: [".c", ".cc", ".cpp", ".cxx", ".c++", ".h", ".hh", ".hpp", ".hxx", ".h++", ".ino", ".C", ".H"],
   async enabled() {
     const items = await Filesystem.findUp(".clang-format", Instance.directory, Instance.worktree)
-    if (items.length === 0) return false
-    return ["clang-format", "-i", "$FILE"]
+    return items.length > 0
   },
 }
 
 export const ktlint: Info = {
   name: "ktlint",
+  command: ["ktlint", "-F", "$FILE"],
   extensions: [".kt", ".kts"],
   async enabled() {
-    const p = which("ktlint")
-    if (p === null) return false
-    return [p, "-F", "$FILE"]
+    return which("ktlint") !== null
   },
 }
 
 export const ruff: Info = {
   name: "ruff",
+  command: ["ruff", "format", "$FILE"],
   extensions: [".py", ".pyi"],
   async enabled() {
-    const p = which("ruff")
-    if (p === null) return false
+    if (!which("ruff")) return false
     const configs = ["pyproject.toml", "ruff.toml", ".ruff.toml"]
     for (const config of configs) {
       const found = await Filesystem.findUp(config, Instance.directory, Instance.worktree)
       if (found.length > 0) {
         if (config === "pyproject.toml") {
           const content = await Filesystem.readText(found[0])
-          if (content.includes("[tool.ruff]")) return [p, "format", "$FILE"]
+          if (content.includes("[tool.ruff]")) return true
         } else {
-          return [p, "format", "$FILE"]
+          return true
         }
       }
     }
@@ -201,7 +199,7 @@ export const ruff: Info = {
       const found = await Filesystem.findUp(dep, Instance.directory, Instance.worktree)
       if (found.length > 0) {
         const content = await Filesystem.readText(found[0])
-        if (content.includes("ruff")) return [p, "format", "$FILE"]
+        if (content.includes("ruff")) return true
       }
     }
     return false
@@ -210,13 +208,14 @@ export const ruff: Info = {
 
 export const rlang: Info = {
   name: "air",
+  command: ["air", "format", "$FILE"],
   extensions: [".R"],
   async enabled() {
     const airPath = which("air")
     if (airPath == null) return false
 
     try {
-      const proc = Process.spawn([airPath, "--help"], {
+      const proc = Process.spawn(["air", "--help"], {
         stdout: "pipe",
         stderr: "pipe",
       })
@@ -228,10 +227,7 @@ export const rlang: Info = {
       const firstLine = output.split("\n")[0]
       const hasR = firstLine.includes("R language")
       const hasFormatter = firstLine.includes("formatter")
-      if (hasR && hasFormatter) {
-        return [airPath, "format", "$FILE"]
-      }
-      return false
+      return hasR && hasFormatter
     } catch (error) {
       return false
     }
@@ -240,14 +236,14 @@ export const rlang: Info = {
 
 export const uvformat: Info = {
   name: "uv",
+  command: ["uv", "format", "--", "$FILE"],
   extensions: [".py", ".pyi"],
   async enabled() {
     if (await ruff.enabled()) return false
-    const uvPath = which("uv")
-    if (uvPath !== null) {
-      const proc = Process.spawn([uvPath, "format", "--help"], { stderr: "pipe", stdout: "pipe" })
+    if (which("uv") !== null) {
+      const proc = Process.spawn(["uv", "format", "--help"], { stderr: "pipe", stdout: "pipe" })
       const code = await proc.exited
-      if (code === 0) return [uvPath, "format", "--", "$FILE"]
+      return code === 0
     }
     return false
   },
@@ -255,118 +251,108 @@ export const uvformat: Info = {
 
 export const rubocop: Info = {
   name: "rubocop",
+  command: ["rubocop", "--autocorrect", "$FILE"],
   extensions: [".rb", ".rake", ".gemspec", ".ru"],
   async enabled() {
-    const path = which("rubocop")
-    if (path === null) return false
-    return [path, "--autocorrect", "$FILE"]
+    return which("rubocop") !== null
   },
 }
 
 export const standardrb: Info = {
   name: "standardrb",
+  command: ["standardrb", "--fix", "$FILE"],
   extensions: [".rb", ".rake", ".gemspec", ".ru"],
   async enabled() {
-    const path = which("standardrb")
-    if (path === null) return false
-    return [path, "--fix", "$FILE"]
+    return which("standardrb") !== null
   },
 }
 
 export const htmlbeautifier: Info = {
   name: "htmlbeautifier",
+  command: ["htmlbeautifier", "$FILE"],
   extensions: [".erb", ".html.erb"],
   async enabled() {
-    const path = which("htmlbeautifier")
-    if (path === null) return false
-    return [path, "$FILE"]
+    return which("htmlbeautifier") !== null
   },
 }
 
 export const dart: Info = {
   name: "dart",
+  command: ["dart", "format", "$FILE"],
   extensions: [".dart"],
   async enabled() {
-    const path = which("dart")
-    if (path === null) return false
-    return [path, "format", "$FILE"]
+    return which("dart") !== null
   },
 }
 
 export const ocamlformat: Info = {
   name: "ocamlformat",
+  command: ["ocamlformat", "-i", "$FILE"],
   extensions: [".ml", ".mli"],
   async enabled() {
-    const path = which("ocamlformat")
-    if (!path) return false
+    if (!which("ocamlformat")) return false
     const items = await Filesystem.findUp(".ocamlformat", Instance.directory, Instance.worktree)
-    if (items.length === 0) return false
-    return [path, "-i", "$FILE"]
+    return items.length > 0
   },
 }
 
 export const terraform: Info = {
   name: "terraform",
+  command: ["terraform", "fmt", "$FILE"],
   extensions: [".tf", ".tfvars"],
   async enabled() {
-    const path = which("terraform")
-    if (path === null) return false
-    return [path, "fmt", "$FILE"]
+    return which("terraform") !== null
   },
 }
 
 export const latexindent: Info = {
   name: "latexindent",
+  command: ["latexindent", "-w", "-s", "$FILE"],
   extensions: [".tex"],
   async enabled() {
-    const path = which("latexindent")
-    if (path === null) return false
-    return [path, "-w", "-s", "$FILE"]
+    return which("latexindent") !== null
   },
 }
 
 export const gleam: Info = {
   name: "gleam",
+  command: ["gleam", "format", "$FILE"],
   extensions: [".gleam"],
   async enabled() {
-    const path = which("gleam")
-    if (path === null) return false
-    return [path, "format", "$FILE"]
+    return which("gleam") !== null
   },
 }
 
 export const shfmt: Info = {
   name: "shfmt",
+  command: ["shfmt", "-w", "$FILE"],
   extensions: [".sh", ".bash"],
   async enabled() {
-    const path = which("shfmt")
-    if (path === null) return false
-    return [path, "-w", "$FILE"]
+    return which("shfmt") !== null
   },
 }
 
 export const nixfmt: Info = {
   name: "nixfmt",
+  command: ["nixfmt", "$FILE"],
   extensions: [".nix"],
   async enabled() {
-    const path = which("nixfmt")
-    if (path === null) return false
-    return [path, "$FILE"]
+    return which("nixfmt") !== null
   },
 }
 
 export const rustfmt: Info = {
   name: "rustfmt",
+  command: ["rustfmt", "$FILE"],
   extensions: [".rs"],
   async enabled() {
-    const path = which("rustfmt")
-    if (path === null) return false
-    return [path, "$FILE"]
+    return which("rustfmt") !== null
   },
 }
 
 export const pint: Info = {
   name: "pint",
+  command: ["./vendor/bin/pint", "$FILE"],
   extensions: [".php"],
   async enabled() {
     const items = await Filesystem.findUp("composer.json", Instance.directory, Instance.worktree)
@@ -375,9 +361,8 @@ export const pint: Info = {
         require?: Record<string, string>
         "require-dev"?: Record<string, string>
       }>(item)
-      if (json.require?.["laravel/pint"] || json["require-dev"]?.["laravel/pint"]) {
-        return ["./vendor/bin/pint", "$FILE"]
-      }
+      if (json.require?.["laravel/pint"]) return true
+      if (json["require-dev"]?.["laravel/pint"]) return true
     }
     return false
   },
@@ -385,30 +370,27 @@ export const pint: Info = {
 
 export const ormolu: Info = {
   name: "ormolu",
+  command: ["ormolu", "-i", "$FILE"],
   extensions: [".hs"],
   async enabled() {
-    const path = which("ormolu")
-    if (path === null) return false
-    return [path, "-i", "$FILE"]
+    return which("ormolu") !== null
   },
 }
 
 export const cljfmt: Info = {
   name: "cljfmt",
+  command: ["cljfmt", "fix", "--quiet", "$FILE"],
   extensions: [".clj", ".cljs", ".cljc", ".edn"],
   async enabled() {
-    const path = which("cljfmt")
-    if (path === null) return false
-    return [path, "fix", "--quiet", "$FILE"]
+    return which("cljfmt") !== null
   },
 }
 
 export const dfmt: Info = {
   name: "dfmt",
+  command: ["dfmt", "-i", "$FILE"],
   extensions: [".d"],
   async enabled() {
-    const path = which("dfmt")
-    if (path === null) return false
-    return [path, "-i", "$FILE"]
+    return which("dfmt") !== null
   },
 }

packages/opencode/src/format/index.ts

@@ -25,14 +25,14 @@ export namespace Format {
   export type Status = z.infer<typeof Status>
 
   const state = Instance.state(async () => {
-    const cache: Record<string, string[] | false> = {}
+    const enabled: Record<string, boolean> = {}
     const cfg = await Config.get()
 
     const formatters: Record<string, Formatter.Info> = {}
     if (cfg.formatter === false) {
       log.info("all formatters are disabled")
       return {
-        cache,
+        enabled,
         formatters,
       }
     }
@@ -46,41 +46,43 @@ export namespace Format {
         continue
       }
       const result: Formatter.Info = mergeDeep(formatters[name] ?? {}, {
+        command: [],
         extensions: [],
         ...item,
       })
 
-      result.enabled = async () => item.command ?? false
+      if (result.command.length === 0) continue
+
+      result.enabled = async () => true
       result.name = name
       formatters[name] = result
     }
 
     return {
-      cache,
+      enabled,
       formatters,
     }
   })
 
-  async function resolveCommand(item: Formatter.Info) {
+  async function isEnabled(item: Formatter.Info) {
     const s = await state()
-    let command = s.cache[item.name]
-    if (command === undefined) {
-      log.info("resolving command", { name: item.name })
-      command = await item.enabled()
-      s.cache[item.name] = command
+    let status = s.enabled[item.name]
+    if (status === undefined) {
+      status = await item.enabled()
+      s.enabled[item.name] = status
     }
-    return command
+    return status
   }
 
   async function getFormatter(ext: string) {
     const formatters = await state().then((x) => x.formatters)
-    const result: { info: Formatter.Info; command: string[] }[] = []
+    const result = []
     for (const item of Object.values(formatters)) {
+      log.info("checking", { name: item.name, ext })
       if (!item.extensions.includes(ext)) continue
-      const command = await resolveCommand(item)
-      if (!command) continue
+      if (!(await isEnabled(item))) continue
       log.info("enabled", { name: item.name, ext })
-      result.push({ info: item, command })
+      result.push(item)
     }
     return result
   }
@@ -89,11 +91,11 @@ export namespace Format {
     const s = await state()
     const result: Status[] = []
     for (const formatter of Object.values(s.formatters)) {
-      const command = await resolveCommand(formatter)
+      const enabled = await isEnabled(formatter)
       result.push({
         name: formatter.name,
         extensions: formatter.extensions,
-        enabled: !!command,
+        enabled,
       })
     }
     return result
@@ -106,27 +108,29 @@ export namespace Format {
       log.info("formatting", { file })
       const ext = path.extname(file)
 
-      for (const { info, command } of await getFormatter(ext)) {
-        const replaced = command.map((x) => x.replace("$FILE", file))
-        log.info("running", { replaced })
+      for (const item of await getFormatter(ext)) {
+        log.info("running", { command: item.command })
         try {
-          const proc = Process.spawn(replaced, {
-            cwd: Instance.directory,
-            env: { ...process.env, ...info.environment },
-            stdout: "ignore",
-            stderr: "ignore",
-          })
+          const proc = Process.spawn(
+            item.command.map((x) => x.replace("$FILE", file)),
+            {
+              cwd: Instance.directory,
+              env: { ...process.env, ...item.environment },
+              stdout: "ignore",
+              stderr: "ignore",
+            },
+          )
           const exit = await proc.exited
           if (exit !== 0)
             log.error("failed", {
-              command,
-              ...info.environment,
+              command: item.command,
+              ...item.environment,
             })
         } catch (error) {
           log.error("failed to format file", {
             error,
-            command,
-            ...info.environment,
+            command: item.command,
+            ...item.environment,
             file,
           })
         }

packages/opencode/src/global/index.ts

@@ -18,7 +18,7 @@ export namespace Global {
       return process.env.OPENCODE_TEST_HOME || os.homedir()
     },
     data,
-    bin: path.join(cache, "bin"),
+    bin: path.join(data, "bin"),
     log: path.join(data, "log"),
     cache,
     config,

packages/opencode/src/lsp/server.ts

@@ -3,6 +3,7 @@ import path from "path"
 import os from "os"
 import { Global } from "../global"
 import { Log } from "../util/log"
+import { BunProc } from "../bun"
 import { text } from "node:stream/consumers"
 import fs from "fs/promises"
 import { Filesystem } from "../util/filesystem"
@@ -12,7 +13,6 @@ import { Archive } from "../util/archive"
 import { Process } from "../util/process"
 import { which } from "../util/which"
 import { Module } from "@opencode-ai/util/module"
-import { Npm } from "@/npm"
 
 const spawn = ((cmd, args, opts) => {
   if (Array.isArray(args)) return launch(cmd, [...args], { ...(opts ?? {}), windowsHide: true })
@@ -107,7 +107,7 @@ export namespace LSPServer {
       const tsserver = Module.resolve("typescript/lib/tsserver.js", Instance.directory)
       log.info("typescript server", { tsserver })
       if (!tsserver) return
-      const proc = spawn(await Npm.which("typescript-language-server"), ["--stdio"], {
+      const proc = spawn(BunProc.which(), ["x", "typescript-language-server", "--stdio"], {
         cwd: root,
         env: {
           ...process.env,
@@ -133,8 +133,29 @@ export namespace LSPServer {
       let binary = which("vue-language-server")
       const args: string[] = []
       if (!binary) {
-        if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
-        binary = await Npm.which("@vue/language-server")
+        const js = path.join(
+          Global.Path.bin,
+          "node_modules",
+          "@vue",
+          "language-server",
+          "bin",
+          "vue-language-server.js",
+        )
+        if (!(await Filesystem.exists(js))) {
+          if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
+          await Process.spawn([BunProc.which(), "install", "@vue/language-server"], {
+            cwd: Global.Path.bin,
+            env: {
+              ...process.env,
+              BUN_BE_BUN: "1",
+            },
+            stdout: "pipe",
+            stderr: "pipe",
+            stdin: "pipe",
+          }).exited
+        }
+        binary = BunProc.which()
+        args.push("run", js)
       }
       args.push("--stdio")
       const proc = spawn(binary, args, {
@@ -197,7 +218,7 @@ export namespace LSPServer {
         log.info("installed VS Code ESLint server", { serverPath })
       }
 
-      const proc = spawn(await Npm.which("tsx"), [serverPath, "--stdio"], {
+      const proc = spawn(BunProc.which(), [serverPath, "--stdio"], {
         cwd: root,
         env: {
           ...process.env,
@@ -328,8 +349,8 @@ export namespace LSPServer {
       if (!bin) {
         const resolved = Module.resolve("biome", root)
         if (!resolved) return
-        bin = await Npm.which("biome")
-        args = ["lsp-proxy", "--stdio"]
+        bin = BunProc.which()
+        args = ["x", "biome", "lsp-proxy", "--stdio"]
       }
 
       const proc = spawn(bin, args, {
@@ -355,7 +376,9 @@ export namespace LSPServer {
     },
     extensions: [".go"],
     async spawn(root) {
-      let bin = which("gopls")
+      let bin = which("gopls", {
+        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
+      })
       if (!bin) {
         if (!which("go")) return
         if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
@@ -390,7 +413,9 @@ export namespace LSPServer {
     root: NearestRoot(["Gemfile"]),
     extensions: [".rb", ".rake", ".gemspec", ".ru"],
     async spawn(root) {
-      let bin = which("rubocop")
+      let bin = which("rubocop", {
+        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
+      })
       if (!bin) {
         const ruby = which("ruby")
         const gem = which("gem")
@@ -495,8 +520,19 @@ export namespace LSPServer {
       let binary = which("pyright-langserver")
       const args = []
       if (!binary) {
-        if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
-        binary = await Npm.which("pyright")
+        const js = path.join(Global.Path.bin, "node_modules", "pyright", "dist", "pyright-langserver.js")
+        if (!(await Filesystem.exists(js))) {
+          if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
+          await Process.spawn([BunProc.which(), "install", "pyright"], {
+            cwd: Global.Path.bin,
+            env: {
+              ...process.env,
+              BUN_BE_BUN: "1",
+            },
+          }).exited
+        }
+        binary = BunProc.which()
+        args.push(...["run", js])
       }
       args.push("--stdio")
 
@@ -598,7 +634,9 @@ export namespace LSPServer {
     extensions: [".zig", ".zon"],
     root: NearestRoot(["build.zig"]),
     async spawn(root) {
-      let bin = which("zls")
+      let bin = which("zls", {
+        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
+      })
 
       if (!bin) {
         const zig = which("zig")
@@ -708,7 +746,9 @@ export namespace LSPServer {
     root: NearestRoot([".slnx", ".sln", ".csproj", "global.json"]),
     extensions: [".cs"],
     async spawn(root) {
-      let bin = which("csharp-ls")
+      let bin = which("csharp-ls", {
+        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
+      })
       if (!bin) {
         if (!which("dotnet")) {
           log.error(".NET SDK is required to install csharp-ls")
@@ -745,7 +785,9 @@ export namespace LSPServer {
     root: NearestRoot([".slnx", ".sln", ".fsproj", "global.json"]),
     extensions: [".fs", ".fsi", ".fsx", ".fsscript"],
     async spawn(root) {
-      let bin = which("fsautocomplete")
+      let bin = which("fsautocomplete", {
+        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
+      })
       if (!bin) {
         if (!which("dotnet")) {
           log.error(".NET SDK is required to install fsautocomplete")
@@ -1011,8 +1053,22 @@ export namespace LSPServer {
       let binary = which("svelteserver")
       const args: string[] = []
       if (!binary) {
-        if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
-        binary = await Npm.which("svelte-language-server")
+        const js = path.join(Global.Path.bin, "node_modules", "svelte-language-server", "bin", "server.js")
+        if (!(await Filesystem.exists(js))) {
+          if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
+          await Process.spawn([BunProc.which(), "install", "svelte-language-server"], {
+            cwd: Global.Path.bin,
+            env: {
+              ...process.env,
+              BUN_BE_BUN: "1",
+            },
+            stdout: "pipe",
+            stderr: "pipe",
+            stdin: "pipe",
+          }).exited
+        }
+        binary = BunProc.which()
+        args.push("run", js)
       }
       args.push("--stdio")
       const proc = spawn(binary, args, {
@@ -1044,8 +1100,22 @@ export namespace LSPServer {
       let binary = which("astro-ls")
       const args: string[] = []
       if (!binary) {
-        if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
-        binary = await Npm.which("@astrojs/language-server")
+        const js = path.join(Global.Path.bin, "node_modules", "@astrojs", "language-server", "bin", "nodeServer.js")
+        if (!(await Filesystem.exists(js))) {
+          if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
+          await Process.spawn([BunProc.which(), "install", "@astrojs/language-server"], {
+            cwd: Global.Path.bin,
+            env: {
+              ...process.env,
+              BUN_BE_BUN: "1",
+            },
+            stdout: "pipe",
+            stderr: "pipe",
+            stdin: "pipe",
+          }).exited
+        }
+        binary = BunProc.which()
+        args.push("run", js)
       }
       args.push("--stdio")
       const proc = spawn(binary, args, {
@@ -1294,8 +1364,31 @@ export namespace LSPServer {
       let binary = which("yaml-language-server")
       const args: string[] = []
       if (!binary) {
-        if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
-        binary = await Npm.which("yaml-language-server")
+        const js = path.join(
+          Global.Path.bin,
+          "node_modules",
+          "yaml-language-server",
+          "out",
+          "server",
+          "src",
+          "server.js",
+        )
+        const exists = await Filesystem.exists(js)
+        if (!exists) {
+          if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
+          await Process.spawn([BunProc.which(), "install", "yaml-language-server"], {
+            cwd: Global.Path.bin,
+            env: {
+              ...process.env,
+              BUN_BE_BUN: "1",
+            },
+            stdout: "pipe",
+            stderr: "pipe",
+            stdin: "pipe",
+          }).exited
+        }
+        binary = BunProc.which()
+        args.push("run", js)
       }
       args.push("--stdio")
       const proc = spawn(binary, args, {
@@ -1324,7 +1417,9 @@ export namespace LSPServer {
     ]),
     extensions: [".lua"],
     async spawn(root) {
-      let bin = which("lua-language-server")
+      let bin = which("lua-language-server", {
+        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
+      })
 
       if (!bin) {
         if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
@@ -1460,8 +1555,22 @@ export namespace LSPServer {
       let binary = which("intelephense")
       const args: string[] = []
       if (!binary) {
-        if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
-        binary = await Npm.which("intelephense")
+        const js = path.join(Global.Path.bin, "node_modules", "intelephense", "lib", "intelephense.js")
+        if (!(await Filesystem.exists(js))) {
+          if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
+          await Process.spawn([BunProc.which(), "install", "intelephense"], {
+            cwd: Global.Path.bin,
+            env: {
+              ...process.env,
+              BUN_BE_BUN: "1",
+            },
+            stdout: "pipe",
+            stderr: "pipe",
+            stdin: "pipe",
+          }).exited
+        }
+        binary = BunProc.which()
+        args.push("run", js)
       }
       args.push("--stdio")
       const proc = spawn(binary, args, {
@@ -1543,8 +1652,22 @@ export namespace LSPServer {
       let binary = which("bash-language-server")
       const args: string[] = []
       if (!binary) {
-        if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
-        binary = await Npm.which("bash-language-server")
+        const js = path.join(Global.Path.bin, "node_modules", "bash-language-server", "out", "cli.js")
+        if (!(await Filesystem.exists(js))) {
+          if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
+          await Process.spawn([BunProc.which(), "install", "bash-language-server"], {
+            cwd: Global.Path.bin,
+            env: {
+              ...process.env,
+              BUN_BE_BUN: "1",
+            },
+            stdout: "pipe",
+            stderr: "pipe",
+            stdin: "pipe",
+          }).exited
+        }
+        binary = BunProc.which()
+        args.push("run", js)
       }
       args.push("start")
       const proc = spawn(binary, args, {
@@ -1565,7 +1688,9 @@ export namespace LSPServer {
     extensions: [".tf", ".tfvars"],
     root: NearestRoot([".terraform.lock.hcl", "terraform.tfstate", "*.tf"]),
     async spawn(root) {
-      let bin = which("terraform-ls")
+      let bin = which("terraform-ls", {
+        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
+      })
 
       if (!bin) {
         if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
@@ -1646,7 +1771,9 @@ export namespace LSPServer {
     extensions: [".tex", ".bib"],
     root: NearestRoot([".latexmkrc", "latexmkrc", ".texlabroot", "texlabroot"]),
     async spawn(root) {
-      let bin = which("texlab")
+      let bin = which("texlab", {
+        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
+      })
 
       if (!bin) {
         if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
@@ -1737,8 +1864,22 @@ export namespace LSPServer {
       let binary = which("docker-langserver")
       const args: string[] = []
       if (!binary) {
-        if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
-        binary = await Npm.which("dockerfile-language-server-nodejs")
+        const js = path.join(Global.Path.bin, "node_modules", "dockerfile-language-server-nodejs", "lib", "server.js")
+        if (!(await Filesystem.exists(js))) {
+          if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
+          await Process.spawn([BunProc.which(), "install", "dockerfile-language-server-nodejs"], {
+            cwd: Global.Path.bin,
+            env: {
+              ...process.env,
+              BUN_BE_BUN: "1",
+            },
+            stdout: "pipe",
+            stderr: "pipe",
+            stdin: "pipe",
+          }).exited
+        }
+        binary = BunProc.which()
+        args.push("run", js)
       }
       args.push("--stdio")
       const proc = spawn(binary, args, {
@@ -1829,7 +1970,9 @@ export namespace LSPServer {
     extensions: [".typ", ".typc"],
     root: NearestRoot(["typst.toml"]),
     async spawn(root) {
-      let bin = which("tinymist")
+      let bin = which("tinymist", {
+        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
+      })
 
       if (!bin) {
         if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return

packages/opencode/src/mcp/index.ts

@@ -11,7 +11,6 @@ import {
 } from "@modelcontextprotocol/sdk/types.js"
 import { Config } from "../config/config"
 import { Log } from "../util/log"
-import { Process } from "../util/process"
 import { NamedError } from "@opencode-ai/util/error"
 import z from "zod/v4"
 import { Instance } from "../project/instance"
@@ -167,10 +166,14 @@ export namespace MCP {
     const queue = [pid]
     while (queue.length > 0) {
       const current = queue.shift()!
-      const lines = await Process.lines(["pgrep", "-P", String(current)], { nothrow: true })
-      for (const tok of lines) {
+      const proc = Bun.spawn(["pgrep", "-P", String(current)], { stdout: "pipe", stderr: "pipe" })
+      const [code, out] = await Promise.all([proc.exited, new Response(proc.stdout).text()]).catch(
+        () => [-1, ""] as const,
+      )
+      if (code !== 0) continue
+      for (const tok of out.trim().split(/\s+/)) {
         const cpid = parseInt(tok, 10)
-        if (!isNaN(cpid) && !pids.includes(cpid)) {
+        if (!isNaN(cpid) && pids.indexOf(cpid) === -1) {
           pids.push(cpid)
           queue.push(cpid)
         }

packages/opencode/src/mcp/oauth-callback.ts

@@ -1,5 +1,4 @@
 import { createConnection } from "net"
-import { createServer } from "http"
 import { Log } from "../util/log"
 import { OAUTH_CALLBACK_PORT, OAUTH_CALLBACK_PATH } from "./oauth-provider"
 
@@ -53,74 +52,11 @@ interface PendingAuth {
 }
 
 export namespace McpOAuthCallback {
-  let server: ReturnType<typeof createServer> | undefined
+  let server: ReturnType<typeof Bun.serve> | undefined
   const pendingAuths = new Map<string, PendingAuth>()
 
   const CALLBACK_TIMEOUT_MS = 5 * 60 * 1000 // 5 minutes
 
-  function handleRequest(req: import("http").IncomingMessage, res: import("http").ServerResponse) {
-    const url = new URL(req.url || "/", `http://localhost:${OAUTH_CALLBACK_PORT}`)
-
-    if (url.pathname !== OAUTH_CALLBACK_PATH) {
-      res.writeHead(404)
-      res.end("Not found")
-      return
-    }
-
-    const code = url.searchParams.get("code")
-    const state = url.searchParams.get("state")
-    const error = url.searchParams.get("error")
-    const errorDescription = url.searchParams.get("error_description")
-
-    log.info("received oauth callback", { hasCode: !!code, state, error })
-
-    // Enforce state parameter presence
-    if (!state) {
-      const errorMsg = "Missing required state parameter - potential CSRF attack"
-      log.error("oauth callback missing state parameter", { url: url.toString() })
-      res.writeHead(400, { "Content-Type": "text/html" })
-      res.end(HTML_ERROR(errorMsg))
-      return
-    }
-
-    if (error) {
-      const errorMsg = errorDescription || error
-      if (pendingAuths.has(state)) {
-        const pending = pendingAuths.get(state)!
-        clearTimeout(pending.timeout)
-        pendingAuths.delete(state)
-        pending.reject(new Error(errorMsg))
-      }
-      res.writeHead(200, { "Content-Type": "text/html" })
-      res.end(HTML_ERROR(errorMsg))
-      return
-    }
-
-    if (!code) {
-      res.writeHead(400, { "Content-Type": "text/html" })
-      res.end(HTML_ERROR("No authorization code provided"))
-      return
-    }
-
-    // Validate state parameter
-    if (!pendingAuths.has(state)) {
-      const errorMsg = "Invalid or expired state parameter - potential CSRF attack"
-      log.error("oauth callback with invalid state", { state, pendingStates: Array.from(pendingAuths.keys()) })
-      res.writeHead(400, { "Content-Type": "text/html" })
-      res.end(HTML_ERROR(errorMsg))
-      return
-    }
-
-    const pending = pendingAuths.get(state)!
-
-    clearTimeout(pending.timeout)
-    pendingAuths.delete(state)
-    pending.resolve(code)
-
-    res.writeHead(200, { "Content-Type": "text/html" })
-    res.end(HTML_SUCCESS)
-  }
-
   export async function ensureRunning(): Promise<void> {
     if (server) return
 
@@ -130,14 +66,75 @@ export namespace McpOAuthCallback {
       return
     }
 
-    server = createServer(handleRequest)
-    await new Promise<void>((resolve, reject) => {
-      server!.listen(OAUTH_CALLBACK_PORT, () => {
-        log.info("oauth callback server started", { port: OAUTH_CALLBACK_PORT })
-        resolve()
-      })
-      server!.on("error", reject)
+    server = Bun.serve({
+      port: OAUTH_CALLBACK_PORT,
+      fetch(req) {
+        const url = new URL(req.url)
+
+        if (url.pathname !== OAUTH_CALLBACK_PATH) {
+          return new Response("Not found", { status: 404 })
+        }
+
+        const code = url.searchParams.get("code")
+        const state = url.searchParams.get("state")
+        const error = url.searchParams.get("error")
+        const errorDescription = url.searchParams.get("error_description")
+
+        log.info("received oauth callback", { hasCode: !!code, state, error })
+
+        // Enforce state parameter presence
+        if (!state) {
+          const errorMsg = "Missing required state parameter - potential CSRF attack"
+          log.error("oauth callback missing state parameter", { url: url.toString() })
+          return new Response(HTML_ERROR(errorMsg), {
+            status: 400,
+            headers: { "Content-Type": "text/html" },
+          })
+        }
+
+        if (error) {
+          const errorMsg = errorDescription || error
+          if (pendingAuths.has(state)) {
+            const pending = pendingAuths.get(state)!
+            clearTimeout(pending.timeout)
+            pendingAuths.delete(state)
+            pending.reject(new Error(errorMsg))
+          }
+          return new Response(HTML_ERROR(errorMsg), {
+            headers: { "Content-Type": "text/html" },
+          })
+        }
+
+        if (!code) {
+          return new Response(HTML_ERROR("No authorization code provided"), {
+            status: 400,
+            headers: { "Content-Type": "text/html" },
+          })
+        }
+
+        // Validate state parameter
+        if (!pendingAuths.has(state)) {
+          const errorMsg = "Invalid or expired state parameter - potential CSRF attack"
+          log.error("oauth callback with invalid state", { state, pendingStates: Array.from(pendingAuths.keys()) })
+          return new Response(HTML_ERROR(errorMsg), {
+            status: 400,
+            headers: { "Content-Type": "text/html" },
+          })
+        }
+
+        const pending = pendingAuths.get(state)!
+
+        clearTimeout(pending.timeout)
+        pendingAuths.delete(state)
+        pending.resolve(code)
+
+        return new Response(HTML_SUCCESS, {
+          headers: { "Content-Type": "text/html" },
+        })
+      },
     })
+
+    log.info("oauth callback server started", { port: OAUTH_CALLBACK_PORT })
   }
 
   export function waitForCallback(oauthState: string): Promise<string> {
@@ -177,7 +174,7 @@ export namespace McpOAuthCallback {
 
   export async function stop(): Promise<void> {
     if (server) {
-      await new Promise<void>((resolve) => server!.close(() => resolve()))
+      server.stop()
       server = undefined
       log.info("oauth callback server stopped")
     }

packages/opencode/src/node.ts

@@ -1,8 +0,0 @@
-import { Server } from "./server/server"
-
-const result = await Server.listen({
-  port: 1338,
-  hostname: "0.0.0.0",
-})
-
-console.log(result)

packages/opencode/src/npm/index.ts

@@ -1,158 +0,0 @@
-// Workaround: Bun on Windows does not support the UV_FS_O_FILEMAP flag that
-// the `tar` package uses for files < 512KB (fs.open returns EINVAL).
-// tar silently swallows the error and skips writing files, leaving only empty
-// directories. Setting __FAKE_PLATFORM__ makes tar fall back to the plain 'w'
-// flag. See tar's get-write-flag.js.
-// Must be set before @npmcli/arborist is imported since tar caches the flag
-// at module evaluation time — so we use a dynamic import() below.
-if (process.platform === "win32") {
-  process.env.__FAKE_PLATFORM__ = "linux"
-}
-
-import semver from "semver"
-import z from "zod"
-import { NamedError } from "@opencode-ai/util/error"
-import { Global } from "../global"
-import { Lock } from "../util/lock"
-import { Log } from "../util/log"
-import path from "path"
-import { readdir } from "fs/promises"
-import { Filesystem } from "@/util/filesystem"
-
-const { Arborist } = await import("@npmcli/arborist")
-
-export namespace Npm {
-  const log = Log.create({ service: "npm" })
-
-  export const InstallFailedError = NamedError.create(
-    "NpmInstallFailedError",
-    z.object({
-      pkg: z.string(),
-    }),
-  )
-
-  function directory(pkg: string) {
-    return path.join(Global.Path.cache, "packages", pkg)
-  }
-
-  export async function outdated(pkg: string, cachedVersion: string): Promise<boolean> {
-    const response = await fetch(`https://registry.npmjs.org/${pkg}`)
-    if (!response.ok) {
-      log.warn("Failed to resolve latest version, using cached", { pkg, cachedVersion })
-      return false
-    }
-
-    const data = (await response.json()) as { "dist-tags"?: { latest?: string } }
-    const latestVersion = data?.["dist-tags"]?.latest
-    if (!latestVersion) {
-      log.warn("No latest version found, using cached", { pkg, cachedVersion })
-      return false
-    }
-
-    const isRange = /[\s^~*xX<>|=]/.test(cachedVersion)
-    if (isRange) return !semver.satisfies(latestVersion, cachedVersion)
-
-    return semver.lt(cachedVersion, latestVersion)
-  }
-
-  export async function add(pkg: string) {
-    using _ = await Lock.write("npm-install")
-    log.info("installing package", {
-      pkg,
-    })
-    const hash = pkg
-    const dir = directory(hash)
-
-    const arborist = new Arborist({
-      path: dir,
-      binLinks: true,
-      progress: false,
-      savePrefix: "",
-    })
-    const tree = await arborist.loadVirtual().catch(() => {})
-    if (tree) {
-      const first = tree.edgesOut.values().next().value?.to
-      if (first) {
-        log.info("package already installed", { pkg })
-        return first.path
-      }
-    }
-
-    const result = await arborist
-      .reify({
-        add: [pkg],
-        save: true,
-        saveType: "prod",
-      })
-      .catch((cause) => {
-        throw new InstallFailedError(
-          { pkg },
-          {
-            cause,
-          },
-        )
-      })
-
-    const first = result.edgesOut.values().next().value?.to
-    if (!first) throw new InstallFailedError({ pkg })
-    return first.path
-  }
-
-  export async function install(dir: string) {
-    log.info("checking dependencies", { dir })
-
-    const reify = async () => {
-      const arb = new Arborist({
-        path: dir,
-        binLinks: true,
-        progress: false,
-        savePrefix: "",
-      })
-      await arb.reify().catch(() => {})
-    }
-
-    if (!(await Filesystem.exists(path.join(dir, "node_modules")))) {
-      log.info("node_modules missing, reifying")
-      await reify()
-      return
-    }
-
-    const pkg = await Filesystem.readJson(path.join(dir, "package.json")).catch(() => ({}))
-    const lock = await Filesystem.readJson(path.join(dir, "package-lock.json")).catch(() => ({}))
-
-    const declared = new Set([
-      ...Object.keys(pkg.dependencies || {}),
-      ...Object.keys(pkg.devDependencies || {}),
-      ...Object.keys(pkg.peerDependencies || {}),
-      ...Object.keys(pkg.optionalDependencies || {}),
-    ])
-
-    const root = lock.packages?.[""] || {}
-    const locked = new Set([
-      ...Object.keys(root.dependencies || {}),
-      ...Object.keys(root.devDependencies || {}),
-      ...Object.keys(root.peerDependencies || {}),
-      ...Object.keys(root.optionalDependencies || {}),
-    ])
-
-    for (const name of declared) {
-      if (!locked.has(name)) {
-        log.info("dependency not in lock file, reifying", { name })
-        await reify()
-        return
-      }
-    }
-
-    log.info("dependencies in sync")
-  }
-
-  export async function which(pkg: string) {
-    const dir = path.join(directory(pkg), "node_modules", ".bin")
-    const files = await readdir(dir).catch(() => [])
-    if (!files.length) {
-      await add(pkg)
-      return which(pkg)
-    }
-    return path.join(dir, files[0])
-  }
-}

packages/opencode/src/permission/index.ts

@@ -1,6 +1,5 @@
 import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
-import { SessionID, MessageID } from "@/session/schema"
 import z from "zod"
 import { Log } from "../util/log"
 import { Identifier } from "../id/id"
@@ -25,8 +24,8 @@ export namespace Permission {
       id: z.string(),
       type: z.string(),
       pattern: z.union([z.string(), z.array(z.string())]).optional(),
-      sessionID: SessionID.zod,
-      messageID: MessageID.zod,
+      sessionID: z.string(),
+      messageID: z.string(),
       callID: z.string().optional(),
       message: z.string(),
       metadata: z.record(z.string(), z.any()),
@@ -44,7 +43,7 @@ export namespace Permission {
     Replied: BusEvent.define(
       "permission.replied",
       z.object({
-        sessionID: SessionID.zod,
+        sessionID: z.string(),
         permissionID: z.string(),
         response: z.string(),
       }),

packages/opencode/src/permission/next.ts

@@ -2,13 +2,11 @@ import { Bus } from "@/bus"
 import { BusEvent } from "@/bus/bus-event"
 import { Config } from "@/config/config"
 import { Identifier } from "@/id/id"
-import { SessionID, MessageID } from "@/session/schema"
 import { Instance } from "@/project/instance"
 import { Database, eq } from "@/storage/db"
 import { PermissionTable } from "@/session/session.sql"
 import { fn } from "@/util/fn"
 import { Log } from "@/util/log"
-import { ProjectID } from "@/project/schema"
 import { Wildcard } from "@/util/wildcard"
 import os from "os"
 import z from "zod"
@@ -70,14 +68,14 @@ export namespace PermissionNext {
   export const Request = z
     .object({
       id: Identifier.schema("permission"),
-      sessionID: SessionID.zod,
+      sessionID: Identifier.schema("session"),
       permission: z.string(),
       patterns: z.string().array(),
       metadata: z.record(z.string(), z.any()),
       always: z.string().array(),
       tool: z
         .object({
-          messageID: MessageID.zod,
+          messageID: z.string(),
           callID: z.string(),
         })
         .optional(),
@@ -92,7 +90,7 @@ export namespace PermissionNext {
   export type Reply = z.infer<typeof Reply>
 
   export const Approval = z.object({
-    projectID: ProjectID.zod,
+    projectID: z.string(),
     patterns: z.string().array(),
   })
 
@@ -101,7 +99,7 @@ export namespace PermissionNext {
     Replied: BusEvent.define(
       "permission.replied",
       z.object({
-        sessionID: SessionID.zod,
+        sessionID: z.string(),
         requestID: z.string(),
         reply: Reply,
       }),

packages/opencode/src/plugin/codex.ts

@@ -5,7 +5,6 @@ import { Auth, OAUTH_DUMMY_KEY } from "../auth"
 import os from "os"
 import { ProviderTransform } from "@/provider/transform"
 import { setTimeout as sleep } from "node:timers/promises"
-import { createServer } from "http"
 
 const log = Log.create({ service: "plugin.codex" })
 
@@ -241,7 +240,7 @@ interface PendingOAuth {
   reject: (error: Error) => void
 }
 
-let oauthServer: ReturnType<typeof createServer> | undefined
+let oauthServer: ReturnType<typeof Bun.serve> | undefined
 let pendingOAuth: PendingOAuth | undefined
 
 async function startOAuthServer(): Promise<{ port: number; redirectUri: string }> {
@@ -249,83 +248,77 @@ async function startOAuthServer(): Promise<{ port: number; redirectUri: string }
     return { port: OAUTH_PORT, redirectUri: `http://localhost:${OAUTH_PORT}/auth/callback` }
   }
 
-  oauthServer = createServer((req, res) => {
-    const url = new URL(req.url || "/", `http://localhost:${OAUTH_PORT}`)
+  oauthServer = Bun.serve({
+    port: OAUTH_PORT,
+    fetch(req) {
+      const url = new URL(req.url)
 
-    if (url.pathname === "/auth/callback") {
-      const code = url.searchParams.get("code")
-      const state = url.searchParams.get("state")
-      const error = url.searchParams.get("error")
-      const errorDescription = url.searchParams.get("error_description")
+      if (url.pathname === "/auth/callback") {
+        const code = url.searchParams.get("code")
+        const state = url.searchParams.get("state")
+        const error = url.searchParams.get("error")
+        const errorDescription = url.searchParams.get("error_description")
 
-      if (error) {
-        const errorMsg = errorDescription || error
-        pendingOAuth?.reject(new Error(errorMsg))
+        if (error) {
+          const errorMsg = errorDescription || error
+          pendingOAuth?.reject(new Error(errorMsg))
+          pendingOAuth = undefined
+          return new Response(HTML_ERROR(errorMsg), {
+            headers: { "Content-Type": "text/html" },
+          })
+        }
+
+        if (!code) {
+          const errorMsg = "Missing authorization code"
+          pendingOAuth?.reject(new Error(errorMsg))
+          pendingOAuth = undefined
+          return new Response(HTML_ERROR(errorMsg), {
+            status: 400,
+            headers: { "Content-Type": "text/html" },
+          })
+        }
+
+        if (!pendingOAuth || state !== pendingOAuth.state) {
+          const errorMsg = "Invalid state - potential CSRF attack"
+          pendingOAuth?.reject(new Error(errorMsg))
+          pendingOAuth = undefined
+          return new Response(HTML_ERROR(errorMsg), {
+            status: 400,
+            headers: { "Content-Type": "text/html" },
+          })
+        }
+
+        const current = pendingOAuth
         pendingOAuth = undefined
-        res.writeHead(200, { "Content-Type": "text/html" })
-        res.end(HTML_ERROR(errorMsg))
-        return
+
+        exchangeCodeForTokens(code, `http://localhost:${OAUTH_PORT}/auth/callback`, current.pkce)
+          .then((tokens) => current.resolve(tokens))
+          .catch((err) => current.reject(err))
+
+        return new Response(HTML_SUCCESS, {
+          headers: { "Content-Type": "text/html" },
+        })
       }
 
-      if (!code) {
-        const errorMsg = "Missing authorization code"
-        pendingOAuth?.reject(new Error(errorMsg))
+      if (url.pathname === "/cancel") {
+        pendingOAuth?.reject(new Error("Login cancelled"))
         pendingOAuth = undefined
-        res.writeHead(400, { "Content-Type": "text/html" })
-        res.end(HTML_ERROR(errorMsg))
-        return
+        return new Response("Login cancelled", { status: 200 })
       }
 
-      if (!pendingOAuth || state !== pendingOAuth.state) {
-        const errorMsg = "Invalid state - potential CSRF attack"
-        pendingOAuth?.reject(new Error(errorMsg))
-        pendingOAuth = undefined
-        res.writeHead(400, { "Content-Type": "text/html" })
-        res.end(HTML_ERROR(errorMsg))
-        return
-      }
-
-      const current = pendingOAuth
-      pendingOAuth = undefined
-
-      exchangeCodeForTokens(code, `http://localhost:${OAUTH_PORT}/auth/callback`, current.pkce)
-        .then((tokens) => current.resolve(tokens))
-        .catch((err) => current.reject(err))
-
-      res.writeHead(200, { "Content-Type": "text/html" })
-      res.end(HTML_SUCCESS)
-      return
-    }
-
-    if (url.pathname === "/cancel") {
-      pendingOAuth?.reject(new Error("Login cancelled"))
-      pendingOAuth = undefined
-      res.writeHead(200)
-      res.end("Login cancelled")
-      return
-    }
-
-    res.writeHead(404)
-    res.end("Not found")
-  })
-
-  await new Promise<void>((resolve, reject) => {
-    oauthServer!.listen(OAUTH_PORT, () => {
-      log.info("codex oauth server started", { port: OAUTH_PORT })
-      resolve()
-    })
-    oauthServer!.on("error", reject)
+      return new Response("Not found", { status: 404 })
+    },
   })
 
+  log.info("codex oauth server started", { port: OAUTH_PORT })
   return { port: OAUTH_PORT, redirectUri: `http://localhost:${OAUTH_PORT}/auth/callback` }
 }
 
 function stopOAuthServer() {
   if (oauthServer) {
-    oauthServer.close(() => {
-      log.info("codex oauth server stopped")
-    })
+    oauthServer.stop()
     oauthServer = undefined
+    log.info("codex oauth server stopped")
   }
 }
 

packages/opencode/src/plugin/index.ts

@@ -4,7 +4,7 @@ import { Bus } from "../bus"
 import { Log } from "../util/log"
 import { createOpencodeClient } from "@opencode-ai/sdk"
 import { Server } from "../server/server"
-import { Npm } from "../npm"
+import { BunProc } from "../bun"
 import { Instance } from "../project/instance"
 import { Flag } from "../flag/flag"
 import { CodexAuthPlugin } from "./codex"
@@ -27,9 +27,7 @@ export namespace Plugin {
       directory: Instance.directory,
       fetch: async (...args) => Server.Default().fetch(...args),
     })
-    log.info("loading config")
     const config = await Config.get()
-    log.info("config loaded")
     const hooks: Hooks[] = []
     const input: PluginInput = {
       client,
@@ -39,8 +37,7 @@ export namespace Plugin {
       get serverUrl(): URL {
         throw new Error("Server URL is no longer supported in plugins")
       },
-      // @ts-expect-error
-      $: typeof Bun === "undefined" ? undefined : Bun.$,
+      $: Bun.$,
     }
 
     for (const plugin of INTERNAL_PLUGINS) {
@@ -62,13 +59,16 @@ export namespace Plugin {
       if (plugin.includes("opencode-openai-codex-auth") || plugin.includes("opencode-copilot-auth")) continue
       log.info("loading plugin", { path: plugin })
       if (!plugin.startsWith("file://")) {
-        plugin = await Npm.add(plugin).catch((err) => {
+        const lastAtIndex = plugin.lastIndexOf("@")
+        const pkg = lastAtIndex > 0 ? plugin.substring(0, lastAtIndex) : plugin
+        const version = lastAtIndex > 0 ? plugin.substring(lastAtIndex + 1) : "latest"
+        plugin = await BunProc.install(pkg, version).catch((err) => {
           const cause = err instanceof Error ? err.cause : err
           const detail = cause instanceof Error ? cause.message : String(cause ?? err)
-          log.error("failed to install plugin", { plugin, error: detail })
+          log.error("failed to install plugin", { pkg, version, error: detail })
           Bus.publish(Session.Event.Error, {
             error: new NamedError.Unknown({
-              message: `Failed to install plugin ${plugin}: ${detail}`,
+              message: `Failed to install plugin ${pkg}@${version}: ${detail}`,
             }).toObject(),
           })
           return ""

packages/opencode/src/project/project.sql.ts

@@ -1,9 +1,8 @@
 import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core"
 import { Timestamps } from "../storage/schema.sql"
-import type { ProjectID } from "./schema"
 
 export const ProjectTable = sqliteTable("project", {
-  id: text().$type<ProjectID>().primaryKey(),
+  id: text().primaryKey(),
   worktree: text().notNull(),
   vcs: text(),
   name: text(),

packages/opencode/src/project/project.ts

@@ -15,7 +15,6 @@ import { existsSync } from "fs"
 import { git } from "../util/git"
 import { Glob } from "../util/glob"
 import { which } from "../util/which"
-import { ProjectID } from "./schema"
 
 export namespace Project {
   const log = Log.create({ service: "project" })
@@ -34,7 +33,7 @@ export namespace Project {
 
   export const Info = z
     .object({
-      id: ProjectID.zod,
+      id: z.string(),
       worktree: z.string(),
       vcs: z.literal("git").optional(),
       name: z.string().optional(),
@@ -74,7 +73,7 @@ export namespace Project {
         ? { url: row.icon_url ?? undefined, color: row.icon_color ?? undefined }
         : undefined
     return {
-      id: ProjectID.make(row.id),
+      id: row.id,
       worktree: row.worktree,
       vcs: row.vcs ? Info.shape.vcs.parse(row.vcs) : undefined,
       name: row.name ?? undefined,
@@ -92,7 +91,6 @@ export namespace Project {
   function readCachedId(dir: string) {
     return Filesystem.readText(path.join(dir, "opencode"))
       .then((x) => x.trim())
-      .then(ProjectID.make)
       .catch(() => undefined)
   }
 
@@ -113,7 +111,7 @@ export namespace Project {
 
         if (!gitBinary) {
           return {
-            id: id ?? ProjectID.global,
+            id: id ?? "global",
             worktree: sandbox,
             sandbox,
             vcs: Info.shape.vcs.parse(Flag.OPENCODE_FAKE_VCS),
@@ -132,7 +130,7 @@ export namespace Project {
 
         if (!worktree) {
           return {
-            id: id ?? ProjectID.global,
+            id: id ?? "global",
             worktree: sandbox,
             sandbox,
             vcs: Info.shape.vcs.parse(Flag.OPENCODE_FAKE_VCS),
@@ -162,14 +160,14 @@ export namespace Project {
 
           if (!roots) {
             return {
-              id: ProjectID.global,
+              id: "global",
               worktree: sandbox,
               sandbox,
               vcs: Info.shape.vcs.parse(Flag.OPENCODE_FAKE_VCS),
             }
           }
 
-          id = roots[0] ? ProjectID.make(roots[0]) : undefined
+          id = roots[0]
           if (id) {
             await Filesystem.write(path.join(dotgit, "opencode"), id).catch(() => undefined)
           }
@@ -177,7 +175,7 @@ export namespace Project {
 
         if (!id) {
           return {
-            id: ProjectID.global,
+            id: "global",
             worktree: sandbox,
             sandbox,
             vcs: "git",
@@ -210,7 +208,7 @@ export namespace Project {
       }
 
       return {
-        id: ProjectID.global,
+        id: "global",
         worktree: "/",
         sandbox: "/",
         vcs: Info.shape.vcs.parse(Flag.OPENCODE_FAKE_VCS),
@@ -230,7 +228,7 @@ export namespace Project {
           updated: Date.now(),
         },
       }
-      if (data.id !== ProjectID.global) {
+      if (data.id !== "global") {
         await migrateFromGlobal(data.id, data.worktree)
       }
       return fresh
@@ -310,12 +308,12 @@ export namespace Project {
     return
   }
 
-  async function migrateFromGlobal(id: ProjectID, worktree: string) {
-    const row = Database.use((db) => db.select().from(ProjectTable).where(eq(ProjectTable.id, ProjectID.global)).get())
+  async function migrateFromGlobal(id: string, worktree: string) {
+    const row = Database.use((db) => db.select().from(ProjectTable).where(eq(ProjectTable.id, "global")).get())
     if (!row) return
 
     const sessions = Database.use((db) =>
-      db.select().from(SessionTable).where(eq(SessionTable.project_id, ProjectID.global)).all(),
+      db.select().from(SessionTable).where(eq(SessionTable.project_id, "global")).all(),
     )
     if (sessions.length === 0) return
 
@@ -325,14 +323,14 @@ export namespace Project {
       // Skip sessions that belong to a different directory
       if (row.directory && row.directory !== worktree) return
 
-      log.info("migrating session", { sessionID: row.id, from: ProjectID.global, to: id })
+      log.info("migrating session", { sessionID: row.id, from: "global", to: id })
       Database.use((db) => db.update(SessionTable).set({ project_id: id }).where(eq(SessionTable.id, row.id)).run())
     }).catch((error) => {
       log.error("failed to migrate sessions from global to project", { error, projectId: id })
     })
   }
 
-  export function setInitialized(id: ProjectID) {
+  export function setInitialized(id: string) {
     Database.use((db) =>
       db
         .update(ProjectTable)
@@ -354,7 +352,7 @@ export namespace Project {
     )
   }
 
-  export function get(id: ProjectID): Info | undefined {
+  export function get(id: string): Info | undefined {
     const row = Database.use((db) => db.select().from(ProjectTable).where(eq(ProjectTable.id, id)).get())
     if (!row) return undefined
     return fromRow(row)
@@ -377,13 +375,12 @@ export namespace Project {
 
   export const update = fn(
     z.object({
-      projectID: ProjectID.zod,
+      projectID: z.string(),
       name: z.string().optional(),
       icon: Info.shape.icon.optional(),
       commands: Info.shape.commands.optional(),
     }),
     async (input) => {
-      const id = ProjectID.make(input.projectID)
       const result = Database.use((db) =>
         db
           .update(ProjectTable)
@@ -394,7 +391,7 @@ export namespace Project {
             commands: input.commands,
             time_updated: Date.now(),
           })
-          .where(eq(ProjectTable.id, id))
+          .where(eq(ProjectTable.id, input.projectID))
           .returning()
           .get(),
       )
@@ -410,7 +407,7 @@ export namespace Project {
     },
   )
 
-  export async function sandboxes(id: ProjectID) {
+  export async function sandboxes(id: string) {
     const row = Database.use((db) => db.select().from(ProjectTable).where(eq(ProjectTable.id, id)).get())
     if (!row) return []
     const data = fromRow(row)
@@ -422,7 +419,7 @@ export namespace Project {
     return valid
   }
 
-  export async function addSandbox(id: ProjectID, directory: string) {
+  export async function addSandbox(id: string, directory: string) {
     const row = Database.use((db) => db.select().from(ProjectTable).where(eq(ProjectTable.id, id)).get())
     if (!row) throw new Error(`Project not found: ${id}`)
     const sandboxes = [...row.sandboxes]
@@ -446,7 +443,7 @@ export namespace Project {
     return data
   }
 
-  export async function removeSandbox(id: ProjectID, directory: string) {
+  export async function removeSandbox(id: string, directory: string) {
     const row = Database.use((db) => db.select().from(ProjectTable).where(eq(ProjectTable.id, id)).get())
     if (!row) throw new Error(`Project not found: ${id}`)
     const sandboxes = row.sandboxes.filter((s) => s !== directory)

packages/opencode/src/project/schema.ts

@@ -1,16 +0,0 @@
-import { Schema } from "effect"
-import z from "zod"
-
-import { withStatics } from "@/util/schema"
-
-const projectIdSchema = Schema.String.pipe(Schema.brand("ProjectId"))
-
-export type ProjectID = typeof projectIdSchema.Type
-
-export const ProjectID = projectIdSchema.pipe(
-  withStatics((schema: typeof projectIdSchema) => ({
-    global: schema.makeUnsafe("global"),
-    make: (id: string) => schema.makeUnsafe(id),
-    zod: z.string().pipe(z.custom<ProjectID>()),
-  })),
-)

packages/opencode/src/provider/provider.ts

@@ -5,7 +5,7 @@ import { Config } from "../config/config"
 import { mapValues, mergeDeep, omit, pickBy, sortBy } from "remeda"
 import { NoSuchModelError, type Provider as SDK } from "ai"
 import { Log } from "../util/log"
-import { Npm } from "../npm"
+import { BunProc } from "../bun"
 import { Hash } from "../util/hash"
 import { Plugin } from "../plugin"
 import { NamedError } from "@opencode-ai/util/error"
@@ -1209,7 +1209,7 @@ export namespace Provider {
 
       let installedPath: string
       if (!model.api.npm.startsWith("file://")) {
-        installedPath = await Npm.add(model.api.npm)
+        installedPath = await BunProc.install(model.api.npm, "latest")
       } else {
         log.info("loading local provider", { pkg: model.api.npm })
         installedPath = model.api.npm

packages/opencode/src/pty/index.ts

@@ -23,8 +23,6 @@ export namespace Pty {
     close: (code?: number, reason?: string) => void
   }
 
-  const key = (ws: Socket) => (ws.data && typeof ws.data === "object" ? ws.data : ws)
-
   // WebSocket control frame: 0x00 + UTF-8 JSON.
   const meta = (cursor: number) => {
     const json = JSON.stringify({ cursor })
@@ -99,9 +97,9 @@ export namespace Pty {
         try {
           session.process.kill()
         } catch {}
-        for (const [id, ws] of session.subscribers.entries()) {
+        for (const [key, ws] of session.subscribers.entries()) {
           try {
-            if (key(ws) === id) ws.close()
+            if (ws.data === key) ws.close()
           } catch {
             // ignore
           }
@@ -123,7 +121,7 @@ export namespace Pty {
     const id = Identifier.create("pty", false)
     const command = input.command || Shell.preferred()
     const args = input.args || []
-    if (Shell.login(command)) {
+    if (command.endsWith("sh")) {
       args.push("-l")
     }
 
@@ -172,21 +170,21 @@ export namespace Pty {
     ptyProcess.onData((chunk) => {
       session.cursor += chunk.length
 
-      for (const [id, ws] of session.subscribers.entries()) {
+      for (const [key, ws] of session.subscribers.entries()) {
         if (ws.readyState !== 1) {
-          session.subscribers.delete(id)
+          session.subscribers.delete(key)
           continue
         }
 
-        if (key(ws) !== id) {
-          session.subscribers.delete(id)
+        if (ws.data !== key) {
+          session.subscribers.delete(key)
           continue
         }
 
         try {
           ws.send(chunk)
         } catch {
-          session.subscribers.delete(id)
+          session.subscribers.delete(key)
         }
       }
 
@@ -228,9 +226,9 @@ export namespace Pty {
     try {
       session.process.kill()
     } catch {}
-    for (const [id, ws] of session.subscribers.entries()) {
+    for (const [key, ws] of session.subscribers.entries()) {
       try {
-        if (key(ws) === id) ws.close()
+        if (ws.data === key) ws.close()
       } catch {
         // ignore
       }
@@ -261,13 +259,16 @@ export namespace Pty {
     }
     log.info("client connected to session", { id })
 
-    const sub = key(ws)
+    // Use ws.data as the unique key for this connection lifecycle.
+    // If ws.data is undefined, fallback to ws object.
+    const connectionKey = ws.data && typeof ws.data === "object" ? ws.data : ws
 
-    session.subscribers.delete(sub)
-    session.subscribers.set(sub, ws)
+    // Optionally cleanup if the key somehow exists
+    session.subscribers.delete(connectionKey)
+    session.subscribers.set(connectionKey, ws)
 
     const cleanup = () => {
-      session.subscribers.delete(sub)
+      session.subscribers.delete(connectionKey)
     }
 
     const start = session.bufferCursor

packages/opencode/src/question/index.ts

@@ -1,7 +1,6 @@
 import { Bus } from "@/bus"
 import { BusEvent } from "@/bus/bus-event"
 import { Identifier } from "@/id/id"
-import { SessionID, MessageID } from "@/session/schema"
 import { Instance } from "@/project/instance"
 import { Log } from "@/util/log"
 import z from "zod"
@@ -35,11 +34,11 @@ export namespace Question {
   export const Request = z
     .object({
       id: Identifier.schema("question"),
-      sessionID: SessionID.zod,
+      sessionID: Identifier.schema("session"),
       questions: z.array(Info).describe("Questions to ask"),
       tool: z
         .object({
-          messageID: MessageID.zod,
+          messageID: z.string(),
           callID: z.string(),
         })
         .optional(),
@@ -66,7 +65,7 @@ export namespace Question {
     Replied: BusEvent.define(
       "question.replied",
       z.object({
-        sessionID: SessionID.zod,
+        sessionID: z.string(),
         requestID: z.string(),
         answers: z.array(Answer),
       }),
@@ -74,7 +73,7 @@ export namespace Question {
     Rejected: BusEvent.define(
       "question.rejected",
       z.object({
-        sessionID: SessionID.zod,
+        sessionID: z.string(),
         requestID: z.string(),
       }),
     ),
@@ -96,9 +95,9 @@ export namespace Question {
   })
 
   export async function ask(input: {
-    sessionID: SessionID
+    sessionID: string
     questions: Info[]
-    tool?: { messageID: MessageID; callID: string }
+    tool?: { messageID: string; callID: string }
   }): Promise<Answer[]> {
     const s = await state()
     const id = Identifier.ascending("question")

packages/opencode/src/server/routes/project.ts

@@ -4,7 +4,6 @@ import { resolver } from "hono-openapi"
 import { Instance } from "../../project/instance"
 import { Project } from "../../project/project"
 import z from "zod"
-import { ProjectID } from "../../project/schema"
 import { errors } from "../error"
 import { lazy } from "../../util/lazy"
 import { InstanceBootstrap } from "../../project/bootstrap"
@@ -29,7 +28,7 @@ export const ProjectRoutes = lazy(() =>
         },
       }),
       async (c) => {
-        const projects = Project.list()
+        const projects = await Project.list()
         return c.json(projects)
       },
     )
@@ -106,7 +105,7 @@ export const ProjectRoutes = lazy(() =>
           ...errors(400, 404),
         },
       }),
-      validator("param", z.object({ projectID: ProjectID.zod })),
+      validator("param", z.object({ projectID: z.string() })),
       validator("json", Project.update.schema.omit({ projectID: true })),
       async (c) => {
         const projectID = c.req.valid("param").projectID

packages/opencode/src/server/routes/pty.ts

@@ -1,13 +1,14 @@
 import { Hono } from "hono"
 import { describeRoute, validator, resolver } from "hono-openapi"
-import type { UpgradeWebSocket } from "hono/ws"
+import { upgradeWebSocket } from "hono/bun"
 import z from "zod"
 import { Pty } from "@/pty"
 import { NotFoundError } from "../../storage/db"
 import { errors } from "../error"
+import { lazy } from "../../util/lazy"
 
-export function PtyRoutes(upgradeWebSocket: UpgradeWebSocket) {
-  return new Hono()
+export const PtyRoutes = lazy(() =>
+  new Hono()
     .get(
       "/",
       describeRoute({
@@ -195,5 +196,5 @@ export function PtyRoutes(upgradeWebSocket: UpgradeWebSocket) {
           },
         }
       }),
-    )
-}
+    ),
+)

packages/opencode/src/server/routes/session.ts

@@ -1,7 +1,6 @@
 import { Hono } from "hono"
 import { stream } from "hono/streaming"
 import { describeRoute, validator, resolver } from "hono-openapi"
-import { SessionID, MessageID } from "@/session/schema"
 import z from "zod"
 import { Session } from "../../session"
 import { MessageV2 } from "../../session/message-v2"
@@ -174,7 +173,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string().meta({ description: "Session ID" }),
         }),
       ),
       async (c) => {
@@ -259,7 +258,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string(),
         }),
       ),
       validator(
@@ -310,7 +309,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string().meta({ description: "Session ID" }),
         }),
       ),
       validator("json", Session.initialize.schema.omit({ sessionID: true })),
@@ -373,7 +372,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string(),
         }),
       ),
       async (c) => {
@@ -402,7 +401,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string(),
         }),
       ),
       async (c) => {
@@ -503,7 +502,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string().meta({ description: "Session ID" }),
         }),
       ),
       validator(
@@ -562,7 +561,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string().meta({ description: "Session ID" }),
         }),
       ),
       validator(
@@ -606,8 +605,8 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
-          messageID: MessageID.zod,
+          sessionID: z.string().meta({ description: "Session ID" }),
+          messageID: z.string().meta({ description: "Message ID" }),
         }),
       ),
       async (c) => {
@@ -641,8 +640,8 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
-          messageID: MessageID.zod,
+          sessionID: z.string().meta({ description: "Session ID" }),
+          messageID: z.string().meta({ description: "Message ID" }),
         }),
       ),
       async (c) => {
@@ -675,9 +674,9 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
-          messageID: MessageID.zod,
-          partID: z.string(),
+          sessionID: z.string().meta({ description: "Session ID" }),
+          messageID: z.string().meta({ description: "Message ID" }),
+          partID: z.string().meta({ description: "Part ID" }),
         }),
       ),
       async (c) => {
@@ -710,9 +709,9 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
-          messageID: MessageID.zod,
-          partID: z.string(),
+          sessionID: z.string().meta({ description: "Session ID" }),
+          messageID: z.string().meta({ description: "Message ID" }),
+          partID: z.string().meta({ description: "Part ID" }),
         }),
       ),
       validator("json", MessageV2.Part),
@@ -754,7 +753,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string().meta({ description: "Session ID" }),
         }),
       ),
       validator("json", SessionPrompt.PromptInput.omit({ sessionID: true })),
@@ -786,7 +785,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string().meta({ description: "Session ID" }),
         }),
       ),
       validator("json", SessionPrompt.PromptInput.omit({ sessionID: true })),
@@ -826,7 +825,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string().meta({ description: "Session ID" }),
         }),
       ),
       validator("json", SessionPrompt.CommandInput.omit({ sessionID: true })),
@@ -858,7 +857,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string().meta({ description: "Session ID" }),
         }),
       ),
       validator("json", SessionPrompt.ShellInput.omit({ sessionID: true })),
@@ -890,7 +889,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string(),
         }),
       ),
       validator("json", SessionRevert.RevertInput.omit({ sessionID: true })),
@@ -925,7 +924,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string(),
         }),
       ),
       async (c) => {
@@ -956,7 +955,7 @@ export const SessionRoutes = lazy(() =>
       validator(
         "param",
         z.object({
-          sessionID: SessionID.zod,
+          sessionID: z.string(),
           permissionID: z.string(),
         }),
       ),

packages/opencode/src/server/server.ts

@@ -25,7 +25,7 @@ import { WorkspaceContext } from "../control-plane/workspace-context"
 import { WorkspaceRouterMiddleware } from "../control-plane/workspace-router-middleware"
 import { ProjectRoutes } from "./routes/project"
 import { SessionRoutes } from "./routes/session"
-// import { PtyRoutes } from "./routes/pty"
+import { PtyRoutes } from "./routes/pty"
 import { McpRoutes } from "./routes/mcp"
 import { FileRoutes } from "./routes/file"
 import { ConfigRoutes } from "./routes/config"
@@ -34,8 +34,7 @@ import { ProviderRoutes } from "./routes/provider"
 import { InstanceBootstrap } from "../project/bootstrap"
 import { NotFoundError } from "../storage/db"
 import type { ContentfulStatusCode } from "hono/utils/http-status"
-import { createAdaptorServer, type ServerType } from "@hono/node-server"
-import { createNodeWebSocket } from "@hono/node-ws"
+import { websocket } from "hono/bun"
 import { HTTPException } from "hono/http-exception"
 import { errors } from "./error"
 import { Filesystem } from "@/util/filesystem"
@@ -49,20 +48,13 @@ import { lazy } from "@/util/lazy"
 globalThis.AI_SDK_LOG_WARNINGS = false
 
 export namespace Server {
-  export type Listener = {
-    hostname: string
-    port: number
-    url: URL
-    stop: (close?: boolean) => Promise<void>
-  }
+  const log = Log.create({ service: "server" })
 
-  export const Default = lazy(() => create({}).app)
+  export const Default = lazy(() => createApp({}))
 
-  function create(opts: { cors?: string[] }) {
-    const log = Log.create({ service: "server" })
+  export const createApp = (opts: { cors?: string[] }): Hono => {
     const app = new Hono()
-    const ws = createNodeWebSocket({ app })
-    const route = app
+    return app
       .onError((err, c) => {
         log.error("failed", {
           error: err,
@@ -247,6 +239,7 @@ export namespace Server {
         ),
       )
       .route("/project", ProjectRoutes())
+      .route("/pty", PtyRoutes())
       .route("/config", ConfigRoutes())
       .route("/experimental", ExperimentalRoutes())
       .route("/session", SessionRoutes())
@@ -559,7 +552,6 @@ export namespace Server {
           })
         },
       )
-      // .route("/pty", PtyRoutes(ws.upgradeWebSocket))
       .all("/*", async (c) => {
         const path = c.req.path
 
@@ -576,11 +568,6 @@ export namespace Server {
         )
         return response
       })
-
-    return {
-      app: route as Hono,
-      ws,
-    }
   }
 
   export async function openapi() {
@@ -598,86 +585,48 @@ export namespace Server {
     return result
   }
 
-  export async function listen(opts: {
+  export function listen(opts: {
     port: number
     hostname: string
     mdns?: boolean
     mdnsDomain?: string
     cors?: string[]
-  }): Promise<Listener> {
-    const log = Log.create({ service: "server" })
-    const built = create({
-      ...opts,
-    })
-    const start = (port: number) =>
-      new Promise<ServerType>((resolve, reject) => {
-        const server = createAdaptorServer({ fetch: built.app.fetch })
-        built.ws.injectWebSocket(server)
-        const fail = (err: Error) => {
-          cleanup()
-          reject(err)
-        }
-        const ready = () => {
-          cleanup()
-          resolve(server)
-        }
-        const cleanup = () => {
-          server.off("error", fail)
-          server.off("listening", ready)
-        }
-        server.once("error", fail)
-        server.once("listening", ready)
-        server.listen(port, opts.hostname)
-      })
-
-    const server = opts.port === 0 ? await start(4096).catch(() => start(0)) : await start(opts.port)
-    const addr = server.address()
-    if (!addr || typeof addr === "string") {
-      throw new Error(`Failed to resolve server address for port ${opts.port}`)
+  }) {
+    const app = createApp(opts)
+    const args = {
+      hostname: opts.hostname,
+      idleTimeout: 0,
+      fetch: app.fetch,
+      websocket: websocket,
+    } as const
+    const tryServe = (port: number) => {
+      try {
+        return Bun.serve({ ...args, port })
+      } catch {
+        return undefined
+      }
     }
-
-    const url = new URL("http://localhost")
-    url.hostname = opts.hostname
-    url.port = String(addr.port)
+    const server = opts.port === 0 ? (tryServe(4096) ?? tryServe(0)) : tryServe(opts.port)
+    if (!server) throw new Error(`Failed to start server on port ${opts.port}`)
 
     const shouldPublishMDNS =
       opts.mdns &&
-      addr.port &&
+      server.port &&
       opts.hostname !== "127.0.0.1" &&
       opts.hostname !== "localhost" &&
       opts.hostname !== "::1"
     if (shouldPublishMDNS) {
-      MDNS.publish(addr.port, opts.mdnsDomain)
+      MDNS.publish(server.port!, opts.mdnsDomain)
     } else if (opts.mdns) {
       log.warn("mDNS enabled but hostname is loopback; skipping mDNS publish")
     }
 
-    let closing: Promise<void> | undefined
-    return {
-      hostname: opts.hostname,
-      port: addr.port,
-      url,
-      stop(close?: boolean) {
-        closing ??= new Promise((resolve, reject) => {
-          if (shouldPublishMDNS) MDNS.unpublish()
-          server.close((err) => {
-            if (err) {
-              reject(err)
-              return
-            }
-            resolve()
-          })
-          if (close) {
-            if ("closeAllConnections" in server && typeof server.closeAllConnections === "function") {
-              server.closeAllConnections()
-            }
-            if ("closeIdleConnections" in server && typeof server.closeIdleConnections === "function") {
-              server.closeIdleConnections()
-            }
-          }
-        })
-        return closing
-      },
+    const originalStop = server.stop.bind(server)
+    server.stop = async (closeActiveConnections?: boolean) => {
+      if (shouldPublishMDNS) MDNS.unpublish()
+      return originalStop(closeActiveConnections)
     }
+
+    return server
   }
 }

packages/opencode/src/session/compaction.ts

@@ -2,7 +2,6 @@ import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import { Session } from "."
 import { Identifier } from "../id/id"
-import { SessionID, MessageID } from "./schema"
 import { Instance } from "../project/instance"
 import { Provider } from "../provider/provider"
 import { MessageV2 } from "./message-v2"
@@ -23,7 +22,7 @@ export namespace SessionCompaction {
     Compacted: BusEvent.define(
       "session.compacted",
       z.object({
-        sessionID: SessionID.zod,
+        sessionID: z.string(),
       }),
     ),
   }
@@ -56,7 +55,7 @@ export namespace SessionCompaction {
   // goes backwards through parts until there are 40_000 tokens worth of tool
   // calls. then erases output of previous tool calls. idea is to throw away old
   // tool calls that are no longer relevant.
-  export async function prune(input: { sessionID: SessionID }) {
+  export async function prune(input: { sessionID: string }) {
     const config = await Config.get()
     if (config.compaction?.prune === false) return
     log.info("pruning")
@@ -100,9 +99,9 @@ export namespace SessionCompaction {
   }
 
   export async function process(input: {
-    parentID: MessageID
+    parentID: string
     messages: MessageV2.WithParts[]
-    sessionID: SessionID
+    sessionID: string
     abort: AbortSignal
     auto: boolean
     overflow?: boolean
@@ -134,7 +133,7 @@ export namespace SessionCompaction {
       ? await Provider.getModel(agent.model.providerID, agent.model.modelID)
       : await Provider.getModel(userMessage.model.providerID, userMessage.model.modelID)
     const msg = (await Session.updateMessage({
-      id: MessageID.ascending(),
+      id: Identifier.ascending("message"),
       role: "assistant",
       parentID: input.parentID,
       sessionID: input.sessionID,
@@ -237,7 +236,7 @@ When constructing the summary, try to stick to this template:
       if (replay) {
         const original = replay.info as MessageV2.User
         const replayMsg = await Session.updateMessage({
-          id: MessageID.ascending(),
+          id: Identifier.ascending("message"),
           role: "user",
           sessionID: input.sessionID,
           time: { created: Date.now() },
@@ -263,7 +262,7 @@ When constructing the summary, try to stick to this template:
         }
       } else {
         const continueMsg = await Session.updateMessage({
-          id: MessageID.ascending(),
+          id: Identifier.ascending("message"),
           role: "user",
           sessionID: input.sessionID,
           time: { created: Date.now() },
@@ -296,7 +295,7 @@ When constructing the summary, try to stick to this template:
 
   export const create = fn(
     z.object({
-      sessionID: SessionID.zod,
+      sessionID: Identifier.schema("session"),
       agent: z.string(),
       model: z.object({
         providerID: z.string(),
@@ -307,7 +306,7 @@ When constructing the summary, try to stick to this template:
     }),
     async (input) => {
       const msg = await Session.updateMessage({
-        id: MessageID.ascending(),
+        id: Identifier.ascending("message"),
         role: "user",
         model: input.model,
         sessionID: input.sessionID,

packages/opencode/src/session/index.ts

@@ -23,8 +23,6 @@ import { fn } from "@/util/fn"
 import { Command } from "../command"
 import { Snapshot } from "@/snapshot"
 import { WorkspaceContext } from "../control-plane/workspace-context"
-import { ProjectID } from "../project/schema"
-import { SessionID, MessageID } from "./schema"
 
 import type { Provider } from "@/provider/provider"
 import { PermissionNext } from "@/permission/next"
@@ -120,12 +118,12 @@ export namespace Session {
 
   export const Info = z
     .object({
-      id: SessionID.zod,
+      id: Identifier.schema("session"),
       slug: z.string(),
-      projectID: ProjectID.zod,
+      projectID: z.string(),
       workspaceID: z.string().optional(),
       directory: z.string(),
-      parentID: SessionID.zod.optional(),
+      parentID: Identifier.schema("session").optional(),
       summary: z
         .object({
           additions: z.number(),
@@ -150,7 +148,7 @@ export namespace Session {
       permission: PermissionNext.Ruleset.optional(),
       revert: z
         .object({
-          messageID: MessageID.zod,
+          messageID: z.string(),
           partID: z.string().optional(),
           snapshot: z.string().optional(),
           diff: z.string().optional(),
@@ -164,7 +162,7 @@ export namespace Session {
 
   export const ProjectInfo = z
     .object({
-      id: ProjectID.zod,
+      id: z.string(),
       name: z.string().optional(),
       worktree: z.string(),
     })
@@ -202,14 +200,14 @@ export namespace Session {
     Diff: BusEvent.define(
       "session.diff",
       z.object({
-        sessionID: SessionID.zod,
+        sessionID: z.string(),
         diff: Snapshot.FileDiff.array(),
       }),
     ),
     Error: BusEvent.define(
       "session.error",
       z.object({
-        sessionID: SessionID.zod.optional(),
+        sessionID: z.string().optional(),
         error: MessageV2.Assistant.shape.error,
       }),
     ),
@@ -218,7 +216,7 @@ export namespace Session {
   export const create = fn(
     z
       .object({
-        parentID: SessionID.zod.optional(),
+        parentID: Identifier.schema("session").optional(),
         title: z.string().optional(),
         permission: Info.shape.permission,
         workspaceID: Identifier.schema("workspace").optional(),
@@ -237,8 +235,8 @@ export namespace Session {
 
   export const fork = fn(
     z.object({
-      sessionID: SessionID.zod,
-      messageID: MessageID.zod.optional(),
+      sessionID: Identifier.schema("session"),
+      messageID: Identifier.schema("message").optional(),
     }),
     async (input) => {
       const original = await get(input.sessionID)
@@ -250,11 +248,11 @@ export namespace Session {
         title,
       })
       const msgs = await messages({ sessionID: input.sessionID })
-      const idMap = new Map<string, MessageID>()
+      const idMap = new Map<string, string>()
 
       for (const msg of msgs) {
         if (input.messageID && msg.info.id >= input.messageID) break
-        const newID = MessageID.ascending()
+        const newID = Identifier.ascending("message")
         idMap.set(msg.info.id, newID)
 
         const parentID = msg.info.role === "assistant" && msg.info.parentID ? idMap.get(msg.info.parentID) : undefined
@@ -278,7 +276,7 @@ export namespace Session {
     },
   )
 
-  export const touch = fn(SessionID.zod, async (sessionID) => {
+  export const touch = fn(Identifier.schema("session"), async (sessionID) => {
     const now = Date.now()
     Database.use((db) => {
       const row = db
@@ -294,15 +292,15 @@ export namespace Session {
   })
 
   export async function createNext(input: {
-    id?: SessionID
+    id?: string
     title?: string
-    parentID?: SessionID
+    parentID?: string
     workspaceID?: string
     directory: string
     permission?: PermissionNext.Ruleset
   }) {
     const result: Info = {
-      id: SessionID.descending(input.id),
+      id: Identifier.descending("session", input.id),
       slug: Slug.create(),
       version: Installation.VERSION,
       projectID: Instance.project.id,
@@ -343,13 +341,13 @@ export namespace Session {
     return path.join(base, [input.time.created, input.slug].join("-") + ".md")
   }
 
-  export const get = fn(SessionID.zod, async (id) => {
+  export const get = fn(Identifier.schema("session"), async (id) => {
     const row = Database.use((db) => db.select().from(SessionTable).where(eq(SessionTable.id, id)).get())
     if (!row) throw new NotFoundError({ message: `Session not found: ${id}` })
     return fromRow(row)
   })
 
-  export const share = fn(SessionID.zod, async (id) => {
+  export const share = fn(Identifier.schema("session"), async (id) => {
     const cfg = await Config.get()
     if (cfg.share === "disabled") {
       throw new Error("Sharing is disabled in configuration")
@@ -365,7 +363,7 @@ export namespace Session {
     return share
   })
 
-  export const unshare = fn(SessionID.zod, async (id) => {
+  export const unshare = fn(Identifier.schema("session"), async (id) => {
     // Use ShareNext to remove the share (same as share function uses ShareNext to create)
     const { ShareNext } = await import("@/share/share-next")
     await ShareNext.remove(id)
@@ -379,7 +377,7 @@ export namespace Session {
 
   export const setTitle = fn(
     z.object({
-      sessionID: SessionID.zod,
+      sessionID: Identifier.schema("session"),
       title: z.string(),
     }),
     async (input) => {
@@ -400,7 +398,7 @@ export namespace Session {
 
   export const setArchived = fn(
     z.object({
-      sessionID: SessionID.zod,
+      sessionID: Identifier.schema("session"),
       time: z.number().optional(),
     }),
     async (input) => {
@@ -421,7 +419,7 @@ export namespace Session {
 
   export const setPermission = fn(
     z.object({
-      sessionID: SessionID.zod,
+      sessionID: Identifier.schema("session"),
       permission: PermissionNext.Ruleset,
     }),
     async (input) => {
@@ -442,7 +440,7 @@ export namespace Session {
 
   export const setRevert = fn(
     z.object({
-      sessionID: SessionID.zod,
+      sessionID: Identifier.schema("session"),
       revert: Info.shape.revert,
       summary: Info.shape.summary,
     }),
@@ -468,7 +466,7 @@ export namespace Session {
     },
   )
 
-  export const clearRevert = fn(SessionID.zod, async (sessionID) => {
+  export const clearRevert = fn(Identifier.schema("session"), async (sessionID) => {
     return Database.use((db) => {
       const row = db
         .update(SessionTable)
@@ -488,7 +486,7 @@ export namespace Session {
 
   export const setSummary = fn(
     z.object({
-      sessionID: SessionID.zod,
+      sessionID: Identifier.schema("session"),
       summary: Info.shape.summary,
     }),
     async (input) => {
@@ -512,7 +510,7 @@ export namespace Session {
     },
   )
 
-  export const diff = fn(SessionID.zod, async (sessionID) => {
+  export const diff = fn(Identifier.schema("session"), async (sessionID) => {
     try {
       return await Storage.read<Snapshot.FileDiff[]>(["session_diff", sessionID])
     } catch {
@@ -522,7 +520,7 @@ export namespace Session {
 
   export const messages = fn(
     z.object({
-      sessionID: SessionID.zod,
+      sessionID: Identifier.schema("session"),
       limit: z.number().optional(),
     }),
     async (input) => {
@@ -648,7 +646,7 @@ export namespace Session {
     }
   }
 
-  export const children = fn(SessionID.zod, async (parentID) => {
+  export const children = fn(Identifier.schema("session"), async (parentID) => {
     const project = Instance.project
     const rows = Database.use((db) =>
       db
@@ -660,7 +658,7 @@ export namespace Session {
     return rows.map(fromRow)
   })
 
-  export const remove = fn(SessionID.zod, async (sessionID) => {
+  export const remove = fn(Identifier.schema("session"), async (sessionID) => {
     const project = Instance.project
     try {
       const session = await get(sessionID)
@@ -706,8 +704,8 @@ export namespace Session {
 
   export const removeMessage = fn(
     z.object({
-      sessionID: SessionID.zod,
-      messageID: MessageID.zod,
+      sessionID: Identifier.schema("session"),
+      messageID: Identifier.schema("message"),
     }),
     async (input) => {
       // CASCADE delete handles parts automatically
@@ -728,8 +726,8 @@ export namespace Session {
 
   export const removePart = fn(
     z.object({
-      sessionID: SessionID.zod,
-      messageID: MessageID.zod,
+      sessionID: Identifier.schema("session"),
+      messageID: Identifier.schema("message"),
       partID: Identifier.schema("part"),
     }),
     async (input) => {
@@ -776,8 +774,8 @@ export namespace Session {
 
   export const updatePartDelta = fn(
     z.object({
-      sessionID: SessionID.zod,
-      messageID: MessageID.zod,
+      sessionID: z.string(),
+      messageID: z.string(),
       partID: z.string(),
       field: z.string(),
       delta: z.string(),
@@ -874,10 +872,10 @@ export namespace Session {
 
   export const initialize = fn(
     z.object({
-      sessionID: SessionID.zod,
+      sessionID: Identifier.schema("session"),
       modelID: z.string(),
       providerID: z.string(),
-      messageID: MessageID.zod,
+      messageID: Identifier.schema("message"),
     }),
     async (input) => {
       await SessionPrompt.command({

packages/opencode/src/session/message-v2.ts

@@ -1,16 +1,19 @@
 import { BusEvent } from "@/bus/bus-event"
-import { SessionID, MessageID } from "./schema"
 import z from "zod"
 import { NamedError } from "@opencode-ai/util/error"
 import { APICallError, convertToModelMessages, LoadAPIKeyError, type ModelMessage, type UIMessage } from "ai"
+import { Identifier } from "../id/id"
 import { LSP } from "../lsp"
 import { Snapshot } from "@/snapshot"
 import { fn } from "@/util/fn"
 import { Database, eq, desc, inArray } from "@/storage/db"
 import { MessageTable, PartTable } from "./session.sql"
+import { ProviderTransform } from "@/provider/transform"
+import { STATUS_CODES } from "http"
+import { Storage } from "@/storage/storage"
 import { ProviderError } from "@/provider/error"
 import { iife } from "@/util/iife"
-import type { SystemError } from "bun"
+import { type SystemError } from "bun"
 import type { Provider } from "@/provider/provider"
 
 export namespace MessageV2 {
@@ -76,8 +79,8 @@ export namespace MessageV2 {
 
   const PartBase = z.object({
     id: z.string(),
-    sessionID: SessionID.zod,
-    messageID: MessageID.zod,
+    sessionID: z.string(),
+    messageID: z.string(),
   })
 
   export const SnapshotPart = PartBase.extend({
@@ -340,8 +343,8 @@ export namespace MessageV2 {
   export type ToolPart = z.infer<typeof ToolPart>
 
   const Base = z.object({
-    id: MessageID.zod,
-    sessionID: SessionID.zod,
+    id: z.string(),
+    sessionID: z.string(),
   })
 
   export const User = Base.extend({
@@ -407,7 +410,7 @@ export namespace MessageV2 {
         APIError.Schema,
       ])
       .optional(),
-    parentID: MessageID.zod,
+    parentID: z.string(),
     modelID: z.string(),
     providerID: z.string(),
     /**
@@ -454,8 +457,8 @@ export namespace MessageV2 {
     Removed: BusEvent.define(
       "message.removed",
       z.object({
-        sessionID: SessionID.zod,
-        messageID: MessageID.zod,
+        sessionID: z.string(),
+        messageID: z.string(),
       }),
     ),
     PartUpdated: BusEvent.define(
@@ -467,8 +470,8 @@ export namespace MessageV2 {
     PartDelta: BusEvent.define(
       "message.part.delta",
       z.object({
-        sessionID: SessionID.zod,
-        messageID: MessageID.zod,
+        sessionID: z.string(),
+        messageID: z.string(),
         partID: z.string(),
         field: z.string(),
         delta: z.string(),
@@ -477,8 +480,8 @@ export namespace MessageV2 {
     PartRemoved: BusEvent.define(
       "message.part.removed",
       z.object({
-        sessionID: SessionID.zod,
-        messageID: MessageID.zod,
+        sessionID: z.string(),
+        messageID: z.string(),
         partID: z.string(),
       }),
     ),
@@ -695,7 +698,7 @@ export namespace MessageV2 {
           // media (images, PDFs) in tool results
           if (media.length > 0) {
             result.push({
-              id: MessageID.ascending(),
+              id: Identifier.ascending("message"),
               role: "user",
               parts: [
                 {
@@ -725,7 +728,7 @@ export namespace MessageV2 {
     )
   }
 
-  export const stream = fn(SessionID.zod, async function* (sessionID) {
+  export const stream = fn(Identifier.schema("session"), async function* (sessionID) {
     const size = 50
     let offset = 0
     while (true) {
@@ -778,7 +781,7 @@ export namespace MessageV2 {
     }
   })
 
-  export const parts = fn(MessageID.zod, async (message_id) => {
+  export const parts = fn(Identifier.schema("message"), async (message_id) => {
     const rows = Database.use((db) =>
       db.select().from(PartTable).where(eq(PartTable.message_id, message_id)).orderBy(PartTable.id).all(),
     )
@@ -789,8 +792,8 @@ export namespace MessageV2 {
 
   export const get = fn(
     z.object({
-      sessionID: SessionID.zod,
-      messageID: MessageID.zod,
+      sessionID: Identifier.schema("session"),
+      messageID: Identifier.schema("message"),
     }),
     async (input): Promise<WithParts> => {
       const row = Database.use((db) => db.select().from(MessageTable).where(eq(MessageTable.id, input.messageID)).get())

packages/opencode/src/session/message.ts

@@ -1,5 +1,4 @@
 import z from "zod"
-import { SessionID } from "./schema"
 import { NamedError } from "@opencode-ai/util/error"
 
 export namespace Message {
@@ -143,7 +142,7 @@ export namespace Message {
           error: z
             .discriminatedUnion("name", [AuthError.Schema, NamedError.Unknown.Schema, OutputLengthError.Schema])
             .optional(),
-          sessionID: SessionID.zod,
+          sessionID: z.string(),
           tool: z.record(
             z.string(),
             z

packages/opencode/src/session/processor.ts

@@ -15,7 +15,6 @@ import { Config } from "@/config/config"
 import { SessionCompaction } from "./compaction"
 import { PermissionNext } from "@/permission/next"
 import { Question } from "@/question"
-import type { SessionID, MessageID } from "./schema"
 
 export namespace SessionProcessor {
   const DOOM_LOOP_THRESHOLD = 3
@@ -26,7 +25,7 @@ export namespace SessionProcessor {
 
   export function create(input: {
     assistantMessage: MessageV2.Assistant
-    sessionID: SessionID
+    sessionID: string
     model: Provider.Model
     abort: AbortSignal
   }) {

packages/opencode/src/session/prompt.ts

@@ -4,7 +4,6 @@ import fs from "fs/promises"
 import z from "zod"
 import { Filesystem } from "../util/filesystem"
 import { Identifier } from "../id/id"
-import { SessionID, MessageID } from "./schema"
 import { MessageV2 } from "./message-v2"
 import { Log } from "../util/log"
 import { SessionRevert } from "./revert"
@@ -32,6 +31,7 @@ import { Flag } from "../flag/flag"
 import { ulid } from "ulid"
 import { spawn } from "child_process"
 import { Command } from "../command"
+import { $ } from "bun"
 import { pathToFileURL, fileURLToPath } from "url"
 import { ConfigMarkdown } from "../config/markdown"
 import { SessionSummary } from "./summary"
@@ -46,7 +46,6 @@ import { LLM } from "./llm"
 import { iife } from "@/util/iife"
 import { Shell } from "@/shell/shell"
 import { Truncate } from "@/tool/truncation"
-import { Process } from "@/util/process"
 
 // @ts-ignore
 globalThis.AI_SDK_LOG_WARNINGS = false
@@ -85,14 +84,14 @@ export namespace SessionPrompt {
     },
   )
 
-  export function assertNotBusy(sessionID: SessionID) {
+  export function assertNotBusy(sessionID: string) {
     const match = state()[sessionID]
     if (match) throw new Session.BusyError(sessionID)
   }
 
   export const PromptInput = z.object({
-    sessionID: SessionID.zod,
-    messageID: MessageID.zod.optional(),
+    sessionID: Identifier.schema("session"),
+    messageID: Identifier.schema("message").optional(),
     model: z
       .object({
         providerID: z.string(),
@@ -255,7 +254,7 @@ export namespace SessionPrompt {
     return s[sessionID].abort.signal
   }
 
-  export function cancel(sessionID: SessionID) {
+  export function cancel(sessionID: string) {
     log.info("cancel", { sessionID })
     const s = state()
     const match = s[sessionID]
@@ -270,7 +269,7 @@ export namespace SessionPrompt {
   }
 
   export const LoopInput = z.object({
-    sessionID: SessionID.zod,
+    sessionID: Identifier.schema("session"),
     resume_existing: z.boolean().optional(),
   })
   export const loop = fn(LoopInput, async (input) => {
@@ -317,7 +316,11 @@ export namespace SessionPrompt {
       }
 
       if (!lastUser) throw new Error("No user message found in stream. This should never happen.")
-      if (shouldExitLoop(lastUser, lastAssistant)) {
+      if (
+        lastAssistant?.finish &&
+        !["tool-calls", "unknown"].includes(lastAssistant.finish) &&
+        lastUser.id < lastAssistant.id
+      ) {
         log.info("exiting loop", { sessionID })
         break
       }
@@ -351,7 +354,7 @@ export namespace SessionPrompt {
         const taskTool = await TaskTool.init()
         const taskModel = task.model ? await Provider.getModel(task.model.providerID, task.model.modelID) : model
         const assistantMessage = (await Session.updateMessage({
-          id: MessageID.ascending(),
+          id: Identifier.ascending("message"),
           role: "assistant",
           parentID: lastUser.id,
           sessionID,
@@ -500,7 +503,7 @@ export namespace SessionPrompt {
           // If we create assistant messages w/ out user ones following mid loop thinking signatures
           // will be missing and it can cause errors for models like gemini for example
           const summaryUserMsg: MessageV2.User = {
-            id: MessageID.ascending(),
+            id: Identifier.ascending("message"),
             sessionID,
             role: "user",
             time: {
@@ -564,7 +567,7 @@ export namespace SessionPrompt {
 
       const processor = SessionProcessor.create({
         assistantMessage: (await Session.updateMessage({
-          id: MessageID.ascending(),
+          id: Identifier.ascending("message"),
           parentID: lastUser.id,
           role: "assistant",
           mode: agent.name,
@@ -723,7 +726,7 @@ export namespace SessionPrompt {
     throw new Error("Impossible")
   })
 
-  async function lastModel(sessionID: SessionID) {
+  async function lastModel(sessionID: string) {
     for await (const item of MessageV2.stream(sessionID)) {
       if (item.info.role === "user" && item.info.model) return item.info.model
     }
@@ -962,7 +965,7 @@ export namespace SessionPrompt {
     const variant = input.variant ?? (agent.variant && full?.variants?.[agent.variant] ? agent.variant : undefined)
 
     const info: MessageV2.Info = {
-      id: input.messageID ?? MessageID.ascending(),
+      id: input.messageID ?? Identifier.ascending("message"),
       role: "user",
       sessionID: input.sessionID,
       time: {
@@ -1459,7 +1462,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
   }
 
   export const ShellInput = z.object({
-    sessionID: SessionID.zod,
+    sessionID: Identifier.schema("session"),
     agent: z.string(),
     model: z
       .object({
@@ -1496,7 +1499,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
     const agent = await Agent.get(input.agent)
     const model = input.model ?? agent.model ?? (await lastModel(input.sessionID))
     const userMsg: MessageV2.User = {
-      id: MessageID.ascending(),
+      id: Identifier.ascending("message"),
       sessionID: input.sessionID,
       time: {
         created: Date.now(),
@@ -1520,7 +1523,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
     await Session.updatePart(userPart)
 
     const msg: MessageV2.Assistant = {
-      id: MessageID.ascending(),
+      id: Identifier.ascending("message"),
       sessionID: input.sessionID,
       parentID: userMsg.id,
       mode: input.agent,
@@ -1563,7 +1566,9 @@ NOTE: At any point in time through this workflow you should feel free to ask the
     }
     await Session.updatePart(part)
     const shell = Shell.preferred()
-    const shellName = Shell.name(shell)
+    const shellName = (
+      process.platform === "win32" ? path.win32.basename(shell, ".exe") : path.basename(shell)
+    ).toLowerCase()
 
     const invocations: Record<string, { args: string[] }> = {
       nu: {
@@ -1708,8 +1713,8 @@ NOTE: At any point in time through this workflow you should feel free to ask the
   }
 
   export const CommandInput = z.object({
-    messageID: MessageID.zod.optional(),
-    sessionID: SessionID.zod,
+    messageID: Identifier.schema("message").optional(),
+    sessionID: Identifier.schema("session"),
     agent: z.string().optional(),
     model: z.string().optional(),
     arguments: z.string(),
@@ -1774,13 +1779,15 @@ NOTE: At any point in time through this workflow you should feel free to ask the
       template = template + "\n\n" + input.arguments
     }
 
-    const shellMatches = ConfigMarkdown.shell(template)
-    if (shellMatches.length > 0) {
-      const sh = Shell.preferred()
+    const shell = ConfigMarkdown.shell(template)
+    if (shell.length > 0) {
       const results = await Promise.all(
-        shellMatches.map(async ([, cmd]) => {
-          const out = await Process.text([cmd], { shell: sh, nothrow: true })
-          return out.text
+        shell.map(async ([, cmd]) => {
+          try {
+            return await $`${{ raw: cmd }}`.quiet().nothrow().text()
+          } catch (error) {
+            return `Error executing command: ${error instanceof Error ? error.message : String(error)}`
+          }
         }),
       )
       let index = 0
@@ -1953,15 +1960,4 @@ NOTE: At any point in time through this workflow you should feel free to ask the
       return Session.setTitle({ sessionID: input.session.id, title })
     }
   }
-
-  /** @internal Exported for testing — determines whether the prompt loop should exit */
-  export function shouldExitLoop(
-    lastUser: MessageV2.User | undefined,
-    lastAssistant: MessageV2.Assistant | undefined,
-  ): boolean {
-    if (!lastUser) return false
-    if (!lastAssistant?.finish) return false
-    if (["tool-calls", "unknown"].includes(lastAssistant.finish)) return false
-    return lastAssistant.parentID === lastUser.id
-  }
 }

packages/opencode/src/session/revert.ts

@@ -1,6 +1,5 @@
 import z from "zod"
 import { Identifier } from "../id/id"
-import { SessionID, MessageID } from "./schema"
 import { Snapshot } from "../snapshot"
 import { MessageV2 } from "./message-v2"
 import { Session } from "."
@@ -16,8 +15,8 @@ export namespace SessionRevert {
   const log = Log.create({ service: "session.revert" })
 
   export const RevertInput = z.object({
-    sessionID: SessionID.zod,
-    messageID: MessageID.zod,
+    sessionID: Identifier.schema("session"),
+    messageID: Identifier.schema("message"),
     partID: Identifier.schema("part").optional(),
   })
   export type RevertInput = z.infer<typeof RevertInput>
@@ -80,7 +79,7 @@ export namespace SessionRevert {
     return session
   }
 
-  export async function unrevert(input: { sessionID: SessionID }) {
+  export async function unrevert(input: { sessionID: string }) {
     log.info("unreverting", input)
     SessionPrompt.assertNotBusy(input.sessionID)
     const session = await Session.get(input.sessionID)

packages/opencode/src/session/schema.ts

@@ -1,29 +0,0 @@
-import { Schema } from "effect"
-import z from "zod"
-
-import { withStatics } from "@/util/schema"
-import { Identifier } from "@/id/id"
-
-const sessionIdSchema = Schema.String.pipe(Schema.brand("SessionId"))
-
-export type SessionID = typeof sessionIdSchema.Type
-
-export const SessionID = sessionIdSchema.pipe(
-  withStatics((schema: typeof sessionIdSchema) => ({
-    make: (id: string) => schema.makeUnsafe(id),
-    descending: (id?: string) => schema.makeUnsafe(Identifier.descending("session", id)),
-    zod: z.string().startsWith("ses").pipe(z.custom<SessionID>()),
-  })),
-)
-
-const messageIdSchema = Schema.String.pipe(Schema.brand("MessageId"))
-
-export type MessageID = typeof messageIdSchema.Type
-
-export const MessageID = messageIdSchema.pipe(
-  withStatics((schema: typeof messageIdSchema) => ({
-    make: (id: string) => schema.makeUnsafe(id),
-    ascending: (id?: string) => schema.makeUnsafe(Identifier.ascending("message", id)),
-    zod: z.string().startsWith("msg").pipe(z.custom<MessageID>()),
-  })),
-)

packages/opencode/src/session/session.sql.ts

@@ -3,8 +3,6 @@ import { ProjectTable } from "../project/project.sql"
 import type { MessageV2 } from "./message-v2"
 import type { Snapshot } from "../snapshot"
 import type { PermissionNext } from "../permission/next"
-import type { ProjectID } from "../project/schema"
-import type { SessionID, MessageID } from "./schema"
 import { Timestamps } from "../storage/schema.sql"
 
 type PartData = Omit<MessageV2.Part, "id" | "sessionID" | "messageID">
@@ -13,13 +11,12 @@ type InfoData = Omit<MessageV2.Info, "id" | "sessionID">
 export const SessionTable = sqliteTable(
   "session",
   {
-    id: text().$type<SessionID>().primaryKey(),
+    id: text().primaryKey(),
     project_id: text()
-      .$type<ProjectID>()
       .notNull()
       .references(() => ProjectTable.id, { onDelete: "cascade" }),
     workspace_id: text(),
-    parent_id: text().$type<SessionID>(),
+    parent_id: text(),
     slug: text().notNull(),
     directory: text().notNull(),
     title: text().notNull(),
@@ -29,7 +26,7 @@ export const SessionTable = sqliteTable(
     summary_deletions: integer(),
     summary_files: integer(),
     summary_diffs: text({ mode: "json" }).$type<Snapshot.FileDiff[]>(),
-    revert: text({ mode: "json" }).$type<{ messageID: MessageID; partID?: string; snapshot?: string; diff?: string }>(),
+    revert: text({ mode: "json" }).$type<{ messageID: string; partID?: string; snapshot?: string; diff?: string }>(),
     permission: text({ mode: "json" }).$type<PermissionNext.Ruleset>(),
     ...Timestamps,
     time_compacting: integer(),
@@ -45,9 +42,8 @@ export const SessionTable = sqliteTable(
 export const MessageTable = sqliteTable(
   "message",
   {
-    id: text().$type<MessageID>().primaryKey(),
+    id: text().primaryKey(),
     session_id: text()
-      .$type<SessionID>()
       .notNull()
       .references(() => SessionTable.id, { onDelete: "cascade" }),
     ...Timestamps,
@@ -61,10 +57,9 @@ export const PartTable = sqliteTable(
   {
     id: text().primaryKey(),
     message_id: text()
-      .$type<MessageID>()
       .notNull()
       .references(() => MessageTable.id, { onDelete: "cascade" }),
-    session_id: text().$type<SessionID>().notNull(),
+    session_id: text().notNull(),
     ...Timestamps,
     data: text({ mode: "json" }).notNull().$type<PartData>(),
   },
@@ -75,7 +70,6 @@ export const TodoTable = sqliteTable(
   "todo",
   {
     session_id: text()
-      .$type<SessionID>()
       .notNull()
       .references(() => SessionTable.id, { onDelete: "cascade" }),
     content: text().notNull(),

packages/opencode/src/session/status.ts

@@ -1,7 +1,6 @@
 import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import { Instance } from "@/project/instance"
-import { SessionID } from "./schema"
 import z from "zod"
 
 export namespace SessionStatus {
@@ -29,7 +28,7 @@ export namespace SessionStatus {
     Status: BusEvent.define(
       "session.status",
       z.object({
-        sessionID: SessionID.zod,
+        sessionID: z.string(),
         status: Info,
       }),
     ),
@@ -37,7 +36,7 @@ export namespace SessionStatus {
     Idle: BusEvent.define(
       "session.idle",
       z.object({
-        sessionID: SessionID.zod,
+        sessionID: z.string(),
       }),
     ),
   }
@@ -47,7 +46,7 @@ export namespace SessionStatus {
     return data
   })
 
-  export function get(sessionID: SessionID) {
+  export function get(sessionID: string) {
     return (
       state()[sessionID] ?? {
         type: "idle",
@@ -59,7 +58,7 @@ export namespace SessionStatus {
     return state()
   }
 
-  export function set(sessionID: SessionID, status: Info) {
+  export function set(sessionID: string, status: Info) {
     Bus.publish(Event.Status, {
       sessionID,
       status,

packages/opencode/src/session/summary.ts

@@ -4,7 +4,6 @@ import { Session } from "."
 
 import { MessageV2 } from "./message-v2"
 import { Identifier } from "@/id/id"
-import { SessionID, MessageID } from "./schema"
 import { Snapshot } from "@/snapshot"
 
 import { Storage } from "@/storage/storage"
@@ -69,8 +68,8 @@ export namespace SessionSummary {
 
   export const summarize = fn(
     z.object({
-      sessionID: SessionID.zod,
-      messageID: MessageID.zod,
+      sessionID: z.string(),
+      messageID: z.string(),
     }),
     async (input) => {
       const all = await Session.messages({ sessionID: input.sessionID })
@@ -81,7 +80,7 @@ export namespace SessionSummary {
     },
   )
 
-  async function summarizeSession(input: { sessionID: SessionID; messages: MessageV2.WithParts[] }) {
+  async function summarizeSession(input: { sessionID: string; messages: MessageV2.WithParts[] }) {
     const diffs = await computeDiff({ messages: input.messages })
     await Session.setSummary({
       sessionID: input.sessionID,
@@ -114,8 +113,8 @@ export namespace SessionSummary {
 
   export const diff = fn(
     z.object({
-      sessionID: SessionID.zod,
-      messageID: MessageID.zod.optional(),
+      sessionID: Identifier.schema("session"),
+      messageID: Identifier.schema("message").optional(),
     }),
     async (input) => {
       const diffs = await Storage.read<Snapshot.FileDiff[]>(["session_diff", input.sessionID]).catch(() => [])

packages/opencode/src/session/todo.ts

@@ -1,6 +1,5 @@
 import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
-import { SessionID } from "./schema"
 import z from "zod"
 import { Database, eq, asc } from "../storage/db"
 import { TodoTable } from "./session.sql"
@@ -19,13 +18,13 @@ export namespace Todo {
     Updated: BusEvent.define(
       "todo.updated",
       z.object({
-        sessionID: SessionID.zod,
+        sessionID: z.string(),
         todos: z.array(Info),
       }),
     ),
   }
 
-  export function update(input: { sessionID: SessionID; todos: Info[] }) {
+  export function update(input: { sessionID: string; todos: Info[] }) {
     Database.transaction((db) => {
       db.delete(TodoTable).where(eq(TodoTable.session_id, input.sessionID)).run()
       if (input.todos.length === 0) return
@@ -44,7 +43,7 @@ export namespace Todo {
     Bus.publish(Event.Updated, input)
   }
 
-  export function get(sessionID: SessionID) {
+  export function get(sessionID: string) {
     const rows = Database.use((db) =>
       db.select().from(TodoTable).where(eq(TodoTable.session_id, sessionID)).orderBy(asc(TodoTable.position)).all(),
     )

packages/opencode/src/share/share-next.ts

@@ -3,7 +3,6 @@ import { Account } from "@/account"
 import { Config } from "@/config/config"
 import { Provider } from "@/provider/provider"
 import { Session } from "@/session"
-import type { SessionID } from "@/session/schema"
 import { MessageV2 } from "@/session/message-v2"
 import { Database, eq } from "@/storage/db"
 import { SessionShareTable } from "./share.sql"
@@ -110,7 +109,7 @@ export namespace ShareNext {
     })
   }
 
-  export async function create(sessionID: SessionID) {
+  export async function create(sessionID: string) {
     if (disabled) return { id: "", url: "", secret: "" }
     log.info("creating share", { sessionID })
     const req = await request()
@@ -141,7 +140,7 @@ export namespace ShareNext {
     return result
   }
 
-  function get(sessionID: SessionID) {
+  function get(sessionID: string) {
     const row = Database.use((db) =>
       db.select().from(SessionShareTable).where(eq(SessionShareTable.session_id, sessionID)).get(),
     )
@@ -187,7 +186,7 @@ export namespace ShareNext {
   }
 
   const queue = new Map<string, { timeout: NodeJS.Timeout; data: Map<string, Data> }>()
-  async function sync(sessionID: SessionID, data: Data[]) {
+  async function sync(sessionID: string, data: Data[]) {
     if (disabled) return
     const existing = queue.get(sessionID)
     if (existing) {
@@ -226,7 +225,7 @@ export namespace ShareNext {
     queue.set(sessionID, { timeout, data: dataMap })
   }
 
-  export async function remove(sessionID: SessionID) {
+  export async function remove(sessionID: string) {
     if (disabled) return
     log.info("removing share", { sessionID })
     const share = get(sessionID)
@@ -249,7 +248,7 @@ export namespace ShareNext {
     Database.use((db) => db.delete(SessionShareTable).where(eq(SessionShareTable.session_id, sessionID)).run())
   }
 
-  async function fullSync(sessionID: SessionID) {
+  async function fullSync(sessionID: string) {
     log.info("full sync", { sessionID })
     const session = await Session.get(sessionID)
     const diffs = await Session.diff(sessionID)

packages/opencode/src/shell/shell.ts

@@ -9,9 +9,6 @@ import { setTimeout as sleep } from "node:timers/promises"
 const SIGKILL_TIMEOUT_MS = 200
 
 export namespace Shell {
-  const BLACKLIST = new Set(["fish", "nu"])
-  const LOGIN = new Set(["bash", "dash", "fish", "ksh", "sh", "zsh"])
-
   export async function killTree(proc: ChildProcess, opts?: { exited?: () => boolean }): Promise<void> {
     const pid = proc.pid
     if (!pid || opts?.exited?.()) return
@@ -42,29 +39,7 @@ export namespace Shell {
       }
     }
   }
-
-  function full(file: string) {
-    if (process.platform !== "win32") return file
-    const shell = Filesystem.windowsPath(file)
-    if (path.win32.dirname(shell) !== ".") return shell
-    return Bun.which(shell) || shell
-  }
-
-  function pick() {
-    const pwsh = Bun.which("pwsh")
-    if (pwsh) return pwsh
-    const powershell = Bun.which("powershell")
-    if (powershell) return powershell
-  }
-
-  function select(file: string | undefined, opts?: { acceptable?: boolean }) {
-    if (file && (!opts?.acceptable || !BLACKLIST.has(name(file)))) return full(file)
-    if (process.platform === "win32") {
-      const shell = pick()
-      if (shell) return shell
-    }
-    return fallback()
-  }
+  const BLACKLIST = new Set(["fish", "nu"])
 
   function fallback() {
     if (process.platform === "win32") {
@@ -84,16 +59,15 @@ export namespace Shell {
     return "/bin/sh"
   }
 
-  export function name(file: string) {
-    if (process.platform === "win32") return path.win32.parse(Filesystem.windowsPath(file)).name.toLowerCase()
-    return path.basename(file).toLowerCase()
-  }
+  export const preferred = lazy(() => {
+    const s = process.env.SHELL
+    if (s) return s
+    return fallback()
+  })
 
-  export function login(file: string) {
-    return LOGIN.has(name(file))
-  }
-
-  export const preferred = lazy(() => select(process.env.SHELL))
-
-  export const acceptable = lazy(() => select(process.env.SHELL, { acceptable: true }))
+  export const acceptable = lazy(() => {
+    const s = process.env.SHELL
+    if (s && !BLACKLIST.has(process.platform === "win32" ? path.win32.basename(s) : path.basename(s))) return s
+    return fallback()
+  })
 }