Skip to content

Commit d1e1f6c

Browse files
abdurahmon27claude
andcommitted
fix(web): sidebar update pill shows updates on non-default provider instances
Update state is recorded per provider instance, but the sidebar pill collapsed providers to one per driver (preferring the default instance) before looking for an update. A running or just-finished update on any other instance was dropped, so no pill appeared. Select the instances with an update first, then collapse by driver. Fixes #14715 Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
1 parent 99e0852 commit d1e1f6c

2 files changed

Lines changed: 85 additions & 4 deletions

File tree

‎apps/web/src/components/ProviderUpdateLaunchNotification.logic.test.ts‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,68 @@ describe("provider update launch notification logic", () => {
498498
});
499499
});
500500

501+
it("shows the active sidebar pill for an update on a non-default instance", () => {
502+
const view = getProviderUpdateSidebarPillView([
503+
provider({ driver: driver("claudeAgent") }),
504+
provider({
505+
driver: driver("claudeAgent"),
506+
instanceId: instanceId("claude_work"),
507+
updateState: {
508+
status: "running",
509+
startedAt: checkedAt,
510+
finishedAt: null,
511+
message: "Updating provider.",
512+
output: null,
513+
},
514+
}),
515+
]);
516+
517+
expect(view).toMatchObject({
518+
key: "loading:claudeAgent:running",
519+
tone: "loading",
520+
title: "Updating Claude",
521+
description: "Claude update in progress.",
522+
});
523+
});
524+
525+
it("shows the latest terminal sidebar pill across instances of a driver", () => {
526+
const view = getProviderUpdateSidebarPillView(
527+
[
528+
provider({
529+
driver: driver("claudeAgent"),
530+
updateState: {
531+
status: "failed",
532+
startedAt: checkedAt,
533+
finishedAt: checkedAt,
534+
message: "Update command exited with code 1.",
535+
output: null,
536+
},
537+
}),
538+
provider({
539+
driver: driver("claudeAgent"),
540+
instanceId: instanceId("claude_work"),
541+
version: "1.1.0",
542+
latestVersion: "1.1.0",
543+
advisoryStatus: "current",
544+
updateState: {
545+
status: "succeeded",
546+
startedAt: laterCheckedAt,
547+
finishedAt: laterCheckedAt,
548+
message: "Provider updated.",
549+
output: null,
550+
},
551+
}),
552+
],
553+
{ visibleAfterIso: sessionStartedAt },
554+
);
555+
556+
expect(view).toMatchObject({
557+
key: "succeeded:claudeAgent:2026-04-23T10:01:00.000Z:Provider updated.",
558+
tone: "success",
559+
title: "Claude updated: v1.1.0",
560+
});
561+
});
562+
501563
it("uses the provider name for single failed sidebar pill updates", () => {
502564
const view = getProviderUpdateSidebarPillView(
503565
[

‎apps/web/src/components/ProviderUpdateLaunchNotification.logic.ts‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,12 +448,31 @@ function latestFinishedAtForProviders(providers: ReadonlyArray<ServerProvider>):
448448
}, null);
449449
}
450450

451+
/**
452+
* Collapses terminal update states to the most recently finished instance per
453+
* driver, so an update on a non-default instance is not hidden behind an
454+
* older outcome on the driver's default instance.
455+
*/
456+
function latestTerminalProvidersByDriver(providers: ReadonlyArray<ServerProvider>) {
457+
const latestProviderByDriver = new Map<ProviderDriverKind, ServerProvider>();
458+
459+
for (const provider of providers) {
460+
const current = latestProviderByDriver.get(provider.driver);
461+
if (!current || (getUpdateFinishedAt(provider) ?? "") >= (getUpdateFinishedAt(current) ?? "")) {
462+
latestProviderByDriver.set(provider.driver, provider);
463+
}
464+
}
465+
466+
return [...latestProviderByDriver.values()];
467+
}
468+
451469
export function getProviderUpdateSidebarPillView(
452470
providers: ReadonlyArray<ServerProvider>,
453471
options?: ProviderUpdateSidebarPillOptions,
454472
): ProviderUpdateSidebarPillView | null {
455-
const dedupedProviders = dedupeProvidersByDriver(providers);
456-
const activeProviders = dedupedProviders.filter(isProviderUpdateActive);
473+
// Update state is recorded per instance, so pick the instances with an
474+
// update before collapsing to one entry per driver.
475+
const activeProviders = dedupeProvidersByDriver(providers.filter(isProviderUpdateActive));
457476
if (activeProviders.length > 0) {
458477
const activeProvider = activeProviders[0]!;
459478
const activeProviderName =
@@ -475,8 +494,8 @@ export function getProviderUpdateSidebarPillView(
475494
};
476495
}
477496

478-
const recentTerminalProviders = dedupedProviders.filter((provider) =>
479-
isRecentTerminalProvider(provider, options?.visibleAfterIso),
497+
const recentTerminalProviders = latestTerminalProvidersByDriver(
498+
providers.filter((provider) => isRecentTerminalProvider(provider, options?.visibleAfterIso)),
480499
);
481500
const terminalCandidates: ProviderUpdateSidebarPillView[] = [];
482501

0 commit comments

Comments
 (0)