test(core): simplify config layer wiring

packages/core/src/config.ts

@@ -24,6 +24,7 @@ import { ConfigToolOutput } from "./config/tool-output"
 import { ConfigWatcher } from "./config/watcher"
 import { ConfigV1 } from "./v1/config/config"
 import { ConfigMigrateV1 } from "./v1/config/migrate"
+import { LayerNode } from "./effect/layer-node"
 
 export class Info extends Schema.Class<Info>("Config.Info")({
   $schema: Schema.optional(Schema.String).annotate({
@@ -218,3 +219,5 @@ export const layer = Layer.effect(
 )
 
 export const locationLayer = layer.pipe(Layer.provideMerge(Policy.locationLayer))
+export const node = (location: LayerNode.Node<Location.Service>, policy = Policy.node(location)) =>
+  LayerNode.make(layer, [FSUtil.node, Global.node, location, policy])

packages/core/src/file-mutation.ts

@@ -3,7 +3,6 @@ export * as FileMutation from "./file-mutation"
 import { Context, Effect, Layer, Schema } from "effect"
 import { dirname } from "path"
 import { KeyedMutex } from "./effect/keyed-mutex"
-import { LayerNode } from "./effect/layer-node"
 import { FSUtil } from "./fs-util"
 
 export interface Target {
@@ -172,8 +171,6 @@ export const layer = Layer.effect(
   }),
 )
 
-export const node = LayerNode.make(layer, [FSUtil.node])
-
 function splitBom(text: string) {
   const stripped = text.replace(/^\uFEFF+/, "")
   return { bom: stripped.length !== text.length, text: stripped }

packages/core/src/location-mutation.ts

@@ -2,7 +2,6 @@ export * as LocationMutation from "./location-mutation"
 
 import path from "path"
 import { Context, Effect, Layer, Schema } from "effect"
-import { LayerNode } from "./effect/layer-node"
 import { FSUtil } from "./fs-util"
 import { Location } from "./location"
 
@@ -154,5 +153,3 @@ export const layer = Layer.effect(
 )
 
 export const locationLayer = layer
-
-export const node = (location: LayerNode.Node<Location.Service>) => LayerNode.make(layer, [FSUtil.node, location])

packages/core/src/policy.ts

@@ -3,6 +3,7 @@ export * as Policy from "./policy"
 import { Context, Effect as EffectRuntime, Layer, Schema } from "effect"
 import { Wildcard } from "./util/wildcard"
 import { Location } from "./location"
+import { LayerNode } from "./effect/layer-node"
 
 export const Effect = Schema.Literals(["allow", "deny"]).annotate({ identifier: "Policy.Effect" })
 export type Effect = typeof Effect.Type
@@ -44,3 +45,4 @@ export const layer = Layer.effect(
 )
 
 export const locationLayer = layer
+export const node = (location: LayerNode.Node<Location.Service>) => LayerNode.make(layer, [location])

packages/core/test/config/config.test.ts

@@ -5,9 +5,9 @@ import { Effect, Layer, Schema } from "effect"
 import { FastCheck } from "effect/testing"
 import { Config } from "@opencode-ai/core/config"
 import { ConfigProvider } from "@opencode-ai/core/config/provider"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { ConfigMigrateV1 } from "@opencode-ai/core/v1/config/migrate"
 import { ConfigV1 } from "@opencode-ai/core/v1/config/config"
-import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Global } from "@opencode-ai/core/global"
 import { Location } from "@opencode-ai/core/location"
 import { Policy } from "@opencode-ai/core/policy"
@@ -25,10 +25,7 @@ function testLayer(
   projectDirectory = directory,
   vcs?: Project.Vcs,
 ) {
-  return Config.locationLayer.pipe(
+  const locationNode = LayerNode.make(
-    Layer.provide(FSUtil.defaultLayer),
-    Layer.provide(Global.layerWith({ config: globalDirectory })),
-    Layer.provide(
     Layer.succeed(
       Location.Service,
       Location.Service.of(
@@ -38,8 +35,14 @@ function testLayer(
         ),
       ),
     ),
-    ),
+    [],
   )
+  const policyNode = Policy.node(locationNode)
+  return LayerNode.buildLayer(LayerNode.group([Config.node(locationNode, policyNode), policyNode, locationNode]), {
+    replacements: [
+      LayerNode.replace(Global.node, Global.layerWith({ config: globalDirectory })),
+    ],
+  })
 }
 
 const provider = {

packages/core/test/file-mutation.test.ts

@@ -2,7 +2,6 @@ import fs from "fs/promises"
 import path from "path"
 import { describe, expect } from "bun:test"
 import { Deferred, Effect, Fiber, Layer } from "effect"
-import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { FileMutation } from "@opencode-ai/core/file-mutation"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Location } from "@opencode-ai/core/location"
@@ -12,16 +11,14 @@ import { location } from "./fixture/location"
 import { tmpdir } from "./fixture/tmpdir"
 import { it } from "./lib/effect"
 
-function provide(directory: string, filesystem?: LayerNode.Replacement<FSUtil.Service>) {
+function provide(directory: string, filesystem = FSUtil.defaultLayer) {
-  const activeLocation = LayerNode.make(
+  const activeLocation = Layer.succeed(
-    Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make(directory) }))),
+    Location.Service,
-    [],
+    Location.Service.of(location({ directory: AbsolutePath.make(directory) })),
-  )
-  return Effect.provide(
-    LayerNode.buildLayer(LayerNode.group([LocationMutation.node(activeLocation), FileMutation.node]), {
-      replacements: filesystem ? [filesystem] : [],
-    }),
   )
+  const resolution = LocationMutation.layer.pipe(Layer.provide(filesystem), Layer.provide(activeLocation))
+  const mutation = FileMutation.layer.pipe(Layer.provide(filesystem))
+  return Effect.provide(Layer.mergeAll(resolution, mutation))
 }
 
 function withTmp<A, E, R>(f: (directory: string) => Effect.Effect<A, E, R>) {
@@ -350,9 +347,7 @@ describe("FileMutation", () => {
 })
 
 function instrumentWrites(run: <E>(write: Effect.Effect<void, E>, target: string) => Effect.Effect<void, E>) {
-  return LayerNode.replace(
+  return Layer.effect(
-    FSUtil.node,
-    Layer.effect(
     FSUtil.Service,
     Effect.gen(function* () {
       const filesystem = yield* FSUtil.Service
@@ -364,6 +359,5 @@ function instrumentWrites(run: <E>(write: Effect.Effect<void, E>, target: string
           run(filesystem.writeFileString(target, content, options), target),
       })
     }),
-    ).pipe(Layer.provide(LayerNode.buildLayer(FSUtil.node))),
+  ).pipe(Layer.provide(FSUtil.defaultLayer))
-  )
 }