test(core): simplify file mutation layer wiring

packages/core/src/file-mutation.ts

@@ -3,6 +3,7 @@ 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 {
@@ -171,6 +172,8 @@ 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,6 +2,7 @@ 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"
 
@@ -153,3 +154,5 @@ 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/test/file-mutation.test.ts

@@ -2,6 +2,7 @@ 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"
@@ -11,14 +12,16 @@ import { location } from "./fixture/location"
 import { tmpdir } from "./fixture/tmpdir"
 import { it } from "./lib/effect"
 
-function provide(directory: string, filesystem = FSUtil.defaultLayer) {
+function provide(directory: string, filesystem?: LayerNode.Replacement<FSUtil.Service>) {
-  const activeLocation = Layer.succeed(
+  const activeLocation = LayerNode.make(
-    Location.Service,
+    Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make(directory) }))),
-    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>) {
@@ -347,17 +350,20 @@ describe("FileMutation", () => {
 })
 
 function instrumentWrites(run: <E>(write: Effect.Effect<void, E>, target: string) => Effect.Effect<void, E>) {
-  return Layer.effect(
+  return LayerNode.replace(
-    FSUtil.Service,
+    FSUtil.node,
-    Effect.gen(function* () {
+    Layer.effect(
-      const filesystem = yield* FSUtil.Service
+      FSUtil.Service,
-      return FSUtil.Service.of({
+      Effect.gen(function* () {
-        ...filesystem,
+        const filesystem = yield* FSUtil.Service
-        writeWithDirs: (target, content, mode) => run(filesystem.writeWithDirs(target, content, mode), target),
+        return FSUtil.Service.of({
-        writeFile: (target, content, options) => run(filesystem.writeFile(target, content, options), target),
+          ...filesystem,
-        writeFileString: (target, content, options) =>
+          writeWithDirs: (target, content, mode) => run(filesystem.writeWithDirs(target, content, mode), target),
-          run(filesystem.writeFileString(target, content, options), target),
+          writeFile: (target, content, options) => run(filesystem.writeFile(target, content, options), target),
-      })
+          writeFileString: (target, content, options) =>
-    }),
+            run(filesystem.writeFileString(target, content, options), target),
-  ).pipe(Layer.provide(FSUtil.defaultLayer))
+        })
+      }),
+    ).pipe(Layer.provide(LayerNode.buildLayer(FSUtil.node))),
+  )
 }