@@ -78,11 +78,12 @@ function dedupeProvidersByDriver<T extends ServerProvider>(providers: ReadonlyAr
7878 return [ ...latestProviderByDriver . values ( ) ] ;
7979}
8080
81- function getProviderUpdatedTitle ( provider : Pick < ServerProvider , "driver" | "version" > ) : string {
81+ function getProviderUpdatedTitle (
82+ provider : Pick < ServerProvider , "driver" | "version" | "installedVersion" > ,
83+ ) : string {
8284 const providerName = PROVIDER_DISPLAY_NAMES [ provider . driver ] ?? provider . driver ;
83- return provider . version
84- ? `${ providerName } updated: ${ formatVersion ( provider . version ) } `
85- : `${ providerName } updated` ;
85+ const version = provider . installedVersion ?? provider . version ;
86+ return version ? `${ providerName } updated: ${ formatVersion ( version ) } ` : `${ providerName } updated` ;
8687}
8788
8889function getProviderUpdatedDescription ( providerCount : number ) : string {
@@ -200,7 +201,8 @@ export interface ProviderUpdateRun {
200201export function getProviderUpdateRunOutcome (
201202 run : ProviderUpdateRun ,
202203) :
203- | { readonly status : "interrupted" | "updated" }
204+ | { readonly status : "interrupted" }
205+ | { readonly status : "updated" ; readonly message : string | null }
204206 | { readonly status : "failed" ; readonly line : string } {
205207 if ( isAtomCommandInterrupted ( run . result ) ) return { status : "interrupted" } ;
206208 const label = `${ run . machineLabel } · ${ PROVIDER_DISPLAY_NAMES [ run . driver ] ?? run . driver } ` ;
@@ -215,7 +217,7 @@ export function getProviderUpdateRunOutcome(
215217 ( provider ) => provider . instanceId === run . instanceId ,
216218 ) ?. updateState ;
217219 return updateState ?. status === "succeeded"
218- ? { status : "updated" }
220+ ? { status : "updated" , message : updateState . message }
219221 : {
220222 status : "failed" ,
221223 line : `${ label } : ${ updateState ?. message ?? "Provider update did not finish." } ` ,
@@ -236,11 +238,18 @@ export function getProviderUpdateRunToastView(runs: ReadonlyArray<ProviderUpdate
236238 const failureLines = settled . flatMap ( ( outcome ) =>
237239 outcome . status === "failed" ? [ outcome . line ] : [ ] ,
238240 ) ;
241+ const successMessages = [
242+ ...new Set (
243+ settled . flatMap ( ( outcome ) =>
244+ outcome . status === "updated" && outcome . message ? [ outcome . message ] : [ ] ,
245+ ) ,
246+ ) ,
247+ ] ;
239248 if ( failureLines . length === 0 ) {
240249 return {
241250 type : "success" ,
242251 title : settled . length === 1 ? "Provider updated" : `${ settled . length } providers updated` ,
243- description : getProviderUpdatedDescription ( settled . length ) ,
252+ description : successMessages . join ( "\n" ) || getProviderUpdatedDescription ( settled . length ) ,
244253 } ;
245254 }
246255 return {
@@ -251,7 +260,7 @@ export function getProviderUpdateRunToastView(runs: ReadonlyArray<ProviderUpdate
251260 : settled . length === 1
252261 ? "Provider update failed"
253262 : "Provider updates failed" ,
254- description : failureLines . join ( "\n" ) ,
263+ description : [ ... failureLines , ... successMessages ] . join ( "\n" ) ,
255264 } ;
256265}
257266
@@ -398,7 +407,14 @@ export function getProviderUpdateSidebarPillView(
398407 succeededProviders . length === 1
399408 ? getProviderUpdatedTitle ( succeededProvider )
400409 : `${ succeededProviders . length } providers updated` ,
401- description : getProviderUpdatedDescription ( succeededProviders . length ) ,
410+ description :
411+ [
412+ ...new Set (
413+ succeededProviders . flatMap ( ( provider ) =>
414+ provider . updateState ?. message ? [ provider . updateState . message ] : [ ] ,
415+ ) ,
416+ ) ,
417+ ] . join ( "\n" ) || getProviderUpdatedDescription ( succeededProviders . length ) ,
402418 dismissAfterVisibleMs : PROVIDER_UPDATE_SUCCESS_VISIBLE_MS ,
403419 } ) ;
404420 }
0 commit comments