release: v1.14.21

2026-07-17 12:56:41 +02:00 · 2026-04-23 05:45:09 +00:00
206 changed files with 1615 additions and 5363 deletions
@@ -13,4 +13,3 @@ R44VC0RP
 rekram1-node
 RhysSullivan
 thdxr
-simonklee
@@ -1,10 +1,5 @@
 name: "Setup Bun"
 description: "Setup Bun with caching and install dependencies"
-inputs:
-  install-flags:
-    description: "Additional flags to pass to 'bun install'"
-    required: false
-    default: ""
 runs:
  using: "composite"
  steps:
@@ -51,8 +46,8 @@ runs:
        # e.g. ./patches/ for standard-openapi
        # https://github.com/oven-sh/bun/issues/28147
        if [ "$RUNNER_OS" = "Windows" ]; then
-          bun install --linker hoisted ${{ inputs.install-flags }}
+          bun install --linker hoisted
        else
-          bun install ${{ inputs.install-flags }}
+          bun install
        fi
      shell: bash
@@ -402,14 +402,12 @@ jobs:
      fail-fast: false
      matrix:
        settings:
-          - host: macos-26-intel
+          - host: macos-latest
            target: x86_64-apple-darwin
            platform_flag: --mac --x64
-            bun_install_flags: --os=darwin --cpu=x64
-          - host: macos-26
+          - host: macos-latest
            target: aarch64-apple-darwin
            platform_flag: --mac --arm64
-            bun_install_flags: --os=darwin --cpu=arm64
          # github-hosted: blacksmith lacks ARM64 MSVC cross-compilation toolchain
          - host: "windows-2025"
            target: aarch64-pc-windows-msvc
@@ -439,8 +437,6 @@ jobs:
        run: echo "${{ secrets.APPLE_API_KEY_PATH }}" > $RUNNER_TEMP/apple-api-key.p8

      - uses: ./.github/actions/setup-bun
-        with:
-          install-flags: ${{ matrix.settings.bun_install_flags }}

      - name: Azure login
        if: runner.os == 'Windows'
@@ -29,7 +29,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -83,7 +83,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -117,7 +117,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -144,7 +144,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@ai-sdk/anthropic": "3.0.64",
        "@ai-sdk/openai": "3.0.48",
@@ -168,7 +168,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -192,7 +192,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -225,7 +225,7 @@
    },
    "packages/desktop-electron": {
      "name": "@opencode-ai/desktop-electron",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
@@ -269,7 +269,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@opencode-ai/shared": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -298,7 +298,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -314,7 +314,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -459,7 +459,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "effect": "catalog:",
@@ -494,7 +494,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "cross-spawn": "catalog:",
      },
@@ -509,7 +509,7 @@
    },
    "packages/shared": {
      "name": "@opencode-ai/shared",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -533,7 +533,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -568,7 +568,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -617,7 +617,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.14.23",
+      "version": "1.14.21",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.14.23",
+  "version": "1.14.21",
  "description": "",
  "type": "module",
  "exports": {
@@ -270,7 +270,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  const buttonsSpring = useSpring(() => (store.mode === "normal" ? 1 : 0), { visualDuration: 0.2, bounce: 0 })
  const motion = (value: number) => ({
    opacity: value,
-    transform: `scale(${0.98 + value * 0.02})`,
+    transform: `scale(${0.95 + value * 0.05})`,
    filter: `blur(${(1 - value) * 2}px)`,
    "pointer-events": value > 0.5 ? ("auto" as const) : ("none" as const),
  })
@@ -345,7 +345,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    promptPlaceholder({
      mode: store.mode,
      commentCount: commentCount(),
-      example: suggest() ? (store.mode === "shell" ? "git status" : language.t(EXAMPLES[store.placeholder])) : "",
+      example: suggest() ? language.t(EXAMPLES[store.placeholder]) : "",
      suggest: suggest(),
      t: (key, params) => language.t(key as Parameters<typeof language.t>[0], params as never),
    }),
@@ -1403,11 +1403,12 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                <IconButton
                  data-action="prompt-submit"
                  type="submit"
-                  disabled={!working() && blank()}
+                  disabled={store.mode !== "normal" || (!working() && blank())}
                  tabIndex={store.mode === "normal" ? undefined : -1}
-                  icon={stopping() ? "stop" : store.mode === "shell" ? "arrow-undo-down" : "arrow-up"}
+                  icon={stopping() ? "stop" : "arrow-up"}
                  variant="primary"
                  class="size-8"
+                  style={buttons()}
                  aria-label={stopping() ? language.t("prompt.action.stop") : language.t("prompt.action.send")}
                />
              </Tooltip>
@@ -1450,24 +1451,14 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
          <div class="px-1.75 pt-5.5 pb-2 flex items-center gap-2 min-w-0">
            <div class="flex items-center gap-1.5 min-w-0 flex-1 relative">
              <div
-                class="h-7 flex items-center gap-1.5 min-w-0 absolute inset-0"
+                class="h-7 flex items-center gap-1.5 max-w-[160px] min-w-0 absolute inset-y-0 left-0"
                style={{
-                  padding: "0 0px 0 8px",
+                  padding: "0 4px 0 8px",
                  ...shell(),
                }}
              >
-                <Icon name="console" />
-                <span class="truncate text-13-medium text-text-base">{language.t("prompt.mode.shell")}</span>
-                <div class="flex-1" />
-                <Button
-                  variant="ghost"
-                  class="text-text-base"
-                  onClick={() => {
-                    setStore("mode", "normal")
-                  }}
-                >
-                  {language.t("common.cancel")}
-                </Button>
+                <span class="truncate text-13-medium text-text-strong">{language.t("prompt.mode.shell")}</span>
+                <div class="size-4 shrink-0" />
              </div>
              <div class="flex items-center gap-1.5 min-w-0 flex-1 h-7">
                <Show when={!agentsLoading()}>
@@ -1574,35 +1565,33 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                        </TooltipKeybind>
                      </Show>
                    </div>
-                    <Show when={variants().length > 2}>
-                      <div
-                        data-component="prompt-variant-control"
-                        style={providersShouldFadeIn() ? { animation: "fade-in 0.3s" } : undefined}
+                    <div
+                      data-component="prompt-variant-control"
+                      style={providersShouldFadeIn() ? { animation: "fade-in 0.3s" } : undefined}
+                    >
+                      <TooltipKeybind
+                        placement="top"
+                        gutter={4}
+                        title={language.t("command.model.variant.cycle")}
+                        keybind={command.keybind("model.variant.cycle")}
                      >
-                        <TooltipKeybind
-                          placement="top"
-                          gutter={4}
-                          title={language.t("command.model.variant.cycle")}
-                          keybind={command.keybind("model.variant.cycle")}
-                        >
-                          <Select
-                            size="normal"
-                            options={variants()}
-                            current={local.model.variant.current() ?? "default"}
-                            label={(x) => (x === "default" ? language.t("common.default") : x)}
-                            onSelect={(value) => {
-                              local.model.variant.set(value === "default" ? undefined : value)
-                              restoreFocus()
-                            }}
-                            class="capitalize max-w-[160px] text-text-base"
-                            valueClass="truncate text-13-regular text-text-base"
-                            triggerStyle={control()}
-                            triggerProps={{ "data-action": "prompt-model-variant" }}
-                            variant="ghost"
-                          />
-                        </TooltipKeybind>
-                      </div>
-                    </Show>
+                        <Select
+                          size="normal"
+                          options={variants()}
+                          current={local.model.variant.current() ?? "default"}
+                          label={(x) => (x === "default" ? language.t("common.default") : x)}
+                          onSelect={(value) => {
+                            local.model.variant.set(value === "default" ? undefined : value)
+                            restoreFocus()
+                          }}
+                          class="capitalize max-w-[160px] text-text-base"
+                          valueClass="truncate text-13-regular text-text-base"
+                          triggerStyle={control()}
+                          triggerProps={{ "data-action": "prompt-model-variant" }}
+                          variant="ghost"
+                        />
+                      </TooltipKeybind>
+                    </div>
                  </Show>
                </Show>
              </div>
@@ -12,7 +12,7 @@ describe("promptPlaceholder", () => {
      suggest: true,
      t,
    })
-    expect(value).toBe("prompt.placeholder.shell:example")
+    expect(value).toBe("prompt.placeholder.shell")
  })

  test("returns summarize placeholders for comment context", () => {
@@ -7,7 +7,7 @@ type PromptPlaceholderInput = {
 }

 export function promptPlaceholder(input: PromptPlaceholderInput) {
-  if (input.mode === "shell") return input.t("prompt.placeholder.shell", { example: input.example })
+  if (input.mode === "shell") return input.t("prompt.placeholder.shell")
  if (input.commentCount > 1) return input.t("prompt.placeholder.summarizeComments")
  if (input.commentCount === 1) return input.t("prompt.placeholder.summarizeComment")
  if (!input.suggest) return input.t("prompt.placeholder.simple")
@@ -128,25 +128,27 @@ export const SettingsGeneral: Component = () => {
          return
        }

-        const actions = platform.updateAndRestart
-          ? [
-              {
-                label: language.t("toast.update.action.installRestart"),
-                onClick: async () => {
-                  await platform.updateAndRestart!()
+        const actions =
+          platform.update && platform.restart
+            ? [
+                {
+                  label: language.t("toast.update.action.installRestart"),
+                  onClick: async () => {
+                    await platform.update!()
+                    await platform.restart!()
+                  },
                },
-              },
-              {
-                label: language.t("toast.update.action.notYet"),
-                onClick: "dismiss" as const,
-              },
-            ]
-          : [
-              {
-                label: language.t("toast.update.action.notYet"),
-                onClick: "dismiss" as const,
-              },
-            ]
+                {
+                  label: language.t("toast.update.action.notYet"),
+                  onClick: "dismiss" as const,
+                },
+              ]
+            : [
+                {
+                  label: language.t("toast.update.action.notYet"),
+                  onClick: "dismiss" as const,
+                },
+              ]

        showToast({
          persistent: true,
@@ -10,8 +10,9 @@ import type {
 import { showToast } from "@opencode-ai/ui/toast"
 import { getFilename } from "@opencode-ai/shared/util/path"
 import { batch, createContext, getOwner, onCleanup, onMount, type ParentProps, untrack, useContext } from "solid-js"
-import { createStore, produce, reconcile } from "solid-js/store"
+import { createStore, produce, reconcile, unwrap } from "solid-js/store"
 import { useLanguage } from "@/context/language"
+import { Persist, persisted } from "@/utils/persist"
 import type { InitError } from "../pages/error"
 import { useGlobalSDK } from "./global-sdk"
 import { bootstrapDirectory, bootstrapGlobal, clearProviderRev } from "./global-sync/bootstrap"
@@ -23,6 +24,7 @@ import { estimateRootSessionTotal, loadRootSessionsWithFallback } from "./global
 import { trimSessions } from "./global-sync/session-trim"
 import type { ProjectMeta } from "./global-sync/types"
 import { SESSION_RECENT_LIMIT } from "./global-sync/types"
+import { sanitizeProject } from "./global-sync/utils"
 import { formatServerError } from "@/utils/server-errors"
 import { queryOptions, skipToken, useQueryClient } from "@tanstack/solid-query"

@@ -54,10 +56,15 @@ function createGlobalSync() {
  const sessionLoads = new Map<string, Promise<void>>()
  const sessionMeta = new Map<string, { limit: number }>()

+  const [projectCache, setProjectCache, projectInit] = persisted(
+    Persist.global("globalSync.project", ["globalSync.project.v1"]),
+    createStore({ value: [] as Project[] }),
+  )
+
  const [globalStore, setGlobalStore] = createStore<GlobalStore>({
    ready: false,
    path: { state: "", config: "", worktree: "", directory: "", home: "" },
-    project: [],
+    project: projectCache.value,
    session_todo: {},
    provider: { all: [], connected: [], default: {} },
    provider_auth: {},
@@ -66,18 +73,32 @@ function createGlobalSync() {
  })
  const queryClient = useQueryClient()

+  let active = true
+  let projectWritten = false
  let bootedAt = 0
  let bootingRoot = false
  let eventFrame: number | undefined
  let eventTimer: ReturnType<typeof setTimeout> | undefined

+  onCleanup(() => {
+    active = false
+  })
  onCleanup(() => {
    if (eventFrame !== undefined) cancelAnimationFrame(eventFrame)
    if (eventTimer !== undefined) clearTimeout(eventTimer)
  })

+  const cacheProjects = () => {
+    setProjectCache(
+      "value",
+      untrack(() => globalStore.project.map(sanitizeProject)),
+    )
+  }
+
  const setProjects = (next: Project[] | ((draft: Project[]) => Project[])) => {
+    projectWritten = true
    setGlobalStore("project", next)
+    cacheProjects()
  }

  const setBootStore = ((...input: unknown[]) => {
@@ -96,6 +117,16 @@ function createGlobalSync() {
    return (setGlobalStore as (...args: unknown[]) => unknown)(...input)
  }) as typeof setGlobalStore

+  if (projectInit instanceof Promise) {
+    void projectInit.then(() => {
+      if (!active) return
+      if (projectWritten) return
+      const cached = projectCache.value
+      if (cached.length === 0) return
+      setGlobalStore("project", cached)
+    })
+  }
+
  const setSessionTodo = (sessionID: string, todos: Todo[] | undefined) => {
    if (!sessionID) return
    if (!todos) {
@@ -156,12 +156,13 @@ export function createChildStoreManager(input: {

      const init = () =>
        createRoot((dispose) => {
+          const initialMeta = meta[0].value
          const initialIcon = icon[0].value

          const pathQuery = useQuery(() => loadPathQuery(directory))
          const child = createStore<State>({
            project: "",
-            projectMeta: undefined,
+            projectMeta: initialMeta,
            icon: initialIcon,
            provider_ready: false,
            provider: { all: [], connected: [], default: {} },
@@ -207,6 +208,11 @@ export function createChildStoreManager(input: {
            child[1]("vcs", (value) => value ?? cached)
          })

+          onPersistedInit(meta[2], () => {
+            if (child[0].projectMeta !== initialMeta) return
+            child[1]("projectMeta", meta[0].value)
+          })
+
          onPersistedInit(icon[2], () => {
            if (child[0].icon !== initialIcon) return
            child[1]("icon", icon[0].value)
@@ -391,7 +391,37 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        ? globalSync.data.project.find((x) => x.id === projectID)
        : globalSync.data.project.find((x) => x.worktree === project.worktree)

-      return { ...metadata, ...project }
+      const local = childStore.projectMeta
+      const localOverride =
+        local?.name !== undefined ||
+        local?.commands?.start !== undefined ||
+        local?.icon?.override !== undefined ||
+        local?.icon?.color !== undefined
+
+      const base = {
+        ...metadata,
+        ...project,
+        icon: {
+          url: metadata?.icon?.url,
+          override: metadata?.icon?.override ?? childStore.icon,
+          color: metadata?.icon?.color,
+        },
+      }
+
+      const isGlobal = projectID === "global" || (metadata?.id === undefined && localOverride)
+      if (!isGlobal) return base
+
+      return {
+        ...base,
+        id: base.id ?? "global",
+        name: local?.name,
+        commands: local?.commands,
+        icon: {
+          url: base.icon?.url,
+          override: local?.icon?.override,
+          color: local?.icon?.color,
+        },
+      }
    }

    const roots = createMemo(() => {
@@ -486,7 +516,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
      }

      for (const project of projects) {
-        if (project.icon?.color || project.icon?.override || project.icon?.url) continue
+        if (project.icon?.color || project.icon.url) continue
        const worktree = project.worktree
        const existing = colors[worktree]
        const color = existing ?? pickAvailableColor(used)
@@ -49,11 +49,11 @@ export type Platform = {
  /** Storage mechanism, defaults to localStorage */
  storage?: (name?: string) => SyncStorage | AsyncStorage

-  /** Check for a downloadable desktop update */
+  /** Check for updates (Tauri only) */
  checkUpdate?(): Promise<UpdateInfo>

-  /** Install the downloaded update using the platform restart flow */
-  updateAndRestart?(): Promise<void>
+  /** Install updates (Tauri only) */
+  update?(): Promise<void>

  /** Fetch override */
  fetch?: typeof fetch
@@ -210,7 +210,7 @@ export const dict = {
  "common.saving": "جارٍ الحفظ...",
  "common.default": "افتراضي",
  "common.attachment": "مرفق",
-  "prompt.placeholder.shell": "أدخل أمر shell... {{example}}",
+  "prompt.placeholder.shell": "أدخل أمر shell...",
  "prompt.placeholder.normal": 'اسأل أي شيء... "{{example}}"',
  "prompt.placeholder.simple": "اسأل أي شيء...",
  "prompt.placeholder.summarizeComments": "لخّص التعليقات…",
@@ -210,7 +210,7 @@ export const dict = {
  "common.saving": "Salvando...",
  "common.default": "Padrão",
  "common.attachment": "anexo",
-  "prompt.placeholder.shell": "Digite comando do shell... {{example}}",
+  "prompt.placeholder.shell": "Digite comando do shell...",
  "prompt.placeholder.normal": 'Pergunte qualquer coisa... "{{example}}"',
  "prompt.placeholder.simple": "Pergunte qualquer coisa...",
  "prompt.placeholder.summarizeComments": "Resumir comentários…",
@@ -228,7 +228,7 @@ export const dict = {
  "common.default": "Podrazumijevano",
  "common.attachment": "prilog",

-  "prompt.placeholder.shell": "Unesi shell naredbu... {{example}}",
+  "prompt.placeholder.shell": "Unesi shell naredbu...",
  "prompt.placeholder.normal": 'Pitaj bilo šta... "{{example}}"',
  "prompt.placeholder.simple": "Pitaj bilo šta...",
  "prompt.placeholder.summarizeComments": "Sažmi komentare…",
@@ -226,7 +226,7 @@ export const dict = {
  "common.default": "Standard",
  "common.attachment": "vedhæftning",

-  "prompt.placeholder.shell": "Indtast shell-kommando... {{example}}",
+  "prompt.placeholder.shell": "Indtast shell-kommando...",
  "prompt.placeholder.normal": 'Spørg om hvad som helst... "{{example}}"',
  "prompt.placeholder.simple": "Spørg om hvad som helst...",
  "prompt.placeholder.summarizeComments": "Opsummér kommentarer…",
@@ -215,7 +215,7 @@ export const dict = {
  "common.saving": "Speichert...",
  "common.default": "Standard",
  "common.attachment": "Anhang",
-  "prompt.placeholder.shell": "Shell-Befehl eingeben... {{example}}",
+  "prompt.placeholder.shell": "Shell-Befehl eingeben...",
  "prompt.placeholder.normal": 'Fragen Sie alles... "{{example}}"',
  "prompt.placeholder.simple": "Fragen Sie alles...",
  "prompt.placeholder.summarizeComments": "Kommentare zusammenfassen…",
@@ -230,7 +230,7 @@ export const dict = {
  "common.default": "Default",
  "common.attachment": "attachment",

-  "prompt.placeholder.shell": "Enter shell command... {{example}}",
+  "prompt.placeholder.shell": "Enter shell command...",
  "prompt.placeholder.normal": 'Ask anything... "{{example}}"',
  "prompt.placeholder.simple": "Ask anything...",
  "prompt.placeholder.summarizeComments": "Summarize comments…",
@@ -227,7 +227,7 @@ export const dict = {
  "common.default": "Predeterminado",
  "common.attachment": "adjunto",

-  "prompt.placeholder.shell": "Introduce comando de shell... {{example}}",
+  "prompt.placeholder.shell": "Introduce comando de shell...",
  "prompt.placeholder.normal": 'Pregunta cualquier cosa... "{{example}}"',
  "prompt.placeholder.simple": "Pregunta cualquier cosa...",
  "prompt.placeholder.summarizeComments": "Resumir comentarios…",
@@ -210,7 +210,7 @@ export const dict = {
  "common.saving": "Enregistrement...",
  "common.default": "Défaut",
  "common.attachment": "pièce jointe",
-  "prompt.placeholder.shell": "Entrez une commande shell... {{example}}",
+  "prompt.placeholder.shell": "Entrez une commande shell...",
  "prompt.placeholder.normal": 'Demandez n\'importe quoi... "{{example}}"',
  "prompt.placeholder.simple": "Demandez n'importe quoi...",
  "prompt.placeholder.summarizeComments": "Résumer les commentaires…",
@@ -209,7 +209,7 @@ export const dict = {
  "common.saving": "保存中...",
  "common.default": "デフォルト",
  "common.attachment": "添付ファイル",
-  "prompt.placeholder.shell": "シェルコマンドを入力... {{example}}",
+  "prompt.placeholder.shell": "シェルコマンドを入力...",
  "prompt.placeholder.normal": '何でも聞いてください... "{{example}}"',
  "prompt.placeholder.simple": "何でも聞いてください...",
  "prompt.placeholder.summarizeComments": "コメントを要約…",
@@ -209,7 +209,7 @@ export const dict = {
  "common.saving": "저장 중...",
  "common.default": "기본값",
  "common.attachment": "첨부 파일",
-  "prompt.placeholder.shell": "셸 명령어 입력... {{example}}",
+  "prompt.placeholder.shell": "셸 명령어 입력...",
  "prompt.placeholder.normal": '무엇이든 물어보세요... "{{example}}"',
  "prompt.placeholder.simple": "무엇이든 물어보세요...",
  "prompt.placeholder.summarizeComments": "댓글 요약…",
@@ -230,7 +230,7 @@ export const dict = {
  "common.default": "Standard",
  "common.attachment": "vedlegg",

-  "prompt.placeholder.shell": "Skriv inn shell-kommando... {{example}}",
+  "prompt.placeholder.shell": "Skriv inn shell-kommando...",
  "prompt.placeholder.normal": 'Spør om hva som helst... "{{example}}"',
  "prompt.placeholder.simple": "Spør om hva som helst...",
  "prompt.placeholder.summarizeComments": "Oppsummer kommentarer…",
@@ -211,7 +211,7 @@ export const dict = {
  "common.saving": "Zapisywanie...",
  "common.default": "Domyślny",
  "common.attachment": "załącznik",
-  "prompt.placeholder.shell": "Wpisz polecenie terminala... {{example}}",
+  "prompt.placeholder.shell": "Wpisz polecenie terminala...",
  "prompt.placeholder.normal": 'Zapytaj o cokolwiek... "{{example}}"',
  "prompt.placeholder.simple": "Zapytaj o cokolwiek...",
  "prompt.placeholder.summarizeComments": "Podsumuj komentarze…",
@@ -227,7 +227,7 @@ export const dict = {
  "common.default": "По умолчанию",
  "common.attachment": "вложение",

-  "prompt.placeholder.shell": "Введите команду оболочки... {{example}}",
+  "prompt.placeholder.shell": "Введите команду оболочки...",
  "prompt.placeholder.normal": 'Спросите что угодно... "{{example}}"',
  "prompt.placeholder.simple": "Спросите что угодно...",
  "prompt.placeholder.summarizeComments": "Суммировать комментарии…",
@@ -227,7 +227,7 @@ export const dict = {
  "common.default": "ค่าเริ่มต้น",
  "common.attachment": "ไฟล์แนบ",

-  "prompt.placeholder.shell": "ป้อนคำสั่งเชลล์... {{example}}",
+  "prompt.placeholder.shell": "ป้อนคำสั่งเชลล์...",
  "prompt.placeholder.normal": 'ถามอะไรก็ได้... "{{example}}"',
  "prompt.placeholder.simple": "ถามอะไรก็ได้...",
  "prompt.placeholder.summarizeComments": "สรุปความคิดเห็น…",
@@ -232,7 +232,7 @@ export const dict = {
  "common.default": "Varsayılan",
  "common.attachment": "ek",

-  "prompt.placeholder.shell": "Kabuk komutu girin... {{example}}",
+  "prompt.placeholder.shell": "Kabuk komutu girin...",
  "prompt.placeholder.normal": 'Bir şeyler sorun... "{{example}}"',
  "prompt.placeholder.simple": "Bir şeyler sorun...",
  "prompt.placeholder.summarizeComments": "Yorumları özetle…",
@@ -249,7 +249,7 @@ export const dict = {
  "common.default": "默认",
  "common.attachment": "附件",

-  "prompt.placeholder.shell": "输入 shell 命令... {{example}}",
+  "prompt.placeholder.shell": "输入 shell 命令...",
  "prompt.placeholder.normal": '随便问点什么... "{{example}}"',
  "prompt.placeholder.simple": "随便问点什么...",
  "prompt.placeholder.summarizeComments": "总结评论…",
@@ -227,7 +227,7 @@ export const dict = {
  "common.default": "預設",
  "common.attachment": "附件",

-  "prompt.placeholder.shell": "輸入 shell 命令... {{example}}",
+  "prompt.placeholder.shell": "輸入 shell 命令...",
  "prompt.placeholder.normal": '隨便問點什麼... "{{example}}"',
  "prompt.placeholder.simple": "隨便問點什麼...",
  "prompt.placeholder.summarizeComments": "摘要評論…",
@@ -244,9 +244,10 @@ export const ErrorPage: Component<ErrorPageProps> = (props) => {
  }

  async function installUpdate() {
-    if (!platform.updateAndRestart) return
+    if (!platform.update || !platform.restart) return
    await platform
-      .updateAndRestart()
+      .update()
+      .then(() => platform.restart!())
      .then(() => setStore("actionError", undefined))
      .catch((err) => {
        setStore("actionError", formatError(err, language.t))
@@ -366,7 +366,7 @@ export default function Layout(props: ParentProps) {

  const useUpdatePolling = () =>
    onMount(() => {
-      if (!platform.checkUpdate || !platform.updateAndRestart) return
+      if (!platform.checkUpdate || !platform.update || !platform.restart) return

      let toastId: number | undefined
      let interval: ReturnType<typeof setInterval> | undefined
@@ -384,7 +384,8 @@ export default function Layout(props: ParentProps) {
              {
                label: language.t("toast.update.action.installRestart"),
                onClick: async () => {
-                  await platform.updateAndRestart!()
+                  await platform.update!()
+                  await platform.restart!()
                },
              },
              {
@@ -22,7 +22,9 @@ const OPENCODE_PROJECT_ID = "4b0ea68d7af9a6031a7ffda7ad66e0cb83315750"
 export function getProjectAvatarSource(id?: string, icon?: { color?: string; url?: string; override?: string }) {
  return id === OPENCODE_PROJECT_ID
    ? "https://opencode.ai/favicon.svg"
-    : (icon?.override ?? (icon?.color ? undefined : icon?.url))
+    : icon?.color
+      ? undefined
+      : icon?.override || icon?.url
 }

 export const ProjectIcon = (props: { project: LocalProject; class?: string; notify?: boolean }): JSX.Element => {
@@ -267,10 +269,10 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
          </Show>
        </div>
      </div>
-      <Show when={currentChild()} keyed>
+      <Show when={currentChild()}>
        {(child) => (
          <div class="w-full">
-            <SessionItem {...props} session={child} level={(props.level ?? 0) + 1} />
+            <SessionItem {...props} session={child()} level={(props.level ?? 0) + 1} />
          </div>
        )}
      </Show>
@@ -259,7 +259,7 @@ export function MessageTimeline(props: {
    if (!id) return idle
    return sync.data.session_status[id] ?? idle
  })
-  const working = createMemo(() => sessionStatus().type !== "idle")
+  const working = createMemo(() => !!pending() || sessionStatus().type !== "idle")
  const tint = createMemo(() => messageAgentColor(sessionMessages(), sync.data.agent))

  const [timeoutDone, setTimeoutDone] = createSignal(true)
@@ -812,7 +812,7 @@ export function MessageTimeline(props: {
                      </Show>
                    </div>
                  </div>
-                  <Show when={sessionID()} keyed>
+                  <Show when={sessionID()}>
                    {(id) => (
                      <div class="shrink-0 flex items-center gap-3">
                        <SessionContextUsage placement="bottom" />
@@ -878,12 +878,12 @@ export function MessageTimeline(props: {
                                    </DropdownMenu.ItemLabel>
                                  </DropdownMenu.Item>
                                </Show>
-                                <DropdownMenu.Item onSelect={() => void archiveSession(id)}>
+                                <DropdownMenu.Item onSelect={() => void archiveSession(id())}>
                                  <DropdownMenu.ItemLabel>{language.t("common.archive")}</DropdownMenu.ItemLabel>
                                </DropdownMenu.Item>
                                <DropdownMenu.Separator />
                                <DropdownMenu.Item
-                                  onSelect={() => dialog.show(() => <DialogDeleteSession sessionID={id} />)}
+                                  onSelect={() => dialog.show(() => <DialogDeleteSession sessionID={id()} />)}
                                >
                                  <DropdownMenu.ItemLabel>{language.t("common.delete")}</DropdownMenu.ItemLabel>
                                </DropdownMenu.Item>
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.14.23",
+  "version": "1.14.21",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -187,8 +187,6 @@ export async function handler(
      // Try another provider => stop retrying if using fallback provider
      if (
        res.status !== 200 &&
-        // ie. 400 error is usually provider error like malformed request
-        res.status !== 400 &&
        // ie. openai 404 error: Item with id 'msg_0ead8b004a3b165d0069436a6b6834819896da85b63b196a3f' not found.
        res.status !== 404 &&
        // ie. cannot change codex model providers mid-session
@@ -228,7 +226,7 @@ export async function handler(
    logger.debug("STATUS: " + res.status + " " + res.statusText)

    // Handle non-streaming response
-    if (!isStream || [400, 404, 429].includes(res.status)) {
+    if (!isStream || res.status === 429) {
      const json = await res.json()
      await rateLimiter?.track()
      if (json.usage) {
@@ -240,9 +238,6 @@ export async function handler(
        await reload(billingSource, authInfo, costInfo)
        json.cost = calculateOccurredCost(billingSource, costInfo)
      }
-      if (res.status === 400) {
-        logger.metric({ "error.response": JSON.stringify(json) })
-      }
      if (json.error?.message) {
        json.error.message = `Error from provider${providerInfo.displayName ? ` (${providerInfo.displayName})` : ""}: ${json.error.message}`
      }
@@ -398,7 +393,7 @@ export async function handler(
        type: "error",
        error: {
          type: "error",
-          message: "Internal server error",
+          message: error.message,
        },
      }),
      { status: 500 },
@@ -53,7 +53,9 @@ export const anthropicHelper: ProviderHelper = ({ reqModel, providerModel }) =>
              anthropic_version: "bedrock-2023-05-31",
              anthropic_beta: supports1m ? ["context-1m-2025-08-07"] : undefined,
            }
-          : {}),
+          : {
+              service_tier: "standard_only",
+            }),
    }),
    createBinaryStreamDecoder: () => {
      if (!isBedrock) return undefined
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.14.23",
+  "version": "1.14.21",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.14.23",
+  "version": "1.14.21",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.14.23",
+  "version": "1.14.21",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop-electron",
  "private": true,
-  "version": "1.14.23",
+  "version": "1.14.21",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
@@ -337,16 +337,11 @@ function setupAutoUpdater() {
  })
 }

-let downloadedUpdateVersion: string | undefined
+let updateReady = false

 async function checkUpdate() {
  if (!UPDATER_ENABLED) return { updateAvailable: false }
-  if (downloadedUpdateVersion) {
-    logger.log("returning cached downloaded update", {
-      version: downloadedUpdateVersion,
-    })
-    return { updateAvailable: true, version: downloadedUpdateVersion }
-  }
+  updateReady = false
  logger.log("checking for updates", {
    currentVersion: app.getVersion(),
    channel: autoUpdater.channel,
@@ -372,7 +367,7 @@ async function checkUpdate() {
    logger.log("update available", { version })
    await autoUpdater.downloadUpdate()
    logger.log("update download completed", { version })
-    downloadedUpdateVersion = version
+    updateReady = true
    return { updateAvailable: true, version }
  } catch (error) {
    logger.error("update check failed", error)
@@ -381,15 +376,7 @@ async function checkUpdate() {
 }

 async function installUpdate() {
-  if (!downloadedUpdateVersion) {
-    logger.log("install update skipped", {
-      reason: "no downloaded update ready",
-    })
-    return
-  }
-  logger.log("installing downloaded update", {
-    version: downloadedUpdateVersion,
-  })
+  if (!updateReady) return
  killSidecar()
  autoUpdater.quitAndInstall()
 }
@@ -170,7 +170,7 @@ const createPlatform = (): Platform => {
      return window.api.checkUpdate()
    },

-    updateAndRestart: async () => {
+    update: async () => {
      const config = await window.api.getWindowConfig().catch(() => ({ updaterEnabled: false }))
      if (!config.updaterEnabled) return
      await window.api.installUpdate()
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.14.23",
+  "version": "1.14.21",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -297,15 +297,10 @@ const createPlatform = (): Platform => {
      return { updateAvailable: true, version: next.version }
    },

-    updateAndRestart: async () => {
+    update: async () => {
      if (!UPDATER_ENABLED || !update) return
      if (ostype() === "windows") await commands.killSidecar().catch(() => undefined)
-      const installed = await update
-        .install()
-        .then(() => true)
-        .catch(() => false)
-      if (!installed) return
-      await relaunch()
+      await update.install().catch(() => undefined)
    },

    restart: async () => {
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.14.23",
+  "version": "1.14.21",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 id = "opencode"
 name = "OpenCode"
 description = "The open source coding agent."
-version = "1.14.23"
+version = "1.14.21"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/anomalyco/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
 icon = "./icons/opencode.svg"

 [agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.23/opencode-darwin-arm64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.21/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.23/opencode-darwin-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.21/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.23/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.21/opencode-linux-arm64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.23/opencode-linux-x64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.21/opencode-linux-x64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.23/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.21/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.14.23",
+  "version": "1.14.21",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,2 +0,0 @@
-ALTER TABLE `project` ADD `icon_url_override` text;
-UPDATE `project` SET `icon_url_override` = `icon_url` WHERE `icon_url` IS NOT NULL;
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.14.23",
+  "version": "1.14.21",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
@@ -409,7 +409,7 @@ Current instance route inventory:
 - `project` - `bridged` (partial)
  bridged endpoints: `GET /project`, `GET /project/current`
  defer git-init mutation first
- `workspace` - `bridged`
+- `workspace` - `next`
  best small reads: `GET /experimental/workspace/adaptor`, `GET /experimental/workspace`, `GET /experimental/workspace/status`
  defer create/remove mutations first
 - `file` - `later`
@@ -448,7 +448,7 @@ Recommended near-term sequence:
 - [x] port `config` providers read endpoint
 - [x] port `project` read endpoints (`GET /project`, `GET /project/current`)
 - [x] port `GET /config` full read endpoint
- [x] port `workspace` read endpoints
+- [ ] port `workspace` read endpoints
 - [ ] port `file` JSON read endpoints
 - [ ] decide when to remove the flag and make Effect routes the default

@@ -147,17 +147,6 @@ import `z` do so only for local `ZodOverride` bridges or for `z.ZodType`
 type annotations — the `export const <Info|Spec>` values are all Effect
 Schema at source.

-A file is considered "done" when:
-
- its exported schema values (`Info`, `Input`, `Event`, `Definition`, etc.)
-  are authored as Effect Schema
- any remaining zod is either a derived compat bridge (via `zod()` /
-  `zodObject()`), a `z.ZodType` type annotation, or a documented
-  `ZodOverride` escape hatch — never a hand-written parallel source of truth
-
-Files that meet this bar but still carry a compat bridge are checked off
-with an inline note describing the bridge and what unblocks its removal.
-
 - [x] skills, formatter, console-state, mcp, lsp, permission (leaves), model-id, command, plugin, provider
 - [x] server, layout
 - [x] keybinds
@@ -170,7 +159,6 @@ with an inline note describing the bridge and what unblocks its removal.
 These are the highest-priority next targets. Each is a small, self-contained
 schema module with a clear domain.

- [x] `src/account/schema.ts`
 - [x] `src/control-plane/schema.ts`
 - [x] `src/permission/schema.ts`
 - [x] `src/project/schema.ts`
@@ -178,10 +166,8 @@ schema module with a clear domain.
 - [x] `src/pty/schema.ts`
 - [x] `src/question/schema.ts`
 - [x] `src/session/schema.ts`
- [x] `src/storage/schema.ts`
 - [x] `src/sync/schema.ts`
 - [x] `src/tool/schema.ts`
- [x] `src/util/schema.ts`

 ### Session domain

@@ -254,29 +240,29 @@ Working rule for this cluster:
 5. Errors and event payloads last
   - `NamedError.create(...)` shapes can stay temporarily if converting them to
     `Schema.TaggedErrorClass` would force unrelated churn
-   - `SyncEvent.define(...)` and `BusEvent.define(...)` payloads can use
-     derived `.zod` at remaining zod-based HTTP/OpenAPI boundaries
+   - `SyncEvent.define(...)` and `BusEvent.define(...)` payloads can keep using
+     derived `.zod` until the sync/bus layers are migrated

 Possible later tightening after the Schema-first migration is stable:

 - promote repeated opaque strings and timestamp numbers into branded/newtype
  leaf schemas where that adds domain value without changing the wire format

- [x] `src/session/compaction.ts`
- [x] `src/session/message-v2.ts`
- [x] `src/session/message.ts`
- [x] `src/session/prompt.ts`
- [x] `src/session/revert.ts`
- [x] `src/session/session.ts`
- [x] `src/session/status.ts`
- [x] `src/session/summary.ts`
- [x] `src/session/todo.ts`
+- [ ] `src/session/compaction.ts`
+- [ ] `src/session/message-v2.ts`
+- [ ] `src/session/message.ts`
+- [ ] `src/session/prompt.ts`
+- [ ] `src/session/revert.ts`
+- [ ] `src/session/session.ts`
+- [ ] `src/session/status.ts`
+- [ ] `src/session/summary.ts`
+- [ ] `src/session/todo.ts`

 ### Provider domain

- [x] `src/provider/auth.ts`
- [x] `src/provider/models.ts`
- [x] `src/provider/provider.ts`
+- [ ] `src/provider/auth.ts`
+- [ ] `src/provider/models.ts`
+- [ ] `src/provider/provider.ts`

 ### Tool schemas

@@ -284,25 +270,25 @@ Each tool declares its parameters via a zod schema. Tools are consumed by
 both the in-process runtime and the AI SDK's tool-calling layer, so the
 emitted JSON Schema must stay byte-identical.

- [x] `src/tool/apply_patch.ts`
- [x] `src/tool/bash.ts`
- [x] `src/tool/codesearch.ts`
- [x] `src/tool/edit.ts`
- [x] `src/tool/glob.ts`
- [x] `src/tool/grep.ts`
- [x] `src/tool/invalid.ts`
- [x] `src/tool/lsp.ts`
- [x] `src/tool/plan.ts`
- [x] `src/tool/question.ts`
- [x] `src/tool/read.ts`
- [x] `src/tool/registry.ts`
- [x] `src/tool/skill.ts`
- [x] `src/tool/task.ts`
- [x] `src/tool/todo.ts`
- [x] `src/tool/tool.ts`
- [x] `src/tool/webfetch.ts`
- [x] `src/tool/websearch.ts`
- [x] `src/tool/write.ts`
+- [ ] `src/tool/apply_patch.ts`
+- [ ] `src/tool/bash.ts`
+- [ ] `src/tool/codesearch.ts`
+- [ ] `src/tool/edit.ts`
+- [ ] `src/tool/glob.ts`
+- [ ] `src/tool/grep.ts`
+- [ ] `src/tool/invalid.ts`
+- [ ] `src/tool/lsp.ts`
+- [ ] `src/tool/plan.ts`
+- [ ] `src/tool/question.ts`
+- [ ] `src/tool/read.ts`
+- [ ] `src/tool/registry.ts`
+- [ ] `src/tool/skill.ts`
+- [ ] `src/tool/task.ts`
+- [ ] `src/tool/todo.ts`
+- [ ] `src/tool/tool.ts`
+- [ ] `src/tool/webfetch.ts`
+- [ ] `src/tool/websearch.ts`
+- [ ] `src/tool/write.ts`

 ### HTTP route boundaries

@@ -313,8 +299,8 @@ which means touching them is largely mechanical once the domain side is
 done.

 - [ ] `src/server/error.ts`
- [x] `src/server/event.ts`
- [x] `src/server/projectors.ts`
+- [ ] `src/server/event.ts`
+- [ ] `src/server/projectors.ts`
 - [ ] `src/server/routes/control/index.ts`
 - [ ] `src/server/routes/control/workspace.ts`
 - [ ] `src/server/routes/global.ts`
@@ -346,7 +332,7 @@ piecewise.

 - [ ] `src/acp/agent.ts`
 - [ ] `src/agent/agent.ts`
- [x] `src/bus/bus-event.ts`
+- [ ] `src/bus/bus-event.ts`
 - [ ] `src/bus/index.ts`
 - [ ] `src/cli/cmd/tui/config/tui-migrate.ts`
 - [ ] `src/cli/cmd/tui/config/tui-schema.ts`
@@ -354,9 +340,9 @@ piecewise.
 - [ ] `src/cli/cmd/tui/event.ts`
 - [ ] `src/cli/ui.ts`
 - [ ] `src/command/index.ts`
- [x] `src/control-plane/adaptors/worktree.ts`
- [x] `src/control-plane/types.ts`
- [x] `src/control-plane/workspace.ts`
+- [ ] `src/control-plane/adaptors/worktree.ts`
+- [ ] `src/control-plane/types.ts`
+- [ ] `src/control-plane/workspace.ts`
 - [ ] `src/file/index.ts`
 - [ ] `src/file/ripgrep.ts`
 - [ ] `src/file/watcher.ts`
@@ -376,7 +362,7 @@ piecewise.
 - [ ] `src/snapshot/index.ts`
 - [ ] `src/storage/db.ts`
 - [ ] `src/storage/storage.ts`
- [x] `src/sync/index.ts` — public API (`SyncEvent.define`) is Schema-first; `payloads()` still derives zod for the remaining HTTP/OpenAPI boundary
+- [ ] `src/sync/index.ts`
 - [ ] `src/util/fn.ts`
 - [ ] `src/util/log.ts`
 - [ ] `src/util/update-schema.ts`
@@ -372,7 +372,7 @@ export class Agent implements ACPAgent {
              }

              if (part.tool === "todowrite") {
-                const parsedTodos = z.array(Todo.Info.zod).safeParse(JSON.parse(part.state.output))
+                const parsedTodos = z.array(Todo.Info).safeParse(JSON.parse(part.state.output))
                if (parsedTodos.success) {
                  await this.connection
                    .sessionUpdate({
@@ -901,7 +901,7 @@ export class Agent implements ACPAgent {
            }

            if (part.tool === "todowrite") {
-              const parsedTodos = z.array(Todo.Info.zod).safeParse(JSON.parse(part.state.output))
+              const parsedTodos = z.array(Todo.Info).safeParse(JSON.parse(part.state.output))
              if (parsedTodos.success) {
                await this.connection
                  .sessionUpdate({
@@ -1,19 +1,15 @@
 import z from "zod"
-import { Schema } from "effect"
-import { zodObject } from "@/util/effect-zod"
+import type { ZodType } from "zod"

-export type Definition<Type extends string = string, Properties extends Schema.Top = Schema.Top> = {
-  type: Type
-  properties: Properties
-}
+export type Definition = ReturnType<typeof define>

 const registry = new Map<string, Definition>()

-export function define<Type extends string, Properties extends Schema.Top>(
-  type: Type,
-  properties: Properties,
-): Definition<Type, Properties> {
-  const result = { type, properties }
+export function define<Type extends string, Properties extends ZodType>(type: Type, properties: Properties) {
+  const result = {
+    type,
+    properties,
+  }
  registry.set(type, result)
  return result
 }
@@ -25,7 +21,7 @@ export function payloads() {
      return z
        .object({
          type: z.literal(type),
-          properties: zodObject(def.properties),
+          properties: def.properties,
        })
        .meta({
          ref: `Event.${def.type}`,
@@ -1,4 +1,5 @@
-import { Effect, Exit, Layer, PubSub, Scope, Context, Stream, Schema } from "effect"
+import z from "zod"
+import { Effect, Exit, Layer, PubSub, Scope, Context, Stream } from "effect"
 import { EffectBridge } from "@/effect"
 import { Log } from "../util"
 import { BusEvent } from "./bus-event"
@@ -8,18 +9,16 @@ import { makeRuntime } from "@/effect/run-service"

 const log = Log.create({ service: "bus" })

-type BusProperties<D extends BusEvent.Definition<string, Schema.Top>> = Schema.Schema.Type<D["properties"]>
-
 export const InstanceDisposed = BusEvent.define(
  "server.instance.disposed",
-  Schema.Struct({
-    directory: Schema.String,
+  z.object({
+    directory: z.string(),
  }),
 )

 type Payload<D extends BusEvent.Definition = BusEvent.Definition> = {
  type: D["type"]
-  properties: BusProperties<D>
+  properties: z.infer<D["properties"]>
 }

 type State = {
@@ -28,7 +27,10 @@ type State = {
 }

 export interface Interface {
-  readonly publish: <D extends BusEvent.Definition>(def: D, properties: BusProperties<D>) => Effect.Effect<void>
+  readonly publish: <D extends BusEvent.Definition>(
+    def: D,
+    properties: z.output<D["properties"]>,
+  ) => Effect.Effect<void>
  readonly subscribe: <D extends BusEvent.Definition>(def: D) => Stream.Stream<Payload<D>>
  readonly subscribeAll: () => Stream.Stream<Payload>
  readonly subscribeCallback: <D extends BusEvent.Definition>(
@@ -77,7 +79,7 @@ export const layer = Layer.effect(
      })
    }

-    function publish<D extends BusEvent.Definition>(def: D, properties: BusProperties<D>) {
+    function publish<D extends BusEvent.Definition>(def: D, properties: z.output<D["properties"]>) {
      return Effect.gen(function* () {
        const s = yield* InstanceState.get(state)
        const payload: Payload = { type: def.type, properties }
@@ -173,11 +175,14 @@ const { runPromise, runSync } = makeRuntime(Service, layer)

 // runSync is safe here because the subscribe chain (InstanceState.get, PubSub.subscribe,
 // Scope.make, Effect.forkScoped) is entirely synchronous. If any step becomes async, this will throw.
-export async function publish<D extends BusEvent.Definition>(def: D, properties: BusProperties<D>) {
+export async function publish<D extends BusEvent.Definition>(def: D, properties: z.output<D["properties"]>) {
  return runPromise((svc) => svc.publish(def, properties))
 }

-export function subscribe<D extends BusEvent.Definition>(def: D, callback: (event: Payload<D>) => unknown) {
+export function subscribe<D extends BusEvent.Definition>(
+  def: D,
+  callback: (event: { type: D["type"]; properties: z.infer<D["properties"]> }) => unknown,
+) {
  return runSync((svc) => svc.subscribeCallback(def, callback))
 }

@@ -11,7 +11,6 @@ import { ShareNext } from "../../share"
 import { EOL } from "os"
 import { Filesystem } from "../../util"
 import { AppRuntime } from "@/effect/app-runtime"
-import { Schema } from "effect"

 /** Discriminated union returned by the ShareNext API (GET /api/shares/:id/data) */
 export type ShareData =
@@ -155,10 +154,10 @@ export const ImportCommand = cmd({
        return
      }

-      const info = Schema.decodeUnknownSync(Session.Info)({
+      const info = Session.Info.parse({
        ...exportData.info,
        projectID: Instance.project.id,
-      }) as Session.Info
+      })
      const row = Session.toRow(info)
      Database.use((db) =>
        db
@@ -24,7 +24,6 @@ import { DialogProvider as DialogProviderList } from "@tui/component/dialog-prov
 import { ErrorComponent } from "@tui/component/error-component"
 import { PluginRouteMissing } from "@tui/component/plugin-route-missing"
 import { ProjectProvider } from "@tui/context/project"
-import { EditorContextProvider } from "@tui/context/editor"
 import { useEvent } from "@tui/context/event"
 import { SDKProvider, useSDK } from "@tui/context/sdk"
 import { StartupLoading } from "@tui/component/startup-loading"
@@ -178,9 +177,7 @@ export function tui(input: {
                                        <FrecencyProvider>
                                          <PromptHistoryProvider>
                                            <PromptRefProvider>
-                                              <EditorContextProvider>
-                                                <App onSnapshot={input.onSnapshot} />
-                                              </EditorContextProvider>
+                                              <App onSnapshot={input.onSnapshot} />
                                            </PromptRefProvider>
                                          </PromptHistoryProvider>
                                        </FrecencyProvider>
@@ -1,11 +1,9 @@
 import type { BoxRenderable, TextareaRenderable, KeyEvent, ScrollBoxRenderable } from "@opentui/core"
 import { pathToFileURL } from "bun"
 import fuzzysort from "fuzzysort"
-import path from "path"
 import { firstBy } from "remeda"
 import { createMemo, createResource, createEffect, onMount, onCleanup, Index, Show, createSignal } from "solid-js"
 import { createStore } from "solid-js/store"
-import { useEditorContext } from "@tui/context/editor"
 import { useSDK } from "@tui/context/sdk"
 import { useSync } from "@tui/context/sync"
 import { getScrollAcceleration } from "../../util/scroll"
@@ -79,7 +77,6 @@ export function Autocomplete(props: {
  agentStyleId: number
  promptPartTypeId: () => number
 }) {
-  const editor = useEditorContext()
  const sdk = useSDK()
  const sync = useSync()
  const command = useCommandDialog()
@@ -224,70 +221,6 @@ export function Autocomplete(props: {
    }
  }

-  function createFilePart(item: string, lineRange?: { startLine: number; endLine?: number }) {
-    const baseDir = (sync.path.directory || process.cwd()).replace(/\/+$/, "")
-    const fullPath = path.isAbsolute(item) ? item : path.join(baseDir, item)
-    const urlObj = pathToFileURL(fullPath)
-    const filename =
-      lineRange && !item.endsWith("/")
-        ? `${item}#${lineRange.startLine}${lineRange.endLine ? `-${lineRange.endLine}` : ""}`
-        : item
-
-    if (lineRange && !item.endsWith("/")) {
-      urlObj.searchParams.set("start", String(lineRange.startLine))
-      if (lineRange.endLine !== undefined) {
-        urlObj.searchParams.set("end", String(lineRange.endLine))
-      }
-    }
-
-    return {
-      filename,
-      url: urlObj.href,
-      part: {
-        type: "file" as const,
-        mime: "text/plain",
-        filename,
-        url: urlObj.href,
-        source: {
-          type: "file" as const,
-          text: {
-            start: 0,
-            end: 0,
-            value: "",
-          },
-          path: item,
-        },
-      },
-    }
-  }
-
-  function normalizeMentionPath(filePath: string) {
-    const baseDir = sync.path.directory || process.cwd()
-    const absolute = path.resolve(filePath)
-    const relative = path.relative(baseDir, absolute)
-
-    if (relative && !relative.startsWith("..") && !path.isAbsolute(relative)) {
-      return relative.split(path.sep).join("/")
-    }
-
-    return absolute.split(path.sep).join("/")
-  }
-
-  function insertFileMention(input: { filePath: string; lineStart: number; lineEnd: number }) {
-    const item = normalizeMentionPath(input.filePath)
-    const lineRange = {
-      startLine: input.lineStart,
-      endLine: input.lineEnd > input.lineStart ? input.lineEnd : undefined,
-    }
-    const { filename, part } = createFilePart(item, lineRange)
-    const index = store.visible === "@" ? store.index : props.input().cursorOffset
-
-    command.keybinds(true)
-    setStore("visible", false)
-    setStore("index", index)
-    insertPart(filename, part)
-  }
-
  const [files] = createResource(
    () => search(),
    async (query) => {
@@ -317,7 +250,18 @@ export function Autocomplete(props: {
        const width = props.anchor().width - 4
        options.push(
          ...sortedFiles.map((item): AutocompleteOption => {
-            const { filename, url, part } = createFilePart(item, lineRange)
+            const baseDir = (sync.path.directory || process.cwd()).replace(/\/+$/, "")
+            const fullPath = `${baseDir}/${item}`
+            const urlObj = pathToFileURL(fullPath)
+            let filename = item
+            if (lineRange && !item.endsWith("/")) {
+              filename = `${item}#${lineRange.startLine}${lineRange.endLine ? `-${lineRange.endLine}` : ""}`
+              urlObj.searchParams.set("start", String(lineRange.startLine))
+              if (lineRange.endLine !== undefined) {
+                urlObj.searchParams.set("end", String(lineRange.endLine))
+              }
+            }
+            const url = urlObj.href

            const isDir = item.endsWith("/")
            return {
@@ -326,7 +270,21 @@ export function Autocomplete(props: {
              isDirectory: isDir,
              path: item,
              onSelect: () => {
-                insertPart(filename, part)
+                insertPart(filename, {
+                  type: "file",
+                  mime: "text/plain",
+                  filename,
+                  url,
+                  source: {
+                    type: "file",
+                    text: {
+                      start: 0,
+                      end: 0,
+                      value: "",
+                    },
+                    path: item,
+                  },
+                })
              },
            }
          }),
@@ -543,14 +501,6 @@ export function Autocomplete(props: {
  }

  onMount(() => {
-    const unsubscribeMention = editor.onMention((mention) => {
-      insertFileMention(mention)
-    })
-
-    onCleanup(() => {
-      unsubscribeMention()
-    })
-
    props.ref({
      get visible() {
        return store.visible
@@ -12,7 +12,6 @@ import { useRoute } from "@tui/context/route"
 import { useProject } from "@tui/context/project"
 import { useSync } from "@tui/context/sync"
 import { useEvent } from "@tui/context/event"
-import { useEditorContext } from "@tui/context/editor"
 import { MessageID, PartID } from "@/session/schema"
 import { createStore, produce, unwrap } from "solid-js/store"
 import { useKeybind } from "@tui/context/keybind"
@@ -22,7 +21,7 @@ import { usePromptStash } from "./stash"
 import { DialogStash } from "../dialog-stash"
 import { type AutocompleteRef, Autocomplete } from "./autocomplete"
 import { useCommandDialog } from "../dialog-command"
-import { useRenderer, useTerminalDimensions, type JSX } from "@opentui/solid"
+import { useRenderer, type JSX } from "@opentui/solid"
 import * as Editor from "@tui/util/editor"
 import { useExit } from "../../context/exit"
 import * as Clipboard from "../../util/clipboard"
@@ -95,7 +94,6 @@ export function Prompt(props: PromptProps) {
  const local = useLocal()
  const args = useArgs()
  const sdk = useSDK()
-  const editor = useEditorContext()
  const route = useRoute()
  const project = useProject()
  const sync = useSync()
@@ -106,34 +104,11 @@ export function Prompt(props: PromptProps) {
  const stash = usePromptStash()
  const command = useCommandDialog()
  const renderer = useRenderer()
-  const dimensions = useTerminalDimensions()
  const { theme, syntax } = useTheme()
  const kv = useKV()
  const animationsEnabled = createMemo(() => kv.get("animations_enabled", true))
  const list = createMemo(() => props.placeholders?.normal ?? [])
  const shell = createMemo(() => props.placeholders?.shell ?? [])
-  const editorPath = createMemo(() => editor.selection()?.filePath)
-  const editorSelectionLabel = createMemo(() => {
-    const selection = editor.selection()?.selection
-    if (!selection) return
-    if (selection.start.line === selection.end.line && selection.start.character === selection.end.character) return
-    if (selection.start.line === selection.end.line) return `#${selection.start.line}`
-    return `#${selection.start.line}-${selection.end.line}`
-  })
-  const editorFileLabel = createMemo(() => {
-    const value = editorPath()
-    if (!value) return
-    const filename = path.basename(value)
-    const file = /^index\.[^./]+$/.test(filename)
-      ? [path.basename(path.dirname(value)), filename].filter(Boolean).join("/")
-      : filename
-    return `${file.split(path.sep).join("/")}${editorSelectionLabel() ?? ""}`
-  })
-  const editorFileLabelDisplay = createMemo(() => {
-    const file = editorFileLabel()
-    if (!file) return
-    return Locale.truncateMiddle(file, Math.max(12, Math.min(48, Math.floor(dimensions().width / 3))))
-  })
  const [auto, setAuto] = createSignal<AutocompleteRef>()
  const currentProviderLabel = createMemo(() => local.model.parsed().provider)
  const hasRightContent = createMemo(() => Boolean(props.right))
@@ -746,27 +721,6 @@ export function Prompt(props: PromptProps) {
    // Capture mode before it gets reset
    const currentMode = store.mode
    const variant = local.model.variant.current()
-    const editorSelection = editor.selection()
-    const editorParts = editorSelection
-      ? [
-          {
-            id: PartID.ascending(),
-            type: "text" as const,
-            text: (() => {
-              const start = editorSelection.selection.start
-              const end = editorSelection.selection.end
-              if (start.line === end.line && start.character === end.character) {
-                return `Note: The user opened the file "${editorSelection.filePath}".`
-              }
-              if (start.line === end.line) {
-                return `Note: The user selected line ${start.line} from  "${editorSelection.filePath}": ${editorSelection.text}`
-              }
-              return `Note: The user selected lines ${start.line} to ${end.line} from "${editorSelection.filePath}": ${editorSelection.text}`
-            })(),
-            synthetic: true,
-          },
-        ]
-      : []

    if (store.mode === "shell") {
      void sdk.client.session.shell({
@@ -819,7 +773,6 @@ export function Prompt(props: PromptProps) {
          model: selectedModel,
          variant,
          parts: [
-            ...editorParts,
            {
              id: PartID.ascending(),
              type: "text",
@@ -1379,7 +1332,6 @@ export function Prompt(props: PromptProps) {
          </Show>
          <Show when={status().type !== "retry"}>
            <box gap={2} flexDirection="row">
-              <Show when={editorFileLabelDisplay()}>{(file) => <text fg={theme.secondary}>{file()}</text>}</Show>
              <Switch>
                <Match when={store.mode === "normal"}>
                  <Switch>
@@ -1,319 +0,0 @@
-import { readdirSync, readFileSync, statSync } from "node:fs"
-import os from "node:os"
-import path from "node:path"
-import { onCleanup, onMount } from "solid-js"
-import { createStore } from "solid-js/store"
-import z from "zod"
-import { createSimpleContext } from "./helper"
-
-const MCP_PROTOCOL_VERSION = "2025-11-25"
-
-const JsonRpcMessageSchema = z.object({
-  id: z.union([z.number(), z.string(), z.null()]).optional(),
-  method: z.string().optional(),
-  params: z.unknown().optional(),
-  result: z.unknown().optional(),
-  error: z
-    .object({
-      code: z.number().optional(),
-      message: z.string().optional(),
-    })
-    .optional(),
-})
-
-const PositionSchema = z.object({
-  line: z.number(),
-  character: z.number(),
-})
-
-const EditorSelectionSchema = z.object({
-  text: z.string(),
-  filePath: z.string(),
-  selection: z.object({
-    start: PositionSchema,
-    end: PositionSchema,
-  }),
-})
-
-const EditorMentionSchema = z.object({
-  filePath: z.string(),
-  lineStart: z.number(),
-  lineEnd: z.number(),
-})
-
-const EditorServerInfoSchema = z.object({
-  protocolVersion: z.string().optional(),
-  serverInfo: z
-    .object({
-      name: z.string().optional(),
-      version: z.string().optional(),
-    })
-    .optional(),
-})
-
-type JsonRpcMessage = z.infer<typeof JsonRpcMessageSchema>
-export type EditorSelection = z.infer<typeof EditorSelectionSchema>
-export type EditorMention = z.infer<typeof EditorMentionSchema>
-type EditorServerInfo = z.infer<typeof EditorServerInfoSchema>
-
-type EditorConnection = {
-  url: string
-  authToken?: string
-  source: string
-}
-
-type EditorLockFile = {
-  port: number
-  authToken?: string
-  transport?: string
-  workspaceFolders: string[]
-  mtimeMs: number
-}
-
-export const { use: useEditorContext, provider: EditorContextProvider } = createSimpleContext({
-  name: "EditorContext",
-  init: () => {
-    const mentionListeners = new Set<(mention: EditorMention) => void>()
-    const [store, setStore] = createStore<{
-      status: "disabled" | "connecting" | "connected"
-      selection: EditorSelection | undefined
-      server: EditorServerInfo | undefined
-    }>({
-      status: "disabled",
-      selection: undefined,
-      server: undefined,
-    })
-
-    onMount(() => {
-      let socket: WebSocket | undefined
-      let closed = false
-      let reconnect: ReturnType<typeof setTimeout> | undefined
-      let attempt = 0
-      let requestID = 0
-      const pending = new Map<number, string>()
-
-      const send = (payload: JsonRpcMessage) => {
-        if (!socket || socket.readyState !== WebSocket.OPEN) return
-        socket.send(JSON.stringify({ jsonrpc: "2.0", ...payload }))
-      }
-
-      const request = (method: string, params?: unknown) => {
-        requestID += 1
-        pending.set(requestID, method)
-        send({ id: requestID, method, params })
-      }
-
-      const scheduleReconnect = (delay: number) => {
-        if (closed) return
-        if (reconnect) clearTimeout(reconnect)
-        reconnect = setTimeout(connect, delay)
-      }
-
-      const connect = () => {
-        if (closed) return
-
-        const connection = resolveEditorConnection()
-        if (!connection) {
-          setStore("status", "disabled")
-          scheduleReconnect(1000)
-          return
-        }
-
-        setStore("status", "connecting")
-        const current = openEditorSocket(connection)
-        socket = current
-
-        current.addEventListener("open", () => {
-          if (socket !== current) {
-            current.close()
-            return
-          }
-
-          attempt = 0
-          setStore("status", "connected")
-          request("initialize", {
-            protocolVersion: MCP_PROTOCOL_VERSION,
-            capabilities: {},
-            clientInfo: { name: "opencode", version: "0.0.0" },
-          })
-        })
-
-        current.addEventListener("message", (event) => {
-          const message = parseMessage(event.data)
-          if (!message) return
-
-          const selection =
-            message.method === "selection_changed" ? EditorSelectionSchema.safeParse(message.params) : undefined
-          if (selection?.success) {
-            setStore("selection", selection.data)
-            return
-          }
-
-          const mention = message.method === "at_mentioned" ? EditorMentionSchema.safeParse(message.params) : undefined
-          if (mention?.success) {
-            mentionListeners.forEach((listener) => listener(mention.data))
-            return
-          }
-
-          if (typeof message.id !== "number") return
-
-          const method = pending.get(message.id)
-          if (!method) return
-
-          pending.delete(message.id)
-          if (message.error) return
-
-          const initialize = method === "initialize" ? EditorServerInfoSchema.safeParse(message.result) : undefined
-          if (initialize?.success) {
-            setStore("server", initialize.data)
-            send({ method: "notifications/initialized" })
-            return
-          }
-        })
-
-        current.addEventListener("close", () => {
-          if (socket !== current) return
-
-          socket = undefined
-          pending.clear()
-          if (closed) return
-
-          setStore("status", "connecting")
-          attempt += 1
-          const delay = Math.min(1000 * 2 ** (attempt - 1), 30000)
-          scheduleReconnect(delay)
-        })
-      }
-
-      scheduleReconnect(0)
-
-      onCleanup(() => {
-        closed = true
-        if (reconnect) clearTimeout(reconnect)
-        socket?.close()
-      })
-    })
-
-    return {
-      enabled() {
-        return Boolean(resolveEditorConnection())
-      },
-      connected() {
-        return store.status === "connected"
-      },
-      selection() {
-        return store.selection
-      },
-      onMention(listener: (mention: EditorMention) => void) {
-        mentionListeners.add(listener)
-        return () => mentionListeners.delete(listener)
-      },
-      server() {
-        return store.server
-      },
-    }
-  },
-})
-
-function parsePort(value: string | undefined) {
-  if (!value) return
-
-  const parsed = Number.parseInt(value, 10)
-  if (!Number.isInteger(parsed) || parsed <= 0 || parsed > 65535) return
-  return parsed
-}
-
-function resolveEditorConnection(): EditorConnection | undefined {
-  const lock = resolveEditorLockFile()
-  if (lock) {
-    return {
-      url: `ws://127.0.0.1:${lock.port}`,
-      authToken: lock.authToken,
-      source: `lock:${lock.port}`,
-    }
-  }
-
-  const port = parsePort(process.env.CLAUDE_CODE_SSE_PORT || process.env.OPENCODE_EDITOR_SSE_PORT)
-  if (!port) return
-  return {
-    url: `ws://127.0.0.1:${port}`,
-    source: `env:${port}`,
-  }
-}
-
-function resolveEditorLockFile() {
-  const directory = path.join(os.homedir(), ".claude", "ide")
-  let entries: string[]
-
-  try {
-    entries = readdirSync(directory)
-  } catch {
-    return
-  }
-
-  const cwd = process.cwd()
-  const locks = entries
-    .filter((entry) => entry.endsWith(".lock"))
-    .map((entry) => readEditorLockFile(path.join(directory, entry)))
-    .filter((entry): entry is EditorLockFile => Boolean(entry))
-    .sort((left, right) => scoreEditorLock(right, cwd) - scoreEditorLock(left, cwd))
-
-  return locks[0]
-}
-
-function readEditorLockFile(filePath: string): EditorLockFile | undefined {
-  const port = parsePort(path.basename(filePath, ".lock"))
-  if (!port) return
-
-  try {
-    const parsed = JSON.parse(readFileSync(filePath, "utf-8")) as unknown
-    if (!isRecord(parsed)) return
-    if (parsed.transport !== undefined && parsed.transport !== "ws") return
-
-    return {
-      port,
-      authToken: typeof parsed.authToken === "string" ? parsed.authToken : undefined,
-      transport: typeof parsed.transport === "string" ? parsed.transport : undefined,
-      workspaceFolders: Array.isArray(parsed.workspaceFolders)
-        ? parsed.workspaceFolders.filter((value): value is string => typeof value === "string")
-        : [],
-      mtimeMs: statSync(filePath).mtimeMs,
-    }
-  } catch {
-    return
-  }
-}
-
-function scoreEditorLock(lock: EditorLockFile, cwd: string) {
-  const workspaceMatch = lock.workspaceFolders.some((folder) => pathContains(folder, cwd)) ? 1 : 0
-  return workspaceMatch * 1_000_000_000_000 + lock.mtimeMs
-}
-
-function pathContains(parent: string, child: string) {
-  const relative = path.relative(path.resolve(parent), path.resolve(child))
-  return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative))
-}
-
-function openEditorSocket(connection: EditorConnection) {
-  if (!connection.authToken) return new WebSocket(connection.url)
-
-  return new WebSocket(connection.url, {
-    headers: {
-      "x-claude-code-ide-authorization": connection.authToken,
-    },
-  } as any)
-}
-
-function parseMessage(value: unknown) {
-  if (typeof value !== "string") return
-
-  try {
-    return JsonRpcMessageSchema.parse(JSON.parse(value))
-  } catch {
-    return
-  }
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value)
-}
@@ -1,14 +1,14 @@
 import { BusEvent } from "@/bus/bus-event"
 import { SessionID } from "@/session/schema"
-import { Schema } from "effect"
+import z from "zod"

 export const TuiEvent = {
-  PromptAppend: BusEvent.define("tui.prompt.append", Schema.Struct({ text: Schema.String })),
+  PromptAppend: BusEvent.define("tui.prompt.append", z.object({ text: z.string() })),
  CommandExecute: BusEvent.define(
    "tui.command.execute",
-    Schema.Struct({
-      command: Schema.Union([
-        Schema.Literals([
+    z.object({
+      command: z.union([
+        z.enum([
          "session.list",
          "session.new",
          "session.share",
@@ -26,23 +26,23 @@ export const TuiEvent = {
          "prompt.submit",
          "agent.cycle",
        ]),
-        Schema.String,
+        z.string(),
      ]),
    }),
  ),
  ToastShow: BusEvent.define(
    "tui.toast.show",
-    Schema.Struct({
-      title: Schema.optional(Schema.String),
-      message: Schema.String,
-      variant: Schema.Literals(["info", "success", "warning", "error"]),
-      duration: Schema.optional(Schema.Number).annotate({ description: "Duration in milliseconds" }),
+    z.object({
+      title: z.string().optional(),
+      message: z.string(),
+      variant: z.enum(["info", "success", "warning", "error"]),
+      duration: z.number().default(5000).optional().describe("Duration in milliseconds"),
    }),
  ),
  SessionSelect: BusEvent.define(
    "tui.session.select",
-    Schema.Struct({
-      sessionID: SessionID.annotate({ description: "Session ID to navigate to" }),
+    z.object({
+      sessionID: SessionID.zod.describe("Session ID to navigate to"),
    }),
  ),
 }
@@ -1250,17 +1250,7 @@ function UserMessage(props: {
 }) {
  const ctx = use()
  const local = useLocal()
-  const text = createMemo(() => {
-    const texts = props.parts
-      .map((x) => {
-        if (x.type === "text" && !x.synthetic) {
-          return x.text
-        }
-        return null
-      })
-      .filter(Boolean)
-    return texts.join("\n\n")
-  })
+  const text = createMemo(() => props.parts.flatMap((x) => (x.type === "text" && !x.synthetic ? [x] : []))[0])
  const files = createMemo(() => props.parts.flatMap((x) => (x.type === "file" ? [x] : [])))
  const { theme } = useTheme()
  const [hover, setHover] = createSignal(false)
@@ -1295,7 +1285,7 @@ function UserMessage(props: {
            backgroundColor={hover() ? theme.backgroundElement : theme.backgroundPanel}
            flexShrink={0}
          >
-            <text fg={theme.text}>{text()}</text>
+            <text fg={theme.text}>{text()?.text}</text>
            <Show when={files().length}>
              <box flexDirection="row" paddingBottom={metadataVisible() ? 1 : 0} paddingTop={1} gap={1} flexWrap="wrap">
                <For each={files()}>
@@ -4,10 +4,10 @@ import { useTheme } from "@tui/context/theme"
 import { useTerminalDimensions } from "@opentui/solid"
 import { SplitBorder } from "../component/border"
 import { TextAttributes } from "@opentui/core"
-import { Schema } from "effect"
+import z from "zod"
 import { type TuiEvent } from "../event"

-export type ToastOptions = Schema.Schema.Type<typeof TuiEvent.ToastShow.properties>
+export type ToastOptions = z.infer<typeof TuiEvent.ToastShow.properties>

 export function Toast() {
  const toast = useToast()
@@ -3,7 +3,7 @@ import { InstanceState } from "@/effect"
 import { EffectBridge } from "@/effect"
 import type { InstanceContext } from "@/project/instance"
 import { SessionID, MessageID } from "@/session/schema"
-import { Effect, Layer, Context, Schema } from "effect"
+import { Effect, Layer, Context } from "effect"
 import z from "zod"
 import { Config } from "../config"
 import { MCP } from "../mcp"
@@ -18,11 +18,11 @@ type State = {
 export const Event = {
  Executed: BusEvent.define(
    "command.executed",
-    Schema.Struct({
-      name: Schema.String,
-      sessionID: SessionID,
-      arguments: Schema.String,
-      messageID: MessageID,
+    z.object({
+      name: z.string(),
+      sessionID: SessionID.zod,
+      arguments: z.string(),
+      messageID: MessageID.zod,
    }),
  ),
 }
@@ -4,7 +4,6 @@ import { Schema } from "effect"
 import z from "zod"
 import { Bus } from "@/bus"
 import { zod } from "@/util/effect-zod"
-import { PositiveInt } from "@/util/schema"
 import { Log } from "../util"
 import { NamedError } from "@opencode-ai/shared/util/error"
 import { Glob } from "@opencode-ai/shared/util/glob"
@@ -16,6 +15,8 @@ import { ConfigPermission } from "./permission"

 const log = Log.create({ service: "config" })

+const PositiveInt = Schema.Number.check(Schema.isInt()).check(Schema.isGreaterThan(0))
+
 const Color = Schema.Union([
  Schema.String.check(Schema.isPattern(/^#[0-9a-fA-F]{6}$/)),
  Schema.Literals(["primary", "secondary", "accent", "success", "warning", "error", "info"]),
@@ -25,7 +25,7 @@ import { Context, Duration, Effect, Exit, Fiber, Layer, Option, Schema } from "e
 import { EffectFlock } from "@opencode-ai/shared/util/effect-flock"
 import { InstanceRef } from "@/effect/instance-ref"
 import { zod, ZodOverride } from "@/util/effect-zod"
-import { NonNegativeInt, PositiveInt, withStatics, type DeepMutable } from "@/util/schema"
+import { withStatics } from "@/util/schema"
 import { ConfigAgent } from "./agent"
 import { ConfigCommand } from "./command"
 import { ConfigFormatter } from "./formatter"
@@ -88,6 +88,9 @@ export type Layout = ConfigLayout.Layout
 const AgentRef = Schema.Any.annotate({ [ZodOverride]: ConfigAgent.Info })
 const LogLevelRef = Schema.Any.annotate({ [ZodOverride]: Log.Level })

+const PositiveInt = Schema.Number.check(Schema.isInt()).check(Schema.isGreaterThan(0))
+const NonNegativeInt = Schema.Number.check(Schema.isInt()).check(Schema.isGreaterThanOrEqualTo(0))
+
 // The Effect Schema is the canonical source of truth. The `.zod` compatibility
 // surface is derived so existing Hono validators keep working without a parallel
 // Zod definition.
@@ -201,19 +204,6 @@ export const Info = Schema.Struct({
      url: Schema.optional(Schema.String).annotate({ description: "Enterprise URL" }),
    }),
  ),
-  tool_output: Schema.optional(
-    Schema.Struct({
-      max_lines: Schema.optional(PositiveInt).annotate({
-        description: "Maximum lines of tool output before it is truncated and saved to disk (default: 2000)",
-      }),
-      max_bytes: Schema.optional(PositiveInt).annotate({
-        description: "Maximum bytes of tool output before it is truncated and saved to disk (default: 51200)",
-      }),
-    }),
-  ).annotate({
-    description:
-      "Thresholds for truncating tool output. When output exceeds either limit, the full text is written to the truncation directory and a preview is returned.",
-  }),
  compaction: Schema.optional(
    Schema.Struct({
      auto: Schema.optional(Schema.Boolean).annotate({
@@ -262,9 +252,26 @@ export const Info = Schema.Struct({
    })),
  )

-// Uses the shared `DeepMutable` from `@/util/schema`. See the definition
-// there for why the local variant is needed over `Types.DeepMutable` from
-// effect-smol (the upstream version collapses `unknown` to `{}`).
+// Schema.Struct produces readonly types by default, but the service code
+// below mutates Info objects directly (e.g. `config.mode = ...`). Strip the
+// readonly recursively so callers get the same mutable shape zod inferred.
+//
+// `Types.DeepMutable` from effect-smol would be a drop-in, but its fallback
+// branch `{ -readonly [K in keyof T]: ... }` collapses `unknown` to `{}`
+// (since `keyof unknown = never`), which widens `Record<string, unknown>`
+// fields like `ConfigPlugin.Options`. The local version gates on
+// `extends object` so `unknown` passes through.
+//
+// Tuple branch preserves `ConfigPlugin.Spec`'s `readonly [string, Options]`
+// shape (otherwise the general array branch widens it to an array).
+type DeepMutable<T> = T extends readonly [unknown, ...unknown[]]
+  ? { -readonly [K in keyof T]: DeepMutable<T[K]> }
+  : T extends readonly (infer U)[]
+    ? DeepMutable<U>[]
+    : T extends object
+      ? { -readonly [K in keyof T]: DeepMutable<T[K]> }
+      : T
+
 export type Info = DeepMutable<Schema.Schema.Type<typeof Info>> & {
  // plugin_origins is derived state, not a persisted config field. It keeps each winning plugin spec together
  // with the file and scope it came from so later runtime code can make location-sensitive decisions.
@@ -1,6 +1,8 @@
 import { Schema } from "effect"
 import { zod } from "@/util/effect-zod"
-import { PositiveInt, withStatics } from "@/util/schema"
+import { withStatics } from "@/util/schema"
+
+const PositiveInt = Schema.Number.check(Schema.isInt()).check(Schema.isGreaterThan(0))

 export const Model = Schema.Struct({
  id: Schema.optional(Schema.String),
@@ -1,9 +1,9 @@
 import { Schema } from "effect"
 import { zod } from "@/util/effect-zod"
-import { PositiveInt, withStatics } from "@/util/schema"
+import { withStatics } from "@/util/schema"

 export const Server = Schema.Struct({
-  port: Schema.optional(PositiveInt).annotate({
+  port: Schema.optional(Schema.Number.check(Schema.isInt()).check(Schema.isGreaterThan(0))).annotate({
    description: "Port to listen on",
  }),
  hostname: Schema.optional(Schema.String).annotate({ description: "Hostname to listen on" }),
@@ -1,6 +1,12 @@
 import { lazy } from "@/util/lazy"
 import type { ProjectID } from "@/project/schema"
-import type { WorkspaceAdaptor, WorkspaceAdaptorEntry } from "../types"
+import type { WorkspaceAdaptor } from "../types"
+
+export type WorkspaceAdaptorEntry = {
+  type: string
+  name: string
+  description: string
+}

 const BUILTIN: Record<string, () => Promise<WorkspaceAdaptor>> = {
  worktree: lazy(async () => (await import("./worktree")).WorktreeAdaptor),
@@ -1,15 +1,13 @@
-import { Schema } from "effect"
+import z from "zod"
 import { AppRuntime } from "@/effect/app-runtime"
 import { Worktree } from "@/worktree"
 import { type WorkspaceAdaptor, WorkspaceInfo } from "../types"
-import { zod } from "@/util/effect-zod"
-import { withStatics } from "@/util/schema"

-const WorktreeConfig = Schema.Struct({
-  name: WorkspaceInfo.fields.name,
-  branch: Schema.String,
-  directory: Schema.String,
-}).pipe(withStatics((s) => ({ zod: zod(s) })))
+const WorktreeConfig = z.object({
+  name: WorkspaceInfo.shape.name,
+  branch: WorkspaceInfo.shape.branch.unwrap(),
+  directory: WorkspaceInfo.shape.directory.unwrap(),
+})

 export const WorktreeAdaptor: WorkspaceAdaptor = {
  name: "Worktree",
@@ -24,7 +22,7 @@ export const WorktreeAdaptor: WorkspaceAdaptor = {
    }
  },
  async create(info) {
-    const config = WorktreeConfig.zod.parse(info)
+    const config = WorktreeConfig.parse(info)
    await AppRuntime.runPromise(
      Worktree.Service.use((svc) =>
        svc.createFromInfo({
@@ -36,11 +34,11 @@ export const WorktreeAdaptor: WorkspaceAdaptor = {
    )
  },
  async remove(info) {
-    const config = WorktreeConfig.zod.parse(info)
+    const config = WorktreeConfig.parse(info)
    await AppRuntime.runPromise(Worktree.Service.use((svc) => svc.remove({ directory: config.directory })))
  },
  target(info) {
-    const config = WorktreeConfig.zod.parse(info)
+    const config = WorktreeConfig.parse(info)
    return {
      type: "local",
      directory: config.directory,
@@ -1,28 +1,17 @@
-import { Schema } from "effect"
+import z from "zod"
 import { ProjectID } from "@/project/schema"
 import { WorkspaceID } from "./schema"
-import { zod } from "@/util/effect-zod"
-import { type DeepMutable, withStatics } from "@/util/schema"

-export const WorkspaceInfo = Schema.Struct({
-  id: WorkspaceID,
-  type: Schema.String,
-  name: Schema.String,
-  branch: Schema.NullOr(Schema.String),
-  directory: Schema.NullOr(Schema.String),
-  extra: Schema.NullOr(Schema.Unknown),
-  projectID: ProjectID,
+export const WorkspaceInfo = z.object({
+  id: WorkspaceID.zod,
+  type: z.string(),
+  name: z.string(),
+  branch: z.string().nullable(),
+  directory: z.string().nullable(),
+  extra: z.unknown().nullable(),
+  projectID: ProjectID.zod,
 })
-  .annotate({ identifier: "Workspace" })
-  .pipe(withStatics((s) => ({ zod: zod(s) })))
-export type WorkspaceInfo = DeepMutable<Schema.Schema.Type<typeof WorkspaceInfo>>
-
-export const WorkspaceAdaptorEntry = Schema.Struct({
-  type: Schema.String,
-  name: Schema.String,
-  description: Schema.String,
-}).pipe(withStatics((s) => ({ zod: zod(s) })))
-export type WorkspaceAdaptorEntry = Schema.Schema.Type<typeof WorkspaceAdaptorEntry>
+export type WorkspaceInfo = z.infer<typeof WorkspaceInfo>

 export type Target =
  | {
@@ -1,4 +1,4 @@
-import { Schema } from "effect"
+import z from "zod"
 import { setTimeout as sleep } from "node:timers/promises"
 import { fn } from "@/util/fn"
 import { Database, asc, eq, inArray } from "@/storage"
@@ -15,7 +15,7 @@ import { ProjectID } from "@/project/schema"
 import { Slug } from "@opencode-ai/shared/util/slug"
 import { WorkspaceTable } from "./workspace.sql"
 import { getAdaptor } from "./adaptors"
-import { type WorkspaceInfo, WorkspaceInfo as WorkspaceInfoSchema } from "./types"
+import { WorkspaceInfo } from "./types"
 import { WorkspaceID } from "./schema"
 import { parseSSE } from "./sse"
 import { Session } from "@/session"
@@ -25,36 +25,36 @@ import { errorData } from "@/util/error"
 import { AppRuntime } from "@/effect/app-runtime"
 import { waitEvent } from "./util"
 import { WorkspaceContext } from "./workspace-context"
-import { NonNegativeInt, withStatics } from "@/util/schema"
-import { zod as effectZod, zodObject } from "@/util/effect-zod"

-export const Info = WorkspaceInfoSchema
-export type Info = WorkspaceInfo
-
-export const ConnectionStatus = Schema.Struct({
-  workspaceID: WorkspaceID,
-  status: Schema.Literals(["connected", "connecting", "disconnected", "error"]),
+export const Info = WorkspaceInfo.meta({
+  ref: "Workspace",
 })
-export type ConnectionStatus = Schema.Schema.Type<typeof ConnectionStatus>
+export type Info = z.infer<typeof Info>

-const Restore = Schema.Struct({
-  workspaceID: WorkspaceID,
-  sessionID: SessionID,
-  total: NonNegativeInt,
-  step: NonNegativeInt,
+export const ConnectionStatus = z.object({
+  workspaceID: WorkspaceID.zod,
+  status: z.enum(["connected", "connecting", "disconnected", "error"]),
+})
+export type ConnectionStatus = z.infer<typeof ConnectionStatus>
+
+const Restore = z.object({
+  workspaceID: WorkspaceID.zod,
+  sessionID: SessionID.zod,
+  total: z.number().int().min(0),
+  step: z.number().int().min(0),
 })

 export const Event = {
  Ready: BusEvent.define(
    "workspace.ready",
-    Schema.Struct({
-      name: Schema.String,
+    z.object({
+      name: z.string(),
    }),
  ),
  Failed: BusEvent.define(
    "workspace.failed",
-    Schema.Struct({
-      message: Schema.String,
+    z.object({
+      message: z.string(),
    }),
  ),
  Restore: BusEvent.define("workspace.restore", Restore),
@@ -73,16 +73,15 @@ function fromRow(row: typeof WorkspaceTable.$inferSelect): Info {
  }
 }

-export const CreateInput = Schema.Struct({
-  id: Schema.optional(WorkspaceID),
-  type: Info.fields.type,
-  branch: Info.fields.branch,
-  projectID: ProjectID,
-  extra: Info.fields.extra,
-}).pipe(withStatics((s) => ({ zod: effectZod(s), zodObject: zodObject(s) })))
-export type CreateInput = Schema.Schema.Type<typeof CreateInput>
+const CreateInput = z.object({
+  id: WorkspaceID.zod.optional(),
+  type: Info.shape.type,
+  branch: Info.shape.branch,
+  projectID: ProjectID.zod,
+  extra: Info.shape.extra,
+})

-export const create = fn(CreateInput.zod, async (input) => {
+export const create = fn(CreateInput, async (input) => {
  const id = WorkspaceID.ascending(input.id)
  const adaptor = await getAdaptor(input.projectID, input.type)

@@ -138,13 +137,12 @@ export const create = fn(CreateInput.zod, async (input) => {
  return info
 })

-export const SessionRestoreInput = Schema.Struct({
-  workspaceID: WorkspaceID,
-  sessionID: SessionID,
-}).pipe(withStatics((s) => ({ zod: effectZod(s), zodObject: zodObject(s) })))
-export type SessionRestoreInput = Schema.Schema.Type<typeof SessionRestoreInput>
+const SessionRestoreInput = z.object({
+  workspaceID: WorkspaceID.zod,
+  sessionID: SessionID.zod,
+})

-export const sessionRestore = fn(SessionRestoreInput.zod, async (input) => {
+export const sessionRestore = fn(SessionRestoreInput, async (input) => {
  log.info("session restore requested", {
    workspaceID: input.workspaceID,
    sessionID: input.sessionID,
@@ -3,7 +3,7 @@ import { InstanceState } from "@/effect"

 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { Git } from "@/git"
-import { Effect, Layer, Context, Schema, Scope } from "effect"
+import { Effect, Layer, Context, Scope } from "effect"
 import * as Stream from "effect/Stream"
 import { formatPatch, structuredPatch } from "diff"
 import fuzzysort from "fuzzysort"
@@ -76,8 +76,8 @@ export type Content = z.infer<typeof Content>
 export const Event = {
  Edited: BusEvent.define(
    "file.edited",
-    Schema.Struct({
-      file: Schema.String,
+    z.object({
+      file: z.string(),
    }),
  ),
 }
@@ -1,4 +1,4 @@
-import { Cause, Effect, Layer, Context, Schema } from "effect"
+import { Cause, Effect, Layer, Context } from "effect"
 // @ts-ignore
 import { createWrapper } from "@parcel/watcher/wrapper"
 import type ParcelWatcher from "@parcel/watcher"
@@ -25,9 +25,9 @@ const SUBSCRIBE_TIMEOUT_MS = 10_000
 export const Event = {
  Updated: BusEvent.define(
    "file.watcher.updated",
-    Schema.Struct({
-      file: Schema.String,
-      event: Schema.Literals(["add", "change", "unlink"]),
+    z.object({
+      file: z.string(),
+      event: z.union([z.literal("add"), z.literal("change"), z.literal("unlink")]),
    }),
  ),
 }
@@ -1,6 +1,5 @@
 import { BusEvent } from "@/bus/bus-event"
 import z from "zod"
-import { Schema } from "effect"
 import { NamedError } from "@opencode-ai/shared/util/error"
 import { Log } from "../util"
 import { Process } from "@/util"
@@ -18,8 +17,8 @@ const log = Log.create({ service: "ide" })
 export const Event = {
  Installed: BusEvent.define(
    "ide.installed",
-    Schema.Struct({
-      ide: Schema.String,
+    z.object({
+      ide: z.string(),
    }),
  ),
 }
@@ -21,14 +21,14 @@ export type ReleaseType = "patch" | "minor" | "major"
 export const Event = {
  Updated: BusEvent.define(
    "installation.updated",
-    Schema.Struct({
-      version: Schema.String,
+    z.object({
+      version: z.string(),
    }),
  ),
  UpdateAvailable: BusEvent.define(
    "installation.update-available",
-    Schema.Struct({
-      version: Schema.String,
+    z.object({
+      version: z.string(),
    }),
  ),
 }
@@ -132,17 +132,6 @@ export const layer: Layer.Layer<Service, never, HttpClient.HttpClient | ChildPro
        Effect.catch(() => Effect.succeed({ code: ChildProcessSpawner.ExitCode(1), stdout: "", stderr: "" })),
      )

-      const viewVersion = Effect.fnUntraced(function* (method: "npm" | "pnpm" | "bun", spec: string) {
-        const args = method === "bun" ? ["pm", "view", spec, "version", "--json"] : ["view", spec, "version", "--json"]
-        const result = yield* run([method, ...args])
-        if (result.code !== 0 || !result.stdout.trim()) {
-          return yield* new UpgradeFailedError({
-            stderr: result.stderr || result.stdout || `Failed to resolve ${spec}`,
-          })
-        }
-        return yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Schema.String))(result.stdout)
-      })
-
      const getBrewFormula = Effect.fnUntraced(function* () {
        const tapFormula = yield* text(["brew", "list", "--formula", "anomalyco/tap/opencode"])
        if (tapFormula.includes("opencode")) return "anomalyco/tap/opencode"
@@ -228,7 +217,15 @@ export const layer: Layer.Layer<Service, never, HttpClient.HttpClient | ChildPro
        }

        if (detectedMethod === "npm" || detectedMethod === "bun" || detectedMethod === "pnpm") {
-          return yield* viewVersion(detectedMethod, `opencode-ai@${InstallationChannel}`)
+          const r = (yield* text(["npm", "config", "get", "registry"])).trim()
+          const reg = r || "https://registry.npmjs.org"
+          const registry = reg.endsWith("/") ? reg.slice(0, -1) : reg
+          const channel = InstallationChannel
+          const response = yield* httpOk.execute(
+            HttpClientRequest.get(`${registry}/opencode-ai/${channel}`).pipe(HttpClientRequest.acceptJson),
+          )
+          const data = yield* HttpClientResponse.schemaBodyJson(NpmPackage)(response)
+          return data.version
        }

        if (detectedMethod === "choco") {
@@ -8,7 +8,6 @@ import { Log } from "../util"
 import { Process } from "../util"
 import { LANGUAGE_EXTENSIONS } from "./language"
 import z from "zod"
-import { Schema } from "effect"
 import type * as LSPServer from "./server"
 import { NamedError } from "@opencode-ai/shared/util/error"
 import { withTimeout } from "../util/timeout"
@@ -42,9 +41,9 @@ export const InitializeError = NamedError.create(
 export const Event = {
  Diagnostics: BusEvent.define(
    "lsp.client.diagnostics",
-    Schema.Struct({
-      serverID: Schema.String,
-      path: Schema.String,
+    z.object({
+      serverID: z.string(),
+      path: z.string(),
    }),
  ),
 }
@@ -19,7 +19,7 @@ import { zod, ZodOverride } from "@/util/effect-zod"
 const log = Log.create({ service: "lsp" })

 export const Event = {
-  Updated: BusEvent.define("lsp.updated", Schema.Struct({})),
+  Updated: BusEvent.define("lsp.updated", z.object({})),
 }

 const Position = Schema.Struct({
@@ -25,7 +25,7 @@ import { BusEvent } from "../bus/bus-event"
 import { Bus } from "@/bus"
 import { TuiEvent } from "@/cli/cmd/tui/event"
 import open from "open"
-import { Effect, Exit, Layer, Option, Context, Schema, Stream } from "effect"
+import { Effect, Exit, Layer, Option, Context, Stream } from "effect"
 import { EffectBridge } from "@/effect"
 import { InstanceState } from "@/effect"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
@@ -47,16 +47,16 @@ export type Resource = z.infer<typeof Resource>

 export const ToolsChanged = BusEvent.define(
  "mcp.tools.changed",
-  Schema.Struct({
-    server: Schema.String,
+  z.object({
+    server: z.string(),
  }),
 )

 export const BrowserOpenFailed = BusEvent.define(
  "mcp.browser.open.failed",
-  Schema.Struct({
-    mcpName: Schema.String,
-    url: Schema.String,
+  z.object({
+    mcpName: z.string(),
+    url: z.string(),
  }),
 )

@@ -1,19 +1,14 @@
 export * as Npm from "."

 import path from "path"
-import { fileURLToPath } from "url"
 import npa from "npm-package-arg"
 import semver from "semver"
-import Config from "@npmcli/config"
-import { definitions, flatten, nerfDarts, shorthands } from "@npmcli/config/lib/definitions/index.js"
-import { Effect, Schema, Context, Layer, Option, FileSystem, Stream } from "effect"
+import { Effect, Schema, Context, Layer, Option, FileSystem } from "effect"
 import { NodeFileSystem } from "@effect/platform-node"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { Global } from "@opencode-ai/shared/global"
 import { EffectFlock } from "@opencode-ai/shared/util/effect-flock"
-import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"

-import * as CrossSpawnSpawner from "../effect/cross-spawn-spawner"
 import { makeRuntime } from "../effect/runtime"

 export class InstallFailedError extends Schema.TaggedErrorClass<InstallFailedError>()("NpmInstallFailedError", {
@@ -45,39 +40,12 @@ export interface Interface {
 export class Service extends Context.Service<Service, Interface>()("@opencode/Npm") {}

 const illegal = process.platform === "win32" ? new Set(["<", ">", ":", '"', "|", "?", "*"]) : undefined
-const npmPath = fileURLToPath(new URL("../..", import.meta.url))

 export function sanitize(pkg: string) {
  if (!illegal) return pkg
  return Array.from(pkg, (char) => (illegal.has(char) || char.charCodeAt(0) < 32 ? "_" : char)).join("")
 }

-const loadOptions = (dir: string) =>
-  Effect.tryPromise({
-    try: async () => {
-      const config = new Config({
-        npmPath,
-        cwd: dir,
-        env: { ...process.env },
-        argv: [process.execPath, process.execPath],
-        execPath: process.execPath,
-        platform: process.platform,
-        definitions,
-        flatten,
-        nerfDarts,
-        shorthands,
-        warn: false,
-      })
-      await config.load()
-      return config.flat
-    },
-    catch: (cause) =>
-      new InstallFailedError({
-        cause,
-        dir,
-      }),
-  })
-
 const resolveEntryPoint = (name: string, dir: string): EntryPoint => {
  let entrypoint: Option.Option<string>
  try {
@@ -108,41 +76,12 @@ export const layer = Layer.effect(
    const global = yield* Global.Service
    const fs = yield* FileSystem.FileSystem
    const flock = yield* EffectFlock.Service
-    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
    const directory = (pkg: string) => path.join(global.cache, "packages", sanitize(pkg))
-    const runView = Effect.fnUntraced(function* (cmd: string[]) {
-      const handle = yield* spawner.spawn(
-        ChildProcess.make(cmd[0], cmd.slice(1), {
-          extendEnv: true,
-        }),
-      )
-      const [stdout, stderr] = yield* Effect.all(
-        [Stream.mkString(Stream.decodeText(handle.stdout)), Stream.mkString(Stream.decodeText(handle.stderr))],
-        { concurrency: 2 },
-      )
-      const code = yield* handle.exitCode
-      if (code !== 0 || !stdout.trim()) {
-        return yield* Effect.fail(stderr || stdout || `Failed to run ${cmd.join(" ")}`)
-      }
-      return yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Schema.String))(stdout)
-    }, Effect.scoped)
-    const viewLatestVersion = Effect.fnUntraced(function* (pkg: string) {
-      return yield* runView(["npm", "view", pkg, "dist-tags.latest", "--json"]).pipe(
-        Effect.catch(() =>
-          runView(["pnpm", "view", pkg, "dist-tags.latest", "--json"]).pipe(
-            Effect.catch(() => runView(["bun", "pm", "view", pkg, "dist-tags.latest", "--json"])),
-          ),
-        ),
-      )
-    })
    const reify = (input: { dir: string; add?: string[] }) =>
      Effect.gen(function* () {
        yield* flock.acquire(`npm-install:${input.dir}`)
        const { Arborist } = yield* Effect.promise(() => import("@npmcli/arborist"))
-        const add = input.add ?? []
-        const npmOptions = yield* loadOptions(input.dir)
        const arborist = new Arborist({
-          ...npmOptions,
          path: input.dir,
          binLinks: true,
          progress: false,
@@ -152,15 +91,14 @@ export const layer = Layer.effect(
        return yield* Effect.tryPromise({
          try: () =>
            arborist.reify({
-              ...npmOptions,
-              add,
+              add: input?.add || [],
              save: true,
              saveType: "prod",
            }),
          catch: (cause) =>
            new InstallFailedError({
              cause,
-              add,
+              add: input?.add,
              dir: input.dir,
            }),
        }) as Effect.Effect<ArboristTree, InstallFailedError>
@@ -171,15 +109,29 @@ export const layer = Layer.effect(
      )

    const outdated = Effect.fn("Npm.outdated")(function* (pkg: string, cachedVersion: string) {
-      const latestVersion = yield* viewLatestVersion(pkg).pipe(Effect.option)
-      if (Option.isNone(latestVersion)) {
+      const response = yield* Effect.tryPromise({
+        try: () => fetch(`https://registry.npmjs.org/${pkg}`),
+        catch: () => undefined,
+      }).pipe(Effect.orElseSucceed(() => undefined))
+
+      if (!response || !response.ok) {
+        return false
+      }
+
+      const data = yield* Effect.tryPromise({
+        try: () => response.json() as Promise<{ "dist-tags"?: { latest?: string } }>,
+        catch: () => undefined,
+      }).pipe(Effect.orElseSucceed(() => undefined))
+
+      const latestVersion = data?.["dist-tags"]?.latest
+      if (!latestVersion) {
        return false
      }

      const range = /[\s^~*xX<>|=]/.test(cachedVersion)
-      if (range) return !semver.satisfies(latestVersion.value, cachedVersion)
+      if (range) return !semver.satisfies(latestVersion, cachedVersion)

-      return semver.lt(cachedVersion, latestVersion.value)
+      return semver.lt(cachedVersion, latestVersion)
    })

    const add = Effect.fn("Npm.add")(function* (pkg: string) {
@@ -318,7 +270,6 @@ export const defaultLayer = layer.pipe(
  Layer.provide(AppFileSystem.layer),
  Layer.provide(Global.layer),
  Layer.provide(NodeFileSystem.layer),
-  Layer.provide(CrossSpawnSpawner.defaultLayer),
 )

 const { runPromise } = makeRuntime(Service, defaultLayer)
@@ -73,14 +73,16 @@ export class Approval extends Schema.Class<Approval>("PermissionApproval")({
 }

 export const Event = {
-  Asked: BusEvent.define("permission.asked", Request),
+  Asked: BusEvent.define("permission.asked", Request.zod),
  Replied: BusEvent.define(
    "permission.replied",
-    Schema.Struct({
-      sessionID: SessionID,
-      requestID: PermissionID,
-      reply: Reply,
-    }),
+    zod(
+      Schema.Struct({
+        sessionID: SessionID,
+        requestID: PermissionID,
+        reply: Reply,
+      }),
+    ),
  ),
 }

@@ -8,7 +8,6 @@ export const ProjectTable = sqliteTable("project", {
  vcs: text(),
  name: text(),
  icon_url: text(),
-  icon_url_override: text(),
  icon_color: text(),
  ...Timestamps,
  time_initialized: integer(),
@@ -53,20 +53,14 @@ export const Info = Schema.Struct({
 export type Info = Types.DeepMutable<Schema.Schema.Type<typeof Info>>

 export const Event = {
-  Updated: BusEvent.define("project.updated", Info),
+  Updated: BusEvent.define("project.updated", Info.zod),
 }

 type Row = typeof ProjectTable.$inferSelect

 export function fromRow(row: Row): Info {
  const icon =
-    row.icon_url || row.icon_url_override || row.icon_color
-      ? {
-          url: row.icon_url ?? undefined,
-          override: row.icon_url_override ?? undefined,
-          color: row.icon_color ?? undefined,
-        }
-      : undefined
+    row.icon_url || row.icon_color ? { url: row.icon_url ?? undefined, color: row.icon_color ?? undefined } : undefined
  return {
    id: row.id,
    worktree: row.worktree,
@@ -295,7 +289,6 @@ export const layer: Layer.Layer<
            vcs: result.vcs ?? null,
            name: result.name,
            icon_url: result.icon?.url,
-            icon_url_override: result.icon?.override,
            icon_color: result.icon?.color,
            time_created: result.time.created,
            time_updated: result.time.updated,
@@ -310,7 +303,6 @@ export const layer: Layer.Layer<
              vcs: result.vcs ?? null,
              name: result.name,
              icon_url: result.icon?.url,
-              icon_url_override: result.icon?.override,
              icon_color: result.icon?.color,
              time_updated: result.time.updated,
              time_initialized: result.time.initialized,
@@ -373,7 +365,6 @@ export const layer: Layer.Layer<
          .set({
            name: input.name,
            icon_url: input.icon?.url,
-            icon_url_override: input.icon?.override,
            icon_color: input.icon?.color,
            commands: input.commands,
            time_updated: Date.now(),
@@ -1,4 +1,4 @@
-import { Effect, Layer, Context, Schema, Stream, Scope } from "effect"
+import { Effect, Layer, Context, Stream, Scope } from "effect"
 import { formatPatch, structuredPatch } from "diff"
 import path from "path"
 import { Bus } from "@/bus"
@@ -107,8 +107,8 @@ export type Mode = z.infer<typeof Mode>
 export const Event = {
  BranchUpdated: BusEvent.define(
    "vcs.branch.updated",
-    Schema.Struct({
-      branch: Schema.optional(Schema.String),
+    z.object({
+      branch: z.string().optional(),
    }),
  ),
 }
@@ -1,12 +1,13 @@
 import type { AuthOAuthResult, Hooks } from "@opencode-ai/plugin"
+import { NamedError } from "@opencode-ai/shared/util/error"
 import { Auth } from "@/auth"
 import { InstanceState } from "@/effect"
 import { zod } from "@/util/effect-zod"
-import { namedSchemaError } from "@/util/named-schema-error"
 import { withStatics } from "@/util/schema"
 import { Plugin } from "../plugin"
 import { ProviderID } from "./schema"
 import { Array as Arr, Effect, Layer, Record, Result, Context, Schema } from "effect"
+import z from "zod"

 const When = Schema.Struct({
  key: Schema.String,
@@ -69,16 +70,22 @@ export const CallbackInput = Schema.Struct({
 }).pipe(withStatics((s) => ({ zod: zod(s) })))
 export type CallbackInput = Schema.Schema.Type<typeof CallbackInput>

-export const OauthMissing = namedSchemaError("ProviderAuthOauthMissing", { providerID: ProviderID })
+export const OauthMissing = NamedError.create("ProviderAuthOauthMissing", z.object({ providerID: ProviderID.zod }))

-export const OauthCodeMissing = namedSchemaError("ProviderAuthOauthCodeMissing", { providerID: ProviderID })
+export const OauthCodeMissing = NamedError.create(
+  "ProviderAuthOauthCodeMissing",
+  z.object({ providerID: ProviderID.zod }),
+)

-export const OauthCallbackFailed = namedSchemaError("ProviderAuthOauthCallbackFailed", {})
+export const OauthCallbackFailed = NamedError.create("ProviderAuthOauthCallbackFailed", z.object({}))

-export const ValidationFailed = namedSchemaError("ProviderAuthValidationFailed", {
-  field: Schema.String,
-  message: Schema.String,
-})
+export const ValidationFailed = NamedError.create(
+  "ProviderAuthValidationFailed",
+  z.object({
+    field: z.string(),
+    message: z.string(),
+  }),
+)

 export type Error =
  | Auth.AuthError
@@ -111,13 +111,12 @@ export type ParsedStreamError =
  | {
      type: "api_error"
      message: string
-      isRetryable: boolean
+      isRetryable: false
      responseBody: string
    }

 export function parseStreamError(input: unknown): ParsedStreamError | undefined {
-  const raw = json(input)
-  const body = typeof raw?.message === "string" ? (json(raw.message) ?? raw) : raw
+  const body = json(input)
  if (!body) return

  const responseBody = JSON.stringify(body)
@@ -151,13 +150,6 @@ export function parseStreamError(input: unknown): ParsedStreamError | undefined
        isRetryable: false,
        responseBody,
      }
-    case "server_error":
-      return {
-        type: "api_error",
-        message: typeof body?.error?.message === "string" ? body?.error?.message : "Server error.",
-        isRetryable: true,
-        responseBody,
-      }
  }
 }

@@ -1,7 +1,7 @@
 import { Global } from "../global"
 import { Log } from "../util"
 import path from "path"
-import { Schema } from "effect"
+import z from "zod"
 import { Installation } from "../installation"
 import { Flag } from "../flag/flag"
 import { lazy } from "@/util/lazy"
@@ -21,85 +21,91 @@ const filepath = path.join(
 )
 const ttl = 5 * 60 * 1000

-const Cost = Schema.Struct({
-  input: Schema.Number,
-  output: Schema.Number,
-  cache_read: Schema.optional(Schema.Number),
-  cache_write: Schema.optional(Schema.Number),
-  context_over_200k: Schema.optional(
-    Schema.Struct({
-      input: Schema.Number,
-      output: Schema.Number,
-      cache_read: Schema.optional(Schema.Number),
-      cache_write: Schema.optional(Schema.Number),
-    }),
-  ),
+type JsonValue = string | number | boolean | null | { [key: string]: JsonValue } | JsonValue[]
+
+const JsonValue: z.ZodType<JsonValue> = z.lazy(() =>
+  z.union([z.string(), z.number(), z.boolean(), z.null(), z.array(JsonValue), z.record(z.string(), JsonValue)]),
+)
+
+const Cost = z.object({
+  input: z.number(),
+  output: z.number(),
+  cache_read: z.number().optional(),
+  cache_write: z.number().optional(),
+  context_over_200k: z
+    .object({
+      input: z.number(),
+      output: z.number(),
+      cache_read: z.number().optional(),
+      cache_write: z.number().optional(),
+    })
+    .optional(),
 })

-export const Model = Schema.Struct({
-  id: Schema.String,
-  name: Schema.String,
-  family: Schema.optional(Schema.String),
-  release_date: Schema.String,
-  attachment: Schema.Boolean,
-  reasoning: Schema.Boolean,
-  temperature: Schema.Boolean,
-  tool_call: Schema.Boolean,
-  interleaved: Schema.optional(
-    Schema.Union([
-      Schema.Literal(true),
-      Schema.Struct({
-        field: Schema.Literals(["reasoning_content", "reasoning_details"]),
-      }),
-    ]),
-  ),
-  cost: Schema.optional(Cost),
-  limit: Schema.Struct({
-    context: Schema.Number,
-    input: Schema.optional(Schema.Number),
-    output: Schema.Number,
+export const Model = z.object({
+  id: z.string(),
+  name: z.string(),
+  family: z.string().optional(),
+  release_date: z.string(),
+  attachment: z.boolean(),
+  reasoning: z.boolean(),
+  temperature: z.boolean(),
+  tool_call: z.boolean(),
+  interleaved: z
+    .union([
+      z.literal(true),
+      z
+        .object({
+          field: z.enum(["reasoning_content", "reasoning_details"]),
+        })
+        .strict(),
+    ])
+    .optional(),
+  cost: Cost.optional(),
+  limit: z.object({
+    context: z.number(),
+    input: z.number().optional(),
+    output: z.number(),
  }),
-  modalities: Schema.optional(
-    Schema.Struct({
-      input: Schema.Array(Schema.Literals(["text", "audio", "image", "video", "pdf"])),
-      output: Schema.Array(Schema.Literals(["text", "audio", "image", "video", "pdf"])),
-    }),
-  ),
-  experimental: Schema.optional(
-    Schema.Struct({
-      modes: Schema.optional(
-        Schema.Record(
-          Schema.String,
-          Schema.Struct({
-            cost: Schema.optional(Cost),
-            provider: Schema.optional(
-              Schema.Struct({
-                body: Schema.optional(Schema.Record(Schema.String, Schema.MutableJson)),
-                headers: Schema.optional(Schema.Record(Schema.String, Schema.String)),
-              }),
-            ),
+  modalities: z
+    .object({
+      input: z.array(z.enum(["text", "audio", "image", "video", "pdf"])),
+      output: z.array(z.enum(["text", "audio", "image", "video", "pdf"])),
+    })
+    .optional(),
+  experimental: z
+    .object({
+      modes: z
+        .record(
+          z.string(),
+          z.object({
+            cost: Cost.optional(),
+            provider: z
+              .object({
+                body: z.record(z.string(), JsonValue).optional(),
+                headers: z.record(z.string(), z.string()).optional(),
+              })
+              .optional(),
          }),
-        ),
-      ),
-    }),
-  ),
-  status: Schema.optional(Schema.Literals(["alpha", "beta", "deprecated"])),
-  provider: Schema.optional(
-    Schema.Struct({ npm: Schema.optional(Schema.String), api: Schema.optional(Schema.String) }),
-  ),
+        )
+        .optional(),
+    })
+    .optional(),
+  status: z.enum(["alpha", "beta", "deprecated"]).optional(),
+  provider: z.object({ npm: z.string().optional(), api: z.string().optional() }).optional(),
 })
-export type Model = Schema.Schema.Type<typeof Model>
+export type Model = z.infer<typeof Model>

-export const Provider = Schema.Struct({
-  api: Schema.optional(Schema.String),
-  name: Schema.String,
-  env: Schema.Array(Schema.String),
-  id: Schema.String,
-  npm: Schema.optional(Schema.String),
-  models: Schema.Record(Schema.String, Model),
+export const Provider = z.object({
+  api: z.string().optional(),
+  name: z.string(),
+  env: z.array(z.string()),
+  id: z.string(),
+  npm: z.string().optional(),
+  models: z.record(z.string(), Model),
 })

-export type Provider = Schema.Schema.Type<typeof Provider>
+export type Provider = z.infer<typeof Provider>

 function url() {
  return Flag.OPENCODE_MODELS_URL || "https://models.dev"
@@ -1,3 +1,4 @@
+import z from "zod"
 import os from "os"
 import fuzzysort from "fuzzysort"
 import { Config } from "../config"
@@ -7,6 +8,7 @@ import { Log } from "../util"
 import { Npm } from "../npm"
 import { Hash } from "@opencode-ai/shared/util/hash"
 import { Plugin } from "../plugin"
+import { NamedError } from "@opencode-ai/shared/util/error"
 import { type LanguageModelV3 } from "@ai-sdk/provider"
 import * as ModelsDev from "./models"
 import { Auth } from "../auth"
@@ -14,7 +16,6 @@ import { Env } from "../env"
 import { InstallationVersion } from "../installation/version"
 import { Flag } from "../flag/flag"
 import { zod } from "@/util/effect-zod"
-import { namedSchemaError } from "@/util/named-schema-error"
 import { iife } from "@/util/iife"
 import { Global } from "../global"
 import path from "path"
@@ -1046,7 +1047,7 @@ export function fromModelsDevProvider(provider: ModelsDev.Provider): Info {
    id: ProviderID.make(provider.id),
    source: "custom",
    name: provider.name,
-    env: [...(provider.env ?? [])],
+    env: provider.env ?? [],
    options: {},
    models,
  }
@@ -1712,12 +1713,18 @@ export function parseModel(model: string) {
  }
 }

-export const ModelNotFoundError = namedSchemaError("ProviderModelNotFoundError", {
-  providerID: ProviderID,
-  modelID: ModelID,
-  suggestions: Schema.optional(Schema.Array(Schema.String)),
-})
+export const ModelNotFoundError = NamedError.create(
+  "ProviderModelNotFoundError",
+  z.object({
+    providerID: ProviderID.zod,
+    modelID: ModelID.zod,
+    suggestions: z.array(z.string()).optional(),
+  }),
+)

-export const InitError = namedSchemaError("ProviderInitError", {
-  providerID: ProviderID,
-})
+export const InitError = NamedError.create(
+  "ProviderInitError",
+  z.object({
+    providerID: ProviderID.zod,
+  }),
+)
@@ -1 +0,0 @@
-README.md
@@ -1,5 +1,5 @@
 This is a temporary package used primarily for GitHub Copilot compatibility.

-These DO NOT apply for openai-compatible providers or majority of providers supporting completions/responses apis. THIS IS ONLY FOR GITHUB COPILOT!!!
+Avoid making changes to these files unless you only want to affect the Copilot provider.

-Avoid making edits to these files
+Also, this should ONLY be used for the Copilot provider.
@@ -185,19 +185,24 @@ function normalizeMessages(
        // Filter out reasoning parts from content
        const filteredContent = msg.content.filter((part: any) => part.type !== "reasoning")

-        // Include reasoning_content | reasoning_details directly on the message for all assistant messages.
-        // Always set the field even when empty — some providers (e.g. DeepSeek) may return empty
-        // reasoning_content which still needs to be sent back in subsequent requests.
+        // Include reasoning_content | reasoning_details directly on the message for all assistant messages
+        if (reasoningText) {
+          return {
+            ...msg,
+            content: filteredContent,
+            providerOptions: {
+              ...msg.providerOptions,
+              openaiCompatible: {
+                ...msg.providerOptions?.openaiCompatible,
+                [field]: reasoningText,
+              },
+            },
+          }
+        }
+
        return {
          ...msg,
          content: filteredContent,
-          providerOptions: {
-            ...msg.providerOptions,
-            openaiCompatible: {
-              ...msg.providerOptions?.openaiCompatible,
-              [field]: reasoningText,
-            },
-          },
        }
      }

@@ -400,10 +405,7 @@ export function variants(model: Provider.Model): Record<string, Record<string, a
  const id = model.id.toLowerCase()
  const adaptiveEfforts = anthropicAdaptiveEfforts(model.api.id)
  if (
-    id.includes("deepseek-chat") ||
-    id.includes("deepseek-reasoner") ||
-    id.includes("deepseek-r1") ||
-    id.includes("deepseek-v3") ||
+    id.includes("deepseek") ||
    id.includes("minimax") ||
    id.includes("glm") ||
    id.includes("kimi") ||
@@ -529,11 +531,7 @@ export function variants(model: Provider.Model): Record<string, Record<string, a
    case "venice-ai-sdk-provider":
    // https://docs.venice.ai/overview/guides/reasoning-models#reasoning-effort
    case "@ai-sdk/openai-compatible":
-      const efforts = [...WIDELY_SUPPORTED_EFFORTS]
-      if (model.api.id.includes("deepseek-v4")) {
-        efforts.push("max")
-      }
-      return Object.fromEntries(efforts.map((effort) => [effort, { reasoningEffort: effort }]))
+      return Object.fromEntries(WIDELY_SUPPORTED_EFFORTS.map((effort) => [effort, { reasoningEffort: effort }]))

    case "@ai-sdk/azure":
      // https://v5.ai-sdk.dev/providers/ai-sdk-providers/azure
@@ -3,14 +3,13 @@ import { Bus } from "@/bus"
 import { InstanceState } from "@/effect"
 import { Instance } from "@/project/instance"
 import type { Proc } from "#pty"
+import z from "zod"
 import { Log } from "../util"
 import { lazy } from "@opencode-ai/shared/util/lazy"
 import { Shell } from "@/shell/shell"
 import { Plugin } from "@/plugin"
 import { PtyID } from "./schema"
-import { Effect, Layer, Context, Schema, Types } from "effect"
-import { zod } from "@/util/effect-zod"
-import { withStatics } from "@/util/schema"
+import { Effect, Layer, Context } from "effect"
 import { EffectBridge } from "@/effect"

 const log = Log.create({ service: "pty" })
@@ -54,47 +53,47 @@ const meta = (cursor: number) => {

 const pty = lazy(() => import("#pty"))

-export const Info = Schema.Struct({
-  id: PtyID,
-  title: Schema.String,
-  command: Schema.String,
-  args: Schema.Array(Schema.String),
-  cwd: Schema.String,
-  status: Schema.Literals(["running", "exited"]),
-  pid: Schema.Number,
+export const Info = z
+  .object({
+    id: PtyID.zod,
+    title: z.string(),
+    command: z.string(),
+    args: z.array(z.string()),
+    cwd: z.string(),
+    status: z.enum(["running", "exited"]),
+    pid: z.number(),
+  })
+  .meta({ ref: "Pty" })
+
+export type Info = z.infer<typeof Info>
+
+export const CreateInput = z.object({
+  command: z.string().optional(),
+  args: z.array(z.string()).optional(),
+  cwd: z.string().optional(),
+  title: z.string().optional(),
+  env: z.record(z.string(), z.string()).optional(),
 })
-  .annotate({ identifier: "Pty" })
-  .pipe(withStatics((s) => ({ zod: zod(s) })))

-export type Info = Types.DeepMutable<Schema.Schema.Type<typeof Info>>
+export type CreateInput = z.infer<typeof CreateInput>

-export const CreateInput = Schema.Struct({
-  command: Schema.optional(Schema.String),
-  args: Schema.optional(Schema.Array(Schema.String)),
-  cwd: Schema.optional(Schema.String),
-  title: Schema.optional(Schema.String),
-  env: Schema.optional(Schema.Record(Schema.String, Schema.String)),
-}).pipe(withStatics((s) => ({ zod: zod(s) })))
+export const UpdateInput = z.object({
+  title: z.string().optional(),
+  size: z
+    .object({
+      rows: z.number(),
+      cols: z.number(),
+    })
+    .optional(),
+})

-export type CreateInput = Types.DeepMutable<Schema.Schema.Type<typeof CreateInput>>
-
-export const UpdateInput = Schema.Struct({
-  title: Schema.optional(Schema.String),
-  size: Schema.optional(
-    Schema.Struct({
-      rows: Schema.Number,
-      cols: Schema.Number,
-    }),
-  ),
-}).pipe(withStatics((s) => ({ zod: zod(s) })))
-
-export type UpdateInput = Types.DeepMutable<Schema.Schema.Type<typeof UpdateInput>>
+export type UpdateInput = z.infer<typeof UpdateInput>

 export const Event = {
-  Created: BusEvent.define("pty.created", Schema.Struct({ info: Info })),
-  Updated: BusEvent.define("pty.updated", Schema.Struct({ info: Info })),
-  Exited: BusEvent.define("pty.exited", Schema.Struct({ id: PtyID, exitCode: Schema.Number })),
-  Deleted: BusEvent.define("pty.deleted", Schema.Struct({ id: PtyID })),
+  Created: BusEvent.define("pty.created", z.object({ info: Info })),
+  Updated: BusEvent.define("pty.updated", z.object({ info: Info })),
+  Exited: BusEvent.define("pty.exited", z.object({ id: PtyID.zod, exitCode: z.number() })),
+  Deleted: BusEvent.define("pty.deleted", z.object({ id: PtyID.zod })),
 }

 export interface Interface {
@@ -94,9 +94,9 @@ class Rejected extends Schema.Class<Rejected>("QuestionRejected")({
 }) {}

 export const Event = {
-  Asked: BusEvent.define("question.asked", Request),
-  Replied: BusEvent.define("question.replied", Replied),
-  Rejected: BusEvent.define("question.rejected", Rejected),
+  Asked: BusEvent.define("question.asked", Request.zod),
+  Replied: BusEvent.define("question.replied", zod(Replied)),
+  Rejected: BusEvent.define("question.rejected", zod(Rejected)),
 }

 export class RejectedError extends Schema.TaggedErrorClass<RejectedError>()("QuestionRejectedError", {}) {
@@ -194,7 +194,7 @@ export const layer = Layer.effect(
      yield* bus.publish(Event.Replied, {
        sessionID: existing.info.sessionID,
        requestID: existing.info.id,
-        answers: input.answers.map((a) => [...a]),
+        answers: input.answers,
      })
      yield* Deferred.succeed(existing.deferred, input.answers)
    })
@@ -1,7 +1,7 @@
 import { BusEvent } from "@/bus/bus-event"
-import { Schema } from "effect"
+import z from "zod"

 export const Event = {
-  Connected: BusEvent.define("server.connected", Schema.Struct({})),
-  Disposed: BusEvent.define("global.disposed", Schema.Struct({})),
+  Connected: BusEvent.define("server.connected", z.object({})),
+  Disposed: BusEvent.define("global.disposed", z.object({})),
 }
@@ -1,3 +1,4 @@
+import z from "zod"
 import sessionProjectors from "../session/projectors"
 import { SyncEvent } from "@/sync"
 import { Session } from "@/session"
@@ -9,7 +10,7 @@ export function initProjectors() {
    projectors: sessionProjectors,
    convertEvent: (type, data) => {
      if (type === "session.updated") {
-        const id = (data as SyncEvent.Event<typeof Session.Event.Updated>["data"]).sessionID
+        const id = (data as z.infer<typeof Session.Event.Updated.schema>).sessionID
        const row = Database.use((db) => db.select().from(SessionTable).where(eq(SessionTable.id, id)).get())

        if (!row) return data
@@ -3,8 +3,6 @@ import { describeRoute, resolver, validator } from "hono-openapi"
 import z from "zod"
 import { listAdaptors } from "@/control-plane/adaptors"
 import { Workspace } from "@/control-plane/workspace"
-import { WorkspaceAdaptorEntry } from "@/control-plane/types"
-import { zodObject } from "@/util/effect-zod"
 import { Instance } from "@/project/instance"
 import { errors } from "../../error"
 import { lazy } from "@/util/lazy"
@@ -26,7 +24,15 @@ export const WorkspaceRoutes = lazy(() =>
            description: "Workspace adaptors",
            content: {
              "application/json": {
-                schema: resolver(z.array(zodObject(WorkspaceAdaptorEntry))),
+                schema: resolver(
+                  z.array(
+                    z.object({
+                      type: z.string(),
+                      name: z.string(),
+                      description: z.string(),
+                    }),
+                  ),
+                ),
              },
            },
          },
@@ -47,7 +53,7 @@ export const WorkspaceRoutes = lazy(() =>
            description: "Workspace created",
            content: {
              "application/json": {
-                schema: resolver(Workspace.Info.zod),
+                schema: resolver(Workspace.Info),
              },
            },
          },
@@ -56,12 +62,12 @@ export const WorkspaceRoutes = lazy(() =>
      }),
      validator(
        "json",
-        Workspace.CreateInput.zodObject.omit({
+        Workspace.create.schema.omit({
          projectID: true,
        }),
      ),
      async (c) => {
-        const body = c.req.valid("json") as Omit<Workspace.CreateInput, "projectID">
+        const body = c.req.valid("json")
        const workspace = await Workspace.create({
          projectID: Instance.project.id,
          ...body,
@@ -80,7 +86,7 @@ export const WorkspaceRoutes = lazy(() =>
            description: "Workspaces",
            content: {
              "application/json": {
-                schema: resolver(z.array(Workspace.Info.zod)),
+                schema: resolver(z.array(Workspace.Info)),
              },
            },
          },
@@ -101,7 +107,7 @@ export const WorkspaceRoutes = lazy(() =>
            description: "Workspace status",
            content: {
              "application/json": {
-                schema: resolver(z.array(zodObject(Workspace.ConnectionStatus))),
+                schema: resolver(z.array(Workspace.ConnectionStatus)),
              },
            },
          },
@@ -123,7 +129,7 @@ export const WorkspaceRoutes = lazy(() =>
            description: "Workspace removed",
            content: {
              "application/json": {
-                schema: resolver(Workspace.Info.zod.optional()),
+                schema: resolver(Workspace.Info.optional()),
              },
            },
          },
@@ -133,7 +139,7 @@ export const WorkspaceRoutes = lazy(() =>
      validator(
        "param",
        z.object({
-          id: zodObject(Workspace.Info).shape.id,
+          id: Workspace.Info.shape.id,
        }),
      ),
      async (c) => {
@@ -163,11 +169,11 @@ export const WorkspaceRoutes = lazy(() =>
          ...errors(400),
        },
      }),
-      validator("param", z.object({ id: zodObject(Workspace.Info).shape.id })),
-      validator("json", Workspace.SessionRestoreInput.zodObject.omit({ workspaceID: true })),
+      validator("param", z.object({ id: Workspace.Info.shape.id })),
+      validator("json", Workspace.sessionRestore.schema.omit({ workspaceID: true })),
      async (c) => {
        const { id } = c.req.valid("param")
-        const body = c.req.valid("json") as Omit<Workspace.SessionRestoreInput, "workspaceID">
+        const body = c.req.valid("json")
        log.info("session restore route requested", {
          workspaceID: id,
          sessionID: body.sessionID,
@@ -1,7 +1,7 @@
 import { Hono, type Context } from "hono"
 import { describeRoute, resolver, validator } from "hono-openapi"
 import { streamSSE } from "hono/streaming"
-import { Effect, Schema } from "effect"
+import { Effect } from "effect"
 import z from "zod"
 import { BusEvent } from "@/bus/bus-event"
 import { SyncEvent } from "@/sync"
@@ -18,7 +18,7 @@ import { errors } from "../error"

 const log = Log.create({ service: "server" })

-export const GlobalDisposedEvent = BusEvent.define("global.disposed", Schema.Struct({}))
+export const GlobalDisposedEvent = BusEvent.define("global.disposed", z.object({}))

 async function streamEvents(c: Context, subscribe: (q: AsyncQueue<string | null>) => () => void) {
  return streamSSE(c, async (stream) => {
@@ -1,7 +1,6 @@
 import { Hono } from "hono"
 import { describeRoute, validator, resolver } from "hono-openapi"
 import z from "zod"
-import * as EffectZod from "@/util/effect-zod"
 import { ProviderID, ModelID } from "@/provider/schema"
 import { ToolRegistry } from "@/tool"
 import { Worktree } from "@/worktree"
@@ -214,7 +213,7 @@ export const ExperimentalRoutes = lazy(() =>
          tools.map((t) => ({
            id: t.id,
            description: t.description,
-            parameters: EffectZod.toJsonSchema(t.parameters),
+            parameters: z.toJSONSchema(t.parameters),
          })),
        )
      },
@@ -336,7 +335,7 @@ export const ExperimentalRoutes = lazy(() =>
            description: "List of sessions",
            content: {
              "application/json": {
-                schema: resolver(Session.GlobalInfo.zod.array()),
+                schema: resolver(Session.GlobalInfo.array()),
              },
            },
          },
@@ -14,7 +14,6 @@ import { PermissionApi, permissionHandlers } from "./permission"
 import { ProjectApi, projectHandlers } from "./project"
 import { ProviderApi, providerHandlers } from "./provider"
 import { QuestionApi, questionHandlers } from "./question"
-import { WorkspaceApi, workspaceHandlers } from "./workspace"
 import { memoMap } from "@/effect/memo-map"

 const Query = Schema.Struct({
@@ -113,7 +112,6 @@ const PermissionSecured = PermissionApi.middleware(Authorization)
 const ProjectSecured = ProjectApi.middleware(Authorization)
 const ProviderSecured = ProviderApi.middleware(Authorization)
 const ConfigSecured = ConfigApi.middleware(Authorization)
-const WorkspaceSecured = WorkspaceApi.middleware(Authorization)

 export const routes = Layer.mergeAll(
  HttpApiBuilder.layer(ConfigSecured).pipe(Layer.provide(configHandlers)),
@@ -121,7 +119,6 @@ export const routes = Layer.mergeAll(
  HttpApiBuilder.layer(QuestionSecured).pipe(Layer.provide(questionHandlers)),
  HttpApiBuilder.layer(PermissionSecured).pipe(Layer.provide(permissionHandlers)),
  HttpApiBuilder.layer(ProviderSecured).pipe(Layer.provide(providerHandlers)),
-  HttpApiBuilder.layer(WorkspaceSecured).pipe(Layer.provide(workspaceHandlers)),
 ).pipe(
  Layer.provide(auth),
  Layer.provide(normalize),
--- a/Show More
+++ b/Show More