test(core): simplify integration layer wiring

packages/core/src/credential.ts

@@ -7,6 +7,7 @@ import { IntegrationSchema } from "./integration/schema"
 import { NonNegativeInt, withStatics } from "./schema"
 import { Identifier } from "./util/identifier"
 import { CredentialTable } from "./credential/sql"
+import { LayerNode } from "./effect/layer-node"
 
 export const ID = Schema.String.pipe(
   Schema.brand("Credential.ID"),
@@ -150,3 +151,4 @@ export const layer = Layer.effect(
 )
 
 export const defaultLayer = layer.pipe(Layer.provide(Database.defaultLayer))
+export const node = LayerNode.make(layer, [Database.node])

packages/core/src/integration.ts

@@ -9,6 +9,7 @@ import { State } from "./state"
 import { Identifier } from "./util/identifier"
 import { EventV2 } from "./event"
 import { IntegrationConnection } from "./integration/connection"
+import { LayerNode } from "./effect/layer-node"
 
 export const ID = IntegrationSchema.ID
 export type ID = IntegrationSchema.ID
@@ -567,3 +568,5 @@ export const locationLayer = Layer.effect(
     })
   }),
 )
+
+export const node = LayerNode.make(locationLayer, [Credential.node, EventV2.node])

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

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

packages/core/test/integration.test.ts

@@ -4,17 +4,21 @@ import * as TestClock from "effect/testing/TestClock"
 import { Integration } from "@opencode-ai/core/integration"
 import { Credential } from "@opencode-ai/core/credential"
 import { EventV2 } from "@opencode-ai/core/event"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { it } from "./lib/effect"
 
-const layer = Integration.locationLayer.pipe(
-  Layer.provide(EventV2.defaultLayer),
-  Layer.provide(
-    Layer.mock(Credential.Service)({
-      create: () => Effect.die("unexpected credential creation"),
-      list: () => Effect.succeed([]),
-    }),
-  ),
-)
+const root = LayerNode.group([Integration.node, EventV2.node])
+const layer = LayerNode.buildLayer(root, {
+  replacements: [
+    LayerNode.replace(
+      Credential.node,
+      Layer.mock(Credential.Service)({
+        create: () => Effect.die("unexpected credential creation"),
+        list: () => Effect.succeed([]),
+      }),
+    ),
+  ],
+})
 
 function connectionLayer(
   created: Array<{
@@ -23,24 +27,26 @@ function connectionLayer(
     value: Credential.Info
   }>,
 ) {
-  return Integration.locationLayer.pipe(
-    Layer.provideMerge(EventV2.defaultLayer),
-    Layer.provide(
-      Layer.mock(Credential.Service)({
-        create: (input) =>
-          Effect.sync(() => {
-            created.push(input)
-            return new Credential.Stored({
-              id: Credential.ID.create(),
-              integrationID: input.integrationID,
-              label: input.label ?? "default",
-              value: input.value,
-            })
-          }),
-        list: () => Effect.succeed([]),
-      }),
-    ),
-  )
+  return LayerNode.buildLayer(root, {
+    replacements: [
+      LayerNode.replace(
+        Credential.node,
+        Layer.mock(Credential.Service)({
+          create: (input) =>
+            Effect.sync(() => {
+              created.push(input)
+              return new Credential.Stored({
+                id: Credential.ID.create(),
+                integrationID: input.integrationID,
+                label: input.label ?? "default",
+                value: input.value,
+              })
+            }),
+          list: () => Effect.succeed([]),
+        }),
+      ),
+    ],
+  })
 }
 
 describe("Integration", () => {
@@ -357,14 +363,16 @@ describe("Integration", () => {
         value: new Credential.Key({ type: "key", key: "b" }),
       },
     ]
-    const projectionLayer = Integration.locationLayer.pipe(
-      Layer.provide(EventV2.defaultLayer),
-      Layer.provide(
-        Layer.mock(Credential.Service)({
-          list: () => Effect.succeed(rows.map((row) => new Credential.Stored(row))),
-        }),
-      ),
-    )
+    const projectionLayer = LayerNode.buildLayer(root, {
+      replacements: [
+        LayerNode.replace(
+          Credential.node,
+          Layer.mock(Credential.Service)({
+            list: () => Effect.succeed(rows.map((row) => new Credential.Stored(row))),
+          }),
+        ),
+      ],
+    })
     return Effect.acquireUseRelease(
       Effect.sync(() => {
         const previous = process.env.INTEGRATION_TEST_ACME_KEY