@@ -267,24 +267,23 @@ export interface ParsedOpenCodeModelSlug {
267267 readonly modelID : string ;
268268}
269269
270- export type OpenCodeVariantCache = Map < string , ReadonlySet < string > | undefined > ;
270+ export interface OpenCodeCatalogModel {
271+ readonly variants : ReadonlySet < string > ;
272+ readonly contextWindow : number | undefined ;
273+ }
271274
272- export const resolveOpenCodeVariant = Effect . fnUntraced ( function * (
275+ export type OpenCodeVariantCache = Map < string , OpenCodeCatalogModel | undefined > ;
276+
277+ /** The model's catalog entry; a failed read returns undefined and is not cached. */
278+ export const readOpenCodeCatalogModel = Effect . fnUntraced ( function * (
273279 client : OpencodeClient ,
274- model : ParsedOpenCodeModelSlug | undefined ,
275- variant : string | undefined ,
280+ model : ParsedOpenCodeModelSlug ,
276281 abortSignal ?: AbortSignal ,
277282 cache ?: OpenCodeVariantCache ,
278283) {
279- if ( ! variant || ! model ) return variant ;
280-
281284 const key = `${ model . providerID } /${ model . modelID } ` ;
282- const cached = cache ?. get ( key ) ;
283- if ( cache ?. has ( key ) ) {
284- return cached !== undefined && ! cached . has ( variant ) ? undefined : variant ;
285- }
285+ if ( cache ?. has ( key ) ) return cache . get ( key ) ;
286286
287- // Only a confirmed catalog mismatch can invalidate a persisted selection.
288287 const response = yield * runOpenCodeSdk ( "provider.list" , ( signal ) =>
289288 client . provider . list ( undefined , {
290289 signal : abortSignal ? AbortSignal . any ( [ signal , abortSignal ] ) : signal ,
@@ -293,16 +292,30 @@ export const resolveOpenCodeVariant = Effect.fnUntraced(function* (
293292 Effect . timeout ( "10 seconds" ) ,
294293 Effect . orElseSucceed ( ( ) => undefined ) ,
295294 ) ;
296- if ( response ?. data === undefined ) return variant ;
295+ if ( response ?. data === undefined ) return undefined ;
297296
298297 const catalogModel = response . data . all . find ( ( provider ) => provider . id === model . providerID )
299298 ?. models [ model . modelID ] ;
300- const variants = catalogModel ? new Set ( Object . keys ( catalogModel . variants ?? { } ) ) : undefined ;
301- if ( cache !== undefined ) {
302- // Keep only this model's names; provider.list can return several megabytes.
303- cache . set ( key , variants ) ;
304- }
305- return variants !== undefined && ! variants . has ( variant ) ? undefined : variant ;
299+ const entry : OpenCodeCatalogModel | undefined = catalogModel && {
300+ variants : new Set ( Object . keys ( catalogModel . variants ?? { } ) ) ,
301+ contextWindow : catalogModel . limit ?. input ?? catalogModel . limit ?. context ,
302+ } ;
303+ // Keep only what this model needs; provider.list can return several megabytes.
304+ cache ?. set ( key , entry ) ;
305+ return entry ;
306+ } ) ;
307+
308+ export const resolveOpenCodeVariant = Effect . fnUntraced ( function * (
309+ client : OpencodeClient ,
310+ model : ParsedOpenCodeModelSlug | undefined ,
311+ variant : string | undefined ,
312+ abortSignal ?: AbortSignal ,
313+ cache ?: OpenCodeVariantCache ,
314+ ) {
315+ if ( ! variant || ! model ) return variant ;
316+ // Only a confirmed catalog mismatch can invalidate a persisted selection.
317+ const entry = yield * readOpenCodeCatalogModel ( client , model , abortSignal , cache ) ;
318+ return entry !== undefined && ! entry . variants . has ( variant ) ? undefined : variant ;
306319} ) ;
307320
308321export interface OpenCodeSkill {
0 commit comments