Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2985,7 +2985,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
}
: null,
),
Effect.catch(() => Effect.succeed(null)),
Effect.orElseSucceed(() => null),
Effect.flatMap((response) =>
response === null
? client.raw
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/preview/ServerBrowserStream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ const makeHandler = Effect.fnUntraced(function* (browser: ServerBrowser.ServerBr
Effect.as(HttpServerResponse.text("Service Unavailable", { status: 503 })),
),
}),
Effect.catch(() => Effect.succeed(HttpServerResponse.empty())),
Effect.orElseSucceed(() => HttpServerResponse.empty()),
);
});

Expand Down
3 changes: 1 addition & 2 deletions apps/server/src/workspace/WorkspaceFileSystem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,7 @@ export const make = Effect.gen(function* () {
}
},
catch: () => undefined,
// @effect-diagnostics-next-line effectSucceedWithVoid:off - This optional result requires undefined, not the wider void type.
}).pipe(Effect.catch(() => Effect.succeed(undefined)));
}).pipe(Effect.orElseSucceed(() => undefined));
}
return {
kind: "file",
Expand Down
2 changes: 1 addition & 1 deletion packages/client-runtime/src/state/commandPermissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function makeCommandPermissions<R, E>(
suspendOnWaiting: false,
}).pipe(
Effect.timeoutOption(6_000),
Effect.catch(() => Effect.succeed(Option.none<AuthSessionState>())),
Effect.orElseSucceed(() => Option.none<AuthSessionState>()),
);
const missing = scopes.find(
(scope) => Option.isNone(session) || !sessionGrantsScope(session.value, scope),
Expand Down
15 changes: 8 additions & 7 deletions packages/provider-cursor/src/server/accountUsage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,14 @@ export const readCursorAccountUsage = Effect.fn("readCursorAccountUsage")(functi
duration: Duration.seconds(60),
orElse: () => invalid("Account usage read timed out"),
}),
Effect.catch(() =>
Effect.succeed({
accountKey,
records: [],
missing: false,
error: "Cursor account usage could not be read.",
} satisfies CursorAccountUsageReadResult),
Effect.orElseSucceed(
() =>
({
accountKey,
records: [],
missing: false,
error: "Cursor account usage could not be read.",
}) satisfies CursorAccountUsageReadResult,
),
);
});
2 changes: 1 addition & 1 deletion scripts/mobile-native-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ const remoteCache = Effect.fn("nativeClient.remoteCache")(
...login,
} satisfies RemoteCache;
},
Effect.catch(() => Effect.succeed(null)),
Effect.orElseSucceed(() => null),
);

const authorized = (remote: RemoteCache, request: HttpClientRequest.HttpClientRequest) =>
Expand Down
1 change: 1 addition & 0 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"namespaceImportPackages": ["@effect/platform-node", "effect"],
"effectFn": ["span", "inferred-span", "suggested-span"],
"diagnosticSeverity": {
"catchToOrElseSucceed": "error",
"unnecessaryFailYieldableError": "error",
"preferSucceedSomeOrNone": "error",
"effectSucceedWithVoid": "error",
Expand Down
Loading