chore(ci): refresh models.dev snapshot in the release pipeline

Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>

.github/workflows/publish.yml

@@ -46,6 +46,20 @@ jobs:
 
       - uses: ./.github/actions/setup-bun
 
+      # The bundled snapshot is the boot-time catalog floor on a cold cache. Refresh it once per
+      # release and share the same file with every job that bundles core.
+      - name: Refresh models.dev snapshot
+        # A models.dev outage must not block a release; the committed snapshot ships instead.
+        continue-on-error: true
+        working-directory: packages/core
+        run: bun run update-models-snapshot
+
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: models-dev-snapshot
+          path: packages/core/src/models-dev/snapshot.txt
+          if-no-files-found: error
+
       - name: Deploy update service
         if: github.ref_name == 'v2'
         working-directory: services/update
@@ -89,6 +103,11 @@ jobs:
         with:
           fetch-tags: true
 
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: models-dev-snapshot
+          path: packages/core/src/models-dev
+
       - uses: ./.github/actions/setup-bun
         with:
           bun-version: 1.4.2
@@ -203,6 +222,11 @@ jobs:
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: models-dev-snapshot
+          path: packages/core/src/models-dev
+
       - uses: ./.github/actions/setup-bun
 
       - name: Build app archive
@@ -550,6 +574,11 @@ jobs:
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: models-dev-snapshot
+          path: packages/core/src/models-dev
+
       - uses: ./.github/actions/setup-bun
 
       - name: Login to GitHub Container Registry

bun.lock

@@ -32,7 +32,7 @@
     },
     "packages/ai": {
       "name": "@opencode/ai",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@aws-sdk/credential-providers": "3.1057.0",
         "@opencode/schema": "workspace:*",
@@ -54,7 +54,7 @@
     },
     "packages/app": {
       "name": "@opencode/app",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@corvu/drawer": "catalog:",
         "@dnd-kit/abstract": "0.5.0",
@@ -111,7 +111,7 @@
     },
     "packages/cli": {
       "name": "@opencode/cli",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "bin": {
         "opencode2": "./bin/opencode2.cjs",
       },
@@ -175,7 +175,7 @@
     },
     "packages/client": {
       "name": "@opencode/client",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@opencode/protocol": "workspace:*",
         "@opencode/schema": "workspace:*",
@@ -201,7 +201,7 @@
     },
     "packages/codemode": {
       "name": "@opencode/codemode",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "acorn": "8.15.0",
         "effect": "catalog:",
@@ -214,7 +214,7 @@
     },
     "packages/console/app": {
       "name": "@opencode/console-app",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@ibm/plex": "6.4.1",
@@ -250,7 +250,7 @@
     },
     "packages/console/core": {
       "name": "@opencode/console-core",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@aws-sdk/client-sts": "3.782.0",
         "@jsx-email/render": "1.1.1",
@@ -277,7 +277,7 @@
     },
     "packages/console/function": {
       "name": "@opencode/console-function",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@openauthjs/openauth": "0.0.0-20250322224806",
         "@opencode/console-core": "workspace:*",
@@ -294,7 +294,7 @@
     },
     "packages/console/mail": {
       "name": "@opencode/console-mail",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@jsx-email/all": "2.2.3",
         "@jsx-email/cli": "1.4.3",
@@ -318,7 +318,7 @@
     },
     "packages/console/support": {
       "name": "@opencode/console-support",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@opencode/console-core": "workspace:*",
@@ -338,7 +338,7 @@
     },
     "packages/core": {
       "name": "@opencode/core",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@ai-sdk/cohere": "3.0.27",
         "@ai-sdk/gateway": "3.0.104",
@@ -406,7 +406,7 @@
     },
     "packages/desktop": {
       "name": "@opencode/desktop",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@zip.js/zip.js": "2.7.62",
         "electron-context-menu": "4.1.2",
@@ -455,7 +455,7 @@
     },
     "packages/enterprise": {
       "name": "@opencode/enterprise",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@hono/standard-validator": "catalog:",
         "@opencode-ai/sdk": "1.18.21",
@@ -492,7 +492,7 @@
     },
     "packages/function": {
       "name": "@opencode/function",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@octokit/auth-app": "8.0.1",
         "@octokit/rest": "catalog:",
@@ -508,7 +508,7 @@
     },
     "packages/http-recorder": {
       "name": "@opencode/http-recorder",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@effect/platform-node-shared": "4.0.0-rc.112",
       },
@@ -527,7 +527,7 @@
     },
     "packages/httpapi-codegen": {
       "name": "@opencode/httpapi-codegen",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "effect": "catalog:",
         "prettier": "3.6.2",
@@ -540,7 +540,7 @@
     },
     "packages/latex": {
       "name": "@opencode/latex",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opentui/core": "catalog:",
@@ -554,7 +554,7 @@
     },
     "packages/merman": {
       "name": "@opencode/merman",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opentui/core": "catalog:",
@@ -569,7 +569,7 @@
     },
     "packages/plugin": {
       "name": "@opencode/plugin",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@ai-sdk/provider": "3.0.8",
         "@opencode/ai": "workspace:*",
@@ -608,7 +608,7 @@
     },
     "packages/plugin-browser": {
       "name": "@opencode/plugin-browser",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opencode/schema": "workspace:*",
@@ -638,7 +638,7 @@
     },
     "packages/protocol": {
       "name": "@opencode/protocol",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@opencode/schema": "workspace:*",
         "effect": "catalog:",
@@ -653,7 +653,7 @@
     },
     "packages/schema": {
       "name": "@opencode/schema",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@standard-schema/spec": "catalog:",
         "effect": "catalog:",
@@ -677,7 +677,7 @@
     },
     "packages/sdk": {
       "name": "@opencode/sdk",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@opencode/client": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -698,7 +698,7 @@
     },
     "packages/server": {
       "name": "@opencode/server",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@effect/platform-node": "catalog:",
         "@effect/platform-node-shared": "catalog:",
@@ -720,7 +720,7 @@
     },
     "packages/session-ui": {
       "name": "@opencode/session-ui",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@opencode/client": "workspace:*",
@@ -755,7 +755,7 @@
     },
     "packages/simulation": {
       "name": "@opencode/simulation",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@opencode/ai": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -775,7 +775,7 @@
     },
     "packages/stats/app": {
       "name": "@opencode/stats-app",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@ibm/plex": "6.4.1",
         "@kobalte/core": "catalog:",
@@ -809,7 +809,7 @@
     },
     "packages/stats/core": {
       "name": "@opencode/stats-core",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@aws-sdk/client-athena": "3.933.0",
         "@planetscale/database": "1.19.0",
@@ -828,7 +828,7 @@
     },
     "packages/stats/server": {
       "name": "@opencode/stats-server",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@aws-sdk/client-firehose": "3.933.0",
         "@effect/platform-node": "catalog:",
@@ -874,7 +874,7 @@
     },
     "packages/theme": {
       "name": "@opencode/theme",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@opentui/core": "catalog:",
         "effect": "catalog:",
@@ -888,7 +888,7 @@
     },
     "packages/tui": {
       "name": "@opencode/tui",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@opencode/client": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -923,7 +923,7 @@
     },
     "packages/ui": {
       "name": "@opencode/ui",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@pierre/diffs": "catalog:",
@@ -958,7 +958,7 @@
     },
     "packages/util": {
       "name": "@opencode/util",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@effect/opentelemetry": "catalog:",
         "@effect/platform-node": "catalog:",
@@ -991,7 +991,7 @@
     },
     "packages/web": {
       "name": "@opencode/web",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "@astrojs/cloudflare": "12.6.3",
         "@astrojs/markdown-remark": "6.3.1",
@@ -1032,7 +1032,7 @@
     },
     "services/update": {
       "name": "@opencode/update",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "dependencies": {
         "jose": "6.0.11",
         "semver": "catalog:",

package.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode",
   "description": "AI-powered development tool",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "packageManager": "bun@1.4.2",

packages/ai/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "name": "@opencode/ai",
   "type": "module",
   "license": "MIT",

packages/app/e2e/regression/mobile-tab-interactions.spec.ts

@@ -0,0 +1,110 @@
+import { expect, test, type Locator, type Page } from "@playwright/test"
+import { fixture, pageMessages } from "../smoke/session-timeline.fixture"
+import { mockOpenCodeServer } from "../utils/mock-server"
+
+test.use({ viewport: { width: 390, height: 844 }, hasTouch: true, isMobile: true })
+
+test.beforeEach(async ({ page }) => {
+  await mockOpenCodeServer(page, {
+    sessions: fixture.sessions,
+    provider: fixture.provider,
+    directory: fixture.directory,
+    project: fixture.project,
+    pageMessages,
+  })
+  await page.addInitScript(
+    ({ directory, server, sessions }) => {
+      localStorage.setItem(
+        "opencode.global.dat:server",
+        JSON.stringify({ projects: { local: [{ worktree: directory, expanded: true }] } }),
+      )
+      localStorage.setItem(
+        "opencode.window.browser.dat:tabs",
+        JSON.stringify(sessions.map((session) => ({ type: "session", server, sessionId: session.id }))),
+      )
+    },
+    { directory: fixture.directory, server: fixture.serverKey, sessions: fixture.sessions },
+  )
+  await page.goto("/")
+  await page.locator('[data-slot="mobile-tabs-trigger"]').click()
+  await expect(page.locator('[data-slot="mobile-tabs-drawer"]')).toBeVisible()
+  const drawer = page.locator('[data-slot="mobile-drawer-content"]')
+  await expect
+    .poll(() => drawer.evaluate((element) => new DOMMatrixReadOnly(getComputedStyle(element).transform).m42))
+    .toBe(0)
+  await expect(drawer).not.toHaveAttribute("data-transitioning")
+})
+
+test("reorders session tabs with touch", async ({ page }) => {
+  const tabs = page.locator('[data-slot="vertical-tabs"] a')
+  await expect(tabs).toContainText([fixture.expected.sourceTitle, fixture.expected.targetTitle])
+
+  const target = tabs.filter({ hasText: fixture.expected.targetTitle })
+  const source = tabs.filter({ hasText: fixture.expected.sourceTitle })
+  const targetBox = await target.boundingBox()
+  const sourceBox = await source.boundingBox()
+  expect(targetBox).not.toBeNull()
+  expect(sourceBox).not.toBeNull()
+
+  await touchDrag(page, source, {
+    from: { x: sourceBox!.x + sourceBox!.width / 2, y: sourceBox!.y + sourceBox!.height / 2 },
+    to: { x: targetBox!.x + targetBox!.width / 2, y: targetBox!.y + targetBox!.height / 2 },
+  })
+
+  await expect(tabs).toContainText([fixture.expected.targetTitle, fixture.expected.sourceTitle])
+})
+
+test("dismisses a touch context menu by tapping outside", async ({ page }) => {
+  const drawer = page.locator('[data-slot="mobile-tabs-drawer"]')
+  const tab = drawer.locator('[data-slot="tab-link"]').filter({ hasText: fixture.expected.sourceTitle })
+  const home = drawer.getByRole("button", { name: "Home", exact: true })
+  const homeBox = await home.boundingBox()
+  const box = await tab.boundingBox()
+  expect(homeBox).not.toBeNull()
+  expect(box).not.toBeNull()
+  const point = { x: box!.x + box!.width / 2, y: box!.y + box!.height / 2 }
+
+  await tab.dispatchEvent("pointerdown", {
+    pointerType: "touch",
+    pointerId: 1,
+    isPrimary: true,
+    clientX: point.x,
+    clientY: point.y,
+  })
+  const rename = page.getByRole("menuitem", { name: "Rename", exact: true })
+  await expect(rename).toBeVisible()
+  await expect(drawer).toBeVisible()
+  await tab.filter({ visible: true }).dispatchEvent("pointerup", {
+    pointerType: "touch",
+    pointerId: 1,
+    isPrimary: true,
+    clientX: point.x,
+    clientY: point.y,
+  })
+
+  await page.touchscreen.tap(homeBox!.x + homeBox!.width / 2, homeBox!.y + homeBox!.height / 2)
+  await expect(rename).toBeHidden()
+  await expect(drawer).toBeVisible()
+})
+
+async function touchDrag(
+  page: Page,
+  source: Locator,
+  input: { from: { x: number; y: number }; to: { x: number; y: number } },
+) {
+  const client = await page.context().newCDPSession(page)
+  await client.send("Input.dispatchTouchEvent", {
+    type: "touchStart",
+    touchPoints: [{ ...input.from, id: 1 }],
+  })
+  await client.send("Input.dispatchTouchEvent", {
+    type: "touchMove",
+    touchPoints: [{ x: (input.from.x + input.to.x) / 2, y: (input.from.y + input.to.y) / 2, id: 1 }],
+  })
+  await expect(source).toHaveCount(2)
+  await client.send("Input.dispatchTouchEvent", {
+    type: "touchMove",
+    touchPoints: [{ ...input.to, id: 1 }],
+  })
+  await client.send("Input.dispatchTouchEvent", { type: "touchEnd", touchPoints: [] })
+}

packages/app/e2e/regression/session-timeline-projection.spec.ts

@@ -166,6 +166,45 @@ test.describe("session timeline projection", () => {
     await expect(longNotice.locator("[title]")).toHaveAttribute("title", `Switched to ${longName}`)
     await expect.poll(() => longNotice.evaluate((element) => element.scrollWidth <= element.clientWidth)).toBe(true)
   })
+
+  test("does not repeat a review comment file as an attachment", async ({ page }) => {
+    const message = userMessage([
+      userText("what's goin on here", { id: "prt_user_review_comment" }),
+      {
+        id: "prt_user_review_file",
+        type: "file",
+        mime: "text/plain",
+        filename: "LiveRuntime.ts",
+        url: "file:///repo/LiveRuntime.ts?start=14&end=32",
+      },
+      {
+        id: "prt_user_unrelated_file",
+        type: "file",
+        mime: "text/plain",
+        filename: "notes.txt",
+        url: "data:text/plain;base64,bm90ZXM=",
+      },
+    ])
+    message.metadata = {
+      displayText: "what's goin on here",
+      comments: [
+        {
+          path: "LiveRuntime.ts",
+          comment: "what's goin on here",
+          selection: { startLine: 14, startChar: 0, endLine: 32, endChar: 0 },
+          origin: "review",
+        },
+      ],
+    }
+
+    await setupTimeline(page, { messages: [message, assistantMessage()] })
+
+    const user = page.locator('[data-component="user-message"]')
+    await expect(user.getByText("LiveRuntime.ts:14-32", { exact: true })).toBeVisible()
+    const attachments = user.locator('[data-slot="user-message-attachments"]')
+    await expect(attachments.getByText("LiveRuntime.ts", { exact: true })).toHaveCount(0)
+    await expect(attachments.getByText("notes.txt", { exact: true })).toBeVisible()
+  })
 })
 
 function patchFile(file: string, status: "added" | "modified" | "deleted") {

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/app",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "",
   "type": "module",
   "exports": {

packages/app/src/settings/keybinds/keybinds.tsx

@@ -1,7 +1,8 @@
-import { For, Show, createEffect, createMemo, lazy, on, onCleanup } from "solid-js"
+import { For, Show, createEffect, createMemo, on, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
 import { makeEventListener } from "@solid-primitives/event-listener"
 import { Button } from "@opencode/ui/button"
+import { Icon } from "@opencode/ui/icon"
 import { IconButton } from "@opencode/ui/icon-button"
 import { TextInput } from "@opencode/ui/text-input"
 import { showToast } from "@/shell/notifications/toast"
@@ -17,8 +18,6 @@ import { useLanguage } from "@/runtime/i18n/language"
 import { useSettings } from "@/settings/model"
 import { SettingsList } from "@/settings/list"
 
-const Icon = lazy(() => import("@opencode/ui/icon").then((module) => ({ default: module.Icon })))
-
 const IS_MAC = typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform)
 const PALETTE_ID = "command.palette"
 

packages/app/src/shell/titlebar/tab-gesture.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { canOpenTabRename, canStartTabDrag, forwardTabRef, isTabCloseTarget } from "./tab-gesture"
+import { canOpenTabRename, forwardTabRef, isTabCloseTarget } from "./tab-gesture"
 
 describe("titlebar tab gestures", () => {
   test("excludes close controls from tab gestures", () => {
@@ -24,10 +24,4 @@ describe("titlebar tab gestures", () => {
     expect(canOpenTabRename(false, false, false)).toBe(true)
     expect(canOpenTabRename(false, false, true)).toBe(false)
   })
-
-  test("preserves native panning for touch pointers", () => {
-    expect(canStartTabDrag("mouse")).toBe(true)
-    expect(canStartTabDrag("pen")).toBe(true)
-    expect(canStartTabDrag("touch")).toBe(false)
-  })
 })

packages/app/src/shell/titlebar/tab-gesture.ts

@@ -4,10 +4,6 @@ export function isTabCloseTarget(target: EventTarget | null) {
   return target instanceof Element && !!target.closest('[data-slot="tab-close"]')
 }
 
-export function canStartTabDrag(pointerType: string) {
-  return pointerType !== "touch"
-}
-
 export function forwardTabRef(ref: Ref<HTMLDivElement> | undefined, element: HTMLDivElement) {
   if (typeof ref === "function") ref(element)
 }

packages/app/src/shell/titlebar/tab-nav.tsx

@@ -328,6 +328,7 @@ export function TabNavItem(props: {
 
   return (
     <Menu.Context
+      modal={false}
       onOpenChange={(open) => {
         setMenu("open", open)
         if (open) setPopoverOpen(false)

packages/app/src/shell/titlebar/tab-strip.tsx

@@ -16,7 +16,7 @@ import { useTabs } from "@/shell/tabs/tabs"
 import { createTabComposerState } from "@/composer/persistence"
 import { base64Encode } from "@opencode/util/encode"
 import { showToast } from "@/shell/notifications/toast"
-import { canStartTabDrag, isTabCloseTarget } from "./tab-gesture"
+import { isTabCloseTarget } from "./tab-gesture"
 import { adjacentTabKey, mergeVisibleTabOrder } from "./tab-order"
 import type { SessionInfo } from "@opencode/client/promise"
 
@@ -292,9 +292,11 @@ export function TitlebarTabStrip(props: {
         <DragDropProvider
           sensors={[
             PointerSensor.configure({
-              activationConstraints: [new PointerActivationConstraints.Distance({ value: 4 })],
+              activationConstraints: (event) =>
+                event.pointerType === "touch"
+                  ? [new PointerActivationConstraints.Distance({ value: 8 })]
+                  : [new PointerActivationConstraints.Distance({ value: 4 })],
               preventActivation: (event) =>
-                !canStartTabDrag(event.pointerType) ||
                 isTabCloseTarget(event.target) ||
                 (event.target instanceof Element && !!event.target.closest('[contenteditable="true"]')),
             }),
@@ -313,6 +315,7 @@ export function TitlebarTabStrip(props: {
             if (!source) return
             const tab = props.tabs.find((item) => tabKey(item) === source.id.toString())
             if (!tab) return
+            if (vertical()) return
             const tabEl = source.element?.querySelector<HTMLDivElement>("[data-titlebar-tab]")
             props.onNavigate(tab, tabEl ?? undefined)
           }}

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/cli",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "bin": {

packages/cli/script/publish-homebrew.ts

@@ -0,0 +1,120 @@
+#!/usr/bin/env bun
+import { Script } from "@opencode/script"
+import { $ } from "bun"
+import { mkdir, rm } from "node:fs/promises"
+import path from "node:path"
+import { fileURLToPath } from "node:url"
+import { UpdateArtifact } from "../../../script/update-artifact"
+
+if (Script.channel !== "beta" && Script.channel !== "latest") {
+  throw new Error("Homebrew publishing requires the beta or latest channel")
+}
+const valid =
+  Script.channel === "beta"
+    ? /^\d+\.\d+\.\d+-beta[.-]\d+(?:\.\d+)?$/.test(Script.version)
+    : /^\d+\.\d+\.\d+$/.test(Script.version)
+if (!valid) throw new Error(`Expected a ${Script.channel} release version`)
+
+const dir = fileURLToPath(new URL("..", import.meta.url))
+const root = path.resolve(process.env.OPENCODE_CLI_DIST ?? path.join(dir, "dist"))
+const outdir = path.join(root, "homebrew-tap")
+const dryRun = process.argv.includes("--dry-run")
+const name = Script.channel === "beta" ? "opencode-beta" : "opencode-v2"
+const formulaClass = Script.channel === "beta" ? "OpencodeBeta" : "OpencodeV2"
+
+const targets = await Promise.all(
+  [
+    { name: "darwin-arm64", archive: "zip" },
+    { name: "darwin-x64-baseline", archive: "zip" },
+    { name: "linux-arm64", archive: "tar.gz" },
+    { name: "linux-x64-baseline", archive: "tar.gz" },
+  ].map(async (target) => {
+    const filename = `opencode-${target.name}.${target.archive}`
+    const file = Bun.file(path.join(root, filename))
+    if (!(await file.exists()) || !file.size) throw new Error(`Missing Homebrew archive: ${filename}`)
+    const sha256 = new Bun.CryptoHasher("sha256")
+    for await (const chunk of file.stream()) sha256.update(chunk)
+    return {
+      ...target,
+      url: `https://opencode.ai/files/bin/${encodeURIComponent(Script.version)}/${filename}`,
+      sha256: sha256.digest("hex"),
+    }
+  }),
+)
+
+await rm(outdir, { recursive: true, force: true })
+if (dryRun) await mkdir(outdir, { recursive: true })
+if (!dryRun) {
+  const token = process.env.GITHUB_TOKEN
+  if (!token) throw new Error("GITHUB_TOKEN is required to update the Homebrew tap")
+  await $`git clone ${`https://x-access-token:${token}@github.com/anomalyco/homebrew-tap.git`} ${outdir}`
+  await $`git checkout -B master`.cwd(outdir)
+}
+
+const target = (name: string) => {
+  const result = targets.find((item) => item.name === name)
+  if (!result) throw new Error(`Missing Homebrew target: ${name}`)
+  return result
+}
+const macArm = target("darwin-arm64")
+const macIntel = target("darwin-x64-baseline")
+const linuxArm = target("linux-arm64")
+const linuxIntel = target("linux-x64-baseline")
+
+await Bun.write(
+  path.join(outdir, `${name}.rb`),
+  [
+    "# typed: false",
+    "# frozen_string_literal: true",
+    "",
+    `class ${formulaClass} < Formula`,
+    `  desc "OpenCode V2${Script.channel === "beta" ? " beta" : ""} - the AI coding agent for the terminal"`,
+    '  homepage "https://github.com/anomalyco/opencode"',
+    `  version "${Script.version}"`,
+    '  license "MIT"',
+    "",
+    '  depends_on "ripgrep"',
+    '  conflicts_with "opencode", because: "both install an opencode binary"',
+    "",
+    "  on_macos do",
+    "    if Hardware::CPU.arm?",
+    `      url "${macArm.url}"`,
+    `      sha256 "${macArm.sha256}"`,
+    "    else",
+    `      url "${macIntel.url}"`,
+    `      sha256 "${macIntel.sha256}"`,
+    "    end",
+    "  end",
+    "",
+    "  on_linux do",
+    "    if Hardware::CPU.arm?",
+    `      url "${linuxArm.url}"`,
+    `      sha256 "${linuxArm.sha256}"`,
+    "    else",
+    `      url "${linuxIntel.url}"`,
+    `      sha256 "${linuxIntel.sha256}"`,
+    "    end",
+    "  end",
+    "",
+    "  def install",
+    '    bin.install "opencode"',
+    "  end",
+    "end",
+    "",
+  ].join("\n"),
+)
+console.log(`Prepared ${name} ${Script.version} in ${outdir}`)
+if (dryRun) process.exit(0)
+
+await $`git add ${name + ".rb"}`.cwd(outdir)
+if ((await $`git diff --cached --quiet`.cwd(outdir).nothrow()).exitCode !== 0) {
+  await $`git commit -m ${`chore: update ${name} to ${Script.version}`}`.cwd(outdir)
+  await $`git push origin master`.cwd(outdir)
+}
+await UpdateArtifact.publish({
+  channel: Script.channel,
+  name: "cli",
+  distribution: "homebrew",
+  version: Script.version,
+  metadata: { package: `anomalyco/tap/${name}` },
+})

packages/cli/script/publish.ts

@@ -149,6 +149,10 @@ if (Script.channel === "latest" && Script.release && !dryRun) {
 
 if ((Script.channel === "beta" || Script.channel === "latest") && Script.release) {
   await $`bun ./script/publish-aur.ts ${dryRun ? ["--dry-run"] : []}`.env({ ...process.env, OPENCODE_CLI_DIST: root })
+  await $`bun ./script/publish-homebrew.ts ${dryRun ? ["--dry-run"] : []}`.env({
+    ...process.env,
+    OPENCODE_CLI_DIST: root,
+  })
 }
 
 async function archive(bin: string, target: string, binary: string, directory: string) {

packages/cli/src/services/updater.ts

@@ -7,7 +7,7 @@ import { parse, type ParseError } from "jsonc-parser"
 import path from "node:path"
 import { action, parseReleaseVersion, type Policy } from "./updater-action"
 
-export const methods = ["curl", "npm", "pnpm", "bun", "yarn"] as const
+export const methods = ["curl", "npm", "pnpm", "bun", "yarn", "brew"] as const
 export type Method = (typeof methods)[number]
 export type RunResult = { readonly type: "available" | "installed"; readonly version: string }
 export type CheckResult = RunResult | { readonly type: "unavailable"; readonly message: string }
@@ -96,6 +96,13 @@ const make = Effect.gen(function* () {
       process.platform === "win32" ? "opencode.exe" : "opencode",
     )
     if (path.resolve(process.execPath) === path.resolve(binary)) return "curl"
+    const executable = yield* fs.realPath(process.execPath).pipe(Effect.orElseSucceed(() => process.execPath))
+    if (
+      ["opencode-beta", "opencode-v2"].some((name) =>
+        executable.includes(`${path.sep}Cellar${path.sep}${name}${path.sep}`),
+      )
+    )
+      return "brew"
     if (!installedPackage) return
 
     const checks: ReadonlyArray<{ method: Method; command: string[] }> = [
@@ -113,7 +120,7 @@ const make = Effect.gen(function* () {
   })
 
   const removal = (method: Method) => {
-    if (method === "curl" || !installedPackage) return undefined
+    if (method === "curl" || method === "brew" || !installedPackage) return undefined
     const commands = {
       npm: ["npm", "uninstall", "--global", installedPackage],
       pnpm: ["pnpm", "remove", "--global", installedPackage],
@@ -133,11 +140,12 @@ const make = Effect.gen(function* () {
     }
   }
 
-  const release = Effect.fnUntraced(function* () {
+  const release = Effect.fnUntraced(function* (method?: Method) {
+    const distribution = method === "brew" ? "homebrew" : "npm"
     const response = yield* Effect.tryPromise({
       try: (signal) =>
         fetch(
-          `https://opencode.ai/update/api/${encodeURIComponent(channel)}/${encodeURIComponent(OPENCODE_ARTIFACT)}/npm?current=${encodeURIComponent(OPENCODE_VERSION)}`,
+          `https://opencode.ai/update/api/${encodeURIComponent(channel)}/${encodeURIComponent(OPENCODE_ARTIFACT)}/${distribution}?current=${encodeURIComponent(OPENCODE_VERSION)}`,
           {
             signal: AbortSignal.any([signal, AbortSignal.timeout(10_000)]),
           },
@@ -153,7 +161,11 @@ const make = Effect.gen(function* () {
     return { package: data.metadata.package, version: data.version }
   })
 
-  const latest = () => release().pipe(Effect.map((data) => data.version))
+  const latest = () =>
+    method().pipe(
+      Effect.flatMap(release),
+      Effect.map((data) => data.version),
+    )
 
   const temporaryDirectory = (prefix: string) =>
     Effect.acquireRelease(fs.makeTempDirectory({ directory: global.cache, prefix }), (directory) =>
@@ -163,12 +175,12 @@ const make = Effect.gen(function* () {
   const upgrade = Effect.fnUntraced(function* (method: Method, input: string) {
     if (!parseReleaseVersion(input)) return yield* Effect.fail(new Error(`Invalid version: ${input}`))
     const version = input.trim().replace(/^v/, "")
-    const packageName = (yield* release()).package
+    const packageName = (yield* release(method)).package
     const target = `${packageName}@${version}`
     if (installedPackage && packageName !== installedPackage && (method === "pnpm" || method === "yarn")) {
       return yield* Effect.fail(new Error(`Reinstall ${target} with ${method} to migrate from ${installedPackage}.`))
     }
-    const commands: Record<Exclude<Method, "bun" | "curl">, string[]> = {
+    const commands: Record<Exclude<Method, "bun" | "curl" | "brew">, string[]> = {
       // Keep the old package: uninstalling it can unlink the replacement command.
       npm: [
         "npm",
@@ -202,6 +214,7 @@ const make = Effect.gen(function* () {
           if (download.code !== 0) return download
           return yield* exec(["bash", installer, "--version", version, "--no-modify-path"], "5 minutes")
         }
+        if (method === "brew") return yield* exec(["brew", "upgrade", packageName], "5 minutes")
         return yield* exec(commands[method], "5 minutes")
       }),
     ).pipe(Effect.mapError((cause) => new Error(`Failed to update with ${method}`, { cause })))

packages/cli/test/upgrade.test.ts

@@ -50,7 +50,7 @@ describe("upgrade command", () => {
   })
 
   test("rejects unsupported methods before attempting an upgrade", async () => {
-    const result = await cli(["--method", "brew"])
+    const result = await cli(["--method", "apt"])
     expect(result.exitCode).not.toBe(0)
     expect(result.events).toEqual([])
   })

packages/client/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/client",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "repository": {

packages/codemode/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/codemode",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "Effect-native confined code execution over schema-described tools",
   "type": "module",
   "license": "MIT",

packages/console/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/console-app",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/console/core/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/console-core",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/console/function/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/console-function",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",

packages/console/mail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/console-mail",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "dependencies": {
     "@jsx-email/all": "2.2.3",
     "@jsx-email/cli": "1.4.3",

packages/console/support/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/console-support",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "name": "@opencode/core",
   "type": "module",
   "license": "MIT",

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opencode/desktop",
   "private": true,
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "homepage": "https://opencode.ai",

packages/desktop/scripts/bench-startup.ts

@@ -3,7 +3,7 @@
 //
 //   bun run bench:startup -- [--exe <path>] [--compare <path>] [--runs 5] [--warmup 1] [--service warm|cold]
 //                            [--fresh] [--offline] [--seed <userData dir>] [--profile-main] [--profile-renderer]
-//                            [--trace] [--out <dir>] [--home <dir>]
+//                            [--trace] [--out <dir>] [--home <dir>] [--window-at x,y]
 //
 // The app runs in an isolated home directory (its own %APPDATA%, XDG dirs, OpenCode DB, config and
 // service registration) with the developer's OPENCODE_* / OTEL_* environment stripped, so it never
@@ -21,7 +21,15 @@
 // main-process CPU profile from the first statement (via --inspect-brk) on the first run,
 // `--profile-renderer` records the renderer main thread from the moment its debug target appears,
 // and `--trace` records Chromium's startup trace on the last run. Raw samples are written as JSON.
-import { spawn } from "node:child_process"
+//
+// What is on screen is sampled from the screen itself (Windows): a helper pins the window topmost
+// without activating it the moment it exists, then records when the window's pixels first differ
+// from the background colour (`screenPainted`) and when they stop changing (`screenSettled`).
+// Renderer paint timing alone is not enough: Chromium stops painting an occluded window, and a
+// splash or a fade reads as "painted" long before the interface is on screen. `--window-at` puts
+// the window somewhere the developer's foreground window does not cover. BENCH_SCREEN_DUMP=<dir>
+// also saves every sample as PNG, BENCH_EXTRA_ARGS passes extra Chromium switches to the app.
+import { execFileSync, spawn } from "node:child_process"
 import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs"
 import { createServer } from "node:net"
 import { tmpdir } from "node:os"
@@ -45,6 +53,9 @@ const args = parseArgs({
     "profile-renderer": { type: "boolean", default: false },
     trace: { type: "boolean", default: false },
     "settle-ms": { type: "string", default: "1500" },
+    // Restore the bench window at "x,y" (and treat that display as trusted), for example on a display
+    // that the developer's foreground window does not cover; Chromium stops painting an occluded window.
+    "window-at": { type: "string" },
   },
   allowPositionals: true,
 })
@@ -112,10 +123,12 @@ const probe = `(() => ({
   origin: performance.timeOrigin,
   firstPaint: performance.getEntriesByType('paint').find((e) => e.name === 'first-paint')?.startTime,
   domInteractive: performance.getEntriesByType('navigation')[0]?.domInteractive,
-  shell: !!document.querySelector('[data-titlebar-tab-link], [data-action="vertical-tabs-home"]'),
-  editor: !!document.querySelector('[data-component="composer-editor"][contenteditable="true"]'),
-  rows: document.querySelectorAll('[data-timeline-row]').length,
-  home: !!document.querySelector('[data-action="home-new-session"], [data-action="home-add-project-row"]'),
+  prepaint: !!document.getElementById('oc-prepaint'),
+  visible: document.visibilityState === 'visible',
+  shell: !!document.querySelector('#root [data-titlebar-tab-link], #root [data-action="vertical-tabs-home"]'),
+  editor: !!document.querySelector('#root [data-component="composer-editor"][contenteditable="true"]'),
+  rows: document.querySelectorAll('#root [data-timeline-row]').length,
+  home: !!document.querySelector('#root [data-action="home-new-session"], #root [data-action="home-add-project-row"]'),
   url: location.pathname + location.search,
 }))()`
 // Main-process bootstrap timing, read after the run: when the process was created, when Node
@@ -237,6 +250,8 @@ type Probe = {
   origin: number
   firstPaint?: number
   domInteractive?: number
+  prepaint: boolean
+  visible: boolean
   shell: boolean
   editor: boolean
   rows: number
@@ -273,6 +288,7 @@ async function launch(build: { label: string; exe: string }, run: number): Promi
   const trace = args.values.trace && run === runs
   const tracePath = join(outDir, `startup-trace-${Date.now()}.json`)
   const launchArgs = [
+    ...(process.env.BENCH_EXTRA_ARGS?.split(" ").filter(Boolean) ?? []),
     `--remote-debugging-port=${cdpPort}`,
     profile ? `--inspect-brk=${inspectPort}` : `--inspect=${inspectPort}`,
     ...(trace
@@ -284,10 +300,12 @@ async function launch(build: { label: string; exe: string }, run: number): Promi
         ]
       : []),
   ]
+  const raiser = await windowRaiser()
   const spawnAt = Date.now()
   const child = spawn(build.exe, launchArgs, { env, detached: true, stdio: "ignore" })
   child.unref()
   appPid = child.pid
+  raiser.raise(child.pid!)
 
   let mainProfile: Promise<unknown> | undefined
   if (profile) mainProfile = profileMain(spawnAt)
@@ -309,6 +327,7 @@ async function launch(build: { label: string; exe: string }, run: number): Promi
   // when the shell is up and the main thread has spent under 10 % of any 500 ms window in tasks for `settleMs`.
   const seen: Record<string, number> = {}
   let last: Probe | undefined
+  let prepaintSeen = false
   let quietSince: number | undefined
   let taskMs = 0
   let scriptMs = 0
@@ -318,6 +337,9 @@ async function launch(build: { label: string; exe: string }, run: number): Promi
     const result = await cdp.send("Runtime.evaluate", { expression: probe, returnByValue: true })
     last = result.result?.result?.value as Probe | undefined
     const t = Date.now() - spawnAt
+    if (last?.prepaint) prepaintSeen = true
+    // Chromium marks a window it considers occluded hidden and the renderer stops painting.
+    if (last?.visible && !seen.documentVisible) seen.documentVisible = t
     if (last?.shell && !seen.shellVisible) seen.shellVisible = t
     if (last?.editor && !seen.composerEditable) seen.composerEditable = t
     if (last?.rows && !seen.timelineRows) seen.timelineRows = t
@@ -356,6 +378,7 @@ async function launch(build: { label: string; exe: string }, run: number): Promi
   const timelineResult = await cdp.send("Runtime.evaluate", { expression: rendererTimeline, returnByValue: true })
   cdp.close()
   const processes = appPid ? await processTree(appPid) : []
+  const screenChanges = await raiser.screen()
   const boot = profile ? undefined : await mainBootTiming()
   await sleep(300)
   // Chromium writes the startup trace when --trace-startup-duration elapses; keep the app alive until then.
@@ -385,7 +408,16 @@ async function launch(build: { label: string; exe: string }, run: number): Promi
       domInteractive:
         last?.domInteractive !== undefined && origin !== undefined ? Math.round(origin + last.domInteractive) : undefined,
       firstPaint: last?.firstPaint !== undefined && origin !== undefined ? Math.round(origin + last.firstPaint) : undefined,
+      // With a shell snapshot in the early document, first paint is the snapshot, not the app.
+      prepaintVisible:
+        prepaintSeen && last?.firstPaint !== undefined && origin !== undefined
+          ? Math.round(origin + last.firstPaint)
+          : undefined,
       ...seen,
+      // First sampled screen change inside the window: the ground truth for "the user sees something".
+      screenPainted: screenChanges.changed[0],
+      // When the sampled window content stopped changing: the interface, not a splash, is on screen.
+      screenSettled: screenChanges.settled,
       rendererIdle: rendererIdleMs,
     },
     final: { url: last?.url, timelineRows: last?.rows },
@@ -451,6 +483,22 @@ function prepareHome() {
     })
   }
   mkdirSync(paths.logs, { recursive: true })
+  const at = args.values["window-at"]?.split(",").map(Number)
+  if (at?.length === 2 && existsSync(userData)) {
+    for (const file of readdirSync(userData).filter((name) => /^window-state-.*\.json$/.test(name))) {
+      const state = JSON.parse(readFileSync(join(userData, file), "utf8"))
+      const bounds = displayAt(at[0], at[1])
+      writeFileSync(join(userData, file), JSON.stringify({ ...state, x: at[0], y: at[1], isMaximized: false, isFullScreen: false, displayBounds: bounds }))
+    }
+  }
+}
+
+function displayAt(x: number, y: number) {
+  if (process.platform !== "win32") return undefined
+  const out = execFileSync("pwsh", ["-NoProfile", "-NonInteractive", "-Command", "Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.Screen]::AllScreens | ForEach-Object { \"$($_.Bounds.X),$($_.Bounds.Y),$($_.Bounds.Width),$($_.Bounds.Height)\" }"], { encoding: "utf8" })
+  const displays = out.trim().split(/\r?\n/).map((line) => line.split(",").map(Number))
+  const hit = displays.find(([dx, dy, dw, dh]) => x >= dx && y >= dy && x < dx + dw && y < dy + dh)
+  return hit ? { x: hit[0], y: hit[1], width: hit[2], height: hit[3] } : undefined
 }
 
 async function freePort() {
@@ -565,6 +613,86 @@ function mainLog() {
 }
 
 // Working set of every process in the launched app's tree once it is idle.
+// Windows places a window launched from a background process behind the foreground one, and
+// Chromium then marks it occluded and the renderer stops painting, so paint timings would depend on
+// what else is on screen. A helper started before the app polls for its main window and pins it
+// topmost without activating it, so the user keeps their focus and the bench window is visible.
+async function windowRaiser(): Promise<{ raise: (pid: number) => void; screen: () => Promise<number[]> }> {
+  if (process.platform !== "win32") return { raise: () => {}, screen: async () => [] }
+  const script = join(outDir, "raise-window.ps1")
+  writeFileSync(
+    script,
+    [
+      `Add-Type -AssemblyName System.Drawing`,
+      `Add-Type -Namespace Bench -Name User32 -MemberDefinition '[DllImport("user32.dll")] public static extern bool SetWindowPos(IntPtr h, IntPtr a, int x, int y, int w, int z, uint f); [StructLayout(LayoutKind.Sequential)] public struct RECT { public int L; public int T; public int R; public int B; } [DllImport("user32.dll")] public static extern bool GetWindowRect(IntPtr h, out RECT r);'`,
+      `[Console]::Out.WriteLine("ready")`,
+      `$target = [int][Console]::In.ReadLine()`,
+      `$clock = [Diagnostics.Stopwatch]::StartNew()`,
+      `$h = 0`,
+      `for ($i = 0; $i -lt 600; $i++) {`,
+      `  $h = (Get-Process -Id $target -ErrorAction SilentlyContinue).MainWindowHandle`,
+      `  if ($h -and $h -ne 0) { [Bench.User32]::SetWindowPos($h, [IntPtr](-1), 0, 0, 0, 0, 0x13) | Out-Null; [Console]::Out.WriteLine("raised " + $clock.ElapsedMilliseconds); break }`,
+      `  Start-Sleep -Milliseconds 10`,
+      `}`,
+      `if (-not $h -or $h -eq 0) { exit }`,
+      // Sample a 16x16 grid of pixels inside the window: cheap, and enough to tell the background
+      // colour, a splash and the interface apart.
+      `$r = New-Object Bench.User32+RECT`,
+      `while ($clock.ElapsedMilliseconds -lt 3000) {`,
+      `  [Bench.User32]::GetWindowRect($h, [ref]$r) | Out-Null`,
+      `  $w = $r.R - $r.L; $ht = $r.B - $r.T`,
+      `  if ($w -le 48 -or $ht -le 48) { Start-Sleep -Milliseconds 30; continue }`,
+      `  $t = $clock.ElapsedMilliseconds`,
+      `  $bmp = New-Object System.Drawing.Bitmap $w, $ht`,
+      `  $g = [System.Drawing.Graphics]::FromImage($bmp)`,
+      `  try { $g.CopyFromScreen($r.L, $r.T, 0, 0, $bmp.Size) } catch { $g.Dispose(); $bmp.Dispose(); Start-Sleep -Milliseconds 30; continue }`,
+      `  $sum = 0`,
+      `  for ($i = 1; $i -le 16; $i++) { for ($j = 1; $j -le 16; $j++) { $p = $bmp.GetPixel([int]($w * $j / 17), [int]($ht * $i / 17)); $sum += [int]$p.R + [int]$p.G + [int]$p.B } }`,
+      `  [Console]::Out.WriteLine("screen " + $t + " " + $sum)`,
+      `  if ($env:BENCH_SCREEN_DUMP) { $bmp.Save((Join-Path $env:BENCH_SCREEN_DUMP ("screen-" + $t.ToString().PadLeft(4, "0") + ".png"))) }`,
+      `  $g.Dispose(); $bmp.Dispose()`,
+      `  Start-Sleep -Milliseconds 30`,
+      `}`,
+    ].join("\n"),
+  )
+  const helper = spawn("pwsh", ["-NoProfile", "-NonInteractive", "-File", script], { stdio: ["pipe", "pipe", "pipe"] })
+  const lines: string[] = []
+  let buffer = ""
+  await new Promise<void>((resolve) => {
+    helper.stdout!.on("data", (chunk: Buffer) => {
+      buffer += chunk.toString()
+      const parts = buffer.split(/\r?\n/)
+      buffer = parts.pop() ?? ""
+      for (const line of parts) {
+        if (line === "ready") resolve()
+        else lines.push(line)
+      }
+    })
+    helper.stderr!.on("data", (chunk: Buffer) => console.error(`raise-window: ${chunk.toString().trim()}`))
+    helper.on("exit", () => resolve())
+  })
+  const exited = new Promise<void>((resolve) => helper.on("exit", () => resolve()))
+  return {
+    raise: (pid) => helper.stdin!.write(`${pid}\n`),
+    // Resolves with the times (ms since the pid was sent, ~spawn) at which the sampled screen
+    // content differed from the first sample, i.e. when something other than the background colour
+    // was on screen.
+    screen: async () => {
+      await exited
+      const samples = lines
+        .filter((line) => line.startsWith("screen "))
+        .map((line) => line.split(" ").slice(1).map(Number) as [number, number])
+      if (process.env.BENCH_DEBUG) console.log(lines.filter((line) => line.startsWith("raised")).join(" "), `${samples.length} screen samples`)
+      const first = samples[0]?.[1]
+      const last = samples.at(-1)?.[1]
+      const differs = (a: number, b: number) => Math.abs(a - b) > 16 * 16 * 12
+      const changed = samples.filter(([, sum]) => differs(sum, first)).map(([t]) => t)
+      // The last sample that still differed from the final content, i.e. when the window stopped changing.
+      const settledIndex = samples.findLastIndex(([, sum]) => last !== undefined && differs(sum, last))
+      return { changed, settled: settledIndex >= 0 ? samples[settledIndex + 1]?.[0] : samples[0]?.[0] }
+    },
+  }
+}
 async function processTree(root: number) {
   const script =
     process.platform === "win32"

packages/desktop/src/main/wsl/runtime.test.ts

@@ -0,0 +1,35 @@
+import { expect, test } from "bun:test"
+import { listInstalledWslDistros, probeWslRuntime, runWslSh, wslArgs } from "./runtime"
+
+test("wslArgs bypasses the distro default shell", () => {
+  expect(wslArgs(["sh", "-lc", 'printf "%s\\n" "$HOME"'], "Debian")).toEqual([
+    "-d",
+    "Debian",
+    "--exec",
+    "sh",
+    "-lc",
+    'printf "%s\\n" "$HOME"',
+  ])
+  expect(wslArgs(["bash", "-se"], "Debian", "root")).toEqual([
+    "-d",
+    "Debian",
+    "--user",
+    "root",
+    "--exec",
+    "bash",
+    "-se",
+  ])
+})
+
+// Exercise the real wsl.exe argv path: with `--`, WSL routes the command line through the distro's
+// default shell, which expands `$cli` to "" before `sh` runs the script (#48640).
+const distro =
+  process.platform === "win32" && (await probeWslRuntime()).available
+    ? (await listInstalledWslDistros().catch(() => [])).find((item) => item.isDefault)?.name
+    : undefined
+
+test.skipIf(!distro)("inline scripts keep their own variable expansion inside WSL", async () => {
+  const result = await runWslSh(['cli="from-script"', 'printf "%s\\n" "$cli"'].join("\n"), distro)
+  expect(result.code).toBe(0)
+  expect(result.stdout.trim()).toBe("from-script")
+})

packages/desktop/src/main/wsl/runtime.ts

@@ -38,7 +38,9 @@ const DEFAULT_WSL_TIMEOUT_MS = 20_000
 const DEFAULT_WSL_INSTALL_TIMEOUT_MS = 15 * 60_000
 
 export function wslArgs(args: string[], distro?: string | null, user?: string | null) {
-  return [...(distro ? ["-d", distro] : []), ...(user ? ["--user", user] : []), "--", ...args]
+  // `--` hands the command line to the distro's default shell, which expands `$VAR` and `$(...)`
+  // inside our inline scripts before `sh -lc` ever runs them. `--exec` runs the command directly.
+  return [...(distro ? ["-d", distro] : []), ...(user ? ["--user", user] : []), "--exec", ...args]
 }
 
 export function runWsl(args: string[], opts: RunWslOptions = {}) {

packages/enterprise/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/enterprise",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/function/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/function",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",

packages/http-recorder/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "name": "@opencode/http-recorder",
   "description": "Record and replay Effect HTTP and WebSocket traffic with deterministic cassettes",
   "type": "module",

packages/httpapi-codegen/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/httpapi-codegen",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "exports": {

packages/latex/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/latex",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "exports": {

packages/merman/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/merman",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "exports": {

packages/plugin-browser/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/plugin-browser",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "OpenCode's desktop browser plugin",
   "type": "module",
   "license": "MIT",

packages/plugin/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/plugin",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/plugin/src/tui/context.ts

@@ -273,6 +273,8 @@ export interface ToastOptions {
   readonly message: string
   readonly variant?: ToastVariant
   readonly duration?: number
+  /** When this session's family is not open, the title defaults to the session title and the toast offers to open it. */
+  readonly sessionID?: string
 }
 
 export interface Toast {

packages/protocol/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/protocol",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "repository": {

packages/schema/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/schema",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "repository": {

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "name": "@opencode/sdk",
   "type": "module",
   "license": "MIT",

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/server",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "repository": {

packages/session-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/session-ui",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/session-ui/src/components/message-file.test.ts

@@ -1,7 +1,24 @@
 import { describe, expect, test } from "bun:test"
-import { typeLabel } from "./message-file"
+import type { PromptFileAttachment } from "@opencode/client/promise"
+import { attached, typeLabel } from "./message-file"
+
+function file(source: PromptFileAttachment["source"], mention = false): PromptFileAttachment {
+  return {
+    data: "",
+    mime: "text/plain",
+    source,
+    ...(mention ? { mention: { text: "@README.md", start: 0, end: 10 } } : {}),
+  }
+}
 
 describe("message-file", () => {
+  test("only treats data-backed files without mentions as attachments", () => {
+    expect(attached(file({ type: "inline" }))).toBe(true)
+    expect(attached(file({ type: "uri", uri: "data:text/plain;base64,SGVsbG8=" }))).toBe(true)
+    expect(attached(file({ type: "uri", uri: "file:///repo/README.md" }))).toBe(false)
+    expect(attached(file({ type: "inline" }, true))).toBe(false)
+  })
+
   test("labels attachment types from the basename extension", () => {
     expect(typeLabel("list.md", "text/plain", "File")).toBe("Markdown")
     expect(typeLabel("/repo/src/main.ts", "text/plain", "File")).toBe("TypeScript")

packages/session-ui/src/components/message-file.ts

@@ -1,5 +1,12 @@
 import { bundledLanguagesInfo } from "shiki"
 import { getFilename } from "@opencode/util/path"
+import type { PromptFileAttachment } from "@opencode/client/promise"
+
+export function attached(file: PromptFileAttachment) {
+  if (file.mention) return false
+  if (file.source.type === "inline") return true
+  return file.source.uri.startsWith("data:")
+}
 
 // language metadata only; grammars stay behind shiki's lazy imports
 const LANGUAGE_NAMES = new Map<string, string>(

packages/session-ui/src/message/message-content.tsx

@@ -27,7 +27,7 @@ import type {
   SessionMessageUser,
 } from "@opencode/client/promise"
 import type { SessionUserActions, SessionUserAttachmentReference, SessionUserComment } from "../actions"
-import { typeLabel } from "../components/message-file"
+import { attached, typeLabel } from "../components/message-file"
 
 export async function writeClipboard(text: string): Promise<boolean> {
   const body = typeof document === "undefined" ? undefined : document.body
@@ -214,7 +214,7 @@ export function CurrentUserMessageDisplay(props: {
   const dialog = useDialog()
   const i18n = useI18n()
   const [state, setState] = createStore({ copied: false, reverting: false })
-  const attachments = createMemo(() => (props.message.files ?? []).filter((file) => !file.mention))
+  const attachments = createMemo(() => (props.message.files ?? []).filter(attached))
   const references = createMemo(() => props.references ?? [])
   const inlineFiles = createMemo(() => (props.message.files ?? []).filter((file) => !!file.mention))
   const agents = createMemo(() => props.message.agents ?? [])

packages/simulation/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/simulation",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "repository": {

packages/stats/app/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/stats-app",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/stats/core/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/stats-core",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/stats/server/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/stats-server",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/theme/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/theme",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "repository": {

packages/tui/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/tui",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/tui/src/component/prompt/autocomplete.tsx

@@ -44,7 +44,7 @@ export type AutocompleteOption = {
   path?: string
   absolute?: string
   destructive?: { id: string; confirm: string; run: () => void }
-  kind?: "skill"
+  kind?: "skill" | "agent" | "reference"
   queueable?: boolean
 }
 
@@ -404,41 +404,13 @@ export function Autocomplete(props: {
     return { options: [], failed: false, query: "", resolved: false }
   })
 
-  const mcpResources = createMemo(() => {
-    if (store.visible !== "reference") return []
-
-    const options: AutocompleteOption[] = []
-    const width = props.anchor().width - 4
-
-    for (const res of data.location.mcp.resource.list(location.current) ?? []) {
-      options.push({
-        display: Locale.truncateMiddle(res.name, width),
-        // Match the name only; matching the URI caused unrelated fuzzy hits.
-        value: res.name,
-        description: res.description,
-        onSelect: () => {
-          insertPart(res.name, {
-            type: "file",
-            value: {
-              uri: res.uri,
-              name: res.name,
-              description: res.description,
-              mention: { start: 0, end: 0, text: "" },
-            },
-          })
-        },
-      })
-    }
-
-    return options
-  })
-
   const agents = createMemo(() => {
     return (data.location.agent.list() ?? [])
       .filter((agent) => !agent.hidden && agent.mode !== "primary")
       .map(
         (agent): AutocompleteOption => ({
           display: "@" + agent.id,
+          kind: "agent",
           onSelect: () => {
             insertPart(agent.id, {
               type: "agent",
@@ -474,6 +446,7 @@ export function Autocomplete(props: {
       .map(
         (reference): AutocompleteOption => ({
           display: "@" + reference.name,
+          kind: "reference",
           description: ` ${reference.source.type === "git" ? reference.source.repository : reference.source.path}`,
           onSelect: () => {
             insertPart(reference.name, {
@@ -567,7 +540,7 @@ export function Autocomplete(props: {
     const fileOptions: AutocompleteOption[] = store.visible === "reference" ? fileSearch.options : []
     const nonFileOptions: AutocompleteOption[] =
       store.visible === "reference"
-        ? [...skillOptions(), ...referenceAliasesValue, ...agentsValue, ...mcpResources()]
+        ? [...skillOptions(), ...referenceAliasesValue, ...agentsValue]
         : store.index === 0
           ? [...commandsValue]
           : []
@@ -869,6 +842,11 @@ export function Autocomplete(props: {
     return "No matching files, agents, or references"
   })
   const emptyError = createMemo(() => store.visible === "reference" && !files.loading && visibleFiles().failed)
+  const labels = {
+    skill: "skill",
+    agent: "agent",
+    reference: "reference",
+  }
 
   return (
     <box
@@ -902,6 +880,14 @@ export function Autocomplete(props: {
         >
           {(option, index) => {
             const destructive = () => option().destructive
+            const label = () => {
+              const kind = option().kind
+              return kind ? labels[kind] : undefined
+            }
+            const contentWidth = () => {
+              const text = label()
+              return Math.max(1, position().width - 4 - (text ? stringWidth(text) + 2 : 0))
+            }
             const confirmingAction = () => {
               const action = destructive()
               return action !== undefined && action.id === confirming()
@@ -931,17 +917,32 @@ export function Autocomplete(props: {
                         : theme.text.base
                   }
                   flexShrink={0}
+                  wrapMode="none"
                 >
-                  {confirmingAction() ? destructive()?.confirm : option().display}
+                  {Locale.truncateMiddle(
+                    confirmingAction() ? (destructive()?.confirm ?? "") : option().display,
+                    contentWidth(),
+                  )}
                 </text>
                 <Show when={!confirmingAction() && option().description}>
                   <text
                     fg={index === store.selected ? theme.text.action.primary.focused : theme.text.muted}
                     wrapMode="none"
+                    flexShrink={1}
+                    minWidth={0}
                   >
                     {" " + option().description?.replace(/\s+/g, " ").trim()}
                   </text>
                 </Show>
+                <Show when={!confirmingAction() && label()}>
+                  <box flexGrow={1} minWidth={2} />
+                  <text
+                    flexShrink={0}
+                    fg={index === store.selected ? theme.text.action.primary.focused : theme.text.subdued}
+                  >
+                    {label()}
+                  </text>
+                </Show>
               </box>
             )
           }}

packages/tui/src/component/session-tabs.tsx

@@ -120,7 +120,7 @@ const glowTextColor = (base: RGBA, glow: RGBA, index: number, width: number, lev
   tint(base, glow, 0.12 * unreadGlowIntensity(index, width) * level)
 
 function tabFeedbackColor(status: SessionTabsStatus, theme: ReturnType<typeof useTheme>) {
-  if (status.attention) return theme.hue.interactive[800]
+  if (status.attention) return theme.hue.accent[200]
   if (status.unread === "error") return theme.text.feedback.error.base
   return undefined
 }
@@ -528,8 +528,8 @@ function VerticalSessionTabs(props: {
   const compact = createMemo(() => width() < SESSION_TABS_COMPACT_BREAKPOINT)
   const tooltipWidth = () => Math.min(54, dimensions().width - width())
   const stride = () => (compact() ? 2 : 3)
-  const unreadColor = () => theme.hue.interactive[800]
-  const activeNumber = () => theme.hue.accent[800]
+  const unreadColor = () => theme.hue.accent[200]
+  const activeNumber = () => theme.hue.interactive[200]
   const idleNumber = () => tint(theme.text.formfield.base, background(), 0.55)
   const separatorUpperPulseColor = createMemo(() => tint(background(), theme.text.base, 0.04))
   const separatorLowerPulseColor = createMemo(() => tint(background(), theme.text.base, 0.05))
@@ -1291,8 +1291,8 @@ function HorizontalSessionTabs(props: {
   onCleanup(clearCloseHold)
   // A captured drag ends with a synthetic up on its drop target; do not turn that into a click.
   let suppressClick = false
-  const unreadColor = () => theme.hue.interactive[800]
-  const activeNumber = () => theme.hue.accent[800]
+  const unreadColor = () => theme.hue.accent[200]
+  const activeNumber = () => theme.hue.interactive[200]
   const idleNumber = () => tint(theme.text.formfield.base, theme.background.base, 0.55)
   const newTab = () => tabs.newTab?.() ?? false
   const activeID = createMemo(() => (newTab() ? NEW_SESSION_TAB.sessionID : tabs.current()))

packages/tui/src/feature-plugins/prompt/btw.tsx

@@ -32,7 +32,7 @@ export default Plugin.define({
         return (
           <Show when={pending() > 0}>
             <box flexShrink={0}>
-              <Spinner color={theme.hue.accent[800]}>/btw</Spinner>
+              <Spinner color={theme.hue.interactive[200]}>/btw</Spinner>
             </box>
           </Show>
         )

packages/tui/src/feature-plugins/system/notifications.ts

@@ -67,9 +67,7 @@ export default Plugin.define({
         }
         errored.add(sessionID)
         notify(context, sessionID, event.data.error.message, "error")
-        const route = context.ui.router.current()
-        if (route.type === "session" && route.sessionID === sessionID)
-          context.ui.toast.show({ title: "Session failed", message: event.data.error.message, variant: "error" })
+        context.ui.toast.show({ sessionID, title: "Session failed", message: event.data.error.message, variant: "error" })
         ended(sessionID)
       }),
     ]

packages/tui/src/feature-plugins/system/storybook/one-cell-spinner.tsx

@@ -181,7 +181,7 @@ function OneCellSpinnerStory(props: { context: Plugin.Context }) {
                               animations={animations()}
                               paused={paused()}
                               glow={glow()}
-                              color={theme.hue.accent[800]}
+                              color={theme.hue.interactive[200]}
                             />
                           </box>
                         )}
@@ -236,7 +236,7 @@ function OneCellSpinnerStory(props: { context: Plugin.Context }) {
                     animations={animations()}
                     paused={paused()}
                     glow={glow()}
-                    color={theme.hue.accent[800]}
+                    color={theme.hue.interactive[200]}
                   />
                   <text fg={theme.text.base}> esc stop</text>
                 </box>

packages/tui/src/feature-plugins/system/storybook/session-tabs.tsx

@@ -284,10 +284,10 @@ function SessionTabsStory(props: { context: Plugin.Context }) {
       { text: "", color: theme.text.base },
     )
     if (status.attention === "question")
-      lines.push({ text: "? Which approach should I take?", color: theme.hue.interactive[800] })
+      lines.push({ text: "? Which approach should I take?", color: theme.hue.accent[200] })
     else if (status.attention === "permission")
-      lines.push({ text: "! Waiting for permission to run the command", color: theme.hue.interactive[800] })
-    else if (status.busy) lines.push({ text: "● Working…", color: theme.hue.accent[800] })
+      lines.push({ text: "! Waiting for permission to run the command", color: theme.hue.accent[200] })
+    else if (status.busy) lines.push({ text: "● Working…", color: theme.hue.interactive[200] })
     else if (outcome === "failed")
       lines.push({
         text: `✗ bun run test failed — 3 tests failing in ${file}`,

packages/tui/src/mini/theme.ts

@@ -142,9 +142,9 @@ function map(
       formfieldFocusedBg: exact(theme.background.formfield.focused),
       formfieldFocusedText: exact(theme.text.formfield.focused),
       selection: exact(theme.text.formfield.selected),
-      running: exact(theme.hue.accent[800]),
-      question: exact(theme.hue.interactive[800]),
-      permission: exact(theme.hue.interactive[800]),
+      running: exact(theme.hue.interactive[200]),
+      question: exact(theme.hue.accent[200]),
+      permission: exact(theme.hue.accent[200]),
       success: exact(theme.text.feedback.success.base),
       link: exact(theme.markdown.link),
       categorical: dedupeWith(

packages/tui/src/plugin/api.tsx

@@ -95,7 +95,27 @@ export function createPluginContext(input: {
   const dialogApi = createDialogApi(host.dialog, provide)
   const toastApi: Toast = {
     show(options) {
-      host.toast.show({ ...options, variant: options.variant ?? "info" })
+      const toast = {
+        title: options.title,
+        message: options.message,
+        variant: options.variant ?? "info",
+        duration: options.duration,
+      }
+      const sessionID = options.sessionID
+      if (sessionID === undefined) {
+        host.toast.show(toast)
+        return
+      }
+      const route = host.route.data
+      if (route.type === "session" && host.data.session.root(route.sessionID) === host.data.session.root(sessionID)) {
+        host.toast.show(toast)
+        return
+      }
+      host.toast.show({
+        ...toast,
+        title: toast.title ?? host.data.session.get(sessionID)?.title,
+        action: { label: "Open", run: () => host.route.navigate({ type: "session", sessionID }) },
+      })
     },
   }
   // Unregistering after deactivation is a no-op: deactivate already resets

packages/tui/test/cli/cmd/tui/notifications.test.ts

@@ -146,23 +146,27 @@ const permissionNotification: AttentionNotifyOptions = {
 }
 
 describe("internal notifications TUI plugin", () => {
-  test("shows execution failures in the viewed session without needing an assistant message", async () => {
+  test("shows execution failures as session-scoped toasts without needing an assistant message", async () => {
     const harness = await setup()
     harness.emit(executionStarted("started"))
     harness.emit(executionFailed("failed"))
     harness.emit(executionFailed("duplicate"))
-    expect(harness.toasts).toEqual([{ title: "Session failed", message: "boom", variant: "error" }])
+    expect(harness.toasts).toEqual([
+      { sessionID: "session", title: "Session failed", message: "boom", variant: "error" },
+    ])
     harness.emit(executionStarted("retry"))
     harness.emit(executionFailed("failed-again"))
     expect(harness.toasts).toHaveLength(2)
   })
 
   test.each<Route>([{ type: "home" }, { type: "session", sessionID: "other" }])(
-    "keeps other sessions' failures out of the current composer (%j)",
+    "leaves routing of other sessions' failures to the session-scoped toast (%j)",
     async (route) => {
       const harness = await setup(route)
       harness.emit(executionFailed("failed"))
-      expect(harness.toasts).toEqual([])
+      expect(harness.toasts).toEqual([
+        { sessionID: "session", title: "Session failed", message: "boom", variant: "error" },
+      ])
       expect(harness.notifications).toHaveLength(1)
     },
   )

packages/tui/test/component/session-tabs-status.test.tsx

@@ -139,7 +139,7 @@ for (const orientation of ["horizontal", "vertical"] as const) {
             .captureSpans()
             .lines.flatMap((line) => line.spans)
             .find((span) => span.text.trim() === (attention === "question" ? "?" : "!"))?.fg
-        expect(indicatorColor()?.toInts()).toEqual(theme.hue.interactive[800].toInts())
+        expect(indicatorColor()?.toInts()).toEqual(theme.hue.accent[200].toInts())
         const glow = () => {
           const colors = app
             .captureSpans()
@@ -156,7 +156,7 @@ for (const orientation of ["horizontal", "vertical"] as const) {
         expect(full).toBeGreaterThan(0)
         setActive("first")
         await app.renderOnce()
-        expect(indicatorColor()?.toInts()).toEqual(theme.hue.interactive[800].toInts())
+        expect(indicatorColor()?.toInts()).toEqual(theme.hue.accent[200].toInts())
         const dim = glow()
         expect(dim).toBeGreaterThan(0)
         expect(dim).toBeLessThan(full)
@@ -172,7 +172,7 @@ for (const orientation of ["horizontal", "vertical"] as const) {
           .lines.flatMap((line) => line.spans)
           .find((span) => span.text.trim() === glyph)?.fg
         expect(color?.toInts()).toEqual(
-          (unread === "error" ? theme.text.feedback.error.base : theme.hue.interactive[800]).toInts(),
+          (unread === "error" ? theme.text.feedback.error.base : theme.hue.accent[200]).toInts(),
         )
         await app.mockMouse.click(1, orientation === "vertical" ? 1 : 0)
         await app.renderOnce()

packages/tui/test/mini/theme.test.ts

@@ -90,9 +90,9 @@ function expectFooter(actual: RunTheme, theme: ResolvedTheme) {
     formfieldFocusedBg: theme.background.formfield.focused,
     formfieldFocusedText: theme.text.formfield.focused,
     selection: theme.text.formfield.selected,
-    running: theme.hue.accent[800],
-    question: theme.hue.interactive[800],
-    permission: theme.hue.interactive[800],
+    running: theme.hue.interactive[200],
+    question: theme.hue.accent[200],
+    permission: theme.hue.accent[200],
     success: theme.text.feedback.success.base,
     link: theme.markdown.link,
     shade: theme.background.raised.base,

packages/tui/test/plugin-toast.test.tsx

@@ -0,0 +1,62 @@
+import { expect, test } from "bun:test"
+import type { Route } from "@opencode/plugin/tui/context"
+import { createPluginContext, type Registry, type usePluginHost } from "../src/plugin/api"
+
+type Host = ReturnType<typeof usePluginHost>
+type Shown = Parameters<Host["toast"]["show"]>[0]
+
+const sessions: Record<string, { id: string; title?: string; parentID?: string }> = {
+  parent: { id: "parent", title: "Parent session" },
+  child: { id: "child", title: "Child session", parentID: "parent" },
+  other: { id: "other", title: "Other session" },
+}
+
+const root = (sessionID: string): string => {
+  const parentID = sessions[sessionID]?.parentID
+  return parentID ? root(parentID) : sessionID
+}
+
+function setup(route: Route) {
+  const shown: Shown[] = []
+  const navigated: Route[] = []
+  const host = {
+    app: { version: "test", channel: "test" },
+    client: { api: {} },
+    keymap: {},
+    shortcuts: {},
+    keymapState: {},
+    sessionTabs: {},
+    toast: { show: (toast: Shown) => shown.push(toast) },
+    route: {
+      get data() {
+        return route
+      },
+      navigate: (destination: Route) => navigated.push(destination),
+    },
+    data: { session: { root, get: (sessionID: string) => sessions[sessionID] } },
+  } as unknown as Host
+  const registry: Registry = { has: () => false, set() {}, remove() {}, active: () => true }
+  const context = createPluginContext({ host, id: "test", options: undefined, owned: [], registry })
+  return { shown, navigated, toast: context.ui.toast }
+}
+
+test.each([
+  ["parent", "parent"],
+  ["parent", "child"],
+  ["child", "parent"],
+])("toast for %s's family shows as-is while %s is open", (target, routed) => {
+  const harness = setup({ type: "session", sessionID: routed })
+  harness.toast.show({ sessionID: target, message: "done" })
+  expect(harness.shown).toEqual([{ title: undefined, message: "done", variant: "info", duration: undefined }])
+})
+
+test.each<Route>([{ type: "home" }, { type: "session", sessionID: "parent" }])(
+  "toast for a session that is not open gains its title and an Open action (%j)",
+  (route) => {
+    const harness = setup(route)
+    harness.toast.show({ sessionID: "other", message: "done" })
+    expect(harness.shown[0]).toMatchObject({ title: "Other session", action: { label: "Open" } })
+    harness.shown[0].action?.run()
+    expect(harness.navigated).toEqual([{ type: "session", sessionID: "other" }])
+  },
+)

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/ui",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "repository": {

packages/util/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/util",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "license": "MIT",
   "repository": {

packages/web/astro.config.mjs

@@ -296,7 +296,6 @@ export default defineConfig({
       ],
       components: {
         Hero: "./src/components/Hero.astro",
-        Banner: "./src/components/Banner.astro",
         Head: "./src/components/Head.astro",
         Header: "./src/components/Header.astro",
         Footer: "./src/components/Footer.astro",

packages/web/package.json

@@ -2,7 +2,7 @@
   "name": "@opencode/web",
   "type": "module",
   "license": "MIT",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "scripts": {
     "dev": "astro dev",
     "dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev",

packages/web/src/components/Banner.astro

@@ -1,61 +0,0 @@
-<a class="v2-banner" href="https://opencode.ai/v2">
-  <span class="badge">New</span>
-  <span class="text">OpenCode v2 is now available</span>
-  <span class="arrow" aria-hidden="true">&rarr;</span>
-</a>
-
-<style>
-  .v2-banner {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 12px;
-    padding: 12px 24px;
-    background: var(--color-background-interactive);
-    color: var(--color-text-strong) !important;
-    border-bottom: 1px solid var(--color-border-weak);
-    text-decoration: none;
-    font-size: 14px;
-    line-height: 1;
-    transition: background 0.15s ease;
-  }
-
-  .v2-banner:hover {
-    background: var(--color-background-interactive-weaker);
-  }
-
-  .badge {
-    padding: 4px 8px;
-    background: var(--color-background-strong);
-    color: var(--color-text-inverted);
-    font-size: 12px;
-    font-weight: 500;
-    text-transform: uppercase;
-    letter-spacing: 0.02em;
-    border-radius: 2px;
-  }
-
-  .text {
-    font-weight: 500;
-  }
-
-  .arrow {
-    color: var(--color-text);
-    transition: transform 0.15s ease;
-  }
-
-  .v2-banner:hover .arrow {
-    transform: translateX(4px);
-  }
-
-  @media (max-width: 30rem) {
-    .v2-banner {
-      padding: 10px 16px;
-      gap: 8px;
-    }
-
-    .badge {
-      display: none;
-    }
-  }
-</style>

sdks/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "opencode",
   "displayName": "opencode",
   "description": "opencode for VS Code",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "publisher": "sst-dev",
   "repository": {
     "type": "git",

services/update/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/update",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "private": true,
   "type": "module",
   "scripts": {