Context: PR #26569 narrowly fixed a crash where the generated SDK sent GET /session/{sessionID}/message?limit=80&directory=... because public.ts manually injected InstanceQueryParameters (directory/workspace) into OpenAPI, but the runtime MessagesQuery schema omitted directory, causing empty 400. This change eliminates the drift by: 1. Creating a shared schema helper in query.ts that adds directory/workspace fields to all instance route query schemas. 2. Updating all instance route query schemas to use the helper: - session.ts: MessagesQuery, ListQuery - file.ts: FileQuery, FindTextQuery, FindFileQuery, FindSymbolQuery - experimental.ts: ToolListQuery, SessionListQuery - control.ts: LogQuery (already correct, now uses helper) - instance.ts, v2/session.ts, v2/message.ts 3. Adding reproducer tests in httpapi-query-schema-drift.test.ts that verify the runtime accepts directory/workspace params on affected routes. The OpenAPI spec generation in public.ts still manually injects params for backward compatibility with the legacy SDK format, but now the runtime schemas match, eliminating the validation errors. Verification: - bun typecheck passes - 4 drift reproducer tests pass - 24 httpapi tests pass across session, file, experimental, workspace-routing
541 lines
20 KiB
TypeScript
541 lines
20 KiB
TypeScript
import { afterEach, describe, expect } from "bun:test"
|
|
import { mkdir } from "node:fs/promises"
|
|
import path from "node:path"
|
|
import { Effect, Layer } from "effect"
|
|
import { Flag } from "@opencode-ai/core/flag/flag"
|
|
import { registerAdapter } from "../../src/control-plane/adapters"
|
|
import type { WorkspaceAdapter } from "../../src/control-plane/types"
|
|
import { Workspace } from "../../src/control-plane/workspace"
|
|
import { PermissionID } from "../../src/permission/schema"
|
|
import { ModelID, ProviderID } from "../../src/provider/schema"
|
|
import { WithInstance } from "../../src/project/with-instance"
|
|
import { InstanceBootstrap } from "../../src/project/bootstrap"
|
|
import { InstanceStore } from "../../src/project/instance-store"
|
|
import { Project } from "../../src/project/project"
|
|
import { Server } from "../../src/server/server"
|
|
import { SessionPaths } from "../../src/server/routes/instance/httpapi/groups/session"
|
|
import { Session } from "@/session/session"
|
|
import { MessageID, PartID, SessionID, type SessionID as SessionIDType } from "../../src/session/schema"
|
|
import { MessageV2 } from "../../src/session/message-v2"
|
|
import { Database } from "@/storage/db"
|
|
import { SessionMessageTable, SessionTable } from "@/session/session.sql"
|
|
import { SessionMessage } from "../../src/v2/session-message"
|
|
import { Modelv2 } from "../../src/v2/model"
|
|
import * as DateTime from "effect/DateTime"
|
|
import * as Log from "@opencode-ai/core/util/log"
|
|
import { eq } from "drizzle-orm"
|
|
import { resetDatabase } from "../fixture/db"
|
|
import { disposeAllInstances, tmpdir } from "../fixture/fixture"
|
|
import { it } from "../lib/effect"
|
|
|
|
void Log.init({ print: false })
|
|
|
|
const originalWorkspaces = Flag.OPENCODE_EXPERIMENTAL_WORKSPACES
|
|
const workspaceLayer = Workspace.defaultLayer.pipe(
|
|
Layer.provide(InstanceStore.defaultLayer),
|
|
Layer.provide(InstanceBootstrap.defaultLayer),
|
|
)
|
|
|
|
function app() {
|
|
return Server.Default().app
|
|
}
|
|
|
|
function runSession<A, E>(fx: Effect.Effect<A, E, Session.Service>) {
|
|
return Effect.runPromise(fx.pipe(Effect.provide(Session.defaultLayer)))
|
|
}
|
|
|
|
function pathFor(path: string, params: Record<string, string>) {
|
|
return Object.entries(params).reduce((result, [key, value]) => result.replace(`:${key}`, value), path)
|
|
}
|
|
|
|
function createSession(directory: string, input?: Session.CreateInput) {
|
|
return Effect.promise(
|
|
async () =>
|
|
await WithInstance.provide({
|
|
directory,
|
|
fn: () => runSession(Session.Service.use((svc) => svc.create(input))),
|
|
}),
|
|
)
|
|
}
|
|
|
|
function createTextMessage(directory: string, sessionID: SessionIDType, text: string) {
|
|
return Effect.promise(
|
|
async () =>
|
|
await WithInstance.provide({
|
|
directory,
|
|
fn: () =>
|
|
runSession(
|
|
Effect.gen(function* () {
|
|
const svc = yield* Session.Service
|
|
const info = yield* svc.updateMessage({
|
|
id: MessageID.ascending(),
|
|
role: "user",
|
|
sessionID,
|
|
agent: "build",
|
|
model: { providerID: ProviderID.make("test"), modelID: ModelID.make("test") },
|
|
time: { created: Date.now() },
|
|
})
|
|
const part = yield* svc.updatePart({
|
|
id: PartID.ascending(),
|
|
sessionID,
|
|
messageID: info.id,
|
|
type: "text",
|
|
text,
|
|
})
|
|
return { info, part }
|
|
}),
|
|
),
|
|
}),
|
|
)
|
|
}
|
|
|
|
const localAdapter = (directory: string): WorkspaceAdapter => ({
|
|
name: "Local Test",
|
|
description: "Create a local test workspace",
|
|
configure: (info) => ({ ...info, name: "local-test", directory }),
|
|
create: async () => {
|
|
await mkdir(directory, { recursive: true })
|
|
},
|
|
async remove() {},
|
|
target: () => ({ type: "local" as const, directory }),
|
|
})
|
|
|
|
const createLocalWorkspace = (input: { projectID: Project.Info["id"]; type: string; directory: string }) =>
|
|
Effect.gen(function* () {
|
|
registerAdapter(input.projectID, input.type, localAdapter(input.directory))
|
|
return yield* Workspace.Service.use((svc) =>
|
|
svc.create({
|
|
type: input.type,
|
|
branch: null,
|
|
extra: null,
|
|
projectID: input.projectID,
|
|
}),
|
|
).pipe(Effect.provide(workspaceLayer))
|
|
})
|
|
|
|
function request(path: string, init?: RequestInit) {
|
|
return Effect.promise(async () => app().request(path, init))
|
|
}
|
|
|
|
function json<T>(response: Response) {
|
|
return Effect.promise(async () => {
|
|
if (response.status !== 200) throw new Error(await response.text())
|
|
return (await response.json()) as T
|
|
})
|
|
}
|
|
|
|
function responseJson(response: Response) {
|
|
return Effect.promise(() => response.json())
|
|
}
|
|
|
|
function requestJson<T>(path: string, init?: RequestInit) {
|
|
return request(path, init).pipe(Effect.flatMap(json<T>))
|
|
}
|
|
|
|
function withTmp<A, E, R>(
|
|
options: Parameters<typeof tmpdir>[0],
|
|
fn: (tmp: Awaited<ReturnType<typeof tmpdir>>) => Effect.Effect<A, E, R>,
|
|
) {
|
|
return Effect.acquireRelease(
|
|
Effect.promise(() => tmpdir(options)),
|
|
(tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
|
|
).pipe(Effect.flatMap(fn))
|
|
}
|
|
|
|
afterEach(async () => {
|
|
Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = originalWorkspaces
|
|
await disposeAllInstances()
|
|
await resetDatabase()
|
|
})
|
|
|
|
describe("session HttpApi", () => {
|
|
it.live(
|
|
"returns declared not found errors for read routes",
|
|
withTmp({ git: true, config: { formatter: false, lsp: false } }, (tmp) =>
|
|
Effect.gen(function* () {
|
|
const headers = { "x-opencode-directory": tmp.path }
|
|
const missingSession = SessionID.descending()
|
|
const missingSessionBody = {
|
|
name: "NotFoundError",
|
|
data: { message: `Session not found: ${missingSession}` },
|
|
}
|
|
|
|
const get = yield* request(pathFor(SessionPaths.get, { sessionID: missingSession }), { headers })
|
|
expect(get.status).toBe(404)
|
|
expect(yield* responseJson(get)).toEqual(missingSessionBody)
|
|
|
|
const messages = yield* request(pathFor(SessionPaths.messages, { sessionID: missingSession }), { headers })
|
|
expect(messages.status).toBe(404)
|
|
expect(yield* responseJson(messages)).toEqual(missingSessionBody)
|
|
|
|
const remove = yield* request(pathFor(SessionPaths.remove, { sessionID: missingSession }), {
|
|
headers,
|
|
method: "DELETE",
|
|
})
|
|
expect(remove.status).toBe(404)
|
|
expect(yield* responseJson(remove)).toEqual(missingSessionBody)
|
|
|
|
const session = yield* createSession(tmp.path, { title: "missing message" })
|
|
const missingMessage = MessageID.ascending()
|
|
const message = yield* request(
|
|
pathFor(SessionPaths.message, { sessionID: session.id, messageID: missingMessage }),
|
|
{ headers },
|
|
)
|
|
expect(message.status).toBe(404)
|
|
expect(yield* responseJson(message)).toEqual({
|
|
name: "NotFoundError",
|
|
data: { message: `Message not found: ${missingMessage}` },
|
|
})
|
|
}),
|
|
),
|
|
)
|
|
|
|
it.live(
|
|
"serves read routes",
|
|
withTmp({ git: true, config: { formatter: false, lsp: false } }, (tmp) =>
|
|
Effect.gen(function* () {
|
|
const headers = { "x-opencode-directory": tmp.path }
|
|
const parent = yield* createSession(tmp.path, { title: "parent" })
|
|
const child = yield* createSession(tmp.path, { title: "child", parentID: parent.id })
|
|
const message = yield* createTextMessage(tmp.path, parent.id, "hello")
|
|
yield* createTextMessage(tmp.path, parent.id, "world")
|
|
|
|
const listed = yield* requestJson<Session.Info[]>(`${SessionPaths.list}?roots=true`, { headers })
|
|
expect(listed.map((item) => item.id)).toContain(parent.id)
|
|
expect(Object.hasOwn(listed[0]!, "parentID")).toBe(false)
|
|
|
|
expect(yield* requestJson<Record<string, unknown>>(SessionPaths.status, { headers })).toEqual({})
|
|
|
|
expect(
|
|
yield* requestJson<Session.Info>(pathFor(SessionPaths.get, { sessionID: parent.id }), { headers }),
|
|
).toMatchObject({ id: parent.id, title: "parent" })
|
|
|
|
expect(
|
|
(yield* requestJson<Session.Info[]>(pathFor(SessionPaths.children, { sessionID: parent.id }), {
|
|
headers,
|
|
})).map((item) => item.id),
|
|
).toEqual([child.id])
|
|
|
|
expect(
|
|
yield* requestJson<unknown[]>(pathFor(SessionPaths.todo, { sessionID: parent.id }), { headers }),
|
|
).toEqual([])
|
|
|
|
expect(
|
|
yield* requestJson<unknown[]>(pathFor(SessionPaths.diff, { sessionID: parent.id }), { headers }),
|
|
).toEqual([])
|
|
|
|
const messages = yield* request(`${pathFor(SessionPaths.messages, { sessionID: parent.id })}?limit=1`, {
|
|
headers,
|
|
})
|
|
const messagePage = yield* json<MessageV2.WithParts[]>(messages)
|
|
const nextCursor = messages.headers.get("x-next-cursor")
|
|
expect(nextCursor).toBeTruthy()
|
|
expect(messagePage[0]?.parts[0]).toMatchObject({ type: "text" })
|
|
|
|
expect(
|
|
(yield* request(`${pathFor(SessionPaths.messages, { sessionID: parent.id })}?before=${nextCursor}`, {
|
|
headers,
|
|
})).status,
|
|
).toBe(400)
|
|
expect(
|
|
(yield* request(`${pathFor(SessionPaths.messages, { sessionID: parent.id })}?limit=1&before=invalid`, {
|
|
headers,
|
|
})).status,
|
|
).toBe(400)
|
|
|
|
expect(
|
|
yield* requestJson<MessageV2.WithParts>(
|
|
pathFor(SessionPaths.message, { sessionID: parent.id, messageID: message.info.id }),
|
|
{ headers },
|
|
),
|
|
).toMatchObject({ info: { id: message.info.id } })
|
|
|
|
yield* Effect.promise(() =>
|
|
WithInstance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
const message = new SessionMessage.Assistant({
|
|
id: SessionMessage.ID.create(),
|
|
type: "assistant",
|
|
agent: "build",
|
|
model: {
|
|
id: Modelv2.ID.make("model"),
|
|
providerID: Modelv2.ProviderID.make("provider"),
|
|
variant: Modelv2.VariantID.make("default"),
|
|
},
|
|
time: { created: DateTime.makeUnsafe(1) },
|
|
content: [],
|
|
})
|
|
Database.use((db) =>
|
|
db
|
|
.insert(SessionMessageTable)
|
|
.values([
|
|
{
|
|
id: message.id,
|
|
session_id: parent.id,
|
|
type: message.type,
|
|
time_created: 1,
|
|
data: {
|
|
time: { created: 1 },
|
|
agent: message.agent,
|
|
model: message.model,
|
|
content: message.content,
|
|
} as NonNullable<(typeof SessionMessageTable.$inferInsert)["data"]>,
|
|
},
|
|
])
|
|
.run(),
|
|
)
|
|
},
|
|
}),
|
|
)
|
|
|
|
expect(
|
|
(yield* requestJson<{ items: SessionMessage.Message[] }>(
|
|
`/api/session/${parent.id}/message?directory=${encodeURIComponent(tmp.path)}`,
|
|
{ headers },
|
|
)).items,
|
|
).toMatchObject([{ type: "assistant" }])
|
|
}),
|
|
),
|
|
)
|
|
|
|
it.live(
|
|
"serves lifecycle mutation routes",
|
|
withTmp({ git: true, config: { formatter: false, lsp: false, share: "disabled" } }, (tmp) =>
|
|
Effect.gen(function* () {
|
|
const headers = { "x-opencode-directory": tmp.path, "content-type": "application/json" }
|
|
|
|
const createdEmpty = yield* requestJson<Session.Info>(SessionPaths.create, {
|
|
method: "POST",
|
|
headers,
|
|
})
|
|
expect(createdEmpty.id).toBeTruthy()
|
|
|
|
const created = yield* requestJson<Session.Info>(SessionPaths.create, {
|
|
method: "POST",
|
|
headers,
|
|
body: JSON.stringify({ title: "created" }),
|
|
})
|
|
expect(created.title).toBe("created")
|
|
|
|
const updated = yield* requestJson<Session.Info>(pathFor(SessionPaths.update, { sessionID: created.id }), {
|
|
method: "PATCH",
|
|
headers,
|
|
body: JSON.stringify({ title: "updated", time: { archived: 1 } }),
|
|
})
|
|
expect(updated).toMatchObject({ id: created.id, title: "updated", time: { archived: 1 } })
|
|
|
|
const forked = yield* requestJson<Session.Info>(pathFor(SessionPaths.fork, { sessionID: created.id }), {
|
|
method: "POST",
|
|
headers,
|
|
body: JSON.stringify({}),
|
|
})
|
|
expect(forked.id).not.toBe(created.id)
|
|
|
|
expect(
|
|
yield* requestJson<boolean>(pathFor(SessionPaths.abort, { sessionID: created.id }), {
|
|
method: "POST",
|
|
headers,
|
|
}),
|
|
).toBe(true)
|
|
|
|
expect(
|
|
yield* requestJson<boolean>(pathFor(SessionPaths.remove, { sessionID: created.id }), {
|
|
method: "DELETE",
|
|
headers,
|
|
}),
|
|
).toBe(true)
|
|
}),
|
|
),
|
|
)
|
|
|
|
it.live(
|
|
"persists selected workspace id when creating a session",
|
|
withTmp({ git: true, config: { formatter: false, lsp: false, share: "disabled" } }, (tmp) =>
|
|
Effect.gen(function* () {
|
|
Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = true
|
|
const project = yield* Project.use.fromDirectory(tmp.path).pipe(Effect.provide(Project.defaultLayer))
|
|
const workspace = yield* createLocalWorkspace({
|
|
projectID: project.project.id,
|
|
type: "session-create-workspace",
|
|
directory: path.join(tmp.path, ".workspace-local"),
|
|
})
|
|
|
|
const created = yield* requestJson<Session.Info>(`${SessionPaths.create}?workspace=${workspace.id}`, {
|
|
method: "POST",
|
|
headers: { "x-opencode-directory": tmp.path, "content-type": "application/json" },
|
|
body: JSON.stringify({ title: "workspace session" }),
|
|
})
|
|
const messages = yield* request(`${pathFor(SessionPaths.messages, { sessionID: created.id })}?workspace=${workspace.id}`, {
|
|
headers: { "x-opencode-directory": tmp.path },
|
|
})
|
|
|
|
expect(created).toMatchObject({ id: created.id, workspaceID: workspace.id })
|
|
expect(messages.status).toBe(200)
|
|
expect(
|
|
yield* Effect.sync(() =>
|
|
Database.use((db) =>
|
|
db
|
|
.select({ workspaceID: SessionTable.workspace_id })
|
|
.from(SessionTable)
|
|
.where(eq(SessionTable.id, created.id))
|
|
.get(),
|
|
),
|
|
),
|
|
).toEqual({ workspaceID: workspace.id })
|
|
}),
|
|
),
|
|
)
|
|
|
|
it.live(
|
|
"validates archived timestamp values",
|
|
withTmp({ git: true, config: { formatter: false, lsp: false } }, (tmp) =>
|
|
Effect.gen(function* () {
|
|
const headers = { "x-opencode-directory": tmp.path, "content-type": "application/json" }
|
|
const session = yield* createSession(tmp.path, { title: "archived" })
|
|
const body = JSON.stringify({ time: { archived: -1 } })
|
|
|
|
const response = yield* request(pathFor(SessionPaths.update, { sessionID: session.id }), {
|
|
method: "PATCH",
|
|
headers,
|
|
body,
|
|
})
|
|
expect(response.status).toBe(200)
|
|
expect((yield* json<Session.Info>(response)).time.archived).toBe(-1)
|
|
}),
|
|
),
|
|
)
|
|
|
|
it.live(
|
|
"uses project-scoped path and directory precedence",
|
|
withTmp({ git: true, config: { formatter: false, lsp: false } }, (tmp) =>
|
|
Effect.gen(function* () {
|
|
const currentDir = path.join(tmp.path, "packages", "opencode", "src")
|
|
yield* Effect.promise(() => mkdir(currentDir, { recursive: true }))
|
|
|
|
const pathSession = yield* createSession(currentDir)
|
|
const pathlessSession = yield* createSession(currentDir)
|
|
yield* Effect.sync(() =>
|
|
Database.use((db) =>
|
|
db.update(SessionTable).set({ path: null }).where(eq(SessionTable.id, pathlessSession.id)).run(),
|
|
),
|
|
)
|
|
|
|
const query = new URLSearchParams({
|
|
scope: "project",
|
|
path: "packages/opencode/src",
|
|
directory: currentDir,
|
|
})
|
|
const headers = { "x-opencode-directory": tmp.path }
|
|
const sessions = (yield* json<Session.Info[]>(
|
|
yield* request(`${SessionPaths.list}?${query}`, { headers }),
|
|
)).map((item) => item.id)
|
|
|
|
expect(sessions).toContain(pathSession.id)
|
|
expect(sessions).not.toContain(pathlessSession.id)
|
|
}),
|
|
),
|
|
)
|
|
|
|
it.live(
|
|
"serves paginated message link headers",
|
|
withTmp({ git: true, config: { formatter: false, lsp: false } }, (tmp) =>
|
|
Effect.gen(function* () {
|
|
const headers = { "x-opencode-directory": tmp.path }
|
|
const session = yield* createSession(tmp.path, { title: "messages" })
|
|
yield* createTextMessage(tmp.path, session.id, "first")
|
|
yield* createTextMessage(tmp.path, session.id, "second")
|
|
const route = `${pathFor(SessionPaths.messages, { sessionID: session.id })}?limit=1`
|
|
|
|
const response = yield* request(route, { headers })
|
|
|
|
expect(response.headers.get("x-next-cursor")).toBeTruthy()
|
|
expect(response.headers.get("link")).toContain("limit=1")
|
|
expect(response.headers.get("access-control-expose-headers")?.toLowerCase()).toContain("x-next-cursor")
|
|
}),
|
|
),
|
|
)
|
|
|
|
it.live(
|
|
"serves message mutation routes",
|
|
withTmp({ git: true, config: { formatter: false, lsp: false } }, (tmp) =>
|
|
Effect.gen(function* () {
|
|
const headers = { "x-opencode-directory": tmp.path, "content-type": "application/json" }
|
|
const session = yield* createSession(tmp.path, { title: "messages" })
|
|
const first = yield* createTextMessage(tmp.path, session.id, "first")
|
|
const second = yield* createTextMessage(tmp.path, session.id, "second")
|
|
|
|
const updated = yield* requestJson<MessageV2.Part>(
|
|
pathFor(SessionPaths.updatePart, {
|
|
sessionID: session.id,
|
|
messageID: first.info.id,
|
|
partID: first.part.id,
|
|
}),
|
|
{
|
|
method: "PATCH",
|
|
headers,
|
|
body: JSON.stringify({ ...first.part, text: "updated" }),
|
|
},
|
|
)
|
|
expect(updated).toMatchObject({ id: first.part.id, type: "text", text: "updated" })
|
|
|
|
expect(
|
|
yield* requestJson<boolean>(
|
|
pathFor(SessionPaths.deletePart, {
|
|
sessionID: session.id,
|
|
messageID: first.info.id,
|
|
partID: first.part.id,
|
|
}),
|
|
{ method: "DELETE", headers },
|
|
),
|
|
).toBe(true)
|
|
|
|
expect(
|
|
yield* requestJson<boolean>(
|
|
pathFor(SessionPaths.deleteMessage, { sessionID: session.id, messageID: second.info.id }),
|
|
{ method: "DELETE", headers },
|
|
),
|
|
).toBe(true)
|
|
}),
|
|
),
|
|
)
|
|
|
|
it.live(
|
|
"serves remaining non-LLM session mutation routes",
|
|
withTmp({ git: true, config: { formatter: false, lsp: false } }, (tmp) =>
|
|
Effect.gen(function* () {
|
|
const headers = { "x-opencode-directory": tmp.path, "content-type": "application/json" }
|
|
const session = yield* createSession(tmp.path, { title: "remaining" })
|
|
|
|
expect(
|
|
yield* requestJson<Session.Info>(pathFor(SessionPaths.revert, { sessionID: session.id }), {
|
|
method: "POST",
|
|
headers,
|
|
body: JSON.stringify({ messageID: MessageID.ascending() }),
|
|
}),
|
|
).toMatchObject({ id: session.id })
|
|
|
|
expect(
|
|
yield* requestJson<Session.Info>(pathFor(SessionPaths.unrevert, { sessionID: session.id }), {
|
|
method: "POST",
|
|
headers,
|
|
}),
|
|
).toMatchObject({ id: session.id })
|
|
|
|
expect(
|
|
yield* requestJson<boolean>(
|
|
pathFor(SessionPaths.permissions, {
|
|
sessionID: session.id,
|
|
permissionID: String(PermissionID.ascending()),
|
|
}),
|
|
{
|
|
method: "POST",
|
|
headers,
|
|
body: JSON.stringify({ response: "once" }),
|
|
},
|
|
),
|
|
).toBe(true)
|
|
}),
|
|
),
|
|
)
|
|
})
|