test(core): simplify location mutation layer wiring

packages/core/src/location-mutation.ts

@@ -2,6 +2,7 @@ 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"
 
@@ -153,3 +154,5 @@ 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,7 +29,6 @@ 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
 //
@@ -426,15 +425,6 @@ 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,7 +3,6 @@ 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. */
@@ -22,5 +21,3 @@ 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,7 +9,6 @@ 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>
@@ -60,6 +59,4 @@ 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/location-mutation.test.ts

@@ -2,7 +2,7 @@ import fs from "fs/promises"
 import path from "path"
 import { describe, expect, test } from "bun:test"
 import { Effect, Layer, Schema } from "effect"
-import { FSUtil } from "@opencode-ai/core/fs-util"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { Location } from "@opencode-ai/core/location"
 import { LocationMutation } from "@opencode-ai/core/location-mutation"
 import { AbsolutePath } from "@opencode-ai/core/schema"
@@ -11,16 +11,11 @@ import { location } from "./fixture/location"
 import { it } from "./lib/effect"
 
 function provide(directory: string) {
-  return Effect.provide(
+  const activeLocation = LayerNode.make(
-    LocationMutation.layer.pipe(
+    Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make(directory) }))),
-      Layer.provide(
+    [],
-        Layer.mergeAll(
-          FSUtil.defaultLayer,
-          Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make(directory) }))),
-        ),
-      ),
-    ),
   )
+  return Effect.provide(LayerNode.buildLayer(LocationMutation.node(activeLocation)))
 }
 
 function withTmp<A, E, R>(f: (directory: string) => Effect.Effect<A, E, R>) {

packages/core/test/session-prompt.test.ts

@@ -15,10 +15,13 @@ 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 { LayerNode } from "@opencode-ai/core/effect/layer-node"
+import { SessionStore } from "@opencode-ai/core/session/store"
 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> = []
@@ -43,12 +46,14 @@ const execution = Layer.succeed(
       }),
   }),
 )
-const root = LayerNode.group([SessionV2.node, SessionProjector.node, EventV2.node, Database.node])
+const sessions = SessionV2.layer.pipe(
-const it = testEffect(
+  Layer.provide(events),
-  LayerNode.buildLayer(root, {
+  Layer.provide(database),
-    replacements: [LayerNode.replace(Database.node, database), LayerNode.replace(SessionExecution.node, execution)],
+  Layer.provide(store),
-  }),
+  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()