diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-agent.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-agent.tsx index 365a22445b..fcdc77fc88 100644 --- a/packages/opencode/src/cli/cmd/tui/component/dialog-agent.tsx +++ b/packages/opencode/src/cli/cmd/tui/component/dialog-agent.tsx @@ -20,7 +20,7 @@ export function DialogAgent() { return ( { local.agent.set(option.value) diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx index 145fa9da0c..8c43f3a392 100644 --- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx +++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx @@ -531,7 +531,7 @@ export function Prompt(props: PromptProps) { if (store.mode === "shell") { sdk.client.session.shell({ sessionID, - agent: local.agent.current().name, + agent: local.agent.current()?.name ?? "coder", model: { providerID: selectedModel.providerID, modelID: selectedModel.modelID, @@ -552,7 +552,7 @@ export function Prompt(props: PromptProps) { sessionID, command: command.slice(1), arguments: args.join(" "), - agent: local.agent.current().name, + agent: local.agent.current()?.name ?? "coder", model: `${selectedModel.providerID}/${selectedModel.modelID}`, messageID, variant, @@ -569,7 +569,7 @@ export function Prompt(props: PromptProps) { sessionID, ...selectedModel, messageID, - agent: local.agent.current().name, + agent: local.agent.current()?.name ?? "coder", model: selectedModel, variant, parts: [ @@ -690,7 +690,7 @@ export function Prompt(props: PromptProps) { const highlight = createMemo(() => { if (keybind.leader) return theme.border if (store.mode === "shell") return theme.primary - return local.agent.color(local.agent.current().name) + return local.agent.color(local.agent.current()?.name ?? "coder") }) const showVariant = createMemo(() => { @@ -701,7 +701,7 @@ export function Prompt(props: PromptProps) { }) const spinnerDef = createMemo(() => { - const color = local.agent.color(local.agent.current().name) + const color = local.agent.color(local.agent.current()?.name ?? "coder") return { frames: createFrames({ color, @@ -935,7 +935,7 @@ export function Prompt(props: PromptProps) { /> - {store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "} + {store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current()?.name ?? "coder")}{" "} diff --git a/packages/opencode/src/cli/cmd/tui/context/local.tsx b/packages/opencode/src/cli/cmd/tui/context/local.tsx index 63f1d9743b..59044cad91 100644 --- a/packages/opencode/src/cli/cmd/tui/context/local.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/local.tsx @@ -38,7 +38,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ const [agentStore, setAgentStore] = createStore<{ current: string }>({ - current: agents()[0].name, + current: agents()[0]?.name ?? "", }) const { theme } = useTheme() const colors = createMemo(() => [ @@ -54,7 +54,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ return agents() }, current() { - return agents().find((x) => x.name === agentStore.current)! + return agents().find((x) => x.name === agentStore.current) ?? agents()[0] }, set(name: string) { if (!agents().some((x) => x.name === name)) @@ -67,10 +67,13 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ }, move(direction: 1 | -1) { batch(() => { - let next = agents().findIndex((x) => x.name === agentStore.current) + direction - if (next < 0) next = agents().length - 1 - if (next >= agents().length) next = 0 - const value = agents()[next] + const list = agents() + if (list.length === 0) return + let next = list.findIndex((x) => x.name === agentStore.current) + direction + if (next < 0) next = list.length - 1 + if (next >= list.length) next = 0 + const value = list[next] + if (!value) return setAgentStore("current", value.name) }) }, @@ -179,6 +182,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ const currentModel = createMemo(() => { const a = agent.current() + if (!a) return undefined return ( getFirstValidModel( () => modelStore.model[a.name], @@ -217,17 +221,19 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ } }), cycle(direction: 1 | -1) { - const current = currentModel() - if (!current) return + const a = agent.current() + if (!a) return + const model = currentModel() + if (!model) return const recent = modelStore.recent - const index = recent.findIndex((x) => x.providerID === current.providerID && x.modelID === current.modelID) + const index = recent.findIndex((x) => x.providerID === model.providerID && x.modelID === model.modelID) if (index === -1) return let next = index + direction if (next < 0) next = recent.length - 1 if (next >= recent.length) next = 0 const val = recent[next] if (!val) return - setModelStore("model", agent.current().name, { ...val }) + setModelStore("model", a.name, { ...val }) }, cycleFavorite(direction: 1 | -1) { const favorites = modelStore.favorite.filter((item) => isModelValid(item)) @@ -253,7 +259,9 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ } const next = favorites[index] if (!next) return - setModelStore("model", agent.current().name, { ...next }) + const a = agent.current() + if (!a) return + setModelStore("model", a.name, { ...next }) const uniq = uniqueBy([next, ...modelStore.recent], (x) => `${x.providerID}/${x.modelID}`) if (uniq.length > 10) uniq.pop() setModelStore( @@ -264,6 +272,8 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ }, set(model: { providerID: string; modelID: string }, options?: { recent?: boolean }) { batch(() => { + const a = agent.current() + if (!a) return if (!isModelValid(model)) { toast.show({ message: `Model ${model.providerID}/${model.modelID} is not valid`, @@ -272,7 +282,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ }) return } - setModelStore("model", agent.current().name, model) + setModelStore("model", a.name, model) if (options?.recent) { const uniq = uniqueBy([model, ...modelStore.recent], (x) => `${x.providerID}/${x.modelID}`) if (uniq.length > 10) uniq.pop() @@ -368,6 +378,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ // Automatically update model when agent changes createEffect(() => { const value = agent.current() + if (!value) return if (value.model) { if (isModelValid(value.model)) model.set({