From 4b1351c7b8dcd6a6ef3876f92a341c99e5e3228f Mon Sep 17 00:00:00 2001 From: PR Batch Tester Date: Thu, 22 Oct 2026 06:01:23 +0000 Subject: [PATCH 1/3] fix(desktop): a backend busy after startup no longer shows a fatal error The bearer bootstrap capped its retries at 15 s, but each token request waits up to 10 s, so a backend stalled for more than about 10 s got one attempt and the window showed "Something went wrong (HTTP 500)". Raise the budget to 60 s so several attempts fit. Fixes #23378 Co-Authored-By: Claude Opus 5.5 --- .../DesktopLocalEnvironmentAuth.test.ts | 30 +++++++++++++++++++ .../backend/DesktopLocalEnvironmentAuth.ts | 5 +++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts b/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts index 348d3a7050f70..1ccff3a54e819 100644 --- a/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts +++ b/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts @@ -195,6 +195,36 @@ describe("DesktopLocalEnvironmentAuth", () => { return { auth, requestCount }; }); + it.effect("keeps retrying while the backend is too busy to answer", () => + Effect.gen(function* () { + const requestCount = yield* Ref.make(0); + const layerHttpClient = Layer.succeed( + HttpClient.HttpClient, + HttpClient.make((request) => + Ref.updateAndGet(requestCount, (count) => count + 1).pipe( + Effect.flatMap((count) => + count <= 2 ? Effect.never : Effect.succeed(tokenResponse(request)), + ), + ), + ), + ); + const auth = yield* DesktopLocalEnvironmentAuth.DesktopLocalEnvironmentAuth.pipe( + Effect.provide( + DesktopLocalEnvironmentAuth.layer.pipe( + Layer.provide(Layer.mergeAll(layerPool, layerHttpClient)), + ), + ), + ); + + const fiber = yield* auth.getBearerToken.pipe(Effect.forkChild); + yield* TestClock.adjust(Duration.seconds(30)); + const token = yield* Fiber.join(fiber); + + assert.strictEqual(token, "desktop-bearer-token"); + assert.strictEqual(yield* Ref.get(requestCount), 3); + }).pipe(Effect.provide(TestClock.layer())), + ); + it.effect("does not retry a rejected bootstrap credential", () => Effect.gen(function* () { const { auth, requestCount } = yield* makeExchange(1, () => diff --git a/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.ts b/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.ts index 4d95dd075cf3e..61916fae97757 100644 --- a/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.ts +++ b/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.ts @@ -16,7 +16,10 @@ import * as HttpClient from "effect/http/HttpClient"; import * as DesktopBackendPool from "./DesktopBackendPool.ts"; -const BOOTSTRAP_TRANSIENT_RETRY_TIMEOUT = Duration.seconds(15); +// Each token request gives up after 10 s, and a backend that just became ready +// can stall for half a minute on a large state database. The budget has to +// cover several of those attempts, or a slow startup becomes a fatal error. +const BOOTSTRAP_TRANSIENT_RETRY_TIMEOUT = Duration.seconds(60); const BOOTSTRAP_TRANSIENT_RETRY_INTERVAL = Duration.millis(500); const TRANSIENT_BOOTSTRAP_STATUS_CODES = new Set([502, 503, 504]); From fb13b234dd0695b816665037b1b5ac554b1e7374 Mon Sep 17 00:00:00 2001 From: PR Batch Tester Date: Thu, 22 Oct 2026 06:19:24 +0000 Subject: [PATCH 2/3] test(desktop): cover the bearer bootstrap giving up when the backend never answers Co-Authored-By: Claude Opus 5.5 --- .../DesktopLocalEnvironmentAuth.test.ts | 58 +++++++++---------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts b/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts index 1ccff3a54e819..12b683405b9ef 100644 --- a/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts +++ b/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts @@ -170,17 +170,17 @@ describe("DesktopLocalEnvironmentAuth", () => { }, ]), } as unknown as DesktopBackendPool.DesktopBackendPool["Service"]); - const makeExchange = (failures: number, failure: () => Response) => + const makeExchange = (failures: number, failure: () => Effect.Effect) => Effect.gen(function* () { const requestCount = yield* Ref.make(0); const layerHttpClient = Layer.succeed( HttpClient.HttpClient, HttpClient.make((request) => Ref.updateAndGet(requestCount, (count) => count + 1).pipe( - Effect.map((count) => + Effect.flatMap((count) => count <= failures - ? HttpClientResponse.fromWeb(request, failure()) - : tokenResponse(request), + ? Effect.map(failure(), (response) => HttpClientResponse.fromWeb(request, response)) + : Effect.succeed(tokenResponse(request)), ), ), ), @@ -197,24 +197,7 @@ describe("DesktopLocalEnvironmentAuth", () => { it.effect("keeps retrying while the backend is too busy to answer", () => Effect.gen(function* () { - const requestCount = yield* Ref.make(0); - const layerHttpClient = Layer.succeed( - HttpClient.HttpClient, - HttpClient.make((request) => - Ref.updateAndGet(requestCount, (count) => count + 1).pipe( - Effect.flatMap((count) => - count <= 2 ? Effect.never : Effect.succeed(tokenResponse(request)), - ), - ), - ), - ); - const auth = yield* DesktopLocalEnvironmentAuth.DesktopLocalEnvironmentAuth.pipe( - Effect.provide( - DesktopLocalEnvironmentAuth.layer.pipe( - Layer.provide(Layer.mergeAll(layerPool, layerHttpClient)), - ), - ), - ); + const { auth, requestCount } = yield* makeExchange(2, () => Effect.never); const fiber = yield* auth.getBearerToken.pipe(Effect.forkChild); yield* TestClock.adjust(Duration.seconds(30)); @@ -225,17 +208,32 @@ describe("DesktopLocalEnvironmentAuth", () => { }).pipe(Effect.provide(TestClock.layer())), ); + it.effect("gives up after a minute when the backend never answers", () => + Effect.gen(function* () { + const { auth, requestCount } = yield* makeExchange(Infinity, () => Effect.never); + + const fiber = yield* auth.getBearerToken.pipe(Effect.flip, Effect.forkChild); + yield* TestClock.adjust(Duration.seconds(60)); + const error = yield* Fiber.join(fiber); + + assert.strictEqual(error._tag, "DesktopLocalEnvironmentAuthSessionBootstrapError"); + assert.isAbove(yield* Ref.get(requestCount), 1); + }).pipe(Effect.provide(TestClock.layer())), + ); + it.effect("does not retry a rejected bootstrap credential", () => Effect.gen(function* () { const { auth, requestCount } = yield* makeExchange(1, () => - Response.json( - { - _tag: "EnvironmentAuthInvalidError", - code: "auth_invalid", - reason: "invalid_credential", - traceId: "trace-1", - }, - { status: 401 }, + Effect.succeed( + Response.json( + { + _tag: "EnvironmentAuthInvalidError", + code: "auth_invalid", + reason: "invalid_credential", + traceId: "trace-1", + }, + { status: 401 }, + ), ), ); From 0a2f4dbeae709e72898896be9e222ae73575341b Mon Sep 17 00:00:00 2001 From: PR Batch Tester Date: Thu, 22 Oct 2026 06:26:49 +0000 Subject: [PATCH 3/3] test(desktop): require bearer bootstrap to recover after 30 s of stalls Co-Authored-By: Claude Opus 5.5 --- .../desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts b/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts index 12b683405b9ef..7d628a44e856e 100644 --- a/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts +++ b/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts @@ -197,14 +197,14 @@ describe("DesktopLocalEnvironmentAuth", () => { it.effect("keeps retrying while the backend is too busy to answer", () => Effect.gen(function* () { - const { auth, requestCount } = yield* makeExchange(2, () => Effect.never); + const { auth, requestCount } = yield* makeExchange(3, () => Effect.never); const fiber = yield* auth.getBearerToken.pipe(Effect.forkChild); - yield* TestClock.adjust(Duration.seconds(30)); + yield* TestClock.adjust(Duration.seconds(40)); const token = yield* Fiber.join(fiber); assert.strictEqual(token, "desktop-bearer-token"); - assert.strictEqual(yield* Ref.get(requestCount), 3); + assert.strictEqual(yield* Ref.get(requestCount), 4); }).pipe(Effect.provide(TestClock.layer())), );