refactor(schema): apply session review decisions (#35793)

This commit is contained in:
Kit Langton
2026-07-07 22:10:11 -04:00
committed by GitHub
parent d27746e5b3
commit ed6ad272ec
142 changed files with 4321 additions and 3256 deletions
@@ -28,6 +28,7 @@ import { MessageID, PartID, SessionID, type SessionID as SessionIDType } from ".
import { Database } from "@opencode-ai/core/database/database"
import { SessionInputTable, SessionMessageTable, SessionTable } from "@opencode-ai/core/session/sql"
import { SessionMessage } from "@opencode-ai/core/session/message"
import { Agent } from "@opencode-ai/schema/agent"
import { ModelV2 } from "@opencode-ai/core/model"
import { ProviderV2 } from "@opencode-ai/core/provider"
import * as DateTime from "effect/DateTime"
@@ -76,7 +77,7 @@ function createTextMessage(sessionID: SessionIDType, text: string) {
id: MessageID.ascending(),
role: "user",
sessionID,
agent: "build",
agent: Agent.ID.make("build"),
model: { providerID: ProviderV2.ID.make("test"), modelID: ModelV2.ID.make("test") },
time: { created: Date.now() },
})
@@ -123,7 +124,7 @@ const insertLegacyAssistantMessage = (sessionID: SessionIDType, seq = 1, time =
const message = SessionMessage.Assistant.make({
id: SessionMessage.ID.create(),
type: "assistant",
agent: "build",
agent: Agent.ID.make("build"),
model: {
id: ModelV2.ID.make("model"),
providerID: ProviderV2.ID.make("provider"),
@@ -380,7 +381,7 @@ describe("session HttpApi", () => {
yield* insertLegacyAssistantMessage(parent.id)
expect(
(yield* requestJson<{ data: SessionMessage.Message[] }>(`/api/session/${parent.id}/message`, {
(yield* requestJson<{ data: SessionMessage.Info[] }>(`/api/session/${parent.id}/message`, {
headers,
})).data,
).toMatchObject([{ type: "assistant" }])
@@ -474,7 +475,7 @@ describe("session HttpApi", () => {
})
const messagePage = yield* request(`/api/session/${session.id}/message?limit=1`, { headers })
const messageBody = yield* json<{ data: SessionMessage.Message[]; cursor: { next?: string } }>(messagePage)
const messageBody = yield* json<{ data: SessionMessage.Info[]; cursor: { next?: string } }>(messagePage)
const messageCursor = messageBody.cursor.next
expect(messageCursor).toBeTruthy()
expect(messageBody.data.map((message) => message.id)).toEqual([secondMessage.id])
@@ -488,7 +489,7 @@ describe("session HttpApi", () => {
headers,
})
expect(
(yield* json<{ data: SessionMessage.Message[] }>(nextMessagePage)).data.map((message) => message.id),
(yield* json<{ data: SessionMessage.Info[] }>(nextMessagePage)).data.map((message) => message.id),
).toEqual([firstMessage.id])
const legacyMessageCursor = Buffer.from(
@@ -498,7 +499,7 @@ describe("session HttpApi", () => {
headers,
})
expect(
(yield* json<{ data: SessionMessage.Message[] }>(legacyMessagePage)).data.map((message) => message.id),
(yield* json<{ data: SessionMessage.Info[] }>(legacyMessagePage)).data.map((message) => message.id),
).toEqual([firstMessage.id])
const messageCursorWithOrder = yield* request(
@@ -625,7 +626,7 @@ describe("session HttpApi", () => {
})
expect(wake.status).toBe(200)
const message = yield* pollWithTimeout(
requestJson<{ data: SessionMessage.Message[] }>(`/api/session/${session.id}/message`, { headers }).pipe(
requestJson<{ data: SessionMessage.Info[] }>(`/api/session/${session.id}/message`, { headers }).pipe(
Effect.map(({ data }) => data.find((message) => message.id === wakeID)),
),
"V2 prompt was not promoted after wake",
@@ -637,28 +638,25 @@ describe("session HttpApi", () => {
)
it.instance(
"returns v2 public unavailable errors for unfinished session mutations",
"supports current session compact and wait endpoints",
() =>
Effect.gen(function* () {
const test = yield* TestInstance
const headers = { "x-opencode-directory": test.directory }
const session = yield* createSession({ title: "v2 unavailable" })
const compact = yield* request(`/api/session/${session.id}/compact`, { method: "POST", headers })
expect(compact.status).toBe(503)
expect(yield* responseJson(compact)).toEqual({
_tag: "ServiceUnavailableError",
message: "Session compact is not available yet",
service: "session.compact",
const compact = yield* request(`/api/session/${session.id}/compact`, {
method: "POST",
headers: { ...headers, "content-type": "application/json" },
body: JSON.stringify({}),
})
expect(compact.status).toBe(200)
expect(yield* responseJson(compact)).toMatchObject({
data: { type: "compaction", sessionID: session.id },
})
const wait = yield* request(`/api/session/${session.id}/wait`, { method: "POST", headers })
expect(wait.status).toBe(503)
expect(yield* responseJson(wait)).toEqual({
_tag: "ServiceUnavailableError",
message: "Session wait is not available yet",
service: "session.wait",
})
expect(wait.status).toBe(204)
}),
{ git: true, config: { formatter: false, lsp: false } },
)