effect 4.0.0-beta.67 → 4.0.0-beta.68

package/src/Effect.ts

@@ -137,7 +137,7 @@ import { internalCall } from "./Utils.ts"
  * Type-level identifier for `Effect` values.
  *
  * @category Type identifiers
- * @since 2.0.0
+ * @since 4.0.0
  */
 export type TypeId = "~effect/Effect"
 
@@ -145,7 +145,7 @@ export type TypeId = "~effect/Effect"
  * Runtime identifier used to recognize `Effect` values.
  *
  * @category Type identifiers
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const TypeId: TypeId = core.EffectTypeId
 
@@ -163,7 +163,7 @@ export const TypeId: TypeId = core.EffectTypeId
  * To run an `Effect` value, you need a `Runtime`, which is a type that is
  * capable of executing `Effect` values.
  *
- * @category Models
+ * @category models
  * @since 2.0.0
  */
 export interface Effect<out A, out E = never, out R = never> extends Pipeable, Inspectable {
@@ -177,7 +177,7 @@ export interface Effect<out A, out E = never, out R = never> extends Pipeable, I
 /**
  * Type-level unification support for `Effect` values.
  *
- * @category Models
+ * @category models
  * @since 2.0.0
  */
 export interface EffectUnify<A extends { [Unify.typeSymbol]?: any }> {
@@ -200,7 +200,7 @@ export interface EffectTypeLambda extends TypeLambda {
 /**
  * Variance interface for Effect, encoding the type parameters' variance.
  *
- * @category Models
+ * @category models
  * @since 2.0.0
  */
 export interface Variance<A, E, R> {
@@ -212,7 +212,7 @@ export interface Variance<A, E, R> {
 /**
  * Extracts the success type from an `Effect`.
  *
- * @category Models
+ * @category models
  * @since 2.0.0
  */
 export type Success<T> = T extends Effect<infer _A, infer _E, infer _R> ? _A
@@ -221,7 +221,7 @@ export type Success<T> = T extends Effect<infer _A, infer _E, infer _R> ? _A
 /**
  * Extracts the error type from an `Effect`.
  *
- * @category Models
+ * @category models
  * @since 2.0.0
  */
 export type Error<T> = T extends Effect<infer _A, infer _E, infer _R> ? _E
@@ -230,8 +230,8 @@ export type Error<T> = T extends Effect<infer _A, infer _E, infer _R> ? _E
 /**
  * Extracts the required services type from an `Effect`.
  *
- * @category Models
- * @since 2.0.0
+ * @category models
+ * @since 4.0.0
  */
 export type Services<T> = T extends Effect<infer _A, infer _E, infer _R> ? _R
   : never
@@ -248,7 +248,7 @@ export type Services<T> = T extends Effect<infer _A, infer _E, infer _R> ? _R
  * console.log(Effect.isEffect("hello")) // false
  * ```
  *
- * @category Guards
+ * @category guards
  * @since 2.0.0
  */
 export const isEffect: (u: unknown) => u is Effect<any, any, any> = core.isEffect
@@ -256,8 +256,8 @@ export const isEffect: (u: unknown) => u is Effect<any, any, any> = core.isEffec
 /**
  * Iterator interface for Effect generators, enabling Effect values to work with generator functions.
  *
- * @category Models
- * @since 2.0.0
+ * @category models
+ * @since 4.0.0
  */
 export interface EffectIterator<T extends Effect<any, any, any>> {
   next(
@@ -273,14 +273,13 @@ export interface EffectIterator<T extends Effect<any, any, any>> {
  * Namespace containing type utilities for the `Effect.all` function, which handles
  * collecting multiple effects into various output structures.
  *
- * @category Models
  * @since 2.0.0
  */
 export declare namespace All {
   /**
    * Alias for any `Effect` value accepted by `Effect.all`.
    *
-   * @category Models
+   * @category models
    * @since 2.0.0
    */
   export type EffectAny = Effect<any, any, any>
@@ -288,7 +287,7 @@ export declare namespace All {
   /**
    * Computes the return type for `Effect.all` when collecting an iterable.
    *
-   * @category Models
+   * @category models
    * @since 2.0.0
    */
   export type ReturnIterable<
@@ -305,7 +304,7 @@ export declare namespace All {
   /**
    * Computes the return type for `Effect.all` when collecting a tuple.
    *
-   * @category Models
+   * @category models
    * @since 2.0.0
    */
   export type ReturnTuple<
@@ -336,7 +335,7 @@ export declare namespace All {
   /**
    * Computes the return type for `Effect.all` when collecting a record.
    *
-   * @category Models
+   * @category models
    * @since 2.0.0
    */
   export type ReturnObject<T, Discard extends boolean, Mode extends boolean = false> = [T] extends [
@@ -362,7 +361,7 @@ export declare namespace All {
   /**
    * Detects whether `Effect.all` should discard collected values.
    *
-   * @category Models
+   * @category models
    * @since 2.0.0
    */
   export type IsDiscard<A> = [Extract<A, { readonly discard: true }>] extends [
@@ -373,7 +372,7 @@ export declare namespace All {
   /**
    * Detects whether `Effect.all` should collect results in `Result` mode.
    *
-   * @category Models
+   * @category models
    * @since 4.0.0
    */
   export type IsResult<A> = [Extract<A, { readonly mode: "result" }>] extends [never] ? false : true
@@ -381,7 +380,7 @@ export declare namespace All {
   /**
    * Computes the return type for `Effect.all` from its input and options.
    *
-   * @category Models
+   * @category models
    * @since 2.0.0
    */
   export type Return<
@@ -566,7 +565,7 @@ export const all: <
  * ```
  *
  * @category Collecting
- * @since 3.0.0
+ * @since 2.0.0
  */
 export const partition: {
   /**
@@ -595,7 +594,7 @@ export const partition: {
    * ```
    *
    * @category Collecting
-   * @since 3.0.0
+   * @since 2.0.0
    */
   <A, B, E, R>(
     f: (a: A, i: number) => Effect<B, E, R>,
@@ -627,7 +626,7 @@ export const partition: {
    * ```
    *
    * @category Collecting
-   * @since 3.0.0
+   * @since 2.0.0
    */
   <A, B, E, R>(
     elements: Iterable<A>,
@@ -670,7 +669,7 @@ export const partition: {
  * ```
  *
  * @category Error Accumulation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const validate: {
   /**
@@ -707,7 +706,7 @@ export const validate: {
    * ```
    *
    * @category Error Accumulation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <A, B, E, R>(
     f: (a: A, i: number) => Effect<B, E, R>,
@@ -750,7 +749,7 @@ export const validate: {
    * ```
    *
    * @category Error Accumulation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <A, B, E, R>(
     f: (a: A, i: number) => Effect<B, E, R>,
@@ -793,7 +792,7 @@ export const validate: {
    * ```
    *
    * @category Error Accumulation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <A, B, E, R>(
     elements: Iterable<A>,
@@ -837,7 +836,7 @@ export const validate: {
    * ```
    *
    * @category Error Accumulation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <A, B, E, R>(
     elements: Iterable<A>,
@@ -980,8 +979,7 @@ export const findFirstFilter: {
  * **Example** (Applying Effects to Iterable Elements)
  *
  * ```ts
- * import { Effect } from "effect"
- * import { Console } from "effect"
+ * import { Console, Effect } from "effect"
  *
  * const result = Effect.forEach(
  *   [1, 2, 3, 4, 5],
@@ -1002,8 +1000,7 @@ export const findFirstFilter: {
  * **Example** (Using discard to Ignore Results)
  *
  * ```ts
- * import { Effect } from "effect"
- * import { Console } from "effect"
+ * import { Console, Effect } from "effect"
  *
  * // Apply effects but discard the results
  * const result = Effect.forEach(
@@ -1053,8 +1050,7 @@ export const forEach: {
    * **Example** (Applying Effects to Iterable Elements)
    *
    * ```ts
-   * import { Effect } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Effect } from "effect"
    *
    * const result = Effect.forEach(
    *   [1, 2, 3, 4, 5],
@@ -1075,8 +1071,7 @@ export const forEach: {
    * **Example** (Using discard to Ignore Results)
    *
    * ```ts
-   * import { Effect } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Effect } from "effect"
    *
    * // Apply effects but discard the results
    * const result = Effect.forEach(
@@ -1129,8 +1124,7 @@ export const forEach: {
    * **Example** (Applying Effects to Iterable Elements)
    *
    * ```ts
-   * import { Effect } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Effect } from "effect"
    *
    * const result = Effect.forEach(
    *   [1, 2, 3, 4, 5],
@@ -1151,8 +1145,7 @@ export const forEach: {
    * **Example** (Using discard to Ignore Results)
    *
    * ```ts
-   * import { Effect } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Effect } from "effect"
    *
    * // Apply effects but discard the results
    * const result = Effect.forEach(
@@ -1236,7 +1229,7 @@ export const whileLoop: <A, E, R>(options: {
  * This defect is not a standard error but indicates a flaw in the logic that
  * was expected to be error-free. You can think of it similar to an unexpected
  * crash in the program, which can be further managed or logged using tools like
- * {@link catchAllDefect}.
+ * {@link catchDefect}.
  *
  * **Interruptions**
  *
@@ -1514,7 +1507,7 @@ export const suspend: <A, E, R>(
  * This defect is not a standard error but indicates a flaw in the logic that
  * was expected to be error-free. You can think of it similar to an unexpected
  * crash in the program, which can be further managed or logged using tools like
- * {@link catchAllDefect}.
+ * {@link catchDefect}.
  *
  * @see {@link try_ | try} for a version that can handle failures.
  *
@@ -1571,12 +1564,6 @@ export {
  * Use `Effect.callback` when integrating APIs that complete through callbacks
  * instead of returning a `Promise`.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Effect.async`
- *
  * **Example** (Usage)
  *
  * ```ts
@@ -1595,7 +1582,7 @@ export {
  * ```
  *
  * @category Creating Effects
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const callback: <A, E = never, R = never>(
   register: (
@@ -1636,8 +1623,7 @@ export const never: Effect<never> = internal.never
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect } from "effect"
- * import { pipe } from "effect/Function"
+ * import { Effect, pipe } from "effect"
  *
  * const program = pipe(
  *   Effect.Do,
@@ -1648,7 +1634,7 @@ export const never: Effect<never> = internal.never
  * ```
  *
  * @category Do notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const Do: Effect<{}> = internal.Do
 
@@ -1657,7 +1643,7 @@ export const Do: Effect<{}> = internal.Do
  * record used in do notation pipelines.
  *
  * @category Do notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const bindTo: {
   /**
@@ -1665,7 +1651,7 @@ export const bindTo: {
    * record used in do notation pipelines.
    *
    * @category Do notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <N extends string>(name: N): <A, E, R>(self: Effect<A, E, R>) => Effect<{ [K in N]: A }, E, R>
   /**
@@ -1673,7 +1659,7 @@ export const bindTo: {
    * record used in do notation pipelines.
    *
    * @category Do notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <A, E, R, N extends string>(self: Effect<A, E, R>, name: N): Effect<{ [K in N]: A }, E, R>
 } = internal.bindTo
@@ -1697,7 +1683,7 @@ export {
    * Adds a computed plain value to the do notation record.
    *
    * @category Do notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   let_ as let
 }
@@ -1706,14 +1692,14 @@ export {
  * Adds an `Effect` value to the do notation record under a given name.
  *
  * @category Do notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const bind: {
   /**
    * Adds an `Effect` value to the do notation record under a given name.
    *
    * @category Do notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <N extends string, A extends Record<string, any>, B, E2, R2>(name: N, f: (a: NoInfer<A>) => Effect<B, E2, R2>): <E, R>(
     self: Effect<A, E, R>
@@ -1722,7 +1708,7 @@ export const bind: {
    * Adds an `Effect` value to the do notation record under a given name.
    *
    * @category Do notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <A extends Record<string, any>, E, R, B, E2, R2, N extends string>(self: Effect<A, E, R>, name: N, f: (a: NoInfer<A>) => Effect<B, E2, R2>): Effect<Simplify<Omit<A, N> & Record<N, B>>, E | E2, R | R2>
 } = internal.bind
@@ -1909,8 +1895,7 @@ export const gen: {
 /**
  * Type helpers for `Effect.gen` generator return signatures.
  *
- * @category Creating Effects
- * @since 4.0.0
+ * @since 2.0.0
  */
 export namespace gen {
   /**
@@ -1929,7 +1914,7 @@ export namespace gen {
  *
  * Use this function to explicitly signal an error in an `Effect`. The error
  * will keep propagating unless it is handled. You can handle the error with
- * functions like {@link catchAll} or {@link catchTag}.
+ * functions like {@link catchTag} or {@link catchTags}.
  *
  * @see {@link succeed} to create an effect that represents a successful value.
  *
@@ -2043,8 +2028,7 @@ export const failCauseSync: <E>(
  * The error channel of the resulting effect is of type `never`, indicating that
  * it cannot recover from this failure.
  *
- * @see {@link dieSync} for a variant that throws a specified error, evaluated lazily.
- * @see {@link dieMessage} for a variant that throws a `RuntimeException` with a message.
+ * @see {@link die} for a variant that dies with an already computed defect.
  *
  * **Example** (Terminating on Division by Zero with a Specified Error)
  *
@@ -2183,7 +2167,7 @@ export const yieldNow: Effect<void> = internal.yieldNow
  * ```
  *
  * @category Creating Effects
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const yieldNowWith: (priority?: number) => Effect<void> = internal.yieldNowWith
 
@@ -2204,7 +2188,7 @@ export const yieldNowWith: (priority?: number) => Effect<void> = internal.yieldN
  * ```
  *
  * @category Creating Effects
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const withFiber: <A, E = never, R = never>(
   evaluate: (fiber: Fiber<unknown, unknown>) => Effect<A, E, R>
@@ -2233,7 +2217,7 @@ export const withFiber: <A, E = never, R = never>(
  * // { _id: 'Exit', _tag: 'Failure', cause: { _id: 'Cause', _tag: 'Fail', failure: 'Something went wrong' } }
  * ```
  *
- * @category Conversions
+ * @category converting
  * @since 4.0.0
  */
 export const fromResult: <A, E>(result: Result.Result<A, E>) => Effect<A, E> = internal.fromResult
@@ -2260,7 +2244,7 @@ export const fromResult: <A, E>(result: Result.Result<A, E>) => Effect<A, E> = i
  * // { _id: 'Exit', _tag: 'Failure', cause: { _id: 'Cause', _tag: 'Fail', failure: { _id: 'NoSuchElementError' } } }
  * ```
  *
- * @category Conversions
+ * @category converting
  * @since 4.0.0
  */
 export const fromOption: <A>(
@@ -2289,7 +2273,7 @@ export const fromOption: <A>(
  * // Output: hello
  * ```
  *
- * @category Conversions
+ * @category converting
  * @since 4.0.0
  */
 export const fromNullishOr: <A>(value: A) => Effect<NonNullable<A>, Cause.NoSuchElementError> = internal.fromNullishOr
@@ -2359,7 +2343,7 @@ export const fromNullishOr: <A>(value: A) => Effect<NonNullable<A>, Cause.NoSuch
  *
  * @see {@link tap} for a version that ignores the result of the effect.
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const flatMap: {
@@ -2428,7 +2412,7 @@ export const flatMap: {
    *
    * @see {@link tap} for a version that ignores the result of the effect.
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, B, E1, R1>(f: (a: A) => Effect<B, E1, R1>): <E, R>(self: Effect<A, E, R>) => Effect<B, E1 | E, R1 | R>
@@ -2497,7 +2481,7 @@ export const flatMap: {
    *
    * @see {@link tap} for a version that ignores the result of the effect.
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, B, E1, R1>(self: Effect<A, E, R>, f: (a: A) => Effect<B, E1, R1>): Effect<B, E | E1, R | R1>
@@ -2520,7 +2504,7 @@ export const flatMap: {
  * })
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const flatten: <A, E, R, E2, R2>(self: Effect<Effect<A, E, R>, E2, R2>) => Effect<A, E | E2, R | R2> =
@@ -2555,12 +2539,6 @@ export const flatten: <A, E, R, E2, R2>(self: Effect<Effect<A, E, R>, E2, R2>) =
  * Failures or requirements from either effect are preserved in the returned
  * effect.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Effect.zipRight`
- *
  * **Example** (Applying a Discount Based on Fetched Amount)
  *
  * ```ts
@@ -2601,7 +2579,7 @@ export const flatten: <A, E, R, E2, R2>(self: Effect<Effect<A, E, R>, E2, R2>) =
  * // Output: 190
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const andThen: {
@@ -2634,12 +2612,6 @@ export const andThen: {
    * Failures or requirements from either effect are preserved in the returned
    * effect.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.zipRight`
-   *
    * **Example** (Applying a Discount Based on Fetched Amount)
    *
    * ```ts
@@ -2680,7 +2652,7 @@ export const andThen: {
    * // Output: 190
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, B, E2, R2>(f: (a: A) => Effect<B, E2, R2>): <E, R>(self: Effect<A, E, R>) => Effect<B, E | E2, R | R2>
@@ -2713,12 +2685,6 @@ export const andThen: {
    * Failures or requirements from either effect are preserved in the returned
    * effect.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.zipRight`
-   *
    * **Example** (Applying a Discount Based on Fetched Amount)
    *
    * ```ts
@@ -2759,7 +2725,7 @@ export const andThen: {
    * // Output: 190
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <B, E2, R2>(f: Effect<B, E2, R2>): <A, E, R>(self: Effect<A, E, R>) => Effect<B, E | E2, R | R2>
@@ -2792,12 +2758,6 @@ export const andThen: {
    * Failures or requirements from either effect are preserved in the returned
    * effect.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.zipRight`
-   *
    * **Example** (Applying a Discount Based on Fetched Amount)
    *
    * ```ts
@@ -2838,7 +2798,7 @@ export const andThen: {
    * // Output: 190
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, B, E2, R2>(self: Effect<A, E, R>, f: (a: A) => Effect<B, E2, R2>): Effect<B, E | E2, R | R2>
@@ -2871,12 +2831,6 @@ export const andThen: {
    * Failures or requirements from either effect are preserved in the returned
    * effect.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.zipRight`
-   *
    * **Example** (Applying a Discount Based on Fetched Amount)
    *
    * ```ts
@@ -2917,7 +2871,7 @@ export const andThen: {
    * // Output: 190
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, B, E2, R2>(self: Effect<A, E, R>, f: Effect<B, E2, R2>): Effect<B, E | E2, R | R2>
@@ -2940,17 +2894,10 @@ export const andThen: {
  * next part of the chain. Note that if the side effect fails, the entire chain
  * will fail too.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Effect.zipLeft`
- *
  * **Example** (Logging a step in a pipeline)
  *
  * ```ts
- * import { Data, Effect, pipe } from "effect"
- * import { Console } from "effect"
+ * import { Console, Data, Effect, pipe } from "effect"
  *
  * class DiscountRateError extends Data.TaggedError("DiscountRateError")<{}> {}
  *
@@ -2980,7 +2927,7 @@ export const andThen: {
  * // 95
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const tap: {
@@ -3001,17 +2948,10 @@ export const tap: {
    * next part of the chain. Note that if the side effect fails, the entire chain
    * will fail too.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.zipLeft`
-   *
    * **Example** (Logging a step in a pipeline)
    *
    * ```ts
-   * import { Data, Effect, pipe } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Data, Effect, pipe } from "effect"
    *
    * class DiscountRateError extends Data.TaggedError("DiscountRateError")<{}> {}
    *
@@ -3041,7 +2981,7 @@ export const tap: {
    * // 95
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, B, E2, R2>(f: (a: NoInfer<A>) => Effect<B, E2, R2>): <E, R>(self: Effect<A, E, R>) => Effect<A, E | E2, R | R2>
@@ -3062,17 +3002,10 @@ export const tap: {
    * next part of the chain. Note that if the side effect fails, the entire chain
    * will fail too.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.zipLeft`
-   *
    * **Example** (Logging a step in a pipeline)
    *
    * ```ts
-   * import { Data, Effect, pipe } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Data, Effect, pipe } from "effect"
    *
    * class DiscountRateError extends Data.TaggedError("DiscountRateError")<{}> {}
    *
@@ -3102,7 +3035,7 @@ export const tap: {
    * // 95
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <B, E2, R2>(f: Effect<B, E2, R2>): <A, E, R>(self: Effect<A, E, R>) => Effect<A, E | E2, R | R2>
@@ -3123,17 +3056,10 @@ export const tap: {
    * next part of the chain. Note that if the side effect fails, the entire chain
    * will fail too.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.zipLeft`
-   *
    * **Example** (Logging a step in a pipeline)
    *
    * ```ts
-   * import { Data, Effect, pipe } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Data, Effect, pipe } from "effect"
    *
    * class DiscountRateError extends Data.TaggedError("DiscountRateError")<{}> {}
    *
@@ -3163,7 +3089,7 @@ export const tap: {
    * // 95
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, B, E2, R2>(self: Effect<A, E, R>, f: (a: NoInfer<A>) => Effect<B, E2, R2>): Effect<A, E | E2, R | R2>
@@ -3184,17 +3110,10 @@ export const tap: {
    * next part of the chain. Note that if the side effect fails, the entire chain
    * will fail too.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.zipLeft`
-   *
    * **Example** (Logging a step in a pipeline)
    *
    * ```ts
-   * import { Data, Effect, pipe } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Data, Effect, pipe } from "effect"
    *
    * class DiscountRateError extends Data.TaggedError("DiscountRateError")<{}> {}
    *
@@ -3224,7 +3143,7 @@ export const tap: {
    * // 95
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, B, E2, R2>(self: Effect<A, E, R>, f: Effect<B, E2, R2>): Effect<A, E | E2, R | R2>
@@ -3253,12 +3172,6 @@ export const tap: {
  * The resulting effect cannot fail directly because all recoverable failures
  * are represented inside the `Result` type.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Effect.either`
- *
  * **Example** (Usage)
  *
  * ```ts
@@ -3404,7 +3317,7 @@ export const exit: <A, E, R>(
  * @see {@link mapBoth} for a version that operates on both channels.
  * @see {@link flatMap} or {@link andThen} for a version that can return a new effect.
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const map: {
@@ -3452,7 +3365,7 @@ export const map: {
    * @see {@link mapBoth} for a version that operates on both channels.
    * @see {@link flatMap} or {@link andThen} for a version that can return a new effect.
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, B>(f: (a: A) => B): <E, R>(self: Effect<A, E, R>) => Effect<B, E, R>
@@ -3500,7 +3413,7 @@ export const map: {
    * @see {@link mapBoth} for a version that operates on both channels.
    * @see {@link flatMap} or {@link andThen} for a version that can return a new effect.
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, E, R, B>(self: Effect<A, E, R>, f: (a: A) => B): Effect<B, E, R>
@@ -3524,7 +3437,7 @@ export const map: {
  * // Output: "new value"
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const as: {
@@ -3546,7 +3459,7 @@ export const as: {
    * // Output: "new value"
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <B>(value: B): <A, E, R>(self: Effect<A, E, R>) => Effect<B, E, R>
@@ -3568,7 +3481,7 @@ export const as: {
    * // Output: "new value"
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, E, R, B>(self: Effect<A, E, R>, value: B): Effect<B, E, R>
@@ -3590,7 +3503,7 @@ export const as: {
  * // { _id: 'Option', _tag: 'Some', value: 42 }
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const asSome: <A, E, R>(self: Effect<A, E, R>) => Effect<Option<A>, E, R> = internal.asSome
@@ -3612,7 +3525,7 @@ export const asSome: <A, E, R>(self: Effect<A, E, R>) => Effect<Option<A>, E, R>
  * // undefined (void)
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const asVoid: <A, E, R>(self: Effect<A, E, R>) => Effect<void, E, R> = internal.asVoid
@@ -3640,7 +3553,7 @@ export const asVoid: <A, E, R>(self: Effect<A, E, R>) => Effect<void, E, R> = in
  * const flipped = Effect.flip(program)
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const flip: <A, E, R>(self: Effect<A, E, R>) => Effect<E, A, R> = internal.flip
@@ -3714,7 +3627,7 @@ export const flip: <A, E, R>(self: Effect<A, E, R>) => Effect<E, A, R> = interna
  * // [ 1, 'hello' ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zip: {
@@ -3787,7 +3700,7 @@ export const zip: {
    * // [ 1, 'hello' ]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <A2, E2, R2>(
@@ -3863,7 +3776,7 @@ export const zip: {
    * // [ 1, 'hello' ]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <A, E, R, A2, E2, R2>(
@@ -3916,7 +3829,7 @@ export const zip: {
  * // 6
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipWith: {
@@ -3963,7 +3876,7 @@ export const zipWith: {
    * // 6
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <A2, E2, R2, A, B>(
@@ -4014,7 +3927,7 @@ export const zipWith: {
    * // 6
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <A, E, R, A2, E2, R2, B>(
@@ -4055,13 +3968,7 @@ export {
    *
    * @see {@link catchCause} for a version that can recover from both recoverable and unrecoverable errors.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.catchAll`
-   *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   catch_ as catch
@@ -4105,7 +4012,7 @@ export {
  * )
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const catchTag: {
@@ -4147,7 +4054,7 @@ export const catchTag: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <
@@ -4204,7 +4111,7 @@ export const catchTag: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <
@@ -4268,7 +4175,7 @@ export const catchTag: {
  * })
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const catchTags: {
@@ -4312,7 +4219,7 @@ export const catchTags: {
    * })
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <
@@ -4384,7 +4291,7 @@ export const catchTags: {
    * })
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <
@@ -4452,7 +4359,7 @@ export const catchTags: {
  * )
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchReason: {
@@ -4489,7 +4396,7 @@ export const catchReason: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <
@@ -4551,7 +4458,7 @@ export const catchReason: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <
@@ -4609,7 +4516,7 @@ export const catchReason: {
  * )
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchReasons: {
@@ -4645,7 +4552,7 @@ export const catchReasons: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <
@@ -4720,7 +4627,7 @@ export const catchReasons: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <
@@ -4771,7 +4678,7 @@ export const catchReasons: {
  *
  * Used by `catchReasons` and `unwrapReason` to constrain the parent error tag to reason-bearing errors.
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export type TagsWithReason<E> = {
@@ -4806,7 +4713,7 @@ export type TagsWithReason<E> = {
  * const unwrapped = program.pipe(Effect.unwrapReason("AiError"))
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const unwrapReason: {
@@ -4838,7 +4745,7 @@ export const unwrapReason: {
    * const unwrapped = program.pipe(Effect.unwrapReason("AiError"))
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <
@@ -4873,7 +4780,7 @@ export const unwrapReason: {
    * const unwrapped = program.pipe(Effect.unwrapReason("AiError"))
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <
@@ -4901,12 +4808,6 @@ export const unwrapReason: {
  * they often indicate serious issues. However, in some cases, such as
  * dynamically loaded plugins, controlled recovery might be needed.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Effect.catchAllCause`
- *
  * **Example** (Usage)
  *
  * ```ts
@@ -4926,7 +4827,7 @@ export const unwrapReason: {
  * })
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchCause: {
@@ -4947,12 +4848,6 @@ export const catchCause: {
    * they often indicate serious issues. However, in some cases, such as
    * dynamically loaded plugins, controlled recovery might be needed.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.catchAllCause`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -4972,7 +4867,7 @@ export const catchCause: {
    * })
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <E, A2, E2, R2>(f: (cause: Cause.Cause<E>) => Effect<A2, E2, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A2 | A, E2, R2 | R>
@@ -4993,12 +4888,6 @@ export const catchCause: {
    * they often indicate serious issues. However, in some cases, such as
    * dynamically loaded plugins, controlled recovery might be needed.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.catchAllCause`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -5018,7 +4907,7 @@ export const catchCause: {
    * })
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <A, E, R, A2, E2, R2>(self: Effect<A, E, R>, f: (cause: Cause.Cause<E>) => Effect<A2, E2, R2>): Effect<A | A2, E2, R | R2>
@@ -5043,12 +4932,6 @@ export const catchCause: {
  * they often indicate serious issues. In some cases, such as dynamically loaded
  * plugins, controlled recovery may be needed.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Effect.catchAllDefect`
- *
  * **Example** (Usage)
  *
  * ```ts
@@ -5067,7 +4950,7 @@ export const catchCause: {
  * })
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchDefect: {
@@ -5090,12 +4973,6 @@ export const catchDefect: {
    * they often indicate serious issues. In some cases, such as dynamically loaded
    * plugins, controlled recovery may be needed.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.catchAllDefect`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -5114,7 +4991,7 @@ export const catchDefect: {
    * })
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <A2, E2, R2>(f: (defect: unknown) => Effect<A2, E2, R2>): <A, E, R>(self: Effect<A, E, R>) => Effect<A2 | A, E2 | E, R2 | R>
@@ -5137,12 +5014,6 @@ export const catchDefect: {
    * they often indicate serious issues. In some cases, such as dynamically loaded
    * plugins, controlled recovery may be needed.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.catchAllDefect`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -5161,7 +5032,7 @@ export const catchDefect: {
    * })
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <A, E, R, A2, E2, R2>(self: Effect<A, E, R>, f: (defect: unknown) => Effect<A2, E2, R2>): Effect<A | A2, E | E2, R | R2>
@@ -5177,13 +5048,6 @@ export const catchDefect: {
  * matching. Non-matching errors re-fail with the original cause. Defects and
  * interrupts are not caught.
  *
- * **Previously Known As**
- *
- * This API replaces the following:
- *
- * - `Effect.catchSome` (Effect 3.x)
- * - `Effect.catchIf`
- *
  * **Example** (Usage)
  *
  * ```ts
@@ -5210,7 +5074,7 @@ export const catchDefect: {
  * )
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const catchIf: {
@@ -5224,13 +5088,6 @@ export const catchIf: {
    * matching. Non-matching errors re-fail with the original cause. Defects and
    * interrupts are not caught.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following:
-   *
-   * - `Effect.catchSome` (Effect 3.x)
-   * - `Effect.catchIf`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -5257,7 +5114,7 @@ export const catchIf: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <E, EB extends E, A2, E2, R2, A3 = never, E3 = Exclude<E, EB>, R3 = never>(
@@ -5275,13 +5132,6 @@ export const catchIf: {
    * matching. Non-matching errors re-fail with the original cause. Defects and
    * interrupts are not caught.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following:
-   *
-   * - `Effect.catchSome` (Effect 3.x)
-   * - `Effect.catchIf`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -5308,7 +5158,7 @@ export const catchIf: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <E, A2, E2, R2, A3 = never, E3 = E, R3 = never>(
@@ -5326,13 +5176,6 @@ export const catchIf: {
    * matching. Non-matching errors re-fail with the original cause. Defects and
    * interrupts are not caught.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following:
-   *
-   * - `Effect.catchSome` (Effect 3.x)
-   * - `Effect.catchIf`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -5359,7 +5202,7 @@ export const catchIf: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, EB extends E, A2, E2, R2, A3 = never, E3 = Exclude<E, EB>, R3 = never>(
@@ -5378,13 +5221,6 @@ export const catchIf: {
    * matching. Non-matching errors re-fail with the original cause. Defects and
    * interrupts are not caught.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following:
-   *
-   * - `Effect.catchSome` (Effect 3.x)
-   * - `Effect.catchIf`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -5411,7 +5247,7 @@ export const catchIf: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, A2, E2, R2, A3 = never, E3 = E, R3 = never>(
@@ -5425,14 +5261,14 @@ export const catchIf: {
 /**
  * Recovers from specific errors using a `Filter`.
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchFilter: {
   /**
    * Recovers from specific errors using a `Filter`.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <E, EB, A2, E2, R2, X, A3 = never, E3 = X, R3 = never>(
@@ -5443,7 +5279,7 @@ export const catchFilter: {
   /**
    * Recovers from specific errors using a `Filter`.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <A, E, R, EB, A2, E2, R2, X, A3 = never, E3 = X, R3 = never>(
@@ -5472,14 +5308,8 @@ export const catchFilter: {
  * Effect.runPromise(none).then(console.log) // { _id: 'Option', _tag: 'None' }
  * ```
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Effect.optionFromOptional`
- *
- * @category Error Handling
- * @since 2.0.0
+ * @category error handling
+ * @since 4.0.0
  */
 export const catchNoSuchElement: <A, E, R>(
   self: Effect<A, E, R>
@@ -5492,12 +5322,6 @@ export const catchNoSuchElement: <A, E, R>(
  * that match a specific predicate. This is useful when you want to handle
  * only certain types of errors while letting others propagate.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Effect.catchSomeCause`
- *
  * **Example** (Usage)
  *
  * ```ts
@@ -5521,7 +5345,7 @@ export const catchNoSuchElement: <A, E, R>(
  * // Then: "Fallback response"
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchCauseIf: {
@@ -5532,12 +5356,6 @@ export const catchCauseIf: {
    * that match a specific predicate. This is useful when you want to handle
    * only certain types of errors while letting others propagate.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.catchSomeCause`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -5561,7 +5379,7 @@ export const catchCauseIf: {
    * // Then: "Fallback response"
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <E, B, E2, R2>(
@@ -5575,12 +5393,6 @@ export const catchCauseIf: {
    * that match a specific predicate. This is useful when you want to handle
    * only certain types of errors while letting others propagate.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.catchSomeCause`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -5604,7 +5416,7 @@ export const catchCauseIf: {
    * // Then: "Fallback response"
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <A, E, R, B, E2, R2>(
@@ -5617,14 +5429,14 @@ export const catchCauseIf: {
 /**
  * Recovers from specific failures based on a `Filter`.
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchCauseFilter: {
   /**
    * Recovers from specific failures based on a `Filter`.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <E, B, E2, R2, EB, X extends Cause.Cause<any>>(
@@ -5634,7 +5446,7 @@ export const catchCauseFilter: {
   /**
    * Recovers from specific failures based on a `Filter`.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <A, E, R, B, E2, R2, EB, X extends Cause.Cause<any>>(
@@ -5655,7 +5467,7 @@ export const catchCauseFilter: {
  *
  * @see {@link map} for a version that operates on the success channel.
  * @see {@link mapBoth} for a version that operates on both channels.
- * @see {@link orElseFail} if you want to replace the error with a new one.
+ * @see {@link mapError} if you want to replace the error with a new one.
  *
  * **Example** (Usage)
  *
@@ -5676,7 +5488,7 @@ export const catchCauseFilter: {
  * )
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const mapError: {
@@ -5691,7 +5503,7 @@ export const mapError: {
    *
    * @see {@link map} for a version that operates on the success channel.
    * @see {@link mapBoth} for a version that operates on both channels.
-   * @see {@link orElseFail} if you want to replace the error with a new one.
+   * @see {@link mapError} if you want to replace the error with a new one.
    *
    * **Example** (Usage)
    *
@@ -5712,7 +5524,7 @@ export const mapError: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <E, E2>(f: (e: E) => E2): <A, R>(self: Effect<A, E, R>) => Effect<A, E2, R>
@@ -5727,7 +5539,7 @@ export const mapError: {
    *
    * @see {@link map} for a version that operates on the success channel.
    * @see {@link mapBoth} for a version that operates on both channels.
-   * @see {@link orElseFail} if you want to replace the error with a new one.
+   * @see {@link mapError} if you want to replace the error with a new one.
    *
    * **Example** (Usage)
    *
@@ -5748,7 +5560,7 @@ export const mapError: {
    * )
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, E2>(self: Effect<A, E, R>, f: (e: E) => E2): Effect<A, E2, R>
@@ -5786,7 +5598,7 @@ export const mapError: {
  * @see {@link map} for a version that operates on the success channel.
  * @see {@link mapError} for a version that operates on the error channel.
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const mapBoth: {
@@ -5822,7 +5634,7 @@ export const mapBoth: {
    * @see {@link map} for a version that operates on the success channel.
    * @see {@link mapError} for a version that operates on the error channel.
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <E, E2, A, A2>(
@@ -5860,7 +5672,7 @@ export const mapBoth: {
    * @see {@link map} for a version that operates on the success channel.
    * @see {@link mapError} for a version that operates on the error channel.
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, E, R, E2, A2>(
@@ -5878,7 +5690,7 @@ export const mapBoth: {
  * Use `orDie` when a typed failure represents an unrecoverable bug or invalid
  * state and should not be handled as a recoverable error.
  *
- * @see {@link orDieWith} if you need to customize the error.
+ * @see {@link mapError} to transform the error before converting it into a defect with {@link orDie}.
  *
  * **Example** (Propagating an Error as a Defect)
  *
@@ -5936,7 +5748,7 @@ export const orDie: <A, E, R>(self: Effect<A, E, R>) => Effect<A, never, R> = in
  * // expected error: NetworkError
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const tapError: {
@@ -5969,7 +5781,7 @@ export const tapError: {
    * // expected error: NetworkError
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <E, X, E2, R2>(f: (e: NoInfer<E>) => Effect<X, E2, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A, E | E2, R2 | R>
@@ -6002,7 +5814,7 @@ export const tapError: {
    * // expected error: NetworkError
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, X, E2, R2>(self: Effect<A, E, R>, f: (e: E) => Effect<X, E2, R2>): Effect<A, E | E2, R | R2>
@@ -6040,7 +5852,7 @@ export const tapError: {
  * // expected error: 504
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const tapErrorTag: {
@@ -6076,7 +5888,7 @@ export const tapErrorTag: {
    * // expected error: 504
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <const K extends Tags<E> | Arr.NonEmptyReadonlyArray<Tags<E>>, E, A1, E1, R1>(
@@ -6115,7 +5927,7 @@ export const tapErrorTag: {
    * // expected error: 504
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <
@@ -6143,12 +5955,6 @@ export const tapErrorTag: {
  * the operation succeeds, the original cause is preserved. If the operation
  * fails, its error is also represented in the returned effect.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Effect.tapErrorCause`
- *
  * **Example** (Usage)
  *
  * ```ts
@@ -6166,8 +5972,8 @@ export const tapErrorTag: {
  * // Then: { _id: 'Exit', _tag: 'Failure', cause: ... }
  * ```
  *
- * @category Sequencing
- * @since 2.0.0
+ * @category sequencing
+ * @since 4.0.0
  */
 export const tapCause: {
   /**
@@ -6180,12 +5986,6 @@ export const tapCause: {
    * the operation succeeds, the original cause is preserved. If the operation
    * fails, its error is also represented in the returned effect.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.tapErrorCause`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -6203,8 +6003,8 @@ export const tapCause: {
    * // Then: { _id: 'Exit', _tag: 'Failure', cause: ... }
    * ```
    *
-   * @category Sequencing
-   * @since 2.0.0
+   * @category sequencing
+   * @since 4.0.0
    */
   <E, X, E2, R2>(f: (cause: Cause.Cause<NoInfer<E>>) => Effect<X, E2, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A, E | E2, R2 | R>
   /**
@@ -6217,12 +6017,6 @@ export const tapCause: {
    * the operation succeeds, the original cause is preserved. If the operation
    * fails, its error is also represented in the returned effect.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Effect.tapErrorCause`
-   *
    * **Example** (Usage)
    *
    * ```ts
@@ -6240,8 +6034,8 @@ export const tapCause: {
    * // Then: { _id: 'Exit', _tag: 'Failure', cause: ... }
    * ```
    *
-   * @category Sequencing
-   * @since 2.0.0
+   * @category sequencing
+   * @since 4.0.0
    */
   <A, E, R, X, E2, R2>(self: Effect<A, E, R>, f: (cause: Cause.Cause<E>) => Effect<X, E2, R2>): Effect<A, E | E2, R | R2>
 } = internal.tapCause
@@ -6272,7 +6066,7 @@ export const tapCause: {
  * // Then: { _id: 'Exit', _tag: 'Failure', cause: ... }
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 4.0.0
  */
 export const tapCauseIf: {
@@ -6302,7 +6096,7 @@ export const tapCauseIf: {
    * // Then: { _id: 'Exit', _tag: 'Failure', cause: ... }
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 4.0.0
    */
   <E, B, E2, R2>(
@@ -6335,7 +6129,7 @@ export const tapCauseIf: {
    * // Then: { _id: 'Exit', _tag: 'Failure', cause: ... }
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 4.0.0
    */
   <A, E, R, B, E2, R2>(
@@ -6348,14 +6142,14 @@ export const tapCauseIf: {
 /**
  * Conditionally executes a side effect based on the cause of a failed effect.
  *
- * @category Sequencing
+ * @category sequencing
  * @since 4.0.0
  */
 export const tapCauseFilter: {
   /**
    * Conditionally executes a side effect based on the cause of a failed effect.
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 4.0.0
    */
   <E, B, E2, R2, EB, X extends Cause.Cause<any>>(
@@ -6365,7 +6159,7 @@ export const tapCauseFilter: {
   /**
    * Conditionally executes a side effect based on the cause of a failed effect.
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 4.0.0
    */
   <A, E, R, B, E2, R2, EB, X extends Cause.Cause<any>>(
@@ -6419,7 +6213,7 @@ export const tapCauseFilter: {
  * //   ... stack trace ...
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const tapDefect: {
@@ -6467,7 +6261,7 @@ export const tapDefect: {
    * //   ... stack trace ...
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <E, B, E2, R2>(f: (defect: unknown) => Effect<B, E2, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A, E | E2, R | R2>
@@ -6515,7 +6309,7 @@ export const tapDefect: {
    * //   ... stack trace ...
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, B, E2, R2>(self: Effect<A, E, R>, f: (defect: unknown) => Effect<B, E2, R2>): Effect<A, E | E2, R | R2>
@@ -6564,14 +6358,13 @@ export const eventually: <A, E, R>(self: Effect<A, E, R>) => Effect<A, never, R>
 /**
  * Type helpers for retrying effects.
  *
- * @category Error Handling
  * @since 2.0.0
  */
 export declare namespace Retry {
   /**
    * Computes the result type of `Effect.retry` from the original effect and retry options.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   export type Return<R, E, A, O extends Options<E>> = Effect<
@@ -6600,7 +6393,7 @@ export declare namespace Retry {
   /**
    * Options that control whether and how a failing effect is retried.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   export interface Options<E> {
@@ -6655,7 +6448,7 @@ export declare namespace Retry {
  * @see {@link retryOrElse} for a version that allows you to run a fallback.
  * @see {@link repeat} if your retry condition is based on successful outcomes rather than errors.
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const retry: {
@@ -6703,7 +6496,7 @@ export const retry: {
    * @see {@link retryOrElse} for a version that allows you to run a fallback.
    * @see {@link repeat} if your retry condition is based on successful outcomes rather than errors.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <E, O extends Retry.Options<E>>(options: O): <A, R>(self: Effect<A, E, R>) => Retry.Return<R, E, A, O>
@@ -6751,7 +6544,7 @@ export const retry: {
    * @see {@link retryOrElse} for a version that allows you to run a fallback.
    * @see {@link repeat} if your retry condition is based on successful outcomes rather than errors.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <B, E, Error, Env>(policy: Schedule<B, NoInfer<E>, Error, Env>): <A, R>(self: Effect<A, E, R>) => Effect<A, E | Error, R | Env>
@@ -6799,7 +6592,7 @@ export const retry: {
    * @see {@link retryOrElse} for a version that allows you to run a fallback.
    * @see {@link repeat} if your retry condition is based on successful outcomes rather than errors.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <B, E, Error, Env>(
@@ -6851,7 +6644,7 @@ export const retry: {
    * @see {@link retryOrElse} for a version that allows you to run a fallback.
    * @see {@link repeat} if your retry condition is based on successful outcomes rather than errors.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, O extends Retry.Options<E>>(self: Effect<A, E, R>, options: O): Retry.Return<R, E, A, O>
@@ -6899,7 +6692,7 @@ export const retry: {
    * @see {@link retryOrElse} for a version that allows you to run a fallback.
    * @see {@link repeat} if your retry condition is based on successful outcomes rather than errors.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, B, Error, Env>(self: Effect<A, E, R>, policy: Schedule<B, NoInfer<E>, Error, Env>): Effect<A, E | Error, R | Env>
@@ -6947,7 +6740,7 @@ export const retry: {
    * @see {@link retryOrElse} for a version that allows you to run a fallback.
    * @see {@link repeat} if your retry condition is based on successful outcomes rather than errors.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, B, Error, Env>(
@@ -7012,7 +6805,7 @@ export const retry: {
  * // Network data
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const retryOrElse: {
@@ -7070,7 +6863,7 @@ export const retryOrElse: {
    * // Network data
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A1, E, E1, R1, A2, E2, R2>(
@@ -7131,7 +6924,7 @@ export const retryOrElse: {
    * // Network data
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, A1, E1, R1, A2, E2, R2>(
@@ -7167,9 +6960,9 @@ export const retryOrElse: {
  * // Output: "Caught cause: Something went wrong"
  * ```
  *
- * @see {@link unsandbox} to restore the original error handling.
+ * @see {@link sandbox} to expose failures as full causes.
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const sandbox: <A, E, R>(
@@ -7213,13 +7006,7 @@ export const sandbox: <A, E, R>(
  * const programWarn = task.pipe(Effect.ignore({ log: "Warn", message: "Ignoring task failure" }))
  * ```
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Effect.ignoreLogged`
- *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const ignore: <
@@ -7256,7 +7043,7 @@ export const ignore: <
  * const programLog = task.pipe(Effect.ignoreCause({ log: true, message: "Ignoring failure cause" }))
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const ignoreCause: <
@@ -7287,7 +7074,7 @@ export const ignoreCause: <
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect, ExecutionPlan, Layer, Context } from "effect"
+ * import { Context, Effect, ExecutionPlan, Layer } from "effect"
  *
  * const Endpoint = Context.Service<{ url: string }>("Endpoint")
  *
@@ -7322,7 +7109,7 @@ export const withExecutionPlan: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, ExecutionPlan, Layer, Context } from "effect"
+   * import { Context, Effect, ExecutionPlan, Layer } from "effect"
    *
    * const Endpoint = Context.Service<{ url: string }>("Endpoint")
    *
@@ -7361,7 +7148,7 @@ export const withExecutionPlan: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, ExecutionPlan, Layer, Context } from "effect"
+   * import { Context, Effect, ExecutionPlan, Layer } from "effect"
    *
    * const Endpoint = Context.Service<{ url: string }>("Endpoint")
    *
@@ -7396,7 +7183,7 @@ export const withExecutionPlan: {
  * If the `defectsOnly` option is set to `true`, only defects (unrecoverable
  * errors) will be reported, while regular failures will be ignored.
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const withErrorReporting: <
@@ -7596,9 +7383,7 @@ export const firstSuccessOf: <Eff extends Effect<any, any, any>>(
  * your program waits for a task to finish, ensuring that it doesn't hang
  * indefinitely if the task takes too long.
  *
- * @see {@link timeoutFail} for a version that raises a custom error.
- * @see {@link timeoutFailCause} for a version that raises a custom defect.
- * @see {@link timeoutTo} for a version that allows specifying both success and timeout handlers.
+ * @see {@link timeoutOrElse} for a version that allows specifying both success and timeout handlers.
  *
  * **Example** (Usage)
  *
@@ -7648,9 +7433,7 @@ export const timeout: {
    * your program waits for a task to finish, ensuring that it doesn't hang
    * indefinitely if the task takes too long.
    *
-   * @see {@link timeoutFail} for a version that raises a custom error.
-   * @see {@link timeoutFailCause} for a version that raises a custom defect.
-   * @see {@link timeoutTo} for a version that allows specifying both success and timeout handlers.
+   * @see {@link timeoutOrElse} for a version that allows specifying both success and timeout handlers.
    *
    * **Example** (Usage)
    *
@@ -7700,9 +7483,7 @@ export const timeout: {
    * your program waits for a task to finish, ensuring that it doesn't hang
    * indefinitely if the task takes too long.
    *
-   * @see {@link timeoutFail} for a version that raises a custom error.
-   * @see {@link timeoutFailCause} for a version that raises a custom defect.
-   * @see {@link timeoutTo} for a version that allows specifying both success and timeout handlers.
+   * @see {@link timeoutOrElse} for a version that allows specifying both success and timeout handlers.
    *
    * **Example** (Usage)
    *
@@ -7752,9 +7533,7 @@ export const timeout: {
  * source effect fails before the timeout, that failure is preserved.
  *
  * @see {@link timeout} for a version that raises a `TimeoutException`.
- * @see {@link timeoutFail} for a version that raises a custom error.
- * @see {@link timeoutFailCause} for a version that raises a custom defect.
- * @see {@link timeoutTo} for a version that allows specifying both success and timeout handlers.
+ * @see {@link timeoutOrElse} for a version that allows specifying both success and timeout handlers.
  *
  * **Example** (Usage)
  *
@@ -7800,9 +7579,7 @@ export const timeoutOption: {
    * source effect fails before the timeout, that failure is preserved.
    *
    * @see {@link timeout} for a version that raises a `TimeoutException`.
-   * @see {@link timeoutFail} for a version that raises a custom error.
-   * @see {@link timeoutFailCause} for a version that raises a custom defect.
-   * @see {@link timeoutTo} for a version that allows specifying both success and timeout handlers.
+   * @see {@link timeoutOrElse} for a version that allows specifying both success and timeout handlers.
    *
    * **Example** (Usage)
    *
@@ -7848,9 +7625,7 @@ export const timeoutOption: {
    * source effect fails before the timeout, that failure is preserved.
    *
    * @see {@link timeout} for a version that raises a `TimeoutException`.
-   * @see {@link timeoutFail} for a version that raises a custom error.
-   * @see {@link timeoutFailCause} for a version that raises a custom defect.
-   * @see {@link timeoutTo} for a version that allows specifying both success and timeout handlers.
+   * @see {@link timeoutOrElse} for a version that allows specifying both success and timeout handlers.
    *
    * **Example** (Usage)
    *
@@ -7921,7 +7696,7 @@ export const timeoutOption: {
  * ```
  *
  * @category Delays & Timeouts
- * @since 3.1.0
+ * @since 4.0.0
  */
 export const timeoutOrElse: {
   /**
@@ -7959,7 +7734,7 @@ export const timeoutOrElse: {
    * ```
    *
    * @category Delays & Timeouts
-   * @since 3.1.0
+   * @since 4.0.0
    */
   <A2, E2, R2>(
     options: {
@@ -8002,7 +7777,7 @@ export const timeoutOrElse: {
    * ```
    *
    * @category Delays & Timeouts
-   * @since 3.1.0
+   * @since 4.0.0
    */
   <A, E, R, A2, E2, R2>(
     self: Effect<A, E, R>,
@@ -8447,7 +8222,7 @@ export const raceFirst: {
  * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const filter: {
@@ -8473,7 +8248,7 @@ export const filter: {
    * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, B extends A>(refinement: Predicate.Refinement<NoInfer<A>, B>): (elements: Iterable<A>) => Effect<Array<B>>
@@ -8499,7 +8274,7 @@ export const filter: {
    * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A>(predicate: Predicate.Predicate<NoInfer<A>>): (elements: Iterable<A>) => Effect<Array<A>>
@@ -8525,7 +8300,7 @@ export const filter: {
    * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(
@@ -8554,7 +8329,7 @@ export const filter: {
    * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, B extends A>(elements: Iterable<A>, refinement: Predicate.Refinement<A, B>): Effect<Array<B>>
@@ -8580,7 +8355,7 @@ export const filter: {
    * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A>(elements: Iterable<A>, predicate: Predicate.Predicate<A>): Effect<Array<A>>
@@ -8606,7 +8381,7 @@ export const filter: {
    * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(
@@ -8619,22 +8394,22 @@ export const filter: {
 /**
  * Filters and maps elements of an iterable with a `Filter`.
  *
- * @category Filtering
- * @since 4.0.0
+ * @category filtering
+ * @since 2.0.0
  */
 export const filterMap: {
   /**
    * Filters and maps elements of an iterable with a `Filter`.
    *
-   * @category Filtering
-   * @since 4.0.0
+   * @category filtering
+   * @since 2.0.0
    */
   <A, B, X>(filter: Filter.Filter<NoInfer<A>, B, X>): (elements: Iterable<A>) => Effect<Array<B>>
   /**
    * Filters and maps elements of an iterable with a `Filter`.
    *
-   * @category Filtering
-   * @since 4.0.0
+   * @category filtering
+   * @since 2.0.0
    */
   <A, B, X>(elements: Iterable<A>, filter: Filter.Filter<NoInfer<A>, B, X>): Effect<Array<B>>
 } = internal.filterMap
@@ -8642,14 +8417,14 @@ export const filterMap: {
 /**
  * Effectfully filters and maps elements of an iterable with a `FilterEffect`.
  *
- * @category Filtering
+ * @category filtering
  * @since 4.0.0
  */
 export const filterMapEffect: {
   /**
    * Effectfully filters and maps elements of an iterable with a `FilterEffect`.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, B, X, E, R>(
@@ -8659,7 +8434,7 @@ export const filterMapEffect: {
   /**
    * Effectfully filters and maps elements of an iterable with a `FilterEffect`.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, B, X, E, R>(
@@ -8697,7 +8472,7 @@ export const filterMapEffect: {
  * // Result: "Number 5 is odd" (since 5 is not even)
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const filterOrElse: {
@@ -8729,7 +8504,7 @@ export const filterOrElse: {
    * // Result: "Number 5 is odd" (since 5 is not even)
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, C, E2, R2, B extends A>(
@@ -8764,7 +8539,7 @@ export const filterOrElse: {
    * // Result: "Number 5 is odd" (since 5 is not even)
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, C, E2, R2>(
@@ -8799,7 +8574,7 @@ export const filterOrElse: {
    * // Result: "Number 5 is odd" (since 5 is not even)
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, C, E2, R2, B extends A>(
@@ -8835,7 +8610,7 @@ export const filterOrElse: {
    * // Result: "Number 5 is odd" (since 5 is not even)
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, C, E2, R2>(
@@ -8848,14 +8623,14 @@ export const filterOrElse: {
 /**
  * Filters an effect with a `Filter`, providing an alternative effect on failure.
  *
- * @category Filtering
+ * @category filtering
  * @since 4.0.0
  */
 export const filterMapOrElse: {
   /**
    * Filters an effect with a `Filter`, providing an alternative effect on failure.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, B, X, C, E2, R2>(
@@ -8865,7 +8640,7 @@ export const filterMapOrElse: {
   /**
    * Filters an effect with a `Filter`, providing an alternative effect on failure.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, E, R, B, X, C, E2, R2>(
@@ -8902,7 +8677,7 @@ export const filterMapOrElse: {
  * // Result: Effect.fail("Expected even number, got 5")
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const filterOrFail: {
@@ -8933,7 +8708,7 @@ export const filterOrFail: {
    * // Result: Effect.fail("Expected even number, got 5")
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E2, B extends A>(
@@ -8967,7 +8742,7 @@ export const filterOrFail: {
    * // Result: Effect.fail("Expected even number, got 5")
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E2>(
@@ -9001,7 +8776,7 @@ export const filterOrFail: {
    * // Result: Effect.fail("Expected even number, got 5")
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, B extends A>(refinement: Predicate.Refinement<NoInfer<A>, B>): <E, R>(self: Effect<A, E, R>) => Effect<B, Cause.NoSuchElementError | E, R>
@@ -9032,7 +8807,7 @@ export const filterOrFail: {
    * // Result: Effect.fail("Expected even number, got 5")
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A>(predicate: Predicate.Predicate<NoInfer<A>>): <E, R>(self: Effect<A, E, R>) => Effect<A, Cause.NoSuchElementError | E, R>
@@ -9063,7 +8838,7 @@ export const filterOrFail: {
    * // Result: Effect.fail("Expected even number, got 5")
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, E2, B extends A>(
@@ -9098,7 +8873,7 @@ export const filterOrFail: {
    * // Result: Effect.fail("Expected even number, got 5")
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, E2>(
@@ -9133,7 +8908,7 @@ export const filterOrFail: {
    * // Result: Effect.fail("Expected even number, got 5")
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, B extends A>(self: Effect<A, E, R>, refinement: Predicate.Refinement<NoInfer<A>, B>): Effect<B, E | Cause.NoSuchElementError, R>
@@ -9164,7 +8939,7 @@ export const filterOrFail: {
    * // Result: Effect.fail("Expected even number, got 5")
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(self: Effect<A, E, R>, predicate: Predicate.Predicate<NoInfer<A>>): Effect<A, E | Cause.NoSuchElementError, R>
@@ -9173,28 +8948,28 @@ export const filterOrFail: {
 /**
  * Filters an effect with a `Filter`, failing when the filter fails.
  *
- * @category Filtering
+ * @category filtering
  * @since 4.0.0
  */
 export const filterMapOrFail: {
   /**
    * Filters an effect with a `Filter`, failing when the filter fails.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, B, X, E2>(filter: Filter.Filter<NoInfer<A>, B, X>, orFailWith: (x: X) => E2): <E, R>(self: Effect<A, E, R>) => Effect<B, E2 | E, R>
   /**
    * Filters an effect with a `Filter`, failing when the filter fails.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, B, X>(filter: Filter.Filter<NoInfer<A>, B, X>): <E, R>(self: Effect<A, E, R>) => Effect<B, Cause.NoSuchElementError | E, R>
   /**
    * Filters an effect with a `Filter`, failing when the filter fails.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, E, R, B, X, E2>(
@@ -9205,7 +8980,7 @@ export const filterMapOrFail: {
   /**
    * Filters an effect with a `Filter`, failing when the filter fails.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, E, R, B, X>(self: Effect<A, E, R>, filter: Filter.Filter<A, B, X>): Effect<B, Cause.NoSuchElementError | E, R>
@@ -9248,8 +9023,7 @@ export const filterMapOrFail: {
  * // { _id: 'Option', _tag: 'Some', value: undefined }
  * ```
  *
- * @see {@link whenEffect} for a version that allows the condition to be an effect.
- * @see {@link unless} for a version that executes the effect when the condition is `false`.
+ * @see {@link when} for conditional execution with a boolean condition.
  *
  * @category Conditional Operators
  * @since 2.0.0
@@ -9292,8 +9066,7 @@ export const when: {
    * // { _id: 'Option', _tag: 'Some', value: undefined }
    * ```
    *
-   * @see {@link whenEffect} for a version that allows the condition to be an effect.
-   * @see {@link unless} for a version that executes the effect when the condition is `false`.
+   * @see {@link when} for conditional execution with a boolean condition.
    *
    * @category Conditional Operators
    * @since 2.0.0
@@ -9336,8 +9109,7 @@ export const when: {
    * // { _id: 'Option', _tag: 'Some', value: undefined }
    * ```
    *
-   * @see {@link whenEffect} for a version that allows the condition to be an effect.
-   * @see {@link unless} for a version that executes the effect when the condition is `false`.
+   * @see {@link when} for conditional execution with a boolean condition.
    *
    * @category Conditional Operators
    * @since 2.0.0
@@ -9567,7 +9339,7 @@ export const match: {
  * @see {@link matchEffect} if you need to perform side effects in the handlers.
  *
  * @category Pattern Matching
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const matchEager: {
   /**
@@ -9605,7 +9377,7 @@ export const matchEager: {
    * @see {@link matchEffect} if you need to perform side effects in the handlers.
    *
    * @category Pattern Matching
-   * @since 2.0.0
+   * @since 4.0.0
    */
   <E, A2, A, A3>(
     options: {
@@ -9648,7 +9420,7 @@ export const matchEager: {
    * @see {@link matchEffect} if you need to perform side effects in the handlers.
    *
    * @category Pattern Matching
-   * @since 2.0.0
+   * @since 4.0.0
    */
   <A, E, R, A2, A3>(
     self: Effect<A, E, R>,
@@ -9813,7 +9585,7 @@ export const matchCause: {
  * ```
  *
  * @category Pattern Matching
- * @since 3.8.0
+ * @since 4.0.0
  */
 export const matchCauseEager: {
   /**
@@ -9843,7 +9615,7 @@ export const matchCauseEager: {
    * ```
    *
    * @category Pattern Matching
-   * @since 3.8.0
+   * @since 4.0.0
    */
   <E, A2, A, A3>(
     options: {
@@ -9878,7 +9650,7 @@ export const matchCauseEager: {
    * ```
    *
    * @category Pattern Matching
-   * @since 3.8.0
+   * @since 4.0.0
    */
   <A, E, R, A2, A3>(
     self: Effect<A, E, R>,
@@ -10377,7 +10149,7 @@ export const isSuccess: <A, E, R>(self: Effect<A, E, R>) => Effect<boolean, neve
  * **Example** (Usage)
  *
  * ```ts
- * import { Console, Effect, Option, Context } from "effect"
+ * import { Console, Context, Effect, Option } from "effect"
  *
  * const Logger = Context.Service<{
  *   log: (msg: string) => void
@@ -10418,7 +10190,7 @@ export const context: <R = never>() => Effect<Context.Context<R>, never, R> = in
  * **Example** (Usage)
  *
  * ```ts
- * import { Console, Effect, Option, Context } from "effect"
+ * import { Console, Context, Effect, Option } from "effect"
  *
  * const Logger = Context.Service<{
  *   log: (msg: string) => void
@@ -10465,7 +10237,7 @@ export const contextWith: <R, A, E, R2>(
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * interface Database {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -10500,7 +10272,7 @@ export const provide: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, Layer, Context } from "effect"
+   * import { Context, Effect, Layer } from "effect"
    *
    * interface Database {
    *   readonly query: (sql: string) => Effect.Effect<string>
@@ -10546,7 +10318,7 @@ export const provide: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, Layer, Context } from "effect"
+   * import { Context, Effect, Layer } from "effect"
    *
    * interface Database {
    *   readonly query: (sql: string) => Effect.Effect<string>
@@ -10588,7 +10360,7 @@ export const provide: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, Layer, Context } from "effect"
+   * import { Context, Effect, Layer } from "effect"
    *
    * interface Database {
    *   readonly query: (sql: string) => Effect.Effect<string>
@@ -10623,7 +10395,7 @@ export const provide: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, Layer, Context } from "effect"
+   * import { Context, Effect, Layer } from "effect"
    *
    * interface Database {
    *   readonly query: (sql: string) => Effect.Effect<string>
@@ -10668,7 +10440,7 @@ export const provide: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, Layer, Context } from "effect"
+   * import { Context, Effect, Layer } from "effect"
    *
    * interface Database {
    *   readonly query: (sql: string) => Effect.Effect<string>
@@ -10709,7 +10481,7 @@ export const provide: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, Layer, Context } from "effect"
+   * import { Context, Effect, Layer } from "effect"
    *
    * interface Database {
    *   readonly query: (sql: string) => Effect.Effect<string>
@@ -10750,7 +10522,7 @@ export const provide: {
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect, Context } from "effect"
+ * import { Context, Effect } from "effect"
  *
  * // Define service keys
  * const Logger = Context.Service<{
@@ -10776,7 +10548,7 @@ export const provide: {
  * ```
  *
  * @category Environment
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const provideContext: {
   /**
@@ -10791,7 +10563,7 @@ export const provideContext: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, Context } from "effect"
+   * import { Context, Effect } from "effect"
    *
    * // Define service keys
    * const Logger = Context.Service<{
@@ -10817,7 +10589,7 @@ export const provideContext: {
    * ```
    *
    * @category Environment
-   * @since 2.0.0
+   * @since 4.0.0
    */
   <XR>(context: Context.Context<XR>): <A, E, R>(self: Effect<A, E, R>) => Effect<A, E, Exclude<R, XR>>
   /**
@@ -10832,7 +10604,7 @@ export const provideContext: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, Context } from "effect"
+   * import { Context, Effect } from "effect"
    *
    * // Define service keys
    * const Logger = Context.Service<{
@@ -10858,7 +10630,7 @@ export const provideContext: {
    * ```
    *
    * @category Environment
-   * @since 2.0.0
+   * @since 4.0.0
    */
   <A, E, R, XR>(self: Effect<A, E, R>, context: Context.Context<XR>): Effect<A, E, Exclude<R, XR>>
 } = internal.provideContext
@@ -10869,7 +10641,7 @@ export const provideContext: {
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect, Context } from "effect"
+ * import { Context, Effect } from "effect"
  *
  * interface Database {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -10901,7 +10673,7 @@ export const service: <I, S>(service: Context.Key<I, S>) => Effect<S, never, I>
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect, Option, Context } from "effect"
+ * import { Context, Effect, Option } from "effect"
  *
  * // Define a service key
  * const Logger = Context.Service<{
@@ -10936,7 +10708,7 @@ export const serviceOption: <I, S>(key: Context.Key<I, S>) => Effect<Option<S>>
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect, Context } from "effect"
+ * import { Context, Effect } from "effect"
  *
  * // Define services
  * const Logger = Context.Service<{
@@ -10978,7 +10750,7 @@ export const updateContext: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, Context } from "effect"
+   * import { Context, Effect } from "effect"
    *
    * // Define services
    * const Logger = Context.Service<{
@@ -11020,7 +10792,7 @@ export const updateContext: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Effect, Context } from "effect"
+   * import { Context, Effect } from "effect"
    *
    * // Define services
    * const Logger = Context.Service<{
@@ -11066,7 +10838,7 @@ export const updateContext: {
  * **Example** (Usage)
  *
  * ```ts
- * import { Console, Effect, Context } from "effect"
+ * import { Console, Context, Effect } from "effect"
  *
  * // Define a counter service
  * const Counter = Context.Service<{ count: number }>("Counter")
@@ -11100,7 +10872,7 @@ export const updateService: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Console, Effect, Context } from "effect"
+   * import { Console, Context, Effect } from "effect"
    *
    * // Define a counter service
    * const Counter = Context.Service<{ count: number }>("Counter")
@@ -11134,7 +10906,7 @@ export const updateService: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Console, Effect, Context } from "effect"
+   * import { Console, Context, Effect } from "effect"
    *
    * // Define a counter service
    * const Counter = Context.Service<{ count: number }>("Counter")
@@ -11175,7 +10947,7 @@ export const updateService: {
  * **Example** (Usage)
  *
  * ```ts
- * import { Console, Effect, Context } from "effect"
+ * import { Console, Context, Effect } from "effect"
  *
  * // Define a service for configuration
  * const Config = Context.Service<{
@@ -11222,7 +10994,7 @@ export const provideService: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Console, Effect, Context } from "effect"
+   * import { Console, Context, Effect } from "effect"
    *
    * // Define a service for configuration
    * const Config = Context.Service<{
@@ -11269,7 +11041,7 @@ export const provideService: {
      * **Example** (Usage)
      *
      * ```ts
-     * import { Console, Effect, Context } from "effect"
+     * import { Console, Context, Effect } from "effect"
      *
      * // Define a service for configuration
      * const Config = Context.Service<{
@@ -11316,7 +11088,7 @@ export const provideService: {
      * **Example** (Usage)
      *
      * ```ts
-     * import { Console, Effect, Context } from "effect"
+     * import { Console, Context, Effect } from "effect"
      *
      * // Define a service for configuration
      * const Config = Context.Service<{
@@ -11364,7 +11136,7 @@ export const provideService: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Console, Effect, Context } from "effect"
+   * import { Console, Context, Effect } from "effect"
    *
    * // Define a service for configuration
    * const Config = Context.Service<{
@@ -11411,7 +11183,7 @@ export const provideService: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Console, Effect, Context } from "effect"
+   * import { Console, Context, Effect } from "effect"
    *
    * // Define a service for configuration
    * const Config = Context.Service<{
@@ -11458,7 +11230,7 @@ export const provideService: {
  * **Example** (Usage)
  *
  * ```ts
- * import { Console, Effect, Context } from "effect"
+ * import { Console, Context, Effect } from "effect"
  *
  * // Define a database connection service
  * interface DatabaseConnection {
@@ -11512,7 +11284,7 @@ export const provideServiceEffect: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Console, Effect, Context } from "effect"
+   * import { Console, Context, Effect } from "effect"
    *
    * // Define a database connection service
    * interface DatabaseConnection {
@@ -11566,7 +11338,7 @@ export const provideServiceEffect: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Console, Effect, Context } from "effect"
+   * import { Console, Context, Effect } from "effect"
    *
    * // Define a database connection service
    * interface DatabaseConnection {
@@ -11646,7 +11418,7 @@ export const provideServiceEffect: {
  * // [1, 2, 3, 4, 5]
  * ```
  *
- * @category References
+ * @category references
  * @since 2.0.0
  */
 export const withConcurrency: {
@@ -11683,7 +11455,7 @@ export const withConcurrency: {
    * // [1, 2, 3, 4, 5]
    * ```
    *
-   * @category References
+   * @category references
    * @since 2.0.0
    */
   (concurrency: number | "unbounded"): <A, E, R>(self: Effect<A, E, R>) => Effect<A, E, R>
@@ -11720,7 +11492,7 @@ export const withConcurrency: {
    * // [1, 2, 3, 4, 5]
    * ```
    *
-   * @category References
+   * @category references
    * @since 2.0.0
    */
   <A, E, R>(self: Effect<A, E, R>, concurrency: number | "unbounded"): Effect<A, E, R>
@@ -11759,7 +11531,7 @@ export const withConcurrency: {
  * // Releasing resource
  * ```
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 2.0.0
  */
 export const scope: Effect<Scope, never, Scope> = internal.scope
@@ -11793,7 +11565,7 @@ export const scope: Effect<Scope, never, Scope> = internal.scope
  * // Output: "Releasing resource"
  * ```
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 2.0.0
  */
 export const scoped: <A, E, R>(
@@ -11836,8 +11608,8 @@ export const scoped: <A, E, R>(
  * // Manual finalizer
  * ```
  *
- * @category Resource Management & Finalization
- * @since 2.0.0
+ * @category resource management
+ * @since 3.11.0
  */
 export const scopedWith: <A, E, R>(
   f: (scope: Scope) => Effect<A, E, R>
@@ -11894,7 +11666,7 @@ export const scopedWith: <A, E, R>(
  * )
  * ```
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 2.0.0
  */
 export const acquireRelease: <A, E, R, R2>(
@@ -11916,13 +11688,13 @@ export const acquireRelease: <A, E, R, R2>(
  * JavaScript disposal protocal instead of requiring an explicit release
  * function.
  *
- * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/using}
+ * @see [JavaScript `using` declarations](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/using)
  *
  * **Example** (Usage)
  *
  * ```ts
  * import sqlite from "node:sqlite";
- * import { Effect } from "effect";
+ * import { Effect } from "effect"
  *
  * const program = Effect.scoped(
  *   Effect.gen(function* () {
@@ -11938,7 +11710,7 @@ export const acquireRelease: <A, E, R, R2>(
  * )
  * ```
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 4.0.0
  */
 export const acquireDisposable: <A extends AsyncDisposable | Disposable, E, R>(
@@ -12014,7 +11786,7 @@ export const acquireDisposable: <A extends AsyncDisposable | Disposable, E, R>(
  * // Closing connection to db://localhost:5432 (success)
  * ```
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 2.0.0
  */
 export const acquireUseRelease: <Resource, E, R, A, E2, R2, E3, R3>(
@@ -12062,7 +11834,7 @@ export const acquireUseRelease: <Resource, E, R, A, E2, R2, E3, R3>(
  * // operation result
  * ```
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 2.0.0
  */
 export const addFinalizer: <R>(
@@ -12106,7 +11878,7 @@ export const addFinalizer: <R>(
  * // 42
  * ```
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 2.0.0
  */
 export const ensuring: {
@@ -12147,7 +11919,7 @@ export const ensuring: {
    * // 42
    * ```
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 2.0.0
    */
   <X, R1>(finalizer: Effect<X, never, R1>): <A, E, R>(self: Effect<A, E, R>) => Effect<A, E, R1 | R>
@@ -12188,7 +11960,7 @@ export const ensuring: {
    * // 42
    * ```
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 2.0.0
    */
   <A, E, R, X, R1>(self: Effect<A, E, R>, finalizer: Effect<X, never, R1>): Effect<A, E, R1 | R>
@@ -12201,7 +11973,7 @@ export const ensuring: {
  * **Example** (Usage)
  *
  * ```ts
- * import { Cause, Data, Console, Effect } from "effect"
+ * import { Cause, Console, Data, Effect } from "effect"
  *
  * class TaskError extends Data.TaggedError("TaskError")<{ readonly message: string }> {}
  *
@@ -12218,7 +11990,7 @@ export const ensuring: {
  * // TaskError: Something went wrong
  * ```
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 2.0.0
  */
 export const onError: {
@@ -12229,7 +12001,7 @@ export const onError: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Cause, Data, Console, Effect } from "effect"
+   * import { Cause, Console, Data, Effect } from "effect"
    *
    * class TaskError extends Data.TaggedError("TaskError")<{ readonly message: string }> {}
    *
@@ -12246,7 +12018,7 @@ export const onError: {
    * // TaskError: Something went wrong
    * ```
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 2.0.0
    */
   <E, X, R2>(cleanup: (cause: Cause.Cause<E>) => Effect<X, never, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A, E, R2 | R>
@@ -12257,7 +12029,7 @@ export const onError: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Cause, Data, Console, Effect } from "effect"
+   * import { Cause, Console, Data, Effect } from "effect"
    *
    * class TaskError extends Data.TaggedError("TaskError")<{ readonly message: string }> {}
    *
@@ -12274,7 +12046,7 @@ export const onError: {
    * // TaskError: Something went wrong
    * ```
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 2.0.0
    */
   <A, E, R, X, R2>(
@@ -12304,7 +12076,7 @@ export const onError: {
  * )
  * ```
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 4.0.0
  */
 export const onErrorIf: {
@@ -12329,7 +12101,7 @@ export const onErrorIf: {
    * )
    * ```
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 4.0.0
    */
   <E, XE, XR>(
@@ -12357,7 +12129,7 @@ export const onErrorIf: {
    * )
    * ```
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 4.0.0
    */
   <A, E, R, XE, XR>(
@@ -12370,14 +12142,14 @@ export const onErrorIf: {
 /**
  * Runs the finalizer only when this effect fails and the cause matches the provided `Filter`.
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 4.0.0
  */
 export const onErrorFilter: {
   /**
    * Runs the finalizer only when this effect fails and the cause matches the provided `Filter`.
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 4.0.0
    */
   <A, E, EB, X, XE, XR>(
@@ -12387,7 +12159,7 @@ export const onErrorFilter: {
   /**
    * Runs the finalizer only when this effect fails and the cause matches the provided `Filter`.
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 4.0.0
    */
   <A, E, R, EB, X, XE, XR>(
@@ -12406,8 +12178,8 @@ export const onErrorFilter: {
  * This low-level operator preserves the source effect's result unless the
  * finalizer fails. Prefer `onExit` for normal cleanup logic.
  *
- * @category Resource Management & Finalization
- * @since 2.0.0
+ * @category resource management
+ * @since 4.0.0
  */
 export const onExitPrimitive: <A, E, R, XE = never, XR = never>(
   self: Effect<A, E, R>,
@@ -12439,7 +12211,7 @@ export const onExitPrimitive: <A, E, R, XE = never, XR = never>(
  * // 42
  * ```
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 2.0.0
  */
 export const onExit: {
@@ -12467,7 +12239,7 @@ export const onExit: {
    * // 42
    * ```
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 2.0.0
    */
   <A, E, XE = never, XR = never>(f: (exit: Exit.Exit<A, E>) => Effect<void, XE, XR>): <R>(self: Effect<A, E, R>) => Effect<A, E | XE, R | XR>
@@ -12495,7 +12267,7 @@ export const onExit: {
    * // 42
    * ```
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 2.0.0
    */
   <A, E, R, XE = never, XR = never>(self: Effect<A, E, R>, f: (exit: Exit.Exit<A, E>) => Effect<void, XE, XR>): Effect<A, E | XE, R | XR>
@@ -12520,7 +12292,7 @@ export const onExit: {
  * )
  * ```
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 4.0.0
  */
 export const onExitIf: {
@@ -12543,7 +12315,7 @@ export const onExitIf: {
    * )
    * ```
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 4.0.0
    */
   <A, E, XE, XR>(
@@ -12569,7 +12341,7 @@ export const onExitIf: {
    * )
    * ```
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 4.0.0
    */
   <A, E, R, XE, XR>(
@@ -12582,14 +12354,14 @@ export const onExitIf: {
 /**
  * Runs the cleanup effect only when the `Exit` matches the provided `Filter`.
  *
- * @category Resource Management & Finalization
+ * @category resource management
  * @since 4.0.0
  */
 export const onExitFilter: {
   /**
    * Runs the cleanup effect only when the `Exit` matches the provided `Filter`.
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 4.0.0
    */
   <A, E, XE, XR, B, X>(
@@ -12599,7 +12371,7 @@ export const onExitFilter: {
   /**
    * Runs the cleanup effect only when the `Exit` matches the provided `Filter`.
    *
-   * @category Resource Management & Finalization
+   * @category resource management
    * @since 4.0.0
    */
   <A, E, R, XE, XR, B, X>(
@@ -13346,7 +13118,6 @@ export const abortSignal: Effect<AbortSignal, never, Scope> = internal.abortSign
 /**
  * Type helpers for repeating effects.
  *
- * @category Repetition / Recursion
  * @since 2.0.0
  */
 export declare namespace Repeat {
@@ -13465,9 +13236,7 @@ export const forever: <
  *
  * ```ts
  * // Success Example
- * import { Effect } from "effect"
- * import { Schedule } from "effect"
- * import { Console } from "effect"
+ * import { Console, Effect, Schedule } from "effect"
  *
  * const action = Console.log("success")
  * const policy = Schedule.addDelay(Schedule.recurs(2), () => Effect.succeed("100 millis"))
@@ -13480,8 +13249,7 @@ export const forever: <
  *
  * ```ts
  * // Failure Example
- * import { Effect } from "effect"
- * import { Schedule } from "effect"
+ * import { Effect, Schedule } from "effect"
  *
  * let count = 0
  *
@@ -13533,9 +13301,7 @@ export const repeat: {
    *
    * ```ts
    * // Success Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Effect, Schedule } from "effect"
    *
    * const action = Console.log("success")
    * const policy = Schedule.addDelay(Schedule.recurs(2), () => Effect.succeed("100 millis"))
@@ -13548,8 +13314,7 @@ export const repeat: {
    *
    * ```ts
    * // Failure Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
+   * import { Effect, Schedule } from "effect"
    *
    * let count = 0
    *
@@ -13601,9 +13366,7 @@ export const repeat: {
    *
    * ```ts
    * // Success Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Effect, Schedule } from "effect"
    *
    * const action = Console.log("success")
    * const policy = Schedule.addDelay(Schedule.recurs(2), () => Effect.succeed("100 millis"))
@@ -13616,8 +13379,7 @@ export const repeat: {
    *
    * ```ts
    * // Failure Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
+   * import { Effect, Schedule } from "effect"
    *
    * let count = 0
    *
@@ -13669,9 +13431,7 @@ export const repeat: {
    *
    * ```ts
    * // Success Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Effect, Schedule } from "effect"
    *
    * const action = Console.log("success")
    * const policy = Schedule.addDelay(Schedule.recurs(2), () => Effect.succeed("100 millis"))
@@ -13684,8 +13444,7 @@ export const repeat: {
    *
    * ```ts
    * // Failure Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
+   * import { Effect, Schedule } from "effect"
    *
    * let count = 0
    *
@@ -13741,9 +13500,7 @@ export const repeat: {
    *
    * ```ts
    * // Success Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Effect, Schedule } from "effect"
    *
    * const action = Console.log("success")
    * const policy = Schedule.addDelay(Schedule.recurs(2), () => Effect.succeed("100 millis"))
@@ -13756,8 +13513,7 @@ export const repeat: {
    *
    * ```ts
    * // Failure Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
+   * import { Effect, Schedule } from "effect"
    *
    * let count = 0
    *
@@ -13809,9 +13565,7 @@ export const repeat: {
    *
    * ```ts
    * // Success Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Effect, Schedule } from "effect"
    *
    * const action = Console.log("success")
    * const policy = Schedule.addDelay(Schedule.recurs(2), () => Effect.succeed("100 millis"))
@@ -13824,8 +13578,7 @@ export const repeat: {
    *
    * ```ts
    * // Failure Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
+   * import { Effect, Schedule } from "effect"
    *
    * let count = 0
    *
@@ -13880,9 +13633,7 @@ export const repeat: {
    *
    * ```ts
    * // Success Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
-   * import { Console } from "effect"
+   * import { Console, Effect, Schedule } from "effect"
    *
    * const action = Console.log("success")
    * const policy = Schedule.addDelay(Schedule.recurs(2), () => Effect.succeed("100 millis"))
@@ -13895,8 +13646,7 @@ export const repeat: {
    *
    * ```ts
    * // Failure Example
-   * import { Effect } from "effect"
-   * import { Schedule } from "effect"
+   * import { Effect, Schedule } from "effect"
    *
    * let count = 0
    *
@@ -13943,8 +13693,7 @@ export const repeat: {
  * **Example** (Usage)
  *
  * ```ts
- * import { Console, Effect, Schedule } from "effect"
- * import * as Option from "effect/Option"
+ * import { Console, Effect, Option, Schedule } from "effect"
  *
  * let attempt = 0
  * const task = Effect.gen(function*() {
@@ -13987,8 +13736,7 @@ export const repeatOrElse: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Console, Effect, Schedule } from "effect"
-   * import * as Option from "effect/Option"
+   * import { Console, Effect, Option, Schedule } from "effect"
    *
    * let attempt = 0
    * const task = Effect.gen(function*() {
@@ -14034,8 +13782,7 @@ export const repeatOrElse: {
    * **Example** (Usage)
    *
    * ```ts
-   * import { Console, Effect, Schedule } from "effect"
-   * import * as Option from "effect/Option"
+   * import { Console, Effect, Option, Schedule } from "effect"
    *
    * let attempt = 0
    * const task = Effect.gen(function*() {
@@ -14488,7 +14235,7 @@ export const scheduleFrom: {
  * })
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const tracer: Effect<Tracer> = internal.tracer
@@ -14510,7 +14257,7 @@ export const tracer: Effect<Tracer> = internal.tracer
  * // const traced = Effect.withTracer(program, customTracer)
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const withTracer: {
@@ -14531,7 +14278,7 @@ export const withTracer: {
    * // const traced = Effect.withTracer(program, customTracer)
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   (value: Tracer): <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>
@@ -14552,7 +14299,7 @@ export const withTracer: {
    * // const traced = Effect.withTracer(program, customTracer)
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <A, E, R>(effect: Effect<A, E, R>, value: Tracer): Effect<A, E, R>
@@ -14578,7 +14325,7 @@ export const withTracer: {
  * )
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const withTracerEnabled: {
@@ -14602,7 +14349,7 @@ export const withTracerEnabled: {
    * )
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   (enabled: boolean): <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>
@@ -14626,7 +14373,7 @@ export const withTracerEnabled: {
    * )
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <A, E, R>(effect: Effect<A, E, R>, enabled: boolean): Effect<A, E, R>
@@ -14647,7 +14394,7 @@ export const withTracerEnabled: {
  * )
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const withTracerTiming: {
@@ -14666,7 +14413,7 @@ export const withTracerTiming: {
    * )
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   (enabled: boolean): <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>
@@ -14685,7 +14432,7 @@ export const withTracerTiming: {
    * )
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <A, E, R>(effect: Effect<A, E, R>, enabled: boolean): Effect<A, E, R>
@@ -14715,7 +14462,7 @@ export const withTracerTiming: {
  * })
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const annotateSpans: {
@@ -14743,7 +14490,7 @@ export const annotateSpans: {
    * })
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   (key: string, value: unknown): <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>
@@ -14771,7 +14518,7 @@ export const annotateSpans: {
    * })
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   (values: Record<string, unknown>): <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>
@@ -14799,7 +14546,7 @@ export const annotateSpans: {
    * })
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <A, E, R>(effect: Effect<A, E, R>, key: string, value: unknown): Effect<A, E, R>
@@ -14827,7 +14574,7 @@ export const annotateSpans: {
    * })
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <A, E, R>(effect: Effect<A, E, R>, values: Record<string, unknown>): Effect<A, E, R>
@@ -14854,7 +14601,7 @@ export const annotateSpans: {
  * const traced = Effect.withSpan(program, "user-operation")
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const annotateCurrentSpan: {
@@ -14879,7 +14626,7 @@ export const annotateCurrentSpan: {
    * const traced = Effect.withSpan(program, "user-operation")
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   (key: string, value: unknown): Effect<void>
@@ -14904,7 +14651,7 @@ export const annotateCurrentSpan: {
    * const traced = Effect.withSpan(program, "user-operation")
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   (values: Record<string, unknown>): Effect<void>
@@ -14932,7 +14679,7 @@ export const annotateCurrentSpan: {
  * const traced = Effect.withSpan(program, "my-span")
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const currentSpan: Effect<Span, Cause.NoSuchElementError> = internal.currentSpan
@@ -14965,7 +14712,7 @@ export const currentSpan: Effect<Span, Cause.NoSuchElementError> = internal.curr
  * const traced = Effect.withSpan(program, "parent-span")
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const currentParentSpan: Effect<AnySpan, Cause.NoSuchElementError> = internal.currentParentSpan
@@ -14999,7 +14746,7 @@ export const currentParentSpan: Effect<AnySpan, Cause.NoSuchElementError> = inte
  * // Output: Current span annotations: { userId: "123", operation: "data-processing" }
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const spanAnnotations: Effect<Readonly<Record<string, unknown>>> = internal.spanAnnotations
@@ -15025,7 +14772,7 @@ export const spanAnnotations: Effect<Readonly<Record<string, unknown>>> = intern
  * })
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const spanLinks: Effect<ReadonlyArray<SpanLink>> = internal.spanLinks
@@ -15079,7 +14826,7 @@ export const spanLinks: Effect<ReadonlyArray<SpanLink>> = internal.spanLinks
  * })
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const linkSpans: {
@@ -15132,7 +14879,7 @@ export const linkSpans: {
    * })
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   (
@@ -15188,7 +14935,7 @@ export const linkSpans: {
    * })
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <A, E, R>(
@@ -15219,7 +14966,7 @@ export const linkSpans: {
  * })
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const makeSpan: (name: string, options?: SpanOptionsNoTrace) => Effect<Span> = internal.makeSpan
@@ -15246,7 +14993,7 @@ export const makeSpan: (name: string, options?: SpanOptionsNoTrace) => Effect<Sp
  * )
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const makeSpanScoped: (
@@ -15276,7 +15023,7 @@ export const makeSpanScoped: (
  * )
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const useSpan: {
@@ -15302,7 +15049,7 @@ export const useSpan: {
    * )
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <A, E, R>(name: string, evaluate: (span: Span) => Effect<A, E, R>): Effect<A, E, R>
@@ -15328,7 +15075,7 @@ export const useSpan: {
    * )
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <A, E, R>(
@@ -15356,7 +15103,7 @@ export const useSpan: {
  * })
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const withSpan: {
@@ -15378,7 +15125,7 @@ export const withSpan: {
    * })
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <Args extends ReadonlyArray<any>>(
@@ -15407,7 +15154,7 @@ export const withSpan: {
    * })
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <A, E, R>(self: Effect<A, E, R>, name: string, options?: SpanOptions | undefined): Effect<A, E, Exclude<R, ParentSpan>>
@@ -15432,7 +15179,7 @@ export const withSpan: {
  * )
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const withSpanScoped: {
@@ -15455,7 +15202,7 @@ export const withSpanScoped: {
    * )
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   (name: string, options?: SpanOptions): <A, E, R>(
@@ -15480,7 +15227,7 @@ export const withSpanScoped: {
    * )
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <A, E, R>(self: Effect<A, E, R>, name: string, options?: SpanOptions): Effect<A, E, Exclude<R, ParentSpan> | Scope>
@@ -15502,7 +15249,7 @@ export const withSpanScoped: {
  * })
  * ```
  *
- * @category Tracing
+ * @category tracing
  * @since 2.0.0
  */
 export const withParentSpan: {
@@ -15522,7 +15269,7 @@ export const withParentSpan: {
    * })
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   (value: AnySpan, options?: TraceOptions): <A, E, R>(self: Effect<A, E, R>) => Effect<A, E, Exclude<R, ParentSpan>>
@@ -15542,7 +15289,7 @@ export const withParentSpan: {
    * })
    * ```
    *
-   * @category Tracing
+   * @category tracing
    * @since 2.0.0
    */
   <A, E, R>(self: Effect<A, E, R>, value: AnySpan, options?: TraceOptions): Effect<A, E, Exclude<R, ParentSpan>>
@@ -15927,7 +15674,7 @@ export const forkScoped: <
  * ```
  *
  * @category Supervision & Fibers
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const forkDetach: <
   Arg extends Effect<any, any, any> | {
@@ -15994,7 +15741,7 @@ export const fiber: Effect<Fiber<unknown, unknown>> = internal.fiber
  * ```
  *
  * @category Supervision & Fibers
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const fiberId: Effect<number> = internal.fiberId
 
@@ -16032,10 +15779,7 @@ export interface RunOptions {
  * **Example** (Running an Effect in the Background)
  *
  * ```ts
- * import { Effect } from "effect"
- * import { Schedule } from "effect"
- * import { Fiber } from "effect"
- * import { Console } from "effect"
+ * import { Console, Effect, Fiber, Schedule } from "effect"
  *
  * //      ┌─── Effect<number, never, never>
  * //      ▼
@@ -16065,7 +15809,7 @@ export const runFork: <A, E>(effect: Effect<A, E, never>, options?: RunOptions |
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect, Context } from "effect"
+ * import { Context, Effect } from "effect"
  *
  * interface Logger {
  *   log: (message: string) => void
@@ -16101,7 +15845,7 @@ export const runForkWith: <R>(
  * **Example** (Usage)
  *
  * ```ts
- * import { Console, Effect, Exit, Context } from "effect"
+ * import { Console, Context, Effect, Exit } from "effect"
  *
  * interface Logger {
  *   log: (message: string) => Effect.Effect<void>
@@ -16177,7 +15921,7 @@ export const runCallbackWith: <R>(
  * ```
  *
  * @category Running Effects
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const runCallback: <A, E>(
   effect: Effect<A, E, never>,
@@ -16232,7 +15976,7 @@ export const runPromise: <A, E>(
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect, Context } from "effect"
+ * import { Context, Effect } from "effect"
  *
  * interface Config {
  *   apiUrl: string
@@ -16317,7 +16061,7 @@ export const runPromiseExit: <A, E>(
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect, Exit, Context } from "effect"
+ * import { Context, Effect, Exit } from "effect"
  *
  * interface Database {
  *   query: (sql: string) => string
@@ -16417,7 +16161,7 @@ export const runSync: <A, E>(effect: Effect<A, E>) => A = internal.runSync
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect, Context } from "effect"
+ * import { Context, Effect } from "effect"
  *
  * interface MathService {
  *   add: (a: number, b: number) => number
@@ -16524,7 +16268,7 @@ export const runSyncExit: <A, E>(effect: Effect<A, E>) => Exit.Exit<A, E> = inte
  * **Example** (Usage)
  *
  * ```ts
- * import { Effect, Exit, Context } from "effect"
+ * import { Context, Effect, Exit } from "effect"
  *
  * // Define a logger service
  * const Logger = Context.Service<{
@@ -16570,14 +16314,13 @@ export const runSyncExitWith: <R>(
  *
  * Use these to describe generator-based signatures and traced or untraced variants.
  *
- * @category Function
- * @since 3.12.0
+ * @since 3.11.0
  */
 export namespace fn {
   /**
    * Generator return type accepted by `Effect.fn` and `Effect.fnUntraced`.
    *
-   * @category Models
+   * @category models
    * @since 3.19.0
    */
   export type Return<A, E = never, R = never> = Generator<Effect<any, E, R>, A, any>
@@ -16585,7 +16328,7 @@ export namespace fn {
   /**
    * Type of the untraced function builder used by `Effect.fnUntraced`.
    *
-   * @category Models
+   * @category models
    * @since 3.11.0
    */
   export type Untraced = {
@@ -18173,8 +17916,8 @@ export namespace fn {
   /**
    * Type of the traced function builder used by `Effect.fn`.
    *
-   * @category Models
-   * @since 3.11.0
+   * @category models
+   * @since 4.0.0
    */
   export type Traced = {
     <Eff extends Effect<any, any, any>, AEff, Args extends Array<any>>(
@@ -20663,7 +20406,7 @@ export const fnUntraced: fn.Untraced = internal.fnUntraced
  * ```
  *
  * @category Function
- * @since 3.12.0
+ * @since 3.11.0
  */
 export const fn: fn.Traced & {
   (name: string, options?: SpanOptionsNoTrace): fn.Traced
@@ -20723,7 +20466,7 @@ export const clockWith: <A, E, R>(
  * })
  * ```
  *
- * @category Logging
+ * @category logging
  * @since 2.0.0
  */
 export const logWithLevel: (level?: Severity) => (...message: ReadonlyArray<any>) => Effect<void> =
@@ -20753,7 +20496,7 @@ export const logWithLevel: (level?: Severity) => (...message: ReadonlyArray<any>
  * // 4
  * ```
  *
- * @category Logging
+ * @category logging
  * @since 2.0.0
  */
 export const log: (...message: ReadonlyArray<any>) => Effect<void> = internal.logWithLevel()
@@ -20783,7 +20526,7 @@ export const log: (...message: ReadonlyArray<any>) => Effect<void> = internal.lo
  * // timestamp=2023-... level=FATAL message="System shutting down"
  * ```
  *
- * @category Logging
+ * @category logging
  * @since 2.0.0
  */
 export const logFatal: (...message: ReadonlyArray<any>) => Effect<void> = internal.logWithLevel("Fatal")
@@ -20814,7 +20557,7 @@ export const logFatal: (...message: ReadonlyArray<any>) => Effect<void> = intern
  * // timestamp=2023-... level=WARN message="Using deprecated API endpoint"
  * ```
  *
- * @category Logging
+ * @category logging
  * @since 2.0.0
  */
 export const logWarning: (...message: ReadonlyArray<any>) => Effect<void> = internal.logWithLevel("Warn")
@@ -20848,7 +20591,7 @@ export const logWarning: (...message: ReadonlyArray<any>) => Effect<void> = inte
  * // timestamp=2023-... level=ERROR message="Caught error: Something went wrong"
  * ```
  *
- * @category Logging
+ * @category logging
  * @since 2.0.0
  */
 export const logError: (...message: ReadonlyArray<any>) => Effect<void> = internal.logWithLevel("Error")
@@ -20877,7 +20620,7 @@ export const logError: (...message: ReadonlyArray<any>) => Effect<void> = intern
  * // timestamp=2023-... level=INFO message="Application version: 1.2.3"
  * ```
  *
- * @category Logging
+ * @category logging
  * @since 2.0.0
  */
 export const logInfo: (...message: ReadonlyArray<any>) => Effect<void> = internal.logWithLevel("Info")
@@ -20907,7 +20650,7 @@ export const logInfo: (...message: ReadonlyArray<any>) => Effect<void> = interna
  * // timestamp=2023-... level=DEBUG message="Variable state: x=10 y=20 z=30"
  * ```
  *
- * @category Logging
+ * @category logging
  * @since 2.0.0
  */
 export const logDebug: (...message: ReadonlyArray<any>) => Effect<void> = internal.logWithLevel("Debug")
@@ -20940,7 +20683,7 @@ export const logDebug: (...message: ReadonlyArray<any>) => Effect<void> = intern
  * // timestamp=2023-... level=TRACE message="Exiting function processData"
  * ```
  *
- * @category Logging
+ * @category logging
  * @since 2.0.0
  */
 export const logTrace: (...message: ReadonlyArray<any>) => Effect<void> = internal.logWithLevel("Trace")
@@ -20970,8 +20713,8 @@ export const logTrace: (...message: ReadonlyArray<any>) => Effect<void> = intern
  * // Output includes both default and custom log outputs
  * ```
  *
- * @category Logging
- * @since 2.0.0
+ * @category logging
+ * @since 4.0.0
  */
 export const withLogger = dual<
   /**
@@ -20999,8 +20742,8 @@ export const withLogger = dual<
    * // Output includes both default and custom log outputs
    * ```
    *
-   * @category Logging
-   * @since 2.0.0
+   * @category logging
+   * @since 4.0.0
    */
   <Output>(logger: Logger<unknown, Output>) => <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>,
   /**
@@ -21028,8 +20771,8 @@ export const withLogger = dual<
    * // Output includes both default and custom log outputs
    * ```
    *
-   * @category Logging
-   * @since 2.0.0
+   * @category logging
+   * @since 4.0.0
    */
   <A, E, R, Output>(effect: Effect<A, E, R>, logger: Logger<unknown, Output>) => Effect<A, E, R>
 >(2, (effect, logger) =>
@@ -21066,7 +20809,7 @@ export const withLogger = dual<
  * // All log messages will include the userId and operation annotations
  * ```
  *
- * @category Logging
+ * @category logging
  * @since 2.0.0
  */
 export const annotateLogs = dual<
@@ -21097,7 +20840,7 @@ export const annotateLogs = dual<
    * // All log messages will include the userId and operation annotations
    * ```
    *
-   * @category Logging
+   * @category logging
    * @since 2.0.0
    */
   {
@@ -21136,7 +20879,7 @@ export const annotateLogs = dual<
    * // All log messages will include the userId and operation annotations
    * ```
    *
-   * @category Logging
+   * @category logging
    * @since 2.0.0
    */
   {
@@ -21190,8 +20933,8 @@ export const annotateLogs = dual<
  * Effect.runPromise(program)
  * ```
  *
- * @category Logging
- * @since 4.0.0
+ * @category logging
+ * @since 3.1.0
  */
 export const annotateLogsScoped: {
   /**
@@ -21217,8 +20960,8 @@ export const annotateLogsScoped: {
    * Effect.runPromise(program)
    * ```
    *
-   * @category Logging
-   * @since 4.0.0
+   * @category logging
+   * @since 3.1.0
    */
   (key: string, value: unknown): Effect<void, never, Scope>
   /**
@@ -21244,8 +20987,8 @@ export const annotateLogsScoped: {
    * Effect.runPromise(program)
    * ```
    *
-   * @category Logging
-   * @since 4.0.0
+   * @category logging
+   * @since 3.1.0
    */
   (values: Record<string, unknown>): Effect<void, never, Scope>
 } = internal.annotateLogsScoped
@@ -21278,7 +21021,7 @@ export const annotateLogsScoped: {
  * // All log messages will include span information showing the nested operation context
  * ```
  *
- * @category Logging
+ * @category logging
  * @since 2.0.0
  */
 export const withLogSpan = dual<
@@ -21310,7 +21053,7 @@ export const withLogSpan = dual<
    * // All log messages will include span information showing the nested operation context
    * ```
    *
-   * @category Logging
+   * @category logging
    * @since 2.0.0
    */
   (label: string) => <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>,
@@ -21342,7 +21085,7 @@ export const withLogSpan = dual<
    * // All log messages will include span information showing the nested operation context
    * ```
    *
-   * @category Logging
+   * @category logging
    * @since 2.0.0
    */
   <A, E, R>(effect: Effect<A, E, R>, label: string) => Effect<A, E, R>
@@ -22925,7 +22668,6 @@ export const txRetry: Effect<never, never, Transaction> = flatMap(
 /**
  * Type helpers for converting callback-based functions into `Effect` functions.
  *
- * @category Effectify
  * @since 4.0.0
  */
 export declare namespace Effectify {