test(core): simplify command layer wiring

packages/core/src/command.ts

@@ -2,6 +2,7 @@ export * as CommandV2 from "./command"
 
 import { Context, Effect, Layer, Schema } from "effect"
 import { castDraft, type Draft } from "immer"
+import { LayerNode } from "./effect/layer-node"
 import { ModelV2 } from "./model"
 import { State } from "./state"
 
@@ -68,3 +69,4 @@ export const layer = Layer.effect(
 )
 
 export const locationLayer = layer
+export const node = LayerNode.make(layer, [])

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

@@ -1,10 +1,11 @@
 import fs from "fs/promises"
 import path from "path"
 import { describe, expect } from "bun:test"
-import { Effect, Layer, Schema } from "effect"
+import { Effect, Schema } from "effect"
 import { CommandV2 } from "@opencode-ai/core/command"
 import { Config } from "@opencode-ai/core/config"
 import { ConfigCommandPlugin } from "@opencode-ai/core/config/plugin/command"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { ProviderV2 } from "@opencode-ai/core/provider"
@@ -12,7 +13,7 @@ import { AbsolutePath } from "@opencode-ai/core/schema"
 import { tmpdir } from "../fixture/tmpdir"
 import { testEffect } from "../lib/effect"
 
-const it = testEffect(Layer.mergeAll(CommandV2.locationLayer, FSUtil.defaultLayer))
+const it = testEffect(LayerNode.buildLayer(LayerNode.group([CommandV2.node, FSUtil.node])))
 const decode = Schema.decodeUnknownSync(Config.Info)
 
 describe("ConfigCommandPlugin.Plugin", () => {

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)))
     }),
   )