test(core): simplify session prompt layer wiring

packages/core/src/session.ts

@@ -29,6 +29,7 @@ import { logFailure } from "./session/logging"
 import { MessageDecodeError } from "./session/error"
 import { SessionEvent } from "./session/event"
 import { SessionInput } from "./session/input"
+import { LayerNode } from "./effect/layer-node"
 
 // get project -> project.locations
 //
@@ -425,6 +426,15 @@ export const layer = Layer.effect(
   }),
 )
 
+export const node = LayerNode.make(layer, [
+  SessionExecution.node,
+  SessionStore.node,
+  SessionProjector.node,
+  EventV2.node,
+  Database.node,
+  ProjectV2.node,
+])
+
 export const defaultLayer = layer.pipe(
   Layer.provide(SessionExecution.noopLayer),
   Layer.provide(SessionStore.defaultLayer),

packages/core/src/session/execution.ts

@@ -3,6 +3,7 @@ export * as SessionExecution from "./execution"
 import { Context, Effect, Layer } from "effect"
 import { SessionRunner } from "./runner/index"
 import { SessionSchema } from "./schema"
+import { LayerNode } from "../effect/layer-node"
 
 export interface Interface {
   /** Explicitly drain one Session, making at least one provider attempt. */
@@ -21,3 +22,5 @@ export const noopLayer = Layer.succeed(
   Service,
   Service.of({ resume: () => Effect.void, wake: () => Effect.void, interrupt: () => Effect.void }),
 )
+
+export const node = LayerNode.make(noopLayer, [])

packages/core/src/session/store.ts

@@ -9,6 +9,7 @@ import { SessionMessage } from "./message"
 import { SessionSchema } from "./schema"
 import { SessionMessageTable, SessionTable } from "./sql"
 import { fromRow } from "./info"
+import { LayerNode } from "../effect/layer-node"
 
 export interface Interface {
   readonly get: (sessionID: SessionSchema.ID) => Effect.Effect<SessionSchema.Info | undefined>
@@ -59,4 +60,6 @@ export const layer = Layer.effect(
   }),
 )
 
+export const node = LayerNode.make(layer, [Database.node])
+
 export const defaultLayer = layer.pipe(Layer.provide(Database.defaultLayer))

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(Layer.mergeAll(FSUtil.defaultLayer, EventV2.defaultLayer))
-const it = testEffect(LayerNode.buildLayer(root))
 
 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(
+  const locationLayer = Layer.succeed(
-    Layer.succeed(
+    Location.Service,
-      Location.Service,
+    Location.Service.of(location({ directory: AbsolutePath.make(directory) }, { vcs })),
-      Location.Service.of(location({ directory: AbsolutePath.make(directory) }, { vcs })),
-    ),
-    [],
   )
   return Effect.provide(
-    LayerNode.buildLayer(
+    Watcher.layer.pipe(
-      LayerNode.group([
+      Layer.provide(configLayer),
-        LayerNode.make(Watcher.layer, [configNode, EventV2.node, FSUtil.node, Git.node, locationNode]),
+      Layer.provide(Git.defaultLayer),
-        root,
+      Layer.provide(locationLayer),
-      ]),
-      { replacements: [LayerNode.replace(configNode, configLayer)] },
-    ).pipe(
       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/session-prompt.test.ts

@@ -15,13 +15,10 @@ import { SessionProjector } from "@opencode-ai/core/session/projector"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
 import { SessionInput } from "@opencode-ai/core/session/input"
 import { SessionInputTable, SessionMessageTable, SessionTable } from "@opencode-ai/core/session/sql"
-import { SessionStore } from "@opencode-ai/core/session/store"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { testEffect } from "./lib/effect"
 
 const database = Database.layerFromPath(":memory:")
-const events = EventV2.layer.pipe(Layer.provide(database))
-const projector = SessionProjector.layer.pipe(Layer.provide(events), Layer.provide(database))
-const store = SessionStore.layer.pipe(Layer.provide(database))
 const executionCalls: SessionV2.ID[] = []
 const interruptCalls: SessionV2.ID[] = []
 const interruptSeqs: Array<number | undefined> = []
@@ -46,14 +43,12 @@ const execution = Layer.succeed(
       }),
   }),
 )
-const sessions = SessionV2.layer.pipe(
+const root = LayerNode.group([SessionV2.node, SessionProjector.node, EventV2.node, Database.node])
-  Layer.provide(events),
+const it = testEffect(
-  Layer.provide(database),
+  LayerNode.buildLayer(root, {
-  Layer.provide(store),
+    replacements: [LayerNode.replace(Database.node, database), LayerNode.replace(SessionExecution.node, execution)],
-  Layer.provide(Project.defaultLayer),
+  }),
-  Layer.provide(execution),
 )
-const it = testEffect(Layer.mergeAll(database, events, projector, store, execution, sessions))
 const sessionID = SessionV2.ID.make("ses_prompt_test")
 const messageID = SessionMessage.ID.create()