@@ -610,6 +610,14 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
610610 } )
611611 // altimate_change end
612612
613+ // altimate_change start — models explicitly picked during this launch (`--model`, picker,
614+ // cycle, favorite). A stale keyless-Zen selection is repaired to Base only when it is not one
615+ // of these, so switching conversations or agents cannot reroute a deliberate choice. See R8
616+ // for restarts. Declared before `fallbackModel`, which reads it as soon as it is created.
617+ const [ explicitPicks , setExplicitPicks ] = createStore < Record < string , true > > ( { } )
618+ const pickKey = ( model : { providerID : string ; modelID : string } ) => `${ model . providerID } /${ model . modelID } `
619+ // altimate_change end
620+
613621 const fallbackModel = createMemo ( ( ) => { // altimate_change
614622 const explicit = explicitFallbackModel ( ) // altimate_change — declared above
615623 if ( explicit ) return explicit // altimate_change
@@ -644,7 +652,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
644652 if ( ! isModelValid ( item ) ) continue
645653 if ( baseAvailable ) {
646654 const provider = sync . data . provider . find ( ( candidate ) => candidate . id === item . providerID )
647- if ( provider && isPublicZenProvider ( provider ) ) continue
655+ if ( provider && isPublicZenProvider ( provider ) && ! explicitPicks [ pickKey ( item ) ] ) continue
648656 }
649657 return item
650658 }
@@ -680,16 +688,11 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
680688 // `--model`/config `model` (see `explicitFallbackModel` above `fallbackModel()`). Each
681689 // candidate is checked in the SAME priority order this memo used before; only the two
682690 // implicit branches route through `substituteStaleZen`.
683- // Models explicitly picked during this launch (`--model`, picker, cycle, favorite). A stale
684- // keyless-Zen selection is repaired to Base only when it is not one of these, so switching
685- // conversations and back cannot reroute a deliberate choice. See R8 for restarts.
686- const [ explicitPicks , setExplicitPicks ] = createStore < Record < string , true > > ( { } )
687- const pickKey = ( model : { providerID : string ; modelID : string } ) => `${ model . providerID } /${ model . modelID } `
688691
689692 function substituteStaleZen ( model : { providerID : string ; modelID : string } | undefined ) {
690693 if ( ! model ) return model
691694 const provider = sync . data . provider . find ( ( candidate ) => candidate . id === model . providerID )
692- if ( provider && isPublicZenProvider ( provider ) && isModelValid ( ALTIMATE_BASE_MODEL ) ) {
695+ if ( provider && isPublicZenProvider ( provider ) && isModelValid ( ALTIMATE_BASE_MODEL ) && ! explicitPicks [ pickKey ( model ) ] ) {
693696 return { ...ALTIMATE_BASE_MODEL }
694697 }
695698 return model
@@ -700,7 +703,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
700703
701704 const persistedAgentPick = a ? modelStore . model [ a . name ] : undefined
702705 if ( persistedAgentPick && isModelValid ( persistedAgentPick ) )
703- return explicitPicks [ pickKey ( persistedAgentPick ) ] ? persistedAgentPick : substituteStaleZen ( persistedAgentPick )
706+ return substituteStaleZen ( persistedAgentPick )
704707
705708 const agentConfiguredModel = a ?. model
706709 if ( agentConfiguredModel && isModelValid ( agentConfiguredModel ) ) return agentConfiguredModel
0 commit comments