Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions packages/opencode/src/cli/cmd/tui/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -332,16 +332,8 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
onMount(() => {
batch(() => {
if (args.agent) local.agent.set(args.agent)
if (args.model) {
const { providerID, modelID } = Provider.parseModel(args.model)
if (!providerID || !modelID)
return toast.show({
variant: "warning",
message: `Invalid model format: ${args.model}`,
duration: 3000,
})
local.model.set({ providerID, modelID }, { recent: true })
}
// --model is now handled reactively in local.tsx (cliOverride) to avoid
// validation races — providers may not be loaded yet at mount time.
if (args.sessionID && !args.fork) {
route.navigate({
type: "session",
Expand Down
29 changes: 18 additions & 11 deletions packages/opencode/src/cli/cmd/tui/context/local.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createStore } from "solid-js/store"
import { createSimpleContext } from "./helper"
import { batch, createEffect, createMemo } from "solid-js"
import { batch, createEffect, createMemo, createSignal } from "solid-js"
import { useSync } from "@tui/context/sync"
import { useTheme } from "@tui/context/theme"
import { uniqueBy } from "remeda"
Expand Down Expand Up @@ -158,17 +158,22 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
})

const args = useArgs()
const fallbackModel = createMemo(() => {
if (args.model) {
const { providerID, modelID } = parseModel(args.model)
if (isModelValid({ providerID, modelID })) {
return {
providerID,
modelID,
}
}

// CLI --model override: resolved reactively once providers load.
// Highest priority — beats agent config and per-agent selections.
const [cliOverride, setCliOverride] = createSignal<{ providerID: string; modelID: string } | undefined>(undefined)
let cliOverrideApplied = false
createEffect(() => {
if (cliOverrideApplied || !args.model) return
const { providerID, modelID } = parseModel(args.model)
if (!providerID || !modelID) return
if (isModelValid({ providerID, modelID })) {
cliOverrideApplied = true
setCliOverride({ providerID, modelID })
}
})

const fallbackModel = createMemo(() => {
if (sync.data.config.model) {
const { providerID, modelID } = parseModel(sync.data.config.model)
if (isModelValid({ providerID, modelID })) {
Expand Down Expand Up @@ -201,6 +206,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
const a = agent.current()
return (
getFirstValidModel(
cliOverride,
() => a && modelStore.model[a.name],
() => a && a.model,
fallbackModel,
Expand Down Expand Up @@ -397,10 +403,11 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
},
}

// Automatically update model when agent changes
// Automatically update model when agent changes (skip when CLI override is active)
createEffect(() => {
const value = agent.current()
if (!value) return
if (cliOverride()) return
if (value.model) {
if (isModelValid(value.model))
model.set({
Expand Down
Loading