diff --git a/packages/core/src/database/v1-migration.bun.ts b/packages/core/src/database/v1-migration.bun.ts index b13aee50594..4d7c15df7b6 100644 --- a/packages/core/src/database/v1-migration.bun.ts +++ b/packages/core/src/database/v1-migration.bun.ts @@ -15,6 +15,7 @@ import { existsSync } from "node:fs" import path from "node:path" import type { Database as SQLiteDatabase } from "bun:sqlite" import { Project } from "@opencode/schema/project" +import { Agent } from "@opencode/schema/agent" export type SourceMessage = { readonly id: string @@ -469,7 +470,7 @@ export function transformSession(input: TransformInput): TransformResult { return { messages: migrated, session: { - agent: input.session.agent ?? (latestUser?.value.role === "user" ? latestUser.value.agent : null), + agent: input.session.agent ?? (latestUser?.value.role === "user" ? Agent.ID.make(latestUser.value.agent) : null), model: input.session.model ?? (latestUser?.value.role === "user" diff --git a/packages/core/src/session/inbox.ts b/packages/core/src/session/inbox.ts index 052a15525a7..f73e481a122 100644 --- a/packages/core/src/session/inbox.ts +++ b/packages/core/src/session/inbox.ts @@ -131,15 +131,24 @@ const promotedFromMessage = Effect.fn("SessionInbox.promotedFromMessage")(functi return User.make({ ...base, type: "user", - payload: decodeUser(message), + payload: UserPayload.make({ + text: message.text, + files: message.files, + agents: message.agents, + skills: message.skills, + metadata: message.metadata, + }), }) if (message.type === "synthetic") return Synthetic.make({ ...base, type: "synthetic", - payload: decodeSynthetic(message), + payload: SyntheticPayload.make({ + text: message.text, + description: message.description, + metadata: message.metadata, + }), }) - return yield* new LifecycleConflict({ id }) }) export type Interface = Effect.Success> diff --git a/packages/core/src/session/info.ts b/packages/core/src/session/info.ts index 88ff26f5e42..ba8af4359b4 100644 --- a/packages/core/src/session/info.ts +++ b/packages/core/src/session/info.ts @@ -1,5 +1,4 @@ import { DateTime, Schema } from "effect" -import { Agent } from "@opencode/schema/agent" import { Location } from "@opencode/schema/location" import { Model } from "@opencode/schema/model" import { Project } from "@opencode/schema/project" @@ -26,7 +25,7 @@ export function fromRow(row: typeof SessionTable.$inferSelect): SessionSchema.In boundary: row.fork_boundary, } : undefined, - agent: row.agent ? Agent.ID.make(row.agent) : undefined, + agent: row.agent ?? undefined, model: row.model ? { id: Model.ID.make(row.model.id), diff --git a/packages/core/src/session/projector.ts b/packages/core/src/session/projector.ts index 63ccbd79c5a..86b6eed40d8 100644 --- a/packages/core/src/session/projector.ts +++ b/packages/core/src/session/projector.ts @@ -6,7 +6,6 @@ import path from "path" import { Database } from "../database/database.js" import { Bus } from "../bus.js" import { makeGlobalNode } from "@opencode/util/effect/app-node" -import { Agent } from "@opencode/schema/agent" import { Model } from "@opencode/schema/model" import { SessionEvent } from "./event.js" import { SessionMessage } from "./message.js" @@ -257,13 +256,13 @@ function run(db: DatabaseService, event: MessageEvent) { return Effect.gen(function* () { const updateMessage = (message: SessionMessage.Info) => { const encoded = encodeMessage(message) - const { id, type, ...data } = encoded + const { id: _, type, ...data } = encoded return db .update(SessionMessageTable) .set({ type, time_created: DateTime.toEpochMillis(message.time.created), data }) .where( and( - eq(SessionMessageTable.id, SessionMessage.ID.make(id)), + eq(SessionMessageTable.id, message.id), eq(SessionMessageTable.session_id, event.data.sessionID), ), ) @@ -280,7 +279,7 @@ function run(db: DatabaseService, event: MessageEvent) { .get() .pipe( Effect.orDie, - Effect.map((row) => (row?.agent ? Agent.ID.make(row.agent) : undefined)), + Effect.map((row) => row?.agent ?? undefined), ) }, getModel() { @@ -411,11 +410,11 @@ function run(db: DatabaseService, event: MessageEvent) { function insertMessage(db: DatabaseService, event: SessionEvent.DurableEvent, message: SessionMessage.Info) { const encoded = encodeMessage(message) - const { id, type, ...data } = encoded + const { id: _, type, ...data } = encoded return db .insert(SessionMessageTable) .values({ - id: SessionMessage.ID.make(id), + id: message.id, session_id: event.data.sessionID, type, seq: event.durable.seq, diff --git a/packages/core/src/session/sql.ts b/packages/core/src/session/sql.ts index 4465d885b33..88e9f925600 100644 --- a/packages/core/src/session/sql.ts +++ b/packages/core/src/session/sql.ts @@ -4,6 +4,7 @@ import { directoryColumn, pathColumn } from "../database/path.js" import { ProjectTable } from "../project/sql.js" import type { SessionMessage } from "./message.js" import type { SessionInbox } from "./inbox.js" +import type { Agent } from "@opencode/schema/agent" import type { FileDiff } from "@opencode/schema/file-diff" import type { Permission } from "@opencode/schema/permission" import type { Project } from "@opencode/schema/project" @@ -50,7 +51,7 @@ export const SessionTable = sqliteTable( tokens_cache_write: integer().notNull().default(0), revert: text({ mode: "json" }).$type(), permission: text({ mode: "json" }).$type(), - agent: text(), + agent: text().$type(), model: text({ mode: "json" }).$type<{ id: string providerID: string diff --git a/packages/core/test/permission.test.ts b/packages/core/test/permission.test.ts index d7a81110d43..d85e03247d8 100644 --- a/packages/core/test/permission.test.ts +++ b/packages/core/test/permission.test.ts @@ -49,7 +49,7 @@ function setup(rules: Permission.Ruleset = [], sessionID = Session.ID.make("ses_ directory: "/project", title: "test", version: "test", - agent: "test", + agent: Agent.ID.make("test"), }) .onConflictDoNothing() .run() diff --git a/packages/core/test/session-create.test.ts b/packages/core/test/session-create.test.ts index 78d51f41129..db72afb4e9b 100644 --- a/packages/core/test/session-create.test.ts +++ b/packages/core/test/session-create.test.ts @@ -921,7 +921,7 @@ describe("Session.create", () => { const input = { id, location } const created = yield* session.create(input) - yield* db.update(SessionTable).set({ agent: "build" }).where(eq(SessionTable.id, id)).run().pipe(Effect.orDie) + yield* db.update(SessionTable).set({ agent: Agent.defaultID }).where(eq(SessionTable.id, id)).run().pipe(Effect.orDie) expect(yield* session.create(input)).toMatchObject({ id: created.id, agent: "build" }) }), diff --git a/packages/core/test/session-projector.test.ts b/packages/core/test/session-projector.test.ts index 5cc9a070a6a..96f45aa7f51 100644 --- a/packages/core/test/session-projector.test.ts +++ b/packages/core/test/session-projector.test.ts @@ -331,7 +331,7 @@ describe("SessionProjector", () => { it.effect("projects durable context messages supported by the updater", () => Effect.gen(function* () { - const db = yield* seedSession({ agent: "plan", model: previousModel }) + const db = yield* seedSession({ agent: Agent.ID.make("plan"), model: previousModel }) const bus = yield* Bus.Service yield* bus.publish(SessionEvent.AgentSelected, { diff --git a/packages/core/test/session-runner.test.ts b/packages/core/test/session-runner.test.ts index 02d9d0690c8..7289ba02cb7 100644 --- a/packages/core/test/session-runner.test.ts +++ b/packages/core/test/session-runner.test.ts @@ -1843,7 +1843,7 @@ describe("SessionRunnerLLM", () => { ) yield* s.db .update(SessionTable) - .set({ agent: "reviewer" }) + .set({ agent: Agent.ID.make("reviewer") }) .where(eq(SessionTable.id, sessionID)) .run() .pipe(Effect.orDie) @@ -1863,7 +1863,7 @@ describe("SessionRunnerLLM", () => { scenario("fails before the model request when the selected agent is unavailable", function* (s) { yield* s.db .update(SessionTable) - .set({ agent: "explore" }) + .set({ agent: Agent.ID.make("explore") }) .where(eq(SessionTable.id, sessionID)) .run() .pipe(Effect.orDie) diff --git a/packages/core/test/v1-migration.test.ts b/packages/core/test/v1-migration.test.ts index 47d1871219a..e4e3f7d500a 100644 --- a/packages/core/test/v1-migration.test.ts +++ b/packages/core/test/v1-migration.test.ts @@ -8,6 +8,7 @@ import { SessionMessage } from "@opencode/core/session/message" import { SessionSchema } from "@opencode/core/session/schema" import { SessionTable } from "@opencode/core/session/sql" import { Project } from "@opencode/core/project" +import { Agent } from "@opencode/schema/agent" import { ProjectTable } from "@opencode/core/project/sql" import { AbsolutePath } from "@opencode/core/schema" import { Global } from "@opencode/util/global" @@ -661,7 +662,7 @@ describe("V1Migration.transformSession", () => { const compact = user("msg_000000000027aaaaaaaaaaaaaa", {}, 3) const summary = assistant("msg_000000000028aaaaaaaaaaaaaa", compact.id, { summary: true }, 4) const existing = session({ - agent: "existing", + agent: Agent.ID.make("existing"), model: { id: "existing-model", providerID: "existing-provider", variant: "existing" }, }) const result = transform( @@ -680,7 +681,7 @@ describe("V1Migration.transformSession", () => { metadata: { recent: "[User]: question\n\n[Assistant]: answer" }, }) expect(result.messages[2].data).not.toHaveProperty("recent") - expect(result.session.agent).toBe("existing") + expect(result.session.agent).toBe(Agent.ID.make("existing")) expect(result.session.model).toEqual(existing.model) }) @@ -722,7 +723,7 @@ describe("V1Migration.transformSession", () => { }, ]) expect(result.session).toEqual({ - agent: "review", + agent: Agent.ID.make("review"), model: { id: "m2", providerID: "p2", variant: "default" }, cost: 7, tokens_input: 8,