test(core): simplify watcher layer wiring

packages/core/test/event.test.ts

@@ -3,7 +3,6 @@ import { Cause, DateTime, Deferred, Effect, Exit, Fiber, Layer, Schema, Stream }
 import { EventV2 } from "@opencode-ai/core/event"
 import { Database } from "@opencode-ai/core/database/database"
 import { EventSequenceTable, EventTable } from "@opencode-ai/core/event/sql"
-import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { Location } from "@opencode-ai/core/location"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { WorkspaceV2 } from "@opencode-ai/core/workspace"
@@ -18,10 +17,9 @@ const locationLayer = Layer.succeed(
     location({ directory: AbsolutePath.make("project"), workspaceID: WorkspaceV2.ID.make("wrk_test") }),
   ),
 )
-const locationNode = LayerNode.make(locationLayer, [])
-const eventNode = LayerNode.group([EventV2.node, Database.node])
-const it = testEffect(LayerNode.buildLayer(LayerNode.group([eventNode, locationNode])))
-const itWithoutLocation = testEffect(LayerNode.buildLayer(eventNode))
+const eventLayer = Layer.mergeAll(EventV2.defaultLayer, Database.defaultLayer)
+const it = testEffect(eventLayer.pipe(Layer.provideMerge(locationLayer)))
+const itWithoutLocation = testEffect(eventLayer)
 
 const Message = EventV2.define({
   type: "test.message",
@@ -468,15 +466,12 @@ describe("EventV2", () => {
       const continueRead = yield* Deferred.make<void>()
       let pause = true
       const database = Database.layerFromPath(":memory:")
-      const customEventNode = LayerNode.make(
-        EventV2.layerWith({
-          beforeAggregateRead: () =>
-            pause
-              ? Deferred.succeed(readStarted, undefined).pipe(Effect.andThen(Deferred.await(continueRead)))
-              : Effect.void,
-        }),
-        [Database.node],
-      )
+      const eventLayer = EventV2.layerWith({
+        beforeAggregateRead: () =>
+          pause
+            ? Deferred.succeed(readStarted, undefined).pipe(Effect.andThen(Deferred.await(continueRead)))
+            : Effect.void,
+      }).pipe(Layer.provide(database))
 
       yield* Effect.gen(function* () {
         const events = yield* EventV2.Service
@@ -493,16 +488,7 @@ describe("EventV2", () => {
         expect(Array.from(yield* Fiber.join(fiber)).map((event) => [event.cursor, event.event.data])).toEqual([
           [EventV2.Cursor.make(0), { id: aggregateID, text: "during handoff" }],
         ])
-      }).pipe(
-        Effect.provide(
-          LayerNode.buildLayer(EventV2.node, {
-            replacements: [
-              LayerNode.replaceWithNode(EventV2.node, customEventNode),
-              LayerNode.replace(Database.node, database),
-            ],
-          }),
-        ),
-      )
+      }).pipe(Effect.provide(Layer.mergeAll(database, eventLayer)))
     }),
   )
 

packages/core/test/filesystem/watcher.test.ts

@@ -4,6 +4,7 @@ import fs from "fs/promises"
 import path from "path"
 import { ConfigProvider, Deferred, Duration, Effect, Fiber, Layer, Option, Stream } from "effect"
 import { Config } from "@opencode-ai/core/config"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { EventV2 } from "@opencode-ai/core/event"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Watcher } from "@opencode-ai/core/filesystem/watcher"
@@ -18,7 +19,8 @@ const describeWatcher = Watcher.hasNativeBinding() && !process.env.CI ? describe
 
 type WatcherEvent = { file: string; event: "add" | "change" | "unlink" }
 
-const it = testEffect(Layer.mergeAll(FSUtil.defaultLayer, EventV2.defaultLayer))
+const root = LayerNode.group([FSUtil.node, EventV2.node])
+const it = testEffect(LayerNode.buildLayer(root))
 
 const configLayer = Layer.succeed(
   Config.Service,
@@ -26,6 +28,7 @@ const configLayer = Layer.succeed(
     entries: () => Effect.succeed([]),
   }),
 )
+const configNode = LayerNode.make(configLayer, [])
 
 const flagsLayer = ConfigProvider.layer(
   ConfigProvider.fromUnknown({
@@ -35,15 +38,21 @@ const flagsLayer = ConfigProvider.layer(
 )
 
 function provide(directory: string, vcs?: Location.Interface["vcs"]) {
-  const locationLayer = Layer.succeed(
-    Location.Service,
-    Location.Service.of(location({ directory: AbsolutePath.make(directory) }, { vcs })),
+  const locationNode = LayerNode.make(
+    Layer.succeed(
+      Location.Service,
+      Location.Service.of(location({ directory: AbsolutePath.make(directory) }, { vcs })),
+    ),
+    [],
   )
   return Effect.provide(
-    Watcher.layer.pipe(
-      Layer.provide(configLayer),
-      Layer.provide(Git.defaultLayer),
-      Layer.provide(locationLayer),
+    LayerNode.buildLayer(
+      LayerNode.group([
+        LayerNode.make(Watcher.layer, [configNode, EventV2.node, FSUtil.node, Git.node, locationNode]),
+        root,
+      ]),
+      { replacements: [LayerNode.replace(configNode, configLayer)] },
+    ).pipe(
       Layer.provide(flagsLayer),
     ),
   )
@@ -196,7 +205,7 @@ describeWatcher("Watcher", () => {
       yield* noUpdate((event) => event.file === file, fs.writeFileString(file, "gone")).pipe(
         Effect.provideService(EventV2.Service, events),
       )
-    }).pipe(Effect.provide(Layer.mergeAll(FSUtil.defaultLayer, EventV2.defaultLayer))),
+    }).pipe(Effect.provide(LayerNode.buildLayer(root))),
   )
 
   it.live("ignores .git/index changes", () =>