feat(hooks): remove max attempts limit from useWithRetry hook

BrunoQuaresma · claude · BrunoQuaresma · commit 000f0e4458ea · 2025-07-03T18:13:37.000Z
Remove the MAX_ATTEMPTS constant and associated logic to allow unlimited retry attempts. The hook now retries indefinitely with exponential backoff (capped at 10 minutes delay) until the operation succeeds or is cancelled. Update tests to verify the new unlimited retry behavior while maintaining all existing functionality like cancellation, cleanup, and proper state management. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/site/src/hooks/useWithRetry.test.ts b/site/src/hooks/useWithRetry.test.ts
@@ -96,7 +96,7 @@ describe("useWithRetry", () => {
 		expect(result.current.retryAt).toBe(undefined);
 	});
 
-	it("should stop retrying after max attempts (10)", async () => {
+	it("should continue retrying without limit", async () => {
 		mockFn.mockRejectedValue(new Error("Always fails"));
 
 		const { result } = renderHook(() => useWithRetry(mockFn));
@@ -110,18 +110,19 @@ describe("useWithRetry", () => {
 		expect(result.current.isLoading).toBe(false);
 		expect(result.current.retryAt).not.toBe(null);
 
-		// Fast-forward through all retries
-		for (let i = 1; i < 10; i++) {
+		// Fast-forward through multiple retries to verify it continues
+		for (let i = 1; i < 15; i++) {
 			const delay = Math.min(1000 * 2 ** (i - 1), 600000); // exponential backoff with max delay
 			await act(async () => {
 				jest.advanceTimersByTime(delay);
 			});
 			expect(mockFn).toHaveBeenCalledTimes(i + 1);
+			expect(result.current.isLoading).toBe(false);
+			expect(result.current.retryAt).not.toBe(null);
 		}
 
-		// After 10 attempts, should stop retrying
-		expect(result.current.isLoading).toBe(false);
-		expect(result.current.retryAt).toBe(undefined);
+		// Should still be retrying after 15 attempts
+		expect(result.current.retryAt).not.toBe(null);
 	});
 
 	it("should respect max delay of 10 minutes", async () => {
@@ -158,7 +159,15 @@ describe("useWithRetry", () => {
 
 		expect(mockFn).toHaveBeenCalledTimes(10);
 		expect(result.current.isLoading).toBe(false);
-		expect(result.current.retryAt).toBe(undefined);
+		expect(result.current.retryAt).not.toBe(null);
+
+		// Continue with more retries at max delay to verify it continues indefinitely
+		await act(async () => {
+			jest.advanceTimersByTime(600000);
+		});
+
+		expect(mockFn).toHaveBeenCalledTimes(11);
+		expect(result.current.retryAt).not.toBe(null);
 	});
 
 	it("should cancel previous retry when call is invoked again", async () => {
diff --git a/site/src/hooks/useWithRetry.ts b/site/src/hooks/useWithRetry.ts
@@ -1,6 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from "react";
 
-const MAX_ATTEMPTS = 10;
 const DELAY_MS = 1_000;
 const MAX_DELAY_MS = 600_000; // 10 minutes
 // Determines how much the delay between retry attempts increases after each
@@ -49,31 +48,21 @@ export function useWithRetry(fn: () => Promise<void>): UseWithRetryResult {
 				await fn();
 				setState({ isLoading: false, retryAt: undefined, attemptCount: 0 });
 			} catch (error) {
-				// Since attempts start from 0, we need to add +1 to make the condition work
-				// This ensures exactly MAX_ATTEMPTS total attempts (attempt 0, 1, 2, ..., 9)
-				if (attempt + 1 < MAX_ATTEMPTS) {
-					const delayMs = Math.min(
-						DELAY_MS * MULTIPLIER ** attempt,
-						MAX_DELAY_MS,
-					);
+				const delayMs = Math.min(
+					DELAY_MS * MULTIPLIER ** attempt,
+					MAX_DELAY_MS,
+				);
 
-					setState((prev) => ({
-						...prev,
-						isLoading: false,
-						retryAt: new Date(Date.now() + delayMs),
-					}));
+				setState((prev) => ({
+					...prev,
+					isLoading: false,
+					retryAt: new Date(Date.now() + delayMs),
+				}));
 
-					timeoutRef.current = window.setTimeout(() => {
-						setState((prev) => ({ ...prev, retryAt: undefined }));
-						executeAttempt(attempt + 1);
-					}, delayMs);
-				} else {
-					setState((prev) => ({
-						...prev,
-						isLoading: false,
-						retryAt: undefined,
-					}));
-				}
+				timeoutRef.current = window.setTimeout(() => {
+					setState((prev) => ({ ...prev, retryAt: undefined }));
+					executeAttempt(attempt + 1);
+				}, delayMs);
 			}
 		};
 
