fix(desktop): preserve selected model during session promotion (#34466)

This commit is contained in:
usrnk1 2026-06-30 10:23:39 +02:00 committed by GitHub
commit e34822db6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -80,6 +80,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
const [store, setStore] = createStore<{ const [store, setStore] = createStore<{
current?: string current?: string
draft?: State draft?: State
promoting?: State
last?: { last?: {
type: "agent" | "model" | "variant" type: "agent" | "model" | "variant"
agent?: string agent?: string
@ -123,7 +124,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
const scope = createMemo<State | undefined>(() => { const scope = createMemo<State | undefined>(() => {
const session = id() const session = id()
if (!session) return store.draft if (!session) return store.draft ?? store.promoting
return saved.session[session] ?? handoff.get(handoffKey(serverSDK().scope, sdk().directory, session)) return saved.session[session] ?? handoff.get(handoffKey(serverSDK().scope, sdk().directory, session))
}) })
@ -136,11 +137,13 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
if (!next) return if (!next) return
if (saved.session[session] !== undefined) { if (saved.session[session] !== undefined) {
handoff.delete(key) handoff.delete(key)
setStore("promoting", undefined)
return return
} }
setSaved("session", session, clone(next)) setSaved("session", session, clone(next))
handoff.delete(key) handoff.delete(key)
setStore("promoting", undefined)
}) })
const configuredModel = () => { const configuredModel = () => {
@ -373,19 +376,19 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
agent, agent,
session: { session: {
reset() { reset() {
setStore("draft", undefined) setStore({ draft: undefined, promoting: undefined })
}, },
promote(dir: string, session: string) { promote(dir: string, session: string) {
const next = clone(snapshot()) const next = clone(snapshot())
if (!next) return if (!next) return
const key = handoffKey(serverSDK().scope, dir, session)
handoff.set(key, next)
if (dir === sdk().directory) { if (dir === sdk().directory) {
setSaved("session", session, next) setSaved("session", session, next)
setStore("draft", undefined)
return
} }
handoff.set(handoffKey(serverSDK().scope, dir, session), next) setStore("promoting", next)
setStore("draft", undefined) setStore("draft", undefined)
}, },
restore(msg: { sessionID: string; agent: string; model: ModelKey }) { restore(msg: { sessionID: string; agent: string; model: ModelKey }) {