Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix: advance session generation when team restore fails
Josuéad96d437864f
diff --git a/desktop-app/src/__tests__/appService.teamTransitionOwnership.test.ts b/desktop-app/src/__tests__/appService.teamTransitionOwnership.test.tsindex c24339d6c..69f1d9b56 100644--- a/desktop-app/src/__tests__/appService.teamTransitionOwnership.test.ts+++ b/desktop-app/src/__tests__/appService.teamTransitionOwnership.test.ts@@ -303,6 +303,51 @@ describe('AppService deliberate team transition ownership', () => {expect(app.getSessionGeneration()).toBe(sessionGeneration)})+ it('advances session generation when a failed restore leaves the borrowed team active', async () => {+ const { service } = await createNativeCommitTestHarness()+ const meA = {+ id: 'user-a',+ email: '[email protected]',+ name: 'User A',+ picture: null,+ teamId: 'team-a',+ teamName: 'Team A',+ role: 'member',+ }+ const meB = { ...meA, teamId: 'team-b', teamName: 'Team B' }+ const app = service as unknown as {+ authClient: unknown+ me: { teamId: string } | null+ sessionToken: string | null+ readWorkflow(ns: string, name: string): Promise<unknown>+ workflowTeamByKey: Map<string, string>+ workflowKey(ns: string, name: string): string+ getSessionGeneration(): number+ }+ let currentTeamId = 'team-a'+ app.authClient = {+ googleLogin: vi.fn().mockResolvedValue({ token: 'synthetic-session-a', me: meA }),+ switchTeam: vi.fn(async (_token: string, teamId: string) => {+ if (teamId === 'team-a' && currentTeamId === 'team-b') {+ throw new Error('restore rejected')+ }+ currentTeamId = teamId+ return { token: `session-${teamId}`, team: { id: teamId, name: teamId, role: 'member' } }+ }),+ getMe: vi.fn(async () => (currentTeamId === 'team-a' ? meA : meB)),+ readWorkflow: vi.fn().mockResolvedValue({ workflow: 'result' }),+ }+ await service.googleLogin('synthetic-google-token')+ app.workflowTeamByKey.set(app.workflowKey('team-a', 'flow-a'), 'team-b')+ const previousGeneration = app.getSessionGeneration()++ await expect(app.readWorkflow('team-a', 'flow-a')).rejects.toThrow('restore rejected')++ expect(app.me?.teamId).toBe('team-b')+ expect(app.sessionToken).toBe('session-team-b')+ expect(app.getSessionGeneration()).toBe(previousGeneration + 1)+ })+it('rejects a stale handoff generation after a public login advances the session', async () => {const { service, runtimeConfig, optionA } = await createNativeCommitTestHarness()const app = service as unknown as {diff --git a/desktop-app/src/appService.ts b/desktop-app/src/appService.tsindex ee223f329..02a8e432c 100644--- a/desktop-app/src/appService.ts+++ b/desktop-app/src/appService.ts@@ -1346,7 +1346,10 @@ export class AppService {const originalTeamId = context.teamIdconst shouldRestore = Boolean(originalTeamId)let restoredOriginalTeam = false- let operationError: unknown+ let operationFailed = false+ let restoreFailed = false+ let restoreFailure: unknown+ let hopSessionToken: string | null = nullconst releaseTransientHop = this.enterGfsTransientTeamHop()if (shouldRestore) this.chatStoreHomeTeamId = originalTeamId@@ -1354,11 +1357,12 @@ export class AppService {const activeToken = await this.switchSessionToTeam(targetTeamId, originalToken, {advanceSessionGeneration: false,})+ hopSessionToken = activeTokentry {return await operation(activeToken)} catch (error) {- operationError = error+ operationFailed = truethrow error} finally {if (shouldRestore) {@@ -1368,11 +1372,14 @@ export class AppService {})restoredOriginalTeam = true} catch (restoreError) {- if (!operationError) throw restoreError- console.warn(- '[AppService] Failed to restore team context after operation:',- restoreError- )+ restoreFailed = true+ restoreFailure = restoreError+ if (operationFailed) {+ console.warn(+ '[AppService] Failed to restore team context after operation:',+ restoreError+ )+ }}}if (restoredOriginalTeam && this.sessionToken) {@@ -1380,15 +1387,21 @@ export class AppService {this.restartEntityChangeStreamForSessionReplacement()} else if (shouldRestore &&- this.sessionToken &&+ hopSessionToken &&+ this.sessionToken === hopSessionToken &&this.me &&- this.me.teamId !== originalTeamId+ String(this.me.teamId || '').trim() !== originalTeamId) {// A failed restore leaves the hop team as the actual committed- // session. Rebind the stream to the token that remains active.+ // session. Publish it as a new session before releasing the owner,+ // then rebind session-scoped consumers to the token that remains.+ if (this.sessionGeneration === context.sessionGeneration) {+ this.sessionGeneration += 1+ }this.updateEntityChangeSessionToken(this.sessionToken)this.restartEntityChangeStreamForSessionReplacement()}+ if (restoreFailed && !operationFailed) throw restoreFailure}} finally {if (shouldRestore) {