effect 4.0.0-beta.17 → 4.0.0-beta.19

package/dist/Effect.d.ts

@@ -636,7 +636,7 @@ export declare const all: <const Arg extends Iterable<Effect<any, any, any>> | R
     readonly mode?: "default" | "result" | undefined;
 }>(arg: Arg, options?: O) => All.Return<Arg, O>;
 /**
- * Applies an effectful function to each element and partitions failures and
+ * Applies an effectful `Filter` to each element and partitions failures and
  * successes.
  *
  * The returned tuple is `[excluded, satisfying]`, where:
@@ -649,10 +649,10 @@ export declare const all: <const Arg extends Iterable<Effect<any, any, any>> | R
  *
  * @example
  * ```ts
- * import { Effect } from "effect"
+ * import { Effect, Result } from "effect"
  *
  * const program = Effect.partition([0, 1, 2, 3], (n) =>
- *   n % 2 === 0 ? Effect.fail(`${n} is even`) : Effect.succeed(n)
+ *   Effect.succeed(n % 2 === 0 ? Result.fail(`${n} is even`) : Result.succeed(n))
  * )
  *
  * Effect.runPromise(program).then(console.log)
@@ -664,7 +664,7 @@ export declare const all: <const Arg extends Iterable<Effect<any, any, any>> | R
  */
 export declare const partition: {
     /**
-     * Applies an effectful function to each element and partitions failures and
+     * Applies an effectful `Filter` to each element and partitions failures and
      * successes.
      *
      * The returned tuple is `[excluded, satisfying]`, where:
@@ -677,10 +677,10 @@ export declare const partition: {
      *
      * @example
      * ```ts
-     * import { Effect } from "effect"
+     * import { Effect, Result } from "effect"
      *
      * const program = Effect.partition([0, 1, 2, 3], (n) =>
-     *   n % 2 === 0 ? Effect.fail(`${n} is even`) : Effect.succeed(n)
+     *   Effect.succeed(n % 2 === 0 ? Result.fail(`${n} is even`) : Result.succeed(n))
      * )
      *
      * Effect.runPromise(program).then(console.log)
@@ -690,11 +690,11 @@ export declare const partition: {
      * @since 3.0.0
      * @category Collecting
      */
-    <A, B, E, R>(f: (a: A, i: number) => Effect<B, E, R>, options?: {
+    <A, Pass, Fail, E, R>(filter: Filter.FilterEffect<NoInfer<A>, Pass, Fail, E, R, [i: number]>, options?: {
         readonly concurrency?: Concurrency | undefined;
-    }): (elements: Iterable<A>) => Effect<[excluded: Array<E>, satisfying: Array<B>], never, R>;
+    }): (elements: Iterable<A>) => Effect<[excluded: Array<Fail>, satisfying: Array<Pass>], E, R>;
     /**
-     * Applies an effectful function to each element and partitions failures and
+     * Applies an effectful `Filter` to each element and partitions failures and
      * successes.
      *
      * The returned tuple is `[excluded, satisfying]`, where:
@@ -707,10 +707,10 @@ export declare const partition: {
      *
      * @example
      * ```ts
-     * import { Effect } from "effect"
+     * import { Effect, Result } from "effect"
      *
      * const program = Effect.partition([0, 1, 2, 3], (n) =>
-     *   n % 2 === 0 ? Effect.fail(`${n} is even`) : Effect.succeed(n)
+     *   Effect.succeed(n % 2 === 0 ? Result.fail(`${n} is even`) : Result.succeed(n))
      * )
      *
      * Effect.runPromise(program).then(console.log)
@@ -720,9 +720,9 @@ export declare const partition: {
      * @since 3.0.0
      * @category Collecting
      */
-    <A, B, E, R>(elements: Iterable<A>, f: (a: A, i: number) => Effect<B, E, R>, options?: {
+    <A, Pass, Fail, E, R>(elements: Iterable<A>, filter: Filter.FilterEffect<NoInfer<A>, Pass, Fail, E, R, [i: number]>, options?: {
         readonly concurrency?: Concurrency | undefined;
-    }): Effect<[excluded: Array<E>, satisfying: Array<B>], never, R>;
+    }): Effect<[excluded: Array<Fail>, satisfying: Array<Pass>], E, R>;
 };
 /**
  * Applies an effectful function to each element and accumulates all failures.
@@ -4746,15 +4746,14 @@ export declare const catchDefect: {
     <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>;
 };
 /**
- * Recovers from specific errors using a `Filter`, `Predicate`, or
- * `Refinement`.
+ * Recovers from specific errors using a `Predicate` or `Refinement`.
  *
  * **When to Use**
  *
- * `catchIf` lets you recover from errors that match a condition. Pass a
- * `Filter` for transformation, a `Refinement` for type narrowing, or a
- * `Predicate` for simple boolean matching. Non-matching errors re-fail with
- * the original cause. Defects and interrupts are not caught.
+ * `catchIf` lets you recover from errors that match a condition. Use a
+ * `Refinement` for type narrowing or a `Predicate` for simple boolean
+ * matching. Non-matching errors re-fail with the original cause. Defects and
+ * interrupts are not caught.
  *
  * **Previously Known As**
  *
@@ -4781,7 +4780,7 @@ export declare const catchDefect: {
  *
  * // With a Filter
  * const recovered2 = program.pipe(
- *   Effect.catchIf(
+ *   Effect.catchFilter(
  *     Filter.tagged("NotFound"),
  *     (error) => Effect.succeed(`missing:${error.id}`)
  *   )
@@ -4793,15 +4792,14 @@ export declare const catchDefect: {
  */
 export declare const catchIf: {
     /**
-     * Recovers from specific errors using a `Filter`, `Predicate`, or
-     * `Refinement`.
+     * Recovers from specific errors using a `Predicate` or `Refinement`.
      *
      * **When to Use**
      *
-     * `catchIf` lets you recover from errors that match a condition. Pass a
-     * `Filter` for transformation, a `Refinement` for type narrowing, or a
-     * `Predicate` for simple boolean matching. Non-matching errors re-fail with
-     * the original cause. Defects and interrupts are not caught.
+     * `catchIf` lets you recover from errors that match a condition. Use a
+     * `Refinement` for type narrowing or a `Predicate` for simple boolean
+     * matching. Non-matching errors re-fail with the original cause. Defects and
+     * interrupts are not caught.
      *
      * **Previously Known As**
      *
@@ -4828,7 +4826,7 @@ export declare const catchIf: {
      *
      * // With a Filter
      * const recovered2 = program.pipe(
-     *   Effect.catchIf(
+     *   Effect.catchFilter(
      *     Filter.tagged("NotFound"),
      *     (error) => Effect.succeed(`missing:${error.id}`)
      *   )
@@ -4840,15 +4838,14 @@ export declare const catchIf: {
      */
     <E, EB extends E, A2, E2, R2, A3 = never, E3 = Exclude<E, EB>, R3 = never>(refinement: Predicate.Refinement<NoInfer<E>, EB>, f: (e: EB) => Effect<A2, E2, R2>, orElse?: ((e: Exclude<E, EB>) => Effect<A3, E3, R3>) | undefined): <A, R>(self: Effect<A, E, R>) => Effect<A | A2 | A3, E2 | E3, R | R2 | R3>;
     /**
-     * Recovers from specific errors using a `Filter`, `Predicate`, or
-     * `Refinement`.
+     * Recovers from specific errors using a `Predicate` or `Refinement`.
      *
      * **When to Use**
      *
-     * `catchIf` lets you recover from errors that match a condition. Pass a
-     * `Filter` for transformation, a `Refinement` for type narrowing, or a
-     * `Predicate` for simple boolean matching. Non-matching errors re-fail with
-     * the original cause. Defects and interrupts are not caught.
+     * `catchIf` lets you recover from errors that match a condition. Use a
+     * `Refinement` for type narrowing or a `Predicate` for simple boolean
+     * matching. Non-matching errors re-fail with the original cause. Defects and
+     * interrupts are not caught.
      *
      * **Previously Known As**
      *
@@ -4875,7 +4872,7 @@ export declare const catchIf: {
      *
      * // With a Filter
      * const recovered2 = program.pipe(
-     *   Effect.catchIf(
+     *   Effect.catchFilter(
      *     Filter.tagged("NotFound"),
      *     (error) => Effect.succeed(`missing:${error.id}`)
      *   )
@@ -4885,17 +4882,16 @@ export declare const catchIf: {
      * @since 2.0.0
      * @category Error Handling
      */
-    <E, Result extends Filter.ResultOrBool, A2, E2, R2, A3 = never, E3 = Filter.Fail<E, Result>, R3 = never>(filter: Filter.OrPredicate<NoInfer<E>, Result>, f: (e: Filter.Pass<E, Result>) => Effect<A2, E2, R2>, orElse?: ((e: Filter.Fail<E, Result>) => Effect<A3, E3, R3>) | undefined): <A, R>(self: Effect<A, E, R>) => Effect<A | A2 | A3, E2 | E3, R | R2 | R3>;
+    <E, A2, E2, R2, A3 = never, E3 = E, R3 = never>(predicate: Predicate.Predicate<NoInfer<E>>, f: (e: NoInfer<E>) => Effect<A2, E2, R2>, orElse?: ((e: NoInfer<E>) => Effect<A3, E3, R3>) | undefined): <A, R>(self: Effect<A, E, R>) => Effect<A | A2 | A3, E2 | E3, R | R2 | R3>;
     /**
-     * Recovers from specific errors using a `Filter`, `Predicate`, or
-     * `Refinement`.
+     * Recovers from specific errors using a `Predicate` or `Refinement`.
      *
      * **When to Use**
      *
-     * `catchIf` lets you recover from errors that match a condition. Pass a
-     * `Filter` for transformation, a `Refinement` for type narrowing, or a
-     * `Predicate` for simple boolean matching. Non-matching errors re-fail with
-     * the original cause. Defects and interrupts are not caught.
+     * `catchIf` lets you recover from errors that match a condition. Use a
+     * `Refinement` for type narrowing or a `Predicate` for simple boolean
+     * matching. Non-matching errors re-fail with the original cause. Defects and
+     * interrupts are not caught.
      *
      * **Previously Known As**
      *
@@ -4922,7 +4918,7 @@ export declare const catchIf: {
      *
      * // With a Filter
      * const recovered2 = program.pipe(
-     *   Effect.catchIf(
+     *   Effect.catchFilter(
      *     Filter.tagged("NotFound"),
      *     (error) => Effect.succeed(`missing:${error.id}`)
      *   )
@@ -4934,15 +4930,14 @@ export declare const catchIf: {
      */
     <A, E, R, EB extends E, A2, E2, R2, A3 = never, E3 = Exclude<E, EB>, R3 = never>(self: Effect<A, E, R>, refinement: Predicate.Refinement<E, EB>, f: (e: EB) => Effect<A2, E2, R2>, orElse?: ((e: Exclude<E, EB>) => Effect<A3, E3, R3>) | undefined): Effect<A | A2 | A3, E2 | E3, R | R2 | R3>;
     /**
-     * Recovers from specific errors using a `Filter`, `Predicate`, or
-     * `Refinement`.
+     * Recovers from specific errors using a `Predicate` or `Refinement`.
      *
      * **When to Use**
      *
-     * `catchIf` lets you recover from errors that match a condition. Pass a
-     * `Filter` for transformation, a `Refinement` for type narrowing, or a
-     * `Predicate` for simple boolean matching. Non-matching errors re-fail with
-     * the original cause. Defects and interrupts are not caught.
+     * `catchIf` lets you recover from errors that match a condition. Use a
+     * `Refinement` for type narrowing or a `Predicate` for simple boolean
+     * matching. Non-matching errors re-fail with the original cause. Defects and
+     * interrupts are not caught.
      *
      * **Previously Known As**
      *
@@ -4969,7 +4964,7 @@ export declare const catchIf: {
      *
      * // With a Filter
      * const recovered2 = program.pipe(
-     *   Effect.catchIf(
+     *   Effect.catchFilter(
      *     Filter.tagged("NotFound"),
      *     (error) => Effect.succeed(`missing:${error.id}`)
      *   )
@@ -4979,7 +4974,29 @@ export declare const catchIf: {
      * @since 2.0.0
      * @category Error Handling
      */
-    <A, E, R, Result extends Filter.ResultOrBool, A2, E2, R2, A3 = never, E3 = Filter.Fail<E, Result>, R3 = never>(self: Effect<A, E, R>, filter: Filter.OrPredicate<NoInfer<E>, Result>, f: (e: Filter.Pass<E, Result>) => Effect<A2, E2, R2>, orElse?: ((e: Filter.Fail<E, Result>) => Effect<A3, E3, R3>) | undefined): Effect<A | A2 | A3, E2 | E3, R | R2 | R3>;
+    <A, E, R, A2, E2, R2, A3 = never, E3 = E, R3 = never>(self: Effect<A, E, R>, predicate: Predicate.Predicate<E>, f: (e: E) => Effect<A2, E2, R2>, orElse?: ((e: E) => Effect<A3, E3, R3>) | undefined): Effect<A | A2 | A3, E2 | E3, R | R2 | R3>;
+};
+/**
+ * Recovers from specific errors using a `Filter`.
+ *
+ * @since 4.0.0
+ * @category Error Handling
+ */
+export declare const catchFilter: {
+    /**
+     * Recovers from specific errors using a `Filter`.
+     *
+     * @since 4.0.0
+     * @category Error Handling
+     */
+    <E, EB, A2, E2, R2, X, A3 = never, E3 = X, R3 = never>(filter: Filter.Filter<NoInfer<E>, EB, X>, f: (e: EB) => Effect<A2, E2, R2>, orElse?: ((e: X) => Effect<A3, E3, R3>) | undefined): <A, R>(self: Effect<A, E, R>) => Effect<A | A2 | A3, E2 | E3, R | R2 | R3>;
+    /**
+     * Recovers from specific errors using a `Filter`.
+     *
+     * @since 4.0.0
+     * @category Error Handling
+     */
+    <A, E, R, EB, A2, E2, R2, X, A3 = never, E3 = X, R3 = never>(self: Effect<A, E, R>, filter: Filter.Filter<NoInfer<E>, EB, X>, f: (e: EB) => Effect<A2, E2, R2>, orElse?: ((e: X) => Effect<A3, E3, R3>) | undefined): Effect<A | A2 | A3, E2 | E3, R | R2 | R3>;
 };
 /**
  * Catches `NoSuchElementError` failures and converts them to `Option.none`.
@@ -5085,7 +5102,7 @@ export declare const catchCauseIf: {
      * @since 4.0.0
      * @category Error Handling
      */
-    <E, Result extends Filter.ResultOrBool<Cause.Cause<any>>, B, E2, R2>(filter: Filter.OrPredicate<Cause.Cause<E>, Result>, f: (failure: Filter.Pass<Cause.Cause<E>, Result>, cause: Cause.Cause<E>) => Effect<B, E2, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A | B, Cause.Cause.Error<Filter.Fail<Cause.Cause<E>, Result>> | E2, R | R2>;
+    <E, B, E2, R2>(predicate: Predicate.Predicate<Cause.Cause<E>>, f: (cause: Cause.Cause<E>) => Effect<B, E2, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A | B, E | E2, R | R2>;
     /**
      * Recovers from specific failures based on a predicate.
      *
@@ -5124,7 +5141,29 @@ export declare const catchCauseIf: {
      * @since 4.0.0
      * @category Error Handling
      */
-    <A, E, R, B, E2, R2, Result extends Filter.ResultOrBool<Cause.Cause<any>>>(self: Effect<A, E, R>, filter: Filter.OrPredicate<Cause.Cause<E>, Result>, f: (failure: Filter.Pass<Cause.Cause<E>, Result>, cause: Cause.Cause<E>) => Effect<B, E2, R2>): Effect<A | B, Cause.Cause.Error<Filter.Fail<Cause.Cause<E>, Result>> | E2, R | R2>;
+    <A, E, R, B, E2, R2>(self: Effect<A, E, R>, predicate: Predicate.Predicate<Cause.Cause<E>>, f: (cause: Cause.Cause<E>) => Effect<B, E2, R2>): Effect<A | B, E | E2, R | R2>;
+};
+/**
+ * Recovers from specific failures based on a `Filter`.
+ *
+ * @since 4.0.0
+ * @category Error Handling
+ */
+export declare const catchCauseFilter: {
+    /**
+     * Recovers from specific failures based on a `Filter`.
+     *
+     * @since 4.0.0
+     * @category Error Handling
+     */
+    <E, B, E2, R2, EB, X extends Cause.Cause<any>>(filter: Filter.Filter<Cause.Cause<E>, EB, X>, f: (failure: EB, cause: Cause.Cause<E>) => Effect<B, E2, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A | B, Cause.Cause.Error<X> | E2, R | R2>;
+    /**
+     * Recovers from specific failures based on a `Filter`.
+     *
+     * @since 4.0.0
+     * @category Error Handling
+     */
+    <A, E, R, B, E2, R2, EB, X extends Cause.Cause<any>>(self: Effect<A, E, R>, filter: Filter.Filter<Cause.Cause<E>, EB, X>, f: (failure: EB, cause: Cause.Cause<E>) => Effect<B, E2, R2>): Effect<A | B, Cause.Cause.Error<X> | E2, R | R2>;
 };
 /**
  * The `mapError` function is used to transform or modify the error
@@ -5731,7 +5770,7 @@ export declare const tapCauseIf: {
      * @since 4.0.0
      * @category Sequencing
      */
-    <E, Result extends Filter.ResultOrBool, B, E2, R2>(filter: Filter.OrPredicate<Cause.Cause<E>, Result>, f: (a: Filter.Pass<Cause.Cause<E>, Result>, cause: Cause.Cause<E>) => Effect<B, E2, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A, E | E2, R | R2>;
+    <E, B, E2, R2>(predicate: Predicate.Predicate<Cause.Cause<E>>, f: (cause: Cause.Cause<E>) => Effect<B, E2, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A, E | E2, R | R2>;
     /**
      * Conditionally executes a side effect based on the cause of a failed effect.
      *
@@ -5760,7 +5799,29 @@ export declare const tapCauseIf: {
      * @since 4.0.0
      * @category Sequencing
      */
-    <A, E, R, Result extends Filter.ResultOrBool, B, E2, R2>(self: Effect<A, E, R>, filter: Filter.OrPredicate<Cause.Cause<E>, Result>, f: (a: Filter.Pass<Cause.Cause<E>, Result>, cause: Cause.Cause<E>) => Effect<B, E2, R2>): Effect<A, E | E2, R | R2>;
+    <A, E, R, B, E2, R2>(self: Effect<A, E, R>, predicate: Predicate.Predicate<Cause.Cause<E>>, f: (cause: Cause.Cause<E>) => Effect<B, E2, R2>): Effect<A, E | E2, R | R2>;
+};
+/**
+ * Conditionally executes a side effect based on the cause of a failed effect.
+ *
+ * @since 4.0.0
+ * @category Sequencing
+ */
+export declare const tapCauseFilter: {
+    /**
+     * Conditionally executes a side effect based on the cause of a failed effect.
+     *
+     * @since 4.0.0
+     * @category Sequencing
+     */
+    <E, B, E2, R2, EB, X extends Cause.Cause<any>>(filter: Filter.Filter<Cause.Cause<E>, EB, X>, f: (a: EB, cause: Cause.Cause<E>) => Effect<B, E2, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A, E | E2, R | R2>;
+    /**
+     * Conditionally executes a side effect based on the cause of a failed effect.
+     *
+     * @since 4.0.0
+     * @category Sequencing
+     */
+    <A, E, R, B, E2, R2, EB, X extends Cause.Cause<any>>(self: Effect<A, E, R>, filter: Filter.Filter<Cause.Cause<E>, EB, X>, f: (a: EB, cause: Cause.Cause<E>) => Effect<B, E2, R2>): Effect<A, E | E2, R | R2>;
 };
 /**
  * Inspect severe errors or defects (non-recoverable failures) in an effect.
@@ -7682,12 +7743,12 @@ export declare const raceFirst: {
     }): Effect<A | A2, E | E2, R | R2>;
 };
 /**
- * Filters elements of an iterable using a predicate, refinement, effectful
- * predicate, or `Filter.FilterEffect`.
+ * Filters elements of an iterable using a predicate, refinement, or effectful
+ * predicate.
  *
  * @example
  * ```ts
- * import { Effect, Filter, Result } from "effect"
+ * import { Effect } from "effect"
  *
  * // Sync predicate
  * const evens = Effect.filter([1, 2, 3, 4], (n) => n % 2 === 0)
@@ -7695,10 +7756,7 @@ export declare const raceFirst: {
  * // Effectful predicate
  * const checked = Effect.filter([1, 2, 3], (n) => Effect.succeed(n > 1))
  *
- * // FilterEffect
- * const mapped = Effect.filter([1, 2, 3, 4], (n) =>
- *   Effect.succeed(n % 2 === 0 ? Result.succeed(n * 2) : Result.fail(n))
- * )
+ * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
  * ```
  *
  * @since 2.0.0
@@ -7706,12 +7764,12 @@ export declare const raceFirst: {
  */
 export declare const filter: {
     /**
-     * Filters elements of an iterable using a predicate, refinement, effectful
-     * predicate, or `Filter.FilterEffect`.
+     * Filters elements of an iterable using a predicate, refinement, or effectful
+     * predicate.
      *
      * @example
      * ```ts
-     * import { Effect, Filter, Result } from "effect"
+     * import { Effect } from "effect"
      *
      * // Sync predicate
      * const evens = Effect.filter([1, 2, 3, 4], (n) => n % 2 === 0)
@@ -7719,10 +7777,7 @@ export declare const filter: {
      * // Effectful predicate
      * const checked = Effect.filter([1, 2, 3], (n) => Effect.succeed(n > 1))
      *
-     * // FilterEffect
-     * const mapped = Effect.filter([1, 2, 3, 4], (n) =>
-     *   Effect.succeed(n % 2 === 0 ? Result.succeed(n * 2) : Result.fail(n))
-     * )
+     * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
      * ```
      *
      * @since 2.0.0
@@ -7730,12 +7785,12 @@ export declare const filter: {
      */
     <A, B extends A>(refinement: Predicate.Refinement<NoInfer<A>, B>): (elements: Iterable<A>) => Effect<Array<B>>;
     /**
-     * Filters elements of an iterable using a predicate, refinement, effectful
-     * predicate, or `Filter.FilterEffect`.
+     * Filters elements of an iterable using a predicate, refinement, or effectful
+     * predicate.
      *
      * @example
      * ```ts
-     * import { Effect, Filter, Result } from "effect"
+     * import { Effect } from "effect"
      *
      * // Sync predicate
      * const evens = Effect.filter([1, 2, 3, 4], (n) => n % 2 === 0)
@@ -7743,10 +7798,7 @@ export declare const filter: {
      * // Effectful predicate
      * const checked = Effect.filter([1, 2, 3], (n) => Effect.succeed(n > 1))
      *
-     * // FilterEffect
-     * const mapped = Effect.filter([1, 2, 3, 4], (n) =>
-     *   Effect.succeed(n % 2 === 0 ? Result.succeed(n * 2) : Result.fail(n))
-     * )
+     * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
      * ```
      *
      * @since 2.0.0
@@ -7754,12 +7806,12 @@ export declare const filter: {
      */
     <A>(predicate: Predicate.Predicate<NoInfer<A>>): (elements: Iterable<A>) => Effect<Array<A>>;
     /**
-     * Filters elements of an iterable using a predicate, refinement, effectful
-     * predicate, or `Filter.FilterEffect`.
+     * Filters elements of an iterable using a predicate, refinement, or effectful
+     * predicate.
      *
      * @example
      * ```ts
-     * import { Effect, Filter, Result } from "effect"
+     * import { Effect } from "effect"
      *
      * // Sync predicate
      * const evens = Effect.filter([1, 2, 3, 4], (n) => n % 2 === 0)
@@ -7767,25 +7819,22 @@ export declare const filter: {
      * // Effectful predicate
      * const checked = Effect.filter([1, 2, 3], (n) => Effect.succeed(n > 1))
      *
-     * // FilterEffect
-     * const mapped = Effect.filter([1, 2, 3, 4], (n) =>
-     *   Effect.succeed(n % 2 === 0 ? Result.succeed(n * 2) : Result.fail(n))
-     * )
+     * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
      * ```
      *
      * @since 2.0.0
      * @category Filtering
      */
-    <A, B, X>(filter: Filter.Filter<NoInfer<A>, B, X>, options?: {
+    <A, E, R>(predicate: (a: NoInfer<A>, i: number) => Effect<boolean, E, R>, options?: {
         readonly concurrency?: Concurrency | undefined;
-    }): (elements: Iterable<A>) => Effect<Array<B>>;
+    }): (iterable: Iterable<A>) => Effect<Array<A>, E, R>;
     /**
-     * Filters elements of an iterable using a predicate, refinement, effectful
-     * predicate, or `Filter.FilterEffect`.
+     * Filters elements of an iterable using a predicate, refinement, or effectful
+     * predicate.
      *
      * @example
      * ```ts
-     * import { Effect, Filter, Result } from "effect"
+     * import { Effect } from "effect"
      *
      * // Sync predicate
      * const evens = Effect.filter([1, 2, 3, 4], (n) => n % 2 === 0)
@@ -7793,25 +7842,20 @@ export declare const filter: {
      * // Effectful predicate
      * const checked = Effect.filter([1, 2, 3], (n) => Effect.succeed(n > 1))
      *
-     * // FilterEffect
-     * const mapped = Effect.filter([1, 2, 3, 4], (n) =>
-     *   Effect.succeed(n % 2 === 0 ? Result.succeed(n * 2) : Result.fail(n))
-     * )
+     * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
      * ```
      *
      * @since 2.0.0
      * @category Filtering
      */
-    <A, B, X, E, R>(filter: Filter.FilterEffect<NoInfer<A>, B, X, E, R>, options?: {
-        readonly concurrency?: Concurrency | undefined;
-    }): (elements: Iterable<A>) => Effect<Array<B>, E, R>;
+    <A, B extends A>(elements: Iterable<A>, refinement: Predicate.Refinement<A, B>): Effect<Array<B>>;
     /**
-     * Filters elements of an iterable using a predicate, refinement, effectful
-     * predicate, or `Filter.FilterEffect`.
+     * Filters elements of an iterable using a predicate, refinement, or effectful
+     * predicate.
      *
      * @example
      * ```ts
-     * import { Effect, Filter, Result } from "effect"
+     * import { Effect } from "effect"
      *
      * // Sync predicate
      * const evens = Effect.filter([1, 2, 3, 4], (n) => n % 2 === 0)
@@ -7819,25 +7863,20 @@ export declare const filter: {
      * // Effectful predicate
      * const checked = Effect.filter([1, 2, 3], (n) => Effect.succeed(n > 1))
      *
-     * // FilterEffect
-     * const mapped = Effect.filter([1, 2, 3, 4], (n) =>
-     *   Effect.succeed(n % 2 === 0 ? Result.succeed(n * 2) : Result.fail(n))
-     * )
+     * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
      * ```
      *
      * @since 2.0.0
      * @category Filtering
      */
-    <A, E, R>(predicate: (a: NoInfer<A>, i: number) => Effect<boolean, E, R>, options?: {
-        readonly concurrency?: Concurrency | undefined;
-    }): (iterable: Iterable<A>) => Effect<Array<A>, E, R>;
+    <A>(elements: Iterable<A>, predicate: Predicate.Predicate<A>): Effect<Array<A>>;
     /**
-     * Filters elements of an iterable using a predicate, refinement, effectful
-     * predicate, or `Filter.FilterEffect`.
+     * Filters elements of an iterable using a predicate, refinement, or effectful
+     * predicate.
      *
      * @example
      * ```ts
-     * import { Effect, Filter, Result } from "effect"
+     * import { Effect } from "effect"
      *
      * // Sync predicate
      * const evens = Effect.filter([1, 2, 3, 4], (n) => n % 2 === 0)
@@ -7845,116 +7884,63 @@ export declare const filter: {
      * // Effectful predicate
      * const checked = Effect.filter([1, 2, 3], (n) => Effect.succeed(n > 1))
      *
-     * // FilterEffect
-     * const mapped = Effect.filter([1, 2, 3, 4], (n) =>
-     *   Effect.succeed(n % 2 === 0 ? Result.succeed(n * 2) : Result.fail(n))
-     * )
+     * // Use Effect.filterMapEffect for effectful Filter.Filter callbacks
      * ```
      *
      * @since 2.0.0
      * @category Filtering
      */
-    <A, B extends A>(elements: Iterable<A>, refinement: Predicate.Refinement<A, B>): Effect<Array<B>>;
+    <A, E, R>(iterable: Iterable<A>, predicate: (a: NoInfer<A>, i: number) => Effect<boolean, E, R>, options?: {
+        readonly concurrency?: Concurrency | undefined;
+    }): Effect<Array<A>, E, R>;
+};
+/**
+ * Filters and maps elements of an iterable with a `Filter`.
+ *
+ * @since 4.0.0
+ * @category Filtering
+ */
+export declare const filterMap: {
     /**
-     * Filters elements of an iterable using a predicate, refinement, effectful
-     * predicate, or `Filter.FilterEffect`.
-     *
-     * @example
-     * ```ts
-     * import { Effect, Filter, Result } from "effect"
-     *
-     * // Sync predicate
-     * const evens = Effect.filter([1, 2, 3, 4], (n) => n % 2 === 0)
-     *
-     * // Effectful predicate
-     * const checked = Effect.filter([1, 2, 3], (n) => Effect.succeed(n > 1))
-     *
-     * // FilterEffect
-     * const mapped = Effect.filter([1, 2, 3, 4], (n) =>
-     *   Effect.succeed(n % 2 === 0 ? Result.succeed(n * 2) : Result.fail(n))
-     * )
-     * ```
+     * Filters and maps elements of an iterable with a `Filter`.
      *
-     * @since 2.0.0
+     * @since 4.0.0
      * @category Filtering
      */
-    <A>(elements: Iterable<A>, predicate: Predicate.Predicate<A>): Effect<Array<A>>;
+    <A, B, X>(filter: Filter.Filter<NoInfer<A>, B, X>): (elements: Iterable<A>) => Effect<Array<B>>;
     /**
-     * Filters elements of an iterable using a predicate, refinement, effectful
-     * predicate, or `Filter.FilterEffect`.
-     *
-     * @example
-     * ```ts
-     * import { Effect, Filter, Result } from "effect"
+     * Filters and maps elements of an iterable with a `Filter`.
      *
-     * // Sync predicate
-     * const evens = Effect.filter([1, 2, 3, 4], (n) => n % 2 === 0)
-     *
-     * // Effectful predicate
-     * const checked = Effect.filter([1, 2, 3], (n) => Effect.succeed(n > 1))
-     *
-     * // FilterEffect
-     * const mapped = Effect.filter([1, 2, 3, 4], (n) =>
-     *   Effect.succeed(n % 2 === 0 ? Result.succeed(n * 2) : Result.fail(n))
-     * )
-     * ```
-     *
-     * @since 2.0.0
+     * @since 4.0.0
      * @category Filtering
      */
     <A, B, X>(elements: Iterable<A>, filter: Filter.Filter<NoInfer<A>, B, X>): Effect<Array<B>>;
+};
+/**
+ * Effectfully filters and maps elements of an iterable with a `FilterEffect`.
+ *
+ * @since 4.0.0
+ * @category Filtering
+ */
+export declare const filterMapEffect: {
     /**
-     * Filters elements of an iterable using a predicate, refinement, effectful
-     * predicate, or `Filter.FilterEffect`.
-     *
-     * @example
-     * ```ts
-     * import { Effect, Filter, Result } from "effect"
-     *
-     * // Sync predicate
-     * const evens = Effect.filter([1, 2, 3, 4], (n) => n % 2 === 0)
-     *
-     * // Effectful predicate
-     * const checked = Effect.filter([1, 2, 3], (n) => Effect.succeed(n > 1))
+     * Effectfully filters and maps elements of an iterable with a `FilterEffect`.
      *
-     * // FilterEffect
-     * const mapped = Effect.filter([1, 2, 3, 4], (n) =>
-     *   Effect.succeed(n % 2 === 0 ? Result.succeed(n * 2) : Result.fail(n))
-     * )
-     * ```
-     *
-     * @since 2.0.0
+     * @since 4.0.0
      * @category Filtering
      */
-    <A, B, X, E, R>(elements: Iterable<A>, filter: Filter.FilterEffect<NoInfer<A>, B, X, E, R>, options?: {
+    <A, B, X, E, R>(filter: Filter.FilterEffect<NoInfer<A>, B, X, E, R>, options?: {
         readonly concurrency?: Concurrency | undefined;
-    }): Effect<Array<B>, E, R>;
+    }): (elements: Iterable<A>) => Effect<Array<B>, E, R>;
     /**
-     * Filters elements of an iterable using a predicate, refinement, effectful
-     * predicate, or `Filter.FilterEffect`.
-     *
-     * @example
-     * ```ts
-     * import { Effect, Filter, Result } from "effect"
-     *
-     * // Sync predicate
-     * const evens = Effect.filter([1, 2, 3, 4], (n) => n % 2 === 0)
+     * Effectfully filters and maps elements of an iterable with a `FilterEffect`.
      *
-     * // Effectful predicate
-     * const checked = Effect.filter([1, 2, 3], (n) => Effect.succeed(n > 1))
-     *
-     * // FilterEffect
-     * const mapped = Effect.filter([1, 2, 3, 4], (n) =>
-     *   Effect.succeed(n % 2 === 0 ? Result.succeed(n * 2) : Result.fail(n))
-     * )
-     * ```
-     *
-     * @since 2.0.0
+     * @since 4.0.0
      * @category Filtering
      */
-    <A, E, R>(iterable: Iterable<A>, predicate: (a: NoInfer<A>, i: number) => Effect<boolean, E, R>, options?: {
+    <A, B, X, E, R>(elements: Iterable<A>, filter: Filter.FilterEffect<NoInfer<A>, B, X, E, R>, options?: {
         readonly concurrency?: Concurrency | undefined;
-    }): Effect<Array<A>, E, R>;
+    }): Effect<Array<B>, E, R>;
 };
 /**
  * Filters an effect, providing an alternative effect if the predicate fails.
@@ -8048,7 +8034,7 @@ export declare const filterOrElse: {
      * @since 2.0.0
      * @category Filtering
      */
-    <A, Result extends Filter.ResultOrBool, C, E2, R2>(filter: Filter.OrPredicate<NoInfer<A>, Result>, orElse: (a: Filter.Fail<A, Result>) => Effect<C, E2, R2>): <E, R>(self: Effect<A, E, R>) => Effect<Filter.Pass<A, Result> | C, E2 | E, R2 | R>;
+    <A, C, E2, R2>(predicate: Predicate.Predicate<NoInfer<A>>, orElse: (a: NoInfer<A>) => Effect<C, E2, R2>): <E, R>(self: Effect<A, E, R>) => Effect<A | C, E2 | E, R2 | R>;
     /**
      * Filters an effect, providing an alternative effect if the predicate fails.
      *
@@ -8110,7 +8096,29 @@ export declare const filterOrElse: {
      * @since 2.0.0
      * @category Filtering
      */
-    <A, E, R, Result extends Filter.ResultOrBool, C, E2, R2>(self: Effect<A, E, R>, filter: Filter.OrPredicate<NoInfer<A>, Result>, orElse: (a: Filter.Fail<A, Result>) => Effect<C, E2, R2>): Effect<Filter.Pass<A, Result> | C, E | E2, R | R2>;
+    <A, E, R, C, E2, R2>(self: Effect<A, E, R>, predicate: Predicate.Predicate<NoInfer<A>>, orElse: (a: NoInfer<A>) => Effect<C, E2, R2>): Effect<A | C, E | E2, R | R2>;
+};
+/**
+ * Filters an effect with a `Filter`, providing an alternative effect on failure.
+ *
+ * @since 4.0.0
+ * @category Filtering
+ */
+export declare const filterMapOrElse: {
+    /**
+     * Filters an effect with a `Filter`, providing an alternative effect on failure.
+     *
+     * @since 4.0.0
+     * @category Filtering
+     */
+    <A, B, X, C, E2, R2>(filter: Filter.Filter<NoInfer<A>, B, X>, orElse: (x: X) => Effect<C, E2, R2>): <E, R>(self: Effect<A, E, R>) => Effect<B | C, E2 | E, R2 | R>;
+    /**
+     * Filters an effect with a `Filter`, providing an alternative effect on failure.
+     *
+     * @since 4.0.0
+     * @category Filtering
+     */
+    <A, E, R, B, X, C, E2, R2>(self: Effect<A, E, R>, filter: Filter.Filter<NoInfer<A>, B, X>, orElse: (x: X) => Effect<C, E2, R2>): Effect<B | C, E | E2, R | R2>;
 };
 /**
  * Filters an effect, failing with a custom error if the predicate fails.
@@ -8231,7 +8239,7 @@ export declare const filterOrFail: {
      * @since 2.0.0
      * @category Filtering
      */
-    <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>;
+    <A, B extends A>(refinement: Predicate.Refinement<NoInfer<A>, B>): <E, R>(self: Effect<A, E, R>) => Effect<B, Cause.NoSuchElementError | E, R>;
     /**
      * Filters an effect, failing with a custom error if the predicate fails.
      *
@@ -8261,7 +8269,7 @@ export declare const filterOrFail: {
      * @since 2.0.0
      * @category Filtering
      */
-    <A, B extends A>(refinement: Predicate.Refinement<NoInfer<A>, B>): <E, R>(self: Effect<A, E, R>) => Effect<B, Cause.NoSuchElementError | E, R>;
+    <A>(predicate: Predicate.Predicate<NoInfer<A>>): <E, R>(self: Effect<A, E, R>) => Effect<A, Cause.NoSuchElementError | E, R>;
     /**
      * Filters an effect, failing with a custom error if the predicate fails.
      *
@@ -8291,7 +8299,7 @@ export declare const filterOrFail: {
      * @since 2.0.0
      * @category Filtering
      */
-    <A>(predicate: Predicate.Predicate<NoInfer<A>>): <E, R>(self: Effect<A, E, R>) => Effect<A, Cause.NoSuchElementError | E, R>;
+    <A, E, R, E2, B extends A>(self: Effect<A, E, R>, refinement: Predicate.Refinement<NoInfer<A>, B>, orFailWith: (a: NoInfer<A>) => E2): Effect<B, E2 | E, R>;
     /**
      * Filters an effect, failing with a custom error if the predicate fails.
      *
@@ -8321,7 +8329,7 @@ export declare const filterOrFail: {
      * @since 2.0.0
      * @category Filtering
      */
-    <A, B, X>(filter: Filter.Filter<NoInfer<A>, B, X>): <E, R>(self: Effect<A, E, R>) => Effect<B, Cause.NoSuchElementError | E, R>;
+    <A, E, R, E2>(self: Effect<A, E, R>, predicate: Predicate.Predicate<NoInfer<A>>, orFailWith: (a: NoInfer<A>) => E2): Effect<A, E2 | E, R>;
     /**
      * Filters an effect, failing with a custom error if the predicate fails.
      *
@@ -8351,7 +8359,7 @@ export declare const filterOrFail: {
      * @since 2.0.0
      * @category Filtering
      */
-    <A, E, R, E2, B extends A>(self: Effect<A, E, R>, refinement: Predicate.Refinement<NoInfer<A>, B>, orFailWith: (a: NoInfer<A>) => E2): Effect<B, E2 | E, R>;
+    <A, E, R, B extends A>(self: Effect<A, E, R>, refinement: Predicate.Refinement<NoInfer<A>, B>): Effect<B, E | Cause.NoSuchElementError, R>;
     /**
      * Filters an effect, failing with a custom error if the predicate fails.
      *
@@ -8381,127 +8389,43 @@ export declare const filterOrFail: {
      * @since 2.0.0
      * @category Filtering
      */
-    <A, E, R, E2>(self: Effect<A, E, R>, predicate: Predicate.Predicate<NoInfer<A>>, orFailWith: (a: NoInfer<A>) => E2): Effect<A, E2 | E, R>;
+    <A, E, R>(self: Effect<A, E, R>, predicate: Predicate.Predicate<NoInfer<A>>): Effect<A, E | Cause.NoSuchElementError, R>;
+};
+/**
+ * Filters an effect with a `Filter`, failing when the filter fails.
+ *
+ * @since 4.0.0
+ * @category Filtering
+ */
+export declare const filterMapOrFail: {
     /**
-     * Filters an effect, failing with a custom error if the predicate fails.
+     * Filters an effect with a `Filter`, failing when the filter fails.
      *
-     * **Details**
-     *
-     * This function applies a predicate to the result of an effect. If the
-     * predicate evaluates to `false`, the effect fails with either a custom
-     * error (if `orFailWith` is provided) or a `NoSuchElementError`.
-     *
-     * @example
-     * ```ts
-     * import { Effect } from "effect"
-     *
-     * // An effect that produces a number
-     * const program = Effect.succeed(5)
-     *
-     * // Filter for even numbers, fail for odd numbers
-     * const filtered = Effect.filterOrFail(
-     *   program,
-     *   (n) => n % 2 === 0,
-     *   (n) => `Expected even number, got ${n}`
-     * )
-     *
-     * // Result: Effect.fail("Expected even number, got 5")
-     * ```
-     *
-     * @since 2.0.0
+     * @since 4.0.0
      * @category Filtering
      */
-    <A, E, R, B, X, E2>(self: Effect<A, E, R>, filter: Filter.Filter<A, B, X>, orFailWith: (x: X) => E2): Effect<B, E2 | E, R>;
+    <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, failing with a custom error if the predicate fails.
-     *
-     * **Details**
-     *
-     * This function applies a predicate to the result of an effect. If the
-     * predicate evaluates to `false`, the effect fails with either a custom
-     * error (if `orFailWith` is provided) or a `NoSuchElementError`.
-     *
-     * @example
-     * ```ts
-     * import { Effect } from "effect"
-     *
-     * // An effect that produces a number
-     * const program = Effect.succeed(5)
-     *
-     * // Filter for even numbers, fail for odd numbers
-     * const filtered = Effect.filterOrFail(
-     *   program,
-     *   (n) => n % 2 === 0,
-     *   (n) => `Expected even number, got ${n}`
-     * )
+     * Filters an effect with a `Filter`, failing when the filter fails.
      *
-     * // Result: Effect.fail("Expected even number, got 5")
-     * ```
-     *
-     * @since 2.0.0
+     * @since 4.0.0
      * @category Filtering
      */
-    <A, E, R, B extends A>(self: Effect<A, E, R>, refinement: Predicate.Refinement<NoInfer<A>, B>): Effect<B, E | Cause.NoSuchElementError, R>;
+    <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, failing with a custom error if the predicate fails.
-     *
-     * **Details**
-     *
-     * This function applies a predicate to the result of an effect. If the
-     * predicate evaluates to `false`, the effect fails with either a custom
-     * error (if `orFailWith` is provided) or a `NoSuchElementError`.
-     *
-     * @example
-     * ```ts
-     * import { Effect } from "effect"
-     *
-     * // An effect that produces a number
-     * const program = Effect.succeed(5)
+     * Filters an effect with a `Filter`, failing when the filter fails.
      *
-     * // Filter for even numbers, fail for odd numbers
-     * const filtered = Effect.filterOrFail(
-     *   program,
-     *   (n) => n % 2 === 0,
-     *   (n) => `Expected even number, got ${n}`
-     * )
-     *
-     * // Result: Effect.fail("Expected even number, got 5")
-     * ```
-     *
-     * @since 2.0.0
+     * @since 4.0.0
      * @category Filtering
      */
-    <A, E, R>(self: Effect<A, E, R>, predicate: Predicate.Predicate<NoInfer<A>>): Effect<A, E | Cause.NoSuchElementError, R>;
+    <A, E, R, B, X, E2>(self: Effect<A, E, R>, filter: Filter.Filter<A, B, X>, orFailWith: (x: X) => E2): Effect<B, E2 | E, R>;
     /**
-     * Filters an effect, failing with a custom error if the predicate fails.
-     *
-     * **Details**
-     *
-     * This function applies a predicate to the result of an effect. If the
-     * predicate evaluates to `false`, the effect fails with either a custom
-     * error (if `orFailWith` is provided) or a `NoSuchElementError`.
-     *
-     * @example
-     * ```ts
-     * import { Effect } from "effect"
-     *
-     * // An effect that produces a number
-     * const program = Effect.succeed(5)
-     *
-     * // Filter for even numbers, fail for odd numbers
-     * const filtered = Effect.filterOrFail(
-     *   program,
-     *   (n) => n % 2 === 0,
-     *   (n) => `Expected even number, got ${n}`
-     * )
-     *
-     * // Result: Effect.fail("Expected even number, got 5")
-     * ```
+     * Filters an effect with a `Filter`, failing when the filter fails.
      *
-     * @since 2.0.0
+     * @since 4.0.0
      * @category Filtering
      */
-    <A, E, R, B, X>(self: Effect<A, E, R>, filter: Filter.Filter<A, B, X>): Effect<B, E | Cause.NoSuchElementError, R>;
+    <A, E, R, B, X>(self: Effect<A, E, R>, filter: Filter.Filter<A, B, X>): Effect<B, Cause.NoSuchElementError | E, R>;
 };
 /**
  * Conditionally executes an effect based on a boolean condition.
@@ -11279,7 +11203,7 @@ export declare const onError: {
 };
 /**
  * Runs the finalizer only when this effect fails and the `Cause` matches the
- * filter, passing the filtered failure and the original cause.
+ * provided predicate.
  *
  * @example
  * ```ts
@@ -11303,7 +11227,7 @@ export declare const onError: {
 export declare const onErrorIf: {
     /**
      * Runs the finalizer only when this effect fails and the `Cause` matches the
-     * filter, passing the filtered failure and the original cause.
+     * provided predicate.
      *
      * @example
      * ```ts
@@ -11324,10 +11248,10 @@ export declare const onErrorIf: {
      * @since 4.0.0
      * @category Resource Management & Finalization
      */
-    <E, Result extends Filter.ResultOrBool, XE, XR>(filter: Filter.OrPredicate<Cause.Cause<E>, Result>, f: (failure: Filter.Pass<Cause.Cause<E>, Result>, cause: Cause.Cause<E>) => Effect<void, XE, XR>): <A, R>(self: Effect<A, E, R>) => Effect<A, E | XE, R | XR>;
+    <E, XE, XR>(predicate: Predicate.Predicate<Cause.Cause<E>>, f: (cause: Cause.Cause<E>) => Effect<void, XE, XR>): <A, R>(self: Effect<A, E, R>) => Effect<A, E | XE, R | XR>;
     /**
      * Runs the finalizer only when this effect fails and the `Cause` matches the
-     * filter, passing the filtered failure and the original cause.
+     * provided predicate.
      *
      * @example
      * ```ts
@@ -11348,7 +11272,29 @@ export declare const onErrorIf: {
      * @since 4.0.0
      * @category Resource Management & Finalization
      */
-    <A, E, R, XE, XR, Result extends Filter.ResultOrBool>(self: Effect<A, E, R>, filter: Filter.OrPredicate<Cause.Cause<E>, Result>, f: (failure: Filter.Pass<Cause.Cause<E>, Result>, cause: Cause.Cause<E>) => Effect<void, XE, XR>): Effect<A, E | XE, R | XR>;
+    <A, E, R, XE, XR>(self: Effect<A, E, R>, predicate: Predicate.Predicate<Cause.Cause<E>>, f: (cause: Cause.Cause<E>) => Effect<void, XE, XR>): Effect<A, E | XE, R | XR>;
+};
+/**
+ * Runs the finalizer only when this effect fails and the cause matches the provided `Filter`.
+ *
+ * @since 4.0.0
+ * @category Resource Management & Finalization
+ */
+export declare const onErrorFilter: {
+    /**
+     * Runs the finalizer only when this effect fails and the cause matches the provided `Filter`.
+     *
+     * @since 4.0.0
+     * @category Resource Management & Finalization
+     */
+    <A, E, EB, X, XE, XR>(filter: Filter.Filter<Cause.Cause<E>, EB, X>, f: (failure: EB, cause: Cause.Cause<E>) => Effect<void, XE, XR>): <R>(self: Effect<A, E, R>) => Effect<A, E | XE, R | XR>;
+    /**
+     * Runs the finalizer only when this effect fails and the cause matches the provided `Filter`.
+     *
+     * @since 4.0.0
+     * @category Resource Management & Finalization
+     */
+    <A, E, R, EB, X, XE, XR>(self: Effect<A, E, R>, filter: Filter.Filter<Cause.Cause<E>, EB, X>, f: (failure: EB, cause: Cause.Cause<E>) => Effect<void, XE, XR>): Effect<A, E | XE, R | XR>;
 };
 /**
  * The low level primitive that powers `onExit`.
@@ -11442,20 +11388,20 @@ export declare const onExit: {
     <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>;
 };
 /**
- * Runs the cleanup effect only when the `Exit` passes the provided filter.
- *
- * The cleanup is skipped when the filter returns `Filter.fail`.
+ * Runs the cleanup effect only when the `Exit` satisfies the provided
+ * predicate.
  *
  * @example
  * ```ts
- * import { Console, Effect, Exit, Filter } from "effect"
- *
- * const exitFilter = Filter.fromPredicate(Exit.isSuccess<number, never>)
+ * import { Console, Effect, Exit } from "effect"
  *
  * const program = Effect.onExitIf(
  *   Effect.succeed(42),
- *   exitFilter,
- *   (success) => Console.log(`Succeeded with: ${success.value}`)
+ *   Exit.isSuccess,
+ *   (exit) =>
+ *     Exit.isSuccess(exit)
+ *       ? Console.log(`Succeeded with: ${exit.value}`)
+ *       : Effect.void
  * )
  * ```
  *
@@ -11464,49 +11410,71 @@ export declare const onExit: {
  */
 export declare const onExitIf: {
     /**
-     * Runs the cleanup effect only when the `Exit` passes the provided filter.
-     *
-     * The cleanup is skipped when the filter returns `Filter.fail`.
+     * Runs the cleanup effect only when the `Exit` satisfies the provided
+     * predicate.
      *
      * @example
      * ```ts
-     * import { Console, Effect, Exit, Filter } from "effect"
-     *
-     * const exitFilter = Filter.fromPredicate(Exit.isSuccess<number, never>)
+     * import { Console, Effect, Exit } from "effect"
      *
      * const program = Effect.onExitIf(
      *   Effect.succeed(42),
-     *   exitFilter,
-     *   (success) => Console.log(`Succeeded with: ${success.value}`)
+     *   Exit.isSuccess,
+     *   (exit) =>
+     *     Exit.isSuccess(exit)
+     *       ? Console.log(`Succeeded with: ${exit.value}`)
+     *       : Effect.void
      * )
      * ```
      *
      * @since 4.0.0
      * @category Resource Management & Finalization
      */
-    <A, E, XE, XR, Result extends Filter.ResultOrBool>(filter: Filter.OrPredicate<Exit.Exit<NoInfer<A>, NoInfer<E>>, Result>, f: (pass: Filter.Pass<Exit.Exit<NoInfer<A>, NoInfer<E>>, Result>, exit: Exit.Exit<NoInfer<A>, NoInfer<E>>) => Effect<void, XE, XR>): <R>(self: Effect<A, E, R>) => Effect<A, E | XE, R | XR>;
+    <A, E, XE, XR>(predicate: Predicate.Predicate<Exit.Exit<NoInfer<A>, NoInfer<E>>>, f: (exit: Exit.Exit<NoInfer<A>, NoInfer<E>>) => Effect<void, XE, XR>): <R>(self: Effect<A, E, R>) => Effect<A, E | XE, R | XR>;
     /**
-     * Runs the cleanup effect only when the `Exit` passes the provided filter.
-     *
-     * The cleanup is skipped when the filter returns `Filter.fail`.
+     * Runs the cleanup effect only when the `Exit` satisfies the provided
+     * predicate.
      *
      * @example
      * ```ts
-     * import { Console, Effect, Exit, Filter } from "effect"
-     *
-     * const exitFilter = Filter.fromPredicate(Exit.isSuccess<number, never>)
+     * import { Console, Effect, Exit } from "effect"
      *
      * const program = Effect.onExitIf(
      *   Effect.succeed(42),
-     *   exitFilter,
-     *   (success) => Console.log(`Succeeded with: ${success.value}`)
+     *   Exit.isSuccess,
+     *   (exit) =>
+     *     Exit.isSuccess(exit)
+     *       ? Console.log(`Succeeded with: ${exit.value}`)
+     *       : Effect.void
      * )
      * ```
      *
      * @since 4.0.0
      * @category Resource Management & Finalization
      */
-    <A, E, R, XE, XR, Result extends Filter.ResultOrBool>(self: Effect<A, E, R>, filter: Filter.OrPredicate<Exit.Exit<NoInfer<A>, NoInfer<E>>, Result>, f: (pass: Filter.Pass<Exit.Exit<NoInfer<A>, NoInfer<E>>, Result>, exit: Exit.Exit<NoInfer<A>, NoInfer<E>>) => Effect<void, XE, XR>): Effect<A, E | XE, R | XR>;
+    <A, E, R, XE, XR>(self: Effect<A, E, R>, predicate: Predicate.Predicate<Exit.Exit<NoInfer<A>, NoInfer<E>>>, f: (exit: Exit.Exit<NoInfer<A>, NoInfer<E>>) => Effect<void, XE, XR>): Effect<A, E | XE, R | XR>;
+};
+/**
+ * Runs the cleanup effect only when the `Exit` matches the provided `Filter`.
+ *
+ * @since 4.0.0
+ * @category Resource Management & Finalization
+ */
+export declare const onExitFilter: {
+    /**
+     * Runs the cleanup effect only when the `Exit` matches the provided `Filter`.
+     *
+     * @since 4.0.0
+     * @category Resource Management & Finalization
+     */
+    <A, E, XE, XR, B, X>(filter: Filter.Filter<Exit.Exit<NoInfer<A>, NoInfer<E>>, B, X>, f: (b: B, exit: Exit.Exit<NoInfer<A>, NoInfer<E>>) => Effect<void, XE, XR>): <R>(self: Effect<A, E, R>) => Effect<A, E | XE, R | XR>;
+    /**
+     * Runs the cleanup effect only when the `Exit` matches the provided `Filter`.
+     *
+     * @since 4.0.0
+     * @category Resource Management & Finalization
+     */
+    <A, E, R, XE, XR, B, X>(self: Effect<A, E, R>, filter: Filter.Filter<Exit.Exit<NoInfer<A>, NoInfer<E>>, B, X>, f: (b: B, exit: Exit.Exit<NoInfer<A>, NoInfer<E>>) => Effect<void, XE, XR>): Effect<A, E | XE, R | XR>;
 };
 /**
  * Returns an effect that lazily computes a result and caches it for subsequent
@@ -17427,118 +17395,63 @@ declare const Transaction_base: ServiceMap.ServiceClass<Transaction, "effect/Eff
 export declare class Transaction extends Transaction_base {
 }
 /**
- * Defines a transaction. Transactions are "all or nothing" with respect to changes made to
- * transactional values (i.e. TxRef) that occur within the transaction body.
+ * Accesses the current transaction state within an active transaction.
  *
- * In Effect transactions are optimistic with retry, that means transactions are retried when:
- *
- * - the body of the transaction explicitely calls to `Effect.retryTransaction` and any of the
- *   accessed transactional values changes.
- *
- * - any of the accessed transactional values change during the execution of the transaction
- *   due to a different transaction committing before the current.
- *
- * - parent transaction retry, if you have a transaction within another transaction and
- *   the parent retries the child will also retry together with the parent.
+ * This function requires `Transaction` in the context and does NOT create or strip
+ * transaction boundaries. Use it to interact with the transaction journal (e.g. in
+ * `TxRef` internals). To define a transaction boundary, use {@link transaction}.
  *
  * @example
  * ```ts
  * import { Effect, TxRef } from "effect"
  *
  * const program = Effect.gen(function*() {
- *   const ref1 = yield* TxRef.make(0)
- *   const ref2 = yield* TxRef.make(0)
- *
- *   // All operations within atomic block succeed or fail together
- *   yield* Effect.atomic(Effect.gen(function*() {
- *     yield* TxRef.set(ref1, 10)
- *     yield* TxRef.set(ref2, 20)
- *     const sum = (yield* TxRef.get(ref1)) + (yield* TxRef.get(ref2))
- *     console.log(`Transaction sum: ${sum}`)
- *   }))
- *
- *   console.log(`Final ref1: ${yield* TxRef.get(ref1)}`) // 10
- *   console.log(`Final ref2: ${yield* TxRef.get(ref2)}`) // 20
- * })
- * ```
- *
- * @since 4.0.0
- * @category Transactions
- */
-export declare const atomic: <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, Exclude<R, Transaction>>;
-/**
- * Executes a function within a transaction context, providing access to the transaction state.
- *
- * @example
- * ```ts
- * import { Effect, TxRef } from "effect"
- *
- * const program = Effect.atomicWith((txState) =>
- *   Effect.gen(function*() {
- *     const ref = yield* TxRef.make(0)
- *
- *     // Access transaction state for debugging
- *     console.log(`Journal size: ${txState.journal.size}`)
- *     console.log(`Retry flag: ${txState.retry}`)
+ *   const ref = yield* Effect.transaction(TxRef.make(0))
  *
+ *   yield* Effect.transaction(Effect.gen(function*() {
  *     yield* TxRef.set(ref, 42)
  *     return yield* TxRef.get(ref)
- *   })
- * )
- *
- * Effect.runPromise(program).then(console.log) // 42
+ *   }))
+ * })
  * ```
  *
  * @since 4.0.0
  * @category Transactions
  */
-export declare const atomicWith: <A, E, R>(f: (state: Transaction["Service"]) => Effect<A, E, R>) => Effect<A, E, Exclude<R, Transaction>>;
+export declare const withTxState: <A, E, R>(f: (state: Transaction["Service"]) => Effect<A, E, R>) => Effect<A, E, R | Transaction>;
 /**
- * Creates an isolated transaction that never composes with parent transactions.
+ * Defines a transaction boundary. Transactions are "all or nothing" with respect to changes
+ * made to transactional values (i.e. TxRef) that occur within the transaction body.
  *
- * **Details**
+ * In Effect transactions are optimistic with retry, that means transactions are retried when:
  *
- * Unlike `Effect.atomic`, which composes with parent transactions when nested,
- * `Effect.transaction` always creates a new isolated transaction boundary.
- * This ensures complete isolation between different transaction scopes.
+ * - the body of the transaction explicitely calls to `Effect.retryTransaction` and any of the
+ *   accessed transactional values changes.
  *
- * **Key Differences from Effect.atomic:**
- * - Always creates a new transaction, even when called within another transaction
- * - Parent transaction failures don't affect isolated transactions
- * - Isolated transaction failures don't affect parent transactions
- * - Each transaction has its own journal and retry logic
+ * - any of the accessed transactional values change during the execution of the transaction
+ *   due to a different transaction committing before the current.
  *
- * **When to Use:**
- * - When you need guaranteed isolation between transaction scopes
- * - For implementing independent operations that shouldn't be affected by outer transactions
- * - When building transaction-based systems where isolation is critical
+ * Each call to `transaction` always creates a new isolated transaction boundary with its own
+ * journal and retry logic.
  *
  * @example
  * ```ts
  * import { Effect, TxRef } from "effect"
  *
  * const program = Effect.gen(function*() {
- *   const ref1 = yield* TxRef.make(0)
- *   const ref2 = yield* TxRef.make(100)
+ *   const ref1 = yield* Effect.transaction(TxRef.make(0))
+ *   const ref2 = yield* Effect.transaction(TxRef.make(0))
  *
- *   // Nested atomic transaction - ref1 will be part of outer transaction
- *   yield* Effect.atomic(Effect.gen(function*() {
- *     yield* TxRef.set(ref1, 10)
- *
- *     // This atomic operation composes with the parent
- *     yield* Effect.atomic(Effect.gen(function*() {
- *       yield* TxRef.set(ref1, 20) // Part of same transaction
- *     }))
- *   }))
- *
- *   // Isolated transaction - ref2 will be in its own transaction
+ *   // All operations within transaction block succeed or fail together
  *   yield* Effect.transaction(Effect.gen(function*() {
- *     yield* TxRef.set(ref2, 200)
+ *     yield* TxRef.set(ref1, 10)
+ *     yield* TxRef.set(ref2, 20)
+ *     const sum = (yield* TxRef.get(ref1)) + (yield* TxRef.get(ref2))
+ *     console.log(`Transaction sum: ${sum}`)
  *   }))
  *
- *   const val1 = yield* TxRef.get(ref1) // 20
- *   const val2 = yield* TxRef.get(ref2) // 200
- *   return { ref1: val1, ref2: val2 }
+ *   console.log(`Final ref1: ${yield* Effect.transaction(TxRef.get(ref1))}`) // 10
+ *   console.log(`Final ref2: ${yield* Effect.transaction(TxRef.get(ref2))}`) // 20
  * })
  * ```
  *
@@ -17547,34 +17460,21 @@ export declare const atomicWith: <A, E, R>(f: (state: Transaction["Service"]) =>
  */
 export declare const transaction: <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, Exclude<R, Transaction>>;
 /**
- * Executes a function within an isolated transaction context, providing access to the transaction state.
+ * Like {@link transaction} but provides access to the transaction state.
  *
- * This function always creates a new transaction boundary, regardless of whether it's called
- * within another transaction. This ensures complete isolation between transaction scopes.
+ * Always creates a new isolated transaction boundary with its own journal and retry logic.
  *
  * @example
  * ```ts
  * import { Effect, TxRef } from "effect"
  *
- * const program = Effect.transactionWith((txState) =>
+ * const program = Effect.transactionWith((_txState) =>
  *   Effect.gen(function*() {
  *     const ref = yield* TxRef.make(0)
- *
- *     // This transaction is isolated - it has its own journal
- *     // txState.journal is independent of any parent transaction
- *
  *     yield* TxRef.set(ref, 42)
  *     return yield* TxRef.get(ref)
  *   })
  * )
- *
- * // Even when nested in another atomic block, this transaction is isolated
- * const nestedProgram = Effect.atomic(
- *   Effect.gen(function*() {
- *     const result = yield* program // Runs in its own isolated transaction
- *     return result
- *   })
- * )
  * ```
  *
  * @since 4.0.0
@@ -17596,16 +17496,16 @@ export declare const transactionWith: <A, E, R>(f: (state: Transaction["Service"
  *
  * const program = Effect.gen(function*() {
  *   // create a transactional reference
- *   const ref = yield* TxRef.make(0)
+ *   const ref = yield* Effect.transaction(TxRef.make(0))
  *
  *   // forks a fiber that increases the value of `ref` every 100 millis
  *   yield* Effect.forkChild(Effect.forever(
  *     // update to transactional value
- *     TxRef.update(ref, (n) => n + 1).pipe(Effect.delay("100 millis"))
+ *     Effect.transaction(TxRef.update(ref, (n) => n + 1)).pipe(Effect.delay("100 millis"))
  *   ))
  *
  *   // the following will retry 10 times until the `ref` value is 10
- *   yield* Effect.atomic(Effect.gen(function*() {
+ *   yield* Effect.transaction(Effect.gen(function*() {
  *     const value = yield* TxRef.get(ref)
  *     if (value < 10) {
  *       yield* Effect.log(`retry due to value: ${value}`)