diff --git a/apps/desktop/src/app/settings/connections-registry.test.tsx b/apps/desktop/src/app/settings/connections-registry.test.tsx index e6cf553fbc..6a5b4007f7 100644 --- a/apps/desktop/src/app/settings/connections-registry.test.tsx +++ b/apps/desktop/src/app/settings/connections-registry.test.tsx @@ -2,6 +2,7 @@ import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/re import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { DesktopConnectionsRegistry } from '@/global' +import { _resetFleetRosterForTests, refreshFleetRoster } from '@/store/fleet-roster' import { $connection } from '@/store/session' import { @@ -68,6 +69,21 @@ afterEach(() => { }) describe('ConnectionsRegistrySection', () => { + it('refreshes a cached roster immediately after a successful connection test', async () => { + _resetFleetRosterForTests() + const getAgentRoster = vi.fn().mockResolvedValue({ agents: [], sources: [] }) + Object.assign(window.hermesDesktop!, { getAgentRoster }) + + try { + await refreshFleetRoster() + render() + await screen.findByText('Homelab') + fireEvent.click(screen.getAllByRole('button', { name: /^test$/i })[0]) + await waitFor(() => expect(getAgentRoster).toHaveBeenCalledTimes(2)) + } finally { + _resetFleetRosterForTests() + } + }) it('distinguishes the current connection from the registry primary', async () => { render() diff --git a/apps/desktop/src/app/settings/connections-registry.tsx b/apps/desktop/src/app/settings/connections-registry.tsx index 3cfdbfe963..8ae3056dd2 100644 --- a/apps/desktop/src/app/settings/connections-registry.tsx +++ b/apps/desktop/src/app/settings/connections-registry.tsx @@ -35,6 +35,7 @@ import { } from '@/lib/icons' import { coerceRemoteUrlScheme } from '@/lib/remote-url' import { $activeConnectionId, setConnectionsRegistry } from '@/store/connections' +import { refreshFleetRoster } from '@/store/fleet-roster' import { notify, notifyError } from '@/store/notifications' import { EmptyState, ListRow, Pill, SectionHeading, ToggleRow } from './primitives' @@ -552,6 +553,9 @@ export function ConnectionsRegistrySection() { if (reachable) { notify({ title: conn.label, message: s.testOk }) + // A successful Test may have warmed a cold OAuth session that the + // roster missed; explicit recovery should bypass its cache window. + void refreshFleetRoster({ force: true }) } else { notifyError(new Error(result.error || conn.label), s.testFailed) } diff --git a/apps/desktop/src/store/fleet-roster.test.ts b/apps/desktop/src/store/fleet-roster.test.ts new file mode 100644 index 0000000000..d44c8a1705 --- /dev/null +++ b/apps/desktop/src/store/fleet-roster.test.ts @@ -0,0 +1,77 @@ +import { afterEach, describe, expect, it, vi } from 'vitest' + +import type { DesktopAgentRoster } from '@/global' + +import { $fleetRoster, _resetFleetRosterForTests, refreshFleetRoster } from './fleet-roster' + +afterEach(() => { + _resetFleetRosterForTests() + vi.unstubAllGlobals() + vi.useRealTimers() +}) + +const unreachable: DesktopAgentRoster = { + agents: [], + sources: [{ connectionId: 'lab', label: 'Lab', kind: 'remote', reachable: false, error: 'timed out' }] +} + +const recovered: DesktopAgentRoster = { + agents: [{ connectionId: 'lab', connectionLabel: 'Lab', connectionKind: 'remote', profile: 'default', handle: 'default' }], + sources: [{ connectionId: 'lab', label: 'Lab', kind: 'remote', reachable: true }] +} + +describe('fleet roster recovery', () => { + it('queues one fresh enumeration when recovery overlaps an older request', async () => { + let finish!: (roster: DesktopAgentRoster) => void + const pending = new Promise(resolve => { finish = resolve }) + const getAgentRoster = vi.fn().mockReturnValueOnce(pending).mockResolvedValue(recovered) + vi.stubGlobal('window', { hermesDesktop: { getAgentRoster } }) + + const initial = refreshFleetRoster() + const recovery = refreshFleetRoster({ force: true }) + const repeated = refreshFleetRoster({ force: true }) + expect(getAgentRoster).toHaveBeenCalledTimes(1) + finish(unreachable) + await Promise.all([initial, recovery, repeated]) + expect(getAgentRoster).toHaveBeenCalledTimes(2) + expect($fleetRoster.get()).toBe(recovered) + }) + it('keeps on-demand sources cached but lets explicit recovery bypass the cooldown', async () => { + vi.useFakeTimers() + const onDemand: DesktopAgentRoster = { + agents: [], + sources: [{ connectionId: 'ssh', label: 'Box', kind: 'ssh', reachable: false, error: 'connect-on-demand' }] + } + const getAgentRoster = vi.fn().mockResolvedValueOnce(onDemand).mockResolvedValue(recovered) + vi.stubGlobal('window', { hermesDesktop: { getAgentRoster } }) + + await refreshFleetRoster() + await vi.advanceTimersByTimeAsync(5_000) + await refreshFleetRoster() + expect(getAgentRoster).toHaveBeenCalledTimes(1) + + await refreshFleetRoster({ force: true }) + expect(getAgentRoster).toHaveBeenCalledTimes(2) + expect($fleetRoster.get()).toBe(recovered) + }) + + it('retries incomplete rosters before the normal stale window without a focus-event hot loop', async () => { + vi.useFakeTimers() + const getAgentRoster = vi.fn().mockResolvedValueOnce(unreachable).mockResolvedValue(recovered) + vi.stubGlobal('window', { hermesDesktop: { getAgentRoster } }) + + await refreshFleetRoster() + await refreshFleetRoster() + expect(getAgentRoster).toHaveBeenCalledTimes(1) + expect($fleetRoster.get()).toBe(unreachable) + + await vi.advanceTimersByTimeAsync(5_000) + await Promise.all([refreshFleetRoster(), refreshFleetRoster()]) + expect(getAgentRoster).toHaveBeenCalledTimes(2) + expect($fleetRoster.get()).toBe(recovered) + + await vi.advanceTimersByTimeAsync(5_000) + await refreshFleetRoster() + expect(getAgentRoster).toHaveBeenCalledTimes(2) + }) +}) diff --git a/apps/desktop/src/store/fleet-roster.ts b/apps/desktop/src/store/fleet-roster.ts index 9669fdfd0b..86bc27a7bc 100644 --- a/apps/desktop/src/store/fleet-roster.ts +++ b/apps/desktop/src/store/fleet-roster.ts @@ -11,9 +11,12 @@ import type { DesktopAgentRoster } from '@/global' export const $fleetRoster = atom(null) const FLEET_ROSTER_STALE_MS = 60_000 +// Focus/mount may retry a partial result sooner, but never on every event. +const FLEET_ROSTER_RETRY_MS = 5_000 let fetchedAt = 0 let inflight: null | Promise = null +let forcedRefresh: null | Promise = null export async function refreshFleetRoster(options: { force?: boolean } = {}): Promise { const bridge = window.hermesDesktop?.getAgentRoster @@ -22,11 +25,25 @@ export async function refreshFleetRoster(options: { force?: boolean } = {}): Pro return } - if (!options.force && $fleetRoster.get() && Date.now() - fetchedAt < FLEET_ROSTER_STALE_MS) { + const current = $fleetRoster.get() + const incomplete = current?.sources.some(source => !source.reachable && source.error !== 'connect-on-demand') + const staleMs = incomplete ? FLEET_ROSTER_RETRY_MS : FLEET_ROSTER_STALE_MS + + if (!options.force && current && Date.now() - fetchedAt < staleMs) { return } if (inflight) { + if (options.force) { + forcedRefresh ??= inflight.then(() => { + forcedRefresh = null + + return refreshFleetRoster({ force: true }) + }) + + return forcedRefresh + } + return inflight } @@ -52,4 +69,5 @@ export function _resetFleetRosterForTests(): void { $fleetRoster.set(null) fetchedAt = 0 inflight = null + forcedRefresh = null }