diff --git a/apps/web/src/components/ProviderUpdateLaunchNotification.logic.test.ts b/apps/web/src/components/ProviderUpdateLaunchNotification.logic.test.ts index 764a76ba74f12..29e7e5125f4ed 100644 --- a/apps/web/src/components/ProviderUpdateLaunchNotification.logic.test.ts +++ b/apps/web/src/components/ProviderUpdateLaunchNotification.logic.test.ts @@ -274,6 +274,59 @@ describe("provider update launch notification logic", () => { title: "Claude v1.1.0 update failed", }); }); + + it("does not count an already dismissed success again when another provider updates", () => { + const claudeUpdated = provider({ + driver: driver("claudeAgent"), + version: "1.1.0", + latestVersion: "1.1.0", + advisoryStatus: "current", + updateState: { + status: "succeeded", + startedAt: checkedAt, + finishedAt: checkedAt, + message: "Provider updated.", + output: null, + }, + }); + const claudeView = getProviderUpdateSidebarPillView([claudeUpdated], { + visibleAfterIso: sessionStartedAt, + }); + expect(claudeView).toMatchObject({ title: "Claude updated: v1.1.0" }); + + const bothUpdated = [ + claudeUpdated, + provider({ + driver: driver("codex"), + version: "1.2.0", + latestVersion: "1.2.0", + advisoryStatus: "current", + updateState: { + status: "succeeded", + startedAt: laterCheckedAt, + finishedAt: laterCheckedAt, + message: "Provider updated.", + output: null, + }, + }), + ]; + const codexView = getProviderUpdateSidebarPillView(bothUpdated, { + visibleAfterIso: sessionStartedAt, + dismissedKeys: new Set(claudeView?.dismissKeys), + }); + expect(codexView).toMatchObject({ tone: "success", title: "Codex updated: v1.2.0" }); + + const groupedView = getProviderUpdateSidebarPillView(bothUpdated, { + visibleAfterIso: sessionStartedAt, + }); + expect(groupedView).toMatchObject({ title: "2 providers updated" }); + expect( + getProviderUpdateSidebarPillView(bothUpdated, { + visibleAfterIso: sessionStartedAt, + dismissedKeys: new Set(groupedView?.dismissKeys), + }), + ).toBeNull(); + }); }); it("does not offer incompatible latest versions and restores suggestions after policy relaxation", () => { diff --git a/apps/web/src/components/ProviderUpdateLaunchNotification.logic.ts b/apps/web/src/components/ProviderUpdateLaunchNotification.logic.ts index 9c94c4854d0c3..b57ceb38a6f33 100644 --- a/apps/web/src/components/ProviderUpdateLaunchNotification.logic.ts +++ b/apps/web/src/components/ProviderUpdateLaunchNotification.logic.ts @@ -39,6 +39,7 @@ export interface ProviderUpdateSidebarPillView { readonly description: string; readonly dismissible?: boolean; readonly dismissAfterVisibleMs?: number; + readonly dismissKeys?: ReadonlyArray; } interface ProviderUpdateSidebarPillOptions { @@ -355,6 +356,15 @@ function latestFinishedAtForProviders(providers: ReadonlyArray): }, null); } +function terminalUpdateKey(provider: ServerProvider): string { + return `${provider.updateState?.status}:${provider.driver}:${provider.updateState?.finishedAt ?? "pending"}:${provider.updateState?.message ?? ""}`; +} + +function terminalPillIdentity(providers: ReadonlyArray) { + const dismissKeys = providers.map(terminalUpdateKey).toSorted(); + return { key: dismissKeys.join("|"), dismissKeys }; +} + /** Use each driver's latest finished instance so an older default-instance result cannot hide it. */ function latestTerminalProvidersByDriver(providers: ReadonlyArray) { const latestProviderByDriver = new Map(); @@ -412,7 +422,7 @@ export function getProviderUpdateSidebarPillView( const recentTerminalProviders = latestTerminalProvidersByDriver( providers.filter((provider) => isRecentTerminalProvider(provider, options?.visibleAfterIso)), - ); + ).filter((provider) => !options?.dismissedKeys?.has(terminalUpdateKey(provider))); const terminalCandidates: ProviderUpdateSidebarPillView[] = []; const failedProviders = recentTerminalProviders.filter( @@ -421,13 +431,7 @@ export function getProviderUpdateSidebarPillView( if (failedProviders.length > 0) { const failedProvider = failedProviders[0]!; terminalCandidates.push({ - key: `failed:${failedProviders - .map( - (provider) => - `${provider.driver}:${provider.updateState?.finishedAt ?? "pending"}:${provider.updateState?.message ?? ""}`, - ) - .toSorted() - .join("|")}`, + ...terminalPillIdentity(failedProviders), tone: "error", title: failedProviders.length === 1 @@ -451,13 +455,7 @@ export function getProviderUpdateSidebarPillView( const unchangedProviderName = PROVIDER_DISPLAY_NAMES[unchangedProvider.driver] ?? unchangedProvider.driver; terminalCandidates.push({ - key: `unchanged:${unchangedProviders - .map( - (provider) => - `${provider.driver}:${provider.updateState?.finishedAt ?? "pending"}:${provider.updateState?.message ?? ""}`, - ) - .toSorted() - .join("|")}`, + ...terminalPillIdentity(unchangedProviders), tone: "warning", title: unchangedProviders.length === 1 @@ -490,13 +488,7 @@ export function getProviderUpdateSidebarPillView( if (succeededProviders.length > 0) { const succeededProvider = succeededProviders[0]!; terminalCandidates.push({ - key: `succeeded:${succeededProviders - .map( - (provider) => - `${provider.driver}:${provider.updateState?.finishedAt ?? "pending"}:${provider.updateState?.message ?? ""}`, - ) - .toSorted() - .join("|")}`, + ...terminalPillIdentity(succeededProviders), tone: "success", title: succeededProviders.length === 1 @@ -533,7 +525,7 @@ export function getProviderUpdateSidebarPillView( const rightFinishedAt = latestFinishedAtForProviders(rightProviders) ?? ""; return rightFinishedAt.localeCompare(leftFinishedAt); }) - .find((candidate) => !options?.dismissedKeys?.has(candidate.key)) ?? null + .at(0) ?? null ); } diff --git a/apps/web/src/components/sidebar/SidebarProviderUpdatePill.tsx b/apps/web/src/components/sidebar/SidebarProviderUpdatePill.tsx index e710762041f6a..5ca319587792d 100644 --- a/apps/web/src/components/sidebar/SidebarProviderUpdatePill.tsx +++ b/apps/web/src/components/sidebar/SidebarProviderUpdatePill.tsx @@ -52,7 +52,7 @@ export function SidebarProviderUpdatePill() { const [renderedView, setRenderedView] = useState(null); const [pendingView, setPendingView] = useState(null); const [exitingKey, setExitingKey] = useState(null); - const [dismissAfterExitKey, setDismissAfterExitKey] = useState(null); + const [dismissAfterExitKeys, setDismissAfterExitKeys] = useState>([]); const [visibleAfterIso, setVisibleAfterIso] = useState(); const effectiveVisibleAfterIso = visibleAfterIso ?? latestProviderCheckedAt(providers); const view = getProviderUpdateSidebarPillView( @@ -84,14 +84,14 @@ export function SidebarProviderUpdatePill() { const startExit = ( key: string, nextView: ProviderUpdateSidebarPillView | null, - dismissKey?: string, + dismissKeys: ReadonlyArray = [], ) => { if (exitingKey === key) { return; } setPendingView(nextView); setExitingKey(key); - setDismissAfterExitKey(dismissKey ?? null); + setDismissAfterExitKeys(dismissKeys); }; if (exitingKey === null) { @@ -106,16 +106,18 @@ export function SidebarProviderUpdatePill() { } } - const exitAfterVisible = useEffectEvent((key: string) => startExit(key, null, key)); + const exitAfterVisible = useEffectEvent((key: string) => + startExit(key, null, displayedView?.dismissKeys), + ); const finishExit = useEffectEvent(() => { - if (dismissAfterExitKey !== null) { - setDismissedKeys((previous) => new Set(previous).add(dismissAfterExitKey)); + if (dismissAfterExitKeys.length > 0) { + setDismissedKeys((previous) => new Set([...previous, ...dismissAfterExitKeys])); } setRenderedView(pendingView); setPendingView(null); setExitingKey(null); - setDismissAfterExitKey(null); + setDismissAfterExitKeys([]); }); // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- fallback timer that finishes the exit if the CSS transition never ends @@ -203,7 +205,7 @@ export function SidebarProviderUpdatePill() { type="button" aria-label={gt("Dismiss provider update notice")} className="relative z-[1] mr-1 flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-md opacity-70 outline-none hover:opacity-100 focus-visible:opacity-100 focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring" - onClick={() => startExit(displayedView.key, null, displayedView.key)} + onClick={() => startExit(displayedView.key, null, displayedView.dismissKeys)} >