rm

gitlab integration poc
Merge branch 'dev' into add-model-reconciliation
2026-03-20 13:44:27 +00:00 · 2026-03-19 00:00:02 -05:00 · 2026-03-18 23:59:50 -05:00 · 2026-03-18 21:58:45 -05:00 · 2026-03-18 18:16:00 -05:00
134 changed files with 1396 additions and 2325 deletions
--- a/.opencode/.gitignore
+++ b/.opencode/.gitignore
@@ -1,6 +1,4 @@
-node_modules
-plans
-package.json
+plans/
 bun.lock
-.gitignore
-package-lock.json
+package.json
+package-lock.json
--- a/.opencode/agent/translator.md
+++ b/.opencode/agent/translator.md
@@ -1,7 +1,7 @@
 ---
 description: Translate content for a specified locale while preserving technical terms
 mode: subagent
-model: opencode/gpt-5.4
+model: opencode/gemini-3.1-pro
 ---

 You are a professional translator and localization specialist.
--- a/.opencode/tool/github-pr-search.ts
+++ b/.opencode/tool/github-pr-search.ts
@@ -1,5 +1,7 @@
 /// <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}`, {
    ...options,
@@ -22,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),
--- a/.opencode/tool/github-pr-search.txt
+++ b/.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.
--- a/.opencode/tool/github-triage.ts
+++ b/.opencode/tool/github-triage.ts
@@ -1,5 +1,7 @@
 /// <reference path="../env.d.ts" />
 import { tool } from "@opencode-ai/plugin"
+import DESCRIPTION from "./github-triage.txt"
+
 const TEAM = {
  desktop: ["adamdotdevin", "iamdavidhill", "Brendonovich", "nexxeln"],
  zen: ["fwang", "MrMushrooooom"],
@@ -38,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[]])
--- a/.opencode/tool/github-triage.txt
+++ b/.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.
--- a/README.md
+++ b/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.
--- a/bun.lock
+++ b/bun.lock
--- a/infra/console.ts
+++ b/infra/console.ts
@@ -122,7 +122,6 @@ const ZEN_LITE_PRICE = new sst.Linkable("ZEN_LITE_PRICE", {
  properties: {
    product: zenLiteProduct.id,
    price: zenLitePrice.id,
-    priceInr: 92900,
    firstMonth50Coupon: zenLiteCouponFirstMonth50.id,
  },
 })
--- a/package.json
+++ b/package.json
@@ -43,8 +43,8 @@
      "@tailwindcss/vite": "4.1.11",
      "diff": "8.0.2",
      "dompurify": "3.3.1",
-      "drizzle-kit": "1.0.0-beta.19-d95b7a4",
-      "drizzle-orm": "1.0.0-beta.19-d95b7a4",
+      "drizzle-kit": "1.0.0-beta.16-ea816b6",
+      "drizzle-orm": "1.0.0-beta.16-ea816b6",
      "effect": "4.0.0-beta.35",
      "ai": "5.0.124",
      "hono": "4.10.7",
--- a/packages/app/e2e/actions.ts
+++ b/packages/app/e2e/actions.ts
@@ -1,4 +1,3 @@
-import { base64Decode, base64Encode } from "@opencode-ai/util/encode"
 import { expect, type Locator, type Page } from "@playwright/test"
 import fs from "node:fs/promises"
 import os from "node:os"
@@ -362,30 +361,6 @@ export async function waitSlug(page: Page, skip: string[] = []) {
  return next
 }

-export async function resolveSlug(slug: string) {
-  const directory = base64Decode(slug)
-  if (!directory) throw new Error(`Failed to decode workspace slug: ${slug}`)
-  const resolved = await resolveDirectory(directory)
-  return { directory: resolved, slug: base64Encode(resolved), raw: slug }
-}
-
-export async function waitDir(page: Page, directory: string) {
-  const target = await resolveDirectory(directory)
-  await expect
-    .poll(
-      async () => {
-        const slug = slugFromUrl(page.url())
-        if (!slug) return ""
-        return resolveSlug(slug)
-          .then((item) => item.directory)
-          .catch(() => "")
-      },
-      { timeout: 45_000 },
-    )
-    .toBe(target)
-  return { directory: target, slug: base64Encode(target) }
-}
-
 export function sessionIDFromUrl(url: string) {
  const match = /\/session\/([^/?#]+)/.exec(url)
  return match?.[1]
--- a/packages/app/e2e/projects/projects-switch.spec.ts
+++ b/packages/app/e2e/projects/projects-switch.spec.ts
@@ -1,15 +1,7 @@
 import { base64Decode } from "@opencode-ai/util/encode"
 import type { Page } from "@playwright/test"
 import { test, expect } from "../fixtures"
-import {
-  defocus,
-  createTestProject,
-  cleanupTestProject,
-  openSidebar,
-  sessionIDFromUrl,
-  waitDir,
-  waitSlug,
-} from "../actions"
+import { defocus, createTestProject, cleanupTestProject, openSidebar, sessionIDFromUrl, waitSlug } from "../actions"
 import { projectSwitchSelector, promptSelector, workspaceItemSelector, workspaceNewSessionSelector } from "../selectors"
 import { dirSlug, resolveDirectory } from "../utils"

@@ -108,8 +100,11 @@ test("switching back to a project opens the latest workspace session", async ({
        await expect(btn).toBeVisible()
        await btn.click({ force: true })

+        // A new workspace can be discovered via a transient slug before the route and sidebar
+        // settle to the canonical workspace path on Windows, so interact with either and assert
+        // against the resolved workspace slug.
        await waitSlug(page)
-        await waitDir(page, space)
+        await expect(page).toHaveURL(new RegExp(`/${next}/session(?:[/?#]|$)`))

        // Create a session by sending a prompt
        const prompt = page.locator(promptSelector)
@@ -137,7 +132,6 @@ test("switching back to a project opens the latest workspace session", async ({
        await expect(rootButton).toBeVisible()
        await rootButton.click()

-        await waitDir(page, space)
        await expect.poll(() => sessionIDFromUrl(page.url()) ?? "").toBe(created)
        await expect(page).toHaveURL(new RegExp(`/session/${created}(?:[/?#]|$)`))
      },
--- a/packages/app/e2e/projects/workspace-new-session.spec.ts
+++ b/packages/app/e2e/projects/workspace-new-session.spec.ts
@@ -1,25 +1,18 @@
+import { base64Decode } from "@opencode-ai/util/encode"
 import type { Page } from "@playwright/test"
 import { test, expect } from "../fixtures"
-import { openSidebar, resolveSlug, sessionIDFromUrl, setWorkspacesEnabled, waitDir, waitSlug } from "../actions"
+import { openSidebar, sessionIDFromUrl, setWorkspacesEnabled, slugFromUrl, waitSlug } from "../actions"
 import { promptSelector, workspaceItemSelector, workspaceNewSessionSelector } from "../selectors"
 import { createSdk } from "../utils"

-function item(space: { slug: string; raw: string }) {
-  return `${workspaceItemSelector(space.slug)}, ${workspaceItemSelector(space.raw)}`
-}
-
-function button(space: { slug: string; raw: string }) {
-  return `${workspaceNewSessionSelector(space.slug)}, ${workspaceNewSessionSelector(space.raw)}`
-}
-
-async function waitWorkspaceReady(page: Page, space: { slug: string; raw: string }) {
+async function waitWorkspaceReady(page: Page, slug: string) {
  await openSidebar(page)
  await expect
    .poll(
      async () => {
-        const row = page.locator(item(space)).first()
+        const item = page.locator(workspaceItemSelector(slug)).first()
        try {
-          await row.hover({ timeout: 500 })
+          await item.hover({ timeout: 500 })
          return true
        } catch {
          return false
@@ -34,30 +27,29 @@ async function createWorkspace(page: Page, root: string, seen: string[]) {
  await openSidebar(page)
  await page.getByRole("button", { name: "New workspace" }).first().click()

-  const next = await resolveSlug(await waitSlug(page, [root, ...seen]))
-  await waitDir(page, next.directory)
+  const slug = await waitSlug(page, [root, ...seen])
+  const directory = base64Decode(slug)
+  if (!directory) throw new Error(`Failed to decode workspace slug: ${slug}`)
+  return { slug, directory }
+}
+
+async function openWorkspaceNewSession(page: Page, slug: string) {
+  await waitWorkspaceReady(page, slug)
+
+  const item = page.locator(workspaceItemSelector(slug)).first()
+  await item.hover()
+
+  const button = page.locator(workspaceNewSessionSelector(slug)).first()
+  await expect(button).toBeVisible()
+  await button.click({ force: true })
+
+  const next = await waitSlug(page)
+  await expect(page).toHaveURL(new RegExp(`/${next}/session(?:[/?#]|$)`))
  return next
 }

-async function openWorkspaceNewSession(page: Page, space: { slug: string; raw: string; directory: string }) {
-  await waitWorkspaceReady(page, space)
-
-  const row = page.locator(item(space)).first()
-  await row.hover()
-
-  const next = page.locator(button(space)).first()
-  await expect(next).toBeVisible()
-  await next.click({ force: true })
-
-  return waitDir(page, space.directory)
-}
-
-async function createSessionFromWorkspace(
-  page: Page,
-  space: { slug: string; raw: string; directory: string },
-  text: string,
-) {
-  const next = await openWorkspaceNewSession(page, space)
+async function createSessionFromWorkspace(page: Page, slug: string, text: string) {
+  const next = await openWorkspaceNewSession(page, slug)

  const prompt = page.locator(promptSelector)
  await expect(prompt).toBeVisible()
@@ -68,13 +60,13 @@ async function createSessionFromWorkspace(
  await expect.poll(async () => ((await prompt.textContent()) ?? "").trim()).toContain(text)
  await prompt.press("Enter")

-  await waitDir(page, next.directory)
+  await expect.poll(() => slugFromUrl(page.url())).toBe(next)
  await expect.poll(() => sessionIDFromUrl(page.url()) ?? "", { timeout: 30_000 }).not.toBe("")

  const sessionID = sessionIDFromUrl(page.url())
  if (!sessionID) throw new Error(`Failed to parse session id from url: ${page.url()}`)
-  await expect(page).toHaveURL(new RegExp(`/session/${sessionID}(?:[/?#]|$)`))
-  return { sessionID, slug: next.slug }
+  await expect(page).toHaveURL(new RegExp(`/${next}/session/${sessionID}(?:[/?#]|$)`))
+  return { sessionID, slug: next }
 }

 async function sessionDirectory(directory: string, sessionID: string) {
@@ -95,11 +87,11 @@ test("new sessions from sidebar workspace actions stay in selected workspace", a

    const first = await createWorkspace(page, root, [])
    trackDirectory(first.directory)
-    await waitWorkspaceReady(page, first)
+    await waitWorkspaceReady(page, first.slug)

    const second = await createWorkspace(page, root, [first.slug])
    trackDirectory(second.directory)
-    await waitWorkspaceReady(page, second)
+    await waitWorkspaceReady(page, second.slug)

    const firstSession = await createSessionFromWorkspace(page, first.slug, `workspace one ${Date.now()}`)
    trackSession(firstSession.sessionID, first.directory)
--- a/packages/app/e2e/projects/workspaces.spec.ts
+++ b/packages/app/e2e/projects/workspaces.spec.ts
@@ -1,7 +1,7 @@
+import { base64Decode } from "@opencode-ai/util/encode"
 import fs from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
-import { base64Decode } from "@opencode-ai/util/encode"
 import type { Page } from "@playwright/test"

 import { test, expect } from "../fixtures"
@@ -13,10 +13,8 @@ import {
  confirmDialog,
  openSidebar,
  openWorkspaceMenu,
-  resolveSlug,
  setWorkspacesEnabled,
  slugFromUrl,
-  waitDir,
  waitSlug,
 } from "../actions"
 import { dropdownMenuContentSelector, inlineInputSelector, workspaceItemSelector } from "../selectors"
@@ -29,15 +27,15 @@ async function setupWorkspaceTest(page: Page, project: { slug: string }) {
  await setWorkspacesEnabled(page, rootSlug, true)

  await page.getByRole("button", { name: "New workspace" }).first().click()
-  const next = await resolveSlug(await waitSlug(page, [rootSlug]))
-  await waitDir(page, next.directory)
+  const slug = await waitSlug(page, [rootSlug])
+  const dir = base64Decode(slug)

  await openSidebar(page)

  await expect
    .poll(
      async () => {
-        const item = page.locator(workspaceItemSelector(next.slug)).first()
+        const item = page.locator(workspaceItemSelector(slug)).first()
        try {
          await item.hover({ timeout: 500 })
          return true
@@ -49,7 +47,7 @@ async function setupWorkspaceTest(page: Page, project: { slug: string }) {
    )
    .toBe(true)

-  return { rootSlug, slug: next.slug, directory: next.directory }
+  return { rootSlug, slug, directory: dir }
 }

 test("can enable and disable workspaces from project menu", async ({ page, withProject }) => {
@@ -81,15 +79,15 @@ test("can create a workspace", async ({ page, withProject }) => {
    await expect(page.getByRole("button", { name: "New workspace" }).first()).toBeVisible()

    await page.getByRole("button", { name: "New workspace" }).first().click()
-    const next = await resolveSlug(await waitSlug(page, [slug]))
-    await waitDir(page, next.directory)
+    const workspaceSlug = await waitSlug(page, [slug])
+    const workspaceDir = base64Decode(workspaceSlug)

    await openSidebar(page)

    await expect
      .poll(
        async () => {
-          const item = page.locator(workspaceItemSelector(next.slug)).first()
+          const item = page.locator(workspaceItemSelector(workspaceSlug)).first()
          try {
            await item.hover({ timeout: 500 })
            return true
@@ -101,9 +99,9 @@ test("can create a workspace", async ({ page, withProject }) => {
      )
      .toBe(true)

-    await expect(page.locator(workspaceItemSelector(next.slug)).first()).toBeVisible()
+    await expect(page.locator(workspaceItemSelector(workspaceSlug)).first()).toBeVisible()

-    await cleanupTestProject(next.directory)
+    await cleanupTestProject(workspaceDir)
  })
 })

@@ -121,7 +119,7 @@ test("non-git projects keep workspace mode disabled", async ({ page, withProject

      await expect.poll(() => slugFromUrl(page.url()), { timeout: 30_000 }).not.toBe("")

-      const activeDir = await resolveSlug(slugFromUrl(page.url())).then((item) => item.directory)
+      const activeDir = base64Decode(slugFromUrl(page.url()))
      expect(path.basename(activeDir)).toContain("opencode-e2e-project-nongit-")

      await openSidebar(page)
@@ -333,9 +331,9 @@ test("can reorder workspaces by drag and drop", async ({ page, withProject }) =>
      for (const _ of [0, 1]) {
        const prev = slugFromUrl(page.url())
        await page.getByRole("button", { name: "New workspace" }).first().click()
-        const next = await resolveSlug(await waitSlug(page, [rootSlug, prev]))
-        await waitDir(page, next.directory)
-        workspaces.push(next)
+        const slug = await waitSlug(page, [rootSlug, prev])
+        const dir = base64Decode(slug)
+        workspaces.push({ slug, directory: dir })

        await openSidebar(page)
      }
--- a/packages/app/e2e/session/session-model-persistence.spec.ts
+++ b/packages/app/e2e/session/session-model-persistence.spec.ts
@@ -1,6 +1,7 @@
+import { base64Decode } from "@opencode-ai/util/encode"
 import type { Locator, Page } from "@playwright/test"
 import { test, expect } from "../fixtures"
-import { openSidebar, resolveSlug, sessionIDFromUrl, setWorkspacesEnabled, waitSessionIdle, waitSlug } from "../actions"
+import { openSidebar, sessionIDFromUrl, setWorkspacesEnabled, waitSessionIdle, waitSlug } from "../actions"
 import {
  promptAgentSelector,
  promptModelSelector,
@@ -223,9 +224,10 @@ async function createWorkspace(page: Page, root: string, seen: string[]) {
  await openSidebar(page)
  await page.getByRole("button", { name: "New workspace" }).first().click()

-  const next = await resolveSlug(await waitSlug(page, [root, ...seen]))
-  await expect(page).toHaveURL(new RegExp(`/${next.slug}/session(?:[/?#]|$)`))
-  return next
+  const slug = await waitSlug(page, [root, ...seen])
+  const directory = base64Decode(slug)
+  if (!directory) throw new Error(`Failed to decode workspace slug: ${slug}`)
+  return { slug, directory }
 }

 async function waitWorkspace(page: Page, slug: string) {
@@ -255,8 +257,8 @@ async function newWorkspaceSession(page: Page, slug: string) {
  await expect(button).toBeVisible()
  await button.click({ force: true })

-  const next = await resolveSlug(await waitSlug(page))
-  await expect(page).toHaveURL(new RegExp(`/${next.slug}/session(?:[/?#]|$)`))
+  const next = await waitSlug(page)
+  await expect(page).toHaveURL(new RegExp(`/${next}/session(?:[/?#]|$)`))
  await expect(page.locator(promptSelector)).toBeVisible()
  return currentDir(page)
 }
--- a/packages/app/src/app.tsx
+++ b/packages/app/src/app.tsx
@@ -46,13 +46,21 @@ import Layout from "@/pages/layout"
 import { ErrorPage } from "./pages/error"
 import { useCheckServerHealth } from "./utils/server-health"

-const HomeRoute = lazy(() => import("@/pages/home"))
+const Home = lazy(() => import("@/pages/home"))
 const Session = lazy(() => import("@/pages/session"))
 const Loading = () => <div class="size-full" />

+const HomeRoute = () => (
+  <Suspense fallback={<Loading />}>
+    <Home />
+  </Suspense>
+)
+
 const SessionRoute = () => (
  <SessionProviders>
-    <Session />
+    <Suspense fallback={<Loading />}>
+      <Session />
+    </Suspense>
  </SessionProviders>
 )

@@ -116,10 +124,8 @@ function SessionProviders(props: ParentProps) {
 function RouterRoot(props: ParentProps<{ appChildren?: JSX.Element }>) {
  return (
    <AppShellProviders>
-      <Suspense fallback={<Loading />}>
-        {props.appChildren}
-        {props.children}
-      </Suspense>
+      {props.appChildren}
+      {props.children}
    </AppShellProviders>
  )
 }
@@ -259,15 +265,6 @@ function ConnectionError(props: { onRetry?: () => void; onServerSelected?: (key:
  )
 }

-function ServerKey(props: ParentProps) {
-  const server = useServer()
-  return (
-    <Show when={server.key} keyed>
-      {props.children}
-    </Show>
-  )
-}
-
 export function AppInterface(props: {
  children?: JSX.Element
  defaultServer: ServerConnection.Key
@@ -278,22 +275,20 @@ export function AppInterface(props: {
  return (
    <ServerProvider defaultServer={props.defaultServer} servers={props.servers}>
      <ConnectionGate disableHealthCheck={props.disableHealthCheck}>
-        <ServerKey>
-          <GlobalSDKProvider>
-            <GlobalSyncProvider>
-              <Dynamic
-                component={props.router ?? Router}
-                root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>}
-              >
-                <Route path="/" component={HomeRoute} />
-                <Route path="/:dir" component={DirectoryLayout}>
-                  <Route path="/" component={SessionIndexRoute} />
-                  <Route path="/session/:id?" component={SessionRoute} />
-                </Route>
-              </Dynamic>
-            </GlobalSyncProvider>
-          </GlobalSDKProvider>
-        </ServerKey>
+        <GlobalSDKProvider>
+          <GlobalSyncProvider>
+            <Dynamic
+              component={props.router ?? Router}
+              root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>}
+            >
+              <Route path="/" component={HomeRoute} />
+              <Route path="/:dir" component={DirectoryLayout}>
+                <Route path="/" component={SessionIndexRoute} />
+                <Route path="/session/:id?" component={SessionRoute} />
+              </Route>
+            </Dynamic>
+          </GlobalSyncProvider>
+        </GlobalSDKProvider>
      </ConnectionGate>
    </ServerProvider>
  )
--- a/packages/app/src/components/dialog-connect-provider.tsx
+++ b/packages/app/src/components/dialog-connect-provider.tsx
@@ -15,6 +15,7 @@ import { Link } from "@/components/link"
 import { useLanguage } from "@/context/language"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { useGlobalSync } from "@/context/global-sync"
+import { usePlatform } from "@/context/platform"
 import { DialogSelectModel } from "./dialog-select-model"
 import { DialogSelectProvider } from "./dialog-select-provider"

@@ -22,6 +23,7 @@ export function DialogConnectProvider(props: { provider: string }) {
  const dialog = useDialog()
  const globalSync = useGlobalSync()
  const globalSDK = useGlobalSDK()
+  const platform = usePlatform()
  const language = useLanguage()

  const alive = { value: true }
@@ -47,14 +49,13 @@ export function DialogConnectProvider(props: { provider: string }) {
  const [store, setStore] = createStore({
    methodIndex: undefined as undefined | number,
    authorization: undefined as undefined | ProviderAuthAuthorization,
-    state: "pending" as undefined | "pending" | "complete" | "error" | "prompt",
+    state: "pending" as undefined | "pending" | "complete" | "error",
    error: undefined as string | undefined,
  })

  type Action =
    | { type: "method.select"; index: number }
    | { type: "method.reset" }
-    | { type: "auth.prompt" }
    | { type: "auth.pending" }
    | { type: "auth.complete"; authorization: ProviderAuthAuthorization }
    | { type: "auth.error"; error: string }
@@ -76,11 +77,6 @@ export function DialogConnectProvider(props: { provider: string }) {
          draft.error = undefined
          return
        }
-        if (action.type === "auth.prompt") {
-          draft.state = "prompt"
-          draft.error = undefined
-          return
-        }
        if (action.type === "auth.pending") {
          draft.state = "pending"
          draft.error = undefined
@@ -124,7 +120,7 @@ export function DialogConnectProvider(props: { provider: string }) {
    return fallback
  }

-  async function selectMethod(index: number, inputs?: Record<string, string>) {
+  async function selectMethod(index: number) {
    if (timer.current !== undefined) {
      clearTimeout(timer.current)
      timer.current = undefined
@@ -134,10 +130,6 @@ export function DialogConnectProvider(props: { provider: string }) {
    dispatch({ type: "method.select", index })

    if (method.type === "oauth") {
-      if (method.prompts?.length && !inputs) {
-        dispatch({ type: "auth.prompt" })
-        return
-      }
      dispatch({ type: "auth.pending" })
      const start = Date.now()
      await globalSDK.client.provider.oauth
@@ -145,7 +137,6 @@ export function DialogConnectProvider(props: { provider: string }) {
          {
            providerID: props.provider,
            method: index,
-            inputs,
          },
          { throwOnError: true },
        )
@@ -172,122 +163,6 @@ export function DialogConnectProvider(props: { provider: string }) {
    }
  }

-  function OAuthPromptsView() {
-    const [formStore, setFormStore] = createStore({
-      value: {} as Record<string, string>,
-      index: 0,
-    })
-
-    const prompts = createMemo(() => method()?.prompts ?? [])
-    const matches = (prompt: NonNullable<ReturnType<typeof prompts>[number]>, value: Record<string, string>) => {
-      if (!prompt.when) return true
-      const actual = value[prompt.when.key]
-      if (actual === undefined) return false
-      return prompt.when.op === "eq" ? actual === prompt.when.value : actual !== prompt.when.value
-    }
-    const current = createMemo(() => {
-      const all = prompts()
-      const index = all.findIndex((prompt, index) => index >= formStore.index && matches(prompt, formStore.value))
-      if (index === -1) return
-      return {
-        index,
-        prompt: all[index],
-      }
-    })
-    const valid = createMemo(() => {
-      const item = current()
-      if (!item || item.prompt.type !== "text") return false
-      const value = formStore.value[item.prompt.key] ?? ""
-      return value.trim().length > 0
-    })
-
-    async function next(index: number, value: Record<string, string>) {
-      if (store.methodIndex === undefined) return
-      const next = prompts().findIndex((prompt, i) => i > index && matches(prompt, value))
-      if (next !== -1) {
-        setFormStore("index", next)
-        return
-      }
-      await selectMethod(store.methodIndex, value)
-    }
-
-    async function handleSubmit(e: SubmitEvent) {
-      e.preventDefault()
-      const item = current()
-      if (!item || item.prompt.type !== "text") return
-      if (!valid()) return
-      await next(item.index, formStore.value)
-    }
-
-    const item = () => current()
-    const text = createMemo(() => {
-      const prompt = item()?.prompt
-      if (!prompt || prompt.type !== "text") return
-      return prompt
-    })
-    const select = createMemo(() => {
-      const prompt = item()?.prompt
-      if (!prompt || prompt.type !== "select") return
-      return prompt
-    })
-
-    return (
-      <form onSubmit={handleSubmit} class="flex flex-col items-start gap-4">
-        <Switch>
-          <Match when={item()?.prompt.type === "text"}>
-            <TextField
-              type="text"
-              label={text()?.message ?? ""}
-              placeholder={text()?.placeholder}
-              value={text() ? (formStore.value[text()!.key] ?? "") : ""}
-              onChange={(value) => {
-                const prompt = text()
-                if (!prompt) return
-                setFormStore("value", prompt.key, value)
-              }}
-            />
-            <Button class="w-auto" type="submit" size="large" variant="primary" disabled={!valid()}>
-              {language.t("common.continue")}
-            </Button>
-          </Match>
-          <Match when={item()?.prompt.type === "select"}>
-            <div class="w-full flex flex-col gap-1.5">
-              <div class="text-14-regular text-text-base">{select()?.message}</div>
-              <div>
-                <List
-                  items={select()?.options ?? []}
-                  key={(x) => x.value}
-                  current={select()?.options.find((x) => x.value === formStore.value[select()!.key])}
-                  onSelect={(value) => {
-                    if (!value) return
-                    const prompt = select()
-                    if (!prompt) return
-                    const nextValue = {
-                      ...formStore.value,
-                      [prompt.key]: value.value,
-                    }
-                    setFormStore("value", prompt.key, value.value)
-                    void next(item()!.index, nextValue)
-                  }}
-                >
-                  {(option) => (
-                    <div class="w-full flex items-center gap-x-2">
-                      <div class="w-4 h-2 rounded-[1px] bg-input-base shadow-xs-border-base flex items-center justify-center">
-                        <div class="w-2.5 h-0.5 ml-0 bg-icon-strong-base hidden" data-slot="list-item-extra-icon" />
-                      </div>
-                      <span>{option.label}</span>
-                      <span class="text-14-regular text-text-weak">{option.hint}</span>
-                    </div>
-                  )}
-                </List>
-              </div>
-            </div>
-          </Match>
-        </Switch>
-      </form>
-    )
-  }
-
  let listRef: ListRef | undefined
  function handleKey(e: KeyboardEvent) {
    if (e.key === "Enter" && e.target instanceof HTMLInputElement) {
@@ -426,7 +301,7 @@ export function DialogConnectProvider(props: { provider: string }) {
            error={formStore.error}
          />
          <Button class="w-auto" type="submit" size="large" variant="primary">
-            {language.t("common.continue")}
+            {language.t("common.submit")}
          </Button>
        </form>
      </div>
@@ -439,6 +314,12 @@ export function DialogConnectProvider(props: { provider: string }) {
      error: undefined as string | undefined,
    })

+    onMount(() => {
+      if (store.authorization?.method === "code" && store.authorization?.url) {
+        platform.openLink(store.authorization.url)
+      }
+    })
+
    async function handleSubmit(e: SubmitEvent) {
      e.preventDefault()

@@ -487,7 +368,7 @@ export function DialogConnectProvider(props: { provider: string }) {
            error={formStore.error}
          />
          <Button class="w-auto" type="submit" size="large" variant="primary">
-            {language.t("common.continue")}
+            {language.t("common.submit")}
          </Button>
        </form>
      </div>
@@ -505,6 +386,10 @@ export function DialogConnectProvider(props: { provider: string }) {

    onMount(() => {
      void (async () => {
+        if (store.authorization?.url) {
+          platform.openLink(store.authorization.url)
+        }
+
        const result = await globalSDK.client.provider.oauth
          .callback({
            providerID: props.provider,
@@ -585,9 +470,6 @@ export function DialogConnectProvider(props: { provider: string }) {
                  </div>
                </div>
              </Match>
-              <Match when={store.state === "prompt"}>
-                <OAuthPromptsView />
-              </Match>
              <Match when={store.state === "error"}>
                <div class="text-14-regular text-text-base">
                  <div class="flex items-center gap-x-2">
--- a/packages/app/src/components/dialog-select-server.tsx
+++ b/packages/app/src/components/dialog-select-server.tsx
@@ -291,8 +291,8 @@ export function DialogSelectServer() {
      navigate("/")
      return
    }
+    server.setActive(ServerConnection.key(conn))
    navigate("/")
-    queueMicrotask(() => server.setActive(ServerConnection.key(conn)))
  }

  const handleAddChange = (value: string) => {
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -1241,20 +1241,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

    // Note: Shift+Enter is handled earlier, before IME check
    if (event.key === "Enter" && !event.shiftKey) {
-      event.preventDefault()
-      if (event.repeat) return
-      if (
-        working() &&
-        prompt
-          .current()
-          .map((part) => ("content" in part ? part.content : ""))
-          .join("")
-          .trim().length === 0 &&
-        imageAttachments().length === 0 &&
-        commentCount() === 0
-      ) {
-        return
-      }
      handleSubmit(event)
    }
  }
--- a/packages/app/src/components/status-popover.tsx
+++ b/packages/app/src/components/status-popover.tsx
@@ -277,8 +277,8 @@ export function StatusPopover() {
                        aria-disabled={isBlocked()}
                        onClick={() => {
                          if (isBlocked()) return
+                          server.setActive(key)
                          navigate("/")
-                          queueMicrotask(() => server.setActive(key))
                        }}
                      >
                        <ServerHealthIndicator health={health[key]} />
--- a/packages/app/src/components/terminal.tsx
+++ b/packages/app/src/components/terminal.tsx
@@ -165,12 +165,6 @@ export const Terminal = (props: TerminalProps) => {
  const theme = useTheme()
  const language = useLanguage()
  const server = useServer()
-  const directory = sdk.directory
-  const client = sdk.client
-  const url = sdk.url
-  const auth = server.current?.http
-  const username = auth?.username ?? "opencode"
-  const password = auth?.password ?? ""
  let container!: HTMLDivElement
  const [local, others] = splitProps(props, ["pty", "class", "classList", "autoFocus", "onConnect", "onConnectError"])
  const id = local.pty.id
@@ -221,7 +215,7 @@ export const Terminal = (props: TerminalProps) => {
  }

  const pushSize = (cols: number, rows: number) => {
-    return client.pty
+    return sdk.client.pty
      .update({
        ptyID: id,
        size: { cols, rows },
@@ -480,7 +474,7 @@ export const Terminal = (props: TerminalProps) => {
      }

      const gone = () =>
-        client.pty
+        sdk.client.pty
          .get({ ptyID: id })
          .then(() => false)
          .catch((err) => {
@@ -512,14 +506,14 @@ export const Terminal = (props: TerminalProps) => {
        if (disposed) return
        drop?.()

-        const next = new URL(url + `/pty/${id}/connect`)
-        next.searchParams.set("directory", directory)
-        next.searchParams.set("cursor", String(seek))
-        next.protocol = next.protocol === "https:" ? "wss:" : "ws:"
-        next.username = username
-        next.password = password
+        const url = new URL(sdk.url + `/pty/${id}/connect`)
+        url.searchParams.set("directory", sdk.directory)
+        url.searchParams.set("cursor", String(seek))
+        url.protocol = url.protocol === "https:" ? "wss:" : "ws:"
+        url.username = server.current?.http.username ?? "opencode"
+        url.password = server.current?.http.password ?? ""

-        const socket = new WebSocket(next)
+        const socket = new WebSocket(url)
        socket.binaryType = "arraybuffer"
        ws = socket

--- a/packages/app/src/context/terminal.tsx
+++ b/packages/app/src/context/terminal.tsx
@@ -185,60 +185,6 @@ function createWorkspaceTerminalSession(sdk: ReturnType<typeof useSDK>, dir: str
  })
  onCleanup(unsub)

-  const update = (client: ReturnType<typeof useSDK>["client"], pty: Partial<LocalPTY> & { id: string }) => {
-    const index = store.all.findIndex((x) => x.id === pty.id)
-    const previous = index >= 0 ? store.all[index] : undefined
-    if (index >= 0) {
-      setStore("all", index, (item) => ({ ...item, ...pty }))
-    }
-    client.pty
-      .update({
-        ptyID: pty.id,
-        title: pty.title,
-        size: pty.cols && pty.rows ? { rows: pty.rows, cols: pty.cols } : undefined,
-      })
-      .catch((error: unknown) => {
-        if (previous) {
-          const currentIndex = store.all.findIndex((item) => item.id === pty.id)
-          if (currentIndex >= 0) setStore("all", currentIndex, previous)
-        }
-        console.error("Failed to update terminal", error)
-      })
-  }
-
-  const clone = async (client: ReturnType<typeof useSDK>["client"], id: string) => {
-    const index = store.all.findIndex((x) => x.id === id)
-    const pty = store.all[index]
-    if (!pty) return
-    const next = await client.pty
-      .create({
-        title: pty.title,
-      })
-      .catch((error: unknown) => {
-        console.error("Failed to clone terminal", error)
-        return undefined
-      })
-    if (!next?.data) return
-
-    const active = store.active === pty.id
-
-    batch(() => {
-      setStore("all", index, {
-        id: next.data.id,
-        title: next.data.title ?? pty.title,
-        titleNumber: pty.titleNumber,
-        buffer: undefined,
-        cursor: undefined,
-        scrollY: undefined,
-        rows: undefined,
-        cols: undefined,
-      })
-      if (active) {
-        setStore("active", next.data.id)
-      }
-    })
-  }
-
  return {
    ready,
    all: createMemo(() => store.all),
@@ -270,7 +216,24 @@ function createWorkspaceTerminalSession(sdk: ReturnType<typeof useSDK>, dir: str
        })
    },
    update(pty: Partial<LocalPTY> & { id: string }) {
-      update(sdk.client, pty)
+      const index = store.all.findIndex((x) => x.id === pty.id)
+      const previous = index >= 0 ? store.all[index] : undefined
+      if (index >= 0) {
+        setStore("all", index, (item) => ({ ...item, ...pty }))
+      }
+      sdk.client.pty
+        .update({
+          ptyID: pty.id,
+          title: pty.title,
+          size: pty.cols && pty.rows ? { rows: pty.rows, cols: pty.cols } : undefined,
+        })
+        .catch((error: unknown) => {
+          if (previous) {
+            const currentIndex = store.all.findIndex((item) => item.id === pty.id)
+            if (currentIndex >= 0) setStore("all", currentIndex, previous)
+          }
+          console.error("Failed to update terminal", error)
+        })
    },
    trim(id: string) {
      const index = store.all.findIndex((x) => x.id === id)
@@ -285,23 +248,37 @@ function createWorkspaceTerminalSession(sdk: ReturnType<typeof useSDK>, dir: str
      })
    },
    async clone(id: string) {
-      await clone(sdk.client, id)
-    },
-    bind() {
-      const client = sdk.client
-      return {
-        trim(id: string) {
-          const index = store.all.findIndex((x) => x.id === id)
-          if (index === -1) return
-          setStore("all", index, (pty) => trimTerminal(pty))
-        },
-        update(pty: Partial<LocalPTY> & { id: string }) {
-          update(client, pty)
-        },
-        async clone(id: string) {
-          await clone(client, id)
-        },
-      }
+      const index = store.all.findIndex((x) => x.id === id)
+      const pty = store.all[index]
+      if (!pty) return
+      const clone = await sdk.client.pty
+        .create({
+          title: pty.title,
+        })
+        .catch((error: unknown) => {
+          console.error("Failed to clone terminal", error)
+          return undefined
+        })
+      if (!clone?.data) return
+
+      const active = store.active === pty.id
+
+      batch(() => {
+        setStore("all", index, {
+          id: clone.data.id,
+          title: clone.data.title ?? pty.title,
+          titleNumber: pty.titleNumber,
+          // New PTY process, so start clean.
+          buffer: undefined,
+          cursor: undefined,
+          scrollY: undefined,
+          rows: undefined,
+          cols: undefined,
+        })
+        if (active) {
+          setStore("active", clone.data.id)
+        }
+      })
    },
    open(id: string) {
      setStore("active", id)
@@ -426,7 +403,6 @@ export const { use: useTerminal, provider: TerminalProvider } = createSimpleCont
      trim: (id: string) => workspace().trim(id),
      trimAll: () => workspace().trimAll(),
      clone: (id: string) => workspace().clone(id),
-      bind: () => workspace(),
      open: (id: string) => workspace().open(id),
      close: (id: string) => workspace().close(id),
      move: (id: string, to: number) => workspace().move(id, to),
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -204,7 +204,6 @@ export const dict = {
  "common.cancel": "إلغاء",
  "common.connect": "اتصال",
  "common.disconnect": "قطع الاتصال",
-  "common.continue": "إرسال",
  "common.submit": "إرسال",
  "common.save": "حفظ",
  "common.saving": "جارٍ الحفظ...",
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -204,7 +204,6 @@ export const dict = {
  "common.cancel": "Cancelar",
  "common.connect": "Conectar",
  "common.disconnect": "Desconectar",
-  "common.continue": "Enviar",
  "common.submit": "Enviar",
  "common.save": "Salvar",
  "common.saving": "Salvando...",
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -221,7 +221,6 @@ export const dict = {
  "common.cancel": "Otkaži",
  "common.connect": "Poveži",
  "common.disconnect": "Prekini vezu",
-  "common.continue": "Pošalji",
  "common.submit": "Pošalji",
  "common.save": "Sačuvaj",
  "common.saving": "Čuvanje...",
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -219,7 +219,6 @@ export const dict = {
  "common.cancel": "Annuller",
  "common.connect": "Forbind",
  "common.disconnect": "Frakobl",
-  "common.continue": "Indsend",
  "common.submit": "Indsend",
  "common.save": "Gem",
  "common.saving": "Gemmer...",
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -209,7 +209,6 @@ export const dict = {
  "common.cancel": "Abbrechen",
  "common.connect": "Verbinden",
  "common.disconnect": "Trennen",
-  "common.continue": "Absenden",
  "common.submit": "Absenden",
  "common.save": "Speichern",
  "common.saving": "Speichert...",
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -221,7 +221,6 @@ export const dict = {
  "common.open": "Open",
  "common.connect": "Connect",
  "common.disconnect": "Disconnect",
-  "common.continue": "Continue",
  "common.submit": "Submit",
  "common.save": "Save",
  "common.saving": "Saving...",
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -220,7 +220,6 @@ export const dict = {
  "common.cancel": "Cancelar",
  "common.connect": "Conectar",
  "common.disconnect": "Desconectar",
-  "common.continue": "Enviar",
  "common.submit": "Enviar",
  "common.save": "Guardar",
  "common.saving": "Guardando...",
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -204,7 +204,6 @@ export const dict = {
  "common.cancel": "Annuler",
  "common.connect": "Connecter",
  "common.disconnect": "Déconnecter",
-  "common.continue": "Soumettre",
  "common.submit": "Soumettre",
  "common.save": "Enregistrer",
  "common.saving": "Enregistrement...",
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -203,7 +203,6 @@ export const dict = {
  "common.cancel": "キャンセル",
  "common.connect": "接続",
  "common.disconnect": "切断",
-  "common.continue": "送信",
  "common.submit": "送信",
  "common.save": "保存",
  "common.saving": "保存中...",
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -207,7 +207,6 @@ export const dict = {
  "common.cancel": "취소",
  "common.connect": "연결",
  "common.disconnect": "연결 해제",
-  "common.continue": "제출",
  "common.submit": "제출",
  "common.save": "저장",
  "common.saving": "저장 중...",
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -223,7 +223,6 @@ export const dict = {
  "common.cancel": "Avbryt",
  "common.connect": "Koble til",
  "common.disconnect": "Koble fra",
-  "common.continue": "Send inn",
  "common.submit": "Send inn",
  "common.save": "Lagre",
  "common.saving": "Lagrer...",
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -205,7 +205,6 @@ export const dict = {
  "common.cancel": "Anuluj",
  "common.connect": "Połącz",
  "common.disconnect": "Rozłącz",
-  "common.continue": "Prześlij",
  "common.submit": "Prześlij",
  "common.save": "Zapisz",
  "common.saving": "Zapisywanie...",
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -220,7 +220,6 @@ export const dict = {
  "common.cancel": "Отмена",
  "common.connect": "Подключить",
  "common.disconnect": "Отключить",
-  "common.continue": "Отправить",
  "common.submit": "Отправить",
  "common.save": "Сохранить",
  "common.saving": "Сохранение...",
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -220,7 +220,6 @@ export const dict = {
  "common.cancel": "ยกเลิก",
  "common.connect": "เชื่อมต่อ",
  "common.disconnect": "ยกเลิกการเชื่อมต่อ",
-  "common.continue": "ส่ง",
  "common.submit": "ส่ง",
  "common.save": "บันทึก",
  "common.saving": "กำลังบันทึก...",
--- a/packages/app/src/i18n/tr.ts
+++ b/packages/app/src/i18n/tr.ts
@@ -225,7 +225,6 @@ export const dict = {
  "common.cancel": "İptal",
  "common.connect": "Bağlan",
  "common.disconnect": "Bağlantı Kes",
-  "common.continue": "Gönder",
  "common.submit": "Gönder",
  "common.save": "Kaydet",
  "common.saving": "Kaydediliyor...",
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -242,7 +242,6 @@ export const dict = {
  "common.cancel": "取消",
  "common.connect": "连接",
  "common.disconnect": "断开连接",
-  "common.continue": "提交",
  "common.submit": "提交",
  "common.save": "保存",
  "common.saving": "保存中...",
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -220,7 +220,6 @@ export const dict = {
  "common.cancel": "取消",
  "common.connect": "連線",
  "common.disconnect": "中斷連線",
-  "common.continue": "提交",
  "common.submit": "提交",
  "common.save": "儲存",
  "common.saving": "儲存中...",
--- a/packages/app/src/pages/directory-layout.tsx
+++ b/packages/app/src/pages/directory-layout.tsx
@@ -1,15 +1,16 @@
-import { DataProvider } from "@opencode-ai/ui/context"
-import { showToast } from "@opencode-ai/ui/toast"
-import { base64Encode } from "@opencode-ai/util/encode"
+import { batch, createEffect, createMemo, Show, type ParentProps } from "solid-js"
+import { createStore } from "solid-js/store"
 import { useLocation, useNavigate, useParams } from "@solidjs/router"
-import { createMemo, createResource, type ParentProps, Show } from "solid-js"
-import { useGlobalSDK } from "@/context/global-sdk"
-import { useLanguage } from "@/context/language"
-import { LocalProvider } from "@/context/local"
 import { SDKProvider } from "@/context/sdk"
 import { SyncProvider, useSync } from "@/context/sync"
-import { decode64 } from "@/utils/base64"
+import { LocalProvider } from "@/context/local"
+import { useGlobalSDK } from "@/context/global-sdk"

+import { DataProvider } from "@opencode-ai/ui/context"
+import { base64Encode } from "@opencode-ai/util/encode"
+import { decode64 } from "@/utils/base64"
+import { showToast } from "@opencode-ai/ui/toast"
+import { useLanguage } from "@/context/language"
 function DirectoryDataProvider(props: ParentProps<{ directory: string }>) {
  const navigate = useNavigate()
  const sync = useSync()
@@ -29,53 +30,57 @@ function DirectoryDataProvider(props: ParentProps<{ directory: string }>) {

 export default function Layout(props: ParentProps) {
  const params = useParams()
+  const navigate = useNavigate()
  const location = useLocation()
  const language = useLanguage()
  const globalSDK = useGlobalSDK()
-  const navigate = useNavigate()
-  let invalid = ""
+  const directory = createMemo(() => decode64(params.dir) ?? "")
+  const [state, setState] = createStore({ invalid: "", resolved: "" })

-  const [resolved] = createResource(
-    () => {
-      if (params.dir) return [location.pathname, params.dir] as const
-    },
-    async ([pathname, b64Dir]) => {
-      const directory = decode64(b64Dir)
+  createEffect(() => {
+    if (!params.dir) return
+    const raw = directory()
+    if (!raw) {
+      if (state.invalid === params.dir) return
+      setState("invalid", params.dir)
+      showToast({
+        variant: "error",
+        title: language.t("common.requestFailed"),
+        description: language.t("directory.error.invalidUrl"),
+      })
+      navigate("/", { replace: true })
+      return
+    }

-      if (!directory) {
-        if (invalid === params.dir) return
-        invalid = b64Dir
-        showToast({
-          variant: "error",
-          title: language.t("common.requestFailed"),
-          description: language.t("directory.error.invalidUrl"),
+    const current = params.dir
+    globalSDK
+      .createClient({
+        directory: raw,
+        throwOnError: true,
+      })
+      .path.get()
+      .then((x) => {
+        if (params.dir !== current) return
+        const next = x.data?.directory ?? raw
+        batch(() => {
+          setState("invalid", "")
+          setState("resolved", next)
        })
-        navigate("/", { replace: true })
-        return
-      }
-
-      return await globalSDK
-        .createClient({
-          directory,
-          throwOnError: true,
+        if (next === raw) return
+        const path = location.pathname.slice(current.length + 1)
+        navigate(`/${base64Encode(next)}${path}${location.search}${location.hash}`, { replace: true })
+      })
+      .catch(() => {
+        if (params.dir !== current) return
+        batch(() => {
+          setState("invalid", "")
+          setState("resolved", raw)
        })
-        .path.get()
-        .then((x) => {
-          const next = x.data?.directory ?? directory
-          invalid = ""
-          if (next === directory) return next
-          const path = pathname.slice(b64Dir.length + 1)
-          navigate(`/${base64Encode(next)}${path}${location.search}${location.hash}`, { replace: true })
-        })
-        .catch(() => {
-          invalid = ""
-          return directory
-        })
-    },
-  )
+      })
+  })

  return (
-    <Show when={resolved()} keyed>
+    <Show when={state.resolved} keyed>
      {(resolved) => (
        <SDKProvider directory={() => resolved}>
          <SyncProvider>
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -543,14 +543,13 @@ export default function Layout(props: ParentProps) {
  const currentProject = createMemo(() => {
    const directory = currentDir()
    if (!directory) return
-    const key = workspaceKey(directory)

    const projects = layout.projects.list()

-    const sandbox = projects.find((p) => p.sandboxes?.some((item) => workspaceKey(item) === key))
+    const sandbox = projects.find((p) => p.sandboxes?.includes(directory))
    if (sandbox) return sandbox

-    const direct = projects.find((p) => workspaceKey(p.worktree) === key)
+    const direct = projects.find((p) => p.worktree === directory)
    if (direct) return direct

    const [child] = globalSync.child(directory, { bootstrap: false })
@@ -631,11 +630,7 @@ export default function Layout(props: ParentProps) {
    const projects = layout.projects.list()
    for (const [directory, expanded] of Object.entries(store.workspaceExpanded)) {
      if (!expanded) continue
-      const key = workspaceKey(directory)
-      const project = projects.find(
-        (item) =>
-          workspaceKey(item.worktree) === key || item.sandboxes?.some((sandbox) => workspaceKey(sandbox) === key),
-      )
+      const project = projects.find((item) => item.worktree === directory || item.sandboxes?.includes(directory))
      if (!project) continue
      if (project.vcs === "git" && layout.sidebar.workspaces(project.worktree)()) continue
      setStore("workspaceExpanded", directory, false)
@@ -1160,17 +1155,13 @@ export default function Layout(props: ParentProps) {
  }

  function projectRoot(directory: string) {
-    const key = workspaceKey(directory)
    const project = layout.projects
      .list()
-      .find(
-        (item) =>
-          workspaceKey(item.worktree) === key || item.sandboxes?.some((sandbox) => workspaceKey(sandbox) === key),
-      )
+      .find((item) => item.worktree === directory || item.sandboxes?.includes(directory))
    if (project) return project.worktree

    const known = Object.entries(store.workspaceOrder).find(
-      ([root, dirs]) => workspaceKey(root) === key || dirs.some((item) => workspaceKey(item) === key),
+      ([root, dirs]) => root === directory || dirs.includes(directory),
    )
    if (known) return known[0]

@@ -1186,6 +1177,13 @@ export default function Layout(props: ParentProps) {
    return currentProject()?.worktree ?? projectRoot(directory)
  }

+  function touchProjectRoute() {
+    const root = currentProject()?.worktree
+    if (!root) return
+    if (server.projects.last() !== root) server.projects.touch(root)
+    return root
+  }
+
  function rememberSessionRoute(directory: string, id: string, root = activeProjectRoot(directory)) {
    setStore("lastProjectSession", root, { directory, id, at: Date.now() })
    return root
@@ -1349,9 +1347,8 @@ export default function Layout(props: ParentProps) {

  function closeProject(directory: string) {
    const list = layout.projects.list()
-    const key = workspaceKey(directory)
-    const index = list.findIndex((x) => workspaceKey(x.worktree) === key)
-    const active = workspaceKey(currentProject()?.worktree ?? "") === key
+    const index = list.findIndex((x) => x.worktree === directory)
+    const active = currentProject()?.worktree === directory
    if (index === -1) return
    const next = list[index + 1]

@@ -1686,55 +1683,38 @@ export default function Layout(props: ParentProps) {
  const activeRoute = {
    session: "",
    sessionProject: "",
-    directory: "",
  }

  createEffect(
    on(
-      () => {
-        const dir = params.dir
-        const directory = dir ? decode64(dir) : undefined
-        const resolved = directory ? globalSync.child(directory, { bootstrap: false })[0].path.directory : ""
-        return [pageReady(), dir, params.id, currentProject()?.worktree, directory, resolved] as const
-      },
-      ([ready, dir, id, root, directory, resolved]) => {
-        if (!ready || !dir || !directory) {
+      () => [pageReady(), params.dir, params.id, currentProject()?.worktree] as const,
+      ([ready, dir, id]) => {
+        if (!ready || !dir) {
          activeRoute.session = ""
          activeRoute.sessionProject = ""
-          activeRoute.directory = ""
          return
        }

+        const directory = decode64(dir)
+        if (!directory) return
+
+        const root = touchProjectRoute() ?? activeProjectRoot(directory)
+
        if (!id) {
          activeRoute.session = ""
          activeRoute.sessionProject = ""
-          activeRoute.directory = ""
          return
        }

-        const next = resolved || directory
        const session = `${dir}/${id}`
-
-        if (!root) {
+        if (session !== activeRoute.session) {
          activeRoute.session = session
-          activeRoute.directory = next
-          activeRoute.sessionProject = ""
-          return
-        }
-
-        if (server.projects.last() !== root) server.projects.touch(root)
-
-        const changed = session !== activeRoute.session || next !== activeRoute.directory
-        if (changed) {
-          activeRoute.session = session
-          activeRoute.directory = next
-          activeRoute.sessionProject = syncSessionRoute(next, id, root)
+          activeRoute.sessionProject = syncSessionRoute(directory, id, root)
          return
        }

        if (root === activeRoute.sessionProject) return
-        activeRoute.directory = next
-        activeRoute.sessionProject = rememberSessionRoute(next, id, root)
+        activeRoute.sessionProject = rememberSessionRoute(directory, id, root)
      },
    ),
  )
@@ -1798,13 +1778,8 @@ export default function Layout(props: ParentProps) {
    const local = project.worktree
    const dirs = [local, ...(project.sandboxes ?? [])]
    const active = currentProject()
-    const directory = workspaceKey(active?.worktree ?? "") === workspaceKey(project.worktree) ? currentDir() : undefined
-    const extra =
-      directory &&
-      workspaceKey(directory) !== workspaceKey(local) &&
-      !dirs.some((item) => workspaceKey(item) === workspaceKey(directory))
-        ? directory
-        : undefined
+    const directory = active?.worktree === project.worktree ? currentDir() : undefined
+    const extra = directory && directory !== local && !dirs.includes(directory) ? directory : undefined
    const pending = extra ? WorktreeState.get(extra)?.status === "pending" : false

    const ordered = effectiveWorkspaceOrder(local, dirs, store.workspaceOrder[project.worktree])
--- a/packages/app/src/pages/layout/helpers.test.ts
+++ b/packages/app/src/pages/layout/helpers.test.ts
@@ -104,14 +104,14 @@ describe("layout deep links", () => {
 describe("layout workspace helpers", () => {
  test("normalizes trailing slash in workspace key", () => {
    expect(workspaceKey("/tmp/demo///")).toBe("/tmp/demo")
-    expect(workspaceKey("C:\\tmp\\demo\\\\")).toBe("C:/tmp/demo")
+    expect(workspaceKey("C:\\tmp\\demo\\\\")).toBe("C:\\tmp\\demo")
  })

  test("preserves posix and drive roots in workspace key", () => {
    expect(workspaceKey("/")).toBe("/")
    expect(workspaceKey("///")).toBe("/")
-    expect(workspaceKey("C:\\")).toBe("C:/")
-    expect(workspaceKey("C://")).toBe("C:/")
+    expect(workspaceKey("C:\\")).toBe("C:\\")
+    expect(workspaceKey("C:\\\\\\")).toBe("C:\\")
    expect(workspaceKey("C:///")).toBe("C:/")
  })

--- a/packages/app/src/pages/layout/helpers.ts
+++ b/packages/app/src/pages/layout/helpers.ts
@@ -1,17 +1,11 @@
 import { getFilename } from "@opencode-ai/util/path"
 import { type Session } from "@opencode-ai/sdk/v2/client"

-type SessionStore = {
-  session?: Session[]
-  path: { directory: string }
-}
-
 export const workspaceKey = (directory: string) => {
-  const value = directory.replaceAll("\\", "/")
-  const drive = value.match(/^([A-Za-z]:)\/+$/)
-  if (drive) return `${drive[1]}/`
-  if (/^\/+$/i.test(value)) return "/"
-  return value.replace(/\/+$/, "")
+  const drive = directory.match(/^([A-Za-z]:)[\\/]+$/)
+  if (drive) return `${drive[1]}${directory.includes("\\") ? "\\" : "/"}`
+  if (/^[\\/]+$/.test(directory)) return directory.includes("\\") ? "\\" : "/"
+  return directory.replace(/[\\/]+$/, "")
 }

 function sortSessions(now: number) {
@@ -31,13 +25,13 @@ function sortSessions(now: number) {
 const isRootVisibleSession = (session: Session, directory: string) =>
  workspaceKey(session.directory) === workspaceKey(directory) && !session.parentID && !session.time?.archived

-const roots = (store: SessionStore) =>
-  (store.session ?? []).filter((session) => isRootVisibleSession(session, store.path.directory))
+export const sortedRootSessions = (store: { session: Session[]; path: { directory: string } }, now: number) =>
+  store.session.filter((session) => isRootVisibleSession(session, store.path.directory)).sort(sortSessions(now))

-export const sortedRootSessions = (store: SessionStore, now: number) => roots(store).sort(sortSessions(now))
-
-export const latestRootSession = (stores: SessionStore[], now: number) =>
-  stores.flatMap(roots).sort(sortSessions(now))[0]
+export const latestRootSession = (stores: { session: Session[]; path: { directory: string } }[], now: number) =>
+  stores
+    .flatMap((store) => store.session.filter((session) => isRootVisibleSession(session, store.path.directory)))
+    .sort(sortSessions(now))[0]

 export function hasProjectPermissions<T>(
  request: Record<string, T[] | undefined>,
@@ -46,9 +40,9 @@ export function hasProjectPermissions<T>(
  return Object.values(request).some((list) => list?.some(include))
 }

-export const childMapByParent = (sessions: Session[] | undefined) => {
+export const childMapByParent = (sessions: Session[]) => {
  const map = new Map<string, string[]>()
-  for (const session of sessions ?? []) {
+  for (const session of sessions) {
    if (!session.parentID) continue
    const existing = map.get(session.parentID)
    if (existing) {
--- a/packages/app/src/pages/layout/sidebar-workspace.tsx
+++ b/packages/app/src/pages/layout/sidebar-workspace.tsx
@@ -332,13 +332,12 @@ export const SortableWorkspace = (props: {
  const open = createMemo(() => props.ctx.workspaceExpanded(props.directory, local()))
  const boot = createMemo(() => open() || active())
  const booted = createMemo((prev) => prev || workspaceStore.status === "complete", false)
-  const count = createMemo(() => sessions()?.length ?? 0)
-  const hasMore = createMemo(() => workspaceStore.sessionTotal > count())
+  const hasMore = createMemo(() => workspaceStore.sessionTotal > sessions().length)
  const busy = createMemo(() => props.ctx.isBusy(props.directory))
  const wasBusy = createMemo((prev) => prev || busy(), false)
-  const loading = createMemo(() => open() && !booted() && count() === 0 && !wasBusy())
+  const loading = createMemo(() => open() && !booted() && sessions().length === 0 && !wasBusy())
  const touch = createMediaQuery("(hover: none)")
-  const showNew = createMemo(() => !loading() && (touch() || count() === 0 || (active() && !params.id)))
+  const showNew = createMemo(() => !loading() && (touch() || sessions().length === 0 || (active() && !params.id)))
  const loadMore = async () => {
    setWorkspaceStore("limit", (limit) => (limit ?? 0) + 5)
    await globalSync.project.loadSessions(props.directory)
@@ -473,9 +472,8 @@ export const LocalWorkspace = (props: {
  const sessions = createMemo(() => sortedRootSessions(workspace().store, props.sortNow()))
  const children = createMemo(() => childMapByParent(workspace().store.session))
  const booted = createMemo((prev) => prev || workspace().store.status === "complete", false)
-  const count = createMemo(() => sessions()?.length ?? 0)
-  const loading = createMemo(() => !booted() && count() === 0)
-  const hasMore = createMemo(() => workspace().store.sessionTotal > count())
+  const loading = createMemo(() => !booted() && sessions().length === 0)
+  const hasMore = createMemo(() => workspace().store.sessionTotal > sessions().length)
  const loadMore = async () => {
    workspace().setStore("limit", (limit) => (limit ?? 0) + 5)
    await globalSync.project.loadSessions(props.project.worktree)
--- a/packages/app/src/pages/session/terminal-panel.tsx
+++ b/packages/app/src/pages/session/terminal-panel.tsx
@@ -280,24 +280,21 @@ export function TerminalPanel() {
              </Tabs>
              <div class="flex-1 min-h-0 relative">
                <Show when={terminal.active()} keyed>
-                  {(id) => {
-                    const ops = terminal.bind()
-                    return (
-                      <Show when={all().find((pty) => pty.id === id)}>
-                        {(pty) => (
-                          <div id={`terminal-wrapper-${id}`} class="absolute inset-0">
-                            <Terminal
-                              pty={pty()}
-                              autoFocus={opened()}
-                              onConnect={() => ops.trim(id)}
-                              onCleanup={ops.update}
-                              onConnectError={() => ops.clone(id)}
-                            />
-                          </div>
-                        )}
-                      </Show>
-                    )
-                  }}
+                  {(id) => (
+                    <Show when={all().find((pty) => pty.id === id)}>
+                      {(pty) => (
+                        <div id={`terminal-wrapper-${id}`} class="absolute inset-0">
+                          <Terminal
+                            pty={pty()}
+                            autoFocus={opened()}
+                            onConnect={() => terminal.trim(id)}
+                            onCleanup={terminal.update}
+                            onConnectError={() => terminal.clone(id)}
+                          />
+                        </div>
+                      )}
+                    </Show>
+                  )}
                </Show>
              </div>
            </div>
--- a/packages/console/app/src/component/icon.tsx
+++ b/packages/console/app/src/component/icon.tsx
@@ -76,19 +76,6 @@ export function IconAlipay(props: JSX.SvgSVGAttributes<SVGSVGElement>) {
  )
 }

-export function IconUpi(props: JSX.SvgSVGAttributes<SVGSVGElement>) {
-  return (
-    <svg {...props} viewBox="10 16 100 28" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-      <path d="M95.678 42.9 110 29.835l-6.784-13.516Z" />
-      <path d="M90.854 42.9 105.176 29.835l-6.784-13.516Z" />
-      <path
-        d="M22.41 16.47 16.38 37.945l21.407.15 5.88-21.625h5.427l-7.05 25.14c-.27.96-1.298 1.74-2.295 1.74H12.31c-1.664 0-2.65-1.3-2.2-2.9l6.724-23.98Zm66.182-.15h5.427l-7.538 27.03h-5.58ZM49.698 27.582l27.136-.15 1.81-5.707H51.054l1.658-5.256 29.4-.27c1.83-.017 2.92 1.4 2.438 3.167L81.78 29.49c-.483 1.766-2.36 3.197-4.19 3.197H53.316L50.454 43.8h-5.28Z"
-        fill-rule="evenodd"
-      />
-    </svg>
-  )
-}
-
 export function IconWechat(props: JSX.SvgSVGAttributes<SVGSVGElement>) {
  return (
    <svg {...props} viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
--- a/packages/console/app/src/component/modal.css
+++ b/packages/console/app/src/component/modal.css
@@ -62,6 +62,5 @@
    font-size: var(--font-size-lg);
    font-weight: 600;
    color: var(--color-text);
-    text-align: center;
  }
 }
--- a/packages/console/app/src/i18n/ar.ts
+++ b/packages/console/app/src/i18n/ar.ts
@@ -644,8 +644,6 @@ export const dict = {
    "تم تصميم الخطة بشكل أساسي للمستخدمين الدوليين، مع استضافة النماذج في الولايات المتحدة والاتحاد الأوروبي وسنغافورة للحصول على وصول عالمي مستقر. قد تتغير الأسعار وحدود الاستخدام بناءً على تعلمنا من الاستخدام المبكر والملاحظات.",
  "workspace.lite.promo.subscribe": "الاشتراك في Go",
  "workspace.lite.promo.subscribing": "جارٍ إعادة التوجيه...",
-  "workspace.lite.promo.otherMethods": "طرق دفع أخرى",
-  "workspace.lite.promo.selectMethod": "اختر طريقة الدفع",

  "download.title": "OpenCode | تنزيل",
  "download.meta.description": "نزّل OpenCode لـ macOS، Windows، وLinux",
--- a/packages/console/app/src/i18n/br.ts
+++ b/packages/console/app/src/i18n/br.ts
@@ -654,8 +654,6 @@ export const dict = {
    "O plano é projetado principalmente para usuários internacionais, com modelos hospedados nos EUA, UE e Singapura para acesso global estável. Preços e limites de uso podem mudar conforme aprendemos com o uso inicial e feedback.",
  "workspace.lite.promo.subscribe": "Assinar Go",
  "workspace.lite.promo.subscribing": "Redirecionando...",
-  "workspace.lite.promo.otherMethods": "Outros métodos de pagamento",
-  "workspace.lite.promo.selectMethod": "Selecionar método de pagamento",

  "download.title": "OpenCode | Baixar",
  "download.meta.description": "Baixe o OpenCode para macOS, Windows e Linux",
--- a/packages/console/app/src/i18n/da.ts
+++ b/packages/console/app/src/i18n/da.ts
@@ -651,8 +651,6 @@ export const dict = {
    "Planen er primært designet til internationale brugere, med modeller hostet i USA, EU og Singapore for stabil global adgang. Priser og forbrugsgrænser kan ændre sig, efterhånden som vi lærer af tidlig brug og feedback.",
  "workspace.lite.promo.subscribe": "Abonner på Go",
  "workspace.lite.promo.subscribing": "Omdirigerer...",
-  "workspace.lite.promo.otherMethods": "Andre betalingsmetoder",
-  "workspace.lite.promo.selectMethod": "Vælg betalingsmetode",

  "download.title": "OpenCode | Download",
  "download.meta.description": "Download OpenCode til macOS, Windows og Linux",
--- a/packages/console/app/src/i18n/de.ts
+++ b/packages/console/app/src/i18n/de.ts
@@ -654,8 +654,6 @@ export const dict = {
    "Der Plan wurde hauptsächlich für internationale Nutzer entwickelt, wobei die Modelle in den USA, der EU und Singapur gehostet werden, um einen stabilen weltweiten Zugriff zu gewährleisten. Preise und Nutzungslimits können sich ändern, während wir aus der frühen Nutzung und dem Feedback lernen.",
  "workspace.lite.promo.subscribe": "Go abonnieren",
  "workspace.lite.promo.subscribing": "Leite weiter...",
-  "workspace.lite.promo.otherMethods": "Andere Zahlungsmethoden",
-  "workspace.lite.promo.selectMethod": "Zahlungsmethode auswählen",

  "download.title": "OpenCode | Download",
  "download.meta.description": "Lade OpenCode für macOS, Windows und Linux herunter",
--- a/packages/console/app/src/i18n/en.ts
+++ b/packages/console/app/src/i18n/en.ts
@@ -646,8 +646,6 @@ export const dict = {
    "The plan is designed primarily for international users, with models hosted in the US, EU, and Singapore for stable global access. Pricing and usage limits may change as we learn from early usage and feedback.",
  "workspace.lite.promo.subscribe": "Subscribe to Go",
  "workspace.lite.promo.subscribing": "Redirecting...",
-  "workspace.lite.promo.otherMethods": "Other payment methods",
-  "workspace.lite.promo.selectMethod": "Select payment method",

  "download.title": "OpenCode | Download",
  "download.meta.description": "Download OpenCode for macOS, Windows, and Linux",
--- a/packages/console/app/src/i18n/es.ts
+++ b/packages/console/app/src/i18n/es.ts
@@ -654,8 +654,6 @@ export const dict = {
    "El plan está diseñado principalmente para usuarios internacionales, con modelos alojados en EE. UU., la UE y Singapur para un acceso global estable. Los precios y los límites de uso pueden cambiar a medida que aprendemos del uso inicial y los comentarios.",
  "workspace.lite.promo.subscribe": "Suscribirse a Go",
  "workspace.lite.promo.subscribing": "Redirigiendo...",
-  "workspace.lite.promo.otherMethods": "Otros métodos de pago",
-  "workspace.lite.promo.selectMethod": "Seleccionar método de pago",

  "download.title": "OpenCode | Descargar",
  "download.meta.description": "Descarga OpenCode para macOS, Windows y Linux",
--- a/packages/console/app/src/i18n/fr.ts
+++ b/packages/console/app/src/i18n/fr.ts
@@ -661,8 +661,6 @@ export const dict = {
    "Le plan est conçu principalement pour les utilisateurs internationaux, avec des modèles hébergés aux États-Unis, dans l'UE et à Singapour pour un accès mondial stable. Les tarifs et les limites d'utilisation peuvent changer à mesure que nous apprenons des premières utilisations et des commentaires.",
  "workspace.lite.promo.subscribe": "S'abonner à Go",
  "workspace.lite.promo.subscribing": "Redirection...",
-  "workspace.lite.promo.otherMethods": "Autres méthodes de paiement",
-  "workspace.lite.promo.selectMethod": "Sélectionner la méthode de paiement",

  "download.title": "OpenCode | Téléchargement",
  "download.meta.description": "Téléchargez OpenCode pour macOS, Windows et Linux",
--- a/packages/console/app/src/i18n/it.ts
+++ b/packages/console/app/src/i18n/it.ts
@@ -652,8 +652,6 @@ export const dict = {
    "Il piano è progettato principalmente per gli utenti internazionali, con modelli ospitati in US, EU e Singapore per un accesso globale stabile. I prezzi e i limiti di utilizzo potrebbero cambiare man mano che impariamo dall'utilizzo iniziale e dal feedback.",
  "workspace.lite.promo.subscribe": "Abbonati a Go",
  "workspace.lite.promo.subscribing": "Reindirizzamento...",
-  "workspace.lite.promo.otherMethods": "Altri metodi di pagamento",
-  "workspace.lite.promo.selectMethod": "Seleziona metodo di pagamento",

  "download.title": "OpenCode | Download",
  "download.meta.description": "Scarica OpenCode per macOS, Windows e Linux",
--- a/packages/console/app/src/i18n/ja.ts
+++ b/packages/console/app/src/i18n/ja.ts
@@ -653,8 +653,6 @@ export const dict = {
    "このプランは主にグローバルユーザー向けに設計されており、米国、EU、シンガポールでホストされたモデルにより安定したグローバルアクセスを提供します。料金と利用制限は、初期の利用状況やフィードバックに基づいて変更される可能性があります。",
  "workspace.lite.promo.subscribe": "Goを購読する",
  "workspace.lite.promo.subscribing": "リダイレクト中...",
-  "workspace.lite.promo.otherMethods": "その他の支払い方法",
-  "workspace.lite.promo.selectMethod": "支払い方法を選択",

  "download.title": "OpenCode | ダウンロード",
  "download.meta.description": "OpenCode を macOS、Windows、Linux 向けにダウンロード",
--- a/packages/console/app/src/i18n/ko.ts
+++ b/packages/console/app/src/i18n/ko.ts
@@ -645,8 +645,6 @@ export const dict = {
    "이 플랜은 주로 글로벌 사용자를 위해 설계되었으며, 안정적인 글로벌 액세스를 위해 미국, EU 및 싱가포르에 모델이 호스팅되어 있습니다. 가격 및 사용 한도는 초기 사용을 통해 학습하고 피드백을 수집함에 따라 변경될 수 있습니다.",
  "workspace.lite.promo.subscribe": "Go 구독하기",
  "workspace.lite.promo.subscribing": "리디렉션 중...",
-  "workspace.lite.promo.otherMethods": "기타 결제 수단",
-  "workspace.lite.promo.selectMethod": "결제 수단 선택",

  "download.title": "OpenCode | 다운로드",
  "download.meta.description": "macOS, Windows, Linux용 OpenCode 다운로드",
--- a/packages/console/app/src/i18n/no.ts
+++ b/packages/console/app/src/i18n/no.ts
@@ -651,8 +651,6 @@ export const dict = {
    "Planen er primært designet for internasjonale brukere, med modeller driftet i USA, EU og Singapore for stabil global tilgang. Priser og bruksgrenser kan endres etter hvert som vi lærer fra tidlig bruk og tilbakemeldinger.",
  "workspace.lite.promo.subscribe": "Abonner på Go",
  "workspace.lite.promo.subscribing": "Omdirigerer...",
-  "workspace.lite.promo.otherMethods": "Andre betalingsmetoder",
-  "workspace.lite.promo.selectMethod": "Velg betalingsmetode",

  "download.title": "OpenCode | Last ned",
  "download.meta.description": "Last ned OpenCode for macOS, Windows og Linux",
--- a/packages/console/app/src/i18n/pl.ts
+++ b/packages/console/app/src/i18n/pl.ts
@@ -652,8 +652,6 @@ export const dict = {
    "Plan został zaprojektowany głównie dla użytkowników międzynarodowych, z modelami hostowanymi w USA, UE i Singapurze, aby zapewnić stabilny globalny dostęp. Ceny i limity użycia mogą ulec zmianie w miarę analizy wczesnego użycia i zbierania opinii.",
  "workspace.lite.promo.subscribe": "Subskrybuj Go",
  "workspace.lite.promo.subscribing": "Przekierowywanie...",
-  "workspace.lite.promo.otherMethods": "Inne metody płatności",
-  "workspace.lite.promo.selectMethod": "Wybierz metodę płatności",

  "download.title": "OpenCode | Pobierz",
  "download.meta.description": "Pobierz OpenCode na macOS, Windows i Linux",
--- a/packages/console/app/src/i18n/ru.ts
+++ b/packages/console/app/src/i18n/ru.ts
@@ -658,8 +658,6 @@ export const dict = {
    "План предназначен в первую очередь для международных пользователей. Модели размещены в США, ЕС и Сингапуре для стабильного глобального доступа. Цены и лимиты использования могут меняться по мере того, как мы изучаем раннее использование и собираем отзывы.",
  "workspace.lite.promo.subscribe": "Подписаться на Go",
  "workspace.lite.promo.subscribing": "Перенаправление...",
-  "workspace.lite.promo.otherMethods": "Другие способы оплаты",
-  "workspace.lite.promo.selectMethod": "Выберите способ оплаты",

  "download.title": "OpenCode | Скачать",
  "download.meta.description": "Скачать OpenCode для macOS, Windows и Linux",
--- a/packages/console/app/src/i18n/th.ts
+++ b/packages/console/app/src/i18n/th.ts
@@ -648,8 +648,6 @@ export const dict = {
    "แผนนี้ออกแบบมาสำหรับผู้ใช้งานต่างประเทศเป็นหลัก โดยมีโมเดลโฮสต์อยู่ในสหรัฐอเมริกา สหภาพยุโรป และสิงคโปร์ เพื่อการเข้าถึงที่เสถียรทั่วโลก ราคาและขีดจำกัดการใช้งานอาจมีการเปลี่ยนแปลงตามที่เราได้เรียนรู้จากการใช้งานในช่วงแรกและข้อเสนอแนะ",
  "workspace.lite.promo.subscribe": "สมัครสมาชิก Go",
  "workspace.lite.promo.subscribing": "กำลังเปลี่ยนเส้นทาง...",
-  "workspace.lite.promo.otherMethods": "วิธีการชำระเงินอื่นๆ",
-  "workspace.lite.promo.selectMethod": "เลือกวิธีการชำระเงิน",

  "download.title": "OpenCode | ดาวน์โหลด",
  "download.meta.description": "ดาวน์โหลด OpenCode สำหรับ macOS, Windows และ Linux",
--- a/packages/console/app/src/i18n/tr.ts
+++ b/packages/console/app/src/i18n/tr.ts
@@ -655,8 +655,6 @@ export const dict = {
    "Plan öncelikle uluslararası kullanıcılar için tasarlanmıştır; modeller istikrarlı küresel erişim için ABD, AB ve Singapur'da barındırılmaktadır. Erken kullanımdan öğrendikçe ve geri bildirim topladıkça fiyatlandırma ve kullanım limitleri değişebilir.",
  "workspace.lite.promo.subscribe": "Go'ya Abone Ol",
  "workspace.lite.promo.subscribing": "Yönlendiriliyor...",
-  "workspace.lite.promo.otherMethods": "Diğer ödeme yöntemleri",
-  "workspace.lite.promo.selectMethod": "Ödeme yöntemini seçin",

  "download.title": "OpenCode | İndir",
  "download.meta.description": "OpenCode'u macOS, Windows ve Linux için indirin",
--- a/packages/console/app/src/i18n/zh.ts
+++ b/packages/console/app/src/i18n/zh.ts
@@ -626,8 +626,6 @@ export const dict = {
    "该计划主要面向国际用户设计，模型部署在美国、欧盟和新加坡，以确保全球范围内的稳定访问体验。定价和使用额度可能会根据早期用户的使用情况和反馈持续调整与优化。",
  "workspace.lite.promo.subscribe": "订阅 Go",
  "workspace.lite.promo.subscribing": "正在重定向...",
-  "workspace.lite.promo.otherMethods": "其他付款方式",
-  "workspace.lite.promo.selectMethod": "选择付款方式",

  "download.title": "OpenCode | 下载",
  "download.meta.description": "下载适用于 macOS, Windows, 和 Linux 的 OpenCode",
--- a/packages/console/app/src/i18n/zht.ts
+++ b/packages/console/app/src/i18n/zht.ts
@@ -626,8 +626,6 @@ export const dict = {
    "該計畫主要面向國際用戶設計，模型部署在美國、歐盟和新加坡，以確保全球範圍內的穩定存取體驗。定價和使用額度可能會根據早期用戶的使用情況和回饋持續調整與優化。",
  "workspace.lite.promo.subscribe": "訂閱 Go",
  "workspace.lite.promo.subscribing": "重新導向中...",
-  "workspace.lite.promo.otherMethods": "其他付款方式",
-  "workspace.lite.promo.selectMethod": "選擇付款方式",

  "download.title": "OpenCode | 下載",
  "download.meta.description": "下載適用於 macOS、Windows 與 Linux 的 OpenCode",
--- a/packages/console/app/src/routes/stripe/webhook.ts
+++ b/packages/console/app/src/routes/stripe/webhook.ts
@@ -244,7 +244,6 @@ export async function POST(input: APIEvent) {
            customerID,
            enrichment: {
              type: productID === LiteData.productID() ? "lite" : "subscription",
-              currency: body.data.object.currency === "inr" ? "inr" : undefined,
              couponID,
            },
          }),
@@ -332,17 +331,16 @@ export async function POST(input: APIEvent) {
      )
      if (!workspaceID) throw new Error("Workspace ID not found")

-      const payment = await Database.use((tx) =>
+      const amount = await Database.use((tx) =>
        tx
          .select({
            amount: PaymentTable.amount,
-            enrichment: PaymentTable.enrichment,
          })
          .from(PaymentTable)
          .where(and(eq(PaymentTable.paymentID, paymentIntentID), eq(PaymentTable.workspaceID, workspaceID)))
-          .then((rows) => rows[0]),
+          .then((rows) => rows[0]?.amount),
      )
-      if (!payment) throw new Error("Payment not found")
+      if (!amount) throw new Error("Payment not found")

      await Database.transaction(async (tx) => {
        await tx
@@ -352,15 +350,12 @@ export async function POST(input: APIEvent) {
          })
          .where(and(eq(PaymentTable.paymentID, paymentIntentID), eq(PaymentTable.workspaceID, workspaceID)))

-        // deduct balance only for top up
-        if (!payment.enrichment?.type) {
-          await tx
-            .update(BillingTable)
-            .set({
-              balance: sql`${BillingTable.balance} - ${payment.amount}`,
-            })
-            .where(eq(BillingTable.workspaceID, workspaceID))
-        }
+        await tx
+          .update(BillingTable)
+          .set({
+            balance: sql`${BillingTable.balance} - ${amount}`,
+          })
+          .where(eq(BillingTable.workspaceID, workspaceID))
      })
    }
  })()
--- a/packages/console/app/src/routes/workspace/[id]/billing/billing-section.tsx
+++ b/packages/console/app/src/routes/workspace/[id]/billing/billing-section.tsx
@@ -3,7 +3,7 @@ import { createMemo, Match, Show, Switch, createEffect } from "solid-js"
 import { createStore } from "solid-js/store"
 import { Billing } from "@opencode-ai/console-core/billing.js"
 import { withActor } from "~/context/auth.withActor"
-import { IconAlipay, IconCreditCard, IconStripe, IconUpi, IconWechat } from "~/component/icon"
+import { IconAlipay, IconCreditCard, IconStripe, IconWechat } from "~/component/icon"
 import styles from "./billing-section.module.css"
 import { createCheckoutUrl, formatBalance, queryBillingInfo } from "../../common"
 import { useI18n } from "~/context/i18n"
@@ -211,9 +211,6 @@ export function BillingSection() {
                    <Match when={billingInfo()?.paymentMethodType === "wechat_pay"}>
                      <IconWechat style={{ width: "24px", height: "24px" }} />
                    </Match>
-                    <Match when={billingInfo()?.paymentMethodType === "upi"}>
-                      <IconUpi style={{ width: "auto", height: "16px" }} />
-                    </Match>
                  </Switch>
                </div>
                <div data-slot="card-details">
--- a/packages/console/app/src/routes/workspace/[id]/billing/payment-section.tsx
+++ b/packages/console/app/src/routes/workspace/[id]/billing/payment-section.tsx
@@ -6,14 +6,6 @@ import { formatDateUTC, formatDateForTable } from "../../common"
 import styles from "./payment-section.module.css"
 import { useI18n } from "~/context/i18n"

-function money(amount: number, currency?: string) {
-  const formatter =
-    currency === "inr"
-      ? new Intl.NumberFormat("en-IN", { style: "currency", currency: "INR" })
-      : new Intl.NumberFormat("en-US", { style: "currency", currency: "USD" })
-  return formatter.format(amount / 100_000_000)
-}
-
 const getPaymentsInfo = query(async (workspaceID: string) => {
  "use server"
  return withActor(async () => {
@@ -89,10 +81,6 @@ export function PaymentSection() {
                  const date = new Date(payment.timeCreated)
                  const amount =
                    payment.enrichment?.type === "subscription" && payment.enrichment.couponID ? 0 : payment.amount
-                  const currency =
-                    payment.enrichment?.type === "subscription" || payment.enrichment?.type === "lite"
-                      ? payment.enrichment.currency
-                      : undefined
                  return (
                    <tr>
                      <td data-slot="payment-date" title={formatDateUTC(date)}>
@@ -100,7 +88,7 @@ export function PaymentSection() {
                      </td>
                      <td data-slot="payment-id">{payment.id}</td>
                      <td data-slot="payment-amount" data-refunded={!!payment.timeRefunded}>
-                        {money(amount, currency)}
+                        ${((amount ?? 0) / 100000000).toFixed(2)}
                        <Switch>
                          <Match when={payment.enrichment?.type === "credit"}>
                            {" "}
--- a/packages/console/app/src/routes/workspace/[id]/go/lite-section.module.css
+++ b/packages/console/app/src/routes/workspace/[id]/go/lite-section.module.css
@@ -188,45 +188,8 @@
    line-height: 1.4;
  }

-  [data-slot="subscribe-actions"] {
-    display: flex;
-    align-items: center;
-    gap: var(--space-4);
-    margin-top: var(--space-4);
-  }
-
  [data-slot="subscribe-button"] {
-    align-self: stretch;
-  }
-
-  [data-slot="other-methods"] {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    gap: var(--space-2);
-  }
-
-  [data-slot="other-methods-icons"] {
-    display: inline-flex;
-    align-items: center;
-    gap: 4px;
-  }
-
-  [data-slot="modal-actions"] {
-    display: flex;
-    gap: var(--space-3);
+    align-self: flex-start;
    margin-top: var(--space-4);
-
-    button {
-      flex: 1;
-    }
-  }
-
-  [data-slot="method-button"] {
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
-    gap: var(--space-2);
-    height: 48px;
  }
 }
--- a/packages/console/app/src/routes/workspace/[id]/go/lite-section.tsx
+++ b/packages/console/app/src/routes/workspace/[id]/go/lite-section.tsx
@@ -1,7 +1,6 @@
 import { action, useParams, useAction, useSubmission, json, query, createAsync } from "@solidjs/router"
 import { createStore } from "solid-js/store"
 import { createMemo, For, Show } from "solid-js"
-import { Modal } from "~/component/modal"
 import { Billing } from "@opencode-ai/console-core/billing.js"
 import { Database, eq, and, isNull } from "@opencode-ai/console-core/drizzle/index.js"
 import { BillingTable, LiteTable } from "@opencode-ai/console-core/schema/billing.sql.js"
@@ -15,8 +14,6 @@ import { useI18n } from "~/context/i18n"
 import { useLanguage } from "~/context/language"
 import { formError } from "~/lib/form-error"

-import { IconAlipay, IconUpi } from "~/component/icon"
-
 const queryLiteSubscription = query(async (workspaceID: string) => {
  "use server"
  return withActor(async () => {
@@ -81,25 +78,22 @@ function formatResetTime(seconds: number, i18n: ReturnType<typeof useI18n>) {
  return `${minutes} ${minutes === 1 ? i18n.t("workspace.lite.time.minute") : i18n.t("workspace.lite.time.minutes")}`
 }

-const createLiteCheckoutUrl = action(
-  async (workspaceID: string, successUrl: string, cancelUrl: string, method?: "alipay" | "upi") => {
-    "use server"
-    return json(
-      await withActor(
-        () =>
-          Billing.generateLiteCheckoutUrl({ successUrl, cancelUrl, method })
-            .then((data) => ({ error: undefined, data }))
-            .catch((e) => ({
-              error: e.message as string,
-              data: undefined,
-            })),
-        workspaceID,
-      ),
-      { revalidate: [queryBillingInfo.key, queryLiteSubscription.key] },
-    )
-  },
-  "liteCheckoutUrl",
-)
+const createLiteCheckoutUrl = action(async (workspaceID: string, successUrl: string, cancelUrl: string) => {
+  "use server"
+  return json(
+    await withActor(
+      () =>
+        Billing.generateLiteCheckoutUrl({ successUrl, cancelUrl })
+          .then((data) => ({ error: undefined, data }))
+          .catch((e) => ({
+            error: e.message as string,
+            data: undefined,
+          })),
+      workspaceID,
+    ),
+    { revalidate: [queryBillingInfo.key, queryLiteSubscription.key] },
+  )
+}, "liteCheckoutUrl")

 const createSessionUrl = action(async (workspaceID: string, returnUrl: string) => {
  "use server"
@@ -153,30 +147,23 @@ export function LiteSection() {
  const checkoutSubmission = useSubmission(createLiteCheckoutUrl)
  const useBalanceSubmission = useSubmission(setLiteUseBalance)
  const [store, setStore] = createStore({
-    loading: undefined as undefined | "session" | "checkout" | "alipay" | "upi",
-    showModal: false,
+    redirecting: false,
  })

-  const busy = createMemo(() => !!store.loading)
-
  async function onClickSession() {
-    setStore("loading", "session")
    const result = await sessionAction(params.id!, window.location.href)
    if (result.data) {
+      setStore("redirecting", true)
      window.location.href = result.data
-      return
    }
-    setStore("loading", undefined)
  }

-  async function onClickSubscribe(method?: "alipay" | "upi") {
-    setStore("loading", method ?? "checkout")
-    const result = await checkoutAction(params.id!, window.location.href, window.location.href, method)
+  async function onClickSubscribe() {
+    const result = await checkoutAction(params.id!, window.location.href, window.location.href)
    if (result.data) {
+      setStore("redirecting", true)
      window.location.href = result.data
-      return
    }
-    setStore("loading", undefined)
  }

  return (
@@ -192,8 +179,12 @@ export function LiteSection() {
            <div data-slot="section-title">
              <div data-slot="title-row">
                <p>{i18n.t("workspace.lite.subscription.message")}</p>
-                <button data-color="primary" disabled={sessionSubmission.pending || busy()} onClick={onClickSession}>
-                  {store.loading === "session"
+                <button
+                  data-color="primary"
+                  disabled={sessionSubmission.pending || store.redirecting}
+                  onClick={onClickSession}
+                >
+                  {sessionSubmission.pending || store.redirecting
                    ? i18n.t("workspace.lite.loading")
                    : i18n.t("workspace.lite.subscription.manage")}
                </button>
@@ -291,64 +282,16 @@ export function LiteSection() {
            <li>MiniMax M2.7</li>
          </ul>
          <p data-slot="promo-description">{i18n.t("workspace.lite.promo.footer")}</p>
-          <div data-slot="subscribe-actions">
-            <button
-              data-slot="subscribe-button"
-              data-color="primary"
-              disabled={checkoutSubmission.pending || busy()}
-              onClick={() => onClickSubscribe()}
-            >
-              {store.loading === "checkout"
-                ? i18n.t("workspace.lite.promo.subscribing")
-                : i18n.t("workspace.lite.promo.subscribe")}
-            </button>
-            <button
-              type="button"
-              data-slot="other-methods"
-              data-color="ghost"
-              onClick={() => setStore("showModal", true)}
-            >
-              <span>{i18n.t("workspace.lite.promo.otherMethods")}</span>
-              <span data-slot="other-methods-icons">
-                <span> </span>
-                <IconAlipay style={{ width: "16px", height: "16px" }} />
-                <span> </span>
-                <IconUpi style={{ width: "auto", height: "10px" }} />
-              </span>
-            </button>
-          </div>
-          <Modal
-            open={store.showModal}
-            onClose={() => setStore("showModal", false)}
-            title={i18n.t("workspace.lite.promo.selectMethod")}
+          <button
+            data-slot="subscribe-button"
+            data-color="primary"
+            disabled={checkoutSubmission.pending || store.redirecting}
+            onClick={onClickSubscribe}
          >
-            <div data-slot="modal-actions">
-              <button
-                type="button"
-                data-slot="method-button"
-                data-color="ghost"
-                disabled={checkoutSubmission.pending || busy()}
-                onClick={() => onClickSubscribe("alipay")}
-              >
-                <Show when={store.loading !== "alipay"}>
-                  <IconAlipay style={{ width: "24px", height: "24px" }} />
-                </Show>
-                {store.loading === "alipay" ? i18n.t("workspace.lite.promo.subscribing") : "Alipay"}
-              </button>
-              <button
-                type="button"
-                data-slot="method-button"
-                data-color="ghost"
-                disabled={checkoutSubmission.pending || busy()}
-                onClick={() => onClickSubscribe("upi")}
-              >
-                <Show when={store.loading !== "upi"}>
-                  <IconUpi style={{ width: "auto", height: "16px" }} />
-                </Show>
-                {store.loading === "upi" ? i18n.t("workspace.lite.promo.subscribing") : "UPI"}
-              </button>
-            </div>
-          </Modal>
+            {checkoutSubmission.pending || store.redirecting
+              ? i18n.t("workspace.lite.promo.subscribing")
+              : i18n.t("workspace.lite.promo.subscribe")}
+          </button>
        </section>
      </Show>
    </>
--- a/packages/console/core/src/billing.ts
+++ b/packages/console/core/src/billing.ts
@@ -239,11 +239,10 @@ export namespace Billing {
    z.object({
      successUrl: z.string(),
      cancelUrl: z.string(),
-      method: z.enum(["alipay", "upi"]).optional(),
    }),
    async (input) => {
      const user = Actor.assert("user")
-      const { successUrl, cancelUrl, method } = input
+      const { successUrl, cancelUrl } = input

      const email = await User.getAuthEmail(user.properties.userID)
      const billing = await Billing.get()
@@ -251,102 +250,38 @@ export namespace Billing {
      if (billing.subscriptionID) throw new Error("Already subscribed to Black")
      if (billing.liteSubscriptionID) throw new Error("Already subscribed to Lite")

-      const createSession = () =>
-        Billing.stripe().checkout.sessions.create({
-          mode: "subscription",
-          discounts: [{ coupon: LiteData.firstMonth50Coupon() }],
-          ...(billing.customerID
-            ? {
-                customer: billing.customerID,
-                customer_update: {
-                  name: "auto",
-                  address: "auto",
-                },
-              }
-            : {
-                customer_email: email!,
-              }),
-          ...(() => {
-            if (method === "alipay") {
-              return {
-                line_items: [{ price: LiteData.priceID(), quantity: 1 }],
-                payment_method_types: ["alipay"],
-                adaptive_pricing: {
-                  enabled: false,
-                },
-              }
+      const session = await Billing.stripe().checkout.sessions.create({
+        mode: "subscription",
+        billing_address_collection: "required",
+        line_items: [{ price: LiteData.priceID(), quantity: 1 }],
+        discounts: [{ coupon: LiteData.firstMonth50Coupon() }],
+        ...(billing.customerID
+          ? {
+              customer: billing.customerID,
+              customer_update: {
+                name: "auto",
+                address: "auto",
+              },
            }
-            if (method === "upi") {
-              return {
-                line_items: [
-                  {
-                    price_data: {
-                      currency: "inr",
-                      product: LiteData.productID(),
-                      recurring: {
-                        interval: "month",
-                        interval_count: 1,
-                      },
-                      unit_amount: LiteData.priceInr(),
-                    },
-                    quantity: 1,
-                  },
-                ],
-                payment_method_types: ["upi"] as any,
-                adaptive_pricing: {
-                  enabled: false,
-                },
-              }
-            }
-            return {
-              line_items: [{ price: LiteData.priceID(), quantity: 1 }],
-              billing_address_collection: "required",
-            }
-          })(),
-          tax_id_collection: {
-            enabled: true,
+          : {
+              customer_email: email!,
+            }),
+        currency: "usd",
+        tax_id_collection: {
+          enabled: true,
+        },
+        success_url: successUrl,
+        cancel_url: cancelUrl,
+        subscription_data: {
+          metadata: {
+            workspaceID: Actor.workspace(),
+            userID: user.properties.userID,
+            type: "lite",
          },
-          success_url: successUrl,
-          cancel_url: cancelUrl,
-          subscription_data: {
-            metadata: {
-              workspaceID: Actor.workspace(),
-              userID: user.properties.userID,
-              type: "lite",
-            },
-          },
-        })
+        },
+      })

-      try {
-        const session = await createSession()
-        return session.url
-      } catch (e: any) {
-        if (
-          e.type !== "StripeInvalidRequestError" ||
-          !e.message.includes("You cannot combine currencies on a single customer")
-        )
-          throw e
-
-        // get pending payment intent
-        const intents = await Billing.stripe().paymentIntents.search({
-          query: `-status:'canceled' AND -status:'processing' AND -status:'succeeded' AND customer:'${billing.customerID}'`,
-        })
-        if (intents.data.length === 0) throw e
-
-        for (const intent of intents.data) {
-          // get checkout session
-          const sessions = await Billing.stripe().checkout.sessions.list({
-            customer: billing.customerID!,
-            payment_intent: intent.id,
-          })
-
-          // delete pending payment intent
-          await Billing.stripe().checkout.sessions.expire(sessions.data[0].id)
-        }
-
-        const session = await createSession()
-        return session.url
-      }
+      return session.url
    },
  )

--- a/packages/console/core/src/lite.ts
+++ b/packages/console/core/src/lite.ts
@@ -10,7 +10,6 @@ export namespace LiteData {

  export const productID = fn(z.void(), () => Resource.ZEN_LITE_PRICE.product)
  export const priceID = fn(z.void(), () => Resource.ZEN_LITE_PRICE.price)
-  export const priceInr = fn(z.void(), () => Resource.ZEN_LITE_PRICE.priceInr)
  export const firstMonth50Coupon = fn(z.void(), () => Resource.ZEN_LITE_PRICE.firstMonth50Coupon)
  export const planName = fn(z.void(), () => "lite")
 }
--- a/packages/console/core/src/schema/billing.sql.ts
+++ b/packages/console/core/src/schema/billing.sql.ts
@@ -88,7 +88,6 @@ export const PaymentTable = mysqlTable(
    enrichment: json("enrichment").$type<
      | {
          type: "subscription" | "lite"
-          currency?: "inr"
          couponID?: string
        }
      | {
--- a/packages/console/core/sst-env.d.ts
+++ b/packages/console/core/sst-env.d.ts
@@ -145,7 +145,6 @@ declare module "sst" {
    "ZEN_LITE_PRICE": {
      "firstMonth50Coupon": string
      "price": string
-      "priceInr": number
      "product": string
      "type": "sst.sst.Linkable"
    }
--- a/packages/console/function/sst-env.d.ts
+++ b/packages/console/function/sst-env.d.ts
@@ -145,7 +145,6 @@ declare module "sst" {
    "ZEN_LITE_PRICE": {
      "firstMonth50Coupon": string
      "price": string
-      "priceInr": number
      "product": string
      "type": "sst.sst.Linkable"
    }
--- a/packages/console/resource/sst-env.d.ts
+++ b/packages/console/resource/sst-env.d.ts
@@ -145,7 +145,6 @@ declare module "sst" {
    "ZEN_LITE_PRICE": {
      "firstMonth50Coupon": string
      "price": string
-      "priceInr": number
      "product": string
      "type": "sst.sst.Linkable"
    }
--- a/packages/desktop-electron/src/renderer/index.tsx
+++ b/packages/desktop-electron/src/renderer/index.tsx
@@ -152,12 +152,12 @@ const createPlatform = (): Platform => {
    storage,

    checkUpdate: async () => {
-      if (!UPDATER_ENABLED()) return { updateAvailable: false }
+      if (!UPDATER_ENABLED) return { updateAvailable: false }
      return window.api.checkUpdate()
    },

    update: async () => {
-      if (!UPDATER_ENABLED()) return
+      if (!UPDATER_ENABLED) return
      await window.api.installUpdate()
    },

--- a/packages/desktop-electron/src/renderer/updater.ts
+++ b/packages/desktop-electron/src/renderer/updater.ts
@@ -1,6 +1,6 @@
 import { initI18n, t } from "./i18n"

-export const UPDATER_ENABLED = () => window.__OPENCODE__?.updaterEnabled ?? false
+export const UPDATER_ENABLED = window.__OPENCODE__?.updaterEnabled ?? false

 export async function runUpdater({ alertOnFail }: { alertOnFail: boolean }) {
  await initI18n()
--- a/packages/enterprise/sst-env.d.ts
+++ b/packages/enterprise/sst-env.d.ts
@@ -145,7 +145,6 @@ declare module "sst" {
    "ZEN_LITE_PRICE": {
      "firstMonth50Coupon": string
      "price": string
-      "priceInr": number
      "product": string
      "type": "sst.sst.Linkable"
    }
--- a/packages/function/sst-env.d.ts
+++ b/packages/function/sst-env.d.ts
@@ -145,7 +145,6 @@ declare module "sst" {
    "ZEN_LITE_PRICE": {
      "firstMonth50Coupon": string
      "price": string
-      "priceInr": number
      "product": string
      "type": "sst.sst.Linkable"
    }
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -26,13 +26,6 @@
  "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",
@@ -57,8 +50,8 @@
    "@types/which": "3.0.4",
    "@types/yargs": "17.0.33",
    "@typescript/native-preview": "catalog:",
-    "drizzle-kit": "catalog:",
-    "drizzle-orm": "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",
@@ -89,11 +82,8 @@
    "@ai-sdk/xai": "2.0.51",
    "@aws-sdk/credential-providers": "3.993.0",
    "@clack/prompts": "1.0.0-alpha.1",
-    "@effect/platform-node": "catalog:",
-    "@gitlab/gitlab-ai-provider": "3.6.0",
+    "gitlab-ai-provider": "5.2.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",
@@ -107,6 +97,7 @@
    "@openrouter/ai-sdk-provider": "1.5.4",
    "@opentui/core": "0.1.87",
    "@opentui/solid": "0.1.87",
+    "@effect/platform-node": "catalog:",
    "@parcel/watcher": "2.5.1",
    "@pierre/diffs": "catalog:",
    "@solid-primitives/event-bus": "1.1.2",
@@ -122,7 +113,7 @@
    "cross-spawn": "^7.0.6",
    "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",
@@ -153,6 +144,6 @@
    "zod-to-json-schema": "3.24.5"
  },
  "overrides": {
-    "drizzle-orm": "catalog:"
+    "drizzle-orm": "1.0.0-beta.16-ea816b6"
  }
 }
--- a/packages/opencode/src/account/effect.ts
+++ b/packages/opencode/src/account/effect.ts
@@ -148,12 +148,6 @@ export namespace AccountEffect {
          mapAccountServiceError("HTTP request failed"),
        )

-      const executeEffect = <E>(request: Effect.Effect<HttpClientRequest.HttpClientRequest, E>) =>
-        request.pipe(
-          Effect.flatMap((req) => http.execute(req)),
-          mapAccountServiceError("HTTP request failed"),
-        )
-
      const resolveToken = Effect.fnUntraced(function* (row: AccountRow) {
        const now = yield* Clock.currentTimeMillis
        if (row.token_expiry && row.token_expiry > now) return row.access_token
@@ -296,7 +290,7 @@ export namespace AccountEffect {
      })

      const poll = Effect.fn("Account.poll")(function* (input: Login) {
-        const response = yield* executeEffect(
+        const response = yield* executeEffectOk(
          HttpClientRequest.post(`${input.server}/auth/device/token`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.schemaBodyJson(DeviceTokenRequest)(
--- a/packages/opencode/src/agent/agent.ts
+++ b/packages/opencode/src/agent/agent.ts
@@ -260,10 +260,7 @@ export namespace Agent {
    return pipe(
      await state(),
      values(),
-      sortBy(
-        [(x) => (cfg.default_agent ? x.name === cfg.default_agent : x.name === "build"), "desc"],
-        [(x) => x.name, "asc"],
-      ),
+      sortBy([(x) => (cfg.default_agent ? x.name === cfg.default_agent : x.name === "build"), "desc"]),
    )
  }

--- a/packages/opencode/src/bus/index.ts
+++ b/packages/opencode/src/bus/index.ts
@@ -51,8 +51,8 @@ export namespace Bus {
    })
    const pending = []
    for (const key of [def.type, "*"]) {
-      const match = [...(state().subscriptions.get(key) ?? [])]
-      for (const sub of match) {
+      const match = state().subscriptions.get(key)
+      for (const sub of match ?? []) {
        pending.push(sub(payload))
      }
    }
--- a/packages/opencode/src/cli/cmd/acp.ts
+++ b/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}`,
--- a/packages/opencode/src/cli/cmd/providers.ts
+++ b/packages/opencode/src/cli/cmd/providers.ts
@@ -349,6 +349,7 @@ export const ProvidersLoginCommand = cmd({
              value: x.id,
              hint: {
                opencode: "recommended",
+                anthropic: "API key",
                openai: "ChatGPT Plus/Pro or API key",
              }[x.id],
            })),
--- a/packages/opencode/src/cli/cmd/serve.ts
+++ b/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(() => {})
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-workspace-list.tsx
+++ b/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) {
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -13,7 +13,6 @@ import { MessageID, PartID } from "@/session/schema"
 import { createStore, produce } from "solid-js/store"
 import { useKeybind } from "@tui/context/keybind"
 import { usePromptHistory, type PromptInfo } from "./history"
-import { assign } from "./part"
 import { usePromptStash } from "./stash"
 import { DialogStash } from "../dialog-stash"
 import { type AutocompleteRef, Autocomplete } from "./autocomplete"
@@ -644,7 +643,10 @@ export function Prompt(props: PromptProps) {
              type: "text",
              text: inputText,
            },
-            ...nonTextParts.map(assign),
+            ...nonTextParts.map((x) => ({
+              id: PartID.ascending(),
+              ...x,
+            })),
          ],
        })
        .catch(() => {})
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/part.ts
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/part.ts
@@ -1,16 +0,0 @@
-import { PartID } from "@/session/schema"
-import type { PromptInfo } from "./history"
-
-type Item = PromptInfo["parts"][number]
-
-export function strip(part: Item & { id: string; messageID: string; sessionID: string }): Item {
-  const { id: _id, messageID: _messageID, sessionID: _sessionID, ...rest } = part
-  return rest
-}
-
-export function assign(part: Item): Item & { id: PartID } {
-  return {
-    ...part,
-    id: PartID.ascending(),
-  }
-}
--- a/packages/opencode/src/cli/cmd/tui/routes/session/dialog-fork-from-timeline.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/dialog-fork-from-timeline.tsx
@@ -7,7 +7,6 @@ import { useSDK } from "@tui/context/sdk"
 import { useRoute } from "@tui/context/route"
 import { useDialog } from "../../ui/dialog"
 import type { PromptInfo } from "@tui/component/prompt/history"
-import { strip } from "@tui/component/prompt/part"

 export function DialogForkFromTimeline(props: { sessionID: string; onMove: (messageID: string) => void }) {
  const sync = useSync()
@@ -43,7 +42,7 @@ export function DialogForkFromTimeline(props: { sessionID: string; onMove: (mess
              if (part.type === "text") {
                if (!part.synthetic) agg.input += part.text
              }
-              if (part.type === "file") agg.parts.push(strip(part))
+              if (part.type === "file") agg.parts.push(part)
              return agg
            },
            { input: "", parts: [] as PromptInfo["parts"] },
--- a/packages/opencode/src/cli/cmd/tui/routes/session/dialog-message.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/dialog-message.tsx
@@ -5,7 +5,6 @@ import { useSDK } from "@tui/context/sdk"
 import { useRoute } from "@tui/context/route"
 import { Clipboard } from "@tui/util/clipboard"
 import type { PromptInfo } from "@tui/component/prompt/history"
-import { strip } from "@tui/component/prompt/part"

 export function DialogMessage(props: {
  messageID: string
@@ -41,7 +40,7 @@ export function DialogMessage(props: {
                  if (part.type === "text") {
                    if (!part.synthetic) agg.input += part.text
                  }
-                  if (part.type === "file") agg.parts.push(strip(part))
+                  if (part.type === "file") agg.parts.push(part)
                  return agg
                },
                { input: "", parts: [] as PromptInfo["parts"] },
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -907,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" })
--- a/packages/opencode/src/cli/cmd/tui/worker.ts
+++ b/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)
  },
 }

--- a/packages/opencode/src/cli/cmd/web.ts
+++ b/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()
--- a/packages/opencode/src/control-plane/workspace-server/server.ts
+++ b/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"
@@ -57,24 +56,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,
+    })
  }
 }
--- a/packages/opencode/src/control-plane/workspace.ts
+++ b/packages/opencode/src/control-plane/workspace.ts
@@ -1,5 +1,4 @@
 import z from "zod"
-import { setTimeout as sleep } from "node:timers/promises"
 import { fn } from "@/util/fn"
 import { Database, eq } from "@/storage/db"
 import { Project } from "@/project/project"
@@ -118,7 +117,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 +127,7 @@ export namespace Workspace {
        })
      })
      // Wait 250ms and retry if SSE connection fails
-      await sleep(250)
+      await Bun.sleep(250)
    }
  }

--- a/packages/opencode/src/global/index.ts
+++ b/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,
--- a/packages/opencode/src/mcp/index.ts
+++ b/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)
        }
--- a/packages/opencode/src/mcp/oauth-callback.ts
+++ b/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")
    }
--- a/packages/opencode/src/npm/index.ts
+++ b/packages/opencode/src/npm/index.ts
@@ -1,180 +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 range = /[\s^~*xX<>|=]/.test(cachedVersion)
-    if (range) return !semver.satisfies(latestVersion, cachedVersion)
-
-    return semver.lt(cachedVersion, latestVersion)
-  }
-
-  export async function add(pkg: string) {
-    using _ = await Lock.write(`npm-install:${pkg}`)
-    log.info("installing package", {
-      pkg,
-    })
-    const dir = directory(pkg)
-
-    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) {
-    using _ = await Lock.write(`npm-install:${dir}`)
-    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 = directory(pkg)
-    const binDir = path.join(dir, "node_modules", ".bin")
-
-    const pick = async () => {
-      const files = await readdir(binDir).catch(() => [])
-      if (files.length === 0) return undefined
-      if (files.length === 1) return files[0]
-      // Multiple binaries — resolve from package.json bin field like npx does
-      const pkgJson = await Filesystem.readJson<{ bin?: string | Record<string, string> }>(
-        path.join(dir, "node_modules", pkg, "package.json"),
-      ).catch(() => undefined)
-      if (pkgJson?.bin) {
-        const bin = pkgJson.bin
-        if (typeof bin === "string") return path.basename(bin)
-        const keys = Object.keys(bin)
-        if (keys.length === 1) return keys[0]
-        const unscoped = pkg.startsWith("@") ? pkg.split("/")[1] : pkg
-        return bin[unscoped] ? unscoped : keys[0]
-      }
-      return files[0]
-    }
-
-    const bin = await pick()
-    if (bin) return path.join(binDir, bin)
-
-    await add(pkg)
-    const resolved = await pick()
-    if (!resolved) throw new Error(`No binary found for package "${pkg}" after install`)
-    return path.join(binDir, resolved)
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aiden Cline	2c968ed108	rm	2026-03-19 00:00:02 -05:00
Aiden Cline	b3182149c8	gitlab integration poc	2026-03-18 23:59:50 -05:00
Aiden Cline	d95fd77861	Merge branch 'dev' into add-model-reconciliation	2026-03-18 21:58:45 -05:00
Aiden Cline	c32c2e8a8f	feat: add model reconciliation hook	2026-03-18 18:16:00 -05:00