test(core): simplify session prompt layer wiring

This commit is contained in:
James Long 2026-06-20 22:15:06 -04:00
parent d3bbfff826
commit d1366ed07d
4 changed files with 22 additions and 11 deletions

View file

@ -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),

View file

@ -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, [])

View file

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

View file

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