Refactor recoverable Effect fallbacks to orElseSucceed (#2968)

Author: juliusmarminge

apps/desktop/src/app/DesktopAppIdentity.ts

@@ -52,7 +52,7 @@ const make = Effect.gen(function* () {
           Effect.map((parsed) =>
             Option.fromNullishOr(parsed.t3codeCommitHash).pipe(Option.flatMap(normalizeCommitHash)),
           ),
-          Effect.catch(() => Effect.succeed(Option.none<string>())),
+          Effect.orElseSucceed(() => Option.none<string>()),
         ),
     });
   });

apps/desktop/src/backend/tailscaleEndpointProvider.ts

@@ -116,11 +116,11 @@ export const resolveTailscaleAdvertisedEndpoints = Effect.fn("resolveTailscaleAd
       input.statusJson === undefined
         ? yield* readTailscaleStatus.pipe(
             Effect.map((status) => status.magicDnsName),
-            Effect.catch(() => Effect.succeed(null)),
+            Effect.orElseSucceed(() => null),
           )
         : input.statusJson
           ? yield* parseTailscaleMagicDnsName(input.statusJson).pipe(
-              Effect.catch(() => Effect.succeed(null)),
+              Effect.orElseSucceed(() => null),
             )
           : null;
     const magicDnsEndpoint = yield* resolveTailscaleMagicDnsAdvertisedEndpoint({

apps/desktop/src/settings/DesktopAppSettings.ts

@@ -209,7 +209,7 @@ function readSettings(
         onSome: (raw) =>
           decodeDesktopSettingsJson(raw).pipe(
             Effect.map((parsed) => normalizeDesktopSettingsDocument(parsed, appVersion)),
-            Effect.catch(() => Effect.succeed(defaultSettings)),
+            Effect.orElseSucceed(() => defaultSettings),
           ),
       }),
     ),

apps/desktop/src/settings/DesktopClientSettings.ts

@@ -63,7 +63,7 @@ const readClientSettings = (
         onSome: (raw) =>
           decodeClientSettingsJson(raw).pipe(
             Effect.map((settings) => Option.some(settings)),
-            Effect.catch(() => Effect.succeed(Option.none<ClientSettings>())),
+            Effect.orElseSucceed(() => Option.none<ClientSettings>()),
           ),
       }),
     ),

apps/desktop/src/settings/DesktopSavedEnvironments.ts

@@ -185,7 +185,7 @@ function readRegistryDocument(
         onSome: (raw) =>
           decodeSavedEnvironmentRegistryDocumentJson(raw).pipe(
             Effect.map(normalizeSavedEnvironmentRegistryDocument),
-            Effect.catch(() => Effect.succeed({ version: 1, records: [] })),
+            Effect.orElseSucceed(() => ({ version: 1, records: [] })),
           ),
       }),
     ),

apps/desktop/src/shell/DesktopShellEnvironment.ts

@@ -196,7 +196,7 @@ const runCommandOutput = Effect.fn("desktop.shellEnvironment.runCommandOutput")(
     .pipe(
       Effect.timeoutOption(input.timeout),
       Effect.map(Option.getOrElse(() => "")),
-      Effect.catch(() => Effect.succeed("")),
+      Effect.orElseSucceed(() => ""),
     );
 });
 

apps/desktop/src/updates/DesktopUpdates.ts

@@ -120,7 +120,7 @@ function parseAppUpdateYml(raw: string): Effect.Effect<Option.Option<AppUpdateYm
 
   return decodeAppUpdateYmlConfig(entries).pipe(
     Effect.map((config) => (config.provider ? Option.some(config) : Option.none())),
-    Effect.catch(() => Effect.succeed(Option.none<AppUpdateYmlConfig>())),
+    Effect.orElseSucceed(() => Option.none<AppUpdateYmlConfig>()),
   );
 }
 

apps/server/package.json

@@ -38,7 +38,7 @@
     "@t3tools/shared": "workspace:*",
     "@t3tools/tailscale": "workspace:*",
     "@t3tools/web": "workspace:*",
-    "@types/bun": "catalog:",
+    "@types/bun": "1.3.14",
     "@types/node": "catalog:",
     "effect-acp": "workspace:*",
     "effect-codex-app-server": "workspace:*",

apps/server/src/checkpointing/Layers/CheckpointStore.ts

@@ -35,7 +35,7 @@ const makeCheckpointStore = Effect.gen(function* () {
   const isGitRepository: CheckpointStoreShape["isGitRepository"] = (cwd) =>
     vcsRegistry.resolve({ cwd, requestedKind: "git" }).pipe(
       Effect.map(() => true),
-      Effect.catch(() => Effect.succeed(false)),
+      Effect.orElseSucceed(() => false),
     );
 
   const captureCheckpoint: CheckpointStoreShape["captureCheckpoint"] = Effect.fn(

apps/server/src/cloud/ManagedEndpointRuntime.ts

@@ -152,9 +152,7 @@ export const makeCloudManagedEndpointRuntime = Effect.gen(function* () {
     const nextConfigKey = runtimeConfigKey(config);
     const active = yield* Ref.get(activeRef);
     if (active?.configKey === nextConfigKey) {
-      const isRunning = yield* active.child.isRunning.pipe(
-        Effect.catch(() => Effect.succeed(false)),
-      );
+      const isRunning = yield* active.child.isRunning.pipe(Effect.orElseSucceed(() => false));
       if (isRunning) {
         return {
           status: "running",