lmin/zmo-cli
1
0
Fork 0
Code Issues Pull Requests Actions 77 Packages Projects Releases Wiki Activity

test(server): migrate session list tests to Effect runner (#27101)

Browse Source
This commit is contained in:
Kit Langton
2026-05-12 16:45:05 +00:00
committed by GitHub
parent a7b5041674
commit e8125e9b42
1 changed files with 157 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/opencode/test/server/session-list.test.ts
+157 -175
View File
@@ -1,33 +1,25 @@
import { afterEach, describe, expect, test } from "bun:test" import { afterEach, describe, expect } from "bun:test"
import { Effect } from "effect" import { Effect } from "effect"
import { Instance } from "../../src/project/instance"
import { WithInstance } from "../../src/project/with-instance"
import { Session as SessionNs } from "@/session/session" import { Session as SessionNs } from "@/session/session"
import * as Log from "@opencode-ai/core/util/log" import * as Log from "@opencode-ai/core/util/log"
import { disposeAllInstances, tmpdir } from "../fixture/fixture" import { disposeAllInstances, provideInstance, TestInstance } from "../fixture/fixture"
import { Flag } from "@opencode-ai/core/flag/flag" import { Flag } from "@opencode-ai/core/flag/flag"
import { mkdir } from "fs/promises" import { mkdir } from "fs/promises"
import path from "path" import path from "path"
import { Database } from "@/storage/db" import { Database } from "@/storage/db"
import { SessionTable } from "@/session/session.sql" import { SessionTable } from "@/session/session.sql"
import { eq } from "drizzle-orm" import { eq } from "drizzle-orm"
import { testEffect } from "../lib/effect"
void Log.init({ print: false }) void Log.init({ print: false })
const originalWorkspaces = Flag.OPENCODE_EXPERIMENTAL_WORKSPACES const originalWorkspaces = Flag.OPENCODE_EXPERIMENTAL_WORKSPACES
const it = testEffect(SessionNs.defaultLayer)
function run<A, E>(fx: Effect.Effect<A, E, SessionNs.Service>) { const withSession = (input?: Parameters<SessionNs.Interface["create"]>[0]) =>
return Effect.runPromise(fx.pipe(Effect.provide(SessionNs.defaultLayer))) Effect.acquireRelease(
} SessionNs.Service.use((session) => session.create(input)),
(created) => SessionNs.Service.use((session) => session.remove(created.id).pipe(Effect.ignore)),
const svc = { )
...SessionNs,
create(input?: SessionNs.CreateInput) {
return run(SessionNs.Service.use((svc) => svc.create(input)))
},
list(input?: SessionNs.ListInput) {
return run(SessionNs.Service.use((svc) => svc.list(input)))
},
}
afterEach(async () => { afterEach(async () => {
Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = originalWorkspaces Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = originalWorkspaces
@@ -35,205 +27,195 @@ afterEach(async () => {
}) })
describe("session.list", () => { describe("session.list", () => {
test("does not filter by directory when directory is omitted", async () => { it.instance(
Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = false "does not filter by directory when directory is omitted",
await using tmp = await tmpdir({ git: true }) () =>
await mkdir(path.join(tmp.path, "packages", "opencode"), { recursive: true }) Effect.gen(function* () {
await mkdir(path.join(tmp.path, "packages", "app"), { recursive: true }) Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = false
const test = yield* TestInstance
yield* Effect.promise(() => mkdir(path.join(test.directory, "packages", "opencode"), { recursive: true }))
yield* Effect.promise(() => mkdir(path.join(test.directory, "packages", "app"), { recursive: true }))
await WithInstance.provide({ const root = yield* withSession({ title: "root" })
directory: tmp.path, const parent = yield* withSession({ title: "parent" }).pipe(provideInstance(path.join(test.directory, "packages")))
fn: async () => { const current = yield* withSession({ title: "current" }).pipe(
const root = await svc.create({ title: "root" }) provideInstance(path.join(test.directory, "packages", "opencode")),
)
const sibling = yield* withSession({ title: "sibling" }).pipe(
provideInstance(path.join(test.directory, "packages", "app")),
)
const parent = await WithInstance.provide({ const ids = (yield* SessionNs.Service.use((session) => session.list())).map((session) => session.id)
directory: path.join(tmp.path, "packages"),
fn: async () => svc.create({ title: "parent" }),
})
const current = await WithInstance.provide({
directory: path.join(tmp.path, "packages", "opencode"),
fn: async () => svc.create({ title: "current" }),
})
const sibling = await WithInstance.provide({
directory: path.join(tmp.path, "packages", "app"),
fn: async () => svc.create({ title: "sibling" }),
})
const ids = (await svc.list()).map((s) => s.id)
expect(ids).toContain(root.id) expect(ids).toContain(root.id)
expect(ids).toContain(parent.id) expect(ids).toContain(parent.id)
expect(ids).toContain(current.id) expect(ids).toContain(current.id)
expect(ids).toContain(sibling.id) expect(ids).toContain(sibling.id)
}, }),
}) { git: true },
}) )
test("filters by directory when directory is provided", async () => { it.instance(
Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = false "filters by directory when directory is provided",
await using tmp = await tmpdir({ git: true }) () =>
await mkdir(path.join(tmp.path, "packages", "opencode"), { recursive: true }) Effect.gen(function* () {
await mkdir(path.join(tmp.path, "packages", "app"), { recursive: true }) Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = false
const test = yield* TestInstance
yield* Effect.promise(() => mkdir(path.join(test.directory, "packages", "opencode"), { recursive: true }))
yield* Effect.promise(() => mkdir(path.join(test.directory, "packages", "app"), { recursive: true }))
await WithInstance.provide({ const root = yield* withSession({ title: "root" })
directory: tmp.path, const parent = yield* withSession({ title: "parent" }).pipe(provideInstance(path.join(test.directory, "packages")))
fn: async () => { const current = yield* withSession({ title: "current" }).pipe(
const root = await svc.create({ title: "root" }) provideInstance(path.join(test.directory, "packages", "opencode")),
)
const sibling = yield* withSession({ title: "sibling" }).pipe(
provideInstance(path.join(test.directory, "packages", "app")),
)
const parent = await WithInstance.provide({ const ids = (
directory: path.join(tmp.path, "packages"), yield* SessionNs.Service.use((session) =>
fn: async () => svc.create({ title: "parent" }), session.list({ directory: path.join(test.directory, "packages", "opencode") }),
}) )
const current = await WithInstance.provide({ ).map((session) => session.id)
directory: path.join(tmp.path, "packages", "opencode"),
fn: async () => svc.create({ title: "current" }),
})
const sibling = await WithInstance.provide({
directory: path.join(tmp.path, "packages", "app"),
fn: async () => svc.create({ title: "sibling" }),
})
const ids = (await svc.list({ directory: path.join(tmp.path, "packages", "opencode") })).map((s) => s.id)
expect(ids).not.toContain(root.id) expect(ids).not.toContain(root.id)
expect(ids).not.toContain(parent.id) expect(ids).not.toContain(parent.id)
expect(ids).toContain(current.id) expect(ids).toContain(current.id)
expect(ids).not.toContain(sibling.id) expect(ids).not.toContain(sibling.id)
}, }),
}) { git: true },
}) )
test("filters by path and ignores directory when path is provided", async () => { it.instance(
Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = false "filters by path and ignores directory when path is provided",
await using tmp = await tmpdir({ git: true }) () =>
await mkdir(path.join(tmp.path, "packages", "opencode", "src", "deep"), { recursive: true }) Effect.gen(function* () {
await mkdir(path.join(tmp.path, "packages", "app"), { recursive: true }) Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = false
const test = yield* TestInstance
yield* Effect.promise(() =>
mkdir(path.join(test.directory, "packages", "opencode", "src", "deep"), { recursive: true }),
)
yield* Effect.promise(() => mkdir(path.join(test.directory, "packages", "app"), { recursive: true }))
await WithInstance.provide({ const parent = yield* withSession({ title: "parent" }).pipe(
directory: tmp.path, provideInstance(path.join(test.directory, "packages", "opencode")),
fn: async () => { )
const parent = await WithInstance.provide({ const current = yield* withSession({ title: "current" }).pipe(
directory: path.join(tmp.path, "packages", "opencode"), provideInstance(path.join(test.directory, "packages", "opencode", "src")),
fn: async () => svc.create({ title: "parent" }), )
}) const deeper = yield* withSession({ title: "deeper" }).pipe(
const current = await WithInstance.provide({ provideInstance(path.join(test.directory, "packages", "opencode", "src", "deep")),
directory: path.join(tmp.path, "packages", "opencode", "src"), )
fn: async () => svc.create({ title: "current" }), const sibling = yield* withSession({ title: "sibling" }).pipe(
}) provideInstance(path.join(test.directory, "packages", "app")),
const deeper = await WithInstance.provide({ )
directory: path.join(tmp.path, "packages", "opencode", "src", "deep"),
fn: async () => svc.create({ title: "deeper" }),
})
const sibling = await WithInstance.provide({
directory: path.join(tmp.path, "packages", "app"),
fn: async () => svc.create({ title: "sibling" }),
})
const pathIDs = ( const pathIDs = (
await svc.list({ yield* SessionNs.Service.use((session) =>
directory: path.join(tmp.path, "packages", "app"), session.list({
path: "packages/opencode/src", directory: path.join(test.directory, "packages", "app"),
}) path: "packages/opencode/src",
).map((s) => s.id) }),
)
).map((session) => session.id)
expect(pathIDs).not.toContain(parent.id) expect(pathIDs).not.toContain(parent.id)
expect(pathIDs).toContain(current.id) expect(pathIDs).toContain(current.id)
expect(pathIDs).toContain(deeper.id) expect(pathIDs).toContain(deeper.id)
expect(pathIDs).not.toContain(sibling.id) expect(pathIDs).not.toContain(sibling.id)
}, }),
}) { git: true },
}) )
test("falls back to directory when filtering legacy sessions without path", async () => { it.instance(
Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = false "falls back to directory when filtering legacy sessions without path",
await using tmp = await tmpdir({ git: true }) () =>
await mkdir(path.join(tmp.path, "packages", "opencode", "src"), { recursive: true }) Effect.gen(function* () {
await mkdir(path.join(tmp.path, "packages", "app"), { recursive: true }) Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = false
const test = yield* TestInstance
yield* Effect.promise(() => mkdir(path.join(test.directory, "packages", "opencode", "src"), { recursive: true }))
yield* Effect.promise(() => mkdir(path.join(test.directory, "packages", "app"), { recursive: true }))
await WithInstance.provide({ const current = yield* withSession({ title: "legacy-current" }).pipe(
directory: tmp.path, provideInstance(path.join(test.directory, "packages", "opencode", "src")),
fn: async () => { )
const current = await WithInstance.provide({ const sibling = yield* withSession({ title: "legacy-sibling" }).pipe(
directory: path.join(tmp.path, "packages", "opencode", "src"), provideInstance(path.join(test.directory, "packages", "app")),
fn: async () => svc.create({ title: "legacy-current" }), )
})
const sibling = await WithInstance.provide({
directory: path.join(tmp.path, "packages", "app"),
fn: async () => svc.create({ title: "legacy-sibling" }),
})
Database.use((db) => db.update(SessionTable).set({ path: null }).where(eq(SessionTable.id, current.id)).run()) yield* Effect.sync(() =>
Database.use((db) => db.update(SessionTable).set({ path: null }).where(eq(SessionTable.id, sibling.id)).run()) Database.use((db) => db.update(SessionTable).set({ path: null }).where(eq(SessionTable.id, current.id)).run()),
)
yield* Effect.sync(() =>
Database.use((db) => db.update(SessionTable).set({ path: null }).where(eq(SessionTable.id, sibling.id)).run()),
)
const pathIDs = ( const pathIDs = (
await svc.list({ yield* SessionNs.Service.use((session) =>
directory: path.join(tmp.path, "packages", "opencode", "src"), session.list({
path: "packages/opencode/src", directory: path.join(test.directory, "packages", "opencode", "src"),
}) path: "packages/opencode/src",
).map((s) => s.id) }),
)
).map((session) => session.id)
expect(pathIDs).toContain(current.id) expect(pathIDs).toContain(current.id)
expect(pathIDs).not.toContain(sibling.id) expect(pathIDs).not.toContain(sibling.id)
}, }),
}) { git: true },
}) )
test("filters root sessions", async () => { it.instance(
await using tmp = await tmpdir({ git: true }) "filters root sessions",
await WithInstance.provide({ () =>
directory: tmp.path, Effect.gen(function* () {
fn: async () => { const root = yield* withSession({ title: "root-session" })
const root = await svc.create({ title: "root-session" }) const child = yield* withSession({ title: "child-session", parentID: root.id })
const child = await svc.create({ title: "child-session", parentID: root.id })
const sessions = await svc.list({ roots: true }) const sessions = yield* SessionNs.Service.use((session) => session.list({ roots: true }))
const ids = sessions.map((s) => s.id) const ids = sessions.map((session) => session.id)
expect(ids).toContain(root.id) expect(ids).toContain(root.id)
expect(ids).not.toContain(child.id) expect(ids).not.toContain(child.id)
}, }),
}) { git: true },
}) )
test("filters by start time", async () => { it.instance(
await using tmp = await tmpdir({ git: true }) "filters by start time",
await WithInstance.provide({ () =>
directory: tmp.path, Effect.gen(function* () {
fn: async () => { yield* withSession({ title: "new-session" })
await svc.create({ title: "new-session" }) const sessions = yield* SessionNs.Service.use((session) => session.list({ start: Date.now() + 86400000 }))
const futureStart = Date.now() + 86400000
const sessions = await svc.list({ start: futureStart })
expect(sessions.length).toBe(0) expect(sessions.length).toBe(0)
}, }),
}) { git: true },
}) )
test("filters by search term", async () => { it.instance(
await using tmp = await tmpdir({ git: true }) "filters by search term",
await WithInstance.provide({ () =>
directory: tmp.path, Effect.gen(function* () {
fn: async () => { yield* withSession({ title: "unique-search-term-abc" })
await svc.create({ title: "unique-search-term-abc" }) yield* withSession({ title: "other-session-xyz" })
await svc.create({ title: "other-session-xyz" })
const sessions = await svc.list({ search: "unique-search" }) const sessions = yield* SessionNs.Service.use((session) => session.list({ search: "unique-search" }))
const titles = sessions.map((s) => s.title) const titles = sessions.map((session) => session.title)
expect(titles).toContain("unique-search-term-abc") expect(titles).toContain("unique-search-term-abc")
expect(titles).not.toContain("other-session-xyz") expect(titles).not.toContain("other-session-xyz")
}, }),
}) { git: true },
}) )
test("respects limit parameter", async () => { it.instance(
await using tmp = await tmpdir({ git: true }) "respects limit parameter",
await WithInstance.provide({ () =>
directory: tmp.path, Effect.gen(function* () {
fn: async () => { yield* withSession({ title: "session-1" })
await svc.create({ title: "session-1" }) yield* withSession({ title: "session-2" })
await svc.create({ title: "session-2" }) yield* withSession({ title: "session-3" })
await svc.create({ title: "session-3" })
const sessions = await svc.list({ limit: 2 }) const sessions = yield* SessionNs.Service.use((session) => session.list({ limit: 2 }))
expect(sessions.length).toBe(2) expect(sessions.length).toBe(2)
}, }),
}) { git: true },
}) )
}) })