@@ -10,6 +10,7 @@ import { Integration } from "./integration.js"
1010import { Capabilities , ID , Info , Model , Ref , VariantID } from "./model.js"
1111import type { RuntimeInfo } from "./model.js"
1212import { Npm } from "@opencode/util/npm"
13+ import { contextSelection , isModelVariantAvailable } from "@opencode/util/model-variant"
1314import { Provider } from "./provider.js"
1415
1516export class VariantUnavailableError extends Schema . TaggedError < VariantUnavailableError > ( ) (
@@ -140,20 +141,41 @@ export const withVariant = (
140141) : Effect . Effect < Info , VariantUnavailableError > => {
141142 const id = variantID === "default" ? undefined : variantID
142143 const variant = model . variants ?. find ( ( item ) => item . id === id )
143- if ( ! variant && id !== undefined )
144+ if (
145+ id !== undefined &&
146+ ! isModelVariantAvailable (
147+ id ,
148+ model . variants . map ( ( item ) => item . id ) ,
149+ ! ! model . context ,
150+ )
151+ )
144152 return Effect . fail (
145153 new VariantUnavailableError ( {
146154 providerID : model . providerID ,
147155 modelID : model . id ,
148156 variant : id ,
149157 } ) ,
150158 )
151- const effort = model . context && id && / @ ( d e f a u l t | l o n g ) $ / . test ( id ) ? id . slice ( 0 , id . lastIndexOf ( "@" ) ) : undefined
159+ const selection = contextSelection ( id )
160+ const effort = model . context && id && / @ ( d e f a u l t | l o n g ) $ / . test ( id ) ? selection . effort : undefined
152161 const base = effort ? model . variants . find ( ( item ) => item . id === effort ) : undefined
153- const budget = model . context ?. [ id ?. endsWith ( "@long" ) ? "long" : "default" ]
162+ const budget = model . context ?. [ selection . tier ]
154163 const input = budget === undefined ? undefined : Math . min ( budget , model . limit . input ?? budget )
164+ if ( base && / @ ( d e f a u l t | l o n g ) $ / . test ( base . id ) )
165+ return withVariant ( model , base . id ) . pipe (
166+ Effect . map ( ( resolved ) => ( {
167+ ...resolved ,
168+ limit :
169+ input === undefined
170+ ? model . limit
171+ : { ...model . limit , input, context : Math . min ( model . limit . context , input + model . limit . output ) } ,
172+ settings : Provider . mergeOverlay ( resolved . settings , Provider . modelSettings ( variant ?. settings ) ) ,
173+ headers : Provider . mergeHeaders ( resolved . headers , variant ?. headers ) ,
174+ body : Provider . mergeOverlay ( resolved . body , variant ?. body ) ,
175+ } ) ) ,
176+ )
155177 return Effect . succeed (
156- variant
178+ variant || base
157179 ? {
158180 ...model ,
159181 ...( input === undefined
@@ -163,10 +185,10 @@ export const withVariant = (
163185 } ) ,
164186 settings : Provider . mergeOverlay (
165187 Provider . mergeOverlay ( model . settings , Provider . modelSettings ( base ?. settings ) ) ,
166- Provider . modelSettings ( variant . settings ) ,
188+ Provider . modelSettings ( variant ? .settings ) ,
167189 ) ,
168- headers : Provider . mergeHeaders ( Provider . mergeHeaders ( model . headers , base ?. headers ) , variant . headers ) ,
169- body : Provider . mergeOverlay ( Provider . mergeOverlay ( model . body , base ?. body ) , variant . body ) ,
190+ headers : Provider . mergeHeaders ( Provider . mergeHeaders ( model . headers , base ?. headers ) , variant ? .headers ) ,
191+ body : Provider . mergeOverlay ( Provider . mergeOverlay ( model . body , base ?. body ) , variant ? .body ) ,
170192 }
171193 : input === undefined
172194 ? model
0 commit comments