test(core): simplify session prompt 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/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/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/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

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()