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

package/src/Stream.ts

@@ -67,7 +67,7 @@ import * as Option from "./Option.ts"
 import type { Pipeable } from "./Pipeable.ts"
 import type { Predicate, Refinement } from "./Predicate.ts"
 import { hasProperty, isNotUndefined, isTagged } from "./Predicate.ts"
-import type * as PubSub from "./PubSub.ts"
+import * as PubSub from "./PubSub.ts"
 import * as Pull from "./Pull.ts"
 import * as Queue from "./Queue.ts"
 import * as RcMap from "./RcMap.ts"
@@ -90,6 +90,7 @@ import type {
   OmitReason,
   ReasonTags,
   Tags,
+  TupleOf,
   unassigned
 } from "./Types.ts"
 import type * as Unify from "./Unify.ts"
@@ -138,7 +139,7 @@ export const TypeId: TypeId = "~effect/Stream"
  * // 6
  * ```
  *
- * @category Models
+ * @category models
  * @since 2.0.0
  */
 export interface Stream<out A, out E = never, out R = never> extends Variance<A, E, R>, Pipeable {
@@ -151,7 +152,7 @@ export interface Stream<out A, out E = never, out R = never> extends Variance<A,
 /**
  * Type-level unification hook for Stream within the Effect type system.
  *
- * @category Models
+ * @category models
  * @since 2.0.0
  */
 export interface StreamUnify<A extends { [Unify.typeSymbol]?: any }> extends Effect.EffectUnify<A> {
@@ -161,7 +162,7 @@ export interface StreamUnify<A extends { [Unify.typeSymbol]?: any }> extends Eff
 /**
  * Type-level marker that excludes Stream from unification.
  *
- * @category Models
+ * @category models
  * @since 2.0.0
  */
 export interface StreamUnifyIgnore {
@@ -174,11 +175,10 @@ export interface StreamUnifyIgnore {
  * **Example** (Using the stream type lambda)
  *
  * ```ts
- * import type { Kind } from "effect/HKT"
- * import type { StreamTypeLambda } from "effect/Stream"
+ * import type { HKT, Stream } from "effect"
  *
  * // Create a Stream type using the type lambda
- * type NumberStream = Kind<StreamTypeLambda, never, string, never, number>
+ * type NumberStream = HKT.Kind<Stream.StreamTypeLambda, never, string, never, number>
  * // Equivalent to: Stream<number, string, never>
  * ```
  *
@@ -195,7 +195,7 @@ export interface StreamTypeLambda extends TypeLambda {
  * The emitted value `A`, error `E`, and service requirement `R` type
  * parameters are covariant.
  *
- * @category Models
+ * @category models
  * @since 2.0.0
  */
 export interface Variance<out A, out E, out R> {
@@ -208,8 +208,8 @@ export interface Variance<out A, out E, out R> {
  *
  * `_A`, `_E`, and `_R` are covariant markers.
  *
- * @category Models
- * @since 2.0.0
+ * @category models
+ * @since 3.4.0
  */
 export interface VarianceStruct<out A, out E, out R> {
   readonly _A: Covariant<A>
@@ -256,10 +256,6 @@ export type Error<T extends Stream<any, any, any>> = [T] extends [Stream<infer _
 /**
  * Extract the services type from a Stream type.
  *
- * **Previously Known As:**
- *
- * This type alias was named `Context` in Effect 3.x.
- *
  * **Example** (Extracting the services type from a Stream type)
  *
  * ```ts
@@ -274,7 +270,7 @@ export type Error<T extends Stream<any, any, any>> = [T] extends [Stream<infer _
  * ```
  *
  * @category Type-Level
- * @since 3.4.0
+ * @since 4.0.0
  */
 export type Services<T extends Stream<any, any, any>> = [T] extends [Stream<infer _A, infer _E, infer _R>] ? _R
   : never
@@ -300,8 +296,8 @@ export type Services<T extends Stream<any, any, any>> = [T] extends [Stream<infe
  * Effect.runPromise(program)
  * ```
  *
- * @category Guards
- * @since 2.0.0
+ * @category guards
+ * @since 4.0.0
  */
 export const isStream = (u: unknown): u is Stream<unknown, unknown, unknown> => hasProperty(u, TypeId)
 
@@ -329,14 +325,8 @@ export const DefaultChunkSize: number = Channel.DefaultChunkSize
 /**
  * Describes how merged streams decide when to halt.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `StreamHaltStrategy.HaltStrategy`
- *
- * @category Models
- * @since 2.0.0
+ * @category models
+ * @since 4.0.0
  */
 export type HaltStrategy = Channel.HaltStrategy
 
@@ -358,7 +348,7 @@ export type HaltStrategy = Channel.HaltStrategy
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromChannel: <Arr extends Arr.NonEmptyReadonlyArray<any>, E, R>(
@@ -384,7 +374,7 @@ export const fromChannel: <Arr extends Arr.NonEmptyReadonlyArray<any>, E, R>(
  * // Output: [ 42 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromEffect = <A, E, R>(effect: Effect.Effect<A, E, R>): Stream<A, E, R> =>
@@ -396,7 +386,7 @@ export const fromEffect = <A, E, R>(effect: Effect.Effect<A, E, R>): Stream<A, E
  * **Example** (Accessing a service as a stream)
  *
  * ```ts
- * import { Effect, Context, Stream } from "effect"
+ * import { Context, Effect, Stream } from "effect"
  *
  * class Greeter extends Context.Service<Greeter, {
  *   readonly greet: (name: string) => string
@@ -431,7 +421,7 @@ export const service = <I, S>(service: Context.Key<I, S>): Stream<S, never, I> =
  * **Example** (Accessing an optional service as a stream)
  *
  * ```ts
- * import { Effect, Option, Context, Stream } from "effect"
+ * import { Context, Effect, Option, Stream } from "effect"
  *
  * class Greeter extends Context.Service<Greeter, {
  *   readonly greet: (name: string) => string
@@ -483,7 +473,7 @@ export const serviceOption = <I, S>(service: Context.Key<I, S>): Stream<Option.O
  * // Output: Draining side effect
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromEffectDrain = <A, E, R>(effect: Effect.Effect<A, E, R>): Stream<never, E, R> =>
@@ -492,12 +482,6 @@ export const fromEffectDrain = <A, E, R>(effect: Effect.Effect<A, E, R>): Stream
 /**
  * Creates a stream from an effect producing a value of type `A` which repeats forever.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.repeatEffect`
- *
  * **Example** (Repeating an effect forever)
  *
  * ```ts
@@ -515,7 +499,7 @@ export const fromEffectDrain = <A, E, R>(effect: Effect.Effect<A, E, R>): Stream
  * // Output: [ 3891571149, 4239494205, 2352981603, 2339111046, 1488052210 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromEffectRepeat = <A, E, R>(effect: Effect.Effect<A, E, R>): Stream<A, Pull.ExcludeDone<E>, R> =>
@@ -525,12 +509,6 @@ export const fromEffectRepeat = <A, E, R>(effect: Effect.Effect<A, E, R>): Strea
  * Creates a stream from an effect producing a value of type `A`, which is
  * repeated using the specified schedule.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.repeatEffectWithSchedule`
- *
  * **Example** (Repeating an effect with a schedule)
  *
  * ```ts
@@ -549,8 +527,8 @@ export const fromEffectRepeat = <A, E, R>(effect: Effect.Effect<A, E, R>): Strea
  * // Output: [ "ping", "ping", "ping" ]
  * ```
  *
- * @category Constructors
- * @since 2.0.0
+ * @category constructors
+ * @since 4.0.0
  */
 export const fromEffectSchedule = <A, E, R, X, AS extends A, ES, RS>(
   effect: Effect.Effect<A, E, R>,
@@ -597,7 +575,7 @@ export const fromEffectSchedule = <A, E, R, X, AS extends A, ES, RS>(
  * // Output: [ undefined, undefined, undefined ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const tick = (interval: Duration.Input): Stream<void> =>
@@ -639,7 +617,7 @@ export const tick = (interval: Duration.Input): Stream<void> =>
  * // Output: [1, 2, 3]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromPull = <A, E, R, EX, RX>(
@@ -667,7 +645,7 @@ export const fromPull = <A, E, R, EX, RX>(
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const transformPull = <A, E, R, B, E2, R2, EX, RX>(
@@ -716,7 +694,7 @@ export const transformPull = <A, E, R, B, E2, R2, EX, RX>(
  * // Releasing scope
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const transformPullBracket = <A, E, R, B, E2, R2, EX, RX>(
@@ -756,7 +734,7 @@ export const transformPullBracket = <A, E, R, B, E2, R2, EX, RX>(
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const toChannel = <A, E, R>(
@@ -773,15 +751,6 @@ export const toChannel = <A, E, R>(
  * You can customize the buffer size and strategy by passing an object as the
  * second argument with the `bufferSize` and `strategy` fields.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.async`
- * - `Stream.asyncEffect`
- * - `Stream.asyncPush`
- * - `Stream.asyncScoped`
- *
  * **Example** (Creating a stream from a callback that can emit values into a queue)
  *
  * ```ts
@@ -807,8 +776,8 @@ export const toChannel = <A, E, R>(
  * Effect.runPromise(program)
  * ```
  *
- * @category Constructors
- * @since 2.0.0
+ * @category constructors
+ * @since 4.0.0
  */
 export const callback = <A, E = never, R = never>(
   f: (queue: Queue.Queue<A, E | Cause.Done>) => Effect.Effect<unknown, E, R | Scope.Scope>,
@@ -835,8 +804,8 @@ export const callback = <A, E = never, R = never>(
  * // []
  * ```
  *
- * @category Constructors
- * @since 4.0.0
+ * @category constructors
+ * @since 2.0.0
  */
 export const empty: Stream<never> = fromChannel(Channel.empty)
 
@@ -857,7 +826,7 @@ export const empty: Stream<never> = fromChannel(Channel.empty)
  * // [ 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const succeed = <A>(value: A): Stream<A> => fromChannel(Channel.succeed(Arr.of(value)))
@@ -880,7 +849,7 @@ export const succeed = <A>(value: A): Stream<A> => fromChannel(Channel.succeed(A
  * Effect.runPromise(program)
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const make = <const As extends ReadonlyArray<any>>(...values: As): Stream<As[number]> => fromArray(values)
@@ -904,7 +873,7 @@ export const make = <const As extends ReadonlyArray<any>>(...values: As): Stream
  * // Output: [ 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const sync = <A>(evaluate: LazyArg<A>): Stream<A> => fromChannel(Channel.sync(() => Arr.of(evaluate())))
@@ -928,7 +897,7 @@ export const sync = <A>(evaluate: LazyArg<A>): Stream<A> => fromChannel(Channel.
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const suspend = <A, E, R>(stream: LazyArg<Stream<A, E, R>>): Stream<A, E, R> =>
@@ -952,7 +921,7 @@ export const suspend = <A, E, R>(stream: LazyArg<Stream<A, E, R>>): Stream<A, E,
  * Effect.runPromise(program)
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fail = <E>(error: E): Stream<never, E> => fromChannel(Channel.fail(error))
@@ -977,7 +946,7 @@ export const fail = <E>(error: E): Stream<never, E> => fromChannel(Channel.fail(
  * // { _id: 'Exit', _tag: 'Failure', cause: { _id: 'Cause', _tag: 'Fail', failure: 'Uh oh!' } }
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const failSync = <E>(evaluate: LazyArg<E>): Stream<never, E> => fromChannel(Channel.failSync(evaluate))
@@ -1003,7 +972,7 @@ export const failSync = <E>(evaluate: LazyArg<E>): Stream<never, E> => fromChann
  * Effect.runPromise(program)
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const failCause = <E>(cause: Cause.Cause<E>): Stream<never, E> => fromChannel(Channel.failCause(cause))
@@ -1036,7 +1005,7 @@ export const failCause = <E>(cause: Cause.Cause<E>): Stream<never, E> => fromCha
  * // Output: Exit.Failure(Error: Boom)
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const die = (defect: unknown): Stream<never> => fromChannel(Channel.die(defect))
@@ -1063,7 +1032,7 @@ export const die = (defect: unknown): Stream<never> => fromChannel(Channel.die(d
  * // { _id: 'Exit', _tag: 'Failure', cause: { _id: 'Cause', _tag: 'Fail', failure: 'Connection timeout after retries' } }
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const failCauseSync = <E>(evaluate: LazyArg<Cause.Cause<E>>): Stream<never, E> =>
@@ -1096,7 +1065,7 @@ export const failCauseSync = <E>(evaluate: LazyArg<Cause.Cause<E>>): Stream<neve
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromIteratorSucceed = <A>(iterator: IterableIterator<A>, maxChunkSize?: number): Stream<A> =>
@@ -1126,7 +1095,7 @@ export const fromIteratorSucceed = <A>(iterator: IterableIterator<A>, maxChunkSi
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromIterable = <A>(
@@ -1145,7 +1114,7 @@ export const fromIterable = <A>(
  * **Example** (Creating a stream from an iterable effect)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class UserRepo extends Context.Service<UserRepo, {
  *   readonly list: Effect.Effect<ReadonlyArray<string>>
@@ -1171,7 +1140,7 @@ export const fromIterable = <A>(
  * // Output: [ "user1", "user2" ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromIterableEffect = <A, E, R>(iterable: Effect.Effect<Iterable<A>, E, R>): Stream<A, E, R> =>
@@ -1180,12 +1149,6 @@ export const fromIterableEffect = <A, E, R>(iterable: Effect.Effect<Iterable<A>,
 /**
  * Creates a stream by repeatedly running an effect that yields an iterable of values.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.repeatEffectChunk`
- *
  * **Example** (Repeating an iterable effect)
  *
  * ```ts
@@ -1203,7 +1166,7 @@ export const fromIterableEffect = <A, E, R>(iterable: Effect.Effect<Iterable<A>,
  * // Output: [ 1, 2, 1, 2, 1 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromIterableEffectRepeat = <A, E, R>(
@@ -1213,12 +1176,6 @@ export const fromIterableEffectRepeat = <A, E, R>(
 /**
  * Creates a stream from an array of values.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.fromChunk`
- *
  * **Example** (Creating a stream from an array of values)
  *
  * ```ts
@@ -1234,7 +1191,7 @@ export const fromIterableEffectRepeat = <A, E, R>(
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromArray = <A>(array: ReadonlyArray<A>): Stream<A> =>
@@ -1258,7 +1215,7 @@ export const fromArray = <A>(array: ReadonlyArray<A>): Stream<A> =>
  * // Output: [ "Ada", "Grace" ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromArrayEffect = <A, E, R>(
@@ -1268,12 +1225,6 @@ export const fromArrayEffect = <A, E, R>(
 /**
  * Creates a stream from an arbitrary number of arrays.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.fromChunks`
- *
  * **Example** (Creating a stream from an arbitrary number of arrays)
  *
  * ```ts
@@ -1289,7 +1240,7 @@ export const fromArrayEffect = <A, E, R>(
  * // Output: [ 1, 2, 3, 4 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromArrays = <Arr extends ReadonlyArray<ReadonlyArray<any>>>(
@@ -1323,8 +1274,8 @@ export const fromArrays = <Arr extends ReadonlyArray<ReadonlyArray<any>>>(
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
- * @since 4.0.0
+ * @category constructors
+ * @since 2.0.0
  */
 export const fromQueue = <A, E>(queue: Queue.Dequeue<A, E>): Stream<A, Exclude<E, Cause.Done>> =>
   fromChannel(Channel.fromQueueArray(queue))
@@ -1358,8 +1309,8 @@ export const fromQueue = <A, E>(queue: Queue.Dequeue<A, E>): Stream<A, Exclude<E
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
- * @since 4.0.0
+ * @category constructors
+ * @since 2.0.0
  */
 export const fromPubSub = <A>(pubsub: PubSub.PubSub<A>): Stream<A> => fromChannel(Channel.fromPubSubArray(pubsub))
 
@@ -1390,7 +1341,7 @@ export const fromPubSub = <A>(pubsub: PubSub.PubSub<A>): Stream<A> => fromChanne
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromPubSubTake = <A, E>(pubsub: PubSub.PubSub<Take.Take<A, E>>): Stream<A, E> =>
@@ -1432,7 +1383,7 @@ export const fromPubSubTake = <A, E>(pubsub: PubSub.PubSub<Take.Take<A, E>>): St
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromReadableStream = <A, E>(
@@ -1484,7 +1435,7 @@ export const fromReadableStream = <A, E>(
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromAsyncIterable = <A, E>(
@@ -1514,7 +1465,7 @@ export const fromAsyncIterable = <A, E>(
  * // Output: [ 0, 1, 2 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromSchedule = <O, E, R>(schedule: Schedule.Schedule<O, unknown, E, R>): Stream<O, E, R> =>
@@ -1552,7 +1503,7 @@ export const fromSchedule = <O, E, R>(schedule: Schedule.Schedule<O, unknown, E,
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromSubscription = <A>(pubsub: PubSub.Subscription<A>): Stream<A> =>
@@ -1561,7 +1512,7 @@ export const fromSubscription = <A>(pubsub: PubSub.Subscription<A>): Stream<A> =
 /**
  * Interface representing an event listener target.
  *
- * @category Models
+ * @category models
  * @since 3.4.0
  */
 export interface EventListener<A> {
@@ -1614,7 +1565,7 @@ export interface EventListener<A> {
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 3.1.0
  */
 export const fromEventListener = <A = unknown>(
@@ -1659,7 +1610,7 @@ export const fromEventListener = <A = unknown>(
  * // Output: [ 1, 2, 3, 4, 5 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const unfold = <S, A, E, R>(
@@ -1683,8 +1634,7 @@ export const unfold = <S, A, E, R>(
  * **Example** (Paginating stream state)
  *
  * ```ts
- * import { Console, Effect, Stream } from "effect"
- * import * as Option from "effect/Option"
+ * import { Console, Effect, Option, Stream } from "effect"
  *
  * const stream = Stream.paginate(0, (n: number) =>
  *   Effect.succeed(
@@ -1698,7 +1648,7 @@ export const unfold = <S, A, E, R>(
  * // Output: [ 0, 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const paginate = <S, A, E = never, R = never>(
@@ -1743,7 +1693,7 @@ export const paginate = <S, A, E = never, R = never>(
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const iterate = <A>(value: A, next: (value: A) => A): Stream<A> =>
@@ -1768,8 +1718,8 @@ export const iterate = <A>(value: A, next: (value: A) => A): Stream<A> =>
  * Effect.runPromise(program)
  * // Output: [ 1, 2, 3, 4, 5 ]
  * ```
- * @category Constructors
- * @since 4.0.0
+ * @category constructors
+ * @since 2.0.0
  */
 export const range = (
   min: number,
@@ -1810,8 +1760,8 @@ export const range = (
  * // []
  * ```
  *
- * @category Constructors
- * @since 4.0.0
+ * @category constructors
+ * @since 2.0.0
  */
 export const never: Stream<never> = fromChannel(Channel.never)
 
@@ -1834,7 +1784,7 @@ export const never: Stream<never> = fromChannel(Channel.never)
  * // [1, 2, 3]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const unwrap = <A, E2, R2, E, R>(
@@ -1865,7 +1815,7 @@ export const unwrap = <A, E2, R2, E, R>(
  * // [ "resource" ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const scoped = <A, E, R>(
@@ -1889,7 +1839,7 @@ export const scoped = <A, E, R>(
  * // [ 1, 3, 5 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const map: {
@@ -1910,7 +1860,7 @@ export const map: {
    * // [ 1, 3, 5 ]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, B>(f: (a: A, i: number) => B): <E, R>(self: Stream<A, E, R>) => Stream<B, E, R>
@@ -1931,7 +1881,7 @@ export const map: {
    * // [ 1, 3, 5 ]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, E, R, B>(self: Stream<A, E, R>, f: (a: A, i: number) => B): Stream<B, E, R>
@@ -1977,7 +1927,7 @@ export const map: {
  * // Output: [ "error: boom" ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const mapBoth: {
@@ -2014,7 +1964,7 @@ export const mapBoth: {
    * // Output: [ "error: boom" ]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <E, E2, A, A2>(
@@ -2053,7 +2003,7 @@ export const mapBoth: {
    * // Output: [ "error: boom" ]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, E, R, E2, A2>(
@@ -2072,12 +2022,6 @@ export const mapBoth: {
 /**
  * Transforms each emitted chunk using the provided function, which receives the chunk and its index.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.mapChunks`
- *
  * **Example** (Mapping stream chunks)
  *
  * ```ts
@@ -2096,19 +2040,13 @@ export const mapBoth: {
  * // Output: [ 1, 2, 4, 5 ]
  * ```
  *
- * @category Mapping
- * @since 2.0.0
+ * @category mapping
+ * @since 4.0.0
  */
 export const mapArray: {
   /**
    * Transforms each emitted chunk using the provided function, which receives the chunk and its index.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.mapChunks`
-   *
    * **Example** (Mapping stream chunks)
    *
    * ```ts
@@ -2127,8 +2065,8 @@ export const mapArray: {
    * // Output: [ 1, 2, 4, 5 ]
    * ```
    *
-   * @category Mapping
-   * @since 2.0.0
+   * @category mapping
+   * @since 4.0.0
    */
   <A, B>(
     f: (a: Arr.NonEmptyReadonlyArray<A>, i: number) => Arr.NonEmptyReadonlyArray<B>
@@ -2136,12 +2074,6 @@ export const mapArray: {
   /**
    * Transforms each emitted chunk using the provided function, which receives the chunk and its index.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.mapChunks`
-   *
    * **Example** (Mapping stream chunks)
    *
    * ```ts
@@ -2160,8 +2092,8 @@ export const mapArray: {
    * // Output: [ 1, 2, 4, 5 ]
    * ```
    *
-   * @category Mapping
-   * @since 2.0.0
+   * @category mapping
+   * @since 4.0.0
    */
   <A, E, R, B>(
     self: Stream<A, E, R>,
@@ -2204,7 +2136,7 @@ export const mapArray: {
  * // [2, 4, 6]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const mapEffect: {
@@ -2240,7 +2172,7 @@ export const mapEffect: {
    * // [2, 4, 6]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, A2, E2, R2>(
@@ -2282,7 +2214,7 @@ export const mapEffect: {
    * // [2, 4, 6]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, E, R, A2, E2, R2>(
@@ -2327,7 +2259,7 @@ export const mapEffect: {
  * // Output: [1, 2, 3]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const flattenEffect: <
@@ -2360,12 +2292,6 @@ export const flattenEffect: <
 /**
  * Effectfully maps over non-empty array chunks emitted by the stream.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.mapChunksEffect`
- *
  * **Example** (Effectfully mapping stream chunks)
  *
  * ```ts
@@ -2386,19 +2312,13 @@ export const flattenEffect: <
  * // Output: [1, 2, 13, 14]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 4.0.0
  */
 export const mapArrayEffect: {
   /**
    * Effectfully maps over non-empty array chunks emitted by the stream.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.mapChunksEffect`
-   *
    * **Example** (Effectfully mapping stream chunks)
    *
    * ```ts
@@ -2419,7 +2339,7 @@ export const mapArrayEffect: {
    * // Output: [1, 2, 13, 14]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 4.0.0
    */
   <A, B, E2, R2>(
@@ -2428,12 +2348,6 @@ export const mapArrayEffect: {
   /**
    * Effectfully maps over non-empty array chunks emitted by the stream.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.mapChunksEffect`
-   *
    * **Example** (Effectfully mapping stream chunks)
    *
    * ```ts
@@ -2454,7 +2368,7 @@ export const mapArrayEffect: {
    * // Output: [1, 2, 13, 14]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 4.0.0
    */
   <A, E, R, B, E2, R2>(
@@ -2471,12 +2385,6 @@ export const mapArrayEffect: {
  *
  * The stream ends after the first failure, emitting a `Result.fail` value.
  *
- * **Previously Known As:**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.either`
- *
  * **Example** (Converting failures to results)
  *
  * ```ts
@@ -2499,7 +2407,7 @@ export const mapArrayEffect: {
  * // Output: [ "success: 1", "success: 2", "failure: boom" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const result = <A, E, R>(self: Stream<A, E, R>): Stream<Result.Result<A, E>, never, R> =>
@@ -2538,7 +2446,7 @@ export const result = <A, E, R>(self: Stream<A, E, R>): Stream<Result.Result<A,
  * // [ 2, 4, 6 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const tap: {
@@ -2572,7 +2480,7 @@ export const tap: {
    * // [ 2, 4, 6 ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, X, E2, R2>(
@@ -2611,7 +2519,7 @@ export const tap: {
    * // [ 2, 4, 6 ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, X, E2, R2>(
@@ -2663,7 +2571,7 @@ export const tap: {
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const tapBoth: {
@@ -2696,7 +2604,7 @@ export const tapBoth: {
    * // [ 1, 2, 3 ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, X, E2, R2, Y, E3, R3>(
@@ -2735,7 +2643,7 @@ export const tapBoth: {
    * // [ 1, 2, 3 ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, X, E2, R2, Y, E3, R3>(
@@ -2787,7 +2695,7 @@ export const tapBoth: {
  * // Output: [1, 2, 3]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const tapSink: {
@@ -2819,7 +2727,7 @@ export const tapSink: {
    * // Output: [1, 2, 3]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E2, R2>(sink: Sink.Sink<unknown, A, unknown, E2, R2>): <E, R>(self: Stream<A, E, R>) => Stream<A, E2 | E, R2 | R>
@@ -2851,7 +2759,7 @@ export const tapSink: {
    * // Output: [1, 2, 3]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, E2, R2>(self: Stream<A, E, R>, sink: Sink.Sink<unknown, A, unknown, E2, R2>): Stream<A, E | E2, R | R2>
@@ -2945,7 +2853,7 @@ export const tapSink: {
  * // Output: [ 1, 2, 2, 4, 3, 6 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const flatMap: {
@@ -2974,7 +2882,7 @@ export const flatMap: {
    * // Output: [ 1, 2, 2, 4, 3, 6 ]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, A2, E2, R2>(
@@ -3009,7 +2917,7 @@ export const flatMap: {
    * // Output: [ 1, 2, 2, 4, 3, 6 ]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, E, R, A2, E2, R2>(
@@ -3055,7 +2963,7 @@ export const flatMap: {
  * })
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 4.0.0
  */
 export const switchMap: {
@@ -3080,7 +2988,7 @@ export const switchMap: {
    * })
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 4.0.0
    */
   <A, A2, E2, R2>(
@@ -3111,7 +3019,7 @@ export const switchMap: {
    * })
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 4.0.0
    */
   <A, E, R, A2, E2, R2>(
@@ -3164,7 +3072,7 @@ export const switchMap: {
  * // Output: [ 1, 2, 3, 4, 5, 6 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const flatten: <
@@ -3196,12 +3104,6 @@ export const flatten: <
 /**
  * Flattens a stream of non-empty arrays into a stream of elements.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.flattenChunks`
- *
  * **Example** (Flattening a stream of non-empty arrays into a stream of elements)
  *
  * ```ts
@@ -3218,7 +3120,7 @@ export const flatten: <
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 4.0.0
  */
 export const flattenArray = <A, E, R>(self: Stream<Arr.NonEmptyReadonlyArray<A>, E, R>): Stream<A, E, R> =>
@@ -3241,7 +3143,7 @@ export const flattenArray = <A, E, R>(self: Stream<Arr.NonEmptyReadonlyArray<A>,
  * // Output: []
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const drain = <A, E, R>(self: Stream<A, E, R>): Stream<never, E, R> => fromChannel(Channel.drain(self.channel))
@@ -3271,7 +3173,7 @@ export const drain = <A, E, R>(self: Stream<A, E, R>): Stream<never, E, R> => fr
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const drainFork: {
@@ -3300,7 +3202,7 @@ export const drainFork: {
    * // Output: [ 1, 2 ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A2, E2, R2>(that: Stream<A2, E2, R2>): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E2 | E, R2 | R>
@@ -3329,7 +3231,7 @@ export const drainFork: {
    * // Output: [ 1, 2 ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, A2, E2, R2>(self: Stream<A, E, R>, that: Stream<A2, E2, R2>): Stream<A, E | E2, R | R2>
@@ -3360,7 +3262,7 @@ export const drainFork: {
  * // Output: [ 1, 1, 1, 1, 1 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const repeat: {
@@ -3385,7 +3287,7 @@ export const repeat: {
    * // Output: [ 1, 1, 1, 1, 1 ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <B, E2, R2>(
@@ -3416,7 +3318,7 @@ export const repeat: {
    * // Output: [ 1, 1, 1, 1, 1 ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, B, E2, R2>(
@@ -3615,7 +3517,7 @@ export const timeout: {
  * unchanged.
  *
  * @category Rate Limiting
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const timeoutOrElse: {
   /**
@@ -3627,7 +3529,7 @@ export const timeoutOrElse: {
    * unchanged.
    *
    * @category Rate Limiting
-   * @since 2.0.0
+   * @since 4.0.0
    */
   <B, E2, R2>(
     options: {
@@ -3644,7 +3546,7 @@ export const timeoutOrElse: {
    * unchanged.
    *
    * @category Rate Limiting
-   * @since 2.0.0
+   * @since 4.0.0
    */
   <A, E, R, B, E2, R2>(
     self: Stream<A, E, R>,
@@ -3714,8 +3616,6 @@ export const timeoutOrElse: {
  * Repeats each element of the stream according to the provided schedule,
  * including the original emission.
  *
- * @category Sequencing
- * @since 2.0.0
  * **Example** (Repeating stream elements)
  *
  * ```ts
@@ -3732,14 +3632,15 @@ export const timeoutOrElse: {
  * Effect.runPromise(program)
  * // Output: [ "A", "A", "B", "B", "C", "C" ]
  * ```
+ *
+ * @category sequencing
+ * @since 2.0.0
  */
 export const repeatElements: {
   /**
    * Repeats each element of the stream according to the provided schedule,
    * including the original emission.
    *
-   * @category Sequencing
-   * @since 2.0.0
    * **Example** (Repeating stream elements)
    *
    * ```ts
@@ -3756,14 +3657,15 @@ export const repeatElements: {
    * Effect.runPromise(program)
    * // Output: [ "A", "A", "B", "B", "C", "C" ]
    * ```
+   *
+   * @category sequencing
+   * @since 2.0.0
    */
   <B, E2, R2>(schedule: Schedule.Schedule<B, unknown, E2, R2>): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E | E2, R2 | R>
   /**
    * Repeats each element of the stream according to the provided schedule,
    * including the original emission.
    *
-   * @category Sequencing
-   * @since 2.0.0
    * **Example** (Repeating stream elements)
    *
    * ```ts
@@ -3780,6 +3682,9 @@ export const repeatElements: {
    * Effect.runPromise(program)
    * // Output: [ "A", "A", "B", "B", "C", "C" ]
    * ```
+   *
+   * @category sequencing
+   * @since 2.0.0
    */
   <A, E, R, B, E2, R2>(self: Stream<A, E, R>, schedule: Schedule.Schedule<B, unknown, E2, R2>): Stream<A, E | E2, R | R2>
 } = dual(
@@ -3841,7 +3746,7 @@ export const repeatElements: {
  * // Output: [ "A", "B", "A", "B", "A" ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const forever = <A, E, R>(self: Stream<A, E, R>): Stream<A, E, R> => fromChannel(Channel.forever(self.channel))
@@ -3849,12 +3754,6 @@ export const forever = <A, E, R>(self: Stream<A, E, R>): Stream<A, E, R> => from
 /**
  * Submerges the iterables emitted by this stream into the stream's structure.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.flattenIterables`
- *
  * **Example** (Flattening iterable values)
  *
  * ```ts
@@ -3870,7 +3769,7 @@ export const forever = <A, E, R>(self: Stream<A, E, R>): Stream<A, E, R> => from
  * // Output: [ 1, 2, 3, 4 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 4.0.0
  */
 export const flattenIterable = <A, E, R>(self: Stream<Iterable<A>, E, R>): Stream<A, E, R> =>
@@ -3900,8 +3799,8 @@ export const flattenIterable = <A, E, R>(self: Stream<Iterable<A>, E, R>): Strea
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Sequencing
- * @since 4.0.0
+ * @category sequencing
+ * @since 2.0.0
  */
 export const flattenTake = <A, E, E2, R>(self: Stream<Take.Take<A, E>, E2, R>): Stream<A, E | E2, R> =>
   self.channel.pipe(
@@ -3928,7 +3827,7 @@ export const flattenTake = <A, E, E2, R>(self: Stream<Take.Take<A, E>, E2, R>):
  * // Output: [ 1, 2, 3, 4, 5, 6 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const concat: {
@@ -3950,7 +3849,7 @@ export const concat: {
    * // Output: [ 1, 2, 3, 4, 5, 6 ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A2, E2, R2>(that: Stream<A2, E2, R2>): <A, E, R>(self: Stream<A, E, R>) => Stream<A | A2, E | E2, R | R2>
@@ -3972,7 +3871,7 @@ export const concat: {
    * // Output: [ 1, 2, 3, 4, 5, 6 ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, A2, E2, R2>(self: Stream<A, E, R>, that: Stream<A2, E2, R2>): Stream<A | A2, E | E2, R | R2>
@@ -3997,7 +3896,7 @@ export const concat: {
      * // Output: [ 1, 2, 3, 4, 5, 6 ]
      * ```
      *
-     * @category Sequencing
+     * @category sequencing
      * @since 2.0.0
      */
     Stream<A | A2, E | E2, R | R2>>([self, that]))
@@ -4024,7 +3923,7 @@ export const concat: {
  * Effect.runPromise(program)
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const prepend: {
@@ -4049,7 +3948,7 @@ export const prepend: {
    * Effect.runPromise(program)
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <B>(values: Iterable<B>): <A, E, R>(self: Stream<A, E, R>) => Stream<B | A, E, R>
@@ -4074,7 +3973,7 @@ export const prepend: {
    * Effect.runPromise(program)
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, B>(self: Stream<A, E, R>, values: Iterable<B>): Stream<A | B, E, R>
@@ -4192,8 +4091,6 @@ export const merge: {
  * The effect runs concurrently, fails the stream if it fails, and is interrupted
  * when the stream completes.
  *
- * @category Merging
- * @since 4.0.0
  * **Example** (Merging with a background effect)
  *
  * ```ts
@@ -4212,6 +4109,9 @@ export const merge: {
  * // Output: side task
  * // Output: [ 1, 2, 3 ]
  * ```
+ *
+ * @category Merging
+ * @since 4.0.0
  */
 export const mergeEffect: {
   /**
@@ -4220,8 +4120,6 @@ export const mergeEffect: {
    * The effect runs concurrently, fails the stream if it fails, and is interrupted
    * when the stream completes.
    *
-   * @category Merging
-   * @since 4.0.0
    * **Example** (Merging with a background effect)
    *
    * ```ts
@@ -4240,6 +4138,9 @@ export const mergeEffect: {
    * // Output: side task
    * // Output: [ 1, 2, 3 ]
    * ```
+   *
+   * @category Merging
+   * @since 4.0.0
    */
   <A2, E2, R2>(effect: Effect.Effect<A2, E2, R2>): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E2 | E, R2 | R>
   /**
@@ -4248,8 +4149,6 @@ export const mergeEffect: {
    * The effect runs concurrently, fails the stream if it fails, and is interrupted
    * when the stream completes.
    *
-   * @category Merging
-   * @since 4.0.0
    * **Example** (Merging with a background effect)
    *
    * ```ts
@@ -4268,6 +4167,9 @@ export const mergeEffect: {
    * // Output: side task
    * // Output: [ 1, 2, 3 ]
    * ```
+   *
+   * @category Merging
+   * @since 4.0.0
    */
   <A, E, R, A2, E2, R2>(self: Stream<A, E, R>, effect: Effect.Effect<A2, E2, R2>): Stream<A, E | E2, R | R2>
 } = dual(
@@ -4283,12 +4185,6 @@ export const mergeEffect: {
  * Merges this stream and the specified stream together, tagging values from the
  * left stream as `Result.succeed` and values from the right stream as `Result.fail`.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.mergeEither`
- *
  * **Example** (Merging streams into results)
  *
  * ```ts
@@ -4317,19 +4213,13 @@ export const mergeEffect: {
  * ```
  *
  * @category Merging
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const mergeResult: {
   /**
    * Merges this stream and the specified stream together, tagging values from the
    * left stream as `Result.succeed` and values from the right stream as `Result.fail`.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.mergeEither`
-   *
    * **Example** (Merging streams into results)
    *
    * ```ts
@@ -4358,19 +4248,13 @@ export const mergeResult: {
    * ```
    *
    * @category Merging
-   * @since 2.0.0
+   * @since 4.0.0
    */
   <A2, E2, R2>(that: Stream<A2, E2, R2>): <A, E, R>(self: Stream<A, E, R>) => Stream<Result.Result<A, A2>, E2 | E, R2 | R>
   /**
    * Merges this stream and the specified stream together, tagging values from the
    * left stream as `Result.succeed` and values from the right stream as `Result.fail`.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.mergeEither`
-   *
    * **Example** (Merging streams into results)
    *
    * ```ts
@@ -4399,7 +4283,7 @@ export const mergeResult: {
    * ```
    *
    * @category Merging
-   * @since 2.0.0
+   * @since 4.0.0
    */
   <A, E, R, A2, E2, R2>(self: Stream<A, E, R>, that: Stream<A2, E2, R2>): Stream<Result.Result<A, A2>, E | E2, R | R2>
 } = dual(
@@ -4728,7 +4612,7 @@ export const mergeAll: {
  * // Output: [ [ 1, "a" ], [ 1, "b" ], [ 2, "a" ], [ 2, "b" ] ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const cross: {
@@ -4754,7 +4638,7 @@ export const cross: {
    * // Output: [ [ 1, "a" ], [ 1, "b" ], [ 2, "a" ], [ 2, "b" ] ]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AR, ER, RR>(right: Stream<AR, ER, RR>): <AL, EL, RL>(left: Stream<AL, EL, RL>) => Stream<[AL, AR], EL | ER, RL | RR>
@@ -4780,7 +4664,7 @@ export const cross: {
    * // Output: [ [ 1, "a" ], [ 1, "b" ], [ 2, "a" ], [ 2, "b" ] ]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AL, ER, RR, AR, EL, RL>(left: Stream<AL, ER, RR>, right: Stream<AR, EL, RL>): Stream<[AL, AR], EL | ER, RL | RR>
@@ -4813,7 +4697,7 @@ export const cross: {
  * // Output: [ "1-a", "1-b", "2-a", "2-b" ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const crossWith: {
@@ -4841,7 +4725,7 @@ export const crossWith: {
    * // Output: [ "1-a", "1-b", "2-a", "2-b" ]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AR, ER, RR, AL, A>(right: Stream<AR, ER, RR>, f: (left: AL, right: AR) => A): <EL, RL>(left: Stream<AL, EL, RL>) => Stream<A, EL | ER, RL | RR>
@@ -4869,7 +4753,7 @@ export const crossWith: {
    * // Output: [ "1-a", "1-b", "2-a", "2-b" ]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AL, EL, RL, AR, ER, RR, A>(
@@ -4905,7 +4789,7 @@ export const crossWith: {
  * // Output: [ "1-a", "2-b", "3-c" ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipWith: {
@@ -4931,7 +4815,7 @@ export const zipWith: {
    * // Output: [ "1-a", "2-b", "3-c" ]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AR, ER, RR, AL, A>(right: Stream<AR, ER, RR>, f: (left: AL, right: AR) => A): <EL, RL>(left: Stream<AL, EL, RL>) => Stream<A, EL | ER, RL | RR>
@@ -4957,7 +4841,7 @@ export const zipWith: {
    * // Output: [ "1-a", "2-b", "3-c" ]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AL, EL, RL, AR, ER, RR, A>(
@@ -4993,12 +4877,6 @@ const zipArrays = <AL, AR, A>(
  *
  * The function returns output plus leftover arrays that carry into the next pull.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.zipWithChunks`
- *
  * **Example** (Zipping stream chunks)
  *
  * ```ts
@@ -5023,8 +4901,8 @@ const zipArrays = <AL, AR, A>(
  * // Output: [[1, "a"], [2, "b"], [3, "c"], [4, "d"], [5, "e"]]
  * ```
  *
- * @category Zipping
- * @since 2.0.0
+ * @category zipping
+ * @since 4.0.0
  */
 export const zipWithArray: {
   /**
@@ -5032,12 +4910,6 @@ export const zipWithArray: {
    *
    * The function returns output plus leftover arrays that carry into the next pull.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.zipWithChunks`
-   *
    * **Example** (Zipping stream chunks)
    *
    * ```ts
@@ -5062,8 +4934,8 @@ export const zipWithArray: {
    * // Output: [[1, "a"], [2, "b"], [3, "c"], [4, "d"], [5, "e"]]
    * ```
    *
-   * @category Zipping
-   * @since 2.0.0
+   * @category zipping
+   * @since 4.0.0
    */
   <AR, ER, RR, AL, A>(
     right: Stream<AR, ER, RR>,
@@ -5081,12 +4953,6 @@ export const zipWithArray: {
    *
    * The function returns output plus leftover arrays that carry into the next pull.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.zipWithChunks`
-   *
    * **Example** (Zipping stream chunks)
    *
    * ```ts
@@ -5111,8 +4977,8 @@ export const zipWithArray: {
    * // Output: [[1, "a"], [2, "b"], [3, "c"], [4, "d"], [5, "e"]]
    * ```
    *
-   * @category Zipping
-   * @since 2.0.0
+   * @category zipping
+   * @since 4.0.0
    */
   <AL, EL, RL, AR, ER, RR, A>(
     left: Stream<AL, EL, RL>,
@@ -5203,7 +5069,7 @@ export const zipWithArray: {
  * // Output: [[1, "a"], [2, "b"], [3, "c"]]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zip: {
@@ -5230,7 +5096,7 @@ export const zip: {
    * // Output: [[1, "a"], [2, "b"], [3, "c"]]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <A2, E2, R2>(that: Stream<A2, E2, R2>): <A, E, R>(self: Stream<A, E, R>) => Stream<[A, A2], E2 | E, R2 | R>
@@ -5257,7 +5123,7 @@ export const zip: {
    * // Output: [[1, "a"], [2, "b"], [3, "c"]]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <A, E, R, A2, E2, R2>(self: Stream<A, E, R>, that: Stream<A2, E2, R2>): Stream<[A, A2], E | E2, R | R2>
@@ -5292,7 +5158,7 @@ export const zip: {
  * // Output: [1, 2]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipLeft: {
@@ -5319,7 +5185,7 @@ export const zipLeft: {
    * // Output: [1, 2]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AR, ER, RR>(right: Stream<AR, ER, RR>): <AL, EL, RL>(left: Stream<AL, EL, RL>) => Stream<AL, ER | EL, RR | RL>
@@ -5346,7 +5212,7 @@ export const zipLeft: {
    * // Output: [1, 2]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AL, EL, RL, AR, ER, RR>(left: Stream<AL, EL, RL>, right: Stream<AR, ER, RR>): Stream<AL, EL | ER, RL | RR>
@@ -5386,7 +5252,7 @@ export const zipLeft: {
  * // Output: ["a", "b"]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipRight: {
@@ -5410,7 +5276,7 @@ export const zipRight: {
    * // Output: ["a", "b"]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AR, ER, RR>(right: Stream<AR, ER, RR>): <AL, EL, RL>(left: Stream<AL, EL, RL>) => Stream<AR, ER | EL, RR | RL>
@@ -5434,7 +5300,7 @@ export const zipRight: {
    * // Output: ["a", "b"]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AL, EL, RL, AR, ER, RR>(left: Stream<AL, EL, RL>, right: Stream<AR, ER, RR>): Stream<AR, EL | ER, RL | RR>
@@ -5481,7 +5347,7 @@ export const zipRight: {
  * // Output: [[1, "a", "x"], [2, "b", "y"], [3, "c", "z"]]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipFlatten: {
@@ -5512,7 +5378,7 @@ export const zipFlatten: {
    * // Output: [[1, "a", "x"], [2, "b", "y"], [3, "c", "z"]]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <A2, E2, R2>(that: Stream<A2, E2, R2>): <A extends ReadonlyArray<any>, E, R>(self: Stream<A, E, R>) => Stream<[...A, A2], E2 | E, R2 | R>
@@ -5543,7 +5409,7 @@ export const zipFlatten: {
    * // Output: [[1, "a", "x"], [2, "b", "y"], [3, "c", "z"]]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <A extends ReadonlyArray<any>, E, R, A2, E2, R2>(self: Stream<A, E, R>, that: Stream<A2, E2, R2>): Stream<[...A, A2], E | E2, R | R2>
@@ -5575,7 +5441,7 @@ export const zipFlatten: {
  * // Output: [["a", 0], ["b", 1], ["c", 2], ["d", 3]]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipWithIndex = <A, E, R>(self: Stream<A, E, R>): Stream<[A, number], E, R> => map(self, (a, i) => [a, i])
@@ -5603,7 +5469,7 @@ export const zipWithIndex = <A, E, R>(self: Stream<A, E, R>): Stream<[A, number]
  * // ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipWithNext = <A, E, R>(self: Stream<A, E, R>): Stream<[A, Option.Option<A>], E, R> =>
@@ -5650,7 +5516,7 @@ export const zipWithNext = <A, E, R>(self: Stream<A, E, R>): Stream<[A, Option.O
  * // ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipWithPrevious = <A, E, R>(self: Stream<A, E, R>): Stream<[Option.Option<A>, A], E, R> =>
@@ -5684,7 +5550,7 @@ export const zipWithPrevious = <A, E, R>(self: Stream<A, E, R>): Stream<[Option.
  * // Output: [ [Option.none(), 1, Option.some(2)], [Option.some(1), 2, Option.some(3)], [Option.some(2), 3, Option.none()] ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipWithPreviousAndNext = <A, E, R>(
@@ -5746,8 +5612,8 @@ export const zipWithPreviousAndNext = <A, E, R>(
  * // Output: [ [ 1, "a", true ], [ 2, "a", true ], [ 3, "a", true ], [ 3, "b", true ], [ 3, "c", true ], [ 3, "c", false ], [ 3, "c", true ] ]
  * ```
  *
- * @category Zipping
- * @since 2.0.0
+ * @category zipping
+ * @since 3.3.0
  */
 export const zipLatestAll = <T extends ReadonlyArray<Stream<any, any, any>>>(
   ...streams: T
@@ -5811,7 +5677,7 @@ export const zipLatestAll = <T extends ReadonlyArray<Stream<any, any, any>>>(
  * // Output: [ [1, "a"] ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipLatest: {
@@ -5838,7 +5704,7 @@ export const zipLatest: {
    * // Output: [ [1, "a"] ]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AR, ER, RR>(right: Stream<AR, ER, RR>): <AL, EL, RL>(left: Stream<AL, EL, RL>) => Stream<[AL, AR], EL | ER, RL | RR>
@@ -5865,7 +5731,7 @@ export const zipLatest: {
    * // Output: [ [1, "a"] ]
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AL, EL, RL, AR, ER, RR>(left: Stream<AL, EL, RL>, right: Stream<AR, ER, RR>): Stream<[AL, AR], EL | ER, RL | RR>
@@ -5905,7 +5771,7 @@ export const zipLatest: {
  * })
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipLatestWith: {
@@ -5937,7 +5803,7 @@ export const zipLatestWith: {
    * })
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AR, ER, RR, AL, A>(right: Stream<AR, ER, RR>, f: (left: AL, right: AR) => A): <EL, RL>(left: Stream<AL, EL, RL>) => Stream<A, EL | ER, RL | RR>
@@ -5969,7 +5835,7 @@ export const zipLatestWith: {
    * })
    * ```
    *
-   * @category Zipping
+   * @category zipping
    * @since 2.0.0
    */
   <AL, EL, RL, AR, ER, RR, A>(
@@ -5995,7 +5861,7 @@ export const zipLatestWith: {
  * winner is chosen, that stream's later failures are propagated.
  *
  * @category Racing
- * @since 3.7.0
+ * @since 3.5.0
  *
  * **Example** (Racing multiple streams)
  *
@@ -6161,7 +6027,7 @@ export const race: {
  * // Output: [ 2, 4 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const filter: {
@@ -6185,7 +6051,7 @@ export const filter: {
    * // Output: [ 2, 4 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, B extends A>(refinement: Refinement<NoInfer<A>, B>): <E, R>(self: Stream<A, E, R>) => Stream<B, E, R>
@@ -6209,7 +6075,7 @@ export const filter: {
    * // Output: [ 2, 4 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A>(predicate: Predicate<NoInfer<A>>): <E, R>(self: Stream<A, E, R>) => Stream<A, E, R>
@@ -6233,7 +6099,7 @@ export const filter: {
    * // Output: [ 2, 4 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, B extends A>(self: Stream<A, E, R>, refinement: Refinement<A, B>): Stream<B, E, R>
@@ -6257,7 +6123,7 @@ export const filter: {
    * // Output: [ 2, 4 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(self: Stream<A, E, R>, predicate: Predicate<A>): Stream<A, E, R>
@@ -6272,22 +6138,22 @@ export const filter: {
 /**
  * Filters and maps stream elements in one pass using a `Filter`.
  *
- * @category Filtering
- * @since 4.0.0
+ * @category filtering
+ * @since 2.0.0
  */
 export const filterMap: {
   /**
    * Filters and maps stream elements in one pass using a `Filter`.
    *
-   * @category Filtering
-   * @since 4.0.0
+   * @category filtering
+   * @since 2.0.0
    */
   <A, B, X>(filter: Filter.Filter<NoInfer<A>, B, X>): <E, R>(self: Stream<A, E, R>) => Stream<B, E, R>
   /**
    * Filters and maps stream elements in one pass using a `Filter`.
    *
-   * @category Filtering
-   * @since 4.0.0
+   * @category filtering
+   * @since 2.0.0
    */
   <A, E, R, B, X>(self: Stream<A, E, R>, filter: Filter.Filter<A, B, X>): Stream<B, E, R>
 } = dual(
@@ -6317,7 +6183,7 @@ export const filterMap: {
  * // Output: [ 3, 4 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const filterEffect: {
@@ -6340,7 +6206,7 @@ export const filterEffect: {
    * // Output: [ 3, 4 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, EX, RX>(predicate: (a: NoInfer<A>, i: number) => Effect.Effect<boolean, EX, RX>): <E, R>(self: Stream<A, E, R>) => Stream<A, E | EX, R | RX>
@@ -6363,7 +6229,7 @@ export const filterEffect: {
    * // Output: [ 3, 4 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, EX, RX>(
@@ -6381,22 +6247,22 @@ export const filterEffect: {
 /**
  * Effectfully filters and maps elements in a single pass.
  *
- * @category Filtering
- * @since 4.0.0
+ * @category filtering
+ * @since 2.0.0
  */
 export const filterMapEffect: {
   /**
    * Effectfully filters and maps elements in a single pass.
    *
-   * @category Filtering
-   * @since 4.0.0
+   * @category filtering
+   * @since 2.0.0
    */
   <A, B, X, EX, RX>(filter: Filter.FilterEffect<NoInfer<A>, B, X, EX, RX>): <E, R>(self: Stream<A, E, R>) => Stream<B, E | EX, R | RX>
   /**
    * Effectfully filters and maps elements in a single pass.
    *
-   * @category Filtering
-   * @since 4.0.0
+   * @category filtering
+   * @since 2.0.0
    */
   <A, E, R, B, X, EX, RX>(self: Stream<A, E, R>, filter: Filter.FilterEffect<A, B, X, EX, RX>): Stream<B, E | EX, R | RX>
 } = dual(
@@ -6437,7 +6303,7 @@ export const filterMapEffect: {
  * Effect.runPromise(Effect.scoped(program))
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 4.0.0
  */
 export const partitionQueue: {
@@ -6471,7 +6337,7 @@ export const partitionQueue: {
    * Effect.runPromise(Effect.scoped(program))
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, Pass, Fail>(
@@ -6517,7 +6383,7 @@ export const partitionQueue: {
    * Effect.runPromise(Effect.scoped(program))
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, E, R, Pass, Fail>(
@@ -6584,7 +6450,7 @@ export const partitionQueue: {
        * Effect.runPromise(Effect.scoped(program))
        * ```
        *
-       * @category Filtering
+       * @category filtering
        * @since 4.0.0
        */
       Pass, /**
@@ -6617,7 +6483,7 @@ export const partitionQueue: {
        * Effect.runPromise(Effect.scoped(program))
        * ```
        *
-       * @category Filtering
+       * @category filtering
        * @since 4.0.0
        */
       E | Cause.Done>({ capacity })
@@ -6651,7 +6517,7 @@ export const partitionQueue: {
        * Effect.runPromise(Effect.scoped(program))
        * ```
        *
-       * @category Filtering
+       * @category filtering
        * @since 4.0.0
        */
       Fail, /**
@@ -6684,7 +6550,7 @@ export const partitionQueue: {
        * Effect.runPromise(Effect.scoped(program))
        * ```
        *
-       * @category Filtering
+       * @category filtering
        * @since 4.0.0
        */
       E | Cause.Done>({ capacity })
@@ -6739,7 +6605,7 @@ export const partitionQueue: {
  * consumed while that scope remains open. The first stream emits success values
  * from the filter, and the second emits failure values.
  *
- * @category Filtering
+ * @category filtering
  * @since 4.0.0
  */
 export const partitionEffect: {
@@ -6751,7 +6617,7 @@ export const partitionEffect: {
    * consumed while that scope remains open. The first stream emits success values
    * from the filter, and the second emits failure values.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, Pass, Fail, EX, RX>(
@@ -6776,7 +6642,7 @@ export const partitionEffect: {
    * consumed while that scope remains open. The first stream emits success values
    * from the filter, and the second emits failure values.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, E, R, Pass, Fail, EX, RX>(
@@ -6820,7 +6686,7 @@ export const partitionEffect: {
        * consumed while that scope remains open. The first stream emits success values
        * from the filter, and the second emits failure values.
        *
-       * @category Filtering
+       * @category filtering
        * @since 4.0.0
        */
       Result.Result<Pass, Fail>, /**
@@ -6831,7 +6697,7 @@ export const partitionEffect: {
        * consumed while that scope remains open. The first stream emits success values
        * from the filter, and the second emits failure values.
        *
-       * @category Filtering
+       * @category filtering
        * @since 4.0.0
        */
       E | EX, /**
@@ -6842,7 +6708,7 @@ export const partitionEffect: {
        * consumed while that scope remains open. The first stream emits success values
        * from the filter, and the second emits failure values.
        *
-       * @category Filtering
+       * @category filtering
        * @since 4.0.0
        */
       R | RX, /**
@@ -6853,7 +6719,7 @@ export const partitionEffect: {
        * consumed while that scope remains open. The first stream emits success values
        * from the filter, and the second emits failure values.
        *
-       * @category Filtering
+       * @category filtering
        * @since 4.0.0
        */
       Pass, /**
@@ -6864,7 +6730,7 @@ export const partitionEffect: {
        * consumed while that scope remains open. The first stream emits success values
        * from the filter, and the second emits failure values.
        *
-       * @category Filtering
+       * @category filtering
        * @since 4.0.0
        */
       Fail>(
@@ -6884,8 +6750,8 @@ export const partitionEffect: {
  * consumed while that scope remains open. The faster stream may advance up to
  * `bufferSize` elements ahead of the slower one.
  *
- * @category Filtering
- * @since 4.0.0
+ * @category filtering
+ * @since 2.0.0
  *
  * **Example** (Partitioning a stream)
  *
@@ -6915,8 +6781,8 @@ export const partition: {
    * consumed while that scope remains open. The faster stream may advance up to
    * `bufferSize` elements ahead of the slower one.
    *
-   * @category Filtering
-   * @since 4.0.0
+   * @category filtering
+   * @since 2.0.0
    *
    * **Example** (Partitioning a stream)
    *
@@ -6955,8 +6821,8 @@ export const partition: {
    * consumed while that scope remains open. The faster stream may advance up to
    * `bufferSize` elements ahead of the slower one.
    *
-   * @category Filtering
-   * @since 4.0.0
+   * @category filtering
+   * @since 2.0.0
    *
    * **Example** (Partitioning a stream)
    *
@@ -7023,7 +6889,7 @@ export const partition: {
  * // Output: []
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const when: {
@@ -7047,7 +6913,7 @@ export const when: {
    * // Output: []
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <EX = never, RX = never>(test: Effect.Effect<boolean, EX, RX>): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E | EX, R | RX>
@@ -7071,7 +6937,7 @@ export const when: {
    * // Output: []
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, EX = never, RX = never>(self: Stream<A, E, R>, test: Effect.Effect<boolean, EX, RX>): Stream<A, E | EX, R | RX>
@@ -7110,7 +6976,7 @@ export const when: {
  * // Output: [ [1, 2, 3], [4, 5, 6] ]
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const peel: {
@@ -7140,7 +7006,7 @@ export const peel: {
    * // Output: [ [1, 2, 3], [4, 5, 6] ]
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A2, A, E2, R2>(sink: Sink.Sink<A2, A, A, E2, R2>): <E, R>(self: Stream<A, E, R>) => Effect.Effect<[A2, Stream<A, E, never>], E2 | E, Scope.Scope | R2 | R>
@@ -7170,7 +7036,7 @@ export const peel: {
    * // Output: [ [1, 2, 3], [4, 5, 6] ]
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E, R, A2, E2, R2>(self: Stream<A, E, R>, sink: Sink.Sink<A2, A, A, E2, R2>): Effect.Effect<[A2, Stream<A, E, never>], E | E2, Scope.Scope | R | R2>
@@ -7317,12 +7183,6 @@ export const buffer: {
  * buffer is full. This combinator preserves chunking and is best with
  * power-of-2 capacities.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.bufferChunks`
- *
  * **Example** (Buffering stream chunks)
  *
  * ```ts
@@ -7340,7 +7200,7 @@ export const buffer: {
  * ```
  *
  * @category Rate Limiting
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const bufferArray: {
   /**
@@ -7352,12 +7212,6 @@ export const bufferArray: {
    * buffer is full. This combinator preserves chunking and is best with
    * power-of-2 capacities.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.bufferChunks`
-   *
    * **Example** (Buffering stream chunks)
    *
    * ```ts
@@ -7375,7 +7229,7 @@ export const bufferArray: {
    * ```
    *
    * @category Rate Limiting
-   * @since 2.0.0
+   * @since 4.0.0
    */
   (
     options: { readonly capacity: "unbounded" } | {
@@ -7392,12 +7246,6 @@ export const bufferArray: {
    * buffer is full. This combinator preserves chunking and is best with
    * power-of-2 capacities.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.bufferChunks`
-   *
    * **Example** (Buffering stream chunks)
    *
    * ```ts
@@ -7415,7 +7263,7 @@ export const bufferArray: {
    * ```
    *
    * @category Rate Limiting
-   * @since 2.0.0
+   * @since 4.0.0
    */
   <A, E, R>(
     self: Stream<A, E, R>,
@@ -7437,12 +7285,6 @@ export const bufferArray: {
  * one fails. Allows recovery from all causes of failure, including
  * interruption if the stream is uninterruptible.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.catchAllCause`
- *
  * **Example** (Catching stream causes)
  *
  * ```ts
@@ -7466,8 +7308,8 @@ export const bufferArray: {
  * // Output: [ 1, 2, 999 ]
  * ```
  *
- * @category Error Handling
- * @since 4.0.0
+ * @category error handling
+ * @since 2.0.0
  */
 export const catchCause: {
   /**
@@ -7475,12 +7317,6 @@ export const catchCause: {
    * one fails. Allows recovery from all causes of failure, including
    * interruption if the stream is uninterruptible.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.catchAllCause`
-   *
    * **Example** (Catching stream causes)
    *
    * ```ts
@@ -7504,8 +7340,8 @@ export const catchCause: {
    * // Output: [ 1, 2, 999 ]
    * ```
    *
-   * @category Error Handling
-   * @since 4.0.0
+   * @category error handling
+   * @since 2.0.0
    */
   <E, A2, E2, R2>(f: (cause: Cause.Cause<E>) => Stream<A2, E2, R2>): <A, R>(self: Stream<A, E, R>) => Stream<A | A2, E2, R2 | R>
   /**
@@ -7513,12 +7349,6 @@ export const catchCause: {
    * one fails. Allows recovery from all causes of failure, including
    * interruption if the stream is uninterruptible.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.catchAllCause`
-   *
    * **Example** (Catching stream causes)
    *
    * ```ts
@@ -7542,8 +7372,8 @@ export const catchCause: {
    * // Output: [ 1, 2, 999 ]
    * ```
    *
-   * @category Error Handling
-   * @since 4.0.0
+   * @category error handling
+   * @since 2.0.0
    */
   <A, E, R, A2, E2, R2>(self: Stream<A, E, R>, f: (cause: Cause.Cause<E>) => Stream<A2, E2, R2>): Stream<A | A2, E2, R | R2>
 } = dual(2, <A, E, R, A2, E2, R2>(
@@ -7559,12 +7389,6 @@ export const catchCause: {
  * Runs an effect when the stream fails without changing its values or error,
  * unless the tap effect itself fails.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.tapErrorCause`
- *
  * **Example** (Tapping stream causes)
  *
  * ```ts
@@ -7586,20 +7410,14 @@ export const catchCause: {
  * // Output: [ 1, 2, 0 ]
  * ```
  *
- * @category Error Handling
- * @since 4.0.0
+ * @category error handling
+ * @since 2.0.0
  */
 export const tapCause: {
   /**
    * Runs an effect when the stream fails without changing its values or error,
    * unless the tap effect itself fails.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.tapErrorCause`
-   *
    * **Example** (Tapping stream causes)
    *
    * ```ts
@@ -7621,20 +7439,14 @@ export const tapCause: {
    * // Output: [ 1, 2, 0 ]
    * ```
    *
-   * @category Error Handling
-   * @since 4.0.0
+   * @category error handling
+   * @since 2.0.0
    */
   <E, A2, E2, R2>(f: (cause: Cause.Cause<E>) => Effect.Effect<A2, E2, R2>): <A, R>(self: Stream<A, E, R>) => Stream<A, E | E2, R2 | R>
   /**
    * Runs an effect when the stream fails without changing its values or error,
    * unless the tap effect itself fails.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.tapErrorCause`
-   *
    * **Example** (Tapping stream causes)
    *
    * ```ts
@@ -7656,8 +7468,8 @@ export const tapCause: {
    * // Output: [ 1, 2, 0 ]
    * ```
    *
-   * @category Error Handling
-   * @since 4.0.0
+   * @category error handling
+   * @since 2.0.0
    */
   <A, E, R, A2, E2, R2>(
     self: Stream<A, E, R>,
@@ -7689,12 +7501,6 @@ export {
   /**
    * Switches over to the stream produced by the provided function if this one fails.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.catchAll`
-   *
    * **Example** (Catching stream failures)
    *
    * ```ts
@@ -7714,7 +7520,7 @@ export {
    * // Output: [ 1, 2, 999 ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   catch_ as catch
@@ -7745,8 +7551,8 @@ export {
  * // [ 1, 2, 999 ]
  * ```
  *
- * @category Error Handling
- * @since 4.0.0
+ * @category error handling
+ * @since 2.0.0
  */
 export const tapError: {
   /**
@@ -7774,8 +7580,8 @@ export const tapError: {
    * // [ 1, 2, 999 ]
    * ```
    *
-   * @category Error Handling
-   * @since 4.0.0
+   * @category error handling
+   * @since 2.0.0
    */
   <E, A2, E2, R2>(f: (error: E) => Effect.Effect<A2, E2, R2>): <A, R>(self: Stream<A, E, R>) => Stream<A, E | E2, R2 | R>
   /**
@@ -7803,8 +7609,8 @@ export const tapError: {
    * // [ 1, 2, 999 ]
    * ```
    *
-   * @category Error Handling
-   * @since 4.0.0
+   * @category error handling
+   * @since 2.0.0
    */
   <A, E, R, A2, E2, R2>(self: Stream<A, E, R>, f: (error: E) => Effect.Effect<A2, E2, R2>): Stream<A, E | E2, R | R2>
 } = dual(2, <A, E, R, A2, E2, R2>(
@@ -7823,12 +7629,6 @@ export const tapError: {
  * stream. Non-matching failures propagate downstream, so the error type is
  * preserved unless the filter narrows it.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.catchSome`
- *
  * **Example** (Catching matching failures)
  *
  * ```ts
@@ -7851,7 +7651,7 @@ export const tapError: {
  * Effect.runPromise(program)
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchIf: {
@@ -7862,12 +7662,6 @@ export const catchIf: {
    * stream. Non-matching failures propagate downstream, so the error type is
    * preserved unless the filter narrows it.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.catchSome`
-   *
    * **Example** (Catching matching failures)
    *
    * ```ts
@@ -7890,7 +7684,7 @@ export const catchIf: {
    * Effect.runPromise(program)
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <E, EB extends E, A2, E2, R2, A3 = never, E3 = Exclude<E, EB>, R3 = never>(
@@ -7905,12 +7699,6 @@ export const catchIf: {
    * stream. Non-matching failures propagate downstream, so the error type is
    * preserved unless the filter narrows it.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.catchSome`
-   *
    * **Example** (Catching matching failures)
    *
    * ```ts
@@ -7933,7 +7721,7 @@ export const catchIf: {
    * Effect.runPromise(program)
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <E, A2, E2, R2, A3 = never, E3 = E, R3 = never>(
@@ -7948,12 +7736,6 @@ export const catchIf: {
    * stream. Non-matching failures propagate downstream, so the error type is
    * preserved unless the filter narrows it.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.catchSome`
-   *
    * **Example** (Catching matching failures)
    *
    * ```ts
@@ -7976,7 +7758,7 @@ export const catchIf: {
    * Effect.runPromise(program)
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <A, E, R, EB extends E, A2, E2, R2, A3 = never, E3 = Exclude<E, EB>, R3 = never>(
@@ -7992,12 +7774,6 @@ export const catchIf: {
    * stream. Non-matching failures propagate downstream, so the error type is
    * preserved unless the filter narrows it.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.catchSome`
-   *
    * **Example** (Catching matching failures)
    *
    * ```ts
@@ -8020,7 +7796,7 @@ export const catchIf: {
    * Effect.runPromise(program)
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <A, E, R, A2, E2, R2, A3 = never, E3 = E, R3 = never>(
@@ -8058,7 +7834,7 @@ export const catchIf: {
  * Recovers from errors that match a `Filter` by switching to a recovery
  * stream.
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchFilter: {
@@ -8066,7 +7842,7 @@ export const catchFilter: {
    * Recovers from errors that match a `Filter` by switching to a recovery
    * stream.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <E, EB, A2, E2, R2, X, A3 = never, E3 = X, R3 = never>(
@@ -8078,7 +7854,7 @@ export const catchFilter: {
    * Recovers from errors that match a `Filter` by switching to a recovery
    * stream.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <A, E, R, EB, A2, E2, R2, X, A3 = never, E3 = X, R3 = never>(
@@ -8145,8 +7921,8 @@ export const catchFilter: {
  * Effect.runPromise(program)
  * ```
  *
- * @category Error Handling
- * @since 4.0.0
+ * @category error handling
+ * @since 2.0.0
  */
 export const catchTag: {
   /**
@@ -8180,8 +7956,8 @@ export const catchTag: {
    * Effect.runPromise(program)
    * ```
    *
-   * @category Error Handling
-   * @since 4.0.0
+   * @category error handling
+   * @since 2.0.0
    */
   <
     const K extends Tags<E> | Arr.NonEmptyReadonlyArray<Tags<E>>,
@@ -8234,8 +8010,8 @@ export const catchTag: {
    * Effect.runPromise(program)
    * ```
    *
-   * @category Error Handling
-   * @since 4.0.0
+   * @category error handling
+   * @since 2.0.0
    */
   <
     A,
@@ -8318,8 +8094,8 @@ export const catchTag: {
  * // Output: [ "fallback" ]
  * ```
  *
- * @category Error Handling
- * @since 4.0.0
+ * @category error handling
+ * @since 2.0.0
  */
 export const catchTags: {
   /**
@@ -8356,8 +8132,8 @@ export const catchTags: {
    * // Output: [ "fallback" ]
    * ```
    *
-   * @category Error Handling
-   * @since 4.0.0
+   * @category error handling
+   * @since 2.0.0
    */
   <
     E,
@@ -8421,8 +8197,8 @@ export const catchTags: {
    * // Output: [ "fallback" ]
    * ```
    *
-   * @category Error Handling
-   * @since 4.0.0
+   * @category error handling
+   * @since 2.0.0
    */
   <
     R,
@@ -8511,7 +8287,7 @@ export const catchTags: {
  * // Output: [ "retry: 60" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchReason: {
@@ -8556,7 +8332,7 @@ export const catchReason: {
    * // Output: [ "retry: 60" ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <
@@ -8626,7 +8402,7 @@ export const catchReason: {
    * // Output: [ "retry: 60" ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <
@@ -8723,7 +8499,7 @@ export const catchReason: {
  * // Output: [ "retry: 60" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchReasons: {
@@ -8766,7 +8542,7 @@ export const catchReasons: {
    * // Output: [ "retry: 60" ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <
@@ -8846,7 +8622,7 @@ export const catchReasons: {
    * // Output: [ "retry: 60" ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <
@@ -8931,7 +8707,7 @@ export const catchReasons: {
  * // Output: [ "recovered from mapped: bad" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const mapError: {
@@ -8956,7 +8732,7 @@ export const mapError: {
    * // Output: [ "recovered from mapped: bad" ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <E, E2>(f: (error: E) => E2): <A, R>(self: Stream<A, E, R>) => Stream<A, E2, R>
@@ -8981,7 +8757,7 @@ export const mapError: {
    * // Output: [ "recovered from mapped: bad" ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, E2>(self: Stream<A, E, R>, f: (error: E) => E2): Stream<A, E2, R>
@@ -8994,12 +8770,6 @@ export const mapError: {
  * Recovers from stream failures by filtering the `Cause` and switching to a recovery stream.
  * Non-matching causes are re-emitted as failures.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.catchSomeCause`
- *
  * **Example** (Catching matching causes)
  *
  * ```ts
@@ -9021,7 +8791,7 @@ export const mapError: {
  * // Output: [ "Recovered: NetworkError" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchCauseIf: {
@@ -9029,12 +8799,6 @@ export const catchCauseIf: {
    * Recovers from stream failures by filtering the `Cause` and switching to a recovery stream.
    * Non-matching causes are re-emitted as failures.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.catchSomeCause`
-   *
    * **Example** (Catching matching causes)
    *
    * ```ts
@@ -9056,7 +8820,7 @@ export const catchCauseIf: {
    * // Output: [ "Recovered: NetworkError" ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <E, A2, E2, R2>(
@@ -9069,12 +8833,6 @@ export const catchCauseIf: {
    * Recovers from stream failures by filtering the `Cause` and switching to a recovery stream.
    * Non-matching causes are re-emitted as failures.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.catchSomeCause`
-   *
    * **Example** (Catching matching causes)
    *
    * ```ts
@@ -9096,7 +8854,7 @@ export const catchCauseIf: {
    * // Output: [ "Recovered: NetworkError" ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <A, E, R, A2, E2, R2>(
@@ -9121,7 +8879,7 @@ export const catchCauseIf: {
  * Recovers from stream failures by filtering the `Cause` and switching to a
  * recovery stream.
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchCauseFilter: {
@@ -9129,7 +8887,7 @@ export const catchCauseFilter: {
    * Recovers from stream failures by filtering the `Cause` and switching to a
    * recovery stream.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <E, EB, A2, E2, R2, X extends Cause.Cause<any>>(
@@ -9142,7 +8900,7 @@ export const catchCauseFilter: {
    * Recovers from stream failures by filtering the `Cause` and switching to a
    * recovery stream.
    *
-   * @category Error Handling
+   * @category error handling
    * @since 4.0.0
    */
   <A, E, R, EB, A2, E2, R2, X extends Cause.Cause<any>>(
@@ -9183,7 +8941,7 @@ export const catchCauseFilter: {
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const orElseIfEmpty: {
@@ -9207,7 +8965,7 @@ export const orElseIfEmpty: {
    * // Output: [ 1, 2 ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <E, A2, E2, R2>(orElse: LazyArg<Stream<A2, E2, R2>>): <A, R>(self: Stream<A, E, R>) => Stream<A | A2, E | E2, R | R2>
@@ -9231,7 +8989,7 @@ export const orElseIfEmpty: {
    * // Output: [ 1, 2 ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, A2, E2, R2>(self: Stream<A, E, R>, orElse: LazyArg<Stream<A2, E2, R2>>): Stream<A | A2, E | E2, R | R2>
@@ -9265,7 +9023,7 @@ export const orElseIfEmpty: {
  * // Output: [ "Recovered: NetworkError" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const orElseSucceed: {
@@ -9290,7 +9048,7 @@ export const orElseSucceed: {
    * // Output: [ "Recovered: NetworkError" ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <E, A2>(f: (error: E) => A2): <A, R>(self: Stream<A, E, R>) => Stream<A | A2, never, R>
@@ -9315,7 +9073,7 @@ export const orElseSucceed: {
    * // Output: [ "Recovered: NetworkError" ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, A2>(self: Stream<A, E, R>, f: (error: E) => A2): Stream<A | A2, never, R>
@@ -9345,7 +9103,7 @@ export const orElseSucceed: {
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const orDie = <A, E, R>(self: Stream<A, E, R>): Stream<A, never, R> => fromChannel(Channel.orDie(self.channel))
@@ -9389,7 +9147,7 @@ export const orDie = <A, E, R>(self: Stream<A, E, R>): Stream<A, never, R> => fr
  * // []
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const ignore: <
@@ -9434,7 +9192,7 @@ export const ignore: <
  * // [ 1, 2 ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const ignoreCause: <
@@ -9484,7 +9242,7 @@ export const ignoreCause: <
  * // Output: [ 1, 1 ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const retry: {
@@ -9517,7 +9275,7 @@ export const retry: {
    * // Output: [ 1, 1 ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <E, X, E2, R2>(
@@ -9556,7 +9314,7 @@ export const retry: {
    * // Output: [ 1, 1 ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, X, E2, R2>(
@@ -9590,7 +9348,7 @@ export const retry: {
  * **Example** (Applying an execution plan)
  *
  * ```ts
- * import { Console, Effect, ExecutionPlan, Layer, Context, Stream } from "effect"
+ * import { Console, Context, Effect, ExecutionPlan, Layer, Stream } from "effect"
  *
  * class Service extends Context.Service<Service>()("Service", {
  *   make: Effect.succeed({
@@ -9617,9 +9375,8 @@ export const retry: {
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 3.16.0
- * @experimental
  */
 export const withExecutionPlan: {
   /**
@@ -9633,7 +9390,7 @@ export const withExecutionPlan: {
    * **Example** (Applying an execution plan)
    *
    * ```ts
-   * import { Console, Effect, ExecutionPlan, Layer, Context, Stream } from "effect"
+   * import { Console, Context, Effect, ExecutionPlan, Layer, Stream } from "effect"
    *
    * class Service extends Context.Service<Service>()("Service", {
    *   make: Effect.succeed({
@@ -9660,9 +9417,8 @@ export const withExecutionPlan: {
    * // Output: [ 1, 2, 3 ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 3.16.0
-   * @experimental
    */
   <Input, R2, Provides, PolicyE>(
     policy: ExecutionPlan.ExecutionPlan<{ provides: Provides; input: Input; error: PolicyE; requirements: R2 }>,
@@ -9679,7 +9435,7 @@ export const withExecutionPlan: {
    * **Example** (Applying an execution plan)
    *
    * ```ts
-   * import { Console, Effect, ExecutionPlan, Layer, Context, Stream } from "effect"
+   * import { Console, Context, Effect, ExecutionPlan, Layer, Stream } from "effect"
    *
    * class Service extends Context.Service<Service>()("Service", {
    *   make: Effect.succeed({
@@ -9706,9 +9462,8 @@ export const withExecutionPlan: {
    * // Output: [ 1, 2, 3 ]
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 3.16.0
-   * @experimental
    */
   <A, E extends Input, R, R2, Input, Provides, PolicyE>(
     self: Stream<A, E, R>,
@@ -9755,7 +9510,7 @@ export const withExecutionPlan: {
      * **Example** (Applying an execution plan)
      *
      * ```ts
-     * import { Console, Effect, ExecutionPlan, Layer, Context, Stream } from "effect"
+     * import { Console, Context, Effect, ExecutionPlan, Layer, Stream } from "effect"
      *
      * class Service extends Context.Service<Service>()("Service", {
      *   make: Effect.succeed({
@@ -9782,9 +9537,8 @@ export const withExecutionPlan: {
      * // Output: [ 1, 2, 3 ]
      * ```
      *
-     * @category Error Handling
+     * @category error handling
      * @since 3.16.0
-     * @experimental
      */
     E | PolicyE>()
     const loop: Stream<
@@ -9856,7 +9610,7 @@ export const withExecutionPlan: {
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const take: {
@@ -9880,7 +9634,7 @@ export const take: {
    * // Output: [ 1, 2, 3 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   (n: number): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E, R>
@@ -9904,7 +9658,7 @@ export const take: {
    * // Output: [ 1, 2, 3 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(self: Stream<A, E, R>, n: number): Stream<A, E, R>
@@ -9934,7 +9688,7 @@ export const take: {
  * // Output: [ 4, 5, 6 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const takeRight: {
@@ -9958,7 +9712,7 @@ export const takeRight: {
    * // Output: [ 4, 5, 6 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   (n: number): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E, R>
@@ -9982,7 +9736,7 @@ export const takeRight: {
    * // Output: [ 4, 5, 6 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(self: Stream<A, E, R>, n: number): Stream<A, E, R>
@@ -10031,7 +9785,7 @@ export const takeRight: {
  * })
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const takeUntil: {
@@ -10064,7 +9818,7 @@ export const takeUntil: {
    * })
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A>(
@@ -10102,7 +9856,7 @@ export const takeUntil: {
    * })
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(
@@ -10157,7 +9911,7 @@ export const takeUntil: {
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const takeUntilEffect: {
@@ -10181,7 +9935,7 @@ export const takeUntilEffect: {
    * // Output: [ 1, 2, 3 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E2, R2>(
@@ -10210,7 +9964,7 @@ export const takeUntilEffect: {
    * // Output: [ 1, 2, 3 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, E2, R2>(
@@ -10266,7 +10020,7 @@ export const takeUntilEffect: {
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const takeWhile: {
@@ -10291,7 +10045,7 @@ export const takeWhile: {
    * // Output: [ 1, 2 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, B extends A>(refinement: (a: NoInfer<A>, n: number) => a is B): <E, R>(self: Stream<A, E, R>) => Stream<B, E, R>
@@ -10316,7 +10070,7 @@ export const takeWhile: {
    * // Output: [ 1, 2 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A>(predicate: (a: NoInfer<A>, n: number) => boolean): <E, R>(self: Stream<A, E, R>) => Stream<A, E, R>
@@ -10341,7 +10095,7 @@ export const takeWhile: {
    * // Output: [ 1, 2 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, B extends A>(self: Stream<A, E, R>, refinement: (a: NoInfer<A>, n: number) => a is B): Stream<B, E, R>
@@ -10366,7 +10120,7 @@ export const takeWhile: {
    * // Output: [ 1, 2 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(self: Stream<A, E, R>, predicate: (a: NoInfer<A>, n: number) => boolean): Stream<A, E, R>
@@ -10404,7 +10158,7 @@ export const takeWhile: {
  *
  * The stream stops at the first `Result.fail` returned by the filter.
  *
- * @category Filtering
+ * @category filtering
  * @since 4.0.0
  */
 export const takeWhileFilter: {
@@ -10414,7 +10168,7 @@ export const takeWhileFilter: {
    *
    * The stream stops at the first `Result.fail` returned by the filter.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, B, X>(f: Filter.Filter<NoInfer<A>, B, X>): <E, R>(self: Stream<A, E, R>) => Stream<B, E, R>
@@ -10424,7 +10178,7 @@ export const takeWhileFilter: {
    *
    * The stream stops at the first `Result.fail` returned by the filter.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, E, R, B, X>(self: Stream<A, E, R>, f: Filter.Filter<NoInfer<A>, B, X>): Stream<B, E, R>
@@ -10476,8 +10230,8 @@ export const takeWhileFilter: {
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Filtering
- * @since 2.0.0
+ * @category filtering
+ * @since 4.0.0
  */
 export const takeWhileEffect: {
   /**
@@ -10500,8 +10254,8 @@ export const takeWhileEffect: {
    * // Output: [ 1, 2 ]
    * ```
    *
-   * @category Filtering
-   * @since 2.0.0
+   * @category filtering
+   * @since 4.0.0
    */
   <A, E2, R2>(predicate: (a: NoInfer<A>, n: number) => Effect.Effect<boolean, E2, R2>): <E, R>(self: Stream<A, E, R>) => Stream<A, E | E2, R | R2>
   /**
@@ -10524,8 +10278,8 @@ export const takeWhileEffect: {
    * // Output: [ 1, 2 ]
    * ```
    *
-   * @category Filtering
-   * @since 2.0.0
+   * @category filtering
+   * @since 4.0.0
    */
   <A, E, R, E2, R2>(
     self: Stream<A, E, R>,
@@ -10561,7 +10315,7 @@ export const takeWhileEffect: {
  * // Output: [ 3, 4, 5 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const drop: {
@@ -10585,7 +10339,7 @@ export const drop: {
    * // Output: [ 3, 4, 5 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   (n: number): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E, R>
@@ -10609,7 +10363,7 @@ export const drop: {
    * // Output: [ 3, 4, 5 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(self: Stream<A, E, R>, n: number): Stream<A, E, R>
@@ -10649,7 +10403,7 @@ export const drop: {
  * })
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const dropUntil: {
@@ -10671,7 +10425,7 @@ export const dropUntil: {
    * })
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A>(predicate: (a: NoInfer<A>, index: number) => boolean): <E, R>(self: Stream<A, E, R>) => Stream<A, E, R>
@@ -10693,7 +10447,7 @@ export const dropUntil: {
    * })
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(
@@ -10728,7 +10482,7 @@ export const dropUntil: {
  * // Output: [ 4, 5 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const dropUntilEffect: {
@@ -10755,7 +10509,7 @@ export const dropUntilEffect: {
    * // Output: [ 4, 5 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E2, R2>(
@@ -10784,7 +10538,7 @@ export const dropUntilEffect: {
    * // Output: [ 4, 5 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, E2, R2>(
@@ -10823,7 +10577,7 @@ export const dropUntilEffect: {
  * // Output: [ 3, 4, 5 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const dropWhile: {
@@ -10847,7 +10601,7 @@ export const dropWhile: {
    * // Output: [ 3, 4, 5 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A>(predicate: (a: NoInfer<A>, index: number) => boolean): <E, R>(self: Stream<A, E, R>) => Stream<A, E, R>
@@ -10871,7 +10625,7 @@ export const dropWhile: {
    * // Output: [ 3, 4, 5 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(
@@ -10898,21 +10652,21 @@ export const dropWhile: {
 /**
  * Drops elements while the filter succeeds.
  *
- * @category Filtering
+ * @category filtering
  * @since 4.0.0
  */
 export const dropWhileFilter: {
   /**
    * Drops elements while the filter succeeds.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, B, X>(filter: Filter.Filter<NoInfer<A>, B, X>): <E, R>(self: Stream<A, E, R>) => Stream<A, E, R>
   /**
    * Drops elements while the filter succeeds.
    *
-   * @category Filtering
+   * @category filtering
    * @since 4.0.0
    */
   <A, E, R, B, X>(self: Stream<A, E, R>, filter: Filter.Filter<NoInfer<A>, B, X>): Stream<A, E, R>
@@ -10952,7 +10706,7 @@ export const dropWhileFilter: {
  * // Output: [ 3, 4, 5 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const dropWhileEffect: {
@@ -10976,7 +10730,7 @@ export const dropWhileEffect: {
    * // Output: [ 3, 4, 5 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E2, R2>(
@@ -11002,7 +10756,7 @@ export const dropWhileEffect: {
    * // Output: [ 3, 4, 5 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R, E2, R2>(
@@ -11055,7 +10809,7 @@ export const dropWhileEffect: {
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const dropRight: {
@@ -11081,7 +10835,7 @@ export const dropRight: {
    * // Output: [ 1, 2, 3 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   (n: number): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E, R>
@@ -11107,7 +10861,7 @@ export const dropRight: {
    * // Output: [ 1, 2, 3 ]
    * ```
    *
-   * @category Filtering
+   * @category filtering
    * @since 2.0.0
    */
   <A, E, R>(self: Stream<A, E, R>, n: number): Stream<A, E, R>
@@ -11139,7 +10893,7 @@ export const dropRight: {
          * // Output: [ 1, 2, 3 ]
          * ```
          *
-         * @category Filtering
+         * @category filtering
          * @since 2.0.0
          */
         A>()
@@ -11343,7 +11097,7 @@ export const rechunk: {
  * **Example** (Emitting sliding windows)
  *
  * ```ts
- * import { Console, Effect, Stream, pipe } from "effect"
+ * import { Console, Effect, pipe, Stream } from "effect"
  *
  * Effect.gen(function*() {
  *   const result = yield* pipe(
@@ -11366,7 +11120,7 @@ export const sliding: {
    * **Example** (Emitting sliding windows)
    *
    * ```ts
-   * import { Console, Effect, Stream, pipe } from "effect"
+   * import { Console, Effect, pipe, Stream } from "effect"
    *
    * Effect.gen(function*() {
    *   const result = yield* pipe(
@@ -11389,7 +11143,7 @@ export const sliding: {
    * **Example** (Emitting sliding windows)
    *
    * ```ts
-   * import { Console, Effect, Stream, pipe } from "effect"
+   * import { Console, Effect, pipe, Stream } from "effect"
    *
    * Effect.gen(function*() {
    *   const result = yield* pipe(
@@ -11877,12 +11631,6 @@ export const combine: {
  * internal state to control the combining process, with the initial state
  * being specified by `s`.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.combineChunks`
- *
  * **Example** (Combining stream chunks with state)
  *
  * ```ts
@@ -11909,8 +11657,8 @@ export const combine: {
  * // Output: [ 1, 2, 10, 20 ]
  * ```
  *
- * @category Sequencing
- * @since 2.0.0
+ * @category sequencing
+ * @since 4.0.0
  */
 export const combineArray: {
   /**
@@ -11920,12 +11668,6 @@ export const combineArray: {
    * internal state to control the combining process, with the initial state
    * being specified by `s`.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.combineChunks`
-   *
    * **Example** (Combining stream chunks with state)
    *
    * ```ts
@@ -11952,8 +11694,8 @@ export const combineArray: {
    * // Output: [ 1, 2, 10, 20 ]
    * ```
    *
-   * @category Sequencing
-   * @since 2.0.0
+   * @category sequencing
+   * @since 4.0.0
    */
   <A2, E2, R2, S, E, A, A3, E3, R3>(
     that: Stream<A2, E2, R2>,
@@ -11971,12 +11713,6 @@ export const combineArray: {
    * internal state to control the combining process, with the initial state
    * being specified by `s`.
    *
-   * **Previously Known As**
-   *
-   * This API replaces the following from Effect 3.x:
-   *
-   * - `Stream.combineChunks`
-   *
    * **Example** (Combining stream chunks with state)
    *
    * ```ts
@@ -12003,8 +11739,8 @@ export const combineArray: {
    * // Output: [ 1, 2, 10, 20 ]
    * ```
    *
-   * @category Sequencing
-   * @since 2.0.0
+   * @category sequencing
+   * @since 4.0.0
    */
   <R, A2, E2, R2, S, E, A, A3, E3, R3>(
     self: Stream<A, E, R>,
@@ -12057,7 +11793,7 @@ export const combineArray: {
  * // Output: [ 0, 1, 3, 6, 10, 15, 21 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const mapAccum: {
@@ -12085,7 +11821,7 @@ export const mapAccum: {
    * // Output: [ 0, 1, 3, 6, 10, 15, 21 ]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <S, A, B>(
@@ -12119,7 +11855,7 @@ export const mapAccum: {
    * // Output: [ 0, 1, 3, 6, 10, 15, 21 ]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, E, R, S, B>(
@@ -12166,7 +11902,7 @@ export const mapAccum: {
        * // Output: [ 0, 1, 3, 6, 10, 15, 21 ]
        * ```
        *
-       * @category Mapping
+       * @category mapping
        * @since 2.0.0
        */
       B>()
@@ -12213,8 +11949,8 @@ export const mapAccum: {
  * // Output: [ 3, 10, 21 ]
  * ```
  *
- * @category Mapping
- * @since 2.0.0
+ * @category mapping
+ * @since 4.0.0
  */
 export const mapAccumArray: {
   /**
@@ -12243,8 +11979,8 @@ export const mapAccumArray: {
    * // Output: [ 3, 10, 21 ]
    * ```
    *
-   * @category Mapping
-   * @since 2.0.0
+   * @category mapping
+   * @since 4.0.0
    */
   <S, A, B>(
     initial: LazyArg<S>,
@@ -12279,8 +12015,8 @@ export const mapAccumArray: {
    * // Output: [ 3, 10, 21 ]
    * ```
    *
-   * @category Mapping
-   * @since 2.0.0
+   * @category mapping
+   * @since 4.0.0
    */
   <A, E, R, S, B>(
     self: Stream<A, E, R>,
@@ -12346,7 +12082,7 @@ const emptyArr = Arr.empty<never>()
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const mapAccumEffect: {
@@ -12378,7 +12114,7 @@ export const mapAccumEffect: {
    * // Output: [ 1, 2, 3 ]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <S, A, B, E2, R2>(
@@ -12416,7 +12152,7 @@ export const mapAccumEffect: {
    * // Output: [ 1, 2, 3 ]
    * ```
    *
-   * @category Mapping
+   * @category mapping
    * @since 2.0.0
    */
   <A, E, R, S, B, E2, R2>(
@@ -12472,7 +12208,7 @@ export const mapAccumEffect: {
              * // Output: [ 1, 2, 3 ]
              * ```
              *
-             * @category Mapping
+             * @category mapping
              * @since 2.0.0
              */
             Arr.NonEmptyReadonlyArray<B>>()
@@ -12520,8 +12256,8 @@ export const mapAccumEffect: {
  * // Output: [ 3, 10 ]
  * ```
  *
- * @category Mapping
- * @since 2.0.0
+ * @category mapping
+ * @since 4.0.0
  */
 export const mapAccumArrayEffect: {
   /**
@@ -12554,8 +12290,8 @@ export const mapAccumArrayEffect: {
    * // Output: [ 3, 10 ]
    * ```
    *
-   * @category Mapping
-   * @since 2.0.0
+   * @category mapping
+   * @since 4.0.0
    */
   <S, A, B, E2, R2>(
     initial: LazyArg<S>,
@@ -12594,8 +12330,8 @@ export const mapAccumArrayEffect: {
    * // Output: [ 3, 10 ]
    * ```
    *
-   * @category Mapping
-   * @since 2.0.0
+   * @category mapping
+   * @since 4.0.0
    */
   <A, E, R, S, B, E2, R2>(
     self: Stream<A, E, R>,
@@ -14456,6 +14192,237 @@ export const aggregateWithin: {
     )
   }))))
 
+/**
+ * Fan out the stream, producing a fixed-size tuple of streams that each emit
+ * the same elements as the source stream.
+ *
+ * The source stream starts after all downstream streams have been subscribed.
+ * With the default suspend strategy, the source can only advance `capacity`
+ * chunks ahead of the slowest downstream stream. If a downstream stream is
+ * interrupted, it unsubscribes from the broadcast so it no longer contributes
+ * backpressure.
+ *
+ * **Example** (Broadcasting to two consumers)
+ *
+ * ```ts
+ * import { Console, Effect, Stream } from "effect"
+ *
+ * const program = Effect.scoped(
+ *   Effect.gen(function*() {
+ *     const [left, right] = yield* Stream.make(1, 2, 3).pipe(
+ *       Stream.broadcastN({ n: 2, capacity: 8 })
+ *     )
+ *
+ *     const values = yield* Effect.all([
+ *       Stream.runCollect(left),
+ *       Stream.runCollect(right)
+ *     ], { concurrency: "unbounded" })
+ *
+ *     yield* Console.log(values)
+ *   })
+ * )
+ *
+ * Effect.runPromise(program)
+ * // Output: [[1, 2, 3], [1, 2, 3]]
+ * ```
+ *
+ * @category Broadcast
+ * @since 4.0.0
+ */
+export const broadcastN: {
+  /**
+   * Fan out the stream, producing a fixed-size tuple of streams that each emit
+   * the same elements as the source stream.
+   *
+   * The source stream starts after all downstream streams have been subscribed.
+   * With the default suspend strategy, the source can only advance `capacity`
+   * chunks ahead of the slowest downstream stream. If a downstream stream is
+   * interrupted, it unsubscribes from the broadcast so it no longer contributes
+   * backpressure.
+   *
+   * **Example** (Broadcasting to two consumers)
+   *
+   * ```ts
+   * import { Console, Effect, Stream } from "effect"
+   *
+   * const program = Effect.scoped(
+   *   Effect.gen(function*() {
+   *     const [left, right] = yield* Stream.make(1, 2, 3).pipe(
+   *       Stream.broadcastN({ n: 2, capacity: 8 })
+   *     )
+   *
+   *     const values = yield* Effect.all([
+   *       Stream.runCollect(left),
+   *       Stream.runCollect(right)
+   *     ], { concurrency: "unbounded" })
+   *
+   *     yield* Console.log(values)
+   *   })
+   * )
+   *
+   * Effect.runPromise(program)
+   * // Output: [[1, 2, 3], [1, 2, 3]]
+   * ```
+   *
+   * @category Broadcast
+   * @since 4.0.0
+   */
+  <const N extends number>(
+    options: {
+      readonly n: N
+      readonly capacity: "unbounded"
+      readonly replay?: number | undefined
+    } | {
+      readonly n: N
+      readonly capacity: number
+      readonly strategy?: "sliding" | "dropping" | "suspend" | undefined
+      readonly replay?: number | undefined
+    }
+  ): <A, E, R>(self: Stream<A, E, R>) => Effect.Effect<TupleOf<N, Stream<A, E>>, never, Scope.Scope | R>
+  /**
+   * Fan out the stream, producing a fixed-size tuple of streams that each emit
+   * the same elements as the source stream.
+   *
+   * The source stream starts after all downstream streams have been subscribed.
+   * With the default suspend strategy, the source can only advance `capacity`
+   * chunks ahead of the slowest downstream stream. If a downstream stream is
+   * interrupted, it unsubscribes from the broadcast so it no longer contributes
+   * backpressure.
+   *
+   * **Example** (Broadcasting to two consumers)
+   *
+   * ```ts
+   * import { Console, Effect, Stream } from "effect"
+   *
+   * const program = Effect.scoped(
+   *   Effect.gen(function*() {
+   *     const [left, right] = yield* Stream.make(1, 2, 3).pipe(
+   *       Stream.broadcastN({ n: 2, capacity: 8 })
+   *     )
+   *
+   *     const values = yield* Effect.all([
+   *       Stream.runCollect(left),
+   *       Stream.runCollect(right)
+   *     ], { concurrency: "unbounded" })
+   *
+   *     yield* Console.log(values)
+   *   })
+   * )
+   *
+   * Effect.runPromise(program)
+   * // Output: [[1, 2, 3], [1, 2, 3]]
+   * ```
+   *
+   * @category Broadcast
+   * @since 4.0.0
+   */
+  <A, E, R, const N extends number>(
+    self: Stream<A, E, R>,
+    options: {
+      readonly n: N
+      readonly capacity: "unbounded"
+      readonly replay?: number | undefined
+    } | {
+      readonly capacity: number
+      readonly n: N
+      readonly strategy?: "sliding" | "dropping" | "suspend" | undefined
+      readonly replay?: number | undefined
+    }
+  ): Effect.Effect<TupleOf<N, Stream<A, E>>, never, Scope.Scope | R>
+} = dual(
+  2,
+  Effect.fnUntraced(function*<A, E, R, const N extends number>(
+    self: Stream<A, E, R>,
+    options: {
+      readonly n: N
+      readonly capacity: "unbounded"
+      readonly replay?: number | undefined
+    } | {
+      readonly n: N
+      readonly capacity: number
+      readonly strategy?: "sliding" | "dropping" | "suspend" | undefined
+      readonly replay?: number | undefined
+    }
+  ) {
+    const pubsub = yield* makePubSub</**
+     * Fan out the stream, producing a fixed-size tuple of streams that each emit
+     * the same elements as the source stream.
+     *
+     * The source stream starts after all downstream streams have been subscribed.
+     * With the default suspend strategy, the source can only advance `capacity`
+     * chunks ahead of the slowest downstream stream. If a downstream stream is
+     * interrupted, it unsubscribes from the broadcast so it no longer contributes
+     * backpressure.
+     *
+     * **Example** (Broadcasting to two consumers)
+     *
+     * ```ts
+     * import { Console, Effect, Stream } from "effect"
+     *
+     * const program = Effect.scoped(
+     *   Effect.gen(function*() {
+     *     const [left, right] = yield* Stream.make(1, 2, 3).pipe(
+     *       Stream.broadcastN({ n: 2, capacity: 8 })
+     *     )
+     *
+     *     const values = yield* Effect.all([
+     *       Stream.runCollect(left),
+     *       Stream.runCollect(right)
+     *     ], { concurrency: "unbounded" })
+     *
+     *     yield* Console.log(values)
+     *   })
+     * )
+     *
+     * Effect.runPromise(program)
+     * // Output: [[1, 2, 3], [1, 2, 3]]
+     * ```
+     *
+     * @category Broadcast
+     * @since 4.0.0
+     */
+    Take.Take<A, E>>(options)
+    const streams = new Array(options.n)
+    const parentScope = yield* Scope.Scope
+    for (let i = 0; i < options.n; i++) {
+      const scope = Scope.forkUnsafe(parentScope)
+      const subscription = yield* PubSub.subscribe(pubsub).pipe(
+        Effect.provideService(Scope.Scope, scope)
+      )
+      streams[i] = Channel.fromEffectTake(PubSub.take(subscription)).pipe(
+        Channel.onExit((exit) => Scope.close(scope, exit)),
+        fromChannel
+      )
+    }
+    yield* Channel.runForEach(self.channel, (value) => PubSub.publish(pubsub, value)).pipe(
+      Effect.onExit((exit) => PubSub.publish(pubsub, exit)),
+      Effect.forkScoped
+    )
+    return streams as TupleOf<N, Stream<A, E>>
+  })
+)
+
+const makePubSub = <A>(
+  options: {
+    readonly capacity: "unbounded"
+    readonly replay?: number | undefined
+  } | {
+    readonly capacity: number
+    readonly strategy?: "dropping" | "sliding" | "suspend" | undefined
+    readonly replay?: number | undefined
+  }
+) =>
+  Effect.acquireRelease(
+    options.capacity === "unbounded"
+      ? PubSub.unbounded<A>(options)
+      : options.strategy === "dropping"
+      ? PubSub.dropping<A>(options)
+      : options.strategy === "sliding"
+      ? PubSub.sliding<A>(options)
+      : PubSub.bounded<A>(options),
+    PubSub.shutdown
+  )
+
 /**
  * Creates a PubSub-backed stream that multicasts the source to all subscribers.
  *
@@ -14619,7 +14586,7 @@ export const broadcast: {
  * ```
  *
  * @category Broadcast
- * @since 2.0.0
+ * @since 3.8.0
  */
 export const share: {
   /**
@@ -14652,7 +14619,7 @@ export const share: {
    * ```
    *
    * @category Broadcast
-   * @since 2.0.0
+   * @since 3.8.0
    */
   (
     options: {
@@ -14696,7 +14663,7 @@ export const share: {
    * ```
    *
    * @category Broadcast
-   * @since 2.0.0
+   * @since 3.8.0
    */
   <A, E, R>(
     self: Stream<A, E, R>,
@@ -15067,7 +15034,7 @@ export const pipeThrough: {
  * ```
  *
  * @category Accumulation
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const collect = <A, E, R>(self: Stream<A, E, R>): Stream<Array<A>, E, R> => fromEffect(runCollect(self))
 
@@ -15371,7 +15338,7 @@ export const changesWithEffect: {
  * // ["Hello", " World"]
  * ```
  *
- * @category Encoding
+ * @category encoding
  * @since 2.0.0
  */
 export const decodeText: <
@@ -15417,7 +15384,7 @@ export const decodeText: <
  * // [[72, 101, 108, 108, 111], [32], [87, 111, 114, 108, 100]]
  * ```
  *
- * @category Encoding
+ * @category encoding
  * @since 2.0.0
  */
 export const encodeText = <E, R>(self: Stream<string, E, R>): Stream<Uint8Array, E, R> =>
@@ -15443,7 +15410,7 @@ export const encodeText = <E, R>(self: Stream<string, E, R>): Stream<Uint8Array,
  * // ["a", "b", "c"]
  * ```
  *
- * @category Encoding
+ * @category encoding
  * @since 2.0.0
  */
 export const splitLines = <E, R>(self: Stream<string, E, R>): Stream<string, E, R> =>
@@ -15470,7 +15437,7 @@ export const splitLines = <E, R>(self: Stream<string, E, R>): Stream<string, E,
  * // [1, 0, 2, 0, 3, 0, 4]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const intersperse: {
@@ -15492,7 +15459,7 @@ export const intersperse: {
    * // [1, 0, 2, 0, 3, 0, 4]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A2>(element: A2): <A, E, R>(self: Stream<A, E, R>) => Stream<A2 | A, E, R>
@@ -15514,7 +15481,7 @@ export const intersperse: {
    * // [1, 0, 2, 0, 3, 0, 4]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, A2>(self: Stream<A, E, R>, element: A2): Stream<A | A2, E, R>
@@ -15555,7 +15522,7 @@ export const intersperse: {
  * // [ "[", "a", ",", "b", ",", "c", "]" ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const intersperseAffixes: {
@@ -15582,7 +15549,7 @@ export const intersperseAffixes: {
    * // [ "[", "a", ",", "b", ",", "c", "]" ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A2, A3, A4>(options: { readonly start: A2; readonly middle: A3; readonly end: A4 }): <A, E, R>(self: Stream<A, E, R>) => Stream<A2 | A3 | A4 | A, E, R>
@@ -15609,7 +15576,7 @@ export const intersperseAffixes: {
    * // [ "[", "a", ",", "b", ",", "c", "]" ]
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 2.0.0
    */
   <A, E, R, A2, A3, A4>(
@@ -16238,7 +16205,7 @@ export const onExit: {
  * // Stream failed: boom
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const onError: {
@@ -16267,7 +16234,7 @@ export const onError: {
    * // Stream failed: boom
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <E, X, R2>(cleanup: (cause: Cause.Cause<E>) => Effect.Effect<X, never, R2>): <A, R>(self: Stream<A, E, R>) => Stream<A, E, R2 | R>
@@ -16296,7 +16263,7 @@ export const onError: {
    * // Stream failed: boom
    * ```
    *
-   * @category Error Handling
+   * @category error handling
    * @since 2.0.0
    */
   <A, E, R, X, R2>(
@@ -16331,8 +16298,8 @@ export const onError: {
  * // [1, 2, 3]
  * ```
  *
- * @category Sequencing
- * @since 4.0.0
+ * @category sequencing
+ * @since 3.6.0
  */
 export const onStart: {
   /**
@@ -16358,8 +16325,8 @@ export const onStart: {
    * // [1, 2, 3]
    * ```
    *
-   * @category Sequencing
-   * @since 4.0.0
+   * @category sequencing
+   * @since 3.6.0
    */
   <X, EX, RX>(onStart: Effect.Effect<X, EX, RX>): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E | EX, R | RX>
   /**
@@ -16385,8 +16352,8 @@ export const onStart: {
    * // [1, 2, 3]
    * ```
    *
-   * @category Sequencing
-   * @since 4.0.0
+   * @category sequencing
+   * @since 3.6.0
    */
   <A, E, R, X, EX, RX>(self: Stream<A, E, R>, onStart: Effect.Effect<X, EX, RX>): Stream<A, E | EX, R | RX>
 } = dual(2, <A, E, R, X, EX, RX>(
@@ -16411,7 +16378,7 @@ export const onStart: {
  * // Output: first=1
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 4.0.0
  */
 export const onFirst: {
@@ -16432,7 +16399,7 @@ export const onFirst: {
    * // Output: first=1
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 4.0.0
    */
   <A, X, EX, RX>(onFirst: (element: NoInfer<A>) => Effect.Effect<X, EX, RX>): <E, R>(self: Stream<A, E, R>) => Stream<A, E | EX, R | RX>
@@ -16453,7 +16420,7 @@ export const onFirst: {
    * // Output: first=1
    * ```
    *
-   * @category Sequencing
+   * @category sequencing
    * @since 4.0.0
    */
   <A, E, R, X, EX, RX>(
@@ -16486,8 +16453,8 @@ export const onFirst: {
  * // [1, 2, 3]
  * ```
  *
- * @category Sequencing
- * @since 4.0.0
+ * @category sequencing
+ * @since 3.6.0
  */
 export const onEnd: {
   /**
@@ -16511,8 +16478,8 @@ export const onEnd: {
    * // [1, 2, 3]
    * ```
    *
-   * @category Sequencing
-   * @since 4.0.0
+   * @category sequencing
+   * @since 3.6.0
    */
   <X, EX, RX>(onEnd: Effect.Effect<X, EX, RX>): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E | EX, R | RX>
   /**
@@ -16536,8 +16503,8 @@ export const onEnd: {
    * // [1, 2, 3]
    * ```
    *
-   * @category Sequencing
-   * @since 4.0.0
+   * @category sequencing
+   * @since 3.6.0
    */
   <A, E, R, X, EX, RX>(self: Stream<A, E, R>, onEnd: Effect.Effect<X, EX, RX>): Stream<A, E | EX, R | RX>
 } = dual(2, <A, E, R, X, EX, RX>(
@@ -16568,7 +16535,7 @@ export const onEnd: {
  * ```
  *
  * @category Finalization
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const ensuring: {
   /**
@@ -16594,7 +16561,7 @@ export const ensuring: {
    * ```
    *
    * @category Finalization
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <R2>(finalizer: Effect.Effect<unknown, never, R2>): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E, R | R2>
   /**
@@ -16620,7 +16587,7 @@ export const ensuring: {
    * ```
    *
    * @category Finalization
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <A, E, R, R2>(self: Stream<A, E, R>, finalizer: Effect.Effect<unknown, never, R2>): Stream<A, E, R | R2>
 } = dual(
@@ -16634,12 +16601,10 @@ export const ensuring: {
  * service requirements. Use `options.local` to build the layer every time; by
  * default, layers are shared between provide calls.
  *
- * **Previously Known As:** `provideSomeLayer`, `provideSomeContext`.
- *
  * **Example** (Providing stream requirements)
  *
  * ```ts
- * import { Console, Effect, Layer, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Layer, Stream } from "effect"
  *
  * class Env extends Context.Service<Env, { readonly name: string }>()("Env") {}
  *
@@ -16663,7 +16628,7 @@ export const ensuring: {
  * // ["Hello, Ada"]
  * ```
  *
- * @category Services
+ * @category services
  * @since 4.0.0
  */
 export const provide: {
@@ -16672,12 +16637,10 @@ export const provide: {
    * service requirements. Use `options.local` to build the layer every time; by
    * default, layers are shared between provide calls.
    *
-   * **Previously Known As:** `provideSomeLayer`, `provideSomeContext`.
-   *
    * **Example** (Providing stream requirements)
    *
    * ```ts
-   * import { Console, Effect, Layer, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Layer, Stream } from "effect"
    *
    * class Env extends Context.Service<Env, { readonly name: string }>()("Env") {}
    *
@@ -16701,7 +16664,7 @@ export const provide: {
    * // ["Hello, Ada"]
    * ```
    *
-   * @category Services
+   * @category services
    * @since 4.0.0
    */
   <AL, EL = never, RL = never>(
@@ -16717,12 +16680,10 @@ export const provide: {
    * service requirements. Use `options.local` to build the layer every time; by
    * default, layers are shared between provide calls.
    *
-   * **Previously Known As:** `provideSomeLayer`, `provideSomeContext`.
-   *
    * **Example** (Providing stream requirements)
    *
    * ```ts
-   * import { Console, Effect, Layer, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Layer, Stream } from "effect"
    *
    * class Env extends Context.Service<Env, { readonly name: string }>()("Env") {}
    *
@@ -16746,7 +16707,7 @@ export const provide: {
    * // ["Hello, Ada"]
    * ```
    *
-   * @category Services
+   * @category services
    * @since 4.0.0
    */
   <A, E, R, AL, EL = never, RL = never>(
@@ -16770,7 +16731,7 @@ export const provide: {
  * **Example** (Providing multiple services to the stream using a context)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class Config extends Context.Service<Config, { readonly prefix: string }>()("Config") {}
  * class Greeter extends Context.Service<Greeter, { greet: (name: string) => string }>()("Greeter") {}
@@ -16796,8 +16757,8 @@ export const provide: {
  * // ["Hello!"]
  * ```
  *
- * @category Services
- * @since 4.0.0
+ * @category services
+ * @since 2.0.0
  */
 export const provideContext: {
   /**
@@ -16806,7 +16767,7 @@ export const provideContext: {
    * **Example** (Providing multiple services to the stream using a context)
    *
    * ```ts
-   * import { Console, Effect, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Stream } from "effect"
    *
    * class Config extends Context.Service<Config, { readonly prefix: string }>()("Config") {}
    * class Greeter extends Context.Service<Greeter, { greet: (name: string) => string }>()("Greeter") {}
@@ -16832,8 +16793,8 @@ export const provideContext: {
    * // ["Hello!"]
    * ```
    *
-   * @category Services
-   * @since 4.0.0
+   * @category services
+   * @since 2.0.0
    */
   <R2>(context: Context.Context<R2>): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E, Exclude<R, R2>>
   /**
@@ -16842,7 +16803,7 @@ export const provideContext: {
    * **Example** (Providing multiple services to the stream using a context)
    *
    * ```ts
-   * import { Console, Effect, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Stream } from "effect"
    *
    * class Config extends Context.Service<Config, { readonly prefix: string }>()("Config") {}
    * class Greeter extends Context.Service<Greeter, { greet: (name: string) => string }>()("Greeter") {}
@@ -16868,8 +16829,8 @@ export const provideContext: {
    * // ["Hello!"]
    * ```
    *
-   * @category Services
-   * @since 4.0.0
+   * @category services
+   * @since 2.0.0
    */
   <A, E, R, R2>(self: Stream<A, E, R>, context: Context.Context<R2>): Stream<A, E, Exclude<R, R2>>
 } = dual(
@@ -16885,7 +16846,7 @@ export const provideContext: {
  * **Example** (Providing a stream service)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class Greeter extends Context.Service<Greeter, {
  *   greet: (name: string) => string
@@ -16912,8 +16873,8 @@ export const provideContext: {
  * //=> ["Hello, Ada"]
  * ```
  *
- * @category Services
- * @since 4.0.0
+ * @category services
+ * @since 2.0.0
  */
 export const provideService: {
   /**
@@ -16923,7 +16884,7 @@ export const provideService: {
    * **Example** (Providing a stream service)
    *
    * ```ts
-   * import { Console, Effect, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Stream } from "effect"
    *
    * class Greeter extends Context.Service<Greeter, {
    *   greet: (name: string) => string
@@ -16950,8 +16911,8 @@ export const provideService: {
    * //=> ["Hello, Ada"]
    * ```
    *
-   * @category Services
-   * @since 4.0.0
+   * @category services
+   * @since 2.0.0
    */
   <I, S>(key: Context.Key<I, S>, service: NoInfer<S>): <A, E, R>(
     self: Stream<A, E, R>
@@ -16963,7 +16924,7 @@ export const provideService: {
    * **Example** (Providing a stream service)
    *
    * ```ts
-   * import { Console, Effect, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Stream } from "effect"
    *
    * class Greeter extends Context.Service<Greeter, {
    *   greet: (name: string) => string
@@ -16990,8 +16951,8 @@ export const provideService: {
    * //=> ["Hello, Ada"]
    * ```
    *
-   * @category Services
-   * @since 4.0.0
+   * @category services
+   * @since 2.0.0
    */
   <A, E, R, I, S>(self: Stream<A, E, R>, key: Context.Key<I, S>, service: NoInfer<S>): Stream<A, E, Exclude<R, I>>
 } = dual(3, <A, E, R, I, S>(
@@ -17006,7 +16967,7 @@ export const provideService: {
  * **Example** (Providing a stream service effectfully)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class ApiConfig extends Context.Service<ApiConfig, { readonly baseUrl: string }>()("ApiConfig") {}
  *
@@ -17036,8 +16997,8 @@ export const provideService: {
  * // ["https://example.com"]
  * ```
  *
- * @category Services
- * @since 4.0.0
+ * @category services
+ * @since 2.0.0
  */
 export const provideServiceEffect: {
   /**
@@ -17046,7 +17007,7 @@ export const provideServiceEffect: {
    * **Example** (Providing a stream service effectfully)
    *
    * ```ts
-   * import { Console, Effect, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Stream } from "effect"
    *
    * class ApiConfig extends Context.Service<ApiConfig, { readonly baseUrl: string }>()("ApiConfig") {}
    *
@@ -17076,8 +17037,8 @@ export const provideServiceEffect: {
    * // ["https://example.com"]
    * ```
    *
-   * @category Services
-   * @since 4.0.0
+   * @category services
+   * @since 2.0.0
    */
   <I, S, ES, RS>(key: Context.Key<I, S>, service: Effect.Effect<NoInfer<S>, ES, RS>): <A, E, R>(
     self: Stream<A, E, R>
@@ -17088,7 +17049,7 @@ export const provideServiceEffect: {
    * **Example** (Providing a stream service effectfully)
    *
    * ```ts
-   * import { Console, Effect, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Stream } from "effect"
    *
    * class ApiConfig extends Context.Service<ApiConfig, { readonly baseUrl: string }>()("ApiConfig") {}
    *
@@ -17118,8 +17079,8 @@ export const provideServiceEffect: {
    * // ["https://example.com"]
    * ```
    *
-   * @category Services
-   * @since 4.0.0
+   * @category services
+   * @since 2.0.0
    */
   <A, E, R, I, S, ES, RS>(
     self: Stream<A, E, R>,
@@ -17139,7 +17100,7 @@ export const provideServiceEffect: {
  * **Example** (Updating the stream context)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class Logger extends Context.Service<Logger, { prefix: string }>()("Logger") {}
  * class Config extends Context.Service<Config, { name: string }>()("Config") {}
@@ -17169,8 +17130,8 @@ export const provideServiceEffect: {
  * //=> [ "Hello World" ]
  * ```
  *
- * @category Services
- * @since 2.0.0
+ * @category services
+ * @since 4.0.0
  */
 export const updateContext: {
   /**
@@ -17180,7 +17141,7 @@ export const updateContext: {
    * **Example** (Updating the stream context)
    *
    * ```ts
-   * import { Console, Effect, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Stream } from "effect"
    *
    * class Logger extends Context.Service<Logger, { prefix: string }>()("Logger") {}
    * class Config extends Context.Service<Config, { name: string }>()("Config") {}
@@ -17210,8 +17171,8 @@ export const updateContext: {
    * //=> [ "Hello World" ]
    * ```
    *
-   * @category Services
-   * @since 2.0.0
+   * @category services
+   * @since 4.0.0
    */
   <R, R2>(f: (context: Context.Context<R2>) => Context.Context<R>): <A, E>(
     self: Stream<A, E, R>
@@ -17223,7 +17184,7 @@ export const updateContext: {
    * **Example** (Updating the stream context)
    *
    * ```ts
-   * import { Console, Effect, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Stream } from "effect"
    *
    * class Logger extends Context.Service<Logger, { prefix: string }>()("Logger") {}
    * class Config extends Context.Service<Config, { name: string }>()("Config") {}
@@ -17253,8 +17214,8 @@ export const updateContext: {
    * //=> [ "Hello World" ]
    * ```
    *
-   * @category Services
-   * @since 2.0.0
+   * @category services
+   * @since 4.0.0
    */
   <A, E, R, R2>(
     self: Stream<A, E, R>,
@@ -17271,7 +17232,7 @@ export const updateContext: {
  * **Example** (Updating a stream service)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class Counter extends Context.Service<Counter, { count: number }>()("Counter") {}
  *
@@ -17288,7 +17249,7 @@ export const updateContext: {
  * // Output: Updated count: 1
  * ```
  *
- * @category Services
+ * @category services
  * @since 2.0.0
  */
 export const updateService: {
@@ -17298,7 +17259,7 @@ export const updateService: {
    * **Example** (Updating a stream service)
    *
    * ```ts
-   * import { Console, Effect, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Stream } from "effect"
    *
    * class Counter extends Context.Service<Counter, { count: number }>()("Counter") {}
    *
@@ -17315,7 +17276,7 @@ export const updateService: {
    * // Output: Updated count: 1
    * ```
    *
-   * @category Services
+   * @category services
    * @since 2.0.0
    */
   <I, S>(key: Context.Key<I, S>, f: (service: NoInfer<S>) => S): <A, E, R>(
@@ -17327,7 +17288,7 @@ export const updateService: {
    * **Example** (Updating a stream service)
    *
    * ```ts
-   * import { Console, Effect, Context, Stream } from "effect"
+   * import { Console, Context, Effect, Stream } from "effect"
    *
    * class Counter extends Context.Service<Counter, { count: number }>()("Counter") {}
    *
@@ -17344,7 +17305,7 @@ export const updateService: {
    * // Output: Updated count: 1
    * ```
    *
-   * @category Services
+   * @category services
    * @since 2.0.0
    */
   <A, E, R, I, S>(
@@ -17383,8 +17344,8 @@ export const updateService: {
  * // [1, 2, 3]
  * ```
  *
- * @category Tracing
- * @since 4.0.0
+ * @category tracing
+ * @since 2.0.0
  */
 export const withSpan: {
   /**
@@ -17406,8 +17367,8 @@ export const withSpan: {
    * // [1, 2, 3]
    * ```
    *
-   * @category Tracing
-   * @since 4.0.0
+   * @category tracing
+   * @since 2.0.0
    */
   (name: string, options?: SpanOptions): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E, Exclude<R, ParentSpan>>
   /**
@@ -17429,8 +17390,8 @@ export const withSpan: {
    * // [1, 2, 3]
    * ```
    *
-   * @category Tracing
-   * @since 4.0.0
+   * @category tracing
+   * @since 2.0.0
    */
   <A, E, R>(self: Stream<A, E, R>, name: string, options?: SpanOptions): Stream<A, E, Exclude<R, ParentSpan>>
 } = function() {
@@ -17450,7 +17411,7 @@ export const withSpan: {
  * **Example** (Starting stream do notation)
  *
  * ```ts
- * import { Console, Effect, Stream, pipe } from "effect"
+ * import { Console, Effect, pipe, Stream } from "effect"
  *
  * const program = pipe(
  *   Stream.Do,
@@ -17468,7 +17429,7 @@ export const withSpan: {
  * ```
  *
  * @category Do Notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const Do: Stream<{}> = succeed({})
 
@@ -17512,7 +17473,7 @@ export {
    * ```
    *
    * @category Do Notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   let_ as let
 }
@@ -17537,7 +17498,7 @@ export {
  * ```
  *
  * @category Do Notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const bind: {
   /**
@@ -17560,7 +17521,7 @@ export const bind: {
    * ```
    *
    * @category Do Notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <N extends string, A, B, E2, R2>(
     tag: Exclude<N, keyof A>,
@@ -17590,7 +17551,7 @@ export const bind: {
    * ```
    *
    * @category Do Notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <A, E, R, N extends string, B, E2, R2>(
     self: Stream<A, E, R>,
@@ -17635,7 +17596,7 @@ export const bind: {
  * ```
  *
  * @category Do Notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const bindEffect: {
   /**
@@ -17661,7 +17622,7 @@ export const bindEffect: {
    * ```
    *
    * @category Do Notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <N extends string, A, B, E2, R2>(
     tag: Exclude<N, keyof A>,
@@ -17695,7 +17656,7 @@ export const bindEffect: {
    * ```
    *
    * @category Do Notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <A, E, R, N extends string, B, E2, R2>(
     self: Stream<A, E, R>,
@@ -17736,7 +17697,7 @@ export const bindEffect: {
  * ```
  *
  * @category Do Notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const bindTo: {
   /**
@@ -17756,7 +17717,7 @@ export const bindTo: {
    * ```
    *
    * @category Do Notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <N extends string>(name: N): <A, E, R>(self: Stream<A, E, R>) => Stream<{ [K in N]: A }, E, R>
   /**
@@ -17776,7 +17737,7 @@ export const bindTo: {
    * ```
    *
    * @category Do Notation
-   * @since 4.0.0
+   * @since 2.0.0
    */
   <A, E, R, N extends string>(self: Stream<A, E, R>, name: N): Stream<{ [K in N]: A }, E, R>
 } = dual(2, <A, E, R, N extends string>(
@@ -17798,7 +17759,7 @@ export const bindTo: {
  * // 6
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const run: {
@@ -17816,7 +17777,7 @@ export const run: {
    * // 6
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A2, A, L, E2, R2>(sink: Sink.Sink<A2, A, L, E2, R2>): <E, R>(self: Stream<A, E, R>) => Effect.Effect<A2, E2 | E, R | R2>
@@ -17834,7 +17795,7 @@ export const run: {
    * // 6
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E, R, L, A2, E2, R2>(self: Stream<A, E, R>, sink: Sink.Sink<A2, A, L, E2, R2>): Effect.Effect<A2, E | E2, R | R2>
@@ -17868,7 +17829,7 @@ export const run: {
  * // [1, 2, 3, 4, 5]
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runCollect = <A, E, R>(self: Stream<A, E, R>): Effect.Effect<Array<A>, E, R> =>
@@ -17902,7 +17863,7 @@ export const runCollect = <A, E, R>(self: Stream<A, E, R>): Effect.Effect<Array<
  * // 5
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runCount = <A, E, R>(self: Stream<A, E, R>): Effect.Effect<number, E, R> =>
@@ -17925,7 +17886,7 @@ export const runCount = <A, E, R>(self: Stream<A, E, R>): Effect.Effect<number,
  * // 6
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runSum = <E, R>(self: Stream<number, E, R>): Effect.Effect<number, E, R> =>
@@ -17957,7 +17918,7 @@ export const runSum = <E, R>(self: Stream<number, E, R>): Effect.Effect<number,
  * // 6
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runFold: {
@@ -17982,7 +17943,7 @@ export const runFold: {
    * // 6
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <Z, A>(initial: LazyArg<Z>, f: (acc: Z, a: A) => Z): <E, R>(
@@ -18009,7 +17970,7 @@ export const runFold: {
    * // 6
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E, R, Z>(self: Stream<A, E, R>, initial: LazyArg<Z>, f: (acc: Z, a: A) => Z): Effect.Effect<Z, E, R>
@@ -18046,7 +18007,7 @@ export const runFold: {
  * // 6
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runFoldEffect: {
@@ -18071,7 +18032,7 @@ export const runFoldEffect: {
    * // 6
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <Z, A, EX, RX>(initial: LazyArg<Z>, f: (acc: Z, a: A) => Effect.Effect<Z, EX, RX>): <E, R>(
@@ -18098,7 +18059,7 @@ export const runFoldEffect: {
    * // 6
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E, R, Z, EX, RX>(
@@ -18144,7 +18105,7 @@ export const runFoldEffect: {
  * // 1
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runHead = <A, E, R>(self: Stream<A, E, R>): Effect.Effect<Option.Option<A>, E, R> =>
@@ -18153,7 +18114,7 @@ export const runHead = <A, E, R>(self: Stream<A, E, R>): Effect.Effect<Option.Op
 /**
  * Runs the stream and returns the last element as an `Option`.
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runLast = <A, E, R>(self: Stream<A, E, R>): Effect.Effect<Option.Option<A>, E, R> =>
@@ -18179,7 +18140,7 @@ export const runLast = <A, E, R>(self: Stream<A, E, R>): Effect.Effect<Option.Op
  * // Processing: 3
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runForEach: {
@@ -18203,7 +18164,7 @@ export const runForEach: {
    * // Processing: 3
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, X, E2, R2>(f: (a: A) => Effect.Effect<X, E2, R2>): <E, R>(self: Stream<A, E, R>) => Effect.Effect<void, E2 | E, R2 | R>
@@ -18227,7 +18188,7 @@ export const runForEach: {
    * // Processing: 3
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E, R, X, E2, R2>(self: Stream<A, E, R>, f: (a: A) => Effect.Effect<X, E2, R2>): Effect.Effect<void, E | E2, R | R2>
@@ -18270,7 +18231,7 @@ export const runForEach: {
  * // Processing: 3
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runForEachWhile: {
@@ -18300,7 +18261,7 @@ export const runForEachWhile: {
    * // Processing: 3
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E2, R2>(f: (a: A) => Effect.Effect<boolean, E2, R2>): <E, R>(self: Stream<A, E, R>) => Effect.Effect<void, E2 | E, R2 | R>
@@ -18330,7 +18291,7 @@ export const runForEachWhile: {
    * // Processing: 3
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E, R, E2, R2>(self: Stream<A, E, R>, f: (a: A) => Effect.Effect<boolean, E2, R2>): Effect.Effect<void, E | E2, R | R2>
@@ -18374,8 +18335,8 @@ export const runForEachWhile: {
  * // Processing chunk: 1, 2, 3, 4, 5
  * ```
  *
- * @category Destructors
- * @since 2.0.0
+ * @category destructors
+ * @since 4.0.0
  */
 export const runForEachArray: {
   /**
@@ -18398,8 +18359,8 @@ export const runForEachArray: {
    * // Processing chunk: 1, 2, 3, 4, 5
    * ```
    *
-   * @category Destructors
-   * @since 2.0.0
+   * @category destructors
+   * @since 4.0.0
    */
   <A, X, E2, R2>(f: (a: Arr.NonEmptyReadonlyArray<A>) => Effect.Effect<X, E2, R2>): <E, R>(self: Stream<A, E, R>) => Effect.Effect<void, E2 | E, R2 | R>
   /**
@@ -18422,8 +18383,8 @@ export const runForEachArray: {
    * // Processing chunk: 1, 2, 3, 4, 5
    * ```
    *
-   * @category Destructors
-   * @since 2.0.0
+   * @category destructors
+   * @since 4.0.0
    */
   <A, E, R, X, E2, R2>(
     self: Stream<A, E, R>,
@@ -18456,7 +18417,7 @@ export const runForEachArray: {
  * // Processing: 3
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runDrain = <A, E, R>(self: Stream<A, E, R>): Effect.Effect<void, E, R> => Channel.runDrain(self.channel)
@@ -18486,7 +18447,7 @@ export const runDrain = <A, E, R>(self: Stream<A, E, R>): Effect.Effect<void, E,
  * // [1, 2, 3]
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const toPull = <A, E, R>(
@@ -18511,7 +18472,7 @@ export const toPull = <A, E, R>(
  * // Hello World!
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const mkString = <E, R>(self: Stream<string, E, R>): Effect.Effect<string, E, R> =>
@@ -18539,7 +18500,7 @@ export const mkString = <E, R>(self: Stream<string, E, R>): Effect.Effect<string
  * // [1, 2, 3, 4]
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 4.0.0
  */
 export const mkUint8Array = <E, R>(self: Stream<Uint8Array, E, R>): Effect.Effect<Uint8Array, E, R> =>
@@ -18587,8 +18548,8 @@ export const mkUint8Array = <E, R>(self: Stream<Uint8Array, E, R>): Effect.Effec
  * const readableStream = Stream.toReadableStreamWith(stream, Context.empty())
  * ```
  *
- * @category Destructors
- * @since 2.0.0
+ * @category destructors
+ * @since 4.0.0
  */
 export const toReadableStreamWith = dual<
   /**
@@ -18605,8 +18566,8 @@ export const toReadableStreamWith = dual<
    * const readableStream = Stream.toReadableStreamWith(stream, Context.empty())
    * ```
    *
-   * @category Destructors
-   * @since 2.0.0
+   * @category destructors
+   * @since 4.0.0
    */
   <A, XR>(
     context: Context.Context<XR>,
@@ -18626,8 +18587,8 @@ export const toReadableStreamWith = dual<
    * const readableStream = Stream.toReadableStreamWith(stream, Context.empty())
    * ```
    *
-   * @category Destructors
-   * @since 2.0.0
+   * @category destructors
+   * @since 4.0.0
    */
   <A, E, XR, R extends XR>(
     self: Stream<A, E, R>,
@@ -18695,7 +18656,7 @@ export const toReadableStreamWith = dual<
  * const reader = readableStream.getReader()
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const toReadableStream: {
@@ -18713,7 +18674,7 @@ export const toReadableStream: {
    * const reader = readableStream.getReader()
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A>(options?: { readonly strategy?: QueuingStrategy<A> | undefined }): <E>(
@@ -18733,7 +18694,7 @@ export const toReadableStream: {
    * const reader = readableStream.getReader()
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E>(
@@ -18768,7 +18729,7 @@ export const toReadableStream: {
  * Effect.runPromise(effect)
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const toReadableStreamEffect: {
@@ -18792,7 +18753,7 @@ export const toReadableStreamEffect: {
    * Effect.runPromise(effect)
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A>(options?: { readonly strategy?: QueuingStrategy<A> | undefined }): <E, R>(
@@ -18818,7 +18779,7 @@ export const toReadableStreamEffect: {
    * Effect.runPromise(effect)
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E, R>(
@@ -18852,7 +18813,7 @@ export const toReadableStreamEffect: {
        * Effect.runPromise(effect)
        * ```
        *
-       * @category Destructors
+       * @category destructors
        * @since 2.0.0
        */
       R>(),
@@ -18883,8 +18844,8 @@ export const toReadableStreamEffect: {
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Destructors
- * @since 2.0.0
+ * @category destructors
+ * @since 4.0.0
  */
 export const toAsyncIterableWith: {
   /**
@@ -18910,8 +18871,8 @@ export const toAsyncIterableWith: {
    * // [ 1, 2, 3 ]
    * ```
    *
-   * @category Destructors
-   * @since 2.0.0
+   * @category destructors
+   * @since 4.0.0
    */
   <XR>(context: Context.Context<XR>): <A, E, R extends XR>(self: Stream<A, E, R>) => AsyncIterable<A>
   /**
@@ -18937,8 +18898,8 @@ export const toAsyncIterableWith: {
    * // [ 1, 2, 3 ]
    * ```
    *
-   * @category Destructors
-   * @since 2.0.0
+   * @category destructors
+   * @since 4.0.0
    */
   <A, E, XR, R extends XR>(self: Stream<A, E, R>, context: Context.Context<XR>): AsyncIterable<A>
 } = dual(
@@ -19007,8 +18968,8 @@ export const toAsyncIterableWith: {
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Destructors
- * @since 2.0.0
+ * @category destructors
+ * @since 3.15.0
  */
 export const toAsyncIterableEffect = <A, E, R>(self: Stream<A, E, R>): Effect.Effect<AsyncIterable<A>, never, R> =>
   Effect.map(
@@ -19039,8 +19000,8 @@ export const toAsyncIterableEffect = <A, E, R>(self: Stream<A, E, R>): Effect.Ef
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Destructors
- * @since 2.0.0
+ * @category destructors
+ * @since 3.15.0
  */
 export const toAsyncIterable = <A, E>(self: Stream<A, E>): AsyncIterable<A> =>
   toAsyncIterableWith(self, Context.empty())
@@ -19074,7 +19035,7 @@ export const toAsyncIterable = <A, E>(self: Stream<A, E>): AsyncIterable<A> =>
  * //=> 2
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runIntoPubSub: {
@@ -19107,7 +19068,7 @@ export const runIntoPubSub: {
    * //=> 2
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A>(
@@ -19145,7 +19106,7 @@ export const runIntoPubSub: {
    * //=> 2
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E, R>(
@@ -19185,7 +19146,7 @@ export const runIntoPubSub: {
  * }))
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const toPubSub: {
@@ -19211,7 +19172,7 @@ export const toPubSub: {
    * }))
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   (
@@ -19248,7 +19209,7 @@ export const toPubSub: {
    * }))
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E, R>(
@@ -19304,7 +19265,7 @@ export const toPubSub: {
  * })
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 4.0.0
  */
 export const toPubSubTake: {
@@ -19331,7 +19292,7 @@ export const toPubSubTake: {
    * })
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 4.0.0
    */
   (
@@ -19367,7 +19328,7 @@ export const toPubSubTake: {
    * })
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 4.0.0
    */
   <A, E, R>(
@@ -19417,7 +19378,7 @@ export const toPubSubTake: {
  * })
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const toQueue: {
@@ -19441,7 +19402,7 @@ export const toQueue: {
    * })
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   (
@@ -19472,7 +19433,7 @@ export const toQueue: {
    * })
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E, R>(
@@ -19525,7 +19486,7 @@ export const toQueue: {
  * })
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runIntoQueue: {
@@ -19556,7 +19517,7 @@ export const runIntoQueue: {
    * })
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E>(queue: Queue.Queue<A, E | Cause.Done>): <R>(self: Stream<A, E, R>) => Effect.Effect<void, never, R>
@@ -19587,7 +19548,7 @@ export const runIntoQueue: {
    * })
    * ```
    *
-   * @category Destructors
+   * @category destructors
    * @since 2.0.0
    */
   <A, E, R>(self: Stream<A, E, R>, queue: Queue.Queue<A, E | Cause.Done>): Effect.Effect<void, never, R>