@@ -75,12 +75,12 @@ const DevinModelsListJson = Schema.Struct({
7575
7676const decodeDevinModelsListJson = Schema . decodeResult ( Schema . fromJsonString ( DevinModelsListJson ) ) ;
7777
78- export function parseDevinModelsListJson ( output : string ) : ReadonlyArray < ServerProviderModel > {
79- const decoded = decodeDevinModelsListJson ( output ) ;
80- if ( Result . isFailure ( decoded ) ) return [ ] ;
78+ function devinModelsFromDecodedList (
79+ decoded : typeof DevinModelsListJson . Type ,
80+ ) : ServerProviderModel [ ] {
8181 const seen = new Set < string > ( ) ;
8282 const models : ServerProviderModel [ ] = [ ] ;
83- for ( const family of decoded . success . families ?? [ ] ) {
83+ for ( const family of decoded . families ?? [ ] ) {
8484 for ( const variant of family . variants ?? [ ] ) {
8585 const slug = variant . model_uid . trim ( ) ;
8686 if ( ! slug || seen . has ( slug ) ) continue ;
@@ -102,6 +102,11 @@ export function parseDevinModelsListJson(output: string): ReadonlyArray<ServerPr
102102 return models ;
103103}
104104
105+ export function parseDevinModelsListJson ( output : string ) : ReadonlyArray < ServerProviderModel > {
106+ const decoded = decodeDevinModelsListJson ( output ) ;
107+ return Result . isFailure ( decoded ) ? [ ] : devinModelsFromDecodedList ( decoded . success ) ;
108+ }
109+
105110export interface DevinAuthStatus {
106111 /** True or false when the CLI printed a verdict, null when unparseable. */
107112 readonly authenticated : boolean | null ;
@@ -295,14 +300,17 @@ export const checkDevinProviderStatus = Effect.fn("checkDevinProviderStatus")(fu
295300 Effect . result ,
296301 )
297302 : undefined ;
298- // A failed or skipped listing keeps the previous catalog; a successful
299- // listing (even an empty one) replaces it.
300- const modelsFetched =
303+ // A failed, skipped, or undecodable listing keeps the previous catalog; a
304+ // decoded listing (even an empty one) replaces it.
305+ const decodedModels =
301306 modelsResult !== undefined &&
302307 Result . isSuccess ( modelsResult ) &&
303308 Option . isSome ( modelsResult . success ) &&
304- modelsResult . success . value . code === 0 ;
305- const models = modelsFetched ? parseDevinModelsListJson ( modelsResult . success . value . stdout ) : [ ] ;
309+ modelsResult . success . value . code === 0
310+ ? decodeDevinModelsListJson ( modelsResult . success . value . stdout )
311+ : undefined ;
312+ const modelsFetched = decodedModels !== undefined && Result . isSuccess ( decodedModels ) ;
313+ const models = modelsFetched ? devinModelsFromDecodedList ( decodedModels . success ) : [ ] ;
306314
307315 return {
308316 installed : true ,
0 commit comments