Merge pull request #9574 from Kilo-Org/imanolmaiztegui/kilo-opencode-v1.14.23

OpenCode v1.14.23
2026-09-01 15:32:11 +08:00 · 2026-04-28 11:11:57 +02:00
parent 2a6c3e7d5d e902880bda
commit 8078944add
180 changed files with 4348 additions and 1947 deletions
@@ -1,5 +1,10 @@
 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:
@@ -46,8 +51,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
+          bun install --linker hoisted ${{ inputs.install-flags }}
        else
-          bun install
+          bun install ${{ inputs.install-flags }}
        fi
      shell: bash
@@ -1,13 +1,13 @@
 on:
  schedule:
-    - cron: "7,37 * * * *"   # every 30 min at :07 and :37
+    - cron: "7,37 * * * *" # every 30 min at :07 and :37
  workflow_dispatch:

 concurrency:
  group: opencode-release-watch
  cancel-in-progress: false

-permissions:                                                                                           
+permissions:
  contents: read

 jobs:
@@ -66,4 +66,3 @@ jobs:
        with:
          path: .cache/last-seen
          key: last-seen-${{ steps.fetch.outputs.tag }}
-
@@ -1 +1,4 @@
 packages/desktop/src/bindings.ts
+packages/opencode/src/provider/models-snapshot.ts
+packages/opencode/src/provider/models-snapshot.js
+packages/opencode/src/provider/models-snapshot.d.ts
@@ -209,9 +209,7 @@ import { createKiloClient } from "@kilocode/sdk/v2"

 const port = process.env.PORT!
 const pass = process.env.KILO_SERVER_PASSWORD
-const headers = pass
-  ? { Authorization: "Basic " + Buffer.from("kilo:" + pass).toString("base64") }
-  : undefined
+const headers = pass ? { Authorization: "Basic " + Buffer.from("kilo:" + pass).toString("base64") } : undefined

 const client = createKiloClient({
  baseUrl: `http://127.0.0.1:${port}`,
@@ -32,7 +32,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "7.2.26",
+      "version": "7.2.25",
      "dependencies": {
        "@kilocode/kilo-i18n": "workspace:*",
        "@kilocode/kilo-ui": "workspace:*",
@@ -88,7 +88,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "7.2.26",
+      "version": "7.2.25",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -121,7 +121,7 @@
    },
    "packages/desktop-electron": {
      "name": "@opencode-ai/desktop-electron",
-      "version": "7.2.26",
+      "version": "7.2.25",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -398,7 +398,7 @@
    },
    "packages/opencode": {
      "name": "@kilocode/cli",
-      "version": "7.2.26",
+      "version": "7.2.25",
      "bin": {
        "kilo": "./bin/kilo",
        "kilocode": "./bin/kilo",
@@ -556,7 +556,7 @@
    },
    "packages/plugin": {
      "name": "@kilocode/plugin",
-      "version": "7.2.26",
+      "version": "7.2.25",
      "dependencies": {
        "@kilocode/sdk": "workspace:*",
        "effect": "catalog:",
@@ -581,7 +581,7 @@
    },
    "packages/script": {
      "name": "@opencode-ai/script",
-      "version": "7.2.26",
+      "version": "7.2.25",
      "dependencies": {
        "semver": "^7.6.3",
      },
@@ -592,7 +592,7 @@
    },
    "packages/sdk/js": {
      "name": "@kilocode/sdk",
-      "version": "7.2.26",
+      "version": "7.2.25",
      "dependencies": {
        "cross-spawn": "catalog:",
      },
@@ -607,7 +607,7 @@
    },
    "packages/shared": {
      "name": "@opencode-ai/shared",
-      "version": "7.2.26",
+      "version": "7.2.25",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -631,7 +631,7 @@
    },
    "packages/storybook": {
      "name": "@opencode-ai/storybook",
-      "version": "7.2.26",
+      "version": "7.2.25",
      "devDependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@solidjs/meta": "catalog:",
@@ -654,7 +654,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "7.2.26",
+      "version": "7.2.25",
      "dependencies": {
        "@kilocode/sdk": "workspace:*",
        "@kobalte/core": "catalog:",
@@ -147,6 +147,6 @@
    "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
    "stream-chat@9.38.0": "patches/stream-chat@9.38.0.patch"
  },
-  "version": "7.2.26",
+  "version": "7.2.25",
  "peerDependencies": {}
 }
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "7.2.26",
+  "version": "7.2.25",
  "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.95 + value * 0.05})`,
+    transform: `scale(${0.98 + value * 0.02})`,
    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() ? language.t(EXAMPLES[store.placeholder]) : "",
+      example: suggest() ? (store.mode === "shell" ? "git status" : language.t(EXAMPLES[store.placeholder])) : "",
      suggest: suggest(),
      t: (key, params) => language.t(key as Parameters<typeof language.t>[0], params as never),
    }),
@@ -1404,12 +1404,11 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                <IconButton
                  data-action="prompt-submit"
                  type="submit"
-                  disabled={store.mode !== "normal" || (!working() && blank())}
+                  disabled={!working() && blank()}
                  tabIndex={store.mode === "normal" ? undefined : -1}
-                  icon={stopping() ? "stop" : "arrow-up"}
+                  icon={stopping() ? "stop" : store.mode === "shell" ? "arrow-undo-down" : "arrow-up"}
                  variant="primary"
                  class="size-8"
-                  style={buttons()}
                  aria-label={stopping() ? language.t("prompt.action.stop") : language.t("prompt.action.send")}
                />
              </Tooltip>
@@ -1455,14 +1454,24 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
          >
            <div class="flex items-center gap-1.5 min-w-0 flex-1 relative">
              <div
-                class="h-7 flex items-center gap-1.5 max-w-[160px] min-w-0 absolute inset-y-0 left-0"
+                class="h-7 flex items-center gap-1.5 min-w-0 absolute inset-0"
                style={{
-                  padding: "0 4px 0 8px",
+                  padding: "0 0px 0 8px",
                  ...shell(),
                }}
              >
-                <span class="truncate text-13-medium text-text-strong">{language.t("prompt.mode.shell")}</span>
-                <div class="size-4 shrink-0" />
+                <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>
              </div>
              <div class="flex items-center gap-1.5 min-w-0 flex-1 h-7">
                <Show when={!agentsLoading()}>
@@ -1569,33 +1578,35 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                        </TooltipKeybind>
                      </Show>
                    </div>
-                    <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")}
+                    <Show when={variants().length > 2}>
+                      <div
+                        data-component="prompt-variant-control"
+                        style={providersShouldFadeIn() ? { animation: "fade-in 0.3s" } : undefined}
                      >
-                        <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>
+                        <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>
                  </Show>
                </Show>
              </div>
@@ -12,7 +12,7 @@ describe("promptPlaceholder", () => {
      suggest: true,
      t,
    })
-    expect(value).toBe("prompt.placeholder.shell")
+    expect(value).toBe("prompt.placeholder.shell:example")
  })

  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")
+  if (input.mode === "shell") return input.t("prompt.placeholder.shell", { example: input.example })
  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,27 +128,25 @@ export const SettingsGeneral: Component = () => {
          return
        }

-        const actions =
-          platform.update && platform.restart
-            ? [
-                {
-                  label: language.t("toast.update.action.installRestart"),
-                  onClick: async () => {
-                    await platform.update!()
-                    await platform.restart!()
-                  },
+        const actions = platform.updateAndRestart
+          ? [
+              {
+                label: language.t("toast.update.action.installRestart"),
+                onClick: async () => {
+                  await platform.updateAndRestart!()
                },
-                {
-                  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,
@@ -49,11 +49,11 @@ export type Platform = {
  /** Storage mechanism, defaults to localStorage */
  storage?: (name?: string) => SyncStorage | AsyncStorage

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

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

  /** Fetch override */
  fetch?: typeof fetch
@@ -209,7 +209,7 @@ export const dict = {
  "common.saving": "جارٍ الحفظ...",
  "common.default": "افتراضي",
  "common.attachment": "مرفق",
-  "prompt.placeholder.shell": "أدخل أمر shell...",
+  "prompt.placeholder.shell": "أدخل أمر shell... {{example}}",
  "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...",
+  "prompt.placeholder.shell": "Digite comando do shell... {{example}}",
  "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...",
+  "prompt.placeholder.shell": "Unesi shell naredbu... {{example}}",
  "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...",
+  "prompt.placeholder.shell": "Indtast shell-kommando... {{example}}",
  "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...",
+  "prompt.placeholder.shell": "Shell-Befehl eingeben... {{example}}",
  "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...",
+  "prompt.placeholder.shell": "Enter shell command... {{example}}",
  "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...",
+  "prompt.placeholder.shell": "Introduce comando de shell... {{example}}",
  "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...",
+  "prompt.placeholder.shell": "Entrez une commande shell... {{example}}",
  "prompt.placeholder.normal": 'Demandez n\'importe quoi... "{{example}}"',
  "prompt.placeholder.simple": "Demandez n'importe quoi...",
  "prompt.placeholder.summarizeComments": "Résumer les commentaires…",
@@ -398,8 +398,7 @@ export const dict = {
  "toast.session.unshare.failed.description": "Une erreur s'est produite lors de l'annulation du partage de la session",
  "toast.session.listFailed.title": "Échec du chargement des sessions pour {{project}}",
  "toast.update.title": "Mise à jour disponible",
-  "toast.update.description":
-    "Une nouvelle version d'Kilo ({{version}}) est maintenant disponible pour installation.",
+  "toast.update.description": "Une nouvelle version d'Kilo ({{version}}) est maintenant disponible pour installation.",
  "toast.update.action.installRestart": "Installer et redémarrer",
  "toast.update.action.notYet": "Pas encore",
  "error.page.title": "Quelque chose s'est mal passé",
@@ -549,8 +548,7 @@ export const dict = {
  "sidebar.workspaces.enable": "Activer les espaces de travail",
  "sidebar.workspaces.disable": "Désactiver les espaces de travail",
  "sidebar.gettingStarted.title": "Commencer",
-  "sidebar.gettingStarted.line1":
-    "Kilo inclut des modèles gratuits pour que vous puissiez commencer immédiatement.",
+  "sidebar.gettingStarted.line1": "Kilo inclut des modèles gratuits pour que vous puissiez commencer immédiatement.",
  "sidebar.gettingStarted.line2":
    "Connectez n'importe quel fournisseur pour utiliser des modèles, y compris Claude, GPT, Gemini etc.",
  "sidebar.project.recentSessions": "Sessions récentes",
@@ -209,7 +209,7 @@ export const dict = {
  "common.saving": "保存中...",
  "common.default": "デフォルト",
  "common.attachment": "添付ファイル",
-  "prompt.placeholder.shell": "シェルコマンドを入力...",
+  "prompt.placeholder.shell": "シェルコマンドを入力... {{example}}",
  "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": "셸 명령어 입력...",
+  "prompt.placeholder.shell": "셸 명령어 입력... {{example}}",
  "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...",
+  "prompt.placeholder.shell": "Skriv inn shell-kommando... {{example}}",
  "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...",
+  "prompt.placeholder.shell": "Wpisz polecenie terminala... {{example}}",
  "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": "Введите команду оболочки...",
+  "prompt.placeholder.shell": "Введите команду оболочки... {{example}}",
  "prompt.placeholder.normal": 'Спросите что угодно... "{{example}}"',
  "prompt.placeholder.simple": "Спросите что угодно...",
  "prompt.placeholder.summarizeComments": "Суммировать комментарии…",
@@ -149,8 +149,7 @@ export const dict = {
  "provider.connect.oauth.code.invalid": "รหัสการอนุญาตไม่ถูกต้อง",
  "provider.connect.oauth.auto.visit.prefix": "เยี่ยมชม ",
  "provider.connect.oauth.auto.visit.link": "ลิงก์นี้",
-  "provider.connect.oauth.auto.visit.suffix":
-    " และป้อนรหัสด้านล่างเพื่อเชื่อมต่อบัญชีและใช้โมเดล {{provider}} ใน Kilo",
+  "provider.connect.oauth.auto.visit.suffix": " และป้อนรหัสด้านล่างเพื่อเชื่อมต่อบัญชีและใช้โมเดล {{provider}} ใน Kilo",
  "provider.connect.oauth.auto.confirmationCode": "รหัสยืนยัน",
  "provider.connect.toast.connected.title": "{{provider}} ที่เชื่อมต่อแล้ว",
  "provider.connect.toast.connected.description": "โมเดล {{provider}} พร้อมใช้งานแล้ว",
@@ -227,7 +226,7 @@ export const dict = {
  "common.default": "ค่าเริ่มต้น",
  "common.attachment": "ไฟล์แนบ",

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

-  "prompt.placeholder.shell": "Kabuk komutu girin...",
+  "prompt.placeholder.shell": "Kabuk komutu girin... {{example}}",
  "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 命令...",
+  "prompt.placeholder.shell": "输入 shell 命令... {{example}}",
  "prompt.placeholder.normal": '随便问点什么... "{{example}}"',
  "prompt.placeholder.simple": "随便问点什么...",
  "prompt.placeholder.summarizeComments": "总结评论…",
@@ -150,8 +150,7 @@ export const dict = {
  "provider.connect.oauth.code.invalid": "授權碼無效",
  "provider.connect.oauth.auto.visit.prefix": "造訪 ",
  "provider.connect.oauth.auto.visit.link": "此連結",
-  "provider.connect.oauth.auto.visit.suffix":
-    " 並輸入以下程式碼，以連線你的帳戶並在 Kilo 中使用 {{provider}} 模型。",
+  "provider.connect.oauth.auto.visit.suffix": " 並輸入以下程式碼，以連線你的帳戶並在 Kilo 中使用 {{provider}} 模型。",
  "provider.connect.oauth.auto.confirmationCode": "確認碼",
  "provider.connect.toast.connected.title": "{{provider}} 已連線",
  "provider.connect.toast.connected.description": "現在可以使用 {{provider}} 模型了。",
@@ -227,7 +226,7 @@ export const dict = {
  "common.default": "預設",
  "common.attachment": "附件",

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

  async function installUpdate() {
-    if (!platform.update || !platform.restart) return
+    if (!platform.updateAndRestart) return
    await platform
-      .update()
-      .then(() => platform.restart!())
+      .updateAndRestart()
      .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.update || !platform.restart) return
+      if (!platform.checkUpdate || !platform.updateAndRestart) return

      let toastId: number | undefined
      let interval: ReturnType<typeof setInterval> | undefined
@@ -384,8 +384,7 @@ export default function Layout(props: ParentProps) {
              {
                label: language.t("toast.update.action.installRestart"),
                onClick: async () => {
-                  await platform.update!()
-                  await platform.restart!()
+                  await platform.updateAndRestart!()
                },
              },
              {
@@ -71,9 +71,7 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
  const activeFileTab = tabState.activeFileTab
  const closableTab = tabState.closableTab
  const shown = () =>
-    platform.platform !== "desktop" ||
-    import.meta.env.VITE_KILO_CHANNEL !== "beta" ||
-    settings.general.showFileTree()
+    platform.platform !== "desktop" || import.meta.env.VITE_KILO_CHANNEL !== "beta" || settings.general.showFileTree()

  const idle = { type: "idle" as const }
  const status = () => sync.data.session_status[params.id ?? ""] ?? idle
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop-electron",
  "private": true,
-  "version": "7.2.26",
+  "version": "7.2.25",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
@@ -337,11 +337,16 @@ function setupAutoUpdater() {
  })
 }

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

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

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

-    update: async () => {
+    updateAndRestart: 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": "7.2.26",
+  "version": "7.2.25",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -297,10 +297,15 @@ const createPlatform = (): Platform => {
      return { updateAvailable: true, version: next.version }
    },

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

    restart: async () => {
@@ -1,7 +1,7 @@
 id = "kilo"
 name = "Kilo"
 description = "The open source coding agent."
-version = "7.2.26"
+version = "1.14.23"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/Kilo-Org/kilocode"
@@ -11,26 +11,26 @@ name = "Kilo"
 icon = "./icons/opencode.svg"

 [agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.26/opencode-darwin-arm64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v1.14.23/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.26/opencode-darwin-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v1.14.23/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]

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

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

 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.26/opencode-windows-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v1.14.23/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
@@ -20,11 +20,11 @@ When you describe a task, the agent uses its tools — `read`, `grep`, `glob`, a

 Type `@` in the chat input to get autocomplete suggestions. You can mention:

-| Mention          | Description                                           | Example         |
-| ---------------- | ----------------------------------------------------- | --------------- |
-| **File**         | Attach a file's contents to your message              | `@src/utils.ts` |
-| **Terminal**     | Include your active VS Code terminal output           | `@terminal`     |
-| **Git Changes**  | Attach uncommitted working-tree diffs and new files   | `@git-changes`  |
+| Mention | Description | Example |
+|---|---|---|
+| **File** | Attach a file's contents to your message | `@src/utils.ts` |
+| **Terminal** | Include your active VS Code terminal output | `@terminal` |
+| **Git Changes** | Attach uncommitted working-tree diffs and new files | `@git-changes` |

 Selecting a suggestion inserts the mention and highlights it in the input. File contents, terminal output, and git changes are attached as context when you send the message.

@@ -587,7 +587,7 @@ Options:
      --path         directory path to generate the agent file  [string]
      --description  what the agent should do  [string]
      --mode         agent mode  [string] [choices: "all", "primary", "subagent"]
-      --tools        comma-separated list of tools to enable (default: all). Available: "bash, read, write, edit, list, glob, grep, webfetch, task, todowrite"  [string]
+      --tools        comma-separated list of tools to enable (default: all). Available: "bash, read, write, edit, glob, grep, webfetch, task, todowrite"  [string]
  -m, --model        model to use in the format of provider/model  [string]
 ```

@@ -473,7 +473,7 @@ Default legacy mode slugs (`code`, `build`, `architect`, `ask`, `debug`, `orches
 The CLI reads legacy mode files from the following locations (in load order). When the same slug appears in multiple sources, the **last loaded source wins**:

 | Load Order | Path | Format | Scope |
-|------------|------|--------|-------|
+|---|---|---|---|
 | 1 | VSCode extension global storage `/settings/custom_modes.yaml` | YAML | Global |
 | 2 | `~/.kilocode/cli/global/settings/custom_modes.yaml` | YAML | Global |
 | 3 | `~/.kilocodemodes` | YAML | Global |
@@ -91,7 +91,11 @@ function fromFileUrl(value: string): string {
 }

 function stem(value: string): string {
-  const part = value.split(/[\\/]+/).filter(Boolean).at(-1) ?? value
+  const part =
+    value
+      .split(/[\\/]+/)
+      .filter(Boolean)
+      .at(-1) ?? value
  const dot = part.lastIndexOf(".")
  if (dot <= 0) return part
  return part.slice(0, dot)
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.2.26",
+  "version": "7.2.25",
  "name": "@kilocode/cli",
  "type": "module",
  "license": "MIT",
@@ -103,26 +103,22 @@
    "@clack/prompts": "1.0.0-alpha.1",
    "@effect/opentelemetry": "catalog:",
    "@effect/platform-node": "catalog:",
-    "@gitlab/gitlab-ai-provider": "3.6.0",
    "@gitlab/opencode-gitlab-auth": "1.3.3",
    "@hono/node-server": "1.19.13",
    "@hono/node-ws": "1.3.0",
    "@hono/standard-validator": "0.1.5",
    "@hono/zod-validator": "catalog:",
-    "@kilocode/kilo-gateway": "workspace:*",
-    "@kilocode/kilo-indexing": "workspace:*",
-    "@kilocode/kilo-telemetry": "workspace:*",
-    "@kilocode/plugin": "workspace:*",
-    "@kilocode/sdk": "workspace:*",
    "@lydell/node-pty": "catalog:",
    "@modelcontextprotocol/sdk": "1.29.0",
-    "@morphllm/morphsdk": "0.2.166",
    "@npmcli/arborist": "9.4.0",
    "@npmcli/config": "10.8.1",
    "@octokit/graphql": "9.0.2",
    "@octokit/rest": "catalog:",
    "@openauthjs/openauth": "catalog:",
+    "@kilocode/plugin": "workspace:*",
+    "@kilocode/kilo-indexing": "workspace:*",
    "@opencode-ai/script": "workspace:*",
+    "@kilocode/sdk": "workspace:*",
    "@openrouter/ai-sdk-provider": "2.8.1",
    "@opentelemetry/api": "1.9.0",
    "@opentelemetry/context-async-hooks": "2.6.1",
@@ -156,10 +152,8 @@
    "gray-matter": "4.0.3",
    "hono": "catalog:",
    "hono-openapi": "catalog:",
-    "iconv-lite": "0.7.2",
    "ignore": "7.0.5",
    "immer": "11.1.4",
-    "jschardet": "3.1.4",
    "jsonc-parser": "3.3.1",
    "mime-types": "3.0.2",
    "minimatch": "10.2.5",
@@ -170,12 +164,8 @@
    "opentui-spinner": "0.0.6",
    "partial-json": "0.1.7",
    "remeda": "catalog:",
-    "ripgrep": "0.3.1",
-    "rotating-file-stream": "3.2.9",
    "semver": "^7.6.3",
-    "simple-git": "3.35.2",
    "solid-js": "catalog:",
-    "stream-chat": "9.38.0",
    "strip-ansi": "7.1.2",
    "tree-sitter-bash": "0.25.0",
    "tree-sitter-powershell": "0.25.10",
@@ -189,7 +179,17 @@
    "xdg-basedir": "5.1.0",
    "yargs": "18.0.0",
    "zod": "catalog:",
-    "zod-to-json-schema": "3.24.5"
+    "zod-to-json-schema": "3.24.5",
+    "@gitlab/gitlab-ai-provider": "3.6.0",
+    "@kilocode/kilo-gateway": "workspace:*",
+    "@kilocode/kilo-telemetry": "workspace:*",
+    "@morphllm/morphsdk": "0.2.166",
+    "iconv-lite": "0.7.2",
+    "jschardet": "3.1.4",
+    "ripgrep": "0.3.1",
+    "rotating-file-stream": "3.2.9",
+    "simple-git": "3.35.2",
+    "stream-chat": "9.38.0"
  },
  "overrides": {
    "drizzle-orm": "catalog:"
@@ -409,7 +409,7 @@ Current instance route inventory:
 - `project` - `bridged` (partial)
  bridged endpoints: `GET /project`, `GET /project/current`
  defer git-init mutation first
- `workspace` - `next`
+- `workspace` - `bridged`
  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
- [ ] port `workspace` read endpoints
+- [x] port `workspace` read endpoints
 - [ ] port `file` JSON read endpoints
 - [ ] decide when to remove the flag and make Effect routes the default

@@ -147,6 +147,17 @@ 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
@@ -159,6 +170,7 @@ Schema at source.
 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`
@@ -166,8 +178,10 @@ 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

@@ -240,29 +254,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 keep using
-     derived `.zod` until the sync/bus layers are migrated
+   - `SyncEvent.define(...)` and `BusEvent.define(...)` payloads can use
+     derived `.zod` at remaining zod-based HTTP/OpenAPI boundaries

 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

- [ ] `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`
+- [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`

 ### Provider domain

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

 ### Tool schemas

@@ -270,25 +284,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.

- [ ] `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`
+- [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`

 ### HTTP route boundaries

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

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

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

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

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

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

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

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

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

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

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

-    function publish<D extends BusEvent.Definition>(def: D, properties: z.output<D["properties"]>) {
+    function publish<D extends BusEvent.Definition>(def: D, properties: BusProperties<D>) {
      return Effect.gen(function* () {
        const s = yield* InstanceState.get(state)
        const payload: Payload = { type: def.type, properties }
@@ -175,14 +173,11 @@ 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: z.output<D["properties"]>) {
+export async function publish<D extends BusEvent.Definition>(def: D, properties: BusProperties<D>) {
  return runPromise((svc) => svc.publish(def, properties))
 }

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

@@ -32,7 +32,7 @@ export const GenerateCommand = {
      }
    }
    const raw = JSON.stringify(specs, null, 2)
-    // kilocode_change start - replace upstream product name in all descriptions
+      // kilocode_change start - replace upstream product name in all descriptions
      .replaceAll("OpenCode", "Kilo")
      .replaceAll("opencode.local", "kilo.local")
      .replaceAll("opencode serve", "kilo serve")
@@ -10,9 +10,10 @@ import { Instance } from "../../project/instance"
 import { EOL } from "os"
 import { Filesystem } from "../../util"
 import { AppRuntime } from "@/effect/app-runtime"
-import { Log } from "../../util"
+import { Schema } from "effect"
+import { Log } from "../../util" // kilocode_change

-const log = Log.create({ service: "import" })
+const log = Log.create({ service: "import" }) // kilocode_change

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

-      const info = Session.Info.parse({
+      const info = Schema.decodeUnknownSync(Session.Info)({
        ...exportData.info,
        projectID: Instance.project.id,
-      })
+      }) as Session.Info
      const row = Session.toRow(info)
      Database.use((db) =>
        db
@@ -24,6 +24,7 @@ import { DialogProvider as DialogProviderList } from "@tui/component/dialog-prov
 import { InstallationVersion } from "@/installation/version" // kilocode_change
 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"
@@ -186,7 +187,9 @@ export function tui(input: {
                                        <FrecencyProvider>
                                          <PromptHistoryProvider>
                                            <PromptRefProvider>
-                                              <App onSnapshot={input.onSnapshot} />
+                                              <EditorContextProvider>
+                                                <App onSnapshot={input.onSnapshot} />
+                                              </EditorContextProvider>
                                            </PromptRefProvider>
                                          </PromptHistoryProvider>
                                        </FrecencyProvider>
@@ -21,11 +21,12 @@ export function DialogSessionRename(props: DialogSessionRenameProps) {
      title="Rename Session"
      value={session()?.title ?? props.title} // kilocode_change
      onConfirm={(value) => {
-        void sdk.client.session.update({
-          sessionID: props.session,
-          title: value,
-        })
-        .then(() => props.onConfirm?.()) // kilocode_change
+        void sdk.client.session
+          .update({
+            sessionID: props.session,
+            title: value,
+          })
+          .then(() => props.onConfirm?.()) // kilocode_change
        dialog.clear()
      }}
      onCancel={() => dialog.clear()}
@@ -1,9 +1,11 @@
 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"
@@ -81,6 +83,7 @@ export function Autocomplete(props: {
  agentStyleId: number
  promptPartTypeId: () => number
 }) {
+  const editor = useEditorContext()
  const sdk = useSDK()
  const sync = useSync()
  const command = useCommandDialog()
@@ -225,6 +228,70 @@ 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) => {
@@ -254,18 +321,7 @@ export function Autocomplete(props: {
        const width = props.anchor().width - 4
        options.push(
          ...sortedFiles.map((item): AutocompleteOption => {
-            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 { filename, url, part } = createFilePart(item, lineRange)

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

  onMount(() => {
+    const unsubscribeMention = editor.onMention((mention) => {
+      insertFileMention(mention)
+    })
+
+    onCleanup(() => {
+      unsubscribeMention()
+    })
+
    props.ref({
      get visible() {
        return store.visible
@@ -12,6 +12,7 @@ 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"
@@ -21,7 +22,7 @@ import { usePromptStash } from "./stash"
 import { DialogStash } from "../dialog-stash"
 import { type AutocompleteRef, Autocomplete } from "./autocomplete"
 import { useCommandDialog } from "../dialog-command"
-import { useRenderer, type JSX } from "@opentui/solid"
+import { useRenderer, useTerminalDimensions, type JSX } from "@opentui/solid"
 import * as Editor from "@tui/util/editor"
 import { useExit } from "../../context/exit"
 import * as Clipboard from "../../util/clipboard"
@@ -94,6 +95,7 @@ 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()
@@ -104,11 +106,34 @@ 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))
@@ -731,6 +756,27 @@ 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({
@@ -783,6 +829,7 @@ export function Prompt(props: PromptProps) {
          model: selectedModel,
          variant,
          parts: [
+            ...editorParts,
            {
              id: PartID.ascending(),
              type: "text",
@@ -1376,6 +1423,7 @@ export function Prompt(props: PromptProps) {
                </text>
              </Show>
              {/* kilocode_change end */}
+              <Show when={editorFileLabelDisplay()}>{(file) => <text fg={theme.secondary}>{file()}</text>}</Show>
              <Switch>
                <Match when={store.mode === "normal"}>
                  <Switch>
@@ -0,0 +1,319 @@
+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.KILO_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 z from "zod"
+import { Schema } from "effect"

 export const TuiEvent = {
-  PromptAppend: BusEvent.define("tui.prompt.append", z.object({ text: z.string() })),
+  PromptAppend: BusEvent.define("tui.prompt.append", Schema.Struct({ text: Schema.String })),
  CommandExecute: BusEvent.define(
    "tui.command.execute",
-    z.object({
-      command: z.union([
-        z.enum([
+    Schema.Struct({
+      command: Schema.Union([
+        Schema.Literals([
          "session.list",
          "session.new",
          "session.share",
@@ -26,23 +26,23 @@ export const TuiEvent = {
          "prompt.submit",
          "agent.cycle",
        ]),
-        z.string(),
+        Schema.String,
      ]),
    }),
  ),
  ToastShow: BusEvent.define(
    "tui.toast.show",
-    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"),
+    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" }),
    }),
  ),
  SessionSelect: BusEvent.define(
    "tui.session.select",
-    z.object({
-      sessionID: SessionID.zod.describe("Session ID to navigate to"),
+    Schema.Struct({
+      sessionID: SessionID.annotate({ description: "Session ID to navigate to" }),
    }),
  ),
 }
@@ -1368,7 +1368,17 @@ function UserMessage(props: {
 }) {
  const ctx = use()
  const local = useLocal()
-  const text = createMemo(() => props.parts.flatMap((x) => (x.type === "text" && !x.synthetic ? [x] : []))[0])
+  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 files = createMemo(() => props.parts.flatMap((x) => (x.type === "file" ? [x] : [])))
  const { theme } = useTheme()
  const [hover, setHover] = createSignal(false)
@@ -1403,7 +1413,7 @@ function UserMessage(props: {
            backgroundColor={hover() ? theme.backgroundElement : theme.backgroundPanel}
            flexShrink={0}
          >
-            <text fg={theme.text}>{text()?.text}</text>
+            <text fg={theme.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 z from "zod"
+import { Schema } from "effect"
 import { type TuiEvent } from "../event"

-export type ToastOptions = z.infer<typeof TuiEvent.ToastShow.properties>
+export type ToastOptions = Schema.Schema.Type<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 } from "effect"
+import { Effect, Layer, Context, Schema } from "effect"
 import z from "zod"
 import { Config } from "../config"
 import { MCP } from "../mcp"
@@ -20,11 +20,11 @@ type State = {
 export const Event = {
  Executed: BusEvent.define(
    "command.executed",
-    z.object({
-      name: z.string(),
-      sessionID: SessionID.zod,
-      arguments: z.string(),
-      messageID: MessageID.zod,
+    Schema.Struct({
+      name: Schema.String,
+      sessionID: SessionID,
+      arguments: Schema.String,
+      messageID: MessageID,
    }),
  ),
 }
@@ -4,6 +4,7 @@ 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"
@@ -18,8 +19,6 @@ import type { Warning } from "./config"

 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 { withStatics } from "@/util/schema"
+import { NonNegativeInt, PositiveInt, withStatics, type DeepMutable } from "@/util/schema"
 import { ConfigAgent } from "./agent"
 import { ConfigCommand } from "./command"
 import { ConfigFormatter } from "./formatter"
@@ -112,9 +112,6 @@ const AgentRef = Schema.Any.annotate({ [ZodOverride]: ConfigAgent.Info })
 const LogLevelRef = Schema.Any.annotate({ [ZodOverride]: Log.Level })
 const IndexingRef = Schema.Any.annotate({ [ZodOverride]: KiloIndexingConfig }) // kilocode_change

-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.
@@ -245,6 +242,19 @@ export const Info = Schema.Struct({
    }),
  ),
  commit_message: KilocodeConfig.CommitMessageSchema, // kilocode_change
+  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({
@@ -301,26 +311,9 @@ export const Info = Schema.Struct({
    })),
  )

-// 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
-
+// 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 `{}`).
 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,8 +1,6 @@
 import { Schema } from "effect"
 import { zod } from "@/util/effect-zod"
-import { withStatics } from "@/util/schema"
-
-const PositiveInt = Schema.Number.check(Schema.isInt()).check(Schema.isGreaterThan(0))
+import { PositiveInt, withStatics } from "@/util/schema"

 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 { withStatics } from "@/util/schema"
+import { PositiveInt, withStatics } from "@/util/schema"

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

 const BUILTIN: Record<string, () => Promise<WorkspaceAdaptor>> = {
  worktree: lazy(async () => (await import("./worktree")).WorktreeAdaptor),
@@ -1,13 +1,15 @@
-import z from "zod"
+import { Schema } from "effect"
 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 = z.object({
-  name: WorkspaceInfo.shape.name,
-  branch: WorkspaceInfo.shape.branch.unwrap(),
-  directory: WorkspaceInfo.shape.directory.unwrap(),
-})
+const WorktreeConfig = Schema.Struct({
+  name: WorkspaceInfo.fields.name,
+  branch: Schema.String,
+  directory: Schema.String,
+}).pipe(withStatics((s) => ({ zod: zod(s) })))

 export const WorktreeAdaptor: WorkspaceAdaptor = {
  name: "Worktree",
@@ -22,7 +24,7 @@ export const WorktreeAdaptor: WorkspaceAdaptor = {
    }
  },
  async create(info) {
-    const config = WorktreeConfig.parse(info)
+    const config = WorktreeConfig.zod.parse(info)
    await AppRuntime.runPromise(
      Worktree.Service.use((svc) =>
        svc.createFromInfo({
@@ -34,11 +36,11 @@ export const WorktreeAdaptor: WorkspaceAdaptor = {
    )
  },
  async remove(info) {
-    const config = WorktreeConfig.parse(info)
+    const config = WorktreeConfig.zod.parse(info)
    await AppRuntime.runPromise(Worktree.Service.use((svc) => svc.remove({ directory: config.directory })))
  },
  target(info) {
-    const config = WorktreeConfig.parse(info)
+    const config = WorktreeConfig.zod.parse(info)
    return {
      type: "local",
      directory: config.directory,
@@ -1,17 +1,28 @@
-import z from "zod"
+import { Schema } from "effect"
 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 = 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,
+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 type WorkspaceInfo = z.infer<typeof WorkspaceInfo>
+  .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 Target =
  | {
@@ -1,4 +1,4 @@
-import z from "zod"
+import { Schema } from "effect"
 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 { WorkspaceInfo } from "./types"
+import { type WorkspaceInfo, WorkspaceInfo as WorkspaceInfoSchema } 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 = WorkspaceInfo.meta({
-  ref: "Workspace",
+export const Info = WorkspaceInfoSchema
+export type Info = WorkspaceInfo
+
+export const ConnectionStatus = Schema.Struct({
+  workspaceID: WorkspaceID,
+  status: Schema.Literals(["connected", "connecting", "disconnected", "error"]),
 })
-export type Info = z.infer<typeof Info>
+export type ConnectionStatus = Schema.Schema.Type<typeof ConnectionStatus>

-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),
+const Restore = Schema.Struct({
+  workspaceID: WorkspaceID,
+  sessionID: SessionID,
+  total: NonNegativeInt,
+  step: NonNegativeInt,
 })

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

-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 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>

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

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

-const SessionRestoreInput = z.object({
-  workspaceID: WorkspaceID.zod,
-  sessionID: SessionID.zod,
-})
+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>

-export const sessionRestore = fn(SessionRestoreInput, async (input) => {
+export const sessionRestore = fn(SessionRestoreInput.zod, 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, Scope } from "effect"
+import { Effect, Layer, Context, Schema, Scope } from "effect"
 import * as Stream from "effect/Stream"
 import { formatPatch, structuredPatch } from "diff"
 import { DiffFull } from "@/kilocode/snapshot/diff-full" // kilocode_change
@@ -77,8 +77,8 @@ export type Content = z.infer<typeof Content>
 export const Event = {
  Edited: BusEvent.define(
    "file.edited",
-    z.object({
-      file: z.string(),
+    Schema.Struct({
+      file: Schema.String,
    }),
  ),
 }
@@ -1,4 +1,4 @@
-import { Cause, Effect, Layer, Context } from "effect"
+import { Cause, Effect, Layer, Context, Schema } 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",
-    z.object({
-      file: z.string(),
-      event: z.union([z.literal("add"), z.literal("change"), z.literal("unlink")]),
+    Schema.Struct({
+      file: Schema.String,
+      event: Schema.Literals(["add", "change", "unlink"]),
    }),
  ),
 }
@@ -19,8 +19,7 @@ function number(key: string) {

 const KILO_EXPERIMENTAL = truthy("KILO_EXPERIMENTAL")
 const KILO_DISABLE_CLAUDE_CODE = truthy("KILO_DISABLE_CLAUDE_CODE")
-const KILO_DISABLE_CLAUDE_CODE_SKILLS =
-  KILO_DISABLE_CLAUDE_CODE || truthy("KILO_DISABLE_CLAUDE_CODE_SKILLS")
+const KILO_DISABLE_CLAUDE_CODE_SKILLS = KILO_DISABLE_CLAUDE_CODE || truthy("KILO_DISABLE_CLAUDE_CODE_SKILLS")
 const copy = process.env["KILO_EXPERIMENTAL_DISABLE_COPY_ON_SELECT"]

 export const Flag = {
@@ -55,9 +54,7 @@ export const Flag = {

  // Experimental
  KILO_EXPERIMENTAL,
-  KILO_EXPERIMENTAL_FILEWATCHER: Config.boolean("KILO_EXPERIMENTAL_FILEWATCHER").pipe(
-    Config.withDefault(false),
-  ),
+  KILO_EXPERIMENTAL_FILEWATCHER: Config.boolean("KILO_EXPERIMENTAL_FILEWATCHER").pipe(Config.withDefault(false)),
  KILO_EXPERIMENTAL_DISABLE_FILEWATCHER: Config.boolean("KILO_EXPERIMENTAL_DISABLE_FILEWATCHER").pipe(
    Config.withDefault(false),
  ),
@@ -1,5 +1,6 @@
 import { BusEvent } from "@/bus/bus-event"
 import z from "zod"
+import { Schema } from "effect"
 import { NamedError } from "@opencode-ai/shared/util/error"

 const SUPPORTED_IDES = [
@@ -13,8 +14,8 @@ const SUPPORTED_IDES = [
 export const Event = {
  Installed: BusEvent.define(
    "ide.installed",
-    z.object({
-      ide: z.string(),
+    Schema.Struct({
+      ide: Schema.String,
    }),
  ),
 }
@@ -21,14 +21,14 @@ export type ReleaseType = "patch" | "minor" | "major"
 export const Event = {
  Updated: BusEvent.define(
    "installation.updated",
-    z.object({
-      version: z.string(),
+    Schema.Struct({
+      version: Schema.String,
    }),
  ),
  UpdateAvailable: BusEvent.define(
    "installation.update-available",
-    z.object({
-      version: z.string(),
+    Schema.Struct({
+      version: Schema.String,
    }),
  ),
 }
@@ -132,6 +132,17 @@ 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* () {
        // kilocode_change start
        const tapFormula = yield* text(["brew", "list", "--formula", "Kilo-Org/tap/kilo"])
@@ -222,15 +233,7 @@ export const layer: Layer.Layer<Service, never, HttpClient.HttpClient | ChildPro
        }

        if (detectedMethod === "npm" || detectedMethod === "bun" || detectedMethod === "pnpm") {
-          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}/@kilocode/cli/${channel}`).pipe(HttpClientRequest.acceptJson), // kilocode_change
-          )
-          const data = yield* HttpClientResponse.schemaBodyJson(NpmPackage)(response)
-          return data.version
+          return yield* viewVersion(detectedMethod, `@kilocode/cli@${InstallationChannel}`) // kilocode_change
        }

        if (detectedMethod === "choco") {
@@ -14,6 +14,7 @@ import { IngestQueue } from "@/kilo-sessions/ingest-queue"
 import { clearInFlightCache, withInFlightCache } from "@/kilo-sessions/inflight-cache"
 import type * as SDK from "@kilocode/sdk/v2"
 import z from "zod"
+import { Schema } from "effect"
 import { KILO_API_BASE } from "@kilocode/kilo-gateway"
 import { Config } from "@/config"
 import { Instance } from "@/project/instance"
@@ -31,9 +32,9 @@ export namespace KiloSessions {
  export const Event = {
    RemoteStatusChanged: BusEvent.define(
      "kilo-sessions.remote-status-changed",
-      z.object({
-        enabled: z.boolean(),
-        connected: z.boolean(),
+      Schema.Struct({
+        enabled: Schema.Boolean,
+        connected: Schema.Boolean,
      }),
    ),
  }
@@ -179,6 +180,11 @@ export namespace KiloSessions {
  export async function init() {
    if (ingestDisabled) return

+    // kilocode_change start - Same type-erasure upstream uses in share/share-next.ts:165-169.
+    const watch = <D extends { type: string }>(def: D, fn: (evt: { properties: any }) => unknown) =>
+      Bus.subscribe(def as never, fn as never)
+    // kilocode_change end
+
    Bus.subscribe(Session.Event.Created, (evt) => {
      const sessionId = evt.properties.info.id
      void create(sessionId).catch((error) => log.error("share init create failed", { sessionId, error }))
@@ -200,7 +206,7 @@ export namespace KiloSessions {
      ])
    })

-    Bus.subscribe(MessageV2.Event.Updated, async (evt) => {
+    watch(MessageV2.Event.Updated, async (evt) => {
      await ingest.sync(evt.properties.info.sessionID, [
        {
          type: "message",
@@ -222,7 +228,7 @@ export namespace KiloSessions {
      }
    })

-    Bus.subscribe(MessageV2.Event.PartUpdated, async (evt) => {
+    watch(MessageV2.Event.PartUpdated, async (evt) => {
      await ingest.sync(evt.properties.part.sessionID, [
        {
          type: "part",
@@ -231,7 +237,7 @@ export namespace KiloSessions {
      ])
    })

-    Bus.subscribe(Session.Event.Diff, async (evt) => {
+    watch(Session.Event.Diff, async (evt) => {
      await ingest.sync(evt.properties.sessionID, [
        {
          type: "session_diff",
@@ -17,6 +17,7 @@ import { QuestionID } from "@/question/schema"
 import { ModelID, ProviderID } from "@/provider/schema"
 import { Log } from "@/util"
 import z from "zod"
+import { zodObject } from "@/util/effect-zod"

 const QuestionData = z.object({
  requestID: z.string(),
@@ -36,9 +37,9 @@ const SuggestionData = z.object({

 // kilocode_change start — lazy init to avoid circular dependency
 // (Server → RemoteRoutes → RemoteSender → SessionPrompt at module load time)
-let _remotePromptInput: ReturnType<typeof SessionPrompt.PromptInput.extend> | undefined
+let _remotePromptInput: z.ZodObject<any> | undefined
 function getRemotePromptInput() {
-  return (_remotePromptInput ??= SessionPrompt.PromptInput.extend({
+  return (_remotePromptInput ??= zodObject(SessionPrompt.PromptInput).extend({
    model: z.string().optional(),
  }))
 }
@@ -265,7 +266,7 @@ export namespace RemoteSender {
          })
          return
        }
-        const input = SessionPrompt.PromptInput.safeParse(
+        const input = SessionPrompt.PromptInput.zod.safeParse(
          normalizePrompt(parsed.data as SessionPrompt.PromptInput & { model?: string }),
        )
        if (!input.success) {
@@ -1,4 +1,5 @@
 import z from "zod"
+import { Schema } from "effect"
 import path from "path"
 import {
  CodeIndexManager,
@@ -7,7 +8,12 @@ import {
 } from "@kilocode/kilo-indexing/engine"
 import { toIndexingConfigInput } from "@kilocode/kilo-indexing/config"
 import { hasIndexingPlugin } from "@kilocode/kilo-indexing/detect"
-import { IndexingStatus, disabledIndexingStatus, normalizeIndexingStatus } from "@kilocode/kilo-indexing/status"
+import {
+  IndexingStatus,
+  INDEXING_STATUS_STATES,
+  disabledIndexingStatus,
+  normalizeIndexingStatus,
+} from "@kilocode/kilo-indexing/status"
 import { Telemetry } from "@kilocode/kilo-telemetry"
 import { Instance } from "@/project/instance"
 import { Bus } from "@/bus"
@@ -123,6 +129,19 @@ export namespace KiloIndexing {
  export const Status = IndexingStatus
  export type Status = z.infer<typeof Status>

+  // Mirror of IndexingStatus using Effect Schema for BusEvent.define, which
+  // requires a Schema.Top. The zod form above is kept for consumers that still
+  // depend on the z.infer-derived type.
+  const StateSchema = Schema.Literals(INDEXING_STATUS_STATES).annotate({ identifier: "IndexingStatusState" })
+
+  const StatusSchema = Schema.Struct({
+    state: StateSchema,
+    message: Schema.String,
+    processedFiles: Schema.Number,
+    totalFiles: Schema.Number,
+    percent: Schema.Number,
+  }).annotate({ identifier: "IndexingStatus" })
+
  type Entry = {
    manager?: CodeIndexManager
    current(): Status
@@ -138,8 +157,8 @@ export namespace KiloIndexing {

  export const Event = BusEvent.define(
    "indexing.status",
-    z.object({
-      status: Status,
+    Schema.Struct({
+      status: StatusSchema,
    }),
  )

@@ -166,7 +185,9 @@ export namespace KiloIndexing {
    }

    if (cfg.experimental?.semantic_indexing !== true) {
-      return inert(() => disabledIndexingStatus("Semantic indexing is disabled. Enable it in the Experimental settings."))
+      return inert(() =>
+        disabledIndexingStatus("Semantic indexing is disabled. Enable it in the Experimental settings."),
+      )
    }

    if (isWorktreePath(dir)) {
@@ -8,15 +8,11 @@

 import { createKilo, type KiloProvider, AI_SDK_PROVIDERS, PROMPTS } from "@kilocode/kilo-gateway"
 import { DEFAULT_HEADERS } from "@/kilocode/const"
-import { AiSdkProvider, Prompt } from "@/provider/models"
 import { ProviderID, ModelID } from "@/provider/schema"
 import { Effect, Schema } from "effect"
 import type { LanguageModelV3 } from "@ai-sdk/provider"
 import { mapValues, omit, pickBy } from "remeda"

-// Re-export for consumers that previously imported from provider.ts
-export { Prompt, AiSdkProvider }
-
 /** Default timeout (ms) for provider HTTP requests (connection phase). */
 export const REQUEST_TIMEOUT_MS = 120_000 // 2 minutes

@@ -1,6 +1,7 @@
 // kilocode_change - new file
 import { remapChildren as _remapChildren } from "./fork"
 import z from "zod"
+import { Schema } from "effect"
 import { BusEvent } from "@/bus/bus-event"
 import { Session } from "@/session"
 import { MessageID, SessionID } from "@/session/schema"
@@ -23,23 +24,25 @@ export namespace KiloSession {
  // Events
  // ---------------------------------------------------------------------------

+  const CloseReasonSchema = Schema.Literals(["completed", "error", "interrupted"])
+
  export const Event = {
    TurnOpen: BusEvent.define(
      "session.turn.open",
-      z.object({
-        sessionID: z.string(),
+      Schema.Struct({
+        sessionID: SessionID,
      }),
    ),
    TurnClose: BusEvent.define(
      "session.turn.close",
-      z.object({
-        sessionID: z.string(),
-        reason: z.enum(["completed", "error", "interrupted"]),
+      Schema.Struct({
+        sessionID: SessionID,
+        reason: CloseReasonSchema,
      }),
    ),
  }

-  export type CloseReason = z.infer<typeof Event.TurnClose.properties>["reason"]
+  export type CloseReason = Schema.Schema.Type<typeof CloseReasonSchema>

  // ---------------------------------------------------------------------------
  // Per-session platform override (telemetry attribution)
@@ -2,8 +2,10 @@ import { Bus } from "../../bus"
 import { BusEvent } from "../../bus/bus-event"
 import { Identifier } from "../../id/id"
 import { SessionID } from "../../session/schema"
+import { ZodOverride } from "../../util/effect-zod"
 import { Log } from "../../util"
 import z from "zod"
+import { Schema } from "effect"
 import { KiloSessionPromptQueue } from "../session/prompt-queue"

 export namespace Suggestion {
@@ -20,6 +22,18 @@ export namespace Suggestion {
    })
  export type Action = z.infer<typeof Action>

+  export const ActionSchema = Schema.Struct({
+    label: Schema.String.annotate({ description: "Button or option label (1-5 words)" }),
+    description: Schema.optional(Schema.String).annotate({
+      description: "Brief explanation of what this action does",
+    }),
+    prompt: Schema.String.annotate({
+      description: "Synthetic user prompt to inject when this action is accepted",
+    }),
+  })
+
+  const SuggestionIDSchema = Schema.String.annotate({ [ZodOverride]: Identifier.schema("suggestion") })
+
  export const Info = z
    .object({
      text: z.string().describe("Suggestion text shown to the user"),
@@ -54,27 +68,41 @@ export namespace Suggestion {
    })
  export type Request = z.infer<typeof Request>

+  const RequestSchema = Schema.Struct({
+    id: SuggestionIDSchema,
+    sessionID: SessionID,
+    text: Schema.String,
+    actions: Schema.Array(ActionSchema).check(Schema.isMinLength(1), Schema.isMaxLength(2)),
+    blocking: Schema.optional(Schema.Boolean),
+    tool: Schema.optional(
+      Schema.Struct({
+        messageID: Schema.String,
+        callID: Schema.String,
+      }),
+    ),
+  })
+
  export const Accept = z.object({
    index: z.number().int().nonnegative().describe("Zero-based action index to accept"),
  })
  export type Accept = z.infer<typeof Accept>

  export const Event = {
-    Shown: BusEvent.define("suggestion.shown", Request),
+    Shown: BusEvent.define("suggestion.shown", RequestSchema),
    Accepted: BusEvent.define(
      "suggestion.accepted",
-      z.object({
-        sessionID: z.string(),
-        requestID: z.string(),
-        index: z.number().int().nonnegative(),
-        action: Action,
+      Schema.Struct({
+        sessionID: SessionID,
+        requestID: SuggestionIDSchema,
+        index: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)),
+        action: ActionSchema,
      }),
    ),
    Dismissed: BusEvent.define(
      "suggestion.dismissed",
-      z.object({
-        sessionID: z.string(),
-        requestID: z.string(),
+      Schema.Struct({
+        sessionID: SessionID,
+        requestID: SuggestionIDSchema,
      }),
    ),
  }
@@ -124,7 +152,7 @@ export namespace Suggestion {
        resolve,
        reject,
      }
-      Bus.publish(Event.Shown, info)
+      Bus.publish(Event.Shown, { ...info, sessionID: SessionID.make(info.sessionID) })
    })
  }

@@ -149,7 +177,7 @@ export namespace Suggestion {
    log.info("accepted", { requestID: input.requestID, index: input.index, label: action.label })

    Bus.publish(Event.Accepted, {
-      sessionID: existing.info.sessionID,
+      sessionID: SessionID.make(existing.info.sessionID),
      requestID: existing.info.id,
      index: input.index,
      action,
@@ -171,7 +199,7 @@ export namespace Suggestion {
    log.info("dismissed", { requestID })

    Bus.publish(Event.Dismissed, {
-      sessionID: existing.info.sessionID,
+      sessionID: SessionID.make(existing.info.sessionID),
      requestID: existing.info.id,
    })

@@ -192,7 +220,7 @@ export namespace Suggestion {
      delete s.pending[id]
      log.info("dismissed", { requestID: id })
      Bus.publish(Event.Dismissed, {
-        sessionID: entry.info.sessionID,
+        sessionID: SessionID.make(entry.info.sessionID),
        requestID: entry.info.id,
      })
      entry.reject(new DismissedError())
@@ -1,7 +1,6 @@
 import { Command } from "../../command"
 import { Log } from "../../util"
-import z from "zod"
-import { Effect } from "effect"
+import { Effect, Schema } from "effect"
 import DESCRIPTION from "./tool.txt"
 import { Tool } from "../../tool"
 import { Suggestion } from "./index"
@@ -10,9 +9,11 @@ import { SessionID } from "../../session/schema"

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

-const Params = z.object({
-  suggest: z.string().describe("Short suggestion text shown to the user"),
-  actions: z.array(Suggestion.Action).min(1).max(2).describe("Available actions the user can take"),
+const Params = Schema.Struct({
+  suggest: Schema.String.annotate({ description: "Short suggestion text shown to the user" }),
+  actions: Schema.Array(Suggestion.ActionSchema)
+    .check(Schema.isMinLength(1), Schema.isMaxLength(2))
+    .annotate({ description: "Available actions the user can take" }),
 })

 type Meta = {
@@ -62,7 +63,7 @@ export const SuggestTool = Tool.define<typeof Params, Meta, never, "suggest">(
        const promise = Suggestion.show({
          sessionID: ctx.sessionID,
          text: params.suggest,
-          actions: params.actions,
+          actions: params.actions.map((a) => ({ ...a })),
          blocking: false, // render above an active input; VS Code does the same
          tool: ctx.callID ? { messageID: ctx.messageID, callID: ctx.callID } : undefined,
        })
@@ -1,5 +1,4 @@
-import z from "zod"
-import { Effect } from "effect"
+import { Effect, Schema } from "effect"
 import path from "path"
 import * as Tool from "@/tool/tool"
 import { KiloIndexing } from "@/kilocode/indexing"
@@ -7,14 +6,14 @@ import { Instance } from "@/project/instance"

 import DESCRIPTION from "./semantic-search.txt"

-const Parameters = z.object({
-  query: z.string().describe("The search query, expressed in natural language."),
-  path: z
-    .string()
-    .optional()
-    .describe(
+const Parameters = Schema.Struct({
+  query: Schema.String.annotate({
+    description: "The search query, expressed in natural language.",
+  }),
+  path: Schema.optional(Schema.String).annotate({
+    description:
      "Limit search to specific subdirectory (relative to the current workspace directory). Leave empty for entire workspace.",
-    ),
+  }),
 })

 type SearchResult = {
@@ -29,12 +28,15 @@ type Meta = {
  results: SearchResult[]
 }

-export const SemanticSearchTool = Tool.define<typeof Parameters, Meta, never, "semantic_search">(
+export const SemanticSearchTool = Tool.define(
  "semantic_search",
  Effect.succeed({
    description: DESCRIPTION,
    parameters: Parameters,
-    execute: (params, ctx) =>
+    execute: (
+      params: Schema.Schema.Type<typeof Parameters>,
+      ctx: Tool.Context,
+    ): Effect.Effect<Tool.ExecuteResult<Meta>> =>
      Effect.gen(function* () {
        if (!params.query) {
          throw new Error("query is required")
@@ -8,6 +8,7 @@ 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"
@@ -41,9 +42,9 @@ export const InitializeError = NamedError.create(
 export const Event = {
  Diagnostics: BusEvent.define(
    "lsp.client.diagnostics",
-    z.object({
-      serverID: z.string(),
-      path: z.string(),
+    Schema.Struct({
+      serverID: Schema.String,
+      path: Schema.String,
    }),
  ),
 }
@@ -20,7 +20,7 @@ import { zod, ZodOverride } from "@/util/effect-zod"
 const log = Log.create({ service: "lsp" })

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

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

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

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

@@ -6,12 +6,14 @@ 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 } from "effect"
+import { Effect, Schema, Context, Layer, Option, FileSystem, Stream } 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", {
@@ -106,7 +108,33 @@ 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}`)
@@ -143,29 +171,15 @@ export const layer = Layer.effect(
      )

    const outdated = Effect.fn("Npm.outdated")(function* (pkg: string, cachedVersion: string) {
-      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) {
+      const latestVersion = yield* viewLatestVersion(pkg).pipe(Effect.option)
+      if (Option.isNone(latestVersion)) {
        return false
      }

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

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

    const add = Effect.fn("Npm.add")(function* (pkg: string) {
@@ -304,6 +318,7 @@ 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)
@@ -79,16 +79,14 @@ export class Approval extends Schema.Class<Approval>("PermissionApproval")({
 }

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

@@ -54,7 +54,7 @@ export const Info = Schema.Struct({
 export type Info = Types.DeepMutable<Schema.Schema.Type<typeof Info>>

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

 type Row = typeof ProjectTable.$inferSelect
@@ -1,4 +1,4 @@
-import { Effect, Layer, Context, Stream, Scope } from "effect"
+import { Effect, Layer, Context, Schema, Stream, Scope } from "effect"
 import { formatPatch, structuredPatch } from "diff"
 import path from "path"
 import { Bus } from "@/bus"
@@ -108,8 +108,8 @@ export type Mode = z.infer<typeof Mode>
 export const Event = {
  BranchUpdated: BusEvent.define(
    "vcs.branch.updated",
-    z.object({
-      branch: z.string().optional(),
+    Schema.Struct({
+      branch: Schema.optional(Schema.String),
    }),
  ),
 }
@@ -1,13 +1,12 @@
 import type { AuthOAuthResult, Hooks } from "@kilocode/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"

 // kilocode_change start
 import { Telemetry } from "@kilocode/kilo-telemetry"
@@ -76,22 +75,16 @@ export const CallbackInput = Schema.Struct({
 }).pipe(withStatics((s) => ({ zod: zod(s) })))
 export type CallbackInput = Schema.Schema.Type<typeof CallbackInput>

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

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

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

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

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

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

  const responseBody = JSON.stringify(body)
@@ -155,6 +156,13 @@ 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 z from "zod"
+import { Schema } from "effect"
 import { Installation } from "../installation"
 import { Flag } from "../flag/flag"
 import { lazy } from "@/util/lazy"
@@ -32,10 +32,6 @@ const normalizeKiloBaseURL = (baseURL: string | undefined, orgId: string | undef
  if (trimmed.endsWith("/api")) return `${trimmed}/openrouter`
  return `${trimmed}/api/openrouter`
 }
-
-export const Prompt = z.enum(PROMPTS)
-
-export const AiSdkProvider = z.enum(AI_SDK_PROVIDERS)
 // kilocode_change end

 const log = Log.create({ service: "models.dev" })
@@ -46,99 +42,91 @@ const filepath = path.join(
 )
 const ttl = 5 * 60 * 1000

-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(),
+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),
+    }),
+  ),
 })

-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(),
+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,
  }),
-  modalities: z
-    .object({
-      input: z.array(z.enum(["text", "audio", "image", "video", "pdf"])),
-      output: z.array(z.enum(["text", "audio", "image", "video", "pdf"])),
-    })
-    .optional(),
-
+  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"])),
+    }),
+  ),
  // kilocode_change start
-  recommendedIndex: z.number().optional(),
-  prompt: Prompt.optional().catch(undefined),
-  isFree: z.boolean().optional(),
-  ai_sdk_provider: AiSdkProvider.optional().catch(undefined),
+  recommendedIndex: Schema.optional(Schema.Number),
+  prompt: Schema.optional(Schema.Literals(PROMPTS)),
+  isFree: Schema.optional(Schema.Boolean),
+  ai_sdk_provider: Schema.optional(Schema.Literals(AI_SDK_PROVIDERS)),
  // kilocode_change end
-
-  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(),
+  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)),
+              }),
+            ),
          }),
-        )
-        .optional(),
-    })
-    .optional(),
-  status: z.enum(["alpha", "beta", "deprecated"]).optional(),
-  provider: z.object({ npm: z.string().optional(), api: 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) }),
+  ),
 })
-export type Model = z.infer<typeof Model>
+export type Model = Schema.Schema.Type<typeof 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 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 type Provider = z.infer<typeof Provider>
+export type Provider = Schema.Schema.Type<typeof Provider>

 function url() {
  return Flag.KILO_MODELS_URL || "https://models.dev"
@@ -1,4 +1,3 @@
-import z from "zod"
 import os from "os"
 import fuzzysort from "fuzzysort"
 import { Config } from "../config"
@@ -9,7 +8,6 @@ import { Npm } from "../npm"
 import { Hash } from "@opencode-ai/shared/util/hash"
 import { Plugin } from "../plugin"
 import { makeRuntime } from "@/effect/run-service" // kilocode_change
-import { NamedError } from "@opencode-ai/shared/util/error"
 import { type LanguageModelV3 } from "@ai-sdk/provider"
 import * as ModelsDev from "./models"
 import { Auth } from "../auth"
@@ -17,6 +15,7 @@ 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"
@@ -1064,7 +1063,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,
  }
@@ -1313,8 +1312,7 @@ const layer: Layer.Layer<
          const providerID = ProviderID.make(id)
          // kilocode_change start - keep OAuth plugin source when config and Codex auth coexist
          const oauth =
-            auths[providerID]?.type === "oauth" &&
-            plugins.some((x) => x.auth?.provider === providerID && x.auth.loader)
+            auths[providerID]?.type === "oauth" && plugins.some((x) => x.auth?.provider === providerID && x.auth.loader)
          const partial: Partial<Info> = oauth ? {} : { source: "config" }
          if (provider.env) partial.env = provider.env
          // kilocode_change end
@@ -1782,18 +1780,12 @@ export function parseModel(model: string) {
  }
 }

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

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

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

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

-        // kilocode_change start - cherry-picked from anomalyco/opencode#24146;
-        // will be reverted on the next wholesale upstream merge.
        // 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.
@@ -236,7 +234,6 @@ function normalizeMessages(
            },
          },
        }
-        // kilocode_change end
      }

      return msg
@@ -452,12 +449,10 @@ export function variants(model: Provider.Model): Record<string, Record<string, a
  const adaptiveEfforts = anthropicAdaptiveEfforts(model.api.id)

  if (
-    // kilocode_change start - cherry-picked from anomalyco/opencode#24157
    id.includes("deepseek-chat") ||
    id.includes("deepseek-reasoner") ||
    id.includes("deepseek-r1") ||
    id.includes("deepseek-v3") ||
-    // kilocode_change end
    id.includes("minimax") ||
    // id.includes("glm") || // kilocode_change
    // id.includes("kimi") || // kilocode_change
@@ -600,13 +595,11 @@ 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":
-      // kilocode_change start - cherry-picked from anomalyco/opencode#24163
      const efforts = [...WIDELY_SUPPORTED_EFFORTS]
      if (model.api.id.includes("deepseek-v4")) {
        efforts.push("max")
      }
      return Object.fromEntries(efforts.map((effort) => [effort, { reasoningEffort: effort }]))
-    // kilocode_change end

    case "@ai-sdk/azure":
      // https://v5.ai-sdk.dev/providers/ai-sdk-providers/azure
@@ -3,13 +3,14 @@ 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 } from "effect"
+import { Effect, Layer, Context, Schema, Types } from "effect"
+import { zod } from "@/util/effect-zod"
+import { withStatics } from "@/util/schema"
 import { EffectBridge } from "@/effect"

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

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

-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(),
+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,
 })
+  .annotate({ identifier: "Pty" })
+  .pipe(withStatics((s) => ({ zod: zod(s) })))

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

-export const UpdateInput = z.object({
-  title: z.string().optional(),
-  size: z
-    .object({
-      rows: z.number(),
-      cols: z.number(),
-    })
-    .optional(),
-})
+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 type UpdateInput = z.infer<typeof UpdateInput>
+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 const Event = {
-  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 })),
+  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 })),
 }

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

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

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

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

        if (!row) return data
@@ -108,7 +108,8 @@ const app = (upgrade: UpgradeWebSocket) =>
 const log = Log.Default.clone().tag("service", "server-proxy")

 export async function http(url: string | URL, extra: HeadersInit | undefined, req: Request, workspaceID: WorkspaceID) {
-  if (!(await Workspace.isSyncing(workspaceID))) { // kilocode_change missing await
+  if (!(await Workspace.isSyncing(workspaceID))) {
+    // kilocode_change missing await
    return new Response(`broken sync connection for workspace: ${workspaceID}`, {
      status: 503,
      headers: {
--- a/Show More
+++ b/Show More