effect 4.0.0-beta.69 → 4.0.0-beta.70

package/src/Layer.ts

@@ -3,17 +3,28 @@
  * application. Services can be injected into effects via
  * `Effect.provideService`. Effects can require services via `Effect.service`.
  *
- * Layer can be thought of as recipes for producing bundles of services, given
- * their dependencies (other services).
+ * A layer is a recipe for producing services from their dependencies:
  *
- * Construction of services can be effectful and utilize resources that must be
- * acquired and safely released when the services are done being utilized.
+ * - `ROut` is what the layer provides.
+ * - `E` is what can fail while building the layer.
+ * - `RIn` is what the layer needs in order to build.
  *
- * By default layers are shared, meaning that if the same layer is used twice
- * the layer will only be allocated a single time.
+ * Normal application code should ask for services. Layer code should create
+ * services. The application entry point should provide the final layer once.
+ * Keeping this boundary clear makes programs easier to reuse with production,
+ * test, or mock implementations.
+ *
+ * Construction of services can be effectful and can acquire resources that must
+ * be safely released when the services are no longer used. For example, a layer
+ * can open a database pool during acquisition and close it in a finalizer.
+ *
+ * Layers are lazy: they do not build anything until they are provided to a
+ * program or explicitly built. By default layers are shared, meaning that if the
+ * same layer value is used twice, it is allocated only once and both users share
+ * the same service instance.
  *
  * Because of their excellent composition properties, layers are the idiomatic
- * way in Effect-TS to create services that depend on other services.
+ * way in Effect to create services that depend on other services.
  *
  * @since 2.0.0
  */
@@ -42,12 +53,13 @@ import type * as Unify from "./Unify.ts"
 const TypeId = "~effect/Layer"
 
 /**
- * A Layer describes how to build one or more services for dependency injection.
+ * A `Layer` describes how to build one or more services for dependency injection.
+ *
+ * **Details**
  *
- * A Layer<ROut, E, RIn> represents:
- * - ROut: The services this layer provides
- * - E: The possible errors during layer construction
- * - RIn: The services this layer requires as dependencies
+ * A `Layer<ROut, E, RIn>` represents `ROut` as the services this layer
+ * provides, `E` as the possible errors during layer construction, and `RIn` as
+ * the services this layer requires as dependencies.
  *
  * @category models
  * @since 2.0.0
@@ -64,6 +76,8 @@ export interface Layer<in ROut, out E = never, out RIn = never> extends Variance
  * Type-level hook that allows `Layer` values to participate in `Unify`
  * inference.
  *
+ * **Details**
+ *
  * This is used by Effect's pipe and unification machinery to preserve the
  * provided services, error, and requirements of a `Layer`.
  *
@@ -102,12 +116,14 @@ export interface Variance<in ROut, out E, out RIn> {
   }
 }
 /**
- * A constraint interface for working with any Layer type.
+ * A type-level constraint for working with any `Layer` type.
  *
- * This interface is used to constrain generic types to Layer types
- * without specifying exact type parameters.
+ * **Details**
+ *
+ * This interface is used to constrain generic types to `Layer` values without
+ * specifying exact type parameters.
  *
- * @category type-level
+ * @category utility types
  * @since 3.9.0
  */
 export interface Any {
@@ -118,25 +134,25 @@ export interface Any {
   }
 }
 /**
- * Extracts the service dependencies (RIn) from a Layer type.
+ * Extracts the service requirements (`RIn`) from a `Layer` type.
  *
- * @category type-level
+ * @category utility types
  * @since 4.0.0
  */
 export type Services<T extends Any> = T extends infer L
   ? L extends Layer<infer _ROut, infer _E, infer _RIn> ? _RIn : never
   : never
 /**
- * Extracts the error type (E) from a Layer type.
+ * Extracts the error type (`E`) from a `Layer` type.
  *
- * @category type-level
+ * @category utility types
  * @since 2.0.0
  */
 export type Error<T extends Any> = T extends Layer<infer _ROut, infer _E, infer _RIn> ? _E : never
 /**
- * Extracts the service output type (ROut) from a Layer type.
+ * Extracts the service output type (`ROut`) from a `Layer` type.
  *
- * @category type-level
+ * @category utility types
  * @since 2.0.0
  */
 export type Success<T extends Any> = T extends Layer<infer _ROut, infer _E, infer _RIn> ? _ROut : never
@@ -144,9 +160,12 @@ export type Success<T extends Any> = T extends Layer<infer _ROut, infer _E, infe
 const MemoMapTypeId = "~effect/Layer/MemoMap"
 
 /**
- * A MemoMap is used to memoize layer construction and ensure sharing of layers.
+ * A `MemoMap` is used to memoize layer construction and ensure sharing of
+ * layers.
  *
- * The MemoMap prevents duplicate construction of the same layer instance,
+ * **Details**
+ *
+ * The `MemoMap` prevents duplicate construction of the same layer instance,
  * enabling efficient resource sharing across layer dependencies.
  *
  * **Example** (Sharing layer construction with a memo map)
@@ -163,7 +182,7 @@ const MemoMapTypeId = "~effect/Layer/MemoMap"
  *   const memoMap = yield* Layer.makeMemoMap
  *   const scope = yield* Effect.scope
  *
- *   const dbLayer = Layer.succeed(Database)({
+ *   const dbLayer = Layer.succeed(Database, {
  *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  *   })
  *   const context = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
@@ -217,7 +236,7 @@ const memoMapReuse = <RIn, E, ROut>(
  *   readonly query: (sql: string) => Effect.Effect<string>
  * }>()("Database") {}
  *
- * const dbLayer = Layer.succeed(Database)({
+ * const dbLayer = Layer.succeed(Database, {
  *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  * })
  * const notALayer = { someProperty: "value" }
@@ -254,7 +273,10 @@ const fromBuildUnsafe = <ROut, E, RIn>(
 }
 
 /**
- * Constructs a Layer from a function that uses a `MemoMap` and `Scope` to build the layer.
+ * Constructs a `Layer` from a function that uses a `MemoMap` and `Scope` to
+ * build the layer.
+ *
+ * **Details**
  *
  * The function receives a `MemoMap` for memoization and a `Scope` for resource management.
  * A child scope is created, and if the build fails, the child scope is closed.
@@ -295,8 +317,10 @@ export const fromBuild = <ROut, E, RIn>(
   })
 
 /**
- * Constructs a Layer from a function that uses a `MemoMap` and `Scope` to build the layer,
- * with automatic memoization.
+ * Constructs a `Layer` from a function that uses a `MemoMap` and `Scope` to
+ * build the layer, with automatic memoization.
+ *
+ * **Details**
  *
  * This is similar to `fromBuild` but provides automatic memoization of the layer construction.
  * The layer will be memoized based on the provided `MemoMap`.
@@ -417,7 +441,7 @@ class MemoMapImpl implements MemoMap {
  *   const memoMap = Layer.makeMemoMapUnsafe()
  *   const scope = yield* Effect.scope
  *
- *   const dbLayer = Layer.succeed(Database)({
+ *   const dbLayer = Layer.succeed(Database, {
  *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  *   })
  *   const context = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
@@ -457,7 +481,7 @@ export const forkMemoMapUnsafe = (parent: MemoMap): MemoMap => new MemoMapImpl(p
  *   const memoMap = yield* Layer.makeMemoMap
  *   const scope = yield* Effect.scope
  *
- *   const dbLayer = Layer.succeed(Database)({
+ *   const dbLayer = Layer.succeed(Database, {
  *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  *   })
  *   const context = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
@@ -483,6 +507,8 @@ export const forkMemoMap = (parent: MemoMap): Effect<MemoMap> => internalEffect.
 /**
  * A service reference for the current `MemoMap` used in layer construction.
  *
+ * **Details**
+ *
  * This service provides access to the current memoization map during layer building,
  * allowing layers to share memoized results.
  *
@@ -519,13 +545,13 @@ export class CurrentMemoMap extends Context.Service<CurrentMemoMap, MemoMap>()("
  *   const scope = yield* Effect.scope
  *
  *   // Build database layer with memoization
- *   const dbLayer = Layer.succeed(Database)({
+ *   const dbLayer = Layer.succeed(Database, {
  *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  *   })
  *   const dbContext = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
  *
  *   // Build logger layer with same memoization (reuses memo if same layer)
- *   const loggerLayer = Layer.succeed(Logger)({
+ *   const loggerLayer = Layer.succeed(Logger, {
  *     log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
  *   })
  *   const loggerContext = yield* Layer.buildWithMemoMap(
@@ -568,13 +594,13 @@ export const buildWithMemoMap: {
    *   const scope = yield* Effect.scope
    *
    *   // Build database layer with memoization
-   *   const dbLayer = Layer.succeed(Database)({
+   *   const dbLayer = Layer.succeed(Database, {
    *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
    *   })
    *   const dbContext = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
    *
    *   // Build logger layer with same memoization (reuses memo if same layer)
-   *   const loggerLayer = Layer.succeed(Logger)({
+   *   const loggerLayer = Layer.succeed(Logger, {
    *     log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
    *   })
    *   const loggerContext = yield* Layer.buildWithMemoMap(
@@ -617,13 +643,13 @@ export const buildWithMemoMap: {
    *   const scope = yield* Effect.scope
    *
    *   // Build database layer with memoization
-   *   const dbLayer = Layer.succeed(Database)({
+   *   const dbLayer = Layer.succeed(Database, {
    *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
    *   })
    *   const dbContext = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
    *
    *   // Build logger layer with same memoization (reuses memo if same layer)
-   *   const loggerLayer = Layer.succeed(Logger)({
+   *   const loggerLayer = Layer.succeed(Logger, {
    *     log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
    *   })
    *   const loggerContext = yield* Layer.buildWithMemoMap(
@@ -668,7 +694,7 @@ export const buildWithMemoMap: {
  *
  * // Build a layer to get its services
  * const program = Effect.gen(function*() {
- *   const dbLayer = Layer.succeed(Database)({
+ *   const dbLayer = Layer.succeed(Database, {
  *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  *   })
  *
@@ -716,7 +742,7 @@ export const build = <RIn, E, ROut>(
  * const program = Effect.gen(function*() {
  *   const scope = yield* Effect.scope
  *
- *   const dbLayer = Layer.effect(Database)(Effect.gen(function*() {
+ *   const dbLayer = Layer.effect(Database, Effect.gen(function*() {
  *     console.log("Initializing database...")
  *     yield* Scope.addFinalizer(
  *       scope,
@@ -758,7 +784,7 @@ export const buildWithScope: {
    * const program = Effect.gen(function*() {
    *   const scope = yield* Effect.scope
    *
-   *   const dbLayer = Layer.effect(Database)(Effect.gen(function*() {
+   *   const dbLayer = Layer.effect(Database, Effect.gen(function*() {
    *     console.log("Initializing database...")
    *     yield* Scope.addFinalizer(
    *       scope,
@@ -800,7 +826,7 @@ export const buildWithScope: {
    * const program = Effect.gen(function*() {
    *   const scope = yield* Effect.scope
    *
-   *   const dbLayer = Layer.effect(Database)(Effect.gen(function*() {
+   *   const dbLayer = Layer.effect(Database, Effect.gen(function*() {
    *     console.log("Initializing database...")
    *     yield* Scope.addFinalizer(
    *       scope,
@@ -835,9 +861,16 @@ export const buildWithScope: {
   ))
 
 /**
- * Constructs a layer from the specified value.
+ * Constructs a layer that provides a single service from an already available
+ * value.
+ *
+ * **When to use**
  *
- * **Example** (Providing services from values)
+ * Use `succeed` when the service implementation is already constructed and does
+ * not need effectful acquisition. Use `sync` when the service should be created
+ * lazily during layer construction.
+ *
+ * **Example** (Creating a layer from a service implementation)
  *
  * ```ts
  * import { Context, Effect, Layer } from "effect"
@@ -846,42 +879,28 @@ export const buildWithScope: {
  *   readonly query: (sql: string) => Effect.Effect<string>
  * }>()("Database") {}
  *
- * class Logger extends Context.Service<Logger, {
- *   readonly log: (msg: string) => Effect.Effect<void>
- * }>()("Logger") {}
- *
- * // Create layers from concrete service implementations
- * const databaseLayer = Layer.succeed(Database)({
+ * const DatabaseLive = Layer.succeed(Database, {
  *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Query result: ${sql}`))
  * })
- *
- * const loggerLayer = Layer.succeed(Logger)({
- *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
- * })
- *
- * // Use the layers in a program
- * const program = Effect.gen(function*() {
- *   const database = yield* Database
- *   const logger = yield* Logger
- *
- *   yield* logger.log("Starting database query")
- *   const result = yield* database.query("SELECT * FROM users")
- *   yield* logger.log(`Query completed: ${result}`)
- *
- *   return result
- * }).pipe(
- *   Effect.provide(Layer.mergeAll(databaseLayer, loggerLayer))
- * )
  * ```
  *
+ * @see {@link sync} for constructing layers from lazy values
+ *
  * @category constructors
  * @since 2.0.0
  */
 export const succeed: {
   /**
-   * Constructs a layer from the specified value.
+   * Constructs a layer that provides a single service from an already available
+   * value.
+   *
+   * **When to use**
    *
-   * **Example** (Providing services from values)
+   * Use `succeed` when the service implementation is already constructed and does
+   * not need effectful acquisition. Use `sync` when the service should be created
+   * lazily during layer construction.
+   *
+   * **Example** (Creating a layer from a service implementation)
    *
    * ```ts
    * import { Context, Effect, Layer } from "effect"
@@ -890,42 +909,28 @@ export const succeed: {
    *   readonly query: (sql: string) => Effect.Effect<string>
    * }>()("Database") {}
    *
-   * class Logger extends Context.Service<Logger, {
-   *   readonly log: (msg: string) => Effect.Effect<void>
-   * }>()("Logger") {}
-   *
-   * // Create layers from concrete service implementations
-   * const databaseLayer = Layer.succeed(Database)({
+   * const DatabaseLive = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Query result: ${sql}`))
    * })
-   *
-   * const loggerLayer = Layer.succeed(Logger)({
-   *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
-   * })
-   *
-   * // Use the layers in a program
-   * const program = Effect.gen(function*() {
-   *   const database = yield* Database
-   *   const logger = yield* Logger
-   *
-   *   yield* logger.log("Starting database query")
-   *   const result = yield* database.query("SELECT * FROM users")
-   *   yield* logger.log(`Query completed: ${result}`)
-   *
-   *   return result
-   * }).pipe(
-   *   Effect.provide(Layer.mergeAll(databaseLayer, loggerLayer))
-   * )
    * ```
    *
+   * @see {@link sync} for constructing layers from lazy values
+   *
    * @category constructors
    * @since 2.0.0
    */
   <I, S>(service: Context.Key<I, S>): (resource: S) => Layer<I>
   /**
-   * Constructs a layer from the specified value.
+   * Constructs a layer that provides a single service from an already available
+   * value.
+   *
+   * **When to use**
    *
-   * **Example** (Providing services from values)
+   * Use `succeed` when the service implementation is already constructed and does
+   * not need effectful acquisition. Use `sync` when the service should be created
+   * lazily during layer construction.
+   *
+   * **Example** (Creating a layer from a service implementation)
    *
    * ```ts
    * import { Context, Effect, Layer } from "effect"
@@ -934,34 +939,13 @@ export const succeed: {
    *   readonly query: (sql: string) => Effect.Effect<string>
    * }>()("Database") {}
    *
-   * class Logger extends Context.Service<Logger, {
-   *   readonly log: (msg: string) => Effect.Effect<void>
-   * }>()("Logger") {}
-   *
-   * // Create layers from concrete service implementations
-   * const databaseLayer = Layer.succeed(Database)({
+   * const DatabaseLive = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Query result: ${sql}`))
    * })
-   *
-   * const loggerLayer = Layer.succeed(Logger)({
-   *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
-   * })
-   *
-   * // Use the layers in a program
-   * const program = Effect.gen(function*() {
-   *   const database = yield* Database
-   *   const logger = yield* Logger
-   *
-   *   yield* logger.log("Starting database query")
-   *   const result = yield* database.query("SELECT * FROM users")
-   *   yield* logger.log(`Query completed: ${result}`)
-   *
-   *   return result
-   * }).pipe(
-   *   Effect.provide(Layer.mergeAll(databaseLayer, loggerLayer))
-   * )
    * ```
    *
+   * @see {@link sync} for constructing layers from lazy values
+   *
    * @category constructors
    * @since 2.0.0
    */
@@ -974,11 +958,19 @@ export const succeed: {
 } as any
 
 /**
- * Constructs a layer from the specified value, which must return one or more
- * services.
+ * Constructs a layer that provides all services in an already available
+ * `Context`.
  *
- * This is a more general version of `succeed` that allows you to provide multiple
- * services at once through a `Context`.
+ * **When to use**
+ *
+ * Use `succeedContext` when you already have a `Context` or need to provide
+ * multiple services at once. Use `succeed` when you only need to provide one
+ * service value.
+ *
+ * **Details**
+ *
+ * This is a more general version of `succeed` that allows you to provide
+ * multiple services at once through a `Context`.
  *
  * **Example** (Providing multiple services from a context)
  *
@@ -1004,6 +996,8 @@ export const succeed: {
  * const layer = Layer.succeedContext(context)
  * ```
  *
+ * @see {@link succeed} for providing a single service from a value
+ *
  * @category constructors
  * @since 2.0.0
  */
@@ -1011,26 +1005,44 @@ export const succeedContext = <A>(context: Context.Context<A>): Layer<A> =>
   fromBuildUnsafe(constant(internalEffect.succeed(context)))
 
 /**
- * A Layer that constructs an empty Context.
+ * An empty layer that provides no services, cannot fail, has no requirements,
+ * and performs no construction or finalization work.
  *
- * This layer provides no services and can be used as a neutral element
- * in layer composition or as a starting point for building layers.
+ * **When to use**
  *
- * **Example** (Creating an empty layer)
+ * Use `Layer.empty` as the no-op branch when conditionally composing layers.
+ * If you need to run an effect during layer construction while still providing
+ * no services, use `effectDiscard`.
+ *
+ * **Example** (Disabling optional lifecycle work)
  *
  * ```ts
- * import { Layer } from "effect"
+ * import { Console, Layer } from "effect"
+ *
+ * declare const flag: boolean
  *
- * const emptyLayer = Layer.empty
+ * const StartupLogLive = flag
+ *   ? Layer.effectDiscard(Console.log("application starting"))
+ *   : Layer.empty
  * ```
  *
+ * @see {@link effectDiscard} for running an effect while providing no services
+ *
  * @category constructors
  * @since 2.0.0
  */
 export const empty: Layer<never> = succeedContext(Context.empty())
 
 /**
- * Lazily constructs a layer from the specified value.
+ * Lazily constructs a layer that provides a single service.
+ *
+ * **When to use**
+ *
+ * Use `sync` when the service can be created synchronously but should be
+ * deferred until the layer is built. Use `succeed` when the service value is
+ * already available.
+ *
+ * **Details**
  *
  * This is a lazy version of `succeed` where the service value is computed
  * synchronously only when the layer is built.
@@ -1044,17 +1056,27 @@ export const empty: Layer<never> = succeedContext(Context.empty())
  *   readonly query: (sql: string) => Effect.Effect<string>
  * }>()("Database") {}
  *
- * const layer = Layer.sync(Database)(() => ({
+ * const layer = Layer.sync(Database, () => ({
  *   query: (sql: string) => Effect.succeed(`Query: ${sql}`)
  * }))
  * ```
  *
+ * @see {@link succeed} for constructing layers from static values
+ *
  * @category constructors
  * @since 2.0.0
  */
 export const sync: {
   /**
-   * Lazily constructs a layer from the specified value.
+   * Lazily constructs a layer that provides a single service.
+   *
+   * **When to use**
+   *
+   * Use `sync` when the service can be created synchronously but should be
+   * deferred until the layer is built. Use `succeed` when the service value is
+   * already available.
+   *
+   * **Details**
    *
    * This is a lazy version of `succeed` where the service value is computed
    * synchronously only when the layer is built.
@@ -1068,17 +1090,27 @@ export const sync: {
    *   readonly query: (sql: string) => Effect.Effect<string>
    * }>()("Database") {}
    *
-   * const layer = Layer.sync(Database)(() => ({
+   * const layer = Layer.sync(Database, () => ({
    *   query: (sql: string) => Effect.succeed(`Query: ${sql}`)
    * }))
    * ```
    *
+   * @see {@link succeed} for constructing layers from static values
+   *
    * @category constructors
    * @since 2.0.0
    */
   <I, S>(service: Context.Key<I, S>): (evaluate: LazyArg<S>) => Layer<I>
   /**
-   * Lazily constructs a layer from the specified value.
+   * Lazily constructs a layer that provides a single service.
+   *
+   * **When to use**
+   *
+   * Use `sync` when the service can be created synchronously but should be
+   * deferred until the layer is built. Use `succeed` when the service value is
+   * already available.
+   *
+   * **Details**
    *
    * This is a lazy version of `succeed` where the service value is computed
    * synchronously only when the layer is built.
@@ -1092,11 +1124,13 @@ export const sync: {
    *   readonly query: (sql: string) => Effect.Effect<string>
    * }>()("Database") {}
    *
-   * const layer = Layer.sync(Database)(() => ({
+   * const layer = Layer.sync(Database, () => ({
    *   query: (sql: string) => Effect.succeed(`Query: ${sql}`)
    * }))
    * ```
    *
+   * @see {@link succeed} for constructing layers from static values
+   *
    * @category constructors
    * @since 2.0.0
    */
@@ -1109,10 +1143,17 @@ export const sync: {
 } as any
 
 /**
- * Lazily constructs a layer from the specified value, which must return one or more
- * services.
+ * Lazily constructs a layer that provides all services in a `Context`.
+ *
+ * **When to use**
  *
- * This is a lazy version of `succeedContext` where the Context is computed
+ * Use `syncContext` when multiple services can be created synchronously and
+ * should be deferred until the layer is built. Use `sync` when you only need to
+ * provide one service.
+ *
+ * **Details**
+ *
+ * This is a lazy version of `succeedContext` where the `Context` is computed
  * synchronously only when the layer is built.
  *
  * **Example** (Lazily providing a context)
@@ -1131,6 +1172,9 @@ export const sync: {
  * )
  * ```
  *
+ * @see {@link sync} for lazily providing a single service
+ * @see {@link succeedContext} for providing an already available context
+ *
  * @category constructors
  * @since 2.0.0
  */
@@ -1138,10 +1182,19 @@ export const syncContext = <A>(evaluate: LazyArg<Context.Context<A>>): Layer<A>
   fromBuildMemo(constant(internalEffect.sync(evaluate)))
 
 /**
- * Constructs a layer from the specified scoped effect.
+ * Constructs a layer from an effect that produces a single service.
+ *
+ * **When to use**
+ *
+ * Use `effect` when constructing the service requires effects, dependencies, or
+ * scoped resource acquisition. Use `effectContext` when the effect produces
+ * multiple services in a `Context`, and `effectDiscard` when construction work
+ * should provide no services.
  *
- * This allows you to create a Layer from an Effect that produces a service.
- * The Effect is executed in the scope of the layer, allowing for proper
+ * **Details**
+ *
+ * This allows you to create a `Layer` from an `Effect` that produces a service.
+ * The `Effect` is executed in the scope of the layer, allowing for proper
  * resource management.
  *
  * **Example** (Creating a layer from an effect)
@@ -1153,22 +1206,34 @@ export const syncContext = <A>(evaluate: LazyArg<Context.Context<A>>): Layer<A>
  *   readonly query: (sql: string) => Effect.Effect<string>
  * }>()("Database") {}
  *
- * const layer = Layer.effect(Database)(
+ * const layer = Layer.effect(Database,
  *   Effect.sync(() => ({
  *     query: (sql: string) => Effect.succeed(`Query: ${sql}`)
  *   }))
  * )
  * ```
  *
+ * @see {@link effectContext} for effectfully providing multiple services
+ * @see {@link effectDiscard} for running construction work without providing services
+ *
  * @category constructors
  * @since 2.0.0
  */
 export const effect: {
   /**
-   * Constructs a layer from the specified scoped effect.
+   * Constructs a layer from an effect that produces a single service.
+   *
+   * **When to use**
+   *
+   * Use `effect` when constructing the service requires effects, dependencies, or
+   * scoped resource acquisition. Use `effectContext` when the effect produces
+   * multiple services in a `Context`, and `effectDiscard` when construction work
+   * should provide no services.
    *
-   * This allows you to create a Layer from an Effect that produces a service.
-   * The Effect is executed in the scope of the layer, allowing for proper
+   * **Details**
+   *
+   * This allows you to create a `Layer` from an `Effect` that produces a service.
+   * The `Effect` is executed in the scope of the layer, allowing for proper
    * resource management.
    *
    * **Example** (Creating a layer from an effect)
@@ -1180,13 +1245,16 @@ export const effect: {
    *   readonly query: (sql: string) => Effect.Effect<string>
    * }>()("Database") {}
    *
-   * const layer = Layer.effect(Database)(
+   * const layer = Layer.effect(Database,
    *   Effect.sync(() => ({
    *     query: (sql: string) => Effect.succeed(`Query: ${sql}`)
    *   }))
    * )
    * ```
    *
+   * @see {@link effectContext} for effectfully providing multiple services
+   * @see {@link effectDiscard} for running construction work without providing services
+   *
    * @category constructors
    * @since 2.0.0
    */
@@ -1194,10 +1262,19 @@ export const effect: {
     effect: Effect<S, E, R>
   ) => Layer<I, E, Exclude<R, Scope.Scope>>
   /**
-   * Constructs a layer from the specified scoped effect.
+   * Constructs a layer from an effect that produces a single service.
+   *
+   * **When to use**
+   *
+   * Use `effect` when constructing the service requires effects, dependencies, or
+   * scoped resource acquisition. Use `effectContext` when the effect produces
+   * multiple services in a `Context`, and `effectDiscard` when construction work
+   * should provide no services.
    *
-   * This allows you to create a Layer from an Effect that produces a service.
-   * The Effect is executed in the scope of the layer, allowing for proper
+   * **Details**
+   *
+   * This allows you to create a `Layer` from an `Effect` that produces a service.
+   * The `Effect` is executed in the scope of the layer, allowing for proper
    * resource management.
    *
    * **Example** (Creating a layer from an effect)
@@ -1209,13 +1286,16 @@ export const effect: {
    *   readonly query: (sql: string) => Effect.Effect<string>
    * }>()("Database") {}
    *
-   * const layer = Layer.effect(Database)(
+   * const layer = Layer.effect(Database,
    *   Effect.sync(() => ({
    *     query: (sql: string) => Effect.succeed(`Query: ${sql}`)
    *   }))
    * )
    * ```
    *
+   * @see {@link effectContext} for effectfully providing multiple services
+   * @see {@link effectDiscard} for running construction work without providing services
+   *
    * @category constructors
    * @since 2.0.0
    */
@@ -1234,11 +1314,18 @@ const effectImpl = <I, S, E, R>(
   effectContext(internalEffect.map(effect, (value) => Context.make(service, value)))
 
 /**
- * Constructs a layer from the specified scoped effect, which must return one
- * or more services.
+ * Constructs a layer from an effect that produces all services in a `Context`.
+ *
+ * **When to use**
+ *
+ * Use `effectContext` when effectful construction needs to provide multiple
+ * services at once. Use `effect` when the effect produces one service value.
  *
- * This allows you to create a Layer from an effectful computation that returns
- * multiple services. The Effect is executed in the scope of the layer.
+ * **Details**
+ *
+ * This allows you to create a `Layer` from an effectful computation that
+ * returns multiple services. The `Effect` is executed in the scope of the
+ * layer.
  *
  * **Example** (Creating a layer from an effectful context)
  *
@@ -1257,6 +1344,8 @@ const effectImpl = <I, S, E, R>(
  * )
  * ```
  *
+ * @see {@link effect} for effectfully providing a single service
+ *
  * @category constructors
  * @since 2.0.0
  */
@@ -1265,7 +1354,10 @@ export const effectContext = <A, E, R>(
 ): Layer<A, E, Exclude<R, Scope.Scope>> => fromBuildMemo((_, scope) => Scope.provide(effect, scope))
 
 /**
- * Constructs a layer from the specified scoped effect.
+ * Constructs a layer from an effect, discarding its value and providing no
+ * services.
+ *
+ * **When to use**
  *
  * This is useful when you want to run an Effect for its side effects during
  * layer construction, but don't need to provide any services.
@@ -1282,6 +1374,8 @@ export const effectContext = <A, E, R>(
  * )
  * ```
  *
+ * @see {@link empty} for a no-op layer that performs no construction work
+ *
  * @category constructors
  * @since 2.0.0
  */
@@ -1291,6 +1385,8 @@ export const effectDiscard = <X, E, R>(effect: Effect<X, E, R>): Layer<never, E,
 /**
  * Lazily constructs a layer using the specified factory.
  *
+ * **Details**
+ *
  * The factory is evaluated only when the suspended layer is first built, and
  * the result is memoized with normal layer sharing semantics.
  *
@@ -1305,8 +1401,8 @@ export const effectDiscard = <X, E, R>(effect: Effect<X, E, R>): Layer<never, E,
  *
  * const layer = Layer.suspend(() =>
  *   useProd
- *     ? Layer.succeed(Config)("https://api.example.com")
- *     : Layer.succeed(Config)("http://localhost:3000")
+ *     ? Layer.succeed(Config, "https://api.example.com")
+ *     : Layer.succeed(Config, "http://localhost:3000")
  * )
  * ```
  *
@@ -1317,11 +1413,17 @@ export const suspend = <A, E, R>(evaluate: LazyArg<Layer<A, E, R>>): Layer<A, E,
   fromBuildMemo((memoMap, scope) => internalEffect.suspend(() => evaluate().build(memoMap, scope)))
 
 /**
- * Unwraps a Layer from an Effect, flattening the nested structure.
+ * Unwraps a `Layer` from an `Effect`, flattening the nested structure.
+ *
+ * **When to use**
  *
- * This is useful when you have an Effect that produces a Layer, and you want to
- * use that Layer directly. The resulting Layer will have the combined error and
- * dependency types from both the outer Effect and the inner Layer.
+ * Use this when you have an `Effect` that produces a `Layer` and you want to
+ * use that layer directly.
+ *
+ * **Details**
+ *
+ * The resulting Layer will have the combined error and dependency types from
+ * both the outer Effect and the inner Layer.
  *
  * **Example** (Unwrapping an effectful layer)
  *
@@ -1333,7 +1435,7 @@ export const suspend = <A, E, R>(evaluate: LazyArg<Layer<A, E, R>>): Layer<A, E,
  * }>()("Database") {}
  *
  * const layerEffect = Effect.succeed(
- *   Layer.succeed(Database)({ query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result")) })
+ *   Layer.succeed(Database, { query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result")) })
  * )
  *
  * const unwrappedLayer = Layer.unwrap(layerEffect)
@@ -1367,10 +1469,20 @@ const mergeAllEffect = <Layers extends [Layer<never, any, any>, ...Array<Layer<n
 }
 
 /**
- * Combines all the provided layers concurrently, creating a new layer with merged input, error, and output types.
+ * Combines all the provided layers concurrently, creating a new layer with
+ * merged input, error, and output types.
+ *
+ * **When to use**
+ *
+ * Use this when you need to combine multiple independent layers.
+ *
+ * **Details**
  *
  * All layers are built concurrently, and their outputs are merged into a single layer.
- * This is useful when you need to combine multiple independent layers.
+ *
+ * If multiple merged layers depend on the same layer value, that dependency is
+ * shared by default. Reuse a named layer value when you want services to share
+ * the same resource, such as one database pool.
  *
  * **Example** (Merging independent layers)
  *
@@ -1385,16 +1497,18 @@ const mergeAllEffect = <Layers extends [Layer<never, any, any>, ...Array<Layer<n
  *   readonly log: (msg: string) => Effect.Effect<void>
  * }>()("Logger") {}
  *
- * const dbLayer = Layer.succeed(Database)({
+ * const dbLayer = Layer.succeed(Database, {
  *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  * })
- * const loggerLayer = Layer.succeed(Logger)({
+ * const loggerLayer = Layer.succeed(Logger, {
  *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
  * })
  *
  * const mergedLayer = Layer.mergeAll(dbLayer, loggerLayer)
  * ```
  *
+ * @see {@link merge} for merging one layer with another layer or array
+ *
  * @category zipping
  * @since 2.0.0
  */
@@ -1407,10 +1521,19 @@ export const mergeAll = <Layers extends [Layer<never, any, any>, ...Array<Layer<
 > => fromBuild((memoMap, scope) => mergeAllEffect(layers, memoMap, scope))
 
 /**
- * Merges this layer with the specified layer concurrently, producing a new layer with combined input and output types.
+ * Merges this layer with another layer concurrently, producing a new layer with
+ * combined input, error, and output types.
+ *
+ * **When to use**
+ *
+ * Use `merge` when composing from an existing layer in a pipeline. Use
+ * `mergeAll` when you already have all layers as separate arguments.
  *
- * This is a binary version of `mergeAll` that merges exactly two layers or one layer with an array of layers.
- * The layers are built concurrently and their outputs are combined.
+ * **Details**
+ *
+ * This is a binary version of `mergeAll` that merges exactly two layers or one
+ * layer with an array of layers. The layers are built concurrently and their
+ * outputs are combined.
  *
  * **Example** (Merging two layers)
  *
@@ -1425,25 +1548,36 @@ export const mergeAll = <Layers extends [Layer<never, any, any>, ...Array<Layer<
  *   readonly log: (msg: string) => Effect.Effect<void>
  * }>()("Logger") {}
  *
- * const dbLayer = Layer.succeed(Database)({
+ * const dbLayer = Layer.succeed(Database, {
  *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  * })
- * const loggerLayer = Layer.succeed(Logger)({
+ * const loggerLayer = Layer.succeed(Logger, {
  *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
  * })
  *
  * const mergedLayer = Layer.merge(dbLayer, loggerLayer)
  * ```
  *
+ * @see {@link mergeAll} for merging several layers at once
+ *
  * @category zipping
  * @since 2.0.0
  */
 export const merge: {
   /**
-   * Merges this layer with the specified layer concurrently, producing a new layer with combined input and output types.
+   * Merges this layer with another layer concurrently, producing a new layer with
+   * combined input, error, and output types.
+   *
+   * **When to use**
    *
-   * This is a binary version of `mergeAll` that merges exactly two layers or one layer with an array of layers.
-   * The layers are built concurrently and their outputs are combined.
+   * Use `merge` when composing from an existing layer in a pipeline. Use
+   * `mergeAll` when you already have all layers as separate arguments.
+   *
+   * **Details**
+   *
+   * This is a binary version of `mergeAll` that merges exactly two layers or one
+   * layer with an array of layers. The layers are built concurrently and their
+   * outputs are combined.
    *
    * **Example** (Merging two layers)
    *
@@ -1458,25 +1592,36 @@ export const merge: {
    *   readonly log: (msg: string) => Effect.Effect<void>
    * }>()("Logger") {}
    *
-   * const dbLayer = Layer.succeed(Database)({
+   * const dbLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
    * })
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
    * })
    *
    * const mergedLayer = Layer.merge(dbLayer, loggerLayer)
    * ```
    *
+   * @see {@link mergeAll} for merging several layers at once
+   *
    * @category zipping
    * @since 2.0.0
    */
   <RIn, E, ROut>(that: Layer<ROut, E, RIn>): <RIn2, E2, ROut2>(self: Layer<ROut2, E2, RIn2>) => Layer<ROut | ROut2, E | E2, RIn | RIn2>
   /**
-   * Merges this layer with the specified layer concurrently, producing a new layer with combined input and output types.
+   * Merges this layer with another layer concurrently, producing a new layer with
+   * combined input, error, and output types.
+   *
+   * **When to use**
    *
-   * This is a binary version of `mergeAll` that merges exactly two layers or one layer with an array of layers.
-   * The layers are built concurrently and their outputs are combined.
+   * Use `merge` when composing from an existing layer in a pipeline. Use
+   * `mergeAll` when you already have all layers as separate arguments.
+   *
+   * **Details**
+   *
+   * This is a binary version of `mergeAll` that merges exactly two layers or one
+   * layer with an array of layers. The layers are built concurrently and their
+   * outputs are combined.
    *
    * **Example** (Merging two layers)
    *
@@ -1491,16 +1636,18 @@ export const merge: {
    *   readonly log: (msg: string) => Effect.Effect<void>
    * }>()("Logger") {}
    *
-   * const dbLayer = Layer.succeed(Database)({
+   * const dbLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
    * })
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
    * })
    *
    * const mergedLayer = Layer.merge(dbLayer, loggerLayer)
    * ```
    *
+   * @see {@link mergeAll} for merging several layers at once
+   *
    * @category zipping
    * @since 2.0.0
    */
@@ -1513,10 +1660,19 @@ export const merge: {
     | R
   >
   /**
-   * Merges this layer with the specified layer concurrently, producing a new layer with combined input and output types.
+   * Merges this layer with another layer concurrently, producing a new layer with
+   * combined input, error, and output types.
    *
-   * This is a binary version of `mergeAll` that merges exactly two layers or one layer with an array of layers.
-   * The layers are built concurrently and their outputs are combined.
+   * **When to use**
+   *
+   * Use `merge` when composing from an existing layer in a pipeline. Use
+   * `mergeAll` when you already have all layers as separate arguments.
+   *
+   * **Details**
+   *
+   * This is a binary version of `mergeAll` that merges exactly two layers or one
+   * layer with an array of layers. The layers are built concurrently and their
+   * outputs are combined.
    *
    * **Example** (Merging two layers)
    *
@@ -1531,25 +1687,36 @@ export const merge: {
    *   readonly log: (msg: string) => Effect.Effect<void>
    * }>()("Logger") {}
    *
-   * const dbLayer = Layer.succeed(Database)({
+   * const dbLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
    * })
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
    * })
    *
    * const mergedLayer = Layer.merge(dbLayer, loggerLayer)
    * ```
    *
+   * @see {@link mergeAll} for merging several layers at once
+   *
    * @category zipping
    * @since 2.0.0
    */
   <RIn2, E2, ROut2, RIn, E, ROut>(self: Layer<ROut2, E2, RIn2>, that: Layer<ROut, E, RIn>): Layer<ROut | ROut2, E | E2, RIn | RIn2>
   /**
-   * Merges this layer with the specified layer concurrently, producing a new layer with combined input and output types.
+   * Merges this layer with another layer concurrently, producing a new layer with
+   * combined input, error, and output types.
+   *
+   * **When to use**
+   *
+   * Use `merge` when composing from an existing layer in a pipeline. Use
+   * `mergeAll` when you already have all layers as separate arguments.
    *
-   * This is a binary version of `mergeAll` that merges exactly two layers or one layer with an array of layers.
-   * The layers are built concurrently and their outputs are combined.
+   * **Details**
+   *
+   * This is a binary version of `mergeAll` that merges exactly two layers or one
+   * layer with an array of layers. The layers are built concurrently and their
+   * outputs are combined.
    *
    * **Example** (Merging two layers)
    *
@@ -1564,16 +1731,18 @@ export const merge: {
    *   readonly log: (msg: string) => Effect.Effect<void>
    * }>()("Logger") {}
    *
-   * const dbLayer = Layer.succeed(Database)({
+   * const dbLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
    * })
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
    * })
    *
    * const mergedLayer = Layer.merge(dbLayer, loggerLayer)
    * ```
    *
+   * @see {@link mergeAll} for merging several layers at once
+   *
    * @category zipping
    * @since 2.0.0
    */
@@ -1610,9 +1779,19 @@ const provideWith = (
   )
 
 /**
- * Feeds the output services of this builder into the input of the specified
- * builder, resulting in a new builder with the inputs of this builder as
- * well as any leftover inputs, and the outputs of the specified builder.
+ * Feeds the output services of the dependency layer into the requirements of
+ * this layer, returning a layer that only provides the services from this layer.
+ *
+ * **When to use**
+ *
+ * Use `provide` when the dependency layer is an implementation detail of the
+ * layer being built and should not be exposed to callers. Use `provideMerge`
+ * when callers should also receive the dependency services.
+ *
+ * **Details**
+ *
+ * In `serviceLayer.pipe(Layer.provide(dependencyLayer))`, the dependency layer is
+ * built first and is used to satisfy the requirements of `serviceLayer`.
  *
  * **Example** (Providing layer dependencies)
  *
@@ -1635,16 +1814,16 @@ const provideWith = (
  * }>()("Logger") {}
  *
  * // Create dependency layers
- * const databaseLayer = Layer.succeed(Database)({
+ * const databaseLayer = Layer.succeed(Database, {
  *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
  * })
  *
- * const loggerLayer = Layer.succeed(Logger)({
+ * const loggerLayer = Layer.succeed(Logger, {
  *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
  * })
  *
  * // UserService depends on Database and Logger
- * const userServiceLayer = Layer.effect(UserService)(Effect.gen(function*() {
+ * const userServiceLayer = Layer.effect(UserService, Effect.gen(function*() {
  *   const database = yield* Database
  *   const logger = yield* Logger
  *
@@ -1673,14 +1852,26 @@ const provideWith = (
  * )
  * ```
  *
+ * @see {@link provideMerge} for retaining the dependency services
+ *
  * @category utils
  * @since 2.0.0
  */
 export const provide: {
   /**
-   * Feeds the output services of this builder into the input of the specified
-   * builder, resulting in a new builder with the inputs of this builder as
-   * well as any leftover inputs, and the outputs of the specified builder.
+   * Feeds the output services of the dependency layer into the requirements of
+   * this layer, returning a layer that only provides the services from this layer.
+   *
+   * **When to use**
+   *
+   * Use `provide` when the dependency layer is an implementation detail of the
+   * layer being built and should not be exposed to callers. Use `provideMerge`
+   * when callers should also receive the dependency services.
+   *
+   * **Details**
+   *
+   * In `serviceLayer.pipe(Layer.provide(dependencyLayer))`, the dependency layer is
+   * built first and is used to satisfy the requirements of `serviceLayer`.
    *
    * **Example** (Providing layer dependencies)
    *
@@ -1703,16 +1894,16 @@ export const provide: {
    * }>()("Logger") {}
    *
    * // Create dependency layers
-   * const databaseLayer = Layer.succeed(Database)({
+   * const databaseLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
    * })
    *
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
    * })
    *
    * // UserService depends on Database and Logger
-   * const userServiceLayer = Layer.effect(UserService)(Effect.gen(function*() {
+   * const userServiceLayer = Layer.effect(UserService, Effect.gen(function*() {
    *   const database = yield* Database
    *   const logger = yield* Logger
    *
@@ -1741,14 +1932,26 @@ export const provide: {
    * )
    * ```
    *
+   * @see {@link provideMerge} for retaining the dependency services
+   *
    * @category utils
    * @since 2.0.0
    */
   <RIn, E, ROut>(that: Layer<ROut, E, RIn>): <RIn2, E2, ROut2>(self: Layer<ROut2, E2, RIn2>) => Layer<ROut2, E | E2, RIn | Exclude<RIn2, ROut>>
   /**
-   * Feeds the output services of this builder into the input of the specified
-   * builder, resulting in a new builder with the inputs of this builder as
-   * well as any leftover inputs, and the outputs of the specified builder.
+   * Feeds the output services of the dependency layer into the requirements of
+   * this layer, returning a layer that only provides the services from this layer.
+   *
+   * **When to use**
+   *
+   * Use `provide` when the dependency layer is an implementation detail of the
+   * layer being built and should not be exposed to callers. Use `provideMerge`
+   * when callers should also receive the dependency services.
+   *
+   * **Details**
+   *
+   * In `serviceLayer.pipe(Layer.provide(dependencyLayer))`, the dependency layer is
+   * built first and is used to satisfy the requirements of `serviceLayer`.
    *
    * **Example** (Providing layer dependencies)
    *
@@ -1771,16 +1974,16 @@ export const provide: {
    * }>()("Logger") {}
    *
    * // Create dependency layers
-   * const databaseLayer = Layer.succeed(Database)({
+   * const databaseLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
    * })
    *
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
    * })
    *
    * // UserService depends on Database and Logger
-   * const userServiceLayer = Layer.effect(UserService)(Effect.gen(function*() {
+   * const userServiceLayer = Layer.effect(UserService, Effect.gen(function*() {
    *   const database = yield* Database
    *   const logger = yield* Logger
    *
@@ -1809,6 +2012,8 @@ export const provide: {
    * )
    * ```
    *
+   * @see {@link provideMerge} for retaining the dependency services
+   *
    * @category utils
    * @since 2.0.0
    */
@@ -1821,9 +2026,19 @@ export const provide: {
     | Exclude<R, Success<Layers[number]>>
   >
   /**
-   * Feeds the output services of this builder into the input of the specified
-   * builder, resulting in a new builder with the inputs of this builder as
-   * well as any leftover inputs, and the outputs of the specified builder.
+   * Feeds the output services of the dependency layer into the requirements of
+   * this layer, returning a layer that only provides the services from this layer.
+   *
+   * **When to use**
+   *
+   * Use `provide` when the dependency layer is an implementation detail of the
+   * layer being built and should not be exposed to callers. Use `provideMerge`
+   * when callers should also receive the dependency services.
+   *
+   * **Details**
+   *
+   * In `serviceLayer.pipe(Layer.provide(dependencyLayer))`, the dependency layer is
+   * built first and is used to satisfy the requirements of `serviceLayer`.
    *
    * **Example** (Providing layer dependencies)
    *
@@ -1846,16 +2061,16 @@ export const provide: {
    * }>()("Logger") {}
    *
    * // Create dependency layers
-   * const databaseLayer = Layer.succeed(Database)({
+   * const databaseLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
    * })
    *
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
    * })
    *
    * // UserService depends on Database and Logger
-   * const userServiceLayer = Layer.effect(UserService)(Effect.gen(function*() {
+   * const userServiceLayer = Layer.effect(UserService, Effect.gen(function*() {
    *   const database = yield* Database
    *   const logger = yield* Logger
    *
@@ -1884,14 +2099,26 @@ export const provide: {
    * )
    * ```
    *
+   * @see {@link provideMerge} for retaining the dependency services
+   *
    * @category utils
    * @since 2.0.0
    */
   <RIn2, E2, ROut2, RIn, E, ROut>(self: Layer<ROut2, E2, RIn2>, that: Layer<ROut, E, RIn>): Layer<ROut2, E | E2, RIn | Exclude<RIn2, ROut>>
   /**
-   * Feeds the output services of this builder into the input of the specified
-   * builder, resulting in a new builder with the inputs of this builder as
-   * well as any leftover inputs, and the outputs of the specified builder.
+   * Feeds the output services of the dependency layer into the requirements of
+   * this layer, returning a layer that only provides the services from this layer.
+   *
+   * **When to use**
+   *
+   * Use `provide` when the dependency layer is an implementation detail of the
+   * layer being built and should not be exposed to callers. Use `provideMerge`
+   * when callers should also receive the dependency services.
+   *
+   * **Details**
+   *
+   * In `serviceLayer.pipe(Layer.provide(dependencyLayer))`, the dependency layer is
+   * built first and is used to satisfy the requirements of `serviceLayer`.
    *
    * **Example** (Providing layer dependencies)
    *
@@ -1914,16 +2141,16 @@ export const provide: {
    * }>()("Logger") {}
    *
    * // Create dependency layers
-   * const databaseLayer = Layer.succeed(Database)({
+   * const databaseLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
    * })
    *
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
    * })
    *
    * // UserService depends on Database and Logger
-   * const userServiceLayer = Layer.effect(UserService)(Effect.gen(function*() {
+   * const userServiceLayer = Layer.effect(UserService, Effect.gen(function*() {
    *   const database = yield* Database
    *   const logger = yield* Logger
    *
@@ -1952,6 +2179,8 @@ export const provide: {
    * )
    * ```
    *
+   * @see {@link provideMerge} for retaining the dependency services
+   *
    * @category utils
    * @since 2.0.0
    */
@@ -1967,9 +2196,15 @@ export const provide: {
 ) => provideWith(self, that, identity))
 
 /**
- * Feeds the output services of this layer into the input of the specified
- * layer, resulting in a new layer with the inputs of this layer, and the
- * outputs of both layers.
+ * Feeds the output services of the dependency layer into the requirements of
+ * this layer, returning a layer that provides both sets of services.
+ *
+ * **When to use**
+ *
+ * Use this when callers need access to both the service being built and the
+ * dependency used to build it, such as a health check that needs both a
+ * repository and its database. Prefer `provide` when the dependency should stay
+ * private.
  *
  * **Example** (Providing dependencies while retaining services)
  *
@@ -1992,16 +2227,16 @@ export const provide: {
  * }>()("UserService") {}
  *
  * // Create dependency layers
- * const databaseLayer = Layer.succeed(Database)({
+ * const databaseLayer = Layer.succeed(Database, {
  *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
  * })
  *
- * const loggerLayer = Layer.succeed(Logger)({
+ * const loggerLayer = Layer.succeed(Logger, {
  *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
  * })
  *
  * // UserService depends on Database and Logger
- * const userServiceLayer = Layer.effect(UserService)(Effect.gen(function*() {
+ * const userServiceLayer = Layer.effect(UserService, Effect.gen(function*() {
  *   const database = yield* Database
  *   const logger = yield* Logger
  *
@@ -2036,14 +2271,22 @@ export const provide: {
  * )
  * ```
  *
+ * @see {@link provide} for keeping dependency services private
+ *
  * @category utils
  * @since 2.0.0
  */
 export const provideMerge: {
   /**
-   * Feeds the output services of this layer into the input of the specified
-   * layer, resulting in a new layer with the inputs of this layer, and the
-   * outputs of both layers.
+   * Feeds the output services of the dependency layer into the requirements of
+   * this layer, returning a layer that provides both sets of services.
+   *
+   * **When to use**
+   *
+   * Use this when callers need access to both the service being built and the
+   * dependency used to build it, such as a health check that needs both a
+   * repository and its database. Prefer `provide` when the dependency should stay
+   * private.
    *
    * **Example** (Providing dependencies while retaining services)
    *
@@ -2066,16 +2309,16 @@ export const provideMerge: {
    * }>()("UserService") {}
    *
    * // Create dependency layers
-   * const databaseLayer = Layer.succeed(Database)({
+   * const databaseLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
    * })
    *
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
    * })
    *
    * // UserService depends on Database and Logger
-   * const userServiceLayer = Layer.effect(UserService)(Effect.gen(function*() {
+   * const userServiceLayer = Layer.effect(UserService, Effect.gen(function*() {
    *   const database = yield* Database
    *   const logger = yield* Logger
    *
@@ -2110,14 +2353,22 @@ export const provideMerge: {
    * )
    * ```
    *
+   * @see {@link provide} for keeping dependency services private
+   *
    * @category utils
    * @since 2.0.0
    */
   <RIn, E, ROut>(that: Layer<ROut, E, RIn>): <RIn2, E2, ROut2>(self: Layer<ROut2, E2, RIn2>) => Layer<ROut | ROut2, E | E2, RIn | Exclude<RIn2, ROut>>
   /**
-   * Feeds the output services of this layer into the input of the specified
-   * layer, resulting in a new layer with the inputs of this layer, and the
-   * outputs of both layers.
+   * Feeds the output services of the dependency layer into the requirements of
+   * this layer, returning a layer that provides both sets of services.
+   *
+   * **When to use**
+   *
+   * Use this when callers need access to both the service being built and the
+   * dependency used to build it, such as a health check that needs both a
+   * repository and its database. Prefer `provide` when the dependency should stay
+   * private.
    *
    * **Example** (Providing dependencies while retaining services)
    *
@@ -2140,16 +2391,16 @@ export const provideMerge: {
    * }>()("UserService") {}
    *
    * // Create dependency layers
-   * const databaseLayer = Layer.succeed(Database)({
+   * const databaseLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
    * })
    *
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
    * })
    *
    * // UserService depends on Database and Logger
-   * const userServiceLayer = Layer.effect(UserService)(Effect.gen(function*() {
+   * const userServiceLayer = Layer.effect(UserService, Effect.gen(function*() {
    *   const database = yield* Database
    *   const logger = yield* Logger
    *
@@ -2184,6 +2435,8 @@ export const provideMerge: {
    * )
    * ```
    *
+   * @see {@link provide} for keeping dependency services private
+   *
    * @category utils
    * @since 2.0.0
    */
@@ -2196,9 +2449,15 @@ export const provideMerge: {
     | Exclude<R, Success<Layers[number]>>
   >
   /**
-   * Feeds the output services of this layer into the input of the specified
-   * layer, resulting in a new layer with the inputs of this layer, and the
-   * outputs of both layers.
+   * Feeds the output services of the dependency layer into the requirements of
+   * this layer, returning a layer that provides both sets of services.
+   *
+   * **When to use**
+   *
+   * Use this when callers need access to both the service being built and the
+   * dependency used to build it, such as a health check that needs both a
+   * repository and its database. Prefer `provide` when the dependency should stay
+   * private.
    *
    * **Example** (Providing dependencies while retaining services)
    *
@@ -2221,16 +2480,16 @@ export const provideMerge: {
    * }>()("UserService") {}
    *
    * // Create dependency layers
-   * const databaseLayer = Layer.succeed(Database)({
+   * const databaseLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
    * })
    *
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
    * })
    *
    * // UserService depends on Database and Logger
-   * const userServiceLayer = Layer.effect(UserService)(Effect.gen(function*() {
+   * const userServiceLayer = Layer.effect(UserService, Effect.gen(function*() {
    *   const database = yield* Database
    *   const logger = yield* Logger
    *
@@ -2265,14 +2524,22 @@ export const provideMerge: {
    * )
    * ```
    *
+   * @see {@link provide} for keeping dependency services private
+   *
    * @category utils
    * @since 2.0.0
    */
   <RIn2, E2, ROut2, RIn, E, ROut>(self: Layer<ROut2, E2, RIn2>, that: Layer<ROut, E, RIn>): Layer<ROut | ROut2, E | E2, RIn | Exclude<RIn2, ROut>>
   /**
-   * Feeds the output services of this layer into the input of the specified
-   * layer, resulting in a new layer with the inputs of this layer, and the
-   * outputs of both layers.
+   * Feeds the output services of the dependency layer into the requirements of
+   * this layer, returning a layer that provides both sets of services.
+   *
+   * **When to use**
+   *
+   * Use this when callers need access to both the service being built and the
+   * dependency used to build it, such as a health check that needs both a
+   * repository and its database. Prefer `provide` when the dependency should stay
+   * private.
    *
    * **Example** (Providing dependencies while retaining services)
    *
@@ -2295,16 +2562,16 @@ export const provideMerge: {
    * }>()("UserService") {}
    *
    * // Create dependency layers
-   * const databaseLayer = Layer.succeed(Database)({
+   * const databaseLayer = Layer.succeed(Database, {
    *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
    * })
    *
-   * const loggerLayer = Layer.succeed(Logger)({
+   * const loggerLayer = Layer.succeed(Logger, {
    *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
    * })
    *
    * // UserService depends on Database and Logger
-   * const userServiceLayer = Layer.effect(UserService)(Effect.gen(function*() {
+   * const userServiceLayer = Layer.effect(UserService, Effect.gen(function*() {
    *   const database = yield* Database
    *   const logger = yield* Logger
    *
@@ -2339,6 +2606,8 @@ export const provideMerge: {
    * )
    * ```
    *
+   * @see {@link provide} for keeping dependency services private
+   *
    * @category utils
    * @since 2.0.0
    */
@@ -2380,7 +2649,7 @@ export const provideMerge: {
  * }>()("Logger") {}
  *
  * // Base config layer
- * const configLayer = Layer.succeed(Config)({
+ * const configLayer = Layer.succeed(Config, {
  *   dbUrl: "postgres://localhost:5432/mydb",
  *   logLevel: "debug"
  * })
@@ -2391,7 +2660,7 @@ export const provideMerge: {
  *     const config = Context.get(context, Config)
  *
  *     // Create database layer based on config
- *     const dbLayer = Layer.succeed(Database)({
+ *     const dbLayer = Layer.succeed(Database, {
  *       query: Effect.fn("Database.query")((sql: string) =>
  *         Effect.succeed(
  *           `Querying ${config.dbUrl}: ${sql}`
@@ -2399,7 +2668,7 @@ export const provideMerge: {
  *     })
  *
  *     // Create logger layer based on config
- *     const loggerLayer = Layer.succeed(Logger)({
+ *     const loggerLayer = Layer.succeed(Logger, {
  *       log: Effect.fn("Logger.log")((msg: string) =>
  *         config.logLevel === "debug"
  *           ? Effect.sync(() => console.log(`[DEBUG] ${msg}`))
@@ -2452,7 +2721,7 @@ export const flatMap: {
    * }>()("Logger") {}
    *
    * // Base config layer
-   * const configLayer = Layer.succeed(Config)({
+   * const configLayer = Layer.succeed(Config, {
    *   dbUrl: "postgres://localhost:5432/mydb",
    *   logLevel: "debug"
    * })
@@ -2463,7 +2732,7 @@ export const flatMap: {
    *     const config = Context.get(context, Config)
    *
    *     // Create database layer based on config
-   *     const dbLayer = Layer.succeed(Database)({
+   *     const dbLayer = Layer.succeed(Database, {
    *       query: Effect.fn("Database.query")((sql: string) =>
    *         Effect.succeed(
    *           `Querying ${config.dbUrl}: ${sql}`
@@ -2471,7 +2740,7 @@ export const flatMap: {
    *     })
    *
    *     // Create logger layer based on config
-   *     const loggerLayer = Layer.succeed(Logger)({
+   *     const loggerLayer = Layer.succeed(Logger, {
    *       log: Effect.fn("Logger.log")((msg: string) =>
    *         config.logLevel === "debug"
    *           ? Effect.sync(() => console.log(`[DEBUG] ${msg}`))
@@ -2524,7 +2793,7 @@ export const flatMap: {
    * }>()("Logger") {}
    *
    * // Base config layer
-   * const configLayer = Layer.succeed(Config)({
+   * const configLayer = Layer.succeed(Config, {
    *   dbUrl: "postgres://localhost:5432/mydb",
    *   logLevel: "debug"
    * })
@@ -2535,7 +2804,7 @@ export const flatMap: {
    *     const config = Context.get(context, Config)
    *
    *     // Create database layer based on config
-   *     const dbLayer = Layer.succeed(Database)({
+   *     const dbLayer = Layer.succeed(Database, {
    *       query: Effect.fn("Database.query")((sql: string) =>
    *         Effect.succeed(
    *           `Querying ${config.dbUrl}: ${sql}`
@@ -2543,7 +2812,7 @@ export const flatMap: {
    *     })
    *
    *     // Create logger layer based on config
-   *     const loggerLayer = Layer.succeed(Logger)({
+   *     const loggerLayer = Layer.succeed(Logger, {
    *       log: Effect.fn("Logger.log")((msg: string) =>
    *         config.logLevel === "debug"
    *           ? Effect.sync(() => console.log(`[DEBUG] ${msg}`))
@@ -2591,6 +2860,11 @@ export const flatMap: {
 /**
  * Performs the specified effect if this layer succeeds.
  *
+ * **Details**
+ *
+ * The callback receives the services produced by this layer. Its result is
+ * discarded, and the original layer output is preserved.
+ *
  * @category sequencing
  * @since 2.0.0
  */
@@ -2598,6 +2872,11 @@ export const tap: {
   /**
    * Performs the specified effect if this layer succeeds.
    *
+   * **Details**
+   *
+   * The callback receives the services produced by this layer. Its result is
+   * discarded, and the original layer output is preserved.
+   *
    * @category sequencing
    * @since 2.0.0
    */
@@ -2605,6 +2884,11 @@ export const tap: {
   /**
    * Performs the specified effect if this layer succeeds.
    *
+   * **Details**
+   *
+   * The callback receives the services produced by this layer. Its result is
+   * discarded, and the original layer output is preserved.
+   *
    * @category sequencing
    * @since 2.0.0
    */
@@ -2626,6 +2910,12 @@ export const tap: {
 /**
  * Performs the specified effect if this layer fails.
  *
+ * **Details**
+ *
+ * The callback receives the typed error. If the callback succeeds, the layer
+ * still fails with the original error; if the callback fails, that failure is
+ * added to the layer's error type.
+ *
  * @category sequencing
  * @since 2.0.0
  */
@@ -2633,6 +2923,12 @@ export const tapError: {
   /**
    * Performs the specified effect if this layer fails.
    *
+   * **Details**
+   *
+   * The callback receives the typed error. If the callback succeeds, the layer
+   * still fails with the original error; if the callback fails, that failure is
+   * added to the layer's error type.
+   *
    * @category sequencing
    * @since 2.0.0
    */
@@ -2640,6 +2936,12 @@ export const tapError: {
   /**
    * Performs the specified effect if this layer fails.
    *
+   * **Details**
+   *
+   * The callback receives the typed error. If the callback succeeds, the layer
+   * still fails with the original error; if the callback fails, that failure is
+   * added to the layer's error type.
+   *
    * @category sequencing
    * @since 2.0.0
    */
@@ -2659,6 +2961,7 @@ export const tapError: {
  * Performs the specified effect when this layer fails with any cause.
  *
  * **Details**
+ *
  * The callback receives the layer's `Cause`, so it can inspect typed errors,
  * defects, and interruption information. If the callback succeeds, the layer
  * fails again with the original cause; if the callback fails, that failure is
@@ -2672,6 +2975,7 @@ export const tapCause: {
    * Performs the specified effect when this layer fails with any cause.
    *
    * **Details**
+   *
    * The callback receives the layer's `Cause`, so it can inspect typed errors,
    * defects, and interruption information. If the callback succeeds, the layer
    * fails again with the original cause; if the callback fails, that failure is
@@ -2685,6 +2989,7 @@ export const tapCause: {
    * Performs the specified effect when this layer fails with any cause.
    *
    * **Details**
+   *
    * The callback receives the layer's `Cause`, so it can inspect typed errors,
    * defects, and interruption information. If the callback succeeds, the layer
    * fails again with the original cause; if the callback fails, that failure is
@@ -2710,8 +3015,13 @@ export const tapCause: {
   ))
 
 /**
- * Translates effect failure into death of the fiber, making all failures
- * unchecked and not a part of the type of the layer.
+ * Converts layer construction failures into defects, removing them from the
+ * layer's error type.
+ *
+ * **Details**
+ *
+ * Use this only when failures should be treated as unrecoverable defects rather
+ * than typed errors that callers can handle.
  *
  * **Example** (Converting layer failures to defects)
  *
@@ -2727,7 +3037,7 @@ export const tapCause: {
  * }>()("Database") {}
  *
  * // Layer that can fail during construction
- * const flakyDatabaseLayer = Layer.effect(Database)(Effect.gen(function*() {
+ * const flakyDatabaseLayer = Layer.effect(Database, Effect.gen(function*() {
  *   console.log("connecting")
  *   return yield* new DatabaseError({ message: "Connection failed" })
  * }))
@@ -2774,7 +3084,16 @@ const catch_: {
 
 export {
   /**
-   * Recovers from all errors.
+   * Recovers from all typed errors by switching to another layer.
+   *
+   * **When to use**
+   *
+   * Use `catch` when every typed construction error should use the same recovery
+   * path. Use `catchTag` to recover from specific tagged errors, and `catchCause`
+   * when recovery needs the full failure cause.
+   *
+   * @see {@link catchTag} for recovering from specific tagged errors
+   * @see {@link catchCause} for recovering with access to the full cause
    *
    * @category error handling
    * @since 4.0.0
@@ -2785,6 +3104,12 @@ export {
 /**
  * Recovers from specific tagged errors.
  *
+ * **When to use**
+ *
+ * Use `catchTag` when only some tagged construction errors should be recovered.
+ * Use `catchCause` when recovery depends on defects, interruption, or other
+ * cause information.
+ *
  * **Example** (Recovering from tagged layer errors)
  *
  * ```ts
@@ -2796,15 +3121,17 @@ export {
  *   readonly apiUrl: string
  * }>()("Config") {}
  *
- * const configLayer = Layer.effect(Config)(Effect.fail(new ConfigError()))
+ * const configLayer = Layer.effect(Config, Effect.fail(new ConfigError()))
  *
- * const fallbackLayer = Layer.succeed(Config)({ apiUrl: "http://localhost" })
+ * const fallbackLayer = Layer.succeed(Config, { apiUrl: "http://localhost" })
  *
  * const recovered = configLayer.pipe(
  *   Layer.catchTag("ConfigError", () => fallbackLayer)
  * )
  * ```
  *
+ * @see {@link catchCause} for recovering with access to the full cause
+ *
  * @category error handling
  * @since 4.0.0
  */
@@ -2812,6 +3139,12 @@ export const catchTag: {
   /**
    * Recovers from specific tagged errors.
    *
+   * **When to use**
+   *
+   * Use `catchTag` when only some tagged construction errors should be recovered.
+   * Use `catchCause` when recovery depends on defects, interruption, or other
+   * cause information.
+   *
    * **Example** (Recovering from tagged layer errors)
    *
    * ```ts
@@ -2823,15 +3156,17 @@ export const catchTag: {
    *   readonly apiUrl: string
    * }>()("Config") {}
    *
-   * const configLayer = Layer.effect(Config)(Effect.fail(new ConfigError()))
+   * const configLayer = Layer.effect(Config, Effect.fail(new ConfigError()))
    *
-   * const fallbackLayer = Layer.succeed(Config)({ apiUrl: "http://localhost" })
+   * const fallbackLayer = Layer.succeed(Config, { apiUrl: "http://localhost" })
    *
    * const recovered = configLayer.pipe(
    *   Layer.catchTag("ConfigError", () => fallbackLayer)
    * )
    * ```
    *
+   * @see {@link catchCause} for recovering with access to the full cause
+   *
    * @category error handling
    * @since 4.0.0
    */
@@ -2850,6 +3185,12 @@ export const catchTag: {
   /**
    * Recovers from specific tagged errors.
    *
+   * **When to use**
+   *
+   * Use `catchTag` when only some tagged construction errors should be recovered.
+   * Use `catchCause` when recovery depends on defects, interruption, or other
+   * cause information.
+   *
    * **Example** (Recovering from tagged layer errors)
    *
    * ```ts
@@ -2861,15 +3202,17 @@ export const catchTag: {
    *   readonly apiUrl: string
    * }>()("Config") {}
    *
-   * const configLayer = Layer.effect(Config)(Effect.fail(new ConfigError()))
+   * const configLayer = Layer.effect(Config, Effect.fail(new ConfigError()))
    *
-   * const fallbackLayer = Layer.succeed(Config)({ apiUrl: "http://localhost" })
+   * const fallbackLayer = Layer.succeed(Config, { apiUrl: "http://localhost" })
    *
    * const recovered = configLayer.pipe(
    *   Layer.catchTag("ConfigError", () => fallbackLayer)
    * )
    * ```
    *
+   * @see {@link catchCause} for recovering with access to the full cause
+   *
    * @category error handling
    * @since 4.0.0
    */
@@ -2914,10 +3257,18 @@ export const catchTag: {
 /**
  * Recovers from any failure cause by switching to another layer.
  *
+ * **When to use**
+ *
+ * Use `catchCause` when recovery needs more than the typed error, such as
+ * defects or interruption information. Use `catchTag` when recovery only needs
+ * to match specific tagged errors.
+ *
  * **Details**
+ *
  * The handler receives the full `Cause` of the failed layer, including typed
- * errors, defects, and interruption information, and returns the fallback layer
- * to build instead.
+ * errors, unexpected defects, and interruption information, and returns the
+ * fallback layer to build instead. Finalizers for resources acquired by the
+ * failed layer are still run before the fallback layer is acquired.
  *
  * **Example** (Recovering from layer failures by cause)
  *
@@ -2932,13 +3283,13 @@ export const catchTag: {
  *   readonly query: (sql: string) => Effect.Effect<string>
  * }>()("Database") {}
  *
- * const primaryDatabaseLayer = Layer.effect(Database)(
+ * const primaryDatabaseLayer = Layer.effect(Database,
  *   Effect.fail(new DatabaseError({ message: "Primary DB unreachable" }))
  * )
  *
  * const databaseWithFallback = primaryDatabaseLayer.pipe(
  *   Layer.catchCause(() => {
- *     return Layer.succeed(Database)({
+ *     return Layer.succeed(Database, {
  *       query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Memory: ${sql}`))
  *     })
  *   })
@@ -2956,6 +3307,8 @@ export const catchTag: {
  * // Memory: SELECT * FROM users
  * ```
  *
+ * @see {@link catchTag} for recovering from specific tagged errors
+ *
  * @category error handling
  * @since 4.0.0
  */
@@ -2963,10 +3316,18 @@ export const catchCause: {
   /**
    * Recovers from any failure cause by switching to another layer.
    *
+   * **When to use**
+   *
+   * Use `catchCause` when recovery needs more than the typed error, such as
+   * defects or interruption information. Use `catchTag` when recovery only needs
+   * to match specific tagged errors.
+   *
    * **Details**
+   *
    * The handler receives the full `Cause` of the failed layer, including typed
-   * errors, defects, and interruption information, and returns the fallback layer
-   * to build instead.
+   * errors, unexpected defects, and interruption information, and returns the
+   * fallback layer to build instead. Finalizers for resources acquired by the
+   * failed layer are still run before the fallback layer is acquired.
    *
    * **Example** (Recovering from layer failures by cause)
    *
@@ -2981,13 +3342,13 @@ export const catchCause: {
    *   readonly query: (sql: string) => Effect.Effect<string>
    * }>()("Database") {}
    *
-   * const primaryDatabaseLayer = Layer.effect(Database)(
+   * const primaryDatabaseLayer = Layer.effect(Database,
    *   Effect.fail(new DatabaseError({ message: "Primary DB unreachable" }))
    * )
    *
    * const databaseWithFallback = primaryDatabaseLayer.pipe(
    *   Layer.catchCause(() => {
-   *     return Layer.succeed(Database)({
+   *     return Layer.succeed(Database, {
    *       query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Memory: ${sql}`))
    *     })
    *   })
@@ -3005,6 +3366,8 @@ export const catchCause: {
    * // Memory: SELECT * FROM users
    * ```
    *
+   * @see {@link catchTag} for recovering from specific tagged errors
+   *
    * @category error handling
    * @since 4.0.0
    */
@@ -3012,10 +3375,18 @@ export const catchCause: {
   /**
    * Recovers from any failure cause by switching to another layer.
    *
+   * **When to use**
+   *
+   * Use `catchCause` when recovery needs more than the typed error, such as
+   * defects or interruption information. Use `catchTag` when recovery only needs
+   * to match specific tagged errors.
+   *
    * **Details**
+   *
    * The handler receives the full `Cause` of the failed layer, including typed
-   * errors, defects, and interruption information, and returns the fallback layer
-   * to build instead.
+   * errors, unexpected defects, and interruption information, and returns the
+   * fallback layer to build instead. Finalizers for resources acquired by the
+   * failed layer are still run before the fallback layer is acquired.
    *
    * **Example** (Recovering from layer failures by cause)
    *
@@ -3030,13 +3401,13 @@ export const catchCause: {
    *   readonly query: (sql: string) => Effect.Effect<string>
    * }>()("Database") {}
    *
-   * const primaryDatabaseLayer = Layer.effect(Database)(
+   * const primaryDatabaseLayer = Layer.effect(Database,
    *   Effect.fail(new DatabaseError({ message: "Primary DB unreachable" }))
    * )
    *
    * const databaseWithFallback = primaryDatabaseLayer.pipe(
    *   Layer.catchCause(() => {
-   *     return Layer.succeed(Database)({
+   *     return Layer.succeed(Database, {
    *       query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Memory: ${sql}`))
    *     })
    *   })
@@ -3054,6 +3425,8 @@ export const catchCause: {
    * // Memory: SELECT * FROM users
    * ```
    *
+   * @see {@link catchTag} for recovering from specific tagged errors
+   *
    * @category error handling
    * @since 4.0.0
    */
@@ -3075,6 +3448,11 @@ export const catchCause: {
 /**
  * Updates a service in the context with a new implementation.
  *
+ * **When to use**
+ *
+ * Use this to adapt or extend a service's behavior during the creation of a
+ * layer.
+ *
  * **Details**
  *
  * This function modifies the existing implementation of a service in the
@@ -3082,11 +3460,6 @@ export const catchCause: {
  * transformation function `f`, and replaces the old service with the
  * transformed one.
  *
- * **When to Use**
- *
- * This is useful for adapting or extending a service's behavior during the
- * creation of a layer.
- *
  * @category utils
  * @since 3.13.0
  */
@@ -3094,6 +3467,11 @@ export const updateService: {
   /**
    * Updates a service in the context with a new implementation.
    *
+   * **When to use**
+   *
+   * Use this to adapt or extend a service's behavior during the creation of a
+   * layer.
+   *
    * **Details**
    *
    * This function modifies the existing implementation of a service in the
@@ -3101,11 +3479,6 @@ export const updateService: {
    * transformation function `f`, and replaces the old service with the
    * transformed one.
    *
-   * **When to Use**
-   *
-   * This is useful for adapting or extending a service's behavior during the
-   * creation of a layer.
-   *
    * @category utils
    * @since 3.13.0
    */
@@ -3113,6 +3486,11 @@ export const updateService: {
   /**
    * Updates a service in the context with a new implementation.
    *
+   * **When to use**
+   *
+   * Use this to adapt or extend a service's behavior during the creation of a
+   * layer.
+   *
    * **Details**
    *
    * This function modifies the existing implementation of a service in the
@@ -3120,11 +3498,6 @@ export const updateService: {
    * transformation function `f`, and replaces the old service with the
    * transformed one.
    *
-   * **When to Use**
-   *
-   * This is useful for adapting or extending a service's behavior during the
-   * creation of a layer.
-   *
    * @category utils
    * @since 3.13.0
    */
@@ -3145,6 +3518,13 @@ export const updateService: {
 /**
  * Creates a fresh version of this layer that will not be shared.
  *
+ * **When to use**
+ *
+ * Use `fresh` when two parts of an application must receive separate instances
+ * of a resource, such as two independent client sessions. Do not use it just to
+ * work around confusing composition: by default, sharing the same layer value is
+ * usually the desired behavior.
+ *
  * **Example** (Creating non-shared layer instances)
  *
  * ```ts
@@ -3162,12 +3542,12 @@ export const updateService: {
  *   readonly counterId: number
  * }>()("Right") {}
  *
- * const leftLayer = Layer.effect(Left)(Effect.gen(function*() {
+ * const leftLayer = Layer.effect(Left, Effect.gen(function*() {
  *   const counter = yield* Counter
  *   return { counterId: counter.id }
  * }))
  *
- * const rightLayer = Layer.effect(Right)(Effect.gen(function*() {
+ * const rightLayer = Layer.effect(Right, Effect.gen(function*() {
  *   const counter = yield* Counter
  *   return { counterId: counter.id }
  * }))
@@ -3181,7 +3561,7 @@ export const updateService: {
  * const program = Effect.gen(function*() {
  *   const nextId = yield* Ref.make(0)
  *
- *   const counterLayer = Layer.effect(Counter)(Effect.gen(function*() {
+ *   const counterLayer = Layer.effect(Counter, Effect.gen(function*() {
  *     const id = yield* Ref.updateAndGet(nextId, (n) => n + 1)
  *     console.log("constructed Counter")
  *     return { id }
@@ -3218,8 +3598,16 @@ export const fresh = <A, E, R>(self: Layer<A, E, R>): Layer<A, E, R> =>
   fromBuildUnsafe((_, scope) => self.build(makeMemoMapUnsafe(), scope))
 
 /**
- * Builds this layer and uses it until it is interrupted. This is useful when
- * your entire application is a layer, such as an HTTP server.
+ * Builds this layer and keeps it alive until the returned effect is interrupted.
+ *
+ * **When to use**
+ *
+ * Use this when your entire application is a layer, such as an HTTP server.
+ *
+ * **Details**
+ *
+ * When the returned effect is interrupted, the layer scope is closed and all
+ * finalizers registered during layer acquisition are run.
  *
  * **Example** (Launching an application layer)
  *
@@ -3236,7 +3624,7 @@ export const fresh = <A, E, R>(self: Layer<A, E, R>): Layer<A, E, R> =>
  * }>()("Logger") {}
  *
  * // Server layer that starts an HTTP server
- * const serverLayer = Layer.effect(HttpServer)(Effect.gen(function*() {
+ * const serverLayer = Layer.effect(HttpServer, Effect.gen(function*() {
  *   yield* Console.log("Starting HTTP server...")
  *
  *   return {
@@ -3251,7 +3639,7 @@ export const fresh = <A, E, R>(self: Layer<A, E, R>): Layer<A, E, R> =>
  *   }
  * }))
  *
- * const loggerLayer = Layer.succeed(Logger)({
+ * const loggerLayer = Layer.succeed(Logger, {
  *   log: Effect.fn("Logger.log")((msg: string) => Console.log(`[LOG] ${msg}`))
  * })
  *
@@ -3278,11 +3666,13 @@ export const launch = <RIn, E, ROut>(self: Layer<ROut, E, RIn>): Effect<never, E
 /**
  * A utility type for creating partial mocks of services in testing.
  *
+ * **Details**
+ *
  * This type makes Effect methods and Effect-returning functions optional,
  * while keeping non-Effect properties required. This allows you to provide
  * only the methods you need to test while leaving others unimplemented.
  *
- * @category Testing
+ * @category testing
  * @since 3.17.0
  */
 export type PartialEffectful<A extends object> = Types.Simplify<
@@ -3304,8 +3694,16 @@ type AnyEffectOrStream =
 
 /**
  * Creates a mock layer for testing purposes. You can provide a partial
- * implementation of the service, and any methods not provided will
- * throw an unimplemented defect when called.
+ * implementation of the service. Any missing members that are `Effect`s,
+ * `Stream`s, `Channel`s, or functions returning them will fail with an
+ * unimplemented defect when used.
+ *
+ * **Details**
+ *
+ * Missing members are represented by a value that can be used as an `Effect`,
+ * `Stream`, `Channel`, or as a function returning an `Effect`. This lets the
+ * mock preserve the shape of common service methods while still failing loudly
+ * when an unimplemented member is exercised.
  *
  * **Example** (Mocking services for tests)
  *
@@ -3346,14 +3744,22 @@ type AnyEffectOrStream =
  * )
  * ```
  *
- * @category Testing
+ * @category testing
  * @since 3.17.0
  */
 export const mock: {
   /**
    * Creates a mock layer for testing purposes. You can provide a partial
-   * implementation of the service, and any methods not provided will
-   * throw an unimplemented defect when called.
+   * implementation of the service. Any missing members that are `Effect`s,
+   * `Stream`s, `Channel`s, or functions returning them will fail with an
+   * unimplemented defect when used.
+   *
+   * **Details**
+   *
+   * Missing members are represented by a value that can be used as an `Effect`,
+   * `Stream`, `Channel`, or as a function returning an `Effect`. This lets the
+   * mock preserve the shape of common service methods while still failing loudly
+   * when an unimplemented member is exercised.
    *
    * **Example** (Mocking services for tests)
    *
@@ -3394,14 +3800,22 @@ export const mock: {
    * )
    * ```
    *
-   * @category Testing
+   * @category testing
    * @since 3.17.0
    */
   <I, S extends object>(service: Context.Key<I, S>): (implementation: PartialEffectful<S>) => Layer<I>
   /**
    * Creates a mock layer for testing purposes. You can provide a partial
-   * implementation of the service, and any methods not provided will
-   * throw an unimplemented defect when called.
+   * implementation of the service. Any missing members that are `Effect`s,
+   * `Stream`s, `Channel`s, or functions returning them will fail with an
+   * unimplemented defect when used.
+   *
+   * **Details**
+   *
+   * Missing members are represented by a value that can be used as an `Effect`,
+   * `Stream`, `Channel`, or as a function returning an `Effect`. This lets the
+   * mock preserve the shape of common service methods while still failing loudly
+   * when an unimplemented member is exercised.
    *
    * **Example** (Mocking services for tests)
    *
@@ -3442,7 +3856,7 @@ export const mock: {
    * )
    * ```
    *
-   * @category Testing
+   * @category testing
    * @since 3.17.0
    */
   <I, S extends object>(
@@ -3504,10 +3918,12 @@ const ChannelTypeId: Channel.TypeId = "~effect/Channel"
 // -----------------------------------------------------------------------------
 
 /**
- * Ensures that an layer's success type extends a given type `ROut`.
+ * Ensures that a layer's success type extends a given type `ROut`.
+ *
+ * **Details**
  *
  * This function provides compile-time type checking to ensure that the success
- * value of an layer conforms to a specific type constraint.
+ * value of a layer conforms to a specific type constraint.
  *
  * **Example** (Constraining layer success types)
  *
@@ -3529,17 +3945,19 @@ const ChannelTypeId: Channel.TypeId = "~effect/Channel"
  * // Type 'string' is not assignable to type 'number'
  * ```
  *
- * @category Type constraints
+ * @category utility types
  * @since 4.0.0
  */
 export const satisfiesSuccessType =
   <ROut>() => <ROut2 extends ROut, E, RIn>(layer: Layer<ROut2, E, RIn>): Layer<ROut2, E, RIn> => layer
 
 /**
- * Ensures that an layer's error type extends a given type `E`.
+ * Ensures that a layer's error type extends a given type `E`.
+ *
+ * **Details**
  *
  * This function provides compile-time type checking to ensure that the error
- * type of an layer conforms to a specific type constraint.
+ * type of a layer conforms to a specific type constraint.
  *
  * **Example** (Constraining layer error types)
  *
@@ -3562,17 +3980,19 @@ export const satisfiesSuccessType =
  * // Type 'string' is not assignable to type 'Error'
  * ```
  *
- * @category Type constraints
+ * @category utility types
  * @since 4.0.0
  */
 export const satisfiesErrorType =
   <E>() => <ROut, E2 extends E, RIn>(layer: Layer<ROut, E2, RIn>): Layer<ROut, E2, RIn> => layer
 
 /**
- * Ensures that an layer's requirements type extends a given type `R`.
+ * Ensures that a layer's requirements type extends a given type `R`.
+ *
+ * **Details**
  *
  * This function provides compile-time type checking to ensure that the
- * requirements (context) type of an layer conforms to a specific type constraint.
+ * requirements type of a layer conforms to a specific type constraint.
  *
  * **Example** (Constraining layer service requirements)
  *
@@ -3594,7 +4014,7 @@ export const satisfiesErrorType =
  * // Type 'string' is not assignable to type 'number'
  * ```
  *
- * @category Type constraints
+ * @category utility types
  * @since 4.0.0
  */
 export const satisfiesServicesType =
@@ -3613,8 +4033,8 @@ export const satisfiesServicesType =
  */
 export interface SpanOptions extends Tracer.SpanOptions {
   /**
-   * A function that will be called when the span associated with the layer is
-   * ending (i.e. when the `Scope` that the span is associated with is closed).
+   * Runs when the span associated with the layer ends, which happens when the
+   * layer scope is closed.
    */
   readonly onEnd?:
     | ((span: Tracer.Span, exit: Exit.Exit<unknown, unknown>) => Effect<void>)
@@ -3625,9 +4045,13 @@ export interface SpanOptions extends Tracer.SpanOptions {
  * Constructs a new `Layer` which creates a span and registers it as the current
  * parent span.
  *
+ * **Details**
+ *
  * This allows you to create a traced scope for layer construction, making all
  * operations within the layer constructor part of the same trace span. The span
- * is automatically closed when the layer's scope is closed.
+ * is automatically ended when the layer's scope is closed. If `onEnd` is
+ * provided, it receives the span and the layer scope's exit value when the span
+ * ends.
  *
  * **Example** (Tracing layer construction with a span)
  *
@@ -3688,6 +4112,7 @@ export const span = (
  * Constructs a layer that provides an existing span as the current parent span.
  *
  * **Details**
+ *
  * The supplied span is made available through `Tracer.ParentSpan` for layers
  * that are built with this layer. This API does not create, end, or close the
  * span; the caller remains responsible for the span's lifetime.
@@ -3727,9 +4152,11 @@ export const parentSpan = (span: Tracer.AnySpan): Layer<Tracer.ParentSpan> =>
   succeedContext(Tracer.ParentSpan.context(span))
 
 /**
- * Wraps a Layer with a new tracing span, making all operations in the layer
+ * Wraps a `Layer` with a new tracing span, making all operations in the layer
  * constructor part of the named trace span.
  *
+ * **Details**
+ *
  * This creates a new span for the layer's construction and execution. The span
  * is automatically ended when the layer's scope is closed. This is useful for
  * tracking the lifecycle and performance of layer initialization.
@@ -3778,8 +4205,7 @@ export const parentSpan = (span: Tracer.AnySpan): Layer<Tracer.ParentSpan> =>
  *
  *   yield* logger.log("Application ready")
  *   return yield* database.query("SELECT * FROM users")
- * }).pipe(Effect.provide(appLayer)
- * )
+ * }).pipe(Effect.provide(appLayer))
  * ```
  *
  * @category tracing
@@ -3787,9 +4213,11 @@ export const parentSpan = (span: Tracer.AnySpan): Layer<Tracer.ParentSpan> =>
  */
 export const withSpan: {
   /**
-   * Wraps a Layer with a new tracing span, making all operations in the layer
+   * Wraps a `Layer` with a new tracing span, making all operations in the layer
    * constructor part of the named trace span.
    *
+   * **Details**
+   *
    * This creates a new span for the layer's construction and execution. The span
    * is automatically ended when the layer's scope is closed. This is useful for
    * tracking the lifecycle and performance of layer initialization.
@@ -3838,8 +4266,7 @@ export const withSpan: {
    *
    *   yield* logger.log("Application ready")
    *   return yield* database.query("SELECT * FROM users")
-   * }).pipe(Effect.provide(appLayer)
-   * )
+   * }).pipe(Effect.provide(appLayer))
    * ```
    *
    * @category tracing
@@ -3849,9 +4276,11 @@ export const withSpan: {
     self: Layer<A, E, R>
   ) => Layer<A, E, Exclude<R, Tracer.ParentSpan>>
   /**
-   * Wraps a Layer with a new tracing span, making all operations in the layer
+   * Wraps a `Layer` with a new tracing span, making all operations in the layer
    * constructor part of the named trace span.
    *
+   * **Details**
+   *
    * This creates a new span for the layer's construction and execution. The span
    * is automatically ended when the layer's scope is closed. This is useful for
    * tracking the lifecycle and performance of layer initialization.
@@ -3900,8 +4329,7 @@ export const withSpan: {
    *
    *   yield* logger.log("Application ready")
    *   return yield* database.query("SELECT * FROM users")
-   * }).pipe(Effect.provide(appLayer)
-   * )
+   * }).pipe(Effect.provide(appLayer))
    * ```
    *
    * @category tracing
@@ -3945,9 +4373,15 @@ export const withSpan: {
  * as their parent.
  *
  * **Details**
+ *
  * Use this to attach layer construction to an existing trace hierarchy. This API
  * does not create or end the supplied parent span.
  *
+ * When the supplied span is a native `Span`, layer construction also receives
+ * diagnostic information that helps associate failures with the layer call site.
+ * External spans are only installed as the parent span and do not add this
+ * diagnostic call-site information.
+ *
  * **Example** (Attaching layers to an existing parent span)
  *
  * ```ts
@@ -4007,9 +4441,15 @@ export const withParentSpan: {
    * as their parent.
    *
    * **Details**
+   *
    * Use this to attach layer construction to an existing trace hierarchy. This API
    * does not create or end the supplied parent span.
    *
+   * When the supplied span is a native `Span`, layer construction also receives
+   * diagnostic information that helps associate failures with the layer call site.
+   * External spans are only installed as the parent span and do not add this
+   * diagnostic call-site information.
+   *
    * **Example** (Attaching layers to an existing parent span)
    *
    * ```ts
@@ -4071,9 +4511,15 @@ export const withParentSpan: {
    * as their parent.
    *
    * **Details**
+   *
    * Use this to attach layer construction to an existing trace hierarchy. This API
    * does not create or end the supplied parent span.
    *
+   * When the supplied span is a native `Span`, layer construction also receives
+   * diagnostic information that helps associate failures with the layer call site.
+   * External spans are only installed as the parent span and do not add this
+   * diagnostic call-site information.
+   *
    * **Example** (Attaching layers to an existing parent span)
    *
    * ```ts