Skip to content

Commit 15bcbb1

Browse files
jlongsterjlongster
authored
refactor(opencode): migrate session tests to layer nodes (anomalyco#34494)
1 parent 4d32947 commit 15bcbb1

4 files changed

Lines changed: 43 additions & 45 deletions

File tree

‎packages/opencode/test/mcp/auth.test.ts‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import { expect, test } from "bun:test"
22
import { setTimeout as sleep } from "node:timers/promises"
3-
import { LayerNode } from "@opencode-ai/core/effect/layer-node"
3+
import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
44
import { Effect, Layer } from "effect"
55
import { FSUtil } from "@opencode-ai/core/fs-util"
6-
import { EffectFlock } from "@opencode-ai/core/util/effect-flock"
76
import { McpAuth } from "../../src/mcp/auth"
87

98
function authFile() {
109
let raw = ""
1110
let activeWrites = 0
1211
let sawOverlap = false
1312

14-
const layer = Layer.effect(
13+
const fsLayer = Layer.effect(
1514
FSUtil.Service,
1615
Effect.gen(function* () {
1716
const fs = yield* FSUtil.Service
@@ -42,14 +41,14 @@ function authFile() {
4241
: fs.writeJson(file, value, mode),
4342
})
4443
}),
45-
).pipe(Layer.provide(LayerNode.compile(FSUtil.node)))
44+
).pipe(Layer.provide(AppNodeBuilder.build(FSUtil.node)))
4645

47-
return { layer, raw: () => raw }
46+
return { fsLayer, raw: () => raw }
4847
}
4948

50-
function authService(layer: Layer.Layer<FSUtil.Service>) {
49+
function authService(fsLayer: Layer.Layer<FSUtil.Service>) {
5150
return McpAuth.Service.use((auth) => Effect.succeed(auth)).pipe(
52-
Effect.provide(LayerNode.compile(McpAuth.node, [[FSUtil.node, layer]])),
51+
Effect.provide(AppNodeBuilder.build(McpAuth.node, [[FSUtil.node, fsLayer]])),
5352
)
5453
}
5554

@@ -58,8 +57,8 @@ test("serializes concurrent auth file updates across service instances", async (
5857

5958
await Effect.runPromise(
6059
Effect.gen(function* () {
61-
const first = yield* authService(file.layer)
62-
const second = yield* authService(file.layer)
60+
const first = yield* authService(file.fsLayer)
61+
const second = yield* authService(file.fsLayer)
6362

6463
yield* Effect.all(
6564
[

‎packages/opencode/test/permission/next.test.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@ import os from "os"
44
import { Cause, Deferred, Effect, Exit, Fiber, Layer } from "effect"
55
import { EventV2Bridge } from "../../src/event-v2-bridge"
66
import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
7-
import { Database } from "@opencode-ai/core/database/database"
87
import { Permission } from "../../src/permission"
9-
import { InstanceBootstrap } from "../../src/project/bootstrap-service"
8+
import { InstanceBootstrap } from "../../src/project/bootstrap"
109
import { InstanceStore } from "../../src/project/instance-store"
1110
import { TestInstance, tmpdirScoped } from "../fixture/fixture"
1211
import { testEffect } from "../lib/effect"
1312
import { MessageID, SessionID } from "../../src/session/schema"
13+
import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
14+
import { LayerNode } from "@opencode-ai/core/effect/layer-node"
1415

15-
const events = EventV2Bridge.defaultLayer
1616
const noopBootstrap = Layer.succeed(InstanceBootstrap.Service, InstanceBootstrap.Service.of({ run: Effect.void }))
17-
const env = Layer.mergeAll(
18-
Permission.layer.pipe(Layer.provide(Database.defaultLayer), Layer.provide(events)),
19-
events,
20-
CrossSpawnSpawner.defaultLayer,
21-
InstanceStore.defaultLayer.pipe(Layer.provide(noopBootstrap)),
17+
const env = AppNodeBuilder.build(
18+
LayerNode.group([Permission.node, EventV2Bridge.node, CrossSpawnSpawner.node, InstanceStore.node]),
19+
[[InstanceBootstrap.node, noopBootstrap]],
2220
)
2321
const it = testEffect(env)
2422

‎packages/opencode/test/session/instruction.test.ts‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,39 @@ import { describe, expect, test } from "bun:test"
22
import { SessionV1 } from "@opencode-ai/core/v1/session"
33
import path from "path"
44
import { Effect, FileSystem, Layer } from "effect"
5-
import { FetchHttpClient } from "effect/unstable/http"
6-
import { NodeFileSystem } from "@effect/platform-node"
75
import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
8-
import { FSUtil } from "@opencode-ai/core/fs-util"
96

107
import { Instruction } from "../../src/session/instruction"
118
import type { MessageV2 } from "../../src/session/message-v2"
129
import { MessageID, PartID, SessionID } from "../../src/session/schema"
1310
import { Global } from "@opencode-ai/core/global"
1411
import { RuntimeFlags } from "../../src/effect/runtime-flags"
15-
import { provideInstance, provideTmpdirInstance, testInstanceStoreLayer, tmpdirScoped } from "../fixture/fixture"
12+
import { provideInstance, provideTmpdirInstance, tmpdirScoped } from "../fixture/fixture"
1613
import { testEffect } from "../lib/effect"
1714
import { TestConfig } from "../fixture/config"
1815
import { ProviderV2 } from "@opencode-ai/core/provider"
1916
import { ModelV2 } from "@opencode-ai/core/model"
17+
import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
18+
import { LayerNode } from "@opencode-ai/core/effect/layer-node"
19+
import { LayerNodePlatform } from "@opencode-ai/core/effect/app-node-platform"
20+
import { InstanceStore } from "@/project/instance-store"
21+
import { InstanceBootstrap } from "@/project/bootstrap"
22+
import { Config } from "@/config/config"
2023

21-
const it = testEffect(Layer.mergeAll(CrossSpawnSpawner.defaultLayer, NodeFileSystem.layer, testInstanceStoreLayer))
24+
const it = testEffect(
25+
AppNodeBuilder.build(LayerNode.group([CrossSpawnSpawner.node, LayerNodePlatform.filesystem, InstanceStore.node]), [
26+
[InstanceBootstrap.node, Layer.succeed(InstanceBootstrap.Service, InstanceBootstrap.Service.of({ run: Effect.void }))],
27+
]),
28+
)
2229

23-
const configLayer = TestConfig.layer()
30+
const configLayer = Layer.succeed(Config.Service, TestConfig.make())
2431

2532
const instructionLayer = (global: Partial<Global.Interface>, flags: Partial<RuntimeFlags.Info> = {}) =>
26-
Instruction.layer.pipe(
27-
Layer.provide(configLayer),
28-
Layer.provide(FSUtil.defaultLayer),
29-
Layer.provide(FetchHttpClient.layer),
30-
Layer.provide(Global.layerWith(global)),
31-
Layer.provide(RuntimeFlags.layer(flags)),
32-
)
33+
AppNodeBuilder.build(Instruction.node, [
34+
[Config.node, configLayer],
35+
[Global.node, Global.layerWith(global)],
36+
[RuntimeFlags.node, RuntimeFlags.layer(flags)],
37+
])
3338

3439
const provideInstruction =
3540
(global: Partial<Global.Interface>, flags?: Partial<RuntimeFlags.Info>) =>

‎packages/opencode/test/session/session.test.ts‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
import { describe, expect } from "bun:test"
22
import { SessionV1 } from "@opencode-ai/core/v1/session"
3-
import { Database } from "@opencode-ai/core/database/database"
43
import { EventV2 } from "@opencode-ai/core/event"
54
import { SessionProjector } from "@opencode-ai/core/session/projector"
65
import { Deferred, Effect, Exit, Layer } from "effect"
76
import { Session as SessionNs } from "@/session/session"
87
import { MessageV2 } from "../../src/session/message-v2"
98
import { MessageID, PartID, type SessionID } from "../../src/session/schema"
109
import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
11-
import { provideInstance, testInstanceStoreLayer, tmpdirScoped } from "../fixture/fixture"
10+
import { provideInstance, tmpdirScoped } from "../fixture/fixture"
1211
import { testEffect } from "../lib/effect"
13-
import { Storage } from "@/storage/storage"
1412
import { RuntimeFlags } from "@/effect/runtime-flags"
15-
import { BackgroundJob } from "@/background/job"
1613
import { EventV2Bridge } from "@/event-v2-bridge"
1714
import { GlobalBus } from "@/bus/global"
15+
import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
16+
import { LayerNode } from "@opencode-ai/core/effect/layer-node"
17+
import { InstanceStore } from "@/project/instance-store"
18+
import { InstanceBootstrap } from "@/project/bootstrap"
1819

1920
const it = testEffect(
20-
Layer.mergeAll(
21-
SessionNs.layer.pipe(
22-
Layer.provide(Storage.defaultLayer),
23-
Layer.provide(Database.defaultLayer),
24-
Layer.provideMerge(EventV2Bridge.defaultLayer),
25-
Layer.provide(SessionProjector.defaultLayer),
26-
Layer.provide(RuntimeFlags.layer({ experimentalWorkspaces: false })),
27-
Layer.provide(BackgroundJob.defaultLayer),
28-
),
29-
CrossSpawnSpawner.defaultLayer,
30-
testInstanceStoreLayer,
21+
AppNodeBuilder.build(
22+
LayerNode.group([SessionNs.node, EventV2Bridge.node, SessionProjector.node, CrossSpawnSpawner.node, InstanceStore.node]),
23+
[
24+
[RuntimeFlags.node, RuntimeFlags.layer({ experimentalWorkspaces: false })],
25+
[InstanceBootstrap.node, Layer.succeed(InstanceBootstrap.Service, InstanceBootstrap.Service.of({ run: Effect.void }))],
26+
],
3127
),
3228
)
3329

0 commit comments

Comments
 (0)