lifecycle

Author: Sg312

apps/desktop/src/main/index.ts

@@ -22,6 +22,7 @@ import {
   attachSessionLifecycle,
   decideStartRoute,
   handleConnectIntercept,
+  resolveStartRoute,
   tearDownSession,
 } from '@/main/session-lifecycle'
 import { createLauncherShortcutManager } from '@/main/shortcuts'
@@ -48,6 +49,7 @@ function main(): void {
   const preloadPath = join(__dirname, 'preload.cjs')
 
   let mainWindow: BrowserWindow | null = null
+  let mainWindowCreation: Promise<void> | null = null
   let loadHealth: LoadHealthHandle | null = null
   let tray: TrayHandle | null = null
   let updater: UpdaterHandle | null = null
@@ -132,8 +134,29 @@ function main(): void {
   }
 
   async function createAndLoadMainWindow(): Promise<void> {
+    if (mainWindowCreation) {
+      await mainWindowCreation
+      return
+    }
+    const pending = performCreateAndLoadMainWindow()
+    mainWindowCreation = pending
+    try {
+      await pending
+    } finally {
+      if (mainWindowCreation === pending) {
+        mainWindowCreation = null
+      }
+    }
+  }
+
+  async function performCreateAndLoadMainWindow(): Promise<void> {
     const origin = appOrigin()
     const ses = configureSessionForOrigin(origin)
+    const requestedRoute = decideStartRoute(config.get('lastRoute'))
+    const route = await resolveStartRoute(ses, origin, requestedRoute)
+    if (route !== requestedRoute) {
+      config.set('lastRoute', route)
+    }
     const win = createMainWindow({
       config,
       events,
@@ -163,7 +186,7 @@ function main(): void {
     })
     loadHealth = attachLoadHealth(win, {
       offlinePagePath: OFFLINE_PAGE,
-      getStartUrl: () => `${appOrigin()}${decideStartRoute(config.get('lastRoute'))}`,
+      getStartUrl: () => `${appOrigin()}${route}`,
       isOnline: () => net.isOnline(),
       events,
     })
@@ -178,7 +201,6 @@ function main(): void {
       onReauthRequested: () => void authFlow.beginLoginHandoff(),
     })
     loadHealth.startWatchdog()
-    const route = decideStartRoute(config.get('lastRoute'))
     // Fire-and-forget: the window and all its handlers are wired synchronously
     // above, so callers get a usable window immediately and the app menu and
     // updater never wait on the remote page's load (load-health surfaces any

apps/desktop/src/main/session-lifecycle.test.ts

@@ -8,6 +8,7 @@ import {
   isLogoutNavigation,
   isSessionCookieName,
   probeSession,
+  resolveStartRoute,
   tearDownSession,
 } from '@/main/session-lifecycle'
 
@@ -58,6 +59,53 @@ describe('decideStartRoute', () => {
   })
 })
 
+describe('resolveStartRoute', () => {
+  it('restores an accessible saved workspace route', async () => {
+    const session = sessionWithResponse(200, { workspace: { id: 'ws1' } })
+
+    await expect(resolveStartRoute(session, APP, '/workspace/ws1/home')).resolves.toBe(
+      '/workspace/ws1/home'
+    )
+    expect(vi.mocked(session.fetch)).toHaveBeenCalledWith(
+      `${APP}/api/workspaces/ws1/host-context`,
+      expect.objectContaining({ cache: 'no-store' })
+    )
+  })
+
+  it('falls back to the workspace picker after confirmed access denial', async () => {
+    const session = sessionWithResponse(403, { error: 'Workspace access denied' })
+
+    await expect(resolveStartRoute(session, APP, '/workspace/revoked/chat/c1')).resolves.toBe(
+      '/workspace'
+    )
+  })
+
+  it('does not probe routes without a workspace id', async () => {
+    const session = sessionWithResponse(200, {})
+
+    await expect(resolveStartRoute(session, APP, '/workspace')).resolves.toBe('/workspace')
+    expect(session.fetch).not.toHaveBeenCalled()
+  })
+
+  it('preserves the saved route on auth, server, and network failures', async () => {
+    await expect(
+      resolveStartRoute(sessionWithResponse(401, {}), APP, '/workspace/ws1/home')
+    ).resolves.toBe('/workspace/ws1/home')
+    await expect(
+      resolveStartRoute(sessionWithResponse(500, {}), APP, '/workspace/ws1/home')
+    ).resolves.toBe('/workspace/ws1/home')
+
+    const failing = {
+      fetch: vi.fn(async () => {
+        throw new Error('offline')
+      }),
+    } as unknown as Session
+    await expect(resolveStartRoute(failing, APP, '/workspace/ws1/home')).resolves.toBe(
+      '/workspace/ws1/home'
+    )
+  })
+})
+
 describe('probeSession', () => {
   it('reports valid when a session or user is present', async () => {
     await expect(probeSession(sessionWithResponse(200, { user: { id: 'u1' } }), APP)).resolves.toBe(

apps/desktop/src/main/session-lifecycle.ts

@@ -9,6 +9,7 @@ const logger = createLogger('DesktopSessionLifecycle')
 
 const EXPIRY_PROMPT_COOLDOWN_MS = 30_000
 const SESSION_PROBE_TIMEOUT_MS = 5000
+const START_ROUTE_PROBE_TIMEOUT_MS = 1500
 const TEARDOWN_COOLDOWN_MS = 3000
 
 const CLEARED_STORAGES = [
@@ -63,6 +64,57 @@ export function decideStartRoute(lastRoute: string | undefined): string {
   return '/workspace'
 }
 
+function workspaceIdFromRoute(route: string): string | null {
+  try {
+    const pathname = new URL(route, 'https://internal.invalid').pathname
+    const match = /^\/workspace\/([^/]+)/.exec(pathname)
+    return match ? decodeURIComponent(match[1]) : null
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Validates a workspace-specific saved route before Desktop restores it.
+ * Only a confirmed 403 discards the route; auth, network, timeout, and server
+ * failures preserve normal web-app recovery instead of masquerading as a
+ * revoked workspace.
+ */
+export async function resolveStartRoute(
+  session: Session,
+  origin: string,
+  lastRoute: string | undefined,
+  timeoutMs: number = START_ROUTE_PROBE_TIMEOUT_MS
+): Promise<string> {
+  const route = decideStartRoute(lastRoute)
+  const workspaceId = workspaceIdFromRoute(route)
+  if (!workspaceId) {
+    return route
+  }
+
+  const controller = new AbortController()
+  const timer = setTimeout(() => controller.abort(), timeoutMs)
+  try {
+    const response = await session.fetch(
+      `${origin}/api/workspaces/${encodeURIComponent(workspaceId)}/host-context`,
+      {
+        signal: controller.signal,
+        headers: { accept: 'application/json' },
+        cache: 'no-store',
+      }
+    )
+    if (response.status === 403) {
+      logger.info('Saved workspace route is no longer accessible; opening workspace picker')
+      return '/workspace'
+    }
+    return route
+  } catch {
+    return route
+  } finally {
+    clearTimeout(timer)
+  }
+}
+
 /**
  * Checks whether the partition currently holds a valid session by asking
  * better-auth's get-session endpoint with the partition's cookies. Network