From a2ccf200a9e9697f8ec013696d7adec2852670a3 Mon Sep 17 00:00:00 2001
From: webdevcody <webdevcody@gmail.com>
Date: Fri, 9 Jan 2026 23:56:47 -0500
Subject: [PATCH] feat: implement session verification with retry logic

- Enhanced session verification to include retry logic for handling network and timeout errors, particularly during server restarts.
- Introduced a maximum of 8 attempts with exponential backoff for retries, improving resilience in unstable network conditions.
- Updated logging to provide clearer feedback on session verification attempts and failures.

These changes enhance the application's reliability in maintaining user sessions, especially in environments with intermittent connectivity.
---
 apps/ui/src/routes/__root.tsx | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/apps/ui/src/routes/__root.tsx b/apps/ui/src/routes/__root.tsx
index c32f9326..ff842ad3 100644
--- a/apps/ui/src/routes/__root.tsx
+++ b/apps/ui/src/routes/__root.tsx
@@ -284,13 +284,36 @@ function RootLayoutContent() {
         // Initialize API key for Electron mode
         await initApiKey();
 
-        // 1. Verify session (Single Request, ALL modes)
+        // 1. Verify session with retry logic for server restarts
+        // verifySession() returns false for definitive auth failures (401/403)
+        // and throws for network/timeout errors (server might be restarting)
         let isValid = false;
-        try {
-          isValid = await verifySession();
-        } catch (error) {
-          logger.warn('Session verification failed (likely network/server issue):', error);
-          isValid = false;
+        const maxSessionAttempts = 8;
+        const baseSessionDelayMs = 500;
+
+        for (let attempt = 1; attempt <= maxSessionAttempts; attempt++) {
+          try {
+            isValid = await verifySession();
+            // If we get here, verifySession completed (returned true or false)
+            // false = definitive auth failure (401/403), no point retrying
+            break;
+          } catch (error) {
+            // Network/timeout error - server might be restarting
+            if (attempt === maxSessionAttempts) {
+              logger.warn(
+                `Session verification failed after ${maxSessionAttempts} attempts (server unavailable):`,
+                error
+              );
+              isValid = false;
+              break;
+            }
+
+            const delayMs = Math.min(2000, baseSessionDelayMs * attempt);
+            logger.info(
+              `Session verification failed (attempt ${attempt}/${maxSessionAttempts}), server may be restarting. Retrying in ${delayMs}ms...`
+            );
+            await new Promise((resolve) => setTimeout(resolve, delayMs));
+          }
         }
 
         if (isValid) {