@opencode-ai/util 0.0.0-dev-18758 → 0.0.0-dev-18759

package/dist/cross-spawn-spawner.d.ts

@@ -1,3 +1,3 @@
 import { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner";
-export declare const node: import("./effect/layer-node.js").Node<ChildProcessSpawner, never, import("./effect/layer-node.js").Tag<"global">>;
+export declare const node: import("./effect/layer-node.js").Provider<ChildProcessSpawner, never, import("./effect/layer-node.js").Tag<"global">>;
 export * as CrossSpawnSpawner from "./cross-spawn-spawner.js";

package/dist/effect/app-node-platform.d.ts

@@ -1,6 +1,6 @@
 import { FileSystem, Path } from "effect";
 import { HttpClient } from "effect/unstable/http";
-export declare const filesystem: import("./layer-node.js").Node<FileSystem.FileSystem, never, import("./layer-node.js").Tag<"global">>;
-export declare const path: import("./layer-node.js").Node<Path.Path, never, import("./layer-node.js").Tag<"global">>;
-export declare const httpClient: import("./layer-node.js").Node<HttpClient.HttpClient, never, import("./layer-node.js").Tag<"global">>;
+export declare const filesystem: import("./layer-node.js").Provider<FileSystem.FileSystem, never, import("./layer-node.js").Tag<"global">>;
+export declare const path: import("./layer-node.js").Provider<Path.Path, never, import("./layer-node.js").Tag<"global">>;
+export declare const httpClient: import("./layer-node.js").Provider<HttpClient.HttpClient, never, import("./layer-node.js").Tag<"global">>;
 export * as LayerNodePlatform from "./app-node-platform.js";

package/dist/effect/app-node.d.ts

@@ -3,48 +3,60 @@ export declare const tags: LayerNode.Tags<{
     readonly location: readonly ["global"];
     readonly global: readonly [];
 }>;
-export type GlobalNode<A, E = never> = LayerNode.Node<A, E, (typeof tags.values)["global"]>;
-export type LocationNode<A, E = never> = LayerNode.Node<A, E, (typeof tags.values)["location"]>;
-export declare const makeGlobalNode: <const Implementation extends import("effect/Layer").Any, const Items extends readonly [] | readonly [LayerNode.Node<unknown, unknown, any>, ...LayerNode.Node<unknown, unknown, any>[]]>(input: (Omit<{
+export type GlobalGraph<A, E = never> = LayerNode.Graph<A, E, (typeof tags.values)["global"]>;
+export type LocationGraph<A, E = never> = LayerNode.Graph<A, E, (typeof tags.values)["location"]>;
+export declare const makeGlobalNode: <const Implementation extends import("effect/Layer").Any, const Items extends readonly [] | readonly [/*elided*/ any, .../*elided*/ any[]]>(input: (Omit<{
     readonly service: import("effect/Context").Service.Any;
     readonly name?: never;
 } & {
-    readonly layer: Implementation;
-    readonly deps: Items & ([Exclude<import("effect/Layer").Services<Implementation>, LayerNode.Output<NoInfer<Items>[number]>>] extends [never] ? unknown : {
-        readonly "Missing dependencies": Exclude<import("effect/Layer").Services<Implementation>, LayerNode.Output<NoInfer<Items>[number]>>;
+    readonly tag: LayerNode.Tag<"global">;
+} & {
+    readonly layer: Implementation & ([NoInfer<Implementation>] extends [import("effect/Layer").Layer<never, unknown, unknown>] ? unknown : {
+        readonly "Layer contract must be preserved": NoInfer<Implementation>;
+    });
+    readonly deps: Items & ([Exclude<import("effect/Layer").Services<Implementation>, [NoInfer<Items>] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? /*elided*/ any : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T ? T extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T extends unknown ? [Head] extends [LayerNode.Graph<T, unknown, LayerNode.Tag<string> | undefined>] ? T : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_1 ? T_1 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_1 extends unknown ? [Head] extends [LayerNode.Graph<T_1, unknown, LayerNode.Tag<string> | undefined>] ? T_1 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_2 ? T_2 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_2 extends unknown ? [Head] extends [LayerNode.Graph<T_2, unknown, LayerNode.Tag<string> | undefined>] ? T_2 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_3 ? T_3 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_3 extends unknown ? [Head] extends [LayerNode.Graph<T_3, unknown, LayerNode.Tag<string> | undefined>] ? T_3 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_4 ? T_4 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_4 extends unknown ? [Head] extends [LayerNode.Graph<T_4, unknown, LayerNode.Tag<string> | undefined>] ? T_4 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_5 ? T_5 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_5 extends unknown ? [Head] extends [LayerNode.Graph<T_5, unknown, LayerNode.Tag<string> | undefined>] ? T_5 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_6 ? T_6 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_6 extends unknown ? [Head] extends [LayerNode.Graph<T_6, unknown, LayerNode.Tag<string> | undefined>] ? T_6 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_7 ? T_7 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_7 extends unknown ? [Head] extends [LayerNode.Graph<T_7, unknown, LayerNode.Tag<string> | undefined>] ? T_7 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_8 ? T_8 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_8 extends unknown ? [Head] extends [LayerNode.Graph<T_8, unknown, LayerNode.Tag<string> | undefined>] ? T_8 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_9 ? T_9 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_9 extends unknown ? [Head] extends [LayerNode.Graph<T_9, unknown, LayerNode.Tag<string> | undefined>] ? T_9 : never : never : never : never : never>] extends [never] ? unknown : {
+        readonly "Missing dependencies": Exclude<import("effect/Layer").Services<Implementation>, [NoInfer<Items>] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? /*elided*/ any : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_10 ? T_10 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_10 extends unknown ? [Head] extends [LayerNode.Graph<T_10, unknown, LayerNode.Tag<string> | undefined>] ? T_10 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_11 ? T_11 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_11 extends unknown ? [Head] extends [LayerNode.Graph<T_11, unknown, LayerNode.Tag<string> | undefined>] ? T_11 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_12 ? T_12 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_12 extends unknown ? [Head] extends [LayerNode.Graph<T_12, unknown, LayerNode.Tag<string> | undefined>] ? T_12 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_13 ? T_13 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_13 extends unknown ? [Head] extends [LayerNode.Graph<T_13, unknown, LayerNode.Tag<string> | undefined>] ? T_13 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_14 ? T_14 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_14 extends unknown ? [Head] extends [LayerNode.Graph<T_14, unknown, LayerNode.Tag<string> | undefined>] ? T_14 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_15 ? T_15 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_15 extends unknown ? [Head] extends [LayerNode.Graph<T_15, unknown, LayerNode.Tag<string> | undefined>] ? T_15 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_16 ? T_16 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_16 extends unknown ? [Head] extends [LayerNode.Graph<T_16, unknown, LayerNode.Tag<string> | undefined>] ? T_16 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_17 ? T_17 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_17 extends unknown ? [Head] extends [LayerNode.Graph<T_17, unknown, LayerNode.Tag<string> | undefined>] ? T_17 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_18 ? T_18 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_18 extends unknown ? [Head] extends [LayerNode.Graph<T_18, unknown, LayerNode.Tag<string> | undefined>] ? T_18 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_19 ? T_19 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_19 extends unknown ? [Head] extends [LayerNode.Graph<T_19, unknown, LayerNode.Tag<string> | undefined>] ? T_19 : never : never : never : never : never>;
     });
-    readonly tag?: LayerNode.Tag<"global"> | undefined;
 }, "tag"> | Omit<{
     readonly name: string;
     readonly service?: never;
 } & {
-    readonly layer: Implementation;
-    readonly deps: Items & ([Exclude<import("effect/Layer").Services<Implementation>, LayerNode.Output<NoInfer<Items>[number]>>] extends [never] ? unknown : {
-        readonly "Missing dependencies": Exclude<import("effect/Layer").Services<Implementation>, LayerNode.Output<NoInfer<Items>[number]>>;
+    readonly tag: LayerNode.Tag<"global">;
+} & {
+    readonly layer: Implementation & ([NoInfer<Implementation>] extends [import("effect/Layer").Layer<never, unknown, unknown>] ? unknown : {
+        readonly "Layer contract must be preserved": NoInfer<Implementation>;
+    });
+    readonly deps: Items & ([Exclude<import("effect/Layer").Services<Implementation>, [NoInfer<Items>] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? /*elided*/ any : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_20 ? T_20 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_20 extends unknown ? [Head] extends [LayerNode.Graph<T_20, unknown, LayerNode.Tag<string> | undefined>] ? T_20 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_21 ? T_21 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_21 extends unknown ? [Head] extends [LayerNode.Graph<T_21, unknown, LayerNode.Tag<string> | undefined>] ? T_21 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_22 ? T_22 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_22 extends unknown ? [Head] extends [LayerNode.Graph<T_22, unknown, LayerNode.Tag<string> | undefined>] ? T_22 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_23 ? T_23 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_23 extends unknown ? [Head] extends [LayerNode.Graph<T_23, unknown, LayerNode.Tag<string> | undefined>] ? T_23 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_24 ? T_24 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_24 extends unknown ? [Head] extends [LayerNode.Graph<T_24, unknown, LayerNode.Tag<string> | undefined>] ? T_24 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_25 ? T_25 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_25 extends unknown ? [Head] extends [LayerNode.Graph<T_25, unknown, LayerNode.Tag<string> | undefined>] ? T_25 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_26 ? T_26 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_26 extends unknown ? [Head] extends [LayerNode.Graph<T_26, unknown, LayerNode.Tag<string> | undefined>] ? T_26 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_27 ? T_27 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_27 extends unknown ? [Head] extends [LayerNode.Graph<T_27, unknown, LayerNode.Tag<string> | undefined>] ? T_27 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_28 ? T_28 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_28 extends unknown ? [Head] extends [LayerNode.Graph<T_28, unknown, LayerNode.Tag<string> | undefined>] ? T_28 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_29 ? T_29 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_29 extends unknown ? [Head] extends [LayerNode.Graph<T_29, unknown, LayerNode.Tag<string> | undefined>] ? T_29 : never : never : never : never : never>] extends [never] ? unknown : {
+        readonly "Missing dependencies": Exclude<import("effect/Layer").Services<Implementation>, [NoInfer<Items>] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? /*elided*/ any : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_30 ? T_30 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_30 extends unknown ? [Head] extends [LayerNode.Graph<T_30, unknown, LayerNode.Tag<string> | undefined>] ? T_30 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_31 ? T_31 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_31 extends unknown ? [Head] extends [LayerNode.Graph<T_31, unknown, LayerNode.Tag<string> | undefined>] ? T_31 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_32 ? T_32 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_32 extends unknown ? [Head] extends [LayerNode.Graph<T_32, unknown, LayerNode.Tag<string> | undefined>] ? T_32 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_33 ? T_33 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_33 extends unknown ? [Head] extends [LayerNode.Graph<T_33, unknown, LayerNode.Tag<string> | undefined>] ? T_33 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_34 ? T_34 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_34 extends unknown ? [Head] extends [LayerNode.Graph<T_34, unknown, LayerNode.Tag<string> | undefined>] ? T_34 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_35 ? T_35 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_35 extends unknown ? [Head] extends [LayerNode.Graph<T_35, unknown, LayerNode.Tag<string> | undefined>] ? T_35 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_36 ? T_36 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_36 extends unknown ? [Head] extends [LayerNode.Graph<T_36, unknown, LayerNode.Tag<string> | undefined>] ? T_36 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_37 ? T_37 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_37 extends unknown ? [Head] extends [LayerNode.Graph<T_37, unknown, LayerNode.Tag<string> | undefined>] ? T_37 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_38 ? T_38 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_38 extends unknown ? [Head] extends [LayerNode.Graph<T_38, unknown, LayerNode.Tag<string> | undefined>] ? T_38 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_39 ? T_39 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_39 extends unknown ? [Head] extends [LayerNode.Graph<T_39, unknown, LayerNode.Tag<string> | undefined>] ? T_39 : never : never : never : never : never>;
     });
-    readonly tag?: LayerNode.Tag<"global"> | undefined;
-}, "tag">) & ([Exclude<Items[number], LayerNode.Node<unknown, unknown, LayerNode.Tag<"global"> | undefined>>] extends [never] ? unknown : {
-    readonly "Invalid tag dependencies": Exclude<Items[number], LayerNode.Node<unknown, unknown, LayerNode.Tag<"global"> | undefined>>;
-})) => LayerNode.Node<import("effect/Layer").Success<Implementation>, import("effect/Layer").Error<Implementation> | LayerNode.Error<Items[number]>, LayerNode.Tag<"global">>;
-export declare const makeLocationNode: <const Implementation extends import("effect/Layer").Any, const Items extends readonly [] | readonly [LayerNode.Node<unknown, unknown, any>, ...LayerNode.Node<unknown, unknown, any>[]]>(input: (Omit<{
+}, "tag">) & ([Exclude<[Items[number]] extends [never] ? undefined : Items[number] extends infer T_40 ? T_40 extends Items[number] ? T_40 extends LayerNode.Graph<never, unknown, infer T_41 extends LayerNode.Tag<string> | undefined> ? T_41 : never : never : never, LayerNode.Tag<"global"> | undefined>] extends [never] ? unknown : {
+    readonly "Invalid tag dependencies": Exclude<[Items[number]] extends [never] ? undefined : Items[number] extends infer T_42 ? T_42 extends Items[number] ? T_42 extends LayerNode.Graph<never, unknown, infer T_41 extends LayerNode.Tag<string> | undefined> ? T_41 : never : never : never, LayerNode.Tag<"global"> | undefined>;
+})) => LayerNode.Provider<import("effect/Layer").Success<Implementation> extends infer T_43 ? T_43 extends import("effect/Layer").Success<Implementation> ? T_43 extends unknown ? [Implementation] extends [import("effect/Layer").Layer<T_43, unknown, unknown>] ? T_43 : never : never : never : never, import("effect/Layer").Error<Implementation> | LayerNode.Error<Items[number]>, LayerNode.Tag<"global">>;
+export declare const makeLocationNode: <const Implementation extends import("effect/Layer").Any, const Items extends readonly [] | readonly [/*elided*/ any, .../*elided*/ any[]]>(input: (Omit<{
     readonly service: import("effect/Context").Service.Any;
     readonly name?: never;
 } & {
-    readonly layer: Implementation;
-    readonly deps: Items & ([Exclude<import("effect/Layer").Services<Implementation>, LayerNode.Output<NoInfer<Items>[number]>>] extends [never] ? unknown : {
-        readonly "Missing dependencies": Exclude<import("effect/Layer").Services<Implementation>, LayerNode.Output<NoInfer<Items>[number]>>;
+    readonly tag: LayerNode.Tag<"location">;
+} & {
+    readonly layer: Implementation & ([NoInfer<Implementation>] extends [import("effect/Layer").Layer<never, unknown, unknown>] ? unknown : {
+        readonly "Layer contract must be preserved": NoInfer<Implementation>;
+    });
+    readonly deps: Items & ([Exclude<import("effect/Layer").Services<Implementation>, [NoInfer<Items>] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? /*elided*/ any : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T ? T extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T extends unknown ? [Head] extends [LayerNode.Graph<T, unknown, LayerNode.Tag<string> | undefined>] ? T : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_1 ? T_1 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_1 extends unknown ? [Head] extends [LayerNode.Graph<T_1, unknown, LayerNode.Tag<string> | undefined>] ? T_1 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_2 ? T_2 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_2 extends unknown ? [Head] extends [LayerNode.Graph<T_2, unknown, LayerNode.Tag<string> | undefined>] ? T_2 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_3 ? T_3 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_3 extends unknown ? [Head] extends [LayerNode.Graph<T_3, unknown, LayerNode.Tag<string> | undefined>] ? T_3 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_4 ? T_4 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_4 extends unknown ? [Head] extends [LayerNode.Graph<T_4, unknown, LayerNode.Tag<string> | undefined>] ? T_4 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_5 ? T_5 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_5 extends unknown ? [Head] extends [LayerNode.Graph<T_5, unknown, LayerNode.Tag<string> | undefined>] ? T_5 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_6 ? T_6 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_6 extends unknown ? [Head] extends [LayerNode.Graph<T_6, unknown, LayerNode.Tag<string> | undefined>] ? T_6 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_7 ? T_7 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_7 extends unknown ? [Head] extends [LayerNode.Graph<T_7, unknown, LayerNode.Tag<string> | undefined>] ? T_7 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_8 ? T_8 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_8 extends unknown ? [Head] extends [LayerNode.Graph<T_8, unknown, LayerNode.Tag<string> | undefined>] ? T_8 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_9 ? T_9 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_9 extends unknown ? [Head] extends [LayerNode.Graph<T_9, unknown, LayerNode.Tag<string> | undefined>] ? T_9 : never : never : never : never : never>] extends [never] ? unknown : {
+        readonly "Missing dependencies": Exclude<import("effect/Layer").Services<Implementation>, [NoInfer<Items>] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? /*elided*/ any : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_10 ? T_10 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_10 extends unknown ? [Head] extends [LayerNode.Graph<T_10, unknown, LayerNode.Tag<string> | undefined>] ? T_10 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_11 ? T_11 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_11 extends unknown ? [Head] extends [LayerNode.Graph<T_11, unknown, LayerNode.Tag<string> | undefined>] ? T_11 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_12 ? T_12 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_12 extends unknown ? [Head] extends [LayerNode.Graph<T_12, unknown, LayerNode.Tag<string> | undefined>] ? T_12 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_13 ? T_13 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_13 extends unknown ? [Head] extends [LayerNode.Graph<T_13, unknown, LayerNode.Tag<string> | undefined>] ? T_13 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_14 ? T_14 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_14 extends unknown ? [Head] extends [LayerNode.Graph<T_14, unknown, LayerNode.Tag<string> | undefined>] ? T_14 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_15 ? T_15 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_15 extends unknown ? [Head] extends [LayerNode.Graph<T_15, unknown, LayerNode.Tag<string> | undefined>] ? T_15 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_16 ? T_16 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_16 extends unknown ? [Head] extends [LayerNode.Graph<T_16, unknown, LayerNode.Tag<string> | undefined>] ? T_16 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_17 ? T_17 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_17 extends unknown ? [Head] extends [LayerNode.Graph<T_17, unknown, LayerNode.Tag<string> | undefined>] ? T_17 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_18 ? T_18 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_18 extends unknown ? [Head] extends [LayerNode.Graph<T_18, unknown, LayerNode.Tag<string> | undefined>] ? T_18 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_19 ? T_19 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_19 extends unknown ? [Head] extends [LayerNode.Graph<T_19, unknown, LayerNode.Tag<string> | undefined>] ? T_19 : never : never : never : never : never>;
     });
-    readonly tag?: LayerNode.Tag<"location"> | undefined;
 }, "tag"> | Omit<{
     readonly name: string;
     readonly service?: never;
 } & {
-    readonly layer: Implementation;
-    readonly deps: Items & ([Exclude<import("effect/Layer").Services<Implementation>, LayerNode.Output<NoInfer<Items>[number]>>] extends [never] ? unknown : {
-        readonly "Missing dependencies": Exclude<import("effect/Layer").Services<Implementation>, LayerNode.Output<NoInfer<Items>[number]>>;
+    readonly tag: LayerNode.Tag<"location">;
+} & {
+    readonly layer: Implementation & ([NoInfer<Implementation>] extends [import("effect/Layer").Layer<never, unknown, unknown>] ? unknown : {
+        readonly "Layer contract must be preserved": NoInfer<Implementation>;
+    });
+    readonly deps: Items & ([Exclude<import("effect/Layer").Services<Implementation>, [NoInfer<Items>] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? /*elided*/ any : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_20 ? T_20 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_20 extends unknown ? [Head] extends [LayerNode.Graph<T_20, unknown, LayerNode.Tag<string> | undefined>] ? T_20 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_21 ? T_21 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_21 extends unknown ? [Head] extends [LayerNode.Graph<T_21, unknown, LayerNode.Tag<string> | undefined>] ? T_21 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_22 ? T_22 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_22 extends unknown ? [Head] extends [LayerNode.Graph<T_22, unknown, LayerNode.Tag<string> | undefined>] ? T_22 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_23 ? T_23 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_23 extends unknown ? [Head] extends [LayerNode.Graph<T_23, unknown, LayerNode.Tag<string> | undefined>] ? T_23 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_24 ? T_24 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_24 extends unknown ? [Head] extends [LayerNode.Graph<T_24, unknown, LayerNode.Tag<string> | undefined>] ? T_24 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_25 ? T_25 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_25 extends unknown ? [Head] extends [LayerNode.Graph<T_25, unknown, LayerNode.Tag<string> | undefined>] ? T_25 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_26 ? T_26 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_26 extends unknown ? [Head] extends [LayerNode.Graph<T_26, unknown, LayerNode.Tag<string> | undefined>] ? T_26 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_27 ? T_27 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_27 extends unknown ? [Head] extends [LayerNode.Graph<T_27, unknown, LayerNode.Tag<string> | undefined>] ? T_27 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_28 ? T_28 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_28 extends unknown ? [Head] extends [LayerNode.Graph<T_28, unknown, LayerNode.Tag<string> | undefined>] ? T_28 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_29 ? T_29 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_29 extends unknown ? [Head] extends [LayerNode.Graph<T_29, unknown, LayerNode.Tag<string> | undefined>] ? T_29 : never : never : never : never : never>] extends [never] ? unknown : {
+        readonly "Missing dependencies": Exclude<import("effect/Layer").Services<Implementation>, [NoInfer<Items>] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? [Tail] extends [readonly [infer Head extends /*elided*/ any, ...infer Tail extends readonly /*elided*/ any[]]] ? /*elided*/ any : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_30 ? T_30 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_30 extends unknown ? [Head] extends [LayerNode.Graph<T_30, unknown, LayerNode.Tag<string> | undefined>] ? T_30 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_31 ? T_31 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_31 extends unknown ? [Head] extends [LayerNode.Graph<T_31, unknown, LayerNode.Tag<string> | undefined>] ? T_31 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_32 ? T_32 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_32 extends unknown ? [Head] extends [LayerNode.Graph<T_32, unknown, LayerNode.Tag<string> | undefined>] ? T_32 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_33 ? T_33 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_33 extends unknown ? [Head] extends [LayerNode.Graph<T_33, unknown, LayerNode.Tag<string> | undefined>] ? T_33 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_34 ? T_34 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_34 extends unknown ? [Head] extends [LayerNode.Graph<T_34, unknown, LayerNode.Tag<string> | undefined>] ? T_34 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_35 ? T_35 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_35 extends unknown ? [Head] extends [LayerNode.Graph<T_35, unknown, LayerNode.Tag<string> | undefined>] ? T_35 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_36 ? T_36 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_36 extends unknown ? [Head] extends [LayerNode.Graph<T_36, unknown, LayerNode.Tag<string> | undefined>] ? T_36 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_37 ? T_37 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_37 extends unknown ? [Head] extends [LayerNode.Graph<T_37, unknown, LayerNode.Tag<string> | undefined>] ? T_37 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_38 ? T_38 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_38 extends unknown ? [Head] extends [LayerNode.Graph<T_38, unknown, LayerNode.Tag<string> | undefined>] ? T_38 : never : never : never : never : (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) extends infer T_39 ? T_39 extends (Head extends LayerNode.Graph<infer A, unknown, LayerNode.Tag<string> | undefined> ? A : never) ? T_39 extends unknown ? [Head] extends [LayerNode.Graph<T_39, unknown, LayerNode.Tag<string> | undefined>] ? T_39 : never : never : never : never : never>;
     });
-    readonly tag?: LayerNode.Tag<"location"> | undefined;
-}, "tag">) & ([Exclude<Items[number], LayerNode.Node<unknown, unknown, LayerNode.Tag<"location" | "global"> | undefined>>] extends [never] ? unknown : {
-    readonly "Invalid tag dependencies": Exclude<Items[number], LayerNode.Node<unknown, unknown, LayerNode.Tag<"location" | "global"> | undefined>>;
-})) => LayerNode.Node<import("effect/Layer").Success<Implementation>, import("effect/Layer").Error<Implementation> | LayerNode.Error<Items[number]>, LayerNode.Tag<"location">>;
+}, "tag">) & ([Exclude<[Items[number]] extends [never] ? undefined : Items[number] extends infer T_40 ? T_40 extends Items[number] ? T_40 extends LayerNode.Graph<never, unknown, infer T_41 extends LayerNode.Tag<string> | undefined> ? T_41 : never : never : never, LayerNode.Tag<"location" | "global"> | undefined>] extends [never] ? unknown : {
+    readonly "Invalid tag dependencies": Exclude<[Items[number]] extends [never] ? undefined : Items[number] extends infer T_42 ? T_42 extends Items[number] ? T_42 extends LayerNode.Graph<never, unknown, infer T_41 extends LayerNode.Tag<string> | undefined> ? T_41 : never : never : never, LayerNode.Tag<"location" | "global"> | undefined>;
+})) => LayerNode.Provider<import("effect/Layer").Success<Implementation> extends infer T_43 ? T_43 extends import("effect/Layer").Success<Implementation> ? T_43 extends unknown ? [Implementation] extends [import("effect/Layer").Layer<T_43, unknown, unknown>] ? T_43 : never : never : never : never, import("effect/Layer").Error<Implementation> | LayerNode.Error<Items[number]>, LayerNode.Tag<"location">>;
 export * as Node from "./app-node.js";

package/dist/effect/layer-node.d.ts

@@ -1,79 +1,135 @@
 import { Brand, Context, Layer } from "effect";
-type AnyNode = Node<unknown, unknown, any>;
-type NodeList<Item extends AnyNode = AnyNode> = readonly [] | readonly [Item, ...Item[]];
-export type Output<Item> = [Item] extends [never] ? never : Item extends Node<infer A, unknown, any> ? A : never;
-export type Error<Item> = [Item] extends [never] ? never : Item extends Node<unknown, infer E, any> ? E : never;
-type NodeTag<Item> = [Item] extends [never] ? undefined : Item extends Node<unknown, unknown, infer T> ? T : never;
-type Missing<Required, Dependencies extends NodeList> = Exclude<Required, Output<Dependencies[number]>>;
-type CheckDependencies<Implementation extends Layer.Any, Dependencies extends NodeList> = [
-    Missing<Layer.Services<Implementation>, Dependencies>
-] extends [never] ? unknown : {
-    readonly "Missing dependencies": Missing<Layer.Services<Implementation>, Dependencies>;
-};
-declare const $OutputType: unique symbol;
-declare const $ErrorType: unique symbol;
+export * as LayerNode from "./layer-node.js";
+declare const GraphTypeId: unique symbol;
+declare const VarianceTypeId: unique symbol;
+declare const NodeTypeId: unique symbol;
+declare const ReplacementTypeId: unique symbol;
 export type Tag<Name extends string = string> = Name & Brand.Brand<"LayerNode.Tag">;
-export interface Node<A, E = never, T extends Tag | undefined = undefined> {
-    readonly kind: "layer" | "unbound" | "group";
+export type Graph<A, E = never, T extends Tag | undefined = Tag | undefined> = GraphValue<A, E, T>;
+export type Node<A, E = never, T extends Tag | undefined = undefined> = NodeValue<A, E, T>;
+export type Provider<A, E = never, T extends Tag | undefined = undefined> = ProviderNode<A, E, T>;
+export type Replacement = ReplacementValue;
+export type Replacements = readonly Replacement[];
+type AnyGraph = Graph<never, unknown>;
+type AnyNode = AnyGraph & {
+    readonly [NodeTypeId]: unknown;
+    readonly tag: Tag | undefined;
+};
+type RuntimeLayer = Layer.Layer<never, unknown, unknown>;
+type GraphList = readonly [] | readonly [AnyGraph, ...AnyGraph[]];
+export type Output<Item> = CommonOutput<Item, Item extends Graph<infer A, unknown> ? A : never>;
+export type Error<Item> = Item extends Graph<never, infer E> ? E : never;
+type GraphTag<Item> = [Item] extends [never] ? undefined : Item extends Graph<never, unknown, infer T> ? T : never;
+type CommonOutput<Item, A> = A extends unknown ? ([Item] extends [Graph<A, unknown>] ? A : never) : never;
+type LayerOutput<Item extends Layer.Any, A = Layer.Success<Item>> = A extends unknown ? [Item] extends [Layer.Layer<A, unknown, unknown>] ? A : never : never;
+type ListOutput<Items extends readonly AnyGraph[], A = never> = [Items] extends [
+    readonly [infer Head extends AnyGraph, ...infer Tail extends readonly AnyGraph[]]
+] ? ListOutput<Tail, A | Output<Head>> : A;
+type Definition = {
+    readonly kind: "group";
+    readonly name: string;
+    readonly dependencies: readonly AnyGraph[];
+} | {
+    readonly kind: "unbound";
+    readonly name: string;
+} | {
+    readonly kind: "layer";
     readonly name: string;
-    readonly service?: Context.Service.Any;
-    readonly implementation?: Layer.Any;
-    readonly dependencies: readonly AnyNode[];
-    readonly tag?: T;
-    readonly [$OutputType]?: () => A;
-    readonly [$ErrorType]?: () => E;
+    readonly implementation: RuntimeLayer;
+    readonly dependencies: readonly AnyGraph[];
+};
+declare class GraphValue<in A, out E, out T extends Tag | undefined> {
+    private readonly graph;
+    readonly [VarianceTypeId]: {
+        readonly output: (_: A) => void;
+        readonly error: () => E;
+        readonly tags: () => T;
+    };
+    readonly [GraphTypeId]: Definition;
+    constructor(definition: Definition);
+    get name(): string;
+}
+declare class NodeValue<in out A, in out E, in out T extends Tag | undefined> extends GraphValue<A, E, T> {
+    readonly tag: T;
+    readonly [NodeTypeId]: (_: [A, E, T]) => [A, E, T];
+    constructor(definition: Exclude<Definition, {
+        kind: "group";
+    }>, tag: T);
+    /** Replace this declaration, including every dependency on it, without acquiring its old wiring. */
+    replace<const Target extends AnyNode | Layer.Any>(this: Node<A, E, T>, replacement: Target & CheckReplacement<A, E, T, Target>): Replacement;
+}
+declare class ProviderNode<in out A, in out E, in out T extends Tag | undefined> extends NodeValue<A, E, T> {
+    /** Decorate the implementation while preserving its dependency wiring and service contract. */
+    mapLayer(this: Provider<A, E, T>, f: <R>(layer: Layer.Layer<A, E, R>) => Layer.Layer<A, E, R>): Provider<A, E, T>;
 }
-type NodeIdentity = {
+declare class ReplacementValue {
+    private readonly checked;
+    readonly [ReplacementTypeId]: {
+        readonly source: AnyNode;
+        readonly target: AnyNode;
+    };
+    constructor(source: AnyNode, target: AnyNode);
+}
+type CheckErrors<Expected, Actual> = [Exclude<Actual, Expected>] extends [never] ? never : {
+    readonly "New replacement errors": Exclude<Actual, Expected>;
+};
+type CheckReplacement<A, E, T, Target> = [ReplacementErrors<A, E, T, Target>] extends [never] ? unknown : ReplacementErrors<A, E, T, Target>;
+type ReplacementErrors<A, E, T, Target> = Target extends AnyNode ? [Exclude<A, Output<Target>>] extends [never] ? [GraphTag<Target>] extends [T] ? CheckErrors<E, Error<Target>> : {
+    readonly "Invalid replacement tag": GraphTag<Target>;
+} : {
+    readonly "Missing replacement outputs": Exclude<A, Output<Target>>;
+} : Target extends Layer.Layer<A, infer E2, never> ? CheckErrors<E, E2> : {
+    readonly "Replacement must be a closed layer": Target;
+};
+type CheckDependencies<Implementation extends Layer.Any, Items extends GraphList> = [
+    Exclude<Layer.Services<Implementation>, ListOutput<Items>>
+] extends [never] ? unknown : {
+    readonly "Missing dependencies": Exclude<Layer.Services<Implementation>, ListOutput<Items>>;
+};
+type Identity = {
     readonly service: Context.Service.Any;
     readonly name?: never;
 } | {
     readonly name: string;
     readonly service?: never;
 };
+type CheckLayer<Implementation> = [Implementation] extends [RuntimeLayer] ? unknown : {
+    readonly "Layer contract must be preserved": Implementation;
+};
+type TagInput<T> = {
+    readonly tag: T;
+} | ([T] extends [undefined] ? {
+    readonly tag?: undefined;
+} : never);
+type MakeInput<Implementation extends Layer.Any, Items extends GraphList, T extends Tag | undefined> = Identity & TagInput<T> & {
+    readonly layer: Implementation & CheckLayer<NoInfer<Implementation>>;
+    readonly deps: Items & CheckDependencies<Implementation, NoInfer<Items>>;
+};
 type DistributiveOmit<A, K extends PropertyKey> = A extends unknown ? Omit<A, K> : never;
 export type TagConfig = Readonly<Record<string, readonly string[]>>;
 type TagNames<Config extends TagConfig> = keyof Config & string;
-type NodeInTags<Names extends string> = Node<unknown, unknown, Tag<Names> | undefined>;
-type CheckTags<Items extends NodeList, Names extends string> = [Exclude<Items[number], NodeInTags<Names>>] extends [
-    never
-] ? unknown : {
-    readonly "Invalid tag dependencies": Exclude<Items[number], NodeInTags<Names>>;
+type CheckTags<Items extends GraphList, Names extends string> = [
+    Exclude<GraphTag<Items[number]>, Tag<Names> | undefined>
+] extends [never] ? unknown : {
+    readonly "Invalid tag dependencies": Exclude<GraphTag<Items[number]>, Tag<Names> | undefined>;
 };
 export interface Tags<Config extends TagConfig> {
     readonly values: {
         readonly [Name in TagNames<Config>]: Tag<Name>;
     };
-    readonly make: <Name extends TagNames<Config>>(name: Name) => <const Implementation extends Layer.Any, const Items extends NodeList>(input: DistributiveOmit<MakeInput<Implementation, Items, Tag<Name>>, "tag"> & CheckTags<Items, Name | Extract<Config[Name][number], string>>) => Node<Layer.Success<Implementation>, Layer.Error<Implementation> | Error<Items[number]>, Tag<Name>>;
+    readonly make: <Name extends TagNames<Config>>(name: Name) => <const Implementation extends Layer.Any, const Items extends GraphList>(input: DistributiveOmit<MakeInput<Implementation, Items, Tag<Name>>, "tag"> & CheckTags<Items, Name | Extract<Config[Name][number], string>>) => Provider<LayerOutput<Implementation>, Layer.Error<Implementation> | Error<Items[number]>, Tag<Name>>;
 }
 export declare function tags<const Config extends {
     readonly [Name in keyof Config]: readonly (keyof Config & string)[];
 }>(config: Config): Tags<Config>;
-type MakeInput<Implementation extends Layer.Any, Items extends NodeList, T extends Tag | undefined = undefined> = NodeIdentity & {
-    readonly layer: Implementation;
-    readonly deps: Items & CheckDependencies<Implementation, NoInfer<Items>>;
-    readonly tag?: T;
-};
-export declare function make<const Implementation extends Layer.Any, const Items extends NodeList, const T extends Tag | undefined = undefined>(input: MakeInput<Implementation, Items, T>): Node<Layer.Success<Implementation>, Layer.Error<Implementation> | Error<Items[number]>, T>;
+export declare function make<const Implementation extends Layer.Any, const Items extends GraphList, const T extends Tag | undefined = undefined>(input: MakeInput<Implementation, Items, T>): Provider<LayerOutput<Implementation>, Layer.Error<Implementation> | Error<Items[number]>, T>;
 export declare function unbound<R, Shape, const T extends Tag>(service: Context.Key<R, Shape>, tag: T): Node<R, never, T>;
-export declare function group<const Items extends readonly AnyNode[]>(dependencies: Items): Node<Output<Items[number]>, Error<Items[number]>, NodeTag<Items[number]>>;
-export type Replacement = readonly [source: AnyNode, replacement: AnyNode | Layer.Any];
-export type Replacements = readonly Replacement[];
-type CheckReplacementErrors<SourceError, ReplacementError> = [Exclude<ReplacementError, SourceError>] extends [never] ? unknown : {
-    readonly "New replacement errors": Exclude<ReplacementError, SourceError>;
-};
-type CheckReplacement<Item> = Item extends readonly [Node<infer A, infer E, infer T>, infer Replacement] ? Replacement extends Node<NoInfer<A>, infer E2, T> ? CheckReplacementErrors<E, NoInfer<E2>> : Replacement extends Layer.Layer<NoInfer<A>, infer E2, never> ? CheckReplacementErrors<E, NoInfer<E2>> : {
-    readonly "Invalid replacement": Replacement;
-} : {
-    readonly "Invalid replacement": Item;
-};
-type CheckReplacements<Items extends Replacements> = {
-    readonly [K in keyof Items]: CheckReplacement<Items[K]>;
-};
-type ValidReplacements<Items extends Replacements> = Items & CheckReplacements<Items>;
-export declare function hoist<A, E, T extends Tag, const Items extends Replacements = readonly []>(root: Node<A, E, any>, tag: T, replacements?: ValidReplacements<Items>): {
-    readonly node: Node<A, E>;
-    readonly hoisted: Node<unknown, E>;
-};
-export declare function compile<A, E, const Items extends Replacements = readonly []>(root: Node<A, E, any>, replacements?: ValidReplacements<Items>): Layer.Layer<A, E>;
-export declare function hasUnbound(root: Node<unknown, unknown, any>, source: AnyNode): boolean;
-export * as LayerNode from "./layer-node.js";
+/** Ordered, associative composition. Only these roots' outputs are exposed; their dependencies remain private. */
+export declare function group<const Items extends readonly AnyGraph[]>(dependencies: Items): Graph<ListOutput<Items>, Error<Items[number]>, GraphTag<Items[number]>>;
+export interface CompileOptions {
+    readonly replacements?: Replacements;
+    /** Share subgraphs rooted at this tag; give the remaining wiring a fresh map for each build. */
+    readonly shared?: Tag;
+}
+/** Resolve the final overrides before validating or acquiring anything. Effect owns acquisition and finalization. */
+export declare function compile<A, E>(root: Graph<A, E>, options?: CompileOptions): Layer.Layer<A, E>;

package/dist/effect/layer-node.js

@@ -1,181 +1,156 @@
-import { Brand, Context, Layer } from "effect";
+import { Brand, Context, Effect, Layer } from "effect";
+export * as LayerNode from "./layer-node.js";
+const GraphTypeId = Symbol("LayerNode.Graph");
+const VarianceTypeId = Symbol("LayerNode.Variance");
+const NodeTypeId = Symbol("LayerNode.Node");
+const ReplacementTypeId = Symbol("LayerNode.Replacement");
 const makeTag = Brand.nominal();
+class GraphValue {
+    [GraphTypeId];
+    constructor(definition) {
+        this[GraphTypeId] = definition;
+    }
+    get name() {
+        return this[GraphTypeId].name;
+    }
+}
+class NodeValue extends GraphValue {
+    tag;
+    constructor(definition, tag) {
+        super(definition);
+        this.tag = tag;
+    }
+    /** Replace this declaration, including every dependency on it, without acquiring its old wiring. */
+    replace(replacement) {
+        if (replacement instanceof NodeValue) {
+            if (replacement.tag !== this.tag)
+                throw new Error(`Cannot replace ${this.name} across tags`);
+            return new ReplacementValue(this, replacement);
+        }
+        if (!Layer.isLayer(replacement))
+            throw new Error("A replacement must be a node or an Effect Layer");
+        return new ReplacementValue(this, makeProvider({ name: this.name, layer: replacement, deps: [] }, this.tag));
+    }
+}
+class ProviderNode extends NodeValue {
+    /** Decorate the implementation while preserving its dependency wiring and service contract. */
+    mapLayer(f) {
+        const definition = this[GraphTypeId];
+        if (definition.kind !== "layer")
+            throw new Error(`Cannot map unbound layer node: ${this.name}`);
+        return new ProviderNode({ ...definition, implementation: f(definition.implementation) }, this.tag);
+    }
+}
+class ReplacementValue {
+    [ReplacementTypeId];
+    constructor(source, target) {
+        this[ReplacementTypeId] = { source, target };
+    }
+}
 export function tags(config) {
     const names = Object.keys(config);
     const values = Object.fromEntries(names.map((name) => [name, makeTag(name)]));
     return {
         values,
-        make: ((name) => (input) => make({ ...input, tag: values[name] })),
+        make: (name) => (input) => makeProvider(input, values[name]),
     };
 }
 export function make(input) {
-    return {
+    return makeProvider(input, input.tag);
+}
+function makeProvider(input, tag) {
+    if (!Layer.isLayer(input.layer))
+        throw new Error("A layer node requires an Effect Layer");
+    return new ProviderNode({
         kind: "layer",
         name: input.service !== undefined ? input.service.key : input.name,
-        service: input.service,
         implementation: input.layer,
-        dependencies: input.deps,
-        tag: input.tag,
-    };
+        dependencies: [...input.deps],
+    }, tag);
 }
 export function unbound(service, tag) {
-    return {
-        kind: "unbound",
-        name: service.key,
-        service,
-        dependencies: [],
-        tag,
-    };
+    return new NodeValue({ kind: "unbound", name: service.key }, tag);
 }
+/** Ordered, associative composition. Only these roots' outputs are exposed; their dependencies remain private. */
 export function group(dependencies) {
-    return { kind: "group", name: "group", dependencies };
-}
-function replacementNode(source, replacement) {
-    const replacementNode = isNode(replacement)
-        ? replacement
-        : make({
-            ...nodeMakeIdentity(source),
-            layer: replacement,
-            deps: [],
-            tag: source.tag,
-        });
-    if (source.name !== replacementNode.name) {
-        throw new Error(`Cannot replace ${source.name} with ${replacementNode.name}`);
-    }
-    if (source.tag !== replacementNode.tag) {
-        throw new Error(`Cannot replace ${source.name} across tags`);
-    }
-    return replacementNode;
-}
-function nodeMakeIdentity(node) {
-    if (node.service !== undefined)
-        return { service: node.service };
-    return { name: node.name };
-}
-function isNode(input) {
-    return "kind" in input && "dependencies" in input;
+    return new GraphValue({ kind: "group", name: "group", dependencies: [...dependencies] });
 }
-function walk(root, visit, options = {}) {
-    const cache = options.cache ?? new Map();
-    const visiting = new Set();
-    const stack = [];
-    const recur = (node) => {
-        const target = options.resolve?.(node) ?? node;
-        const cached = cache.get(target);
-        if (cached !== undefined || cache.has(target))
-            return cached;
-        if (visiting.has(target)) {
-            const start = stack.indexOf(target);
-            throw new Error(`Cycle detected in layer tree: ${[...stack.slice(start), target].map((item) => item.name).join(" -> ")}`);
-        }
-        visiting.add(target);
-        stack.push(target);
-        try {
-            const result = visit(target, { visit: recur });
-            if (!cache.has(target))
-                cache.set(target, result);
-            return result;
-        }
-        finally {
-            stack.pop();
-            visiting.delete(target);
-        }
+/** Resolve the final overrides before validating or acquiring anything. Effect owns acquisition and finalization. */
+export function compile(root, options = {}) {
+    const shared = options.shared;
+    const replacements = new Map(options.replacements?.map((item) => {
+        const replacement = item[ReplacementTypeId];
+        return [replacement.source, replacement.target];
+    }));
+    const cache = {
+        shared: new Map(),
+        local: new Map(),
     };
-    return recur(root);
-}
-export function hoist(root, tag, replacements) {
-    const hoisted = new Map();
-    const replacementMap = replacementMapFrom(replacements);
-    const node = walk(root, (node, context) => {
-        if (node.kind === "group") {
-            return { ...node, dependencies: node.dependencies.map(context.visit) };
-        }
-        if (node.tag === tag) {
-            const existing = hoisted.get(node.name);
-            if (existing && existing.implementation !== node.implementation) {
-                throw new Error(`Tag ${tag} has conflicting implementations for ${node.name}`);
-            }
-            hoisted.set(node.name, rewriteReplacementDependencies(node, replacementMap));
-            return group([]);
-        }
-        if (node.kind === "unbound") {
-            return node;
-        }
-        return { ...node, dependencies: node.dependencies.map(context.visit) };
-    }, { resolve: (node) => replacementMap.get(node.name) ?? node });
-    return {
-        node: node,
-        hoisted: group(Array.from(hoisted.values())),
-    };
-}
-export function compile(root, replacements) {
-    const replacementMap = replacementMapFrom(replacements);
-    const cache = new Map();
-    const compileNode = (node) => walk(node, (node, context) => {
-        if (node.kind === "unbound")
-            throw new Error(`Unbound layer node: ${node.name}`);
-        const dependencies = node.dependencies.flatMap(flatten).map(context.visit);
-        const implementation = node.implementation;
-        return dependencies.length === 0
-            ? implementation
-            : implementation.pipe(Layer.provide(dependencies));
-    }, { cache, resolve: (node) => replacementMap.get(node.name) ?? node });
-    const layers = flatten(root).map((node) => compileNode(node));
-    const layer = layers.reduce((result, layer) => layer.pipe(Layer.provideMerge(result)), Layer.empty);
-    return layer;
-}
-function replacementMapFrom(replacements) {
-    return (replacements?.reduce((map, [source, replacement]) => {
-        const normalized = rewriteReplacementDependencies(replacementNode(source, replacement), map);
-        const current = new Map([[source.name, normalized]]);
-        for (const [name, node] of map)
-            map.set(name, rewriteReplacementDependencies(node, current));
-        map.set(source.name, normalized);
-        return map;
-    }, new Map()) ?? new Map());
-}
-function rewriteReplacementDependencies(root, replacements) {
-    if (replacements.size === 0)
-        return root;
-    const cache = new Map();
-    const visiting = new Set();
     const stack = [];
-    const recur = (node, isRoot = false) => {
-        const target = isRoot ? node : (replacements.get(node.name) ?? node);
-        const cached = cache.get(target);
-        if (cached !== undefined || cache.has(target))
+    const definitions = { shared: new Map(), local: new Map() };
+    const resolve = (graph, inherited = false) => {
+        const definition = graph[GraphTypeId];
+        const isShared = inherited || (shared !== undefined && graph instanceof NodeValue && graph.tag === shared);
+        const resolved = isShared ? cache.shared : cache.local;
+        const cached = resolved.get(graph);
+        if (cached)
             return cached;
-        if (visiting.has(target)) {
-            const start = stack.indexOf(target);
-            throw new Error(`Cycle detected in layer tree: ${[...stack.slice(start), target].map((item) => item.name).join(" -> ")}`);
-        }
-        visiting.add(target);
-        stack.push(target);
-        try {
-            const dependencies = target.dependencies.map((dependency) => recur(dependency));
-            const result = dependencies.every((dependency, index) => dependency === target.dependencies[index])
-                ? target
-                : { ...target, dependencies };
-            cache.set(target, result);
-            return result;
-        }
-        finally {
-            stack.pop();
-            visiting.delete(target);
+        const cycle = stack.indexOf(graph);
+        if (cycle !== -1) {
+            throw new Error(`Cycle detected in layer graph: ${[...stack.slice(cycle), graph].map((item) => item.name).join(" -> ")}`);
         }
+        stack.push(graph);
+        const replacement = replacements.get(graph);
+        const result = (() => {
+            if (replacement && replacement !== graph)
+                return resolve(replacement, isShared);
+            if (definition.kind === "group")
+                return definition.dependencies.flatMap((dependency) => resolve(dependency, isShared));
+            if (definition.kind === "unbound")
+                throw new Error(`Unbound layer node: ${definition.name}`);
+            const node = {
+                implementation: definition.implementation,
+                dependencies: definition.dependencies.flatMap((dependency) => resolve(dependency, isShared)),
+                shared: isShared,
+            };
+            const registry = node.shared ? definitions.shared : definitions.local;
+            const existing = registry.get(node.implementation);
+            if (existing) {
+                if (existing.dependencies.length !== node.dependencies.length ||
+                    existing.dependencies.some((dependency, index) => dependency !== node.dependencies[index])) {
+                    throw new Error(`Layer ${definition.name} is wired to different dependencies; use a distinct implementation Layer`);
+                }
+                return [existing];
+            }
+            registry.set(node.implementation, node);
+            return [node];
+        })();
+        stack.pop();
+        resolved.set(graph, result);
+        return result;
     };
-    return recur(root, true);
-}
-export function hasUnbound(root, source) {
-    if (source.kind !== "unbound")
-        throw new Error(`Cannot check non-unbound layer node: ${source.name}`);
-    return walk(root, (node, context) => {
-        if (node === source)
-            return true;
-        return node.dependencies.some(context.visit);
+    const roots = resolve(root);
+    return Layer.fromBuild((memoMap, scope) => {
+        const local = shared === undefined ? memoMap : Layer.makeMemoMapUnsafe();
+        const ambient = Layer.succeed(Layer.CurrentMemoMap, memoMap);
+        const layers = new Map();
+        const build = (node) => {
+            const cached = layers.get(node);
+            if (cached)
+                return cached;
+            const dependencies = node.dependencies.map(build);
+            // Acquisition uses the selected cache, while lazy LayerMaps inherit the enclosing shared cache.
+            const implementation = Layer.suspend(() => node.implementation.pipe(Layer.provide([ambient, ...dependencies])));
+            const layer = Layer.fromBuild((_, scope) => buildContext(implementation, node.shared ? memoMap : local, scope));
+            layers.set(node, layer);
+            return layer;
+        };
+        return buildContext(roots.map(build).reduce((result, layer) => layer.pipe(Layer.provideMerge(result)), Layer.empty), memoMap, scope);
     });
 }
-function flatten(node) {
-    return node.kind === "group" ? node.dependencies.flatMap(flatten) : [node];
+class BuildResult extends Context.Service()("@opencode/LayerNode/BuildResult") {
+}
+function buildContext(layer, memoMap, scope) {
+    // Preserve the exact output context before Effect appends its own memo-map metadata.
+    return Layer.buildWithMemoMap(layer.pipe(Layer.flatMap((context) => Layer.succeed(BuildResult, context))), memoMap, scope).pipe(Effect.map(Context.get(BuildResult)));
 }
-export * as LayerNode from "./layer-node.js";

package/dist/effect-flock.d.ts

@@ -26,6 +26,6 @@ export declare namespace EffectFlock {
     const Service_base: Context.ServiceClass<Service, "EffectFlock", Interface>;
     export class Service extends Service_base {
     }
-    export const node: import("./effect/layer-node.js").Node<Service, never, import("./effect/layer-node.js").Tag<"global">>;
+    export const node: import("./effect/layer-node.js").Provider<Service, never, import("./effect/layer-node.js").Tag<"global">>;
     export {};
 }

package/dist/fs-util.d.ts

@@ -84,7 +84,7 @@ export declare namespace FSUtil {
         readonly makeTempDirectoryScoped: (options?: {
             readonly directory?: string | undefined;
             readonly prefix?: string | undefined;
-        } | undefined) => Effect.Effect<string, PlatformError, Service | import("effect/Scope").Scope>;
+        } | undefined) => Effect.Effect<string, PlatformError, import("effect/Scope").Scope | Service>;
         readonly makeTempFile: (options?: {
             readonly directory?: string | undefined;
             readonly prefix?: string | undefined;
@@ -94,11 +94,11 @@ export declare namespace FSUtil {
             readonly directory?: string | undefined;
             readonly prefix?: string | undefined;
             readonly suffix?: string | undefined;
-        } | undefined) => Effect.Effect<string, PlatformError, Service | import("effect/Scope").Scope>;
+        } | undefined) => Effect.Effect<string, PlatformError, import("effect/Scope").Scope | Service>;
         readonly open: (path: string, options?: {
             readonly flag?: FileSystem.OpenFlag | undefined;
             readonly mode?: number | undefined;
-        } | undefined) => Effect.Effect<FileSystem.File, PlatformError, Service | import("effect/Scope").Scope>;
+        } | undefined) => Effect.Effect<FileSystem.File, PlatformError, import("effect/Scope").Scope | Service>;
         readonly readDirectory: (path: string, options?: {
             readonly recursive?: boolean | undefined;
         } | undefined) => Effect.Effect<string[], PlatformError, Service>;
@@ -125,7 +125,7 @@ export declare namespace FSUtil {
         } | undefined) => Effect.Effect<void, PlatformError, Service>;
     };
     export const layer: Layer.Layer<Service, never, FileSystem.FileSystem>;
-    export const node: import("./effect/layer-node.js").Node<Service, never, import("./effect/layer-node.js").Tag<"global">>;
+    export const node: import("./effect/layer-node.js").Provider<Service, never, import("./effect/layer-node.js").Tag<"global">>;
     export function mimeType(p: string): string;
     export function normalizePath(p: string): string;
     export function normalizePathPattern(p: string): string;

package/dist/global.d.ts

@@ -25,6 +25,6 @@ export interface Interface {
     readonly repos: string;
 }
 export declare function make(input?: Partial<Interface>): Interface;
-export declare const node: import("./effect/layer-node.js").Node<Service, never, import("./effect/layer-node.js").Tag<"global">>;
+export declare const node: import("./effect/layer-node.js").Provider<Service, never, import("./effect/layer-node.js").Tag<"global">>;
 export declare const layerWith: (input: Partial<Interface>) => Layer.Layer<Service, never, never>;
 export * as Global from "./global.js";

package/dist/npm.d.ts

@@ -30,7 +30,7 @@ export declare function sanitize(pkg: string): string;
 export declare function isRegistryPackage(pkg: string): Promise<boolean>;
 export declare function isInstallablePackage(pkg: string): Promise<boolean>;
 export declare function cacheKey(pkg: string): Promise<string>;
-export declare const node: LayerNode.Node<Service, never, LayerNode.Tag<"global">>;
+export declare const node: LayerNode.Provider<Service, never, LayerNode.Tag<"global">>;
 export declare function add(...args: Parameters<Interface["add"]>): Promise<EntryPoint>;
 export declare function resolve(...args: Parameters<Interface["resolve"]>): Promise<EntryPoint>;
 export declare function which(...args: Parameters<Interface["which"]>): Promise<string | undefined>;

package/dist/observability/logging.d.ts

@@ -1,6 +1,6 @@
 import { Effect, FileSystem, Logger } from "effect";
 export declare function file(local?: boolean, channel?: string): string;
-export declare function fileLogger(target?: string, id?: string): Effect.Effect<Logger.Logger<unknown, void>, import("effect/PlatformError").PlatformError, FileSystem.FileSystem | import("effect/Scope").Scope>;
+export declare function fileLogger(target?: string, id?: string): Effect.Effect<Logger.Logger<unknown, void>, import("effect/PlatformError").PlatformError, import("effect/Scope").Scope | FileSystem.FileSystem>;
 export declare function minimumLogLevel(): "Error" | "Warn" | "Info" | "Debug";
-export declare function loggers(local?: boolean, channel?: string): (Logger.Logger<unknown, void> | Effect.Effect<Logger.Logger<unknown, void>, import("effect/PlatformError").PlatformError, FileSystem.FileSystem | import("effect/Scope").Scope>)[];
+export declare function loggers(local?: boolean, channel?: string): (Logger.Logger<unknown, void> | Effect.Effect<Logger.Logger<unknown, void>, import("effect/PlatformError").PlatformError, import("effect/Scope").Scope | FileSystem.FileSystem>)[];
 export * as Logging from "./logging.js";

package/dist/observability/otlp.d.ts

@@ -13,6 +13,6 @@ export declare function resource(app?: App): {
     serviceVersion: string;
     attributes: Record<string, string>;
 };
-export declare function loggers(options: Options | undefined, app: App): Effect.Effect<import("effect/Logger").Logger<unknown, void>, never, import("effect/unstable/http/HttpClient").HttpClient | Scope.Scope | import("effect/unstable/observability/OtlpExporter").Flusher | import("effect/unstable/observability/OtlpSerialization").OtlpSerialization>[];
+export declare function loggers(options: Options | undefined, app: App): Effect.Effect<import("effect/Logger").Logger<unknown, void>, never, Scope.Scope | import("effect/unstable/http/HttpClient").HttpClient | import("effect/unstable/observability/OtlpExporter").Flusher | import("effect/unstable/observability/OtlpSerialization").OtlpSerialization>[];
 export declare const tracingLayer: (options: Options | undefined, app: App) => Effect.Effect<Layer.Layer<never, never, never>, never, never>;
 export * as Otlp from "./otlp.js";

package/dist/observability.d.ts

@@ -10,4 +10,4 @@ export declare const Options: Schema.Struct<{
 }>;
 export type Options = typeof Options.Type;
 export declare function layer(options?: Options): Layer.Layer<never, never, never>;
-export declare const node: LayerNode.Node<never, never, undefined>;
+export declare const node: LayerNode.Provider<never, never, undefined>;

package/dist/process.d.ts

@@ -50,5 +50,5 @@ export declare const collectStream: (stream: Stream.Stream<Uint8Array, PlatformE
     buffer: Buffer<ArrayBuffer>;
     truncated: boolean;
 }, PlatformError, never>;
-export declare const node: import("./effect/layer-node.js").Node<Service, never, import("./effect/layer-node.js").Tag<"global">>;
+export declare const node: import("./effect/layer-node.js").Provider<Service, never, import("./effect/layer-node.js").Tag<"global">>;
 export * as AppProcess from "./process.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/util",
-  "version": "0.0.0-dev-18758",
+  "version": "0.0.0-dev-18759",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -40,7 +40,8 @@
   "scripts": {
     "build": "bun run script/build.ts",
     "test": "bun test --only-failures",
-    "typecheck": "tsgo --noEmit"
+    "typecheck": "tsgo --noEmit",
+    "typecheck:dist": "bun run build && bun typecheck --project tsconfig.dist.json"
   },
   "dependencies": {
     "@effect/opentelemetry": "4.0.0-rc.112",