test(core): simplify instruction context layer wiring

packages/core/src/credential.ts

@@ -7,7 +7,6 @@ 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"),
@@ -151,4 +150,3 @@ 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/instruction-context.ts

@@ -9,6 +9,7 @@ import { Location } from "./location"
 import { AbsolutePath } from "./schema"
 import { SystemContext } from "./system-context/index"
 import { SystemContextRegistry } from "./system-context/registry"
+import { LayerNode } from "./effect/layer-node"
 
 class File extends Schema.Class<File>("InstructionContext.File")({
   path: AbsolutePath,
@@ -87,6 +88,9 @@ export const layer = Layer.effectDiscard(
   }),
 )
 
+export const node = (location: LayerNode.Node<Location.Service>) =>
+  LayerNode.make(layer, [FSUtil.node, Global.node, location, SystemContextRegistry.node])
+
 function render(files: ReadonlyArray<File>) {
   return files.map((file) => `Instructions from: ${file.path}\n${file.content}`).join("\n\n")
 }

packages/core/src/integration.ts

@@ -9,7 +9,6 @@ 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
@@ -568,5 +567,3 @@ export const locationLayer = Layer.effect(
     })
   }),
 )
-
-export const node = LayerNode.make(locationLayer, [Credential.node, EventV2.node])

packages/core/src/system-context/registry.ts

@@ -1,6 +1,7 @@
 export * as SystemContextRegistry from "./registry"
 
 import { Context, Effect, Layer, Ref, Scope } from "effect"
+import { LayerNode } from "../effect/layer-node"
 import { SystemContext } from "./index"
 
 export interface Entry {
@@ -44,3 +45,5 @@ export const layer = Layer.effect(
     })
   }),
 )
+
+export const node = LayerNode.make(layer, [])

packages/core/test/instruction-context.test.ts

@@ -5,6 +5,7 @@ import path from "path"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Global } from "@opencode-ai/core/global"
 import { InstructionContext } from "@opencode-ai/core/instruction-context"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { Location } from "@opencode-ai/core/location"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { SystemContext } from "@opencode-ai/core/system-context"
@@ -13,7 +14,28 @@ import { location } from "./fixture/location"
 import { tmpdir } from "./fixture/tmpdir"
 import { testEffect } from "./lib/effect"
 
-const it = testEffect(Layer.empty)
+const it = testEffect(LayerNode.buildLayer(FSUtil.node))
+
+function provide(options: {
+  global: string
+  location: Location.Interface
+  filesystem?: FSUtil.Interface
+}) {
+  const location = LayerNode.make(
+    Layer.succeed(Location.Service, Location.Service.of(options.location)),
+    [],
+  )
+  return Effect.provide(
+    LayerNode.buildLayer(LayerNode.group([InstructionContext.node(location), SystemContextRegistry.node]), {
+      replacements: [
+        LayerNode.replace(Global.node, Global.layerWith({ config: options.global })),
+        ...(options.filesystem
+          ? [LayerNode.replace(FSUtil.node, Layer.succeed(FSUtil.Service, FSUtil.Service.of(options.filesystem)))]
+          : []),
+      ],
+    }),
+  )
+}
 
 describe("InstructionContext", () => {
   it.live("loads global and upward project AGENTS.md files as one aggregate context", () =>
@@ -41,20 +63,13 @@ describe("InstructionContext", () => {
 
           const load = SystemContextRegistry.Service.pipe(
             Effect.flatMap((service) => service.load()),
-            Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
-            Effect.provide(FSUtil.defaultLayer),
-            Effect.provide(Global.layerWith({ config: global })),
-            Effect.provide(
-              Layer.succeed(
-                Location.Service,
-                Location.Service.of(
-                  location(
-                    { directory: AbsolutePath.make(directory) },
-                    { projectDirectory: AbsolutePath.make(project) },
-                  ),
-                ),
+            provide({
+              global,
+              location: location(
+                { directory: AbsolutePath.make(directory) },
+                { projectDirectory: AbsolutePath.make(project) },
               ),
-            ),
+            }),
           )
 
           const initialized = yield* SystemContext.initialize(yield* load)
@@ -107,15 +122,10 @@ describe("InstructionContext", () => {
           yield* Effect.promise(() => fs.writeFile(file, ""))
           const context = yield* SystemContextRegistry.Service.pipe(
             Effect.flatMap((service) => service.load()),
-            Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
-            Effect.provide(FSUtil.defaultLayer),
-            Effect.provide(Global.layerWith({ config: path.join(tmp.path, "global") })),
-            Effect.provide(
-              Layer.succeed(
-                Location.Service,
-                Location.Service.of(location({ directory: AbsolutePath.make(tmp.path) })),
-              ),
-            ),
+            provide({
+              global: path.join(tmp.path, "global"),
+              location: location({ directory: AbsolutePath.make(tmp.path) }),
+            }),
           )
 
           expect((yield* SystemContext.initialize(context)).baseline).toBe(`Instructions from: ${file}\n`)
@@ -126,22 +136,14 @@ describe("InstructionContext", () => {
 
   it.effect("preserves admitted instructions while observation is unavailable", () =>
     Effect.gen(function* () {
-      const failingFS = Layer.effect(
-        FSUtil.Service,
-        FSUtil.Service.pipe(
-          Effect.map((fs) =>
-            FSUtil.Service.of({ ...fs, up: () => Effect.fail(new FSUtil.FileSystemError({ method: "up" })) }),
-          ),
-        ),
-      ).pipe(Layer.provide(FSUtil.defaultLayer))
+      const fs = yield* FSUtil.Service
       const context = yield* SystemContextRegistry.Service.pipe(
         Effect.flatMap((service) => service.load()),
-        Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
-        Effect.provide(failingFS),
-        Effect.provide(Global.layerWith({ config: "/global" })),
-        Effect.provide(
-          Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("/repo") }))),
-        ),
+        provide({
+          global: "/global",
+          location: location({ directory: AbsolutePath.make("/repo") }),
+          filesystem: { ...fs, up: () => Effect.fail(new FSUtil.FileSystemError({ method: "up" })) },
+        }),
       )
 
       expect(
@@ -158,26 +160,18 @@ describe("InstructionContext", () => {
   it.effect("preserves admitted instructions when a discovered file disappears before read", () =>
     Effect.gen(function* () {
       const file = AbsolutePath.make("/repo/AGENTS.md")
-      const racingFS = Layer.effect(
-        FSUtil.Service,
-        FSUtil.Service.pipe(
-          Effect.map((fs) =>
-            FSUtil.Service.of({
-              ...fs,
-              up: () => Effect.succeed([file]),
-              readFileStringSafe: () => Effect.succeed(undefined),
-            }),
-          ),
-        ),
-      ).pipe(Layer.provide(FSUtil.defaultLayer))
+      const fs = yield* FSUtil.Service
       const context = yield* SystemContextRegistry.Service.pipe(
         Effect.flatMap((service) => service.load()),
-        Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
-        Effect.provide(racingFS),
-        Effect.provide(Global.layerWith({ config: "/global" })),
-        Effect.provide(
-          Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("/repo") }))),
-        ),
+        provide({
+          global: "/global",
+          location: location({ directory: AbsolutePath.make("/repo") }),
+          filesystem: {
+            ...fs,
+            up: () => Effect.succeed([file]),
+            readFileStringSafe: () => Effect.succeed(undefined),
+          },
+        }),
       )
 
       expect(
@@ -194,35 +188,25 @@ describe("InstructionContext", () => {
   it.effect("canonicalizes upward discovery boundaries", () =>
     Effect.gen(function* () {
       let observed: { targets: string[]; start: string; stop?: string } | undefined
-      const observingFS = Layer.effect(
-        FSUtil.Service,
-        FSUtil.Service.pipe(
-          Effect.map((fs) =>
-            FSUtil.Service.of({
-              ...fs,
-              up: (options) =>
-                Effect.sync(() => {
-                  observed = options
-                  return []
-                }),
-            }),
-          ),
-        ),
-      ).pipe(Layer.provide(FSUtil.defaultLayer))
+      const fs = yield* FSUtil.Service
 
       yield* SystemContextRegistry.Service.pipe(
         Effect.flatMap((service) => service.load()),
-        Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
-        Effect.provide(observingFS),
-        Effect.provide(Global.layerWith({ config: "/global" })),
-        Effect.provide(
-          Layer.succeed(
-            Location.Service,
-            Location.Service.of(
-              location({ directory: AbsolutePath.make("/repo/") }, { projectDirectory: AbsolutePath.make("/repo") }),
-            ),
+        provide({
+          global: "/global",
+          location: location(
+            { directory: AbsolutePath.make("/repo/") },
+            { projectDirectory: AbsolutePath.make("/repo") },
           ),
-        ),
+          filesystem: {
+            ...fs,
+            up: (options) =>
+              Effect.sync(() => {
+                observed = options
+                return []
+              }),
+          },
+        }),
       )
 
       expect(observed).toEqual({
@@ -238,22 +222,15 @@ describe("InstructionContext", () => {
       const previous = process.env.OPENCODE_DISABLE_PROJECT_CONFIG
       let scanned = false
       process.env.OPENCODE_DISABLE_PROJECT_CONFIG = "1"
+      const fs = yield* FSUtil.Service
 
       yield* SystemContextRegistry.Service.pipe(
         Effect.flatMap((service) => service.load()),
-        Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
-        Effect.provide(
-          Layer.effect(
-            FSUtil.Service,
-            FSUtil.Service.pipe(
-              Effect.map((fs) => FSUtil.Service.of({ ...fs, up: () => Effect.sync(() => ((scanned = true), [])) })),
-            ),
-          ).pipe(Layer.provide(FSUtil.defaultLayer)),
-        ),
-        Effect.provide(Global.layerWith({ config: "/global" })),
-        Effect.provide(
-          Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("/repo") }))),
-        ),
+        provide({
+          global: "/global",
+          location: location({ directory: AbsolutePath.make("/repo") }),
+          filesystem: { ...fs, up: () => Effect.sync(() => ((scanned = true), [])) },
+        }),
         Effect.ensuring(
           Effect.sync(() => {
             if (previous === undefined) delete process.env.OPENCODE_DISABLE_PROJECT_CONFIG
@@ -269,26 +246,17 @@ describe("InstructionContext", () => {
   it.effect("does not discover project instructions outside the canonical project root", () =>
     Effect.gen(function* () {
       let scanned = false
+      const fs = yield* FSUtil.Service
       yield* SystemContextRegistry.Service.pipe(
         Effect.flatMap((service) => service.load()),
-        Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
-        Effect.provide(
-          Layer.effect(
-            FSUtil.Service,
-            FSUtil.Service.pipe(
-              Effect.map((fs) => FSUtil.Service.of({ ...fs, up: () => Effect.sync(() => ((scanned = true), [])) })),
-            ),
-          ).pipe(Layer.provide(FSUtil.defaultLayer)),
-        ),
-        Effect.provide(Global.layerWith({ config: "/global" })),
-        Effect.provide(
-          Layer.succeed(
-            Location.Service,
-            Location.Service.of(
-              location({ directory: AbsolutePath.make("/outside") }, { projectDirectory: AbsolutePath.make("/repo") }),
-            ),
+        provide({
+          global: "/global",
+          location: location(
+            { directory: AbsolutePath.make("/outside") },
+            { projectDirectory: AbsolutePath.make("/repo") },
           ),
-        ),
+          filesystem: { ...fs, up: () => Effect.sync(() => ((scanned = true), [])) },
+        }),
       )
 
       expect(scanned).toBe(false)

packages/core/test/integration.test.ts

@@ -4,21 +4,17 @@ 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 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([]),
-      }),
-    ),
-  ],
-})
+const layer = Integration.locationLayer.pipe(
+  Layer.provide(EventV2.defaultLayer),
+  Layer.provide(
+    Layer.mock(Credential.Service)({
+      create: () => Effect.die("unexpected credential creation"),
+      list: () => Effect.succeed([]),
+    }),
+  ),
+)
 
 function connectionLayer(
   created: Array<{
@@ -27,26 +23,24 @@ function connectionLayer(
     value: Credential.Info
   }>,
 ) {
-  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([]),
-        }),
-      ),
-    ],
-  })
+  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([]),
+      }),
+    ),
+  )
 }
 
 describe("Integration", () => {
@@ -363,16 +357,14 @@ describe("Integration", () => {
         value: new Credential.Key({ type: "key", key: "b" }),
       },
     ]
-    const projectionLayer = LayerNode.buildLayer(root, {
-      replacements: [
-        LayerNode.replace(
-          Credential.node,
-          Layer.mock(Credential.Service)({
-            list: () => Effect.succeed(rows.map((row) => new Credential.Stored(row))),
-          }),
-        ),
-      ],
-    })
+    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))),
+        }),
+      ),
+    )
     return Effect.acquireUseRelease(
       Effect.sync(() => {
         const previous = process.env.INTEGRATION_TEST_ACME_KEY