@devries-cameron20 / t3code-1 / commits / e21347b470
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

chore(desktop): trace shutdown phases (#31850)

Yash Singh committed Nov 6, 2026 at 00:44 UTC e21347b47081d36c2b184fba2685d83300321af9
4 files changed +53 -9
apps/desktop/src/app/DesktopApp.test.ts
+41 -7
@@ -2,6 +2,7 @@ import { assert, it } from "@effect/vitest";
2 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3 import * as Deferred from "effect/Deferred";
4 import * as Effect from "effect/Effect";
5 +import * as Exit from "effect/Exit";
6 import * as Layer from "effect/Layer";
7 import * as FileSystem from "effect/FileSystem";
8 import * as Path from "effect/Path";
@@ -69,14 +70,19 @@ import * as ElectronWindow from "../electron/ElectronWindow.ts";
70 import * as MacPermissions from "../permissions/MacPermissions.ts";
71 import * as PreviewManager from "../preview/Manager.ts";
72
72 -it.effect(
73 - "starts the backend and window while Linux registration is stalled and cancels it on shutdown",
74 - () =>
73 +it.effect.each([false, true])(
74 + "stops backends together before flushing history and cancels Linux registration, stop defect=%s",
75 + (stopDefect) =>
76 Effect.gen(function* () {
77 const registrationStarted = yield* Deferred.make<void>();
78 const releaseRegistration = yield* Deferred.make<void>();
79 const registrationStopped = yield* Deferred.make<void>();
80 const windowStarted = yield* Deferred.make<void>();
81 + const firstStopStarted = yield* Deferred.make<void>();
82 + const secondStopStarted = yield* Deferred.make<void>();
83 + const releaseStops = yield* Deferred.make<void>();
84 + const historyStarted = yield* Deferred.make<void>();
85 + const releaseHistory = yield* Deferred.make<void>();
86 const quitting = yield* Ref.make(false);
87 const events: string[] = [];
88 const record = (event: string) =>
@@ -169,7 +175,21 @@ it.effect(
175 start: record("backend"),
176 currentConfig: Effect.succeedSome({ preflightFailure: Option.none() }),
177 }),
172 - list: Effect.succeed([]),
178 + list: Effect.succeed([
179 + {
180 + stop: () =>
181 + Deferred.succeed(firstStopStarted, undefined).pipe(
182 + Effect.andThen(Deferred.await(releaseStops)),
183 + Effect.andThen(stopDefect ? Effect.die("stop defect") : Effect.void),
184 + ),
185 + },
186 + {
187 + stop: () =>
188 + Deferred.succeed(secondStopStarted, undefined).pipe(
189 + Effect.andThen(Deferred.await(releaseStops)),
190 + ),
191 + },
192 + ]),
193 } as unknown as DesktopBackendPool.DesktopBackendPool["Service"]),
194 Effect.provideService(DesktopServerExposure.DesktopServerExposure, {
195 configureFromSettings: () => Effect.succeed({ mode: "local-only" }),
@@ -182,7 +202,10 @@ it.effect(
202 start: Effect.void,
203 } as unknown as DesktopAppActivation.DesktopAppActivation["Service"]),
204 Effect.provideService(DesktopRendererHistory.DesktopRendererHistory, {
185 - shutdown: Effect.void,
205 + shutdown: Deferred.succeed(historyStarted, undefined).pipe(
206 + Effect.andThen(Deferred.await(releaseHistory)),
207 + Effect.asVoid,
208 + ),
209 } as DesktopRendererHistory.DesktopRendererHistory["Service"]),
210 );
211 const app = yield* runApp.pipe(
@@ -226,8 +249,19 @@ it.effect(
249 yield* Deferred.await(windowStarted);
250 assert.deepEqual(events, ["identity", "ready", "identity", "backend", "window"]);
251 assert.isFalse(yield* Deferred.isDone(registrationStopped));
229 - yield* (yield* DesktopShutdown.DesktopShutdown).request;
230 - yield* Fiber.join(app);
252 + const shutdown = yield* DesktopShutdown.DesktopShutdown;
253 + yield* shutdown.request;
254 + yield* Deferred.await(firstStopStarted);
255 + yield* Deferred.await(secondStopStarted);
256 + assert.isFalse(yield* Deferred.isDone(historyStarted));
257 + assert.isFalse(yield* shutdown.isComplete);
258 + yield* Deferred.succeed(releaseStops, undefined);
259 + yield* Deferred.await(historyStarted);
260 + assert.isFalse(yield* shutdown.isComplete);
261 + yield* Deferred.succeed(releaseHistory, undefined);
262 + const result = yield* Fiber.await(app);
263 + assert.equal(Exit.isFailure(result), stopDefect);
264 + assert.isTrue(yield* shutdown.isComplete);
265 assert.isTrue(yield* Deferred.isDone(registrationStopped));
266 }).pipe(Effect.provide(DesktopShutdown.layer)),
267 );
apps/desktop/src/app/DesktopApp.ts
+1
@@ -363,6 +363,7 @@ const scopedProgram = Effect.scoped(
363 stopAllPoolInstances().pipe(
364 Effect.ensuring(rendererHistory.shutdown),
365 Effect.ensuring(shutdown.markComplete),
366 + Effect.withSpan("desktop.app.shutdown"),
367 ),
368 );
369
apps/desktop/src/backend/DesktopBackendManager.ts
+6 -1
@@ -312,7 +312,10 @@ const closeRun = (
312 onNone: () => Effect.void,
313 onSome: (fiber) => Fiber.await(fiber).pipe(Effect.asVoid),
314 });
315 - const close = Scope.close(run.scope, Exit.void).pipe(Effect.andThen(waitForFiber));
315 + const close = Scope.close(run.scope, Exit.void).pipe(
316 + Effect.withSpan("desktop.backendInstance.closeScope"),
317 + Effect.andThen(waitForFiber.pipe(Effect.withSpan("desktop.backendInstance.awaitRun"))),
318 + );
319 const timeout = options?.timeout;
320
321 if (!timeout) {
@@ -573,6 +576,7 @@ export const runBackendProcess = Effect.fn("runBackendProcess")(function* (
576 yield* probeReadiness().pipe(Effect.repeat({ while: (ready) => !ready }), Effect.forkScoped);
577
578 const exit = yield* handle.exitCode.pipe(
579 + Effect.withSpan("desktop.backendProcess.awaitExit"),
580 Effect.map((exitCode) => ({
581 code: Option.some(exitCode),
582 reason: `code=${exitCode}`,
@@ -608,6 +612,7 @@ export const runBackendProcess = Effect.fn("runBackendProcess")(function* (
612 }).pipe(
613 Effect.timeout(options.outputDrainTimeout ?? DEFAULT_BACKEND_OUTPUT_DRAIN_TIMEOUT),
614 Effect.ignore,
615 + Effect.withSpan("desktop.backendProcess.drainOutput"),
616 );
617 if (Exit.isFailure(exit)) {
618 return yield* Effect.failCause(exit.cause);
apps/desktop/src/telemetry/DesktopRendererHistory.ts
+5 -1
@@ -273,7 +273,11 @@ const make = Effect.fn("DesktopRendererHistory.make")(function* () {
273 accepting = false;
274 for (const renderer of active.values()) renderer.removeListeners();
275 active.clear();
276 - }).pipe(Effect.andThen(Fiber.interrupt(writerFiber)), Effect.asVoid);
276 + }).pipe(
277 + Effect.andThen(Fiber.interrupt(writerFiber)),
278 + Effect.asVoid,
279 + Effect.withSpan("desktop.rendererHistory.shutdown"),
280 + );
281 yield* Effect.addFinalizer(() => shutdown);
282
283 return DesktopRendererHistory.of({ register, recordMetrics, shutdown });