Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix: verify saved handoff before success feedback (R10-L3)
Josué74a9b555a194
diff --git a/desktop-app/ui/src/hooks/domain/__tests__/useAuthController.desktopEnvironment.test.tsx b/desktop-app/ui/src/hooks/domain/__tests__/useAuthController.desktopEnvironment.test.tsxindex 483e3e378..f11479e8c 100644--- a/desktop-app/ui/src/hooks/domain/__tests__/useAuthController.desktopEnvironment.test.tsx+++ b/desktop-app/ui/src/hooks/domain/__tests__/useAuthController.desktopEnvironment.test.tsx@@ -57,6 +57,8 @@ let desktopSetupTokenListener:let confirmDesktopEnvironmentSetupForTest: (() => Promise<void>) | null = nulllet confirmDesktopEnvironmentSwitchForTest: (() => void) | null = nulllet cancelDesktopEnvironmentSwitchForTest: (() => void) | null = null+let selectRuntimeConfigForTest: ((id: string) => Promise<DesktopRuntimeConfigState | null>) | null =+ nulllet setBootingForTest: ((value: boolean) => void) | null = nulllet setAuthenticatedForTest: ((value: boolean) => void) | null = nulllet runtimeConfigModule: typeof import('../../../../../src/config') | null = null@@ -77,6 +79,7 @@ function Probe() {confirmDesktopEnvironmentSetupForTest = auth.handleConfirmDesktopEnvironmentSetupconfirmDesktopEnvironmentSwitchForTest = auth.handleConfirmDesktopEnvironmentSwitchConfirmationcancelDesktopEnvironmentSwitchForTest = auth.handleCancelDesktopEnvironmentSwitchConfirmation+ selectRuntimeConfigForTest = auth.handleSelectRuntimeConfigreturn (<>@@ -92,6 +95,12 @@ function Probe() {{auth.pendingDesktopEnvironmentSetup?.rpcProxyBaseUrl || 'none'}</div><div data-testid="setup-complete">{auth.desktopEnvironmentSetupComplete ? 'yes' : 'no'}</div>+ <div data-testid="active-environment">+ {auth.runtimeConfigState?.activeOptionId || 'none'}+ </div>+ <div data-testid="active-rest">+ {auth.runtimeConfigState?.currentConfig?.externalRestApiBaseUrl || 'none'}+ </div></>)}@@ -126,6 +135,7 @@ beforeEach(async () => {confirmDesktopEnvironmentSetupForTest = nullconfirmDesktopEnvironmentSwitchForTest = nullcancelDesktopEnvironmentSwitchForTest = null+ selectRuntimeConfigForTest = nullsetBootingForTest = nullsetAuthenticatedForTest = nullruntimeConfigModule = null@@ -308,6 +318,7 @@ describe('Desktop environment handoff', () => {expect(nativeAppService!.getCachedUserId()).toBe('new-user')expect(mocks.loadSession).not.toHaveBeenCalled()expect(screen.getByTestId('pending-environment')).toHaveTextContent('none')+ expect(mocks.setStatus.mock.calls.filter(([, tone]) => tone === 'success')).toEqual([])expect(mocks.setStatus).toHaveBeenLastCalledWith('The desktop session changed while processing this link. Open it again.','info'@@ -336,6 +347,12 @@ describe('Desktop environment handoff', () => {})await act(async () => confirmDesktopEnvironmentSetupForTest?.())expect(screen.getByTestId('pending-environment')).toHaveTextContent('none')+ expect(mocks.selectRuntimeConfigForHandoff).toHaveBeenCalledOnce()+ expect(mocks.loadSession).toHaveBeenCalledOnce()+ expect(nativeAppService!.getRuntimeConfigState().currentConfig?.externalRestApiBaseUrl).toBe(+ linked.externalRestApiBaseUrl+ )+ expect(mocks.setStatus.mock.calls.filter(([, tone]) => tone === 'success')).toEqual([])expect(mocks.setStatus).toHaveBeenLastCalledWith('Could not verify the desktop session. Try opening the link again.','error'@@ -669,12 +686,91 @@ describe('Desktop environment handoff', () => {expect(mocks.clearQueryCache).toHaveBeenCalledOnce()expect(mocks.loadSession).toHaveBeenCalledWith({ preserveNav: true })expect(screen.getByTestId('pending-environment')).toHaveTextContent('none')- expect(mocks.setStatus).toHaveBeenCalledWith(- expect.stringContaining('Environment selected: Example tenant'),- 'success',- undefined,- { global: false, toast: true }+ expect(nativeAppService!.getRuntimeConfigState().activeOptionId).toBe(targetOptionId)+ expect(screen.getByTestId('active-rest')).toHaveTextContent(+ `${targetEnvironment.externalRestApiBaseUrl}/api/v1`+ )+ expect(mocks.setStatus.mock.calls.filter(([, tone]) => tone === 'success')).toEqual([+ [+ 'Environment selected: Example tenant (api.example.test).',+ 'success',+ undefined,+ { global: false, toast: true },+ ],+ ])+ })++ it('preserves successful manual selection feedback through the native producer', async () => {+ render(<Probe />)+ await waitFor(() => expect(screen.getByTestId('configuration-loaded')).toHaveTextContent('yes'))+ const targetOptionId = await savedTargetOptionId()+ mocks.selectRuntimeConfig.mockImplementationOnce(id =>+ nativeAppService!.selectRuntimeConfig(id)+ )+ mocks.setStatus.mockClear()++ await act(async () => {+ await selectRuntimeConfigForTest?.(targetOptionId)+ })++ expect(nativeAppService!.getRuntimeConfigState().activeOptionId).toBe(targetOptionId)+ expect(screen.getByTestId('active-environment')).toHaveTextContent(targetOptionId)+ expect(mocks.clearQueryCache).toHaveBeenCalledOnce()+ expect(mocks.selectRuntimeConfigForHandoff).not.toHaveBeenCalled()+ expect(mocks.setStatus.mock.calls.filter(([, tone]) => tone === 'success')).toEqual([+ [+ 'Environment selected: Example tenant (api.example.test).',+ 'success',+ undefined,+ { global: false, toast: true },+ ],+ ])+ })++ it('retains a verified native selection when subsequent session loading fails', async () => {+ render(<Probe />)+ await waitFor(() => expect(screen.getByTestId('configuration-loaded')).toHaveTextContent('yes'))+ const targetOptionId = await savedTargetOptionId()+ mocks.loadSession.mockRejectedValueOnce(new Error('fixture session unavailable'))++ await dispatchDesktopEnvironmentLink({+ ...targetEnvironment,+ externalRestApiBaseUrl: `${targetEnvironment.externalRestApiBaseUrl}/api/v1`,+ })++ expect(nativeAppService!.getRuntimeConfigState().activeOptionId).toBe(targetOptionId)+ expect(mocks.selectRuntimeConfigForHandoff).toHaveBeenCalledOnce()+ expect(mocks.setStatus.mock.calls.filter(([, tone]) => tone === 'success')).toHaveLength(1)+ expect(mocks.setStatus).toHaveBeenLastCalledWith(+ 'Could not load the selected desktop environment: fixture session unavailable',+ 'error'+ )+ expect(screen.getByTestId('pending-environment')).toHaveTextContent('none')+ })++ it('rejects a handoff response selecting a different native profile', async () => {+ render(<Probe />)+ await waitFor(() => expect(screen.getByTestId('configuration-loaded')).toHaveTextContent('yes'))+ const otherOptionId = nativeAppService!.getRuntimeConfigState().activeOptionId+ if (!otherOptionId) throw new Error('The config producer did not return the active profile')+ mocks.selectRuntimeConfigForHandoff.mockImplementationOnce((_id, generation) =>+ nativeAppService!.selectRuntimeConfigForHandoff(otherOptionId, generation)+ )+ mocks.loadSession.mockClear()++ await dispatchDesktopEnvironmentLink({+ ...targetEnvironment,+ externalRestApiBaseUrl: `${targetEnvironment.externalRestApiBaseUrl}/api/v1`,+ })++ expect(nativeAppService!.getRuntimeConfigState().activeOptionId).toBe(otherOptionId)+ expect(mocks.loadSession).not.toHaveBeenCalled()+ expect(mocks.setStatus.mock.calls.filter(([, tone]) => tone === 'success')).toEqual([])+ expect(mocks.setStatus).toHaveBeenLastCalledWith(+ 'Failed to switch environment: Selected desktop environment does not match the requested saved profile.',+ 'error')+ expect(screen.getByTestId('pending-environment')).toHaveTextContent('none')})it('does not load a saved environment when generation changes after selection', async () => {@@ -712,6 +808,8 @@ describe('Desktop environment handoff', () => {)expect(mocks.loadSession).not.toHaveBeenCalled()expect(screen.getByTestId('pending-environment')).toHaveTextContent('none')+ expect(nativeAppService!.getRuntimeConfigState().activeOptionId).toBe(otherOption.id)+ expect(mocks.setStatus.mock.calls.filter(([, tone]) => tone === 'success')).toEqual([])expect(mocks.setStatus).toHaveBeenCalledWith('The desktop session changed while processing this link. Open it again.','info'@@ -885,12 +983,18 @@ describe('Desktop environment handoff', () => {expect((await runtimeConfigModule!.getDesktopRuntimeConfigState()).activeOptionId).toBe(savedOption.id)- expect(mocks.setStatus).toHaveBeenCalledWith(- expect.stringContaining(`Environment selected: ${linkedEnvironment.appName}`),- 'success',- undefined,- { global: false, toast: true }+ expect(screen.getByTestId('active-environment')).toHaveTextContent(savedOption.id)+ expect(screen.getByTestId('active-rest')).toHaveTextContent(+ linkedEnvironment.externalRestApiBaseUrl)+ expect(mocks.setStatus.mock.calls.filter(([, tone]) => tone === 'success')).toEqual([+ [+ 'Environment selected: New tenant (new-api.example.test).',+ 'success',+ undefined,+ { global: false, toast: true },+ ],+ ])})it('keeps the exact active REST profile when a same-origin sibling appears before confirmation', async () => {diff --git a/desktop-app/ui/src/hooks/domain/desktopEnvironmentHandoff.ts b/desktop-app/ui/src/hooks/domain/desktopEnvironmentHandoff.tsindex 43f49b84c..9a903ba49 100644--- a/desktop-app/ui/src/hooks/domain/desktopEnvironmentHandoff.ts+++ b/desktop-app/ui/src/hooks/domain/desktopEnvironmentHandoff.ts@@ -13,6 +13,19 @@ import type { DesktopEnvironmentSwitchConfirmation, SetStatusFn } from './types'const LOCALHOST_OPTION_ID = '__localhost__'+export function reportDesktopEnvironmentSelected(+ state: DesktopRuntimeConfigState,+ setStatus: SetStatusFn+) {+ const selected = state.options.find(option => option.id === state.activeOptionId)+ setStatus(+ selected ? `Environment selected: ${selected.label}.` : 'Environment selected.',+ 'success',+ undefined,+ { global: false, toast: true }+ )+}+type DesktopEnvironmentHandoffState = {booting: booleanbusy: boolean@@ -398,6 +411,7 @@ export function createDesktopEnvironmentSetupHandler({reportAuthenticationStateChanged(authState, setStatus, setPendingDesktopEnvironmentSetup)return}+ reportDesktopEnvironmentSelected(selection.runtimeConfigState, setStatus)try {await onSessionNeedsLoad({ preserveNav: true })} catch (error) {diff --git a/desktop-app/ui/src/hooks/domain/useAuthController.ts b/desktop-app/ui/src/hooks/domain/useAuthController.tsindex addde9c05..43f84a844 100644--- a/desktop-app/ui/src/hooks/domain/useAuthController.ts+++ b/desktop-app/ui/src/hooks/domain/useAuthController.ts@@ -13,6 +13,7 @@ import type {import type { Tone } from '../../uiTypes'import {createDesktopEnvironmentSetupHandler,+ reportDesktopEnvironmentSelected,resolveDesktopEnvironmentRestMatch,} from './desktopEnvironmentHandoff'import type { DesktopEnvironmentSwitchConfirmation, SetStatusFn } from './types'@@ -405,25 +406,15 @@ export function useAuthController({}}- const applySelectedRuntimeConfigState = useCallback(- (state: DesktopRuntimeConfigState) => {- // Switching environment (pre-login) must not carry another env's cached- // queries forward (spec §5.2 P1). The env is bound to login (D4: no switch- // without logout), so a full clear is sufficient — no per-env query keys.- desktopQueryClient.clear()- setRuntimeConfigState(state)- setDesktopSetupAuthorizationToken('')- setDesktopSetupStarted(false)- const selected = state.options.find(option => option.id === state.activeOptionId)- setStatus(- selected ? `Environment selected: ${selected.label}.` : 'Environment selected.',- 'success',- undefined,- { global: false, toast: true }- )- },- [setStatus]- )+ const applySelectedRuntimeConfigState = useCallback((state: DesktopRuntimeConfigState) => {+ // Switching environment (pre-login) must not carry another env's cached+ // queries forward (spec §5.2 P1). The env is bound to login (D4: no switch+ // without logout), so a full clear is sufficient — no per-env query keys.+ desktopQueryClient.clear()+ setRuntimeConfigState(state)+ setDesktopSetupAuthorizationToken('')+ setDesktopSetupStarted(false)+ }, [])const handleSelectRuntimeConfig = useCallback(async (optionId: string): Promise<DesktopRuntimeConfigState | null> => {@@ -432,6 +423,7 @@ export function useAuthController({setBackendSwitchHint(null)const state = await window.clerum.auth.selectRuntimeConfig(optionId)applySelectedRuntimeConfigState(state)+ reportDesktopEnvironmentSelected(state, setStatus)return state} catch (error) {setStatus(@@ -459,6 +451,11 @@ export function useAuthController({expectedSessionGeneration)applySelectedRuntimeConfigState(selection.runtimeConfigState)+ if (selection.runtimeConfigState.activeOptionId !== optionId) {+ throw new Error(+ 'Selected desktop environment does not match the requested saved profile.'+ )+ }return selection} catch (error) {const message = error instanceof Error ? error.message : String(error)@@ -702,6 +699,7 @@ export function useAuthController({return}setPendingDesktopEnvironmentSetup(null)+ reportDesktopEnvironmentSelected(selection.runtimeConfigState, setStatus)try {await onSessionNeedsLoad({ preserveNav: true })} catch (error) {