Skip to content

Commit b6cea61

Browse files
committed
fix(tui): retain model and agent selection when switching sessions
When switching between sessions, the selected model and agent were reset to defaults because there was no per-session memory. This adds a session map to the existing model.json state file so that when you leave a session the current model and agent are saved against that session ID, and restored when you return to it. New sessions with no saved state fall back to the existing default behaviour unchanged. Fixes anomalyco#4930
1 parent b16f7b4 commit b6cea61

1 file changed

Lines changed: 55 additions & 1 deletion

File tree

  • packages/opencode/src/cli/cmd/tui/context

‎packages/opencode/src/cli/cmd/tui/context/local.tsx‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createStore } from "solid-js/store"
2-
import { batch, createEffect, createMemo } from "solid-js"
2+
import { batch, createEffect, createMemo, on } from "solid-js"
33
import { useSync } from "@tui/context/sync"
44
import { useTheme } from "@tui/context/theme"
55
import { uniqueBy } from "remeda"
@@ -13,13 +13,15 @@ import { useArgs } from "./args"
1313
import { useSDK } from "./sdk"
1414
import { RGBA } from "@opentui/core"
1515
import { Filesystem } from "@/util/filesystem"
16+
import { useRoute } from "@tui/context/route"
1617

1718
export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
1819
name: "Local",
1920
init: () => {
2021
const sync = useSync()
2122
const sdk = useSDK()
2223
const toast = useToast()
24+
const route = useRoute()
2325

2426
function isModelValid(model: { providerID: string; modelID: string }) {
2527
const provider = sync.data.provider.find((x) => x.id === model.providerID)
@@ -90,6 +92,10 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
9092
}
9193
return colors()[index % colors().length]
9294
},
95+
// internal setter used for session restore without validation toast
96+
_set(name: string) {
97+
setAgentStore("current", name)
98+
},
9399
}
94100
})
95101

@@ -112,12 +118,20 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
112118
modelID: string
113119
}[]
114120
variant: Record<string, string | undefined>
121+
session: Record<
122+
string,
123+
{
124+
model?: { providerID: string; modelID: string }
125+
agent?: string
126+
}
127+
>
115128
}>({
116129
ready: false,
117130
model: {},
118131
recent: [],
119132
favorite: [],
120133
variant: {},
134+
session: {},
121135
})
122136

123137
const filePath = path.join(Global.Path.state, "model.json")
@@ -135,6 +149,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
135149
recent: modelStore.recent,
136150
favorite: modelStore.favorite,
137151
variant: modelStore.variant,
152+
session: modelStore.session,
138153
})
139154
}
140155

@@ -143,6 +158,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
143158
if (Array.isArray(x.recent)) setModelStore("recent", x.recent)
144159
if (Array.isArray(x.favorite)) setModelStore("favorite", x.favorite)
145160
if (typeof x.variant === "object" && x.variant !== null) setModelStore("variant", x.variant)
161+
if (typeof x.session === "object" && x.session !== null) setModelStore("session", x.session)
146162
})
147163
.catch(() => {})
148164
.finally(() => {
@@ -358,6 +374,28 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
358374
this.set(variants[index + 1])
359375
},
360376
},
377+
saveForSession(sessionID: string) {
378+
const currentModelVal = currentModel()
379+
const currentAgentName = agent.current()?.name
380+
setModelStore("session", sessionID, {
381+
model: currentModelVal,
382+
agent: currentAgentName,
383+
})
384+
save()
385+
},
386+
restoreForSession(sessionID: string) {
387+
const saved = modelStore.session[sessionID]
388+
if (!saved) return
389+
if (saved.agent) {
390+
const agents = sync.data.agent.filter((x) => x.mode !== "subagent" && !x.hidden)
391+
if (agents.some((x) => x.name === saved.agent)) {
392+
agent._set(saved.agent)
393+
}
394+
}
395+
if (saved.model && isModelValid(saved.model)) {
396+
setModelStore("model", agent.current().name, saved.model)
397+
}
398+
},
361399
}
362400
})
363401

@@ -396,6 +434,22 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
396434
}
397435
})
398436

437+
// Save model/agent when leaving a session, restore when entering one
438+
createEffect(
439+
on(
440+
() => route.data,
441+
(current, previous) => {
442+
if (previous?.type === "session") {
443+
model.saveForSession(previous.sessionID)
444+
}
445+
if (current.type === "session") {
446+
model.restoreForSession(current.sessionID)
447+
}
448+
},
449+
{ defer: true },
450+
),
451+
)
452+
399453
const result = {
400454
model,
401455
agent,

0 commit comments

Comments
 (0)