@@ -498,10 +498,13 @@ const catalogFingerprint = (models: ReadonlyArray<OpenCode2Model>) =>
498498 . join ( "\n" ) ;
499499
500500/** A cold server can list a partial catalog; two agreeing reads reduce that startup race. */
501- const settleOpenCode2Catalog = < E > ( list : Effect . Effect < ReadonlyArray < OpenCode2Model > , E > ) =>
501+ const settleOpenCode2Catalog = < E > (
502+ list : Effect . Effect < ReadonlyArray < OpenCode2Model > , E > ,
503+ first ?: ReadonlyArray < OpenCode2Model > ,
504+ ) =>
502505 Effect . suspend ( ( ) => {
503- let previous : string | undefined ;
504- return list . pipe (
506+ let previous = first && first . length > 0 ? catalogFingerprint ( first ) : undefined ;
507+ return ( first ? Effect . delay ( list , "250 millis" ) : list ) . pipe (
505508 Effect . repeat ( {
506509 until : ( models ) => {
507510 const fingerprint = models . length > 0 ? catalogFingerprint ( models ) : undefined ;
@@ -523,17 +526,23 @@ export const makeOpenCode2ModelLoader = <E>(
523526 let lastLoaded : ReadonlyArray < OpenCode2Model > = [ ] ;
524527 return Effect . suspend ( ( ) => {
525528 let latest : ReadonlyArray < OpenCode2Model > = [ ] ;
526- return settleOpenCode2Catalog (
527- list . pipe (
528- Effect . tap ( ( models ) =>
529- Effect . sync ( ( ) => {
530- if ( models . length > 0 ) latest = models ;
531- } ) ,
529+ const tracked = list . pipe (
530+ Effect . tap ( ( models ) =>
531+ Effect . sync ( ( ) => {
532+ if ( models . length > 0 ) latest = models ;
533+ } ) ,
534+ ) ,
535+ ) ;
536+ // The first read can include a cold server start, so only settling shares the budget.
537+ return tracked . pipe (
538+ Effect . flatMap ( ( first ) =>
539+ settleOpenCode2Catalog ( tracked , first ) . pipe (
540+ Effect . timeoutOption ( OPENCODE_2_CATALOG_SETTLE_TIMEOUT ) ,
532541 ) ,
533542 ) ,
534- ) . pipe (
535- Effect . catch ( ( error ) => ( latest . length > 0 ? Effect . succeed ( latest ) : Effect . fail ( error ) ) ) ,
536- Effect . timeoutOption ( OPENCODE_2_CATALOG_SETTLE_TIMEOUT ) ,
543+ Effect . catch ( ( error ) =>
544+ latest . length > 0 ? Effect . succeedSome ( latest ) : Effect . fail ( error ) ,
545+ ) ,
537546 Effect . map ( ( loaded ) => {
538547 // Fresh progress may still be partial, but a warm cache must not freeze slow catalogs.
539548 if ( loaded . _tag === "Some" ) lastLoaded = loaded . value ;
0 commit comments