@@ -599,30 +599,26 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
599599 cause : unknown ,
600600 version : string | null = null ,
601601 phase : "version" | "inventory" = "version" ,
602- installedVersion ?: string | null ,
603602 ) => {
604603 const failure = formatOpenCodeProbeError ( {
605604 cause,
606605 isExternalServer,
607606 phase,
608607 serverUrl : openCodeSettings . serverUrl ,
609608 } ) ;
610- return {
611- ...buildServerProvider ( {
612- presentation : OPENCODE_PRESENTATION ,
613- enabled : openCodeSettings . enabled ,
614- checkedAt,
615- models : providerModelsFromSettings ( [ ] , customModels , DEFAULT_OPENCODE_MODEL_CAPABILITIES ) ,
616- probe : {
617- installed : failure . installed ,
618- version,
619- status : "error" ,
620- auth : { status : "unknown" } ,
621- message : failure . message ,
622- } ,
623- } ) ,
624- ...( installedVersion !== undefined ? { installedVersion } : { } ) ,
625- } ;
609+ return buildServerProvider ( {
610+ presentation : OPENCODE_PRESENTATION ,
611+ enabled : openCodeSettings . enabled ,
612+ checkedAt,
613+ models : providerModelsFromSettings ( [ ] , customModels , DEFAULT_OPENCODE_MODEL_CAPABILITIES ) ,
614+ probe : {
615+ installed : failure . installed ,
616+ version,
617+ status : "error" ,
618+ auth : { status : "unknown" } ,
619+ message : failure . message ,
620+ } ,
621+ } ) ;
626622 } ;
627623
628624 if ( ! openCodeSettings . enabled ) {
@@ -659,7 +655,6 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
659655 if ( probed . generation === "v2" ) {
660656 return yield * checkOpenCode2 ( openCodeSettings , probed . version , checkedAt , loadOpenCode2Models ) ;
661657 }
662- let version : string | null = probed . version ;
663658 if ( compareSemverVersions ( probed . version , OpenCodeRuntime . MINIMUM_OPENCODE_VERSION ) < 0 ) {
664659 return buildServerProvider ( {
665660 presentation : OPENCODE_PRESENTATION ,
@@ -676,22 +671,23 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
676671 } ) ;
677672 }
678673
679- const loadInventory = ( server : {
674+ const installedVersion = isExternalServer ? { } : { installedVersion : probed . version } ;
675+ let version = probed . version ;
676+ const loadInventory = Effect . fnUntraced ( function * ( server : {
680677 readonly url : string ;
681678 readonly serverPassword ?: string ;
682679 readonly version : string ;
683- } ) => {
680+ } ) {
681+ // Preserve the helper's version even when its inventory request fails.
684682 version = server . version ;
685- return openCodeRuntime
686- . loadOpenCodeInventory (
687- openCodeRuntime . createOpenCodeSdkClient ( {
688- baseUrl : server . url ,
689- directory : cwd ,
690- ...( server . serverPassword !== undefined ? { serverPassword : server . serverPassword } : { } ) ,
691- } ) ,
692- )
693- . pipe ( Effect . map ( ( inventory ) => ( { inventory, version : server . version } ) ) ) ;
694- } ;
683+ return yield * openCodeRuntime . loadOpenCodeInventory (
684+ openCodeRuntime . createOpenCodeSdkClient ( {
685+ baseUrl : server . url ,
686+ directory : cwd ,
687+ ...( server . serverPassword !== undefined ? { serverPassword : server . serverPassword } : { } ) ,
688+ } ) ,
689+ ) ;
690+ } ) ;
695691 const inventoryEffect = isExternalServer
696692 ? openCodeRuntime
697693 . connectToOpenCodeServer ( {
@@ -716,33 +712,27 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
716712 ) ,
717713 ) ;
718714 if ( inventoryExit . _tag === "Failure" ) {
719- return fallback (
720- Cause . squash ( inventoryExit . cause ) ,
721- version ,
722- "inventory" ,
723- isExternalServer ? undefined : probed . version ,
724- ) ;
715+ return {
716+ ...fallback ( Cause . squash ( inventoryExit . cause ) , version , "inventory" ) ,
717+ ...installedVersion ,
718+ } ;
725719 }
726720
727- version = inventoryExit . value . version ;
728-
729721 const models = providerModelsFromSettings (
730- flattenOpenCodeModels ( inventoryExit . value . inventory ) ,
722+ flattenOpenCodeModels ( inventoryExit . value ) ,
731723 customModels ,
732724 DEFAULT_OPENCODE_MODEL_CAPABILITIES ,
733725 ) ;
734- const skills = openCodeSkillsToServerProviderSkills ( inventoryExit . value . inventory . skills ) ;
735- const connectedCount = inventoryExit . value . inventory . providerList . connected . length ;
726+ const skills = openCodeSkillsToServerProviderSkills ( inventoryExit . value . skills ) ;
727+ const connectedCount = inventoryExit . value . providerList . connected . length ;
736728 return {
737729 ...buildServerProvider ( {
738730 presentation : OPENCODE_PRESENTATION ,
739731 enabled : true ,
740732 checkedAt,
741733 models,
742734 skills,
743- slashCommands : openCodeCommandsToServerProviderSlashCommands (
744- inventoryExit . value . inventory . commands ,
745- ) ,
735+ slashCommands : openCodeCommandsToServerProviderSlashCommands ( inventoryExit . value . commands ) ,
746736 probe : {
747737 installed : true ,
748738 version,
@@ -759,6 +749,6 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
759749 : "OpenCode is available, but it did not report any connected upstream providers." ,
760750 } ,
761751 } ) ,
762- ...( ! isExternalServer ? { installedVersion : probed . version } : { } ) ,
752+ ...installedVersion ,
763753 } ;
764754} ) ;
0 commit comments