feat(provider): load catalog request variants

test(provider): cover MiniMax routing defaults
fix(provider): remove conflicting MiniMax controls
2026-08-04 17:26:22 -04:00 · 2026-07-21 22:58:11 -05:00 · 2026-07-21 21:14:56 -05:00 · 2026-07-21 21:10:27 -05:00 · 2026-07-21 21:03:38 -05:00 · 2026-07-21 20:50:13 -05:00
163 changed files with 5846 additions and 1578 deletions
@@ -29,7 +29,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@corvu/drawer": "catalog:",
        "@dnd-kit/abstract": "0.5.0",
@@ -65,7 +65,7 @@
        "diff": "catalog:",
        "effect": "catalog:",
        "fuzzysort": "catalog:",
-        "ghostty-web": "github:anomalyco/ghostty-web#513463a6f1190253057e8a3f0dac8f6ee8393553",
+        "ghostty-web": "github:anomalyco/ghostty-web#83c0a07b8628b748aed073b232cb4b52a6ca11c1",
        "luxon": "catalog:",
        "marked": "catalog:",
        "marked-shiki": "catalog:",
@@ -95,7 +95,7 @@
    },
    "packages/cli": {
      "name": "@opencode-ai/cli",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "bin": {
        "lildax": "./bin/lildax.cjs",
      },
@@ -143,7 +143,7 @@
    },
    "packages/codemode": {
      "name": "@opencode-ai/codemode",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "acorn": "8.15.0",
        "effect": "catalog:",
@@ -157,7 +157,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -193,7 +193,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -220,7 +220,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@ai-sdk/anthropic": "3.0.82",
        "@ai-sdk/openai": "3.0.48",
@@ -242,7 +242,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -266,7 +266,7 @@
    },
    "packages/console/support": {
      "name": "@opencode-ai/console-support",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode-ai/console-core": "workspace:*",
@@ -286,7 +286,7 @@
    },
    "packages/core": {
      "name": "@opencode-ai/core",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -380,7 +380,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
        "effect": "catalog:",
@@ -434,7 +434,7 @@
    },
    "packages/effect-drizzle-sqlite": {
      "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
@@ -448,7 +448,7 @@
    },
    "packages/effect-sqlite-node": {
      "name": "@opencode-ai/effect-sqlite-node",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "effect": "catalog:",
      },
@@ -460,7 +460,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -492,7 +492,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -508,7 +508,7 @@
    },
    "packages/http-recorder": {
      "name": "@opencode-ai/http-recorder",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@effect/platform-node": "4.0.0-beta.83",
        "@effect/platform-node-shared": "4.0.0-beta.83",
@@ -539,7 +539,7 @@
    },
    "packages/llm": {
      "name": "@opencode-ai/llm",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@opencode-ai/schema": "workspace:*",
        "@smithy/eventstream-codec": "4.2.14",
@@ -558,7 +558,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -689,7 +689,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
        "@opencode-ai/sdk": "workspace:*",
@@ -765,7 +765,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "cross-spawn": "catalog:",
      },
@@ -780,7 +780,7 @@
    },
    "packages/server": {
      "name": "@opencode-ai/server",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@opencode-ai/core": "workspace:*",
        "@opencode-ai/protocol": "workspace:*",
@@ -795,7 +795,7 @@
    },
    "packages/session-ui": {
      "name": "@opencode-ai/session-ui",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -839,7 +839,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -852,7 +852,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode-ai/stats-app",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@kobalte/core": "catalog:",
@@ -886,7 +886,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode-ai/stats-core",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -905,7 +905,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode-ai/stats-server",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -947,7 +947,7 @@
    },
    "packages/tui": {
      "name": "@opencode-ai/tui",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@opencode-ai/core": "workspace:*",
        "@opencode-ai/plugin": "workspace:*",
@@ -974,7 +974,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@pierre/diffs": "catalog:",
@@ -1025,7 +1025,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.18.3",
+      "version": "1.18.4",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -3845,7 +3845,7 @@

    "get-tsconfig": ["get-tsconfig@4.14.0", "", { "dependencies": { "resolve-pkg-maps": "^1.0.0" } }, "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA=="],

-    "ghostty-web": ["ghostty-web@github:anomalyco/ghostty-web#513463a", {}, "anomalyco-ghostty-web-513463a", "sha512-GZR8LSmgGzViWnBJrqRI8MpAZRCJxhcr1Hi9Tyeh7YRooHZQjK9J97FQRD3tbBaM2wjq05gzGY2UEsG+JtZeBw=="],
+    "ghostty-web": ["ghostty-web@github:anomalyco/ghostty-web#83c0a07", {}, "anomalyco-ghostty-web-83c0a07", "sha512-Lf2v1agHkVUpMpHBWWuCZrhOEmcwwin5/Hboc9rZwQ7/CKkIh5rU1r1CvfLlhkMoFv+ed8z52RZ8hkzGZZj3MQ=="],

    "giget": ["giget@2.0.0", "", { "dependencies": { "citty": "^0.1.6", "consola": "^3.4.0", "defu": "^6.1.4", "node-fetch-native": "^1.6.6", "nypm": "^0.6.0", "pathe": "^2.0.3" }, "bin": { "giget": "dist/cli.mjs" } }, "sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA=="],

@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-zAftZieWR0hWQQVkhEa826iueHaRnKxtyRodhNb+Apc=",
-    "aarch64-linux": "sha256-cTG+gB7CuiFgaYHSFbzXaXUI1C2kiugV3B9rUDRUwlg=",
-    "aarch64-darwin": "sha256-ap4Xv5ZliourkI4mcD0ktbzSI88jb4oVBv5mMK3WdUs=",
-    "x86_64-darwin": "sha256-NGRJMMnaMNrf3FkcYwr5PcfVm5thhlNLGIeMmAK0MeE="
+    "x86_64-linux": "sha256-qt11SKmOjq0KU542QFbs+u7YyJicn4drCcwCdg325yk=",
+    "aarch64-linux": "sha256-z68doReXTrWS7HeiAjc0btIjAsvzeZZ7hXAlHr0c77Q=",
+    "aarch64-darwin": "sha256-PILYH1Pi8XBvSkuZ+1sNnUTao5kba+m5Z8iJKx6YXPo=",
+    "x86_64-darwin": "sha256-KpcJzP4m0SUavu/WaSffgzOxrHq8ljdy0GOzs9p16lo="
  }
 }
@@ -0,0 +1,50 @@
+import { expect, test } from "@playwright/test"
+import { base64Encode } from "@opencode-ai/core/util/encode"
+import { mockOpenCodeServer } from "../utils/mock-server"
+import { expectAppVisible } from "../utils/waits"
+
+const directory = "C:/OpenCode/PromptInputV2Editing"
+const projectID = "proj_prompt_input_v2_editing"
+const sessionID = "ses_prompt_input_v2_editing"
+
+test("preserves the draft when a populated command menu triggers a built-in", async ({ page }) => {
+  await mockOpenCodeServer(page, {
+    directory,
+    project: {
+      id: projectID,
+      worktree: directory,
+      vcs: "git",
+      name: "prompt-input-v2-editing",
+      time: { created: 1700000000000, updated: 1700000000000 },
+      sandboxes: [],
+    },
+    provider: { all: [], connected: [], default: {} },
+    sessions: [
+      {
+        id: sessionID,
+        slug: "prompt-input-v2-editing",
+        projectID,
+        directory,
+        title: "Prompt input V2 editing",
+        version: "dev",
+        time: { created: 1700000000000, updated: 1700000000000 },
+      },
+    ],
+    pageMessages: () => ({ items: [] }),
+  })
+  await page.addInitScript(() => {
+    localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
+  })
+
+  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  const composer = page.locator('[data-component="prompt-input-v2"]')
+  const input = composer.locator('[data-component="prompt-input"]')
+  await expectAppVisible(composer)
+
+  await input.fill("keep me")
+  await composer.getByRole("button", { name: "Add images and files" }).click()
+  await page.getByRole("menuitem", { name: "Commands" }).click()
+  await page.locator('[data-suggestion-id="model.choose"]').click()
+
+  await expect(input).toHaveText("keep me")
+})
@@ -56,7 +56,7 @@ test("shows the V2 thinking level control while relevant", async ({ page }) => {
  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
  const composer = page.locator('[data-component="prompt-input-v2"]')
  const input = composer.locator('[data-component="prompt-input"]')
-  const control = composer.locator('button[title="Choose model variant"]')
+  const control = composer.getByRole("button", { name: "Choose model variant" })
  await expectAppVisible(composer)

  await idleComposer(page)
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "description": "",
  "type": "module",
  "exports": {
@@ -81,7 +81,7 @@
    "diff": "catalog:",
    "effect": "catalog:",
    "fuzzysort": "catalog:",
-    "ghostty-web": "github:anomalyco/ghostty-web#513463a6f1190253057e8a3f0dac8f6ee8393553",
+    "ghostty-web": "github:anomalyco/ghostty-web#83c0a07b8628b748aed073b232cb4b52a6ca11c1",
    "luxon": "catalog:",
    "marked": "catalog:",
    "marked-shiki": "catalog:",
@@ -37,6 +37,14 @@ function writeAndWait(term: Terminal, data: string): Promise<void> {
 }

 describe("SerializeAddon", () => {
+  test("preserves color scheme reporting mode", async () => {
+    const { term, addon } = createTerminal()
+    await writeAndWait(term, "\x1b[?2031h")
+
+    expect(addon.serialize().startsWith("\x1b[?2031h")).toBe(true)
+    expect(addon.serialize({ excludeModes: true }).startsWith("\x1b[?2031h")).toBe(false)
+  })
+
  describe("ANSI color preservation", () => {
    test("should preserve text attributes (bold, italic, underline)", async () => {
      const { term, addon } = createTerminal()
@@ -89,6 +89,13 @@ const getTerminalBuffers = (value: ITerminalCore): TerminalBuffers | undefined =
  return { active, normal, alternate }
 }

+const getTerminalMode = (value: ITerminalCore, mode: number) => {
+  if (!isRecord(value)) return false
+  const terminal = value.wasmTerm
+  if (!isRecord(terminal) || typeof terminal.getMode !== "function") return false
+  return terminal.getMode(mode) === true
+}
+
 // ============================================================================
 // Types
 // ============================================================================
@@ -544,7 +551,8 @@ export class SerializeAddon implements ITerminalAddon {
      return ""
    }

-    let content = options?.range
+    let content = !options?.excludeModes && getTerminalMode(this._terminal, 2031) ? "\u001b[?2031h" : ""
+    content += options?.range
      ? this._serializeBufferByRange(normalBuffer, options.range, true)
      : this._serializeBufferByScrollback(normalBuffer, options?.scrollback)

@@ -16,6 +16,7 @@ export function TabsInfoPopup() {
  const settings = useSettings()
  const platform = usePlatform()
  const [drawerOpen, setDrawerOpen] = createSignal(false)
+  const windows = () => platform.platform === "desktop" && platform.os === "windows"

  return (
    <Drawer open={drawerOpen()} onOpenChange={setDrawerOpen} side="right">
@@ -70,12 +71,40 @@ export function TabsInfoPopup() {
          </button>
        </div>
      </Show>
-      <DrawerContent>
-        <div class="flex h-[52px] w-full shrink-0 items-center gap-4 self-stretch border-b border-v2-border-border-muted p-4">
+      <DrawerContent
+        style={
+          windows()
+            ? {
+                inset: "0 0 0 auto",
+                "max-height": "100vh",
+                "max-width": "100vw",
+                "border-radius": "0",
+              }
+            : undefined
+        }
+      >
+        <Show when={windows()}>
+          <DrawerClose
+            as={IconButtonV2}
+            type="button"
+            size="small"
+            variant="neutral"
+            aria-label="Close"
+            icon={<IconV2 name="xmark-small" />}
+            class="absolute top-[10px] left-[-36px]"
+          />
+        </Show>
+        <div
+          class="flex w-full shrink-0 items-center gap-4 self-stretch border-b border-v2-border-border-muted"
+          classList={{
+            "h-[40px] px-4": windows(),
+            "h-[52px] p-4": !windows(),
+          }}
+        >
          <p class="min-h-0 min-w-0 flex-1 text-[13px] font-[530] leading-5 tracking-[-0.04px] tabular-nums text-v2-text-text-muted">
            July 14
          </p>
-          <Show when={platform.platform !== "desktop" || platform.os !== "windows"}>
+          <Show when={!windows()}>
            <DrawerClose
              as={IconButtonV2}
              type="button"
@@ -36,6 +36,7 @@ import {
 export type PromptInputV2ComposerProps = {
  class?: string
  controller: PromptInputV2ComposerController
+  borderUnderlay?: boolean
  edit?: PromptInputProps["edit"]
  onEditLoaded?: PromptInputProps["onEditLoaded"]
 }
@@ -57,7 +58,10 @@ export function PromptInputV2Composer(props: PromptInputV2ComposerProps) {
    <div class="flex flex-col gap-3">
      <PromptInputV2
        controller={props.controller}
+        borderUnderlay={props.borderUnderlay}
        class={props.class}
+        attachKeybind={command.keybindParts("file.attach")}
+        attachShortcut={command.keybind("file.attach")}
        modelControl={
          <PromptInputV2ModelControl
            loading={props.controller.model.loading}
@@ -449,12 +453,14 @@ export function usePromptInputV2Controller(props: PromptInputV2ControllerProps):
              options: () => props.controls.agents.options.map((name) => ({ id: name, label: name })),
              current: () => props.controls.agents.current,
              onSelect: props.controls.agents.select,
+              keybind: () => command.keybindParts("agent.cycle"),
            }
          : undefined,
      variant: {
        options: () => variants().map((value) => ({ id: value, label: value })),
        current: () => props.controls.model.selection.variant.current() ?? "default",
        onSelect: (value) => props.controls.model.selection.variant.set(value === "default" ? undefined : value),
+        keybind: () => command.keybindParts("model.variant.cycle"),
      },
      submit: {
        stopping,
@@ -1460,10 +1460,10 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
        t={(key) => language.t(key as Parameters<typeof language.t>[0])}
      />
      <DockShellForm
+        data-dock-border-underlay="legacy"
        onSubmit={handleSubmit}
        classList={{
          "group/prompt-input": true,
-          "focus-within:shadow-xs-border": true,
          "border-icon-info-active border-dashed": store.draggingType !== null,
          [props.class ?? ""]: !!props.class,
        }}
@@ -89,13 +89,15 @@ const toOptimisticPart = (part: PromptRequestPart, sessionID: string, messageID:
 }

 export function buildRequestParts(input: BuildRequestPartsInput) {
-  const requestParts: PromptRequestPart[] = [
-    {
-      id: Identifier.ascending("part"),
-      type: "text",
-      text: input.text,
-    },
-  ]
+  const requestParts: PromptRequestPart[] = input.text.trim()
+    ? [
+        {
+          id: Identifier.ascending("part"),
+          type: "text",
+          text: input.text,
+        },
+      ]
+    : []

  const files = input.prompt.filter(isFileAttachment).map((attachment) => {
    const path = absolute(input.sessionDirectory, attachment.path)
@@ -93,24 +93,36 @@ export function PromptWorkspaceSelector(props: {
          </MenuV2.Content>
        </MenuV2.Portal>
      </MenuV2>
-      <Show when={props.branch}>
-        {(branch) => (
-          <>
-            <span class="hidden select-none opacity-50 sm:inline mx-1">/</span>
-            <TooltipV2
-              placement="top"
-              value={branch()}
-              class="min-w-0 max-w-[220px]"
-              contentClass="max-w-[calc(100vw-32px)] break-all"
-            >
-              <div class="flex h-7 min-w-0 max-w-[220px] items-center gap-1.5 px-2 text-[13px] font-[440] leading-5 tracking-[-0.04px]">
-                <Icon name="branch" size="small" class="shrink-0 text-v2-icon-icon-muted" />
-                <span class="min-w-0 truncate">{branch()}</span>
-              </div>
-            </TooltipV2>
-          </>
-        )}
-      </Show>
+      <PromptGitStatus branch={props.branch} />
    </>
  )
 }
+
+export function PromptGitStatus(props: { branch?: string; noGit?: boolean }) {
+  const language = useLanguage()
+  const label = () => {
+    if (props.noGit) return language.t("session.new.git.none")
+    return props.branch
+  }
+
+  return (
+    <Show when={label()}>
+      {(value) => (
+        <>
+          <span class="hidden select-none opacity-50 sm:inline mx-1">/</span>
+          <TooltipV2
+            placement="top"
+            value={value()}
+            class="min-w-0 max-w-[220px]"
+            contentClass="max-w-[calc(100vw-32px)] break-all"
+          >
+            <div class="flex h-7 min-w-0 max-w-[220px] items-center gap-1.5 px-2 text-[13px] font-[440] leading-5 tracking-[-0.04px]">
+              <Icon name="branch" size="small" class="shrink-0 text-v2-icon-icon-muted" />
+              <span class="min-w-0 truncate">{value()}</span>
+            </div>
+          </TooltipV2>
+        </>
+      )}
+    </Show>
+  )
+}
@@ -133,9 +133,10 @@
 }

 [data-slot="settings-v2-row-description"] {
+  margin-block: -3.5px;
  font-size: 13px;
  font-weight: 440;
-  line-height: 1;
+  line-height: 20px;
  color: var(--v2-text-text-muted);
 }

@@ -270,10 +271,10 @@
 }

 .settings-v2-provider-description {
-  margin: 0;
+  margin-block: -3.5px;
  font-size: 13px;
  font-weight: 440;
-  line-height: 1;
+  line-height: 20px;
  color: var(--v2-text-text-muted);
 }

@@ -292,7 +292,12 @@ export const Terminal = (props: TerminalProps) => {

  const scheduleSize = (cols: number, rows: number) => {
    if (disposed) return
-    if (lastSize?.cols === cols && lastSize?.rows === rows) return
+    if (lastSize?.cols === cols && lastSize?.rows === rows) {
+      pendingSize = undefined
+      if (sizeTimer !== undefined) clearTimeout(sizeTimer)
+      sizeTimer = undefined
+      return
+    }

    pendingSize = { cols, rows }

@@ -317,8 +322,10 @@ export const Terminal = (props: TerminalProps) => {

  createEffect(() => {
    const colors = terminalColors()
+    const mode = theme.mode() === "dark" ? "dark" : "light"
    if (!term) return
    setOptionIfSupported(term, "theme", colors)
+    setOptionIfSupported(term, "colorScheme", mode)
  })

  createEffect(() => {
@@ -396,6 +403,7 @@ export const Terminal = (props: TerminalProps) => {
      }
      _ghostty = g
      term = t
+      setOptionIfSupported(t, "colorScheme", theme.mode() === "dark" ? "dark" : "light")
      output = terminalWriter((data, done) =>
        t.write(data, () => {
          done?.()
@@ -595,6 +603,7 @@ export const Terminal = (props: TerminalProps) => {
          tries = 0
          local.onConnect?.()
          scheduleSize(t.cols, t.rows)
+          if (t.getMode(2031)) t.write("\x1b[?996n")
        }

        const handleMessage = (event: MessageEvent) => {
@@ -67,7 +67,7 @@ export function useTitlebarRightMount() {
  return mount
 }

-export function Titlebar(props: { update?: TitlebarUpdate }) {
+export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visible: boolean; toggle: () => void } }) {
  const layout = useLayout()
  const platform = usePlatform()
  const command = useCommand()
@@ -462,7 +462,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                  "md:pl-4": !mac(),
                }}
              >
-                <ChannelIndicator />
+                <ChannelIndicator debugTools={props.debugTools} />
                <Show when={windows() || linux()}>
                  <WindowsAppMenu command={command} platform={platform} variant="v2" />
                </Show>
@@ -660,9 +660,9 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                      </div>
                    </Show>
                    <div id="opencode-titlebar-left" class="flex items-center gap-3 min-w-0 px-2" />
-                    <ChannelIndicator />
                  </div>
                </div>
+                <ChannelIndicator debugTools={props.debugTools} />
              </div>
            </div>

@@ -747,12 +747,27 @@ function TitlebarUpdateIconButton(props: { state: TitlebarUpdatePillState }) {
  )
 }

-function ChannelIndicator() {
+function ChannelIndicator(props: { debugTools?: { visible: boolean; toggle: () => void } }) {
+  const channel = import.meta.env.VITE_OPENCODE_CHANNEL
+  if (channel === "dev" && props.debugTools) {
+    return (
+      <button
+        type="button"
+        class="bg-icon-interactive-base text-[#FFF] font-medium px-2 rounded-sm uppercase font-mono cursor-pointer"
+        onClick={props.debugTools.toggle}
+        aria-label="Toggle debug tools"
+        aria-pressed={props.debugTools.visible}
+      >
+        DEV
+      </button>
+    )
+  }
+
  return (
    <>
-      {["beta", "dev"].includes(import.meta.env.VITE_OPENCODE_CHANNEL) && (
+      {["beta", "dev"].includes(channel) && (
        <div class="bg-icon-interactive-base text-[#FFF] font-medium px-2 rounded-sm uppercase font-mono">
-          {import.meta.env.VITE_OPENCODE_CHANNEL.toUpperCase()}
+          {channel.toUpperCase()}
        </div>
      )}
    </>
@@ -176,7 +176,14 @@ export const { use: useNotification, provider: NotificationProvider } = createSi

    onCleanup(() => states.forEach((value) => value.dispose()))

-    const selected = () => ensure(activeServer())
+    const selected = () => {
+      const list = global.servers.list()
+      const key = activeServer()
+      if (list.some((conn) => ServerConnection.key(conn) === key)) return ensure(key)
+      const conn = list.find((conn) => ServerConnection.key(conn) === server.key) ?? list[0]
+      if (!conn) throw new Error("Notification server not found")
+      return ensure(ServerConnection.key(conn))
+    }

    return {
      ready: () => selected().ready(),
@@ -200,6 +200,49 @@ describe("server session", () => {
    expect(store.history.more("child")).toBe(true)
  })

+  test("keeps assistant history when its deleted parent cannot be backfilled", async () => {
+    const missing = Promise.withResolvers<SingleMessageResponse>()
+    const assistant = assistantMessage("message-2", "message-missing")
+    const client = rootMessageClient([response([{ info: assistant, parts: [] }], "older")], [missing.promise])
+    const store = createServerSession(client)
+    const loading = store.sync("child")
+    await client.rootRequested(1)
+
+    missing.reject(new Error("Message not found: message-missing", { cause: { status: 404 } }))
+    await loading
+
+    expect(client.rootRequests).toEqual([{ sessionID: "child", messageID: "message-missing" }])
+    expect(store.data.message.child).toEqual([assistant])
+    expect(store.history.more("child")).toBe(true)
+  })
+
+  test("drops a cached parent when a forced refresh confirms it was deleted", async () => {
+    const missing = Promise.withResolvers<SingleMessageResponse>()
+    const parent = userMessage("message-1")
+    const part = textPart(parent.id)
+    const assistant = assistantMessage("message-2", parent.id)
+    const client = rootMessageClient(
+      [
+        response([
+          { info: parent, parts: [part] },
+          { info: assistant, parts: [] },
+        ]),
+        response([{ info: assistant, parts: [] }], "older"),
+      ],
+      [missing.promise],
+    )
+    const store = createServerSession(client)
+    await store.sync("child")
+    const loading = store.sync("child", { force: true })
+    await client.rootRequested(1)
+
+    missing.reject(new Error(`Message not found: ${parent.id}`, { cause: { status: 404 } }))
+    await loading
+
+    expect(store.data.message.child).toEqual([assistant])
+    expect(store.data.part[parent.id]).toBeUndefined()
+  })
+
  test("does not let an optimistic user suppress initial root backfill", async () => {
    const user = userMessage("message-1")
    const part = textPart(user.id)
@@ -110,6 +110,7 @@ function reconcileFetched<T extends { id: string }>(
  options: {
    touched?: ReadonlySet<string>
    retained?: ReadonlySet<string>
+    removed?: ReadonlySet<string>
    preserveUnfetched?: boolean | ((item: T) => boolean)
  } = {},
 ) {
@@ -132,6 +133,7 @@ function reconcileFetched<T extends { id: string }>(
    if (item) result.set(id, item)
    if (!item) result.delete(id)
  }
+  for (const id of options.removed ?? emptyIDs) result.delete(id)
  return [...result.values()].sort((a, b) => cmp(a.id, b.id))
 }

@@ -577,6 +579,7 @@ export function createServerSession(client: OpencodeClient, options?: { retry?:
    const messages = reconcileFetched(merged.session, data.message[sessionID] ?? [], {
      touched: touchedMessages,
      retained: load?.retainedMessages,
+      removed: load?.removedMessages,
      preserveUnfetched,
    })
    batch(() => {
@@ -645,7 +648,15 @@ export function createServerSession(client: OpencodeClient, options?: { retry?:
          if (generations.get(sessionID) !== active) break
          const parent = await fetchMessage(sessionID, parentID, () =>
            resetMessageLoad(sessionID, load, messageLoadBaseline(load, parentID)),
-          )
+          ).catch((error) => {
+            const cause = error instanceof Error && typeof error.cause === "object" ? error.cause : undefined
+            if (cause && "status" in cause && cause.status === 404) {
+              load.removedMessages.add(parentID)
+              return
+            }
+            throw error
+          })
+          if (!parent) continue
          if (parent.message.role !== "user") throw new Error(`Assistant parent is not a user message: ${parentID}`)
          parents.push(parent)
        }
@@ -613,6 +613,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "محلي",
  "session.new.workspace.local": "المستودع المحلي",
  "session.new.workspace.existing": "مساحة عمل…",
+  "session.new.git.none": "لا يوجد Git",
  "session.new.lastModified": "آخر تعديل",
  "session.header.search.placeholder": "بحث {{project}}",
  "session.header.searchFiles": "بحث عن الملفات",
@@ -619,6 +619,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Local",
  "session.new.workspace.local": "Repositório local",
  "session.new.workspace.existing": "Espaço de trabalho…",
+  "session.new.git.none": "Sem Git",
  "session.new.lastModified": "Última modificação",
  "session.header.search.placeholder": "Buscar {{project}}",
  "session.header.searchFiles": "Buscar arquivos",
@@ -675,6 +675,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Lokalno",
  "session.new.workspace.local": "Lokalni repozitorij",
  "session.new.workspace.existing": "Radni prostor…",
+  "session.new.git.none": "Nema Gita",
  "session.new.lastModified": "Posljednja izmjena",

  "session.header.search.placeholder": "Pretraži {{project}}",
@@ -670,6 +670,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Lokal",
  "session.new.workspace.local": "Lokalt repository",
  "session.new.workspace.existing": "Arbejdsområde…",
+  "session.new.git.none": "Ingen Git",
  "session.new.lastModified": "Sidst ændret",

  "session.header.search.placeholder": "Søg {{project}}",
@@ -628,6 +628,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Lokal",
  "session.new.workspace.local": "Lokales Repository",
  "session.new.workspace.existing": "Arbeitsbereich…",
+  "session.new.git.none": "Kein Git",
  "session.new.lastModified": "Zuletzt geändert",
  "session.header.search.placeholder": "{{project}} durchsuchen",
  "session.header.searchFiles": "Dateien suchen",
@@ -700,6 +700,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Local",
  "session.new.workspace.local": "Local repository",
  "session.new.workspace.existing": "Workspace…",
+  "session.new.git.none": "No Git",
  "session.new.lastModified": "Last modified",

  "session.header.search.placeholder": "Search {{project}}",
@@ -676,6 +676,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Local",
  "session.new.workspace.local": "Repositorio local",
  "session.new.workspace.existing": "Espacio de trabajo…",
+  "session.new.git.none": "Sin Git",
  "session.new.lastModified": "Última modificación",

  "session.header.search.placeholder": "Buscar {{project}}",
@@ -624,6 +624,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Local",
  "session.new.workspace.local": "Dépôt local",
  "session.new.workspace.existing": "Espace de travail…",
+  "session.new.git.none": "Pas de Git",
  "session.new.lastModified": "Dernière modification",
  "session.header.search.placeholder": "Rechercher {{project}}",
  "session.header.searchFiles": "Rechercher des fichiers",
@@ -615,6 +615,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "ローカル",
  "session.new.workspace.local": "ローカルリポジトリ",
  "session.new.workspace.existing": "ワークスペース…",
+  "session.new.git.none": "Git なし",
  "session.new.lastModified": "最終更新",
  "session.header.search.placeholder": "{{project}}を検索",
  "session.header.searchFiles": "ファイルを検索",
@@ -976,6 +976,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "로컬",
  "session.new.workspace.local": "로컬 저장소",
  "session.new.workspace.existing": "작업 공간…",
+  "session.new.git.none": "Git 없음",

  "sidebar.empty.title": "열린 프로젝트 없음",
  "sidebar.empty.description": "프로젝트를 열어 시작하세요",
@@ -1070,6 +1070,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Lokalt",
  "session.new.workspace.local": "Lokalt depot",
  "session.new.workspace.existing": "Arbeidsområde…",
+  "session.new.git.none": "Ingen Git",

  "sidebar.empty.title": "Ingen åpne prosjekter",
  "sidebar.empty.description": "Åpne et prosjekt for å komme i gang",
@@ -619,6 +619,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Lokalnie",
  "session.new.workspace.local": "Lokalne repozytorium",
  "session.new.workspace.existing": "Przestrzeń robocza…",
+  "session.new.git.none": "Brak Git",
  "session.new.lastModified": "Ostatnio zmodyfikowano",
  "session.header.search.placeholder": "Szukaj {{project}}",
  "session.header.searchFiles": "Szukaj plików",
@@ -673,6 +673,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Локально",
  "session.new.workspace.local": "Локальный репозиторий",
  "session.new.workspace.existing": "Рабочее пространство…",
+  "session.new.git.none": "Нет Git",
  "session.new.lastModified": "Последнее изменение",

  "session.header.search.placeholder": "Поиск {{project}}",
@@ -669,6 +669,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "ในเครื่อง",
  "session.new.workspace.local": "รีโพซิทอรีในเครื่อง",
  "session.new.workspace.existing": "พื้นที่ทำงาน…",
+  "session.new.git.none": "ไม่มี Git",
  "session.new.lastModified": "แก้ไขล่าสุด",

  "session.header.search.placeholder": "ค้นหา {{project}}",
@@ -679,6 +679,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Yerel",
  "session.new.workspace.local": "Yerel depo",
  "session.new.workspace.existing": "Çalışma alanı…",
+  "session.new.git.none": "Git yok",
  "session.new.lastModified": "Son değişiklik",

  "session.header.search.placeholder": "{{project}} ara",
@@ -703,6 +703,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "Локально",
  "session.new.workspace.local": "Локальний репозиторій",
  "session.new.workspace.existing": "Робоча область…",
+  "session.new.git.none": "Немає Git",
  "session.new.lastModified": "Востаннє змінено",

  "session.header.search.placeholder": "Пошук {{project}}",
@@ -666,6 +666,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "本地",
  "session.new.workspace.local": "本地仓库",
  "session.new.workspace.existing": "工作区…",
+  "session.new.git.none": "无 Git",
  "session.new.lastModified": "最后修改",
  "session.header.search.placeholder": "搜索 {{project}}",
  "session.header.searchFiles": "搜索文件",
@@ -663,6 +663,7 @@ export const dict = {
  "session.new.workspace.triggerLocal": "本機",
  "session.new.workspace.local": "本機儲存庫",
  "session.new.workspace.existing": "工作區…",
+  "session.new.git.none": "無 Git",
  "session.new.lastModified": "最後修改",

  "session.header.search.placeholder": "搜尋 {{project}}",
@@ -17,6 +17,11 @@ import {
 } from "solid-js"
 import { makeEventListener } from "@solid-primitives/event-listener"
 import { createStore, produce } from "solid-js/store"
+import { DragDropProvider, PointerSensor } from "@dnd-kit/solid"
+import { isSortable, useSortable } from "@dnd-kit/solid/sortable"
+import { AutoScroller, Feedback, PointerActivationConstraints } from "@dnd-kit/dom"
+import { RestrictToVerticalAxis } from "@dnd-kit/abstract/modifiers"
+import { RestrictToElement } from "@dnd-kit/dom/modifiers"
 import { useQuery } from "@tanstack/solid-query"
 import { Button } from "@opencode-ai/ui/button"
 import { Logo } from "@opencode-ai/ui/logo"
@@ -1037,7 +1042,7 @@ function HomeServerRow(props: {
  )
 }

-function HomeProjectList(props: {
+type HomeProjectListProps = {
  server: ServerConnection.Any
  projects: LocalProject[]
  selected: HomeProjectSelection
@@ -1048,29 +1053,82 @@ function HomeProjectList(props: {
  clearNotifications: (server: ServerConnection.Any, project: LocalProject) => void
  unseenCount: (server: ServerConnection.Any, project: LocalProject) => number
  language: ReturnType<typeof useLanguage>
-}) {
+}
+
+function HomeProjectList(props: HomeProjectListProps) {
+  const global = useGlobal()
+  let listRef!: HTMLDivElement
+  const projects = () => global.ensureServerCtx(props.server).projects
+
  return (
-    <div class="flex min-w-0 flex-col gap-1">
-      <For each={props.projects}>
-        {(project) => (
-          <HomeProjectRow
-            project={project}
-            server={props.server}
-            selected={
-              props.selected.server === ServerConnection.key(props.server) &&
-              props.selected.directory === project.worktree
-            }
-            unseenCount={props.unseenCount(props.server, project)}
-            selectProject={props.selectProject}
-            openNewSession={props.openNewSession}
-            editProject={props.editProject}
-            closeProject={props.closeProject}
-            clearNotifications={props.clearNotifications}
-            language={props.language}
-          />
-        )}
-      </For>
-    </div>
+    <DragDropProvider
+      sensors={(defaults) => [
+        ...defaults.filter((sensor) => sensor !== PointerSensor),
+        PointerSensor.configure({
+          activationConstraints: (event) =>
+            event.pointerType === "touch"
+              ? [new PointerActivationConstraints.Delay({ value: 250, tolerance: 5 })]
+              : [new PointerActivationConstraints.Distance({ value: 4 })],
+          preventActivation: (event) => event.target instanceof Element && !!event.target.closest("[data-action]"),
+        }),
+      ]}
+      modifiers={[RestrictToVerticalAxis, RestrictToElement.configure({ element: () => listRef })]}
+      plugins={(defaults) => [
+        ...defaults.filter((plugin) => plugin !== AutoScroller && plugin !== Feedback),
+        AutoScroller.configure({ acceleration: 8, threshold: { x: 0, y: 0.05 } }),
+        Feedback.configure({ dropAnimation: null }),
+      ]}
+      onDragEnd={(event) => {
+        const source = event.operation.source
+        if (event.canceled || !isSortable(source)) return
+        if (source.initialIndex !== source.index) projects().move(source.id.toString(), source.index)
+        if (props.selected.server !== ServerConnection.key(props.server))
+          props.selectProject(props.server, source.id.toString())
+      }}
+    >
+      <div class="flex min-w-0 flex-col gap-1" ref={listRef}>
+        {/* Keyed on worktree strings: the enriched project objects are
+            recreated on every store or sync update, so iterating them directly
+            remounts all rows — killing any in-flight drag activation (the
+            row's sortable unregisters on unmount) and discarding animations.
+            String keys keep row elements alive and move them on reorder. */}
+        <For each={props.projects.map((project) => project.worktree)}>
+          {(worktree, index) => <HomeProjectSlot {...props} worktree={worktree} index={index} />}
+        </For>
+      </div>
+    </DragDropProvider>
+  )
+}
+
+function HomeProjectSlot(
+  props: HomeProjectListProps & {
+    worktree: string
+    index: () => number
+  },
+) {
+  const project = createMemo(() => props.projects.find((item) => item.worktree === props.worktree))
+
+  return (
+    <Show when={project()}>
+      {(item) => (
+        <HomeProjectRow
+          project={item()}
+          server={props.server}
+          index={props.index}
+          serverSelected={props.selected.server === ServerConnection.key(props.server)}
+          selected={
+            props.selected.server === ServerConnection.key(props.server) && props.selected.directory === props.worktree
+          }
+          unseenCount={props.unseenCount(props.server, item())}
+          selectProject={props.selectProject}
+          openNewSession={props.openNewSession}
+          editProject={props.editProject}
+          closeProject={props.closeProject}
+          clearNotifications={props.clearNotifications}
+          language={props.language}
+        />
+      )}
+    </Show>
  )
 }

@@ -1150,6 +1208,8 @@ function HomeRecentlyClosedRow(props: {
 function HomeProjectRow(props: {
  project: LocalProject
  server: ServerConnection.Any
+  index: () => number
+  serverSelected: boolean
  selected: boolean
  unseenCount: number
  selectProject: (server: ServerConnection.Any, directory: string) => void
@@ -1163,6 +1223,15 @@ function HomeProjectRow(props: {
  const platform = usePlatform()
  const serverUnreachable = () => global.servers.health[ServerConnection.key(props.server)]?.healthy === false
  const [state, setState] = createStore({ menuOpen: false })
+  const sortable = useSortable({
+    get id() {
+      return props.project.worktree
+    },
+    get index() {
+      return props.index()
+    },
+  })
+  let pointerDownSelected: boolean | undefined
  const canRevealInFileManager = () =>
    platform.platform === "desktop" && !!platform.openPath && ServerConnection.local(props.server)
  const fileManagerActionLabel = () =>
@@ -1179,15 +1248,49 @@ function HomeProjectRow(props: {
    )
  }
  return (
-    <div class="group/project relative flex h-7 min-w-0 items-center rounded-[6px]">
+    <div
+      ref={sortable.ref}
+      class="group/project relative flex h-7 min-w-0 items-center rounded-[6px]"
+      classList={{ "z-10": sortable.isDragSource() }}
+    >
      <button
        type="button"
        data-component="home-project-row"
        class={`${HOME_PROJECT_NAV_ROW} pr-16 disabled:opacity-60`}
+        classList={{
+          "bg-v2-background-bg-layer-01 text-v2-text-text-base [box-shadow:inset_0_0_0_0.5px_var(--v2-border-border-muted)]":
+            sortable.isDragSource(),
+        }}
        data-selected={props.selected ? "" : undefined}
        aria-current={props.selected ? "page" : undefined}
        disabled={serverUnreachable()}
-        onClick={() => props.selectProject(props.server, props.project.worktree)}
+        onPointerDown={(event) => {
+          // Same-server mouse selection happens on pointerdown (like tabs),
+          // but only ever selects; selectProject toggles, and deselecting here
+          // would fire on every drag before the threshold is met. Cross-server
+          // selection waits for click so reordering a remote server's projects
+          // does not focus that server and load its session index. Touch is
+          // excluded so flick-scrolling the list cannot select rows.
+          pointerDownSelected = undefined
+          if (event.button !== 0 || event.pointerType === "touch") return
+          if (!props.serverSelected) return
+          pointerDownSelected = props.selected
+          if (!props.selected) props.selectProject(props.server, props.project.worktree)
+        }}
+        onClick={(event) => {
+          // The drag sensor calls preventDefault on post-drag clicks; never
+          // toggle selection as part of a reorder.
+          if (event.defaultPrevented) return
+          // Keyboard activation and touch taps keep the original toggle.
+          if (event.detail === 0 || pointerDownSelected === undefined) {
+            props.selectProject(props.server, props.project.worktree)
+            return
+          }
+          // Mouse: pointerdown already selected unselected rows; a plain click
+          // on an already-selected row toggles it off.
+          if (pointerDownSelected) props.selectProject(props.server, props.project.worktree)
+          pointerDownSelected = undefined
+        }}
      >
        <HomeProjectAvatar project={props.project} />
        <span class={HOME_PROJECT_NAV_LABEL}>{displayName(props.project)}</span>
@@ -1,4 +1,5 @@
 import { createEffect, Suspense, type ParentProps } from "solid-js"
+import { createStore } from "solid-js/store"
 import { useNavigate } from "@solidjs/router"
 import { DebugBar } from "@/components/debug-bar"
 import { TabsInfoPopup } from "@/components/help-button"
@@ -11,6 +12,7 @@ export default function NewLayout(props: ParentProps) {
  const platform = usePlatform()
  const navigate = useNavigate()
  setNavigate(navigate)
+  const [state, setState] = createStore({ debugTools: true })

  createEffect(() => setV2Toast(true))

@@ -32,11 +34,18 @@ export default function NewLayout(props: ParentProps) {
        "padding-bottom": "env(safe-area-inset-bottom, 0px)",
      }}
    >
-      <Titlebar update={update} />
+      <Titlebar
+        update={update}
+        debugTools={
+          import.meta.env.DEV
+            ? { visible: state.debugTools, toggle: () => setState("debugTools", (value) => !value) }
+            : undefined
+        }
+      />
      <main class="flex-1 min-h-0 min-w-0 overflow-x-hidden flex flex-col items-start contain-strict">
        <Suspense>{props.children}</Suspense>
      </main>
-      {import.meta.env.DEV && <DebugBar inline />}
+      {import.meta.env.DEV && state.debugTools && <DebugBar inline />}
      <TabsInfoPopup />
      <ToastRegion v2 />
    </div>
@@ -156,6 +156,7 @@ export default function LegacyLayout(props: ParentProps) {
    sizing: false,
    peek: undefined as string | undefined,
    peeked: false,
+    debugTools: true,
  })

  const updateVersion = () => {
@@ -2248,7 +2249,14 @@ export default function LegacyLayout(props: ParentProps) {
  return (
    <div class="relative bg-background-base flex-1 min-h-0 min-w-0 flex flex-col select-none [&_input]:select-text [&_textarea]:select-text [&_[contenteditable]]:select-text">
      {autoselecting() ?? ""}
-      <Titlebar update={titlebarUpdate} />
+      <Titlebar
+        update={titlebarUpdate}
+        debugTools={
+          import.meta.env.DEV && import.meta.env.VITE_DISABLE_DEBUG_BAR !== "1"
+            ? { visible: state.debugTools, toggle: () => setState("debugTools", (value) => !value) }
+            : undefined
+        }
+      />
      <Show when={updateVersion() !== undefined}>
        <UpdateAvailableToast version={updateVersion() ?? ""} install={installUpdate} language={language} />
      </Show>
@@ -2393,7 +2401,7 @@ export default function LegacyLayout(props: ParentProps) {
            </div>
          </div>
        </div>
-        {import.meta.env.DEV && import.meta.env.VITE_DISABLE_DEBUG_BAR !== "1" && <DebugBar />}
+        {import.meta.env.DEV && import.meta.env.VITE_DISABLE_DEBUG_BAR !== "1" && state.debugTools && <DebugBar />}
      </div>
      <TabsInfoPopup />
      <ToastRegion v2={false} />
@@ -25,7 +25,7 @@ import { createPromptInputController, createPromptProjectControls } from "@/page
 import { useSessionKey } from "@/pages/session/session-layout"
 import { useComposerCommands } from "@/pages/session/use-composer-commands"
 import { NEW_SESSION_CONTENT_WIDTH } from "@/pages/session/new-session-layout"
-import { PromptWorkspaceSelector } from "@/components/prompt-workspace-selector"
+import { PromptGitStatus, PromptWorkspaceSelector } from "@/components/prompt-workspace-selector"
 import { useTitlebarRightMount } from "@/components/titlebar"
 import { useCommand } from "@/context/command"
 import { useProviders } from "@/hooks/use-providers"
@@ -168,24 +168,18 @@ export default function NewSessionPage() {
          <div class="flex-1 min-h-0 overflow-hidden rounded-[10px]">
            <NewSessionDesignView>
              <div class={NEW_SESSION_CONTENT_WIDTH}>
-                <div class="flex flex-col" classList={{ "gap-8": showWorkspaceBar(), "gap-3": !showWorkspaceBar() }}>
+                <div class="flex flex-col gap-8">
                  <PromptInputV2Composer controller={promptInputV2Controller} />
                  <Show when={projectController.empty()}>
                    <PromptProjectAddButton controller={projectController} />
                  </Show>
                  <Show when={projectController.selected()}>
-                    <div
-                      class="flex min-h-7 min-w-0 items-center gap-0 text-v2-text-text-faint"
-                      classList={{
-                        "flex-col justify-center sm:flex-row": showWorkspaceBar(),
-                        "justify-start": !showWorkspaceBar(),
-                      }}
-                    >
-                      <PromptProjectSelector
-                        controller={projectController}
-                        placement={showWorkspaceBar() ? "bottom" : "bottom-start"}
-                      />
-                      <Show when={showWorkspaceBar()}>
+                    <div class="flex min-h-7 min-w-0 flex-col items-center justify-center gap-0 text-v2-text-text-faint sm:flex-row">
+                      <PromptProjectSelector controller={projectController} placement="bottom" />
+                      <Show
+                        when={showWorkspaceBar()}
+                        fallback={<PromptGitStatus branch={selectedBranch()} noGit={sync().project?.vcs !== "git"} />}
+                      >
                        <PromptWorkspaceSelector
                          value={newSessionWorktree()}
                          projectRoot={projectRoot()}
@@ -668,7 +668,8 @@ export default function Page() {
  const mobileChanges = createMemo(() => !isDesktop() && store.mobileTab === "changes")
  const wantsReview = createMemo(() =>
    isDesktop()
-      ? desktopFileTreeOpen() || (desktopReviewOpen() && activeTab() === "review")
+      ? desktopFileTreeOpen() ||
+        (desktopReviewOpen() && (activeTab() === "review" || (newSessionDesign() && !!activeFileTab())))
      : store.mobileTab === "changes",
  )
  const vcsMode = createMemo<VcsMode | undefined>(() => {
@@ -2265,6 +2266,7 @@ export default function Page() {
                    return (
                      <PromptInputV2Composer
                        controller={controller}
+                        borderUnderlay
                        edit={editingFollowup()}
                        onEditLoaded={clearFollowupEdit}
                      />
@@ -2365,6 +2367,9 @@ export default function Page() {
                    reviewHasFocusableContent={() => hasReview() || reviewV2State.sidebarOpened()}
                    reviewCount={reviewCount}
                    reviewPanel={reviewPanelV2}
+                    diffVersion={vcsQuery.dataUpdatedAt}
+                    loadDiff={loadReviewDiff}
+                    expandUnchanged={reviewV2State.expandMode() === "expand"}
                    reviewSidebarToggle={(disabled) => (
                      <SessionReviewV2SidebarToggle
                        opened={reviewV2State.sidebarOpened()}
@@ -1,5 +1,6 @@
 import { For } from "solid-js"
 import { createStore } from "solid-js/store"
+import { DockShell } from "@opencode-ai/ui/dock-surface"
 import { SessionRevertDock } from "@/pages/session/composer/session-revert-dock"
 import { SettingsProvider, useSettings } from "@/context/settings"

@@ -78,12 +79,17 @@ function Stage(props: { count: number }) {
      {/* Reproduce the real composer stack: dock + card overlapping the dock's bottom by lift() = 18px */}
      <div style={{ display: "flex", "flex-direction": "column" }}>
        <SessionRevertDock items={store.items} onRestore={restore} />
-        <div
+        <DockShell
+          data-dock-border-underlay={v2() ? "v2" : "legacy"}
          style={{ position: "relative", "z-index": 70, "margin-top": "-18px" }}
-          class="min-h-24 w-full rounded-[12px] border border-v2-border-border-base bg-v2-background-bg-base px-4 py-3 text-[13px] text-v2-text-text-faint"
+          classList={{
+            "min-h-24 w-full rounded-[12px] px-4 py-3 text-[13px]": true,
+            "bg-v2-background-bg-base text-v2-text-text-faint": v2(),
+            "text-text-weak": !v2(),
+          }}
        >
          Ask anything...
-        </div>
+        </DockShell>
      </div>

      <div class="text-[12px] text-v2-text-text-faint">
@@ -8,8 +8,10 @@ import { TextReveal } from "@opencode-ai/ui/text-reveal"
 import { TextStrikethrough } from "@opencode-ai/ui/text-strikethrough"
 import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { Index, createEffect, createMemo } from "solid-js"
+import { Dynamic } from "solid-js/web"
 import { createStore } from "solid-js/store"
 import { useLanguage } from "@/context/language"
+import { useSettings } from "@/context/settings"

 const doneToken = "\u0000done\u0000"
 const totalToken = "\u0000total\u0000"
@@ -48,6 +50,7 @@ export function SessionTodoDock(props: {
  dockProgress: number
 }) {
  const language = useLanguage()
+  const settings = useSettings()
  const [store, setStore] = createStore({
    height: 78,
  })
@@ -91,8 +94,13 @@ export function SessionTodoDock(props: {
  })

  return (
-    <DockTray
+    <Dynamic
+      component={settings.general.newLayoutDesigns() ? "div" : DockTray}
      data-component="session-todo-dock"
+      classList={{
+        "w-full overflow-hidden rounded-xl border-[0.5px] border-v2-border-border-base bg-v2-background-bg-layer-01":
+          settings.general.newLayoutDesigns(),
+      }}
      style={{
        "overflow-x": "visible",
        "overflow-y": "hidden",
@@ -102,7 +110,11 @@ export function SessionTodoDock(props: {
      <div ref={contentRef}>
        <div
          data-action="session-todo-toggle"
-          class="pl-3 pr-2 py-2 flex items-center gap-2 overflow-visible"
+          classList={{
+            "flex items-center gap-2 overflow-visible": true,
+            "h-[42px] pl-4 pr-2": settings.general.newLayoutDesigns(),
+            "pl-3 pr-2 py-2": !settings.general.newLayoutDesigns(),
+          }}
          role="button"
          tabIndex={0}
          onClick={props.onToggle}
@@ -113,7 +125,12 @@ export function SessionTodoDock(props: {
          }}
        >
          <span
-            class="text-14-regular text-text-strong cursor-default inline-flex items-baseline shrink-0 overflow-visible"
+            classList={{
+              "cursor-default inline-flex items-baseline shrink-0 overflow-visible": true,
+              "font-[440] text-[13px] leading-5 tracking-[-0.04px] text-v2-text-text-muted":
+                settings.general.newLayoutDesigns(),
+              "text-14-regular text-text-strong": !settings.general.newLayoutDesigns(),
+            }}
            aria-label={label()}
            style={{
              "--tool-motion-odometer-ms": "600ms",
@@ -145,7 +162,11 @@ export function SessionTodoDock(props: {
            }}
          >
            <TextReveal
-              class="text-14-regular text-text-base cursor-default"
+              class={
+                settings.general.newLayoutDesigns()
+                  ? "cursor-default text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-faint"
+                  : "text-14-regular text-text-base cursor-default"
+              }
              text={props.collapsed ? preview() : undefined}
              duration={600}
              travel={25}
@@ -191,7 +212,7 @@ export function SessionTodoDock(props: {
          <TodoList todos={props.todos} />
        </div>
      </div>
-    </DockTray>
+    </Dynamic>
  )
 }

@@ -1,4 +1,4 @@
-import { createEffect, createMemo, createSignal, Match, on, onCleanup, Show, Switch } from "solid-js"
+import { createEffect, createMemo, createResource, createSignal, Match, on, onCleanup, Show, Switch } from "solid-js"
 import { createStore } from "solid-js/store"
 import { Dynamic } from "solid-js/web"
 import { makeEventListener } from "@solid-primitives/event-listener"
@@ -8,6 +8,7 @@ import { cloneSelectedLineRange, previewSelectedLines } from "@opencode-ai/sessi
 import { createLineCommentController } from "@opencode-ai/session-ui/line-comment-annotations"
 import { createLineCommentControllerV2 } from "@opencode-ai/session-ui/v2/line-comment-annotations-v2"
 import { sampledChecksum } from "@opencode-ai/core/util/encode"
+import { normalize, text } from "@opencode-ai/session-ui/session-diff"
 import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { LineCommentV2OverflowIcon } from "@opencode-ai/ui/v2/line-comment-v2"
@@ -18,11 +19,23 @@ import { showToast } from "@/utils/toast"
 import { selectionFromLines, useFile, type FileSelection, type SelectedLineRange } from "@/context/file"
 import { useComments } from "@/context/comments"
 import { useLanguage } from "@/context/language"
+import { useLayout } from "@/context/layout"
 import { usePrompt } from "@/context/prompt"
 import { useSettings } from "@/context/settings"
 import { getSessionHandoff } from "@/pages/session/handoff"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { createSessionTabs } from "@/pages/session/helpers"
+import { reviewDiffNeedsLoad, type RenderDiff } from "@/pages/session/v2/review-diff-kinds"
+
+type SessionFileViewProps = {
+  tab: string
+  diff?: RenderDiff
+  diffVersion?: number
+  loadDiff?: (path: string, version?: number) => Promise<RenderDiff | undefined>
+  expandUnchanged?: boolean
+}
+
+const selectionSide = (range: SelectedLineRange) => range.endSide ?? range.side ?? "additions"

 function FileCommentMenu(props: {
  moreLabel: string
@@ -207,11 +220,27 @@ export function FileTabContent(props: { tab: string }) {
  )
 }

-export function SessionFileView(props: { tab: string }) {
+export function SessionFileView(props: SessionFileViewProps) {
  const settings = useSettings()
+  const detailSource = createMemo(() => {
+    if (!props.diff || !props.loadDiff || !reviewDiffNeedsLoad(props.diff)) return
+    return { diff: props.diff, load: props.loadDiff, version: props.diffVersion }
+  })
+  const [loadedDiff] = createResource(detailSource, async ({ diff, load, version }) => {
+    const value = await load(diff.file, version)
+    if (value?.file !== diff.file) return
+    return { source: diff, version, value }
+  })
+  const diff = createMemo(() => {
+    const source = props.diff
+    if (!source) return
+    const loaded = loadedDiff()
+    return normalize(loaded?.source === source && loaded.version === props.diffVersion ? loaded.value : source)
+  })
+
  return (
    <Show when={settings.general.newLayoutDesigns()} fallback={<SessionFileViewV1 tab={props.tab} />}>
-      <SessionFileViewV2 tab={props.tab} />
+      <SessionFileViewV2 tab={props.tab} diff={diff()} expandUnchanged={props.expandUnchanged} />
    </Show>
  )
 }
@@ -501,11 +530,12 @@ function SessionFileViewV1(props: { tab: string }) {
  return content()
 }

-function SessionFileViewV2(props: { tab: string }) {
+function SessionFileViewV2(props: { tab: string; diff?: ReturnType<typeof normalize>; expandUnchanged?: boolean }) {
  const file = useFile()
  const comments = useComments()
  const language = useLanguage()
  const prompt = usePrompt()
+  const layout = useLayout()
  const fileComponent = useFileComponent()
  const { sessionKey, tabs, view } = useSessionLayout()
  const activeFileTab = createSessionTabs({
@@ -548,10 +578,15 @@ function SessionFileViewV2(props: { tab: string }) {
    })
  }

-  const buildPreview = (filePath: string, selection: FileSelection) => {
-    const source = filePath === path() ? contents() : file.get(filePath)?.content?.content
+  const buildPreview = (filePath: string, lines: SelectedLineRange) => {
+    const source =
+      filePath === path()
+        ? props.diff
+          ? text(props.diff, selectionSide(lines))
+          : contents()
+        : file.get(filePath)?.content?.content
    if (!source) return undefined
-    return selectionPreview(source, selection)
+    return selectionPreview(source, selectionFromLines(lines))
  }

  const addCommentToContext = (input: {
@@ -562,7 +597,7 @@ function SessionFileViewV2(props: { tab: string }) {
    origin?: "review" | "file"
  }) => {
    const selection = selectionFromLines(input.selection)
-    const preview = input.preview ?? buildPreview(input.file, selection)
+    const preview = input.preview ?? buildPreview(input.file, input.selection)

    const saved = comments.add({
      file: input.file,
@@ -587,7 +622,7 @@ function SessionFileViewV2(props: { tab: string }) {
    comment: string
  }) => {
    comments.update(input.file, input.id, input.comment)
-    const preview = input.file === path() ? buildPreview(input.file, selectionFromLines(input.selection)) : undefined
+    const preview = input.file === path() ? buildPreview(input.file, input.selection) : undefined
    prompt.context.updateComment(input.file, input.id, {
      comment: input.comment,
      ...(preview ? { preview } : {}),
@@ -628,7 +663,7 @@ function SessionFileViewV2(props: { tab: string }) {
    mention: {
      items: file.searchFilesAndDirectories,
    },
-    getSide: (range) => range.endSide ?? range.side ?? "additions",
+    getSide: selectionSide,
    state: {
      opened: () => note.openedComment,
      setOpened: (id) => setNote("openedComment", id),
@@ -726,12 +761,21 @@ function SessionFileViewV2(props: { tab: string }) {
    <div class="relative overflow-hidden pb-40">
      <Dynamic
        component={fileComponent}
-        mode="text"
-        file={{
-          name: path() ?? "",
-          contents: source,
-          cacheKey: cacheKey(),
-        }}
+        {...(props.diff
+          ? {
+              mode: "diff" as const,
+              fileDiff: props.diff.fileDiff,
+              diffStyle: layout.review.diffStyle(),
+              expandUnchanged: props.expandUnchanged,
+            }
+          : {
+              mode: "text" as const,
+              file: {
+                name: path() ?? "",
+                contents: source,
+                cacheKey: cacheKey(),
+              },
+            })}
        enableLineSelection
        enableGutterUtility
        selectedLines={activeSelection()}
@@ -761,6 +805,7 @@ function SessionFileViewV2(props: { tab: string }) {
        media={{
          mode: "auto",
          path: path(),
+          deleted: props.diff?.status === "deleted",
          current: state()?.content,
          onLoad: scrollSync.queueRestore,
          onError: (args: { kind: "image" | "audio" | "svg" }) => {
@@ -779,6 +824,7 @@ function SessionFileViewV2(props: { tab: string }) {
    <div class="mt-3 relative h-full min-h-0">
      <ScrollView class="h-full" viewportRef={scrollSync.setViewport} onScroll={scrollSync.handleScroll as any}>
        <Switch>
+          <Match when={props.diff}>{renderFile(contents())}</Match>
          <Match when={state()?.loaded}>{renderFile(contents())}</Match>
          <Match when={state()?.loading}>
            <div class="px-6 py-4 text-text-weak">{language.t("common.loading")}...</div>
@@ -71,6 +71,9 @@ export function SessionSidePanel(props: {
  reviewHasFocusableContent: () => boolean
  reviewCount: () => number
  reviewPanel: () => JSX.Element
+  diffVersion?: number
+  loadDiff?: (path: string, version?: number) => Promise<RenderDiff | undefined>
+  expandUnchanged?: boolean
  reviewSidebarToggle?: (disabled: boolean) => JSX.Element
  fileBrowserState?: SessionFileBrowserState
  activeDiff?: string
@@ -88,6 +91,11 @@ export function SessionSidePanel(props: {
  const sdk = useSDK()
  const { sessionKey, tabs, view, params } = useSessionLayout()
  const projectDirectory = createMemo(() => sdk().directory)
+  const diffForTab = (tab: string) => {
+    const path = file.pathFromTab(tab)
+    if (!path) return
+    return props.diffs().find((diff): diff is RenderDiff => renderDiff(diff) && diff.file === path)
+  }

  const isDesktop = createMediaQuery("(min-width: 768px)")
  const shown = settings.visibility.fileTree
@@ -739,6 +747,10 @@ export function SessionSidePanel(props: {
                              active={file.pathFromTab(browserTab() ?? activeFileTab() ?? "")}
                              kinds={kinds()}
                              state={props.fileBrowserState!}
+                              diff={diffForTab(browserTab() ?? activeFileTab() ?? "")}
+                              diffVersion={props.diffVersion}
+                              loadDiff={props.loadDiff}
+                              expandUnchanged={props.expandUnchanged}
                              onSelect={(path) => previewTab(file.tab(path))}
                              onSelectPermanent={(path) => openTab(file.tab(path))}
                              filterRef={(element) => (fileFilter = element)}
@@ -11,6 +11,7 @@ import { useSDK } from "@/context/sdk"
 import { displayName } from "@/pages/layout/helpers"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { SessionFileView } from "@/pages/session/file-tabs"
+import type { RenderDiff } from "@/pages/session/v2/review-diff-kinds"
 import { applyFileListKeyDown, SessionFileListV2 } from "@/pages/session/v2/session-file-list-v2"
 import { pathKey } from "@/utils/path-key"

@@ -30,6 +31,10 @@ export function SessionFileBrowserTab(props: {
  active?: string
  kinds: ReadonlyMap<string, Kind>
  state: SessionFileBrowserState
+  diff?: RenderDiff
+  diffVersion?: number
+  loadDiff?: (path: string, version?: number) => Promise<RenderDiff | undefined>
+  expandUnchanged?: boolean
  onSelect: (path: string) => void
  onSelectPermanent: (path: string) => void
  filterRef?: (element: HTMLInputElement) => void
@@ -172,7 +177,15 @@ export function SessionFileBrowserTab(props: {
      >
        <div class="min-h-0 flex-1">
          <Show when={props.tab} keyed>
-            {(tab) => <SessionFileView tab={tab} />}
+            {(tab) => (
+              <SessionFileView
+                tab={tab}
+                diff={props.diff}
+                diffVersion={props.diffVersion}
+                loadDiff={props.loadDiff}
+                expandUnchanged={props.expandUnchanged}
+              />
+            )}
          </Show>
        </div>
      </Show>
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/cli",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "type": "module",
  "license": "MIT",
  "bin": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/codemode",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "description": "Effect-native confined code execution over schema-described tools",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -9,7 +9,6 @@ import "./app.css"
 import { LanguageProvider } from "~/context/language"
 import { I18nProvider, useI18n } from "~/context/i18n"
 import { strip } from "~/lib/language"
-import { DesktopPromo } from "~/component/desktop-promo"

 function AppMeta() {
  const i18n = useI18n()
@@ -34,7 +33,6 @@ export default function App() {
            <MetaProvider>
              <AppMeta />
              <Suspense>{props.children}</Suspense>
-              <DesktopPromo />
            </MetaProvider>
          </I18nProvider>
        </LanguageProvider>
@@ -358,6 +358,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "المزود {{provider}} غير مدعوم",
  "zen.api.error.missingApiKey": "مفتاح API مفقود.",
  "zen.api.error.invalidApiKey": "مفتاح API غير صالح.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "حظر المزود الخارجي الطلب.",
  "zen.api.error.subscriptionQuotaExceeded": "تم تجاوز حصة الاشتراك. أعد المحاولة خلال {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "تم الوصول إلى حد الاستخدام لمدة 5 ساعات. تتم إعادة التعيين خلال {{retryIn}}. لمواصلة استخدام هذا النموذج الآن، فعّل الاستخدام من رصيدك المتاح: {{consoleGoUrl}}",
@@ -366,6 +366,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "Provedor {{provider}} não suportado",
  "zen.api.error.missingApiKey": "Chave de API ausente.",
  "zen.api.error.invalidApiKey": "Chave de API inválida.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "Solicitação bloqueada pelo provedor upstream.",
  "zen.api.error.subscriptionQuotaExceeded": "Cota de assinatura excedida. Tente novamente em {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "Limite de uso de 5 horas atingido. Será reiniciado em {{retryIn}}. Para continuar usando este modelo agora, habilite o uso a partir do seu saldo disponível: {{consoleGoUrl}}",
@@ -362,6 +362,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "Udbyder {{provider}} understøttes ikke",
  "zen.api.error.missingApiKey": "Manglende API-nøgle.",
  "zen.api.error.invalidApiKey": "Ugyldig API-nøgle.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "Anmodningen blev blokeret af upstream-udbyderen.",
  "zen.api.error.subscriptionQuotaExceeded": "Abonnementskvote overskredet. Prøv igen om {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "Forbrugsgrænsen for 5 timer er nået. Nulstilles om {{retryIn}}. For at fortsætte med at bruge denne model nu, aktivér forbrug fra din tilgængelige saldo: {{consoleGoUrl}}",
@@ -365,6 +365,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "Anbieter {{provider}} wird nicht unterstützt",
  "zen.api.error.missingApiKey": "Fehlender API-Key.",
  "zen.api.error.invalidApiKey": "Ungültiger API-Key.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "Anfrage vom vorgelagerten Anbieter blockiert.",
  "zen.api.error.subscriptionQuotaExceeded": "Abonnement-Quote überschritten. Erneuter Versuch in {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "5-Stunden-Nutzungslimit erreicht. Wird in {{retryIn}} zurückgesetzt. Um dieses Modell jetzt weiter zu nutzen, aktiviere die Nutzung über dein verfügbares Guthaben: {{consoleGoUrl}}",
@@ -360,6 +360,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "Provider {{provider}} not supported",
  "zen.api.error.missingApiKey": "Missing API key.",
  "zen.api.error.invalidApiKey": "Invalid API key.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "Request blocked by upstream provider.",
  "zen.api.error.subscriptionQuotaExceeded": "Subscription quota exceeded. Retry in {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "5-hour usage limit reached. Resets in {{retryIn}}. To continue using this model now, enable usage from your available balance: {{consoleGoUrl}}",
@@ -366,6 +366,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "Proveedor {{provider}} no soportado",
  "zen.api.error.missingApiKey": "Falta la clave API.",
  "zen.api.error.invalidApiKey": "Clave API inválida.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "El proveedor externo bloqueó la solicitud.",
  "zen.api.error.subscriptionQuotaExceeded": "Cuota de suscripción excedida. Reintenta en {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "Límite de uso de 5 horas alcanzado. Se restablece en {{retryIn}}. Para seguir usando este modelo ahora, habilita el uso desde tu saldo disponible: {{consoleGoUrl}}",
@@ -366,6 +366,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "Fournisseur {{provider}} non pris en charge",
  "zen.api.error.missingApiKey": "Clé API manquante.",
  "zen.api.error.invalidApiKey": "Clé API invalide.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "Requête bloquée par le fournisseur en amont.",
  "zen.api.error.subscriptionQuotaExceeded": "Quota d'abonnement dépassé. Réessayez dans {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "Limite d'utilisation sur 5 heures atteinte. Réinitialisation dans {{retryIn}}. Pour continuer à utiliser ce modèle dès maintenant, activez l'utilisation depuis votre solde disponible : {{consoleGoUrl}}",
@@ -362,6 +362,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "Provider {{provider}} non supportato",
  "zen.api.error.missingApiKey": "Chiave API mancante.",
  "zen.api.error.invalidApiKey": "Chiave API non valida.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "Richiesta bloccata dal provider upstream.",
  "zen.api.error.subscriptionQuotaExceeded": "Quota dell'abbonamento superata. Riprova tra {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "Limite di utilizzo di 5 ore raggiunto. Si reimposta tra {{retryIn}}. Per continuare a usare questo modello ora, abilita l'utilizzo dal tuo saldo disponibile: {{consoleGoUrl}}",
@@ -362,6 +362,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "プロバイダー {{provider}} はサポートされていません",
  "zen.api.error.missingApiKey": "APIキーがありません。",
  "zen.api.error.invalidApiKey": "無効なAPIキーです。",
+  "zen.api.error.requestBlockedByUpstreamProvider": "上流プロバイダーによりリクエストがブロックされました。",
  "zen.api.error.subscriptionQuotaExceeded":
    "サブスクリプションの制限を超えました。{{retryIn}} 後に再試行してください。",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
@@ -357,6 +357,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "{{provider}} 제공자는 지원되지 않습니다",
  "zen.api.error.missingApiKey": "API 키가 누락되었습니다.",
  "zen.api.error.invalidApiKey": "유효하지 않은 API 키입니다.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "상위 제공자가 요청을 차단했습니다.",
  "zen.api.error.subscriptionQuotaExceeded": "구독 할당량을 초과했습니다. {{retryIn}} 후 다시 시도해 주세요.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "5시간 사용 한도에 도달했습니다. {{retryIn}} 후 초기화됩니다. 이 모델을 지금 계속 사용하려면 사용 가능한 잔액에서 사용을 활성화하세요: {{consoleGoUrl}}",
@@ -363,6 +363,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "Leverandør {{provider}} støttes ikke",
  "zen.api.error.missingApiKey": "Mangler API-nøkkel.",
  "zen.api.error.invalidApiKey": "Ugyldig API-nøkkel.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "Forespørselen ble blokkert av leverandøren.",
  "zen.api.error.subscriptionQuotaExceeded": "Abonnementskvote overskredet. Prøv igjen om {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "5-timers bruksgrense nådd. Tilbakestilles om {{retryIn}}. For å fortsette å bruke denne modellen nå, aktiver bruk fra din tilgjengelige saldo: {{consoleGoUrl}}",
@@ -364,6 +364,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "Dostawca {{provider}} nie jest obsługiwany",
  "zen.api.error.missingApiKey": "Brak klucza API.",
  "zen.api.error.invalidApiKey": "Nieprawidłowy klucz API.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "Żądanie zablokowane przez dostawcę zewnętrznego.",
  "zen.api.error.subscriptionQuotaExceeded": "Przekroczono limit subskrypcji. Spróbuj ponownie za {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "Osiągnięto 5-godzinny limit użycia. Resetuje się za {{retryIn}}. Aby nadal korzystać z tego modelu, włącz użycie z dostępnego salda: {{consoleGoUrl}}",
@@ -368,6 +368,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "Провайдер {{provider}} не поддерживается",
  "zen.api.error.missingApiKey": "Отсутствует API ключ.",
  "zen.api.error.invalidApiKey": "Неверный API ключ.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "Запрос заблокирован вышестоящим провайдером.",
  "zen.api.error.subscriptionQuotaExceeded": "Квота подписки превышена. Повторите попытку через {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "Достигнут лимит использования за 5 часов. Сбросится через {{retryIn}}. Чтобы продолжить использовать эту модель сейчас, включите оплату с доступного баланса: {{consoleGoUrl}}",
@@ -359,6 +359,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "ไม่รองรับผู้ให้บริการ {{provider}}",
  "zen.api.error.missingApiKey": "ไม่มี API key",
  "zen.api.error.invalidApiKey": "API key ไม่ถูกต้อง",
+  "zen.api.error.requestBlockedByUpstreamProvider": "คำขอถูกบล็อกโดยผู้ให้บริการต้นทาง",
  "zen.api.error.subscriptionQuotaExceeded": "โควต้าการสมัครสมาชิกเกินขีดจำกัด ลองใหม่ในอีก {{retryIn}}",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "ถึงขีดจำกัดการใช้งานในรอบ 5 ชั่วโมงแล้ว จะรีเซ็ตในอีก {{retryIn}} หากต้องการใช้โมเดลนี้ต่อทันที ให้เปิดใช้งานจากยอดเงินคงเหลือของคุณ: {{consoleGoUrl}}",
@@ -366,6 +366,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "{{provider}} sağlayıcısı desteklenmiyor",
  "zen.api.error.missingApiKey": "API anahtarı eksik.",
  "zen.api.error.invalidApiKey": "Geçersiz API anahtarı.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "İstek üst sağlayıcı tarafından engellendi.",
  "zen.api.error.subscriptionQuotaExceeded": "Abonelik kotası aşıldı. {{retryIn}} içinde tekrar deneyin.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "5 saatlik kullanım limitine ulaşıldı. {{retryIn}} içinde sıfırlanır. Bu modeli şimdi kullanmaya devam etmek için kullanılabilir bakiyenizden kullanımı etkinleştirin: {{consoleGoUrl}}",
@@ -363,6 +363,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "Провайдер {{provider}} не підтримується",
  "zen.api.error.missingApiKey": "Відсутній ключ API.",
  "zen.api.error.invalidApiKey": "Недійсний ключ API.",
+  "zen.api.error.requestBlockedByUpstreamProvider": "Запит заблоковано зовнішнім провайдером.",
  "zen.api.error.subscriptionQuotaExceeded": "Перевищено квоту підписки. Повторіть через {{retryIn}}.",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "Досягнуто 5-годинного ліміту використання. Скидається через {{retryIn}}. Щоб продовжити, увімкніть використання з доступного балансу: {{consoleGoUrl}}",
@@ -346,6 +346,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "不支持提供商 {{provider}}",
  "zen.api.error.missingApiKey": "缺少 API 密钥。",
  "zen.api.error.invalidApiKey": "无效的 API 密钥。",
+  "zen.api.error.requestBlockedByUpstreamProvider": "请求被上游提供商阻止。",
  "zen.api.error.subscriptionQuotaExceeded": "超出订阅配额。请在 {{retryIn}} 后重试。",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "已达到 5 小时使用限额。将在 {{retryIn}} 后重置。如需立即继续使用该模型，请启用从可用余额扣费：{{consoleGoUrl}}",
@@ -346,6 +346,7 @@ export const dict = {
  "zen.api.error.providerNotSupported": "不支援供應商 {{provider}}",
  "zen.api.error.missingApiKey": "缺少 API 金鑰。",
  "zen.api.error.invalidApiKey": "無效的 API 金鑰。",
+  "zen.api.error.requestBlockedByUpstreamProvider": "請求遭上游供應商封鎖。",
  "zen.api.error.subscriptionQuotaExceeded": "超出訂閱配額。請在 {{retryIn}} 後重試。",
  "zen.api.error.goSubscriptionRollingLimitExceeded":
    "已達 5 小時使用上限，將在 {{retryIn}} 後重置。若要立即繼續使用此模型，請從可用餘額啟用使用量：{{consoleGoUrl}}",
@@ -63,8 +63,8 @@ function LimitsGraph(props: { href: string }) {

  const baseline = 100
  const graph = [
-    { id: "grok-4.5", name: "Grok 4.5", req: 80, d: "50ms" },
-    { id: "kimi-k3", name: "Kimi K3 (2x usage)", req: 280, baseReq: 140, d: "75ms" },
+    { id: "grok-4.5", name: "Grok 4.5", req: 120, d: "50ms" },
+    { id: "kimi-k3", name: "Kimi K3 (2x usage)", req: 220, baseReq: 110, d: "75ms" },
    { id: "glm-5.2", name: "GLM-5.2", req: 880, d: "100ms" },
    { id: "qwen3.7-max", name: "Qwen3.7 Max", req: 950, d: "110ms" },
    { id: "kimi-k2.7-code", name: "Kimi K2.7 Code", req: 1150, d: "150ms" },
@@ -0,0 +1,14 @@
+import type { APIEvent } from "@solidjs/start/server"
+import { handler } from "~/routes/zen/util/handler"
+import { parseOpenAiVariant } from "~/routes/zen/util/variant"
+
+export function POST(input: APIEvent) {
+  return handler(input, {
+    format: "openai",
+    modelList: "lite",
+    parseApiKey: (headers: Headers) => headers.get("authorization")?.split(" ")[1],
+    parseModel: (url: string, body: any) => body.model,
+    parseVariant: (url: string, body: any) => parseOpenAiVariant(body),
+    parseIsStream: (url: string, body: any) => !!body.stream,
+  })
+}
@@ -697,6 +697,9 @@ export async function handler(
          workspace: {
            id: WorkspaceTable.id,
            region: WorkspaceTable.region,
+            isBlocked: WorkspaceTable.is_blocked,
+            isFlaggedByAnthropic: WorkspaceTable.is_flagged_by_anthropic,
+            isFlaggedByOpenAI: WorkspaceTable.is_flagged_by_openai,
          },
          billing: {
            balance: BillingTable.balance,
@@ -772,6 +775,12 @@ export async function handler(
    )

    if (!data) throw new AuthError(t("zen.api.error.invalidApiKey"))
+    if (
+      data.workspace.isBlocked ||
+      (data.workspace.isFlaggedByAnthropic && modelInfo.id.startsWith("claude-")) ||
+      (data.workspace.isFlaggedByOpenAI && modelInfo.id.startsWith("gpt-"))
+    )
+      throw new AuthError(t("zen.api.error.requestBlockedByUpstreamProvider"))
    if (
      modelInfo.id.startsWith("alpha-") &&
      Resource.App.stage === "production" &&
@@ -0,0 +1,3 @@
+ALTER TABLE `workspace` ADD `is_blocked` boolean;--> statement-breakpoint
+ALTER TABLE `workspace` ADD `is_flagged_by_anthropic` boolean;--> statement-breakpoint
+ALTER TABLE `workspace` ADD `is_flagged_by_openai` boolean;
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,4 +1,4 @@
-import { json, primaryKey, mysqlTable, uniqueIndex, varchar } from "drizzle-orm/mysql-core"
+import { boolean, json, primaryKey, mysqlTable, uniqueIndex, varchar } from "drizzle-orm/mysql-core"
 import { timestamps, ulid } from "../drizzle/types"

 export const WorkspaceTable = mysqlTable(
@@ -8,6 +8,9 @@ export const WorkspaceTable = mysqlTable(
    slug: varchar("slug", { length: 255 }),
    name: varchar("name", { length: 255 }).notNull(),
    region: json("region").$type<("us" | "eu" | "sg" | "cn")[]>(),
+    is_blocked: boolean(),
+    is_flagged_by_anthropic: boolean(),
+    is_flagged_by_openai: boolean(),
    ...timestamps,
  },
  (table) => [uniqueIndex("slug").on(table.slug)],
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-support",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "name": "@opencode-ai/core",
  "type": "module",
  "license": "MIT",
@@ -69,6 +69,7 @@ export const Model = Schema.Struct({
  temperature: Schema.Boolean,
  tool_call: Schema.Boolean,
  reasoning_options: Schema.optional(Schema.Array(ReasoningOption)),
+  variants: Schema.optional(Schema.Record(Schema.String, Schema.Record(Schema.String, Schema.MutableJson))),
  interleaved: Schema.optional(
    Schema.Union([
      Schema.Literal(true),
@@ -109,7 +110,13 @@ export const Model = Schema.Struct({
  ),
  status: Schema.optional(CatalogModelStatus),
  provider: Schema.optional(
-    Schema.Struct({ npm: Schema.optional(Schema.String), api: Schema.optional(Schema.String) }),
+    Schema.Struct({
+      npm: Schema.optional(Schema.String),
+      api: Schema.optional(Schema.String),
+      variant: Schema.optional(Schema.String),
+      body: Schema.optional(Schema.Record(Schema.String, Schema.MutableJson)),
+      headers: Schema.optional(Schema.Record(Schema.String, Schema.String)),
+    }),
  ),
 })
 export type Model = Schema.Schema.Type<typeof Model>
@@ -3,6 +3,7 @@ import type { ModelV2Info } from "@opencode-ai/sdk/v2/types"
 import { Effect, Stream } from "effect"
 import { EventV2 } from "../event"
 import { ModelsDev } from "../models-dev"
+import { ModelV2 } from "../model"
 import { ProviderV2 } from "../provider"

 function released(date: string) {
@@ -102,7 +103,11 @@ function applyModel(
    input: [...(model.modalities?.input ?? [])],
    output: [...(model.modalities?.output ?? [])],
  }
-  draft.variants = []
+  draft.variants = Object.entries(model.variants ?? {}).map(([id, body]) => ({
+    id: ModelV2.VariantID.make(id),
+    headers: {},
+    body: { ...body },
+  }))
  draft.time.released = released(model.release_date)
  draft.cost = input.cost ?? cost(model.cost)
  draft.status = model.status ?? "active"
@@ -112,6 +117,9 @@ function applyModel(
    input: model.limit.input,
    output: model.limit.output,
  }
+  if (model.provider?.variant !== undefined) draft.request.variant = ModelV2.VariantID.make(model.provider.variant)
+  Object.assign(draft.request.headers, model.provider?.headers ?? {})
+  Object.assign(draft.request.body, model.provider?.body ?? {})
  Object.assign(draft.request.headers, input.request?.headers ?? {})
  Object.assign(draft.request.body, input.request?.body ?? {})
 }
@@ -4,7 +4,10 @@ import type { Opts, Proc } from "./pty"
 export type { Disp, Exit, Opts, Proc } from "./pty"

 export function spawn(file: string, args: string[], opts: Opts): Proc {
-  const proc = pty.spawn(file, args, opts)
+  const proc = pty.spawn(file, args, {
+    ...opts,
+    ...(process.platform === "win32" ? { useConptyDll: true } : {}),
+  })
  return {
    pid: proc.pid,
    onData(listener) {
@@ -48,8 +48,13 @@ describe("ModelsDevPlugin", () => {
                  release_date: "2026-01-01",
                  attachment: false,
                  reasoning: true,
+                  reasoning_options: [{ type: "toggle" }],
                  temperature: true,
                  tool_call: true,
+                  variants: {
+                    none: { thinking: { type: "disabled" } },
+                    thinking: { thinking: { type: "adaptive" } },
+                  },
                  cost: {
                    input: 2.5,
                    output: 15,
@@ -64,6 +69,11 @@ describe("ModelsDevPlugin", () => {
                    context_over_200k: { input: 5, output: 22.5, cache_read: 0.5 },
                  },
                  limit: { context: 1_050_000, input: 922_000, output: 128_000 },
+                  provider: {
+                    variant: "thinking",
+                    body: { thinking: { type: "adaptive" } },
+                    headers: { "x-model": "gpt-5.4" },
+                  },
                  experimental: {
                    modes: {
                      fast: {
@@ -93,18 +103,29 @@ describe("ModelsDevPlugin", () => {
      const base = yield* catalog.model.get(providerID, ModelV2.ID.make("gpt-5.4"))
      const fast = yield* catalog.model.get(providerID, ModelV2.ID.make("gpt-5.4-fast"))

-      expect(base?.variants).toEqual([])
-      expect(base?.request.body).toEqual({})
+      expect(base?.variants).toEqual([
+        { id: ModelV2.VariantID.make("none"), headers: {}, body: { thinking: { type: "disabled" } } },
+        { id: ModelV2.VariantID.make("thinking"), headers: {}, body: { thinking: { type: "adaptive" } } },
+      ])
+      expect(base?.request).toEqual({
+        variant: ModelV2.VariantID.make("thinking"),
+        headers: { "x-model": "gpt-5.4" },
+        body: { thinking: { type: "adaptive" } },
+      })
      expect(fast).toMatchObject({
        id: "gpt-5.4-fast",
        providerID: "acme",
        name: "GPT-5.4 Fast",
        api: { id: "gpt-5.4" },
        request: {
-          headers: { "x-mode": "fast" },
-          body: { service_tier: "priority" },
+          variant: ModelV2.VariantID.make("thinking"),
+          headers: { "x-model": "gpt-5.4", "x-mode": "fast" },
+          body: { thinking: { type: "adaptive" }, service_tier: "priority" },
        },
-        variants: [],
+        variants: [
+          { id: ModelV2.VariantID.make("none"), headers: {}, body: { thinking: { type: "disabled" } } },
+          { id: ModelV2.VariantID.make("thinking"), headers: {}, body: { thinking: { type: "adaptive" } } },
+        ],
      })
      expect(fast?.cost).toEqual([
        { input: 5, output: 30, cache: { read: 0.5, write: 0 } },
@@ -22,7 +22,7 @@ type Api =
    }
  | { readonly type: "native"; readonly url?: string; readonly settings: Record<string, unknown> }

-const model = (api: Api, variants: ModelV2.Info["variants"] = []) =>
+const model = (api: Api, variants: ModelV2.Info["variants"] = [], variant?: ModelV2.VariantID) =>
  ModelV2.Info.make({
    id: ModelV2.ID.make("test-model"),
    providerID: ProviderV2.ID.make("test-provider"),
@@ -32,6 +32,7 @@ const model = (api: Api, variants: ModelV2.Info["variants"] = []) =>
    request: {
      headers: { "x-test": "header" },
      body: { apiKey: "secret", custom_extension: { enabled: true } },
+      ...(variant ? { variant } : {}),
    },
    variants,
    time: { released: 0 },
@@ -175,6 +176,44 @@ describe("SessionRunnerModel", () => {
    }),
  )

+  it.effect("uses the catalog default Session variant", () =>
+    Effect.gen(function* () {
+      const catalog = model(
+        { type: "aisdk", package: "@ai-sdk/anthropic", url: "https://anthropic.example/v1" },
+        [
+          {
+            id: ModelV2.VariantID.make("none"),
+            headers: {},
+            body: { thinking: { type: "disabled" } },
+          },
+          {
+            id: ModelV2.VariantID.make("thinking"),
+            headers: {},
+            body: { thinking: { type: "adaptive" } },
+          },
+        ],
+        ModelV2.VariantID.make("thinking"),
+      )
+      const session = SessionV2.Info.make({
+        id: SessionV2.ID.make("ses_default_variant"),
+        projectID: ProjectV2.ID.global,
+        title: "test",
+        model: { id: catalog.id, providerID: catalog.providerID },
+        cost: 0,
+        tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+        time: { created: DateTime.makeUnsafe(0), updated: DateTime.makeUnsafe(0) },
+        location: { directory: AbsolutePath.make("/project") },
+      })
+
+      const resolved = yield* SessionRunnerModel.resolve(session, catalog)
+
+      expect(resolved.route.defaults.http?.body).toEqual({
+        custom_extension: { enabled: true },
+        thinking: { type: "adaptive" },
+      })
+    }),
+  )
+
  it.effect("rejects an explicit unavailable Session variant during model resolution", () =>
    Effect.gen(function* () {
      const catalog = model({ type: "aisdk", package: "@ai-sdk/openai", url: "https://openai.example/v1" })
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.18.3",
+  "version": "1.18.4",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "name": "@opencode-ai/effect-drizzle-sqlite",
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "name": "@opencode-ai/effect-sqlite-node",
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "name": "@opencode-ai/http-recorder",
  "description": "Record and replay Effect HTTP client traffic with deterministic cassettes",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "name": "@opencode-ai/llm",
  "type": "module",
  "license": "MIT",
@@ -3,13 +3,17 @@ import { LLMError, ProviderErrorEvent } from "./schema"

 const patterns = [
  /prompt is too long/i,
+  /request_too_large/i,
  /input is too long for requested model/i,
  /exceeds the context window/i,
+  /exceeds (?:the )?(?:model'?s )?maximum context length(?: of [\d,]+ tokens?|\s*\([\d,]+\))/i,
  /input token count.*exceeds the maximum/i,
  /tokens in request more than max tokens allowed/i,
  /maximum prompt length is \d+/i,
  /reduce the length of the messages/i,
  /maximum context length is \d+ tokens/i,
+  /exceeds (?:the )?maximum allowed input length of [\d,]+ tokens?/i,
+  /input \(\d+ tokens\) is longer than the model'?s context length \(\d+ tokens\)/i,
  /exceeds the limit of \d+/i,
  /exceeds the available context size/i,
  /greater than the context length/i,
@@ -21,11 +25,17 @@ const patterns = [
  /input length.*exceeds.*context length/i,
  /prompt too long; exceeded (?:max )?context length/i,
  /too large for model with \d+ maximum context length/i,
+  /prompt has [\d,]+ tokens?, but the configured context size is [\d,]+ tokens?/i,
  /model_context_window_exceeded/i,
+  /too many tokens/i,
+  /token limit exceeded/i,
 ]

+const exclusions = [/^(throttling error|service unavailable):/i, /rate limit/i, /too many requests/i]
+
 export const isContextOverflow = (message: string) =>
-  patterns.some((pattern) => pattern.test(message)) || /^4(00|13)\s*(status code)?\s*\(no body\)/i.test(message)
+  !exclusions.some((pattern) => pattern.test(message)) &&
+  (patterns.some((pattern) => pattern.test(message)) || /^4(00|13)\s*(status code)?\s*\(no body\)/i.test(message))

 export const isContextOverflowFailure = (failure: unknown) =>
  failure instanceof LLMError
@@ -55,7 +55,6 @@ const PROTOCOL_BODY_OVERLAY_DENYLIST = new Set([
  "systemInstruction",
  "system_instruction",
  "temperature",
-  "thinking",
  "toolChoice",
  "toolConfig",
  "tool_choice",
@@ -156,6 +156,32 @@ describe("request option precedence", () => {
    }),
  )

+  it.effect("allows provider thinking body overlays", () =>
+    LLMClient.generate(
+      LLM.request({
+        model: OpenAIChat.route
+          .with({
+            endpoint: { baseURL: "https://api.provider.test/v1/" },
+            auth: Auth.bearer("test"),
+            http: { body: { thinking: { type: "adaptive" } } },
+          })
+          .model({ id: "minimax-m3" }),
+        prompt: "Say hello.",
+      }),
+    ).pipe(
+      Effect.provide(
+        dynamicResponse((input) => {
+          expect(decodeJson(input.text)).toMatchObject({ thinking: { type: "adaptive" } })
+          return Effect.succeed(
+            input.respond(sseEvents(deltaChunk({}, "stop")), {
+              headers: { "content-type": "text/event-stream" },
+            }),
+          )
+        }),
+      ),
+    ),
+  )
+
  it.effect("uses model output limits after route limits and before call maxTokens", () =>
    Effect.gen(function* () {
      const route = AnthropicMessages.route.with({
@@ -2,7 +2,29 @@ import { describe, expect, test } from "bun:test"
 import { isContextOverflow } from "../src"

 describe("provider error classification", () => {
-  test("classifies Z.AI GLM token limit messages as context overflow", () => {
-    expect(isContextOverflow("tokens in request more than max tokens allowed")).toBe(true)
+  test("classifies provider token limit messages as context overflow", () => {
+    const messages = [
+      "tokens in request more than max tokens allowed",
+      '{"error":{"type":"request_too_large","message":"Request exceeds the maximum size"}}',
+      "Requested token count exceeds the model's maximum context length of 131072 tokens.",
+      "Input length (265330) exceeds model's maximum context length (262144).",
+      "Input length 131393 exceeds the maximum allowed input length of 131040 tokens.",
+      "The input (516368 tokens) is longer than the model's context length (262144 tokens).",
+      "Prompt has 5,958,968 tokens, but the configured context size is 256,000 tokens",
+      "Too many tokens",
+      "Token limit exceeded",
+    ]
+
+    expect(messages.every(isContextOverflow)).toBe(true)
+  })
+
+  test("does not classify rate limits as context overflow", () => {
+    const messages = [
+      "Throttling error: Too many tokens, please wait before trying again.",
+      "Rate limit exceeded, please retry after 30 seconds.",
+      "Too many requests. Please slow down.",
+    ]
+
+    expect(messages.some(isContextOverflow)).toBe(false)
  })
 })
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
@@ -38,6 +38,17 @@ export function shouldAttachShareAuthHeaders(shareUrl: string, accountBaseUrl: s
  }
 }

+export function formatImportFileError(file: string, error: FSUtil.Error) {
+  if (error._tag === "PlatformError") {
+    if (error.reason._tag === "NotFound") return `File not found: ${file}`
+    if (error.reason._tag === "PermissionDenied") return `Failed to read file: Permission denied`
+    return `Failed to read file: ${error.message}`
+  }
+
+  const detail = error.cause instanceof Error ? error.cause.message : error.message
+  return `Invalid JSON in ${file}: ${detail}`
+}
+
 /**
 * Transform ShareNext API response (flat array) into the nested structure for local file storage.
 *
@@ -154,14 +165,9 @@ const runImport = Effect.fn("Cli.import.body")(function* (file: string, ctx: Ins

    exportData = transformed
  } else {
-    exportData = (yield* fs.readJson(file).pipe(Effect.orElseSucceed(() => undefined))) as
-      | NonNullable<typeof exportData>
-      | undefined
-    if (!exportData) {
-      process.stdout.write(`File not found: ${file}`)
-      process.stdout.write(EOL)
-      return
-    }
+    exportData = (yield* fs
+      .readJson(file)
+      .pipe(Effect.mapError((error) => new CliError({ message: formatImportFileError(file, error) })))) as ExportData
  }

  if (!exportData) {
@@ -32,7 +32,7 @@ import { ModelStatus } from "./model-status"
 import { RuntimeFlags } from "@/effect/runtime-flags"
 import { ProviderError } from "./error"

-const OPENAI_HEADER_TIMEOUT_DEFAULT = 10_000
+const OPENAI_HEADER_TIMEOUT_DEFAULT = 300_000

 function wrapSSE(res: Response, ms: number, ctl: AbortController) {
  if (typeof ms !== "number" || ms <= 0) return res
@@ -1041,6 +1041,7 @@ export const Model = Schema.Struct({
  options: Schema.Record(Schema.String, Schema.Any),
  headers: Schema.Record(Schema.String, Schema.String),
  release_date: Schema.String,
+  variant: optional(ModelV2.VariantID),
  variants: optional(Schema.Record(Schema.String, Schema.Record(Schema.String, Schema.Any))),
 }).annotate({ identifier: "Model" })
 export type Model = Types.DeepMutable<Schema.Schema.Type<typeof Model>>
@@ -1216,8 +1217,8 @@ function fromModelsDevModel(provider: ModelsDev.Provider, model: ModelsDev.Model
      npm: model.provider?.npm ?? provider.npm ?? "@ai-sdk/openai-compatible",
    },
    status: model.status ?? "active",
-    headers: {},
-    options: {},
+    headers: { ...(model.provider?.headers ?? {}) },
+    options: { ...(model.provider?.body ?? {}) },
    cost: cost(model.cost),
    limit: {
      context: model.limit.context,
@@ -1246,10 +1247,12 @@ function fromModelsDevModel(provider: ModelsDev.Provider, model: ModelsDev.Model
      interleaved: model.interleaved ?? false,
    },
    release_date: model.release_date ?? "",
+    variant: model.provider?.variant ? ModelV2.VariantID.make(model.provider.variant) : undefined,
    variants: {},
  }

-  const variants = ProviderTransform.reasoningVariants(model, base) ?? ProviderTransform.variants(base)
+  const variants =
+    model.variants ?? ProviderTransform.reasoningVariants(model, base) ?? ProviderTransform.variants(base)

  return {
    ...base,
@@ -1498,6 +1501,7 @@ const layer = Layer.effect(
              headers: mergeDeep(existingModel?.headers ?? {}, model.headers ?? {}),
              family: model.family ?? existingModel?.family ?? "",
              release_date: model.release_date ?? existingModel?.release_date ?? "",
+              variant: existingModel?.variant,
              variants: {},
            }
            const variants =
@@ -26,6 +26,18 @@ export function sanitizeSurrogates(content: string) {
  return content.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "\uFFFD")
 }

+function isKimiFamily(model: Provider.Model) {
+  if (
+    [model.providerID, model.api.id].some((id) => {
+      const value = id.toLowerCase()
+      return value.includes("kimi") || value.includes("moonshot")
+    })
+  )
+    return true
+  const url = model.api.url.toLowerCase()
+  return ["api.kimi.com", "api.moonshot.ai", "api.moonshot.cn", "api.moonshotai.cn"].some((host) => url.includes(host))
+}
+
 // Maps npm package to the key the AI SDK expects for providerOptions
 function sdkKey(npm: string): string | undefined {
  switch (npm) {
@@ -215,10 +227,10 @@ function normalizeMessages(
    })
  }

+  const modelID = model.api.id.toLowerCase()
  if (
    model.providerID === "mistral" ||
-    model.api.id.toLowerCase().includes("mistral") ||
-    model.api.id.toLowerCase().includes("devstral")
+    ["mistral", "devstral", "codestral", "pixtral", "mixtral"].some((family) => modelID.includes(family))
  ) {
    const scrub = (id: string) => {
      return id
@@ -677,15 +689,6 @@ export function variants(model: Provider.Model): Record<string, Record<string, a
  const glm52 = ["glm-5.2", "glm-5-2", "glm-5p2"].some(
    (name) => id.includes(name) || model.api.id.toLowerCase().includes(name),
  )
-  if (
-    model.api.id.toLowerCase().includes("minimax-m3") &&
-    ["@ai-sdk/anthropic", "@ai-sdk/openai-compatible"].includes(model.api.npm)
-  ) {
-    return {
-      none: { thinking: { type: "disabled" } },
-      thinking: { thinking: { type: "adaptive" } },
-    }
-  }
  const adaptiveThinkingOmitted = anthropicOmitsThinking(model.api.id)
  const adaptiveEfforts = anthropicAdaptiveEfforts(model.api.id)
  if (glm52 && model.api.npm === "@openrouter/ai-sdk-provider") {
@@ -707,6 +710,15 @@ export function variants(model: Provider.Model): Record<string, Record<string, a
      max: { effort: "max" },
    }
  }
+  // Kimi's Anthropic-compatible transports implement adaptive thinking effort.
+  if (isKimiFamily(model) && ["@ai-sdk/anthropic", "@ai-sdk/google-vertex/anthropic"].includes(model.api.npm)) {
+    return Object.fromEntries(
+      ["low", "medium", "high", "xhigh", "max"].map((effort) => [
+        effort,
+        { thinking: { type: "adaptive", display: "summarized" }, effort },
+      ]),
+    )
+  }
  if (
    id.includes("deepseek-chat") ||
    id.includes("deepseek-reasoner") ||
@@ -1150,7 +1162,6 @@ export function options(input: {
  }

  if (input.model.providerID === "meta" && input.model.api.npm === "@ai-sdk/openai") {
-    result["reasoningEffort"] = "xhigh"
    result["reasoningSummary"] = "auto"
    result["include"] = INCLUDE_ENCRYPTED_REASONING
  }
@@ -1168,20 +1179,15 @@ export function options(input: {

  const modelId = input.model.api.id.toLowerCase()

-  // MiniMax's Anthropic interface defaults thinking off, unlike Chat Completions.
-  if (modelId.includes("minimax-m3") && input.model.api.npm === "@ai-sdk/anthropic") {
-    result["thinking"] = { type: "adaptive" }
-  }
-
-  // Enable thinking by default for kimi models using anthropic SDK
+  // Moonshot's Anthropic-compatible API uses adaptive effort rather than token budgets.
+  // Request summaries so thinking content survives replay on subsequent turns.
  if (
-    (input.model.api.npm === "@ai-sdk/anthropic" || input.model.api.npm === "@ai-sdk/google-vertex/anthropic") &&
-    (modelId.includes("k2p") || modelId.includes("kimi-k2.") || modelId.includes("kimi-k2p"))
+    ["@ai-sdk/anthropic", "@ai-sdk/google-vertex/anthropic"].includes(input.model.api.npm) &&
+    isKimiFamily(input.model) &&
+    input.model.capabilities.reasoning
  ) {
-    result["thinking"] = {
-      type: "enabled",
-      budgetTokens: Math.min(16_000, Math.floor(input.model.limit.output / 2 - 1)),
-    }
+    result["thinking"] = { type: "adaptive", display: "summarized" }
+    result["effort"] = "high"
  }

  // Enable thinking for reasoning models on alibaba-cn (DashScope).
@@ -1705,6 +1711,8 @@ function reasoningEffort(model: Provider.Model, effort: string) {

 function anthropicEffort(model: Provider.Model, effort: string) {
  if (["opus-4-5", "opus-4.5"].some((value) => model.api.id.includes(value))) return { effort }
+  // Kimi defaults to omitting adaptive thinking text unless summarized display is requested.
+  if (isKimiFamily(model)) return { thinking: { type: "adaptive", display: "summarized" }, effort }
  if (!anthropicAdaptiveEfforts(model.api.id)) return
  return {
    thinking: {
@@ -77,10 +77,9 @@ export const prepare = Effect.fn("LLMRequestPrep.prepare")(function* (input: Pre
    system.push(header, rest.join("\n"))
  }

-  const variant =
-    !input.small && input.model.variants && input.user.model.variant
-      ? input.model.variants[input.user.model.variant]
-      : {}
+  const variantID =
+    input.user.model.variant === "default" ? input.model.variant : (input.user.model.variant ?? input.model.variant)
+  const variant = !input.small && input.model.variants && variantID ? input.model.variants[variantID] : {}
  const base = input.small
    ? ProviderTransform.smallOptions(input.model)
    : ProviderTransform.options({
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aiden Cline	75ab5ceae9	feat(provider): load catalog request variants	2026-07-21 22:58:11 -05:00
Aiden Cline	d00d274192	test(provider): cover MiniMax routing defaults	2026-07-21 21:14:56 -05:00
Aiden Cline	6007304aaa	fix(provider): remove conflicting MiniMax controls	2026-07-21 21:10:27 -05:00
Aiden Cline	f86fdb9712	fix(provider): preserve MiniMax defaults	2026-07-21 21:03:38 -05:00
Aiden Cline	40bd3fdfb2	test(provider): verify NVIDIA MiniMax payload	2026-07-21 20:50:13 -05:00
Aiden Cline	3d0d15b4fe	fix(provider): route MiniMax M3 thinking controls	2026-07-21 20:48:45 -05:00
Frank	4438f69aac	zen: add security check	2026-07-21 14:51:43 -04:00
opencode-agent[bot]	76ced5418f	chore: generate	2026-07-21 18:43:01 +00:00
Frank	c40e3e74a7	zen: add security check	2026-07-21 14:34:00 -04:00
Frank	0317531906	zen: add laguna-2-2.1	2026-07-21 12:59:49 -04:00
opencode-agent[bot]	5f241f1cc1	chore: generate	2026-07-21 15:19:02 +00:00
Daniel Polito	b513fafe83	fix(app): support nested slash command autocomplete (#38097 )	2026-07-21 23:08:23 +08:00
Daniel Polito	21c4c93770	fix(ui): improve progress circle contrast (#38101 )	2026-07-21 23:08:09 +08:00
Frank	abc4b83f58	Zen: gemini 3.6 flash and 3.5 flash lite	2026-07-21 10:59:30 -04:00
opencode-agent[bot]	cb562b2c62	chore: generate	2026-07-21 09:58:21 +00:00
Aarav Sareen	2d2339d37d	feat(app): draggable project rows (#38055 )	2026-07-21 17:56:42 +08:00
Aiden Cline	849c2598ab	docs: generalize session title model description (#37986 )	2026-07-20 14:20:13 -05:00
Aiden Cline	3033afba51	fix(provider): normalize Mistral family tool call IDs (#37982 ) Co-authored-by: tobwen <1864057+tobwen@users.noreply.github.com>	2026-07-20 13:58:49 -05:00
Matthias Reso	5a8ee27254	fix(provider): update muse-spark reasoning default and system prompt (#37562 ) Co-authored-by: Aiden Cline <aidenpcline@gmail.com>	2026-07-20 13:15:42 -05:00
OpeOginni	4cc022481c	fix(opencode): display proper session import errors (#36258 )	2026-07-20 11:43:27 -05:00
opencode	d36a2d8981	sync release versions for v1.18.4	2026-07-20 15:28:16 +00:00
opencode-agent[bot]	96ff82a11f	fix(console): remove desktop promo overlay Requested by: @thdxr (dax via Slack)	2026-07-20 15:28:00 +00:00
opencode-agent[bot]	4872c48c23	fix(app): complete mentions at cursor (#37941 ) Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>	2026-07-20 22:53:10 +08:00
opencode-agent[bot]	47fc6f2991	fix(app): preserve mentions during paste (#37940 ) Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>	2026-07-20 22:52:14 +08:00
opencode-agent[bot]	da312b009c	fix(app): preserve command menu drafts (#37942 ) Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>	2026-07-20 22:49:39 +08:00
opencode-agent[bot]	70535a1bad	chore: update nix node_modules hashes	2026-07-20 14:35:56 +00:00
Luke Parker	43e472bba7	feat(app): sync embedded terminal theme (#37931 )	2026-07-20 14:22:26 +00:00
opencode-agent[bot]	b67fda133a	chore: update nix node_modules hashes	2026-07-20 13:24:20 +00:00
Luke Parker	e2531dff0f	chore(app): bump ghostty-web (#37923 ) Includes the physical-pixel rendering and native Ghostty sprite work from anomalyco/ghostty-web#3.	2026-07-20 13:09:46 +00:00
opencode-agent[bot]	cc3615b535	fix(app): tolerate missing message parents (#37918 ) Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>	2026-07-20 12:20:41 +00:00
Luke Parker	5542415b64	fix(app): shrink Windows drawer close button (#37909 )	2026-07-20 11:21:22 +00:00
Luke Parker	8bec40a816	fix(app): align Windows upgrade drawer (#37895 )	2026-07-20 10:32:38 +00:00
opencode-agent[bot]	4a81e8392b	fix(app): gate notification server selection (#37890 ) Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>	2026-07-20 09:22:18 +00:00
opencode-agent[bot]	a19b52e85b	fix(app): omit empty prompt text parts (#37577 ) Co-authored-by: Jay <53023+jayair@users.noreply.github.com>	2026-07-20 17:09:06 +10:00
opencode-agent[bot]	9105f35966	chore: generate	2026-07-20 06:50:36 +00:00
Aarav Sareen	3ba3954aa0	feat(app): review panel improvements (#36716 ) Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>	2026-07-20 06:49:23 +00:00
Aarav Sareen	3fc5af6dd1	feat(app): update settings description line height (#37759 )	2026-07-20 15:57:11 +10:00
opencode-agent[bot]	5586f9675e	fix(app): restore model variant accessibility (#37857 ) Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>	2026-07-20 05:20:56 +00:00
opencode-agent[bot]	3b719aba48	chore: generate	2026-07-20 04:55:12 +00:00
Qiping Li	20a3a2138e	feat(opencode): use adaptive thinking effort for kimi family on anthr… (#37696 ) Co-authored-by: liqiping <liqiping@msh.team> Co-authored-by: Aiden Cline <aidenpcline@gmail.com>	2026-07-19 23:54:00 -05:00
Frank	cd46f22d51	sync	2026-07-19 23:55:16 -04:00
Frank	cfa134f042	Merge branch 'dev' of github.com:anomalyco/opencode into dev	2026-07-19 23:30:38 -04:00
Frank	61653a20a5	sync	2026-07-19 23:30:36 -04:00
opencode-agent[bot]	2a097f3af7	fix(llm): expand context overflow patterns (#37840 ) Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>	2026-07-19 22:15:21 -05:00
David Hill	ba4b8e21f4	feat(app): toggle debug tools from dev badge (#36689 ) Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>	2026-07-20 12:22:48 +10:00
Rahul A Mistry	7985c2066a	fix(app): show keybind tooltips on prompt input controls (#37824 )	2026-07-20 10:22:38 +10:00
opencode-agent[bot]	67caf894e0	fix(opencode): increase OpenAI header timeout (#37770 ) Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>	2026-07-19 10:41:48 -05:00
opencode-agent[bot]	78587c141b	fix(app): restore question pager segments (#37575 ) Co-authored-by: Jay <53023+jayair@users.noreply.github.com>	2026-07-19 13:00:57 +00:00
opencode-agent[bot]	f5573281ca	chore: generate	2026-07-19 07:46:36 +00:00
opencode-agent[bot]	4817228f96	docs(go): update Kimi K3 request estimates (#37725 ) Co-authored-by: Frank <frank@anoma.ly>	2026-07-19 03:45:27 -04:00
Frank	5a5117b36c	Merge branch 'dev' of github.com:anomalyco/opencode into dev	2026-07-19 02:50:38 -04:00
Frank	6a288426b8	go: support openai route	2026-07-19 02:50:36 -04:00
usrnk1	573ac85983	feat(desktop): align new session project picker (#37461 ) Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com> Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>	2026-07-19 16:15:54 +10:00
Frank	1221bbbe14	Merge branch 'dev' of github.com:anomalyco/opencode into dev	2026-07-19 02:08:19 -04:00
Frank	6bea0f4fa4	zen: grok 4.5 adjusted price	2026-07-19 02:08:05 -04:00
usrnk1	cc34084dfe	feat(desktop): prevent overlapping composer borders (#37490 )	2026-07-19 16:01:16 +10:00