Fix beta integration

packages/cli/package.json

@@ -41,8 +41,8 @@
     "solid-js": "catalog:",
     "tree-sitter-bash": "0.25.0",
     "tree-sitter-powershell": "0.25.10",
-    "web-tree-sitter": "0.25.10",
     "uqr": "0.1.3",
+    "web-tree-sitter": "0.25.10",
     "ws": "8.21.0"
   },
   "devDependencies": {

packages/cli/script/build.ts

@@ -102,6 +102,17 @@ for (const item of targets) {
   const name = target.replace(binary, "cli")
   const executablePath = await compileExecutable(item)
   console.log(`building ${name}`)
+  const compileTarget = {
+    autoloadBunfig: false,
+    autoloadDotenv: false,
+    autoloadTsconfig: true,
+    autoloadPackageJson: true,
+    target: target.replace(binary, "bun") as Bun.Build.CompileTarget,
+    ...(executablePath ? { executablePath } : {}),
+    outfile: path.join(outdir, name, "bin", binary),
+    execArgv: [`--user-agent=${binary}/${Script.version}`, "--use-system-ca", "--no-warnings", "--"],
+    windows: {},
+  }
   const result = await Bun.build({
     entrypoints: ["./src/index.ts"],
     tsconfig: "./tsconfig.json",
@@ -111,17 +122,7 @@ for (const item of targets) {
     minify: true,
     sourcemap: "inline",
     splitting: true,
-    compile: {
-      autoloadBunfig: false,
-      autoloadDotenv: false,
-      autoloadTsconfig: true,
-      autoloadPackageJson: true,
-      target: target.replace(binary, "bun") as Bun.Build.CompileTarget,
-      executablePath,
-      outfile: path.join(outdir, name, "bin", binary),
-      execArgv: [`--user-agent=${binary}/${Script.version}`, "--use-system-ca", "--"],
-      windows: {},
-    },
+    compile: compileTarget,
     define: {
       OPENCODE_VERSION: `'${Script.version}'`,
       OPENCODE_CLI_NAME: `'${binary}'`,

packages/tui/src/context/local.tsx

@@ -10,7 +10,6 @@ import { useClient } from "./client"
 import { RGBA } from "@opentui/core"
 import { readJson, writeJsonAtomic } from "../util/persistence"
 import {
-  availableModelVariant,
   createModelPreferenceRepository,
   cycleModelVariant,
   modelPreferenceKey,
@@ -222,14 +221,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
         if (route.data.type === "session") return sessionSelection(route.data.sessionID)
         const model = newSessionModel()
         if (!model) return
-        const info = models()?.find((item) => item.providerID === model.providerID && item.id === model.modelID)
-        return {
-          ...model,
-          variant: availableModelVariant(
-            preferences.variant[modelPreferenceKey(model)],
-            info?.variants?.map((item) => item.id) ?? [],
-          ),
-        }
+        return { ...model, variant: normalizeModelVariant(preferences.variant[modelPreferenceKey(model)]) }
       })
 
       const currentModel = createMemo(() => {
@@ -270,12 +262,13 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
         if (route.data.type === "session") {
           const sessionID = route.data.sessionID
           const current = sessionSelection(sessionID)
-          const preferred =
+          const preferred = normalizeModelVariant(
             current?.providerID === model.providerID && current.modelID === model.modelID
               ? current.variant
-              : preferences.variant[modelPreferenceKey(model)]
+              : preferences.variant[modelPreferenceKey(model)],
+          )
           const info = models()?.find((item) => item.providerID === model.providerID && item.id === model.modelID)
-          const variant = availableModelVariant(preferred, info?.variants?.map((item) => item.id) ?? [])
+          const variant = preferred && info?.variants?.some((item) => item.id === preferred) ? preferred : undefined
           setSessionDraft(sessionID, { ...model, variant })
           return true
         }

packages/tui/src/model-preference.ts

@@ -39,11 +39,6 @@ export function normalizeModelVariant(value: string | undefined) {
   return value === "default" ? undefined : value
 }
 
-export function availableModelVariant(value: string | undefined, variants: string[]) {
-  const variant = normalizeModelVariant(value)
-  return variant && variants.includes(variant) ? variant : undefined
-}
-
 export function modelPreferenceKey(model: ModelPreferenceModel) {
   return `${model.providerID}/${model.modelID}`
 }

packages/tui/test/model-preference.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from "bun:test"
 import path from "node:path"
-import { availableModelVariant, createModelPreferenceRepository, decodeModelPreference } from "../src/model-preference"
+import { createModelPreferenceRepository, decodeModelPreference } from "../src/model-preference"
 import { tmpdir } from "./fixture/fixture"
 
 test("repairs known model preferences and preserves unrelated fields", () => {
@@ -19,12 +19,6 @@ test("repairs known model preferences and preserves unrelated fields", () => {
   })
 })
 
-test("drops a saved variant that is no longer available", () => {
-  expect(availableModelVariant("medium", [])).toBeUndefined()
-  expect(availableModelVariant("medium", ["low", "high"])).toBeUndefined()
-  expect(availableModelVariant("medium", ["low", "medium", "high"])).toBe("medium")
-})
-
 test("atomically serializes patches and variant updates", async () => {
   await using tmp = await tmpdir()
   const file = path.join(tmp.path, "model.json")