@@ -42,6 +42,7 @@ import { DeepMutable } from "effect/Types";
4242import {
4343 createModelSelection ,
4444 draftModelPickMatchesThread ,
45+ normalizeCustomModelSlug ,
4546 normalizeModelSlug ,
4647} from "@t3tools/shared/model" ;
4748import { AsyncResult , Atom , type AtomRegistry } from "effect/reactivity" ;
@@ -990,7 +991,11 @@ function normalizeModelSelection(
990991 const driverKindHint =
991992 normalizeProviderDriverKind ( candidate ?. provider ?? legacy ?. provider ) ??
992993 ProviderDriverKind . make ( "codex" ) ;
993- const model = normalizeModelSlug ( rawModel , driverKindHint ) ;
994+ // Instance-scoped picks are already resolved slugs; a custom slug can match a static alias.
995+ const model =
996+ candidate ?. instanceId === undefined
997+ ? normalizeModelSlug ( rawModel , driverKindHint )
998+ : normalizeCustomModelSlug ( rawModel ) ;
994999 if ( ! model ) {
9951000 return null ;
9961001 }
@@ -3051,7 +3056,7 @@ const composerDraftStore = create<ComposerDraftStoreState>()(
30513056 }
30523057 const instanceKey = options ?. instanceId ?? defaultInstanceIdForDriver ( normalizedProvider ) ;
30533058 const fallbackModel =
3054- normalizeModelSlug ( options ?. model , normalizedProvider ) ??
3059+ normalizeCustomModelSlug ( options ?. model ) ??
30553060 DEFAULT_MODEL_BY_PROVIDER [ normalizedProvider ] ??
30563061 DEFAULT_MODEL ;
30573062 const providerOpts =
@@ -3083,8 +3088,7 @@ const composerDraftStore = create<ComposerDraftStoreState>()(
30833088 nextStickyMap [ instanceKey ] ??
30843089 base . modelSelectionByProvider [ instanceKey ] ??
30853090 createModelSelection ( instanceKey , fallbackModel ) ;
3086- const rememberedModel =
3087- normalizeModelSlug ( options ?. model , normalizedProvider ) ?? stickyBase . model ;
3091+ const rememberedModel = normalizeCustomModelSlug ( options ?. model ) ?? stickyBase . model ;
30883092 if ( providerOpts ) {
30893093 nextStickyMap [ instanceKey ] = createModelSelection (
30903094 instanceKey ,
0 commit comments