test(core): simplify session prompt layer wiring

packages/core/src/file-mutation.ts

@@ -3,7 +3,6 @@ export * as FileMutation from "./file-mutation"
 import { Context, Effect, Layer, Schema } from "effect"
 import { dirname } from "path"
 import { KeyedMutex } from "./effect/keyed-mutex"
-import { LayerNode } from "./effect/layer-node"
 import { FSUtil } from "./fs-util"
 
 export interface Target {
@@ -172,8 +171,6 @@ export const layer = Layer.effect(
   }),
 )
 
-export const node = LayerNode.make(layer, [FSUtil.node])
-
 function splitBom(text: string) {
   const stripped = text.replace(/^\uFEFF+/, "")
   return { bom: stripped.length !== text.length, text: stripped }

packages/core/src/location-mutation.ts

@@ -2,7 +2,6 @@ export * as LocationMutation from "./location-mutation"
 
 import path from "path"
 import { Context, Effect, Layer, Schema } from "effect"
-import { LayerNode } from "./effect/layer-node"
 import { FSUtil } from "./fs-util"
 import { Location } from "./location"
 
@@ -154,5 +153,3 @@ export const layer = Layer.effect(
 )
 
 export const locationLayer = layer
-
-export const node = (location: LayerNode.Node<Location.Service>) => LayerNode.make(layer, [FSUtil.node, location])

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/file-mutation.test.ts

@@ -2,7 +2,6 @@ import fs from "fs/promises"
 import path from "path"
 import { describe, expect } from "bun:test"
 import { Deferred, Effect, Fiber, Layer } from "effect"
-import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { FileMutation } from "@opencode-ai/core/file-mutation"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Location } from "@opencode-ai/core/location"
@@ -12,16 +11,14 @@ import { location } from "./fixture/location"
 import { tmpdir } from "./fixture/tmpdir"
 import { it } from "./lib/effect"
 
-function provide(directory: string, filesystem?: LayerNode.Replacement<FSUtil.Service>) {
-  const activeLocation = LayerNode.make(
-    Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make(directory) }))),
-    [],
-  )
-  return Effect.provide(
-    LayerNode.buildLayer(LayerNode.group([LocationMutation.node(activeLocation), FileMutation.node]), {
-      replacements: filesystem ? [filesystem] : [],
-    }),
+function provide(directory: string, filesystem = FSUtil.defaultLayer) {
+  const activeLocation = Layer.succeed(
+    Location.Service,
+    Location.Service.of(location({ directory: AbsolutePath.make(directory) })),
   )
+  const resolution = LocationMutation.layer.pipe(Layer.provide(filesystem), Layer.provide(activeLocation))
+  const mutation = FileMutation.layer.pipe(Layer.provide(filesystem))
+  return Effect.provide(Layer.mergeAll(resolution, mutation))
 }
 
 function withTmp<A, E, R>(f: (directory: string) => Effect.Effect<A, E, R>) {
@@ -350,20 +347,17 @@ describe("FileMutation", () => {
 })
 
 function instrumentWrites(run: <E>(write: Effect.Effect<void, E>, target: string) => Effect.Effect<void, E>) {
-  return LayerNode.replace(
-    FSUtil.node,
-    Layer.effect(
-      FSUtil.Service,
-      Effect.gen(function* () {
-        const filesystem = yield* FSUtil.Service
-        return FSUtil.Service.of({
-          ...filesystem,
-          writeWithDirs: (target, content, mode) => run(filesystem.writeWithDirs(target, content, mode), target),
-          writeFile: (target, content, options) => run(filesystem.writeFile(target, content, options), target),
-          writeFileString: (target, content, options) =>
-            run(filesystem.writeFileString(target, content, options), target),
-        })
-      }),
-    ).pipe(Layer.provide(LayerNode.buildLayer(FSUtil.node))),
-  )
+  return Layer.effect(
+    FSUtil.Service,
+    Effect.gen(function* () {
+      const filesystem = yield* FSUtil.Service
+      return FSUtil.Service.of({
+        ...filesystem,
+        writeWithDirs: (target, content, mode) => run(filesystem.writeWithDirs(target, content, mode), target),
+        writeFile: (target, content, options) => run(filesystem.writeFile(target, content, options), target),
+        writeFileString: (target, content, options) =>
+          run(filesystem.writeFileString(target, content, options), target),
+      })
+    }),
+  ).pipe(Layer.provide(FSUtil.defaultLayer))
 }

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(
-  Layer.provide(events),
-  Layer.provide(database),
-  Layer.provide(store),
-  Layer.provide(Project.defaultLayer),
-  Layer.provide(execution),
+const root = LayerNode.group([SessionV2.node, SessionProjector.node, EventV2.node, Database.node])
+const it = testEffect(
+  LayerNode.buildLayer(root, {
+    replacements: [LayerNode.replace(Database.node, database), LayerNode.replace(SessionExecution.node, 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()