Normalize legacy session messages without agent or model

Author: Eric-Guo

packages/opencode/src/session/message-v2.ts

@@ -34,6 +34,7 @@ import { ProviderError } from "@/provider/error"
 import { iife } from "@/util/iife"
 import { errorMessage } from "@/util/error"
 import { isMedia } from "@/util/media"
+import { isRecord } from "@/util/record"
 import type { SystemError } from "bun"
 import type { Provider } from "@/provider/provider"
 import { Effect, Schema } from "effect"
@@ -89,13 +90,28 @@ export const cursor = {
   },
 }
 
-const info = (row: typeof MessageTable.$inferSelect) => {
-  const data = row.data as typeof row.data & { agent?: unknown; mode?: unknown }
+function infoModel(input: unknown): User["model"] | undefined {
+  if (!isRecord(input) || typeof input.providerID !== "string") return
+  const modelID = typeof input.modelID === "string" ? input.modelID : typeof input.id === "string" ? input.id : undefined
+  if (!modelID) return
+  return {
+    providerID: ProviderV2.ID.make(input.providerID),
+    modelID: ProviderV2.ModelID.make(modelID),
+    ...(typeof input.variant === "string" ? { variant: input.variant } : {}),
+  }
+}
+
+const legacyModel = (input: unknown, fallback?: User["model"]) =>
+  infoModel(input) ?? fallback ?? { providerID: ProviderV2.ID.make("unknown"), modelID: ProviderV2.ModelID.make("unknown") }
+
+const info = (row: typeof MessageTable.$inferSelect, fallbackModel?: User["model"]) => {
+  const data = row.data as typeof row.data & { agent?: unknown; mode?: unknown; model?: unknown }
   return {
     ...row.data,
     id: row.id,
     sessionID: row.session_id,
     ...(typeof data.agent === "string" ? {} : { agent: typeof data.mode === "string" ? data.mode : "build" }),
+    ...(data.role === "user" ? { model: legacyModel(data.model, fallbackModel) } : {}),
   } as Info
 }
 
@@ -113,6 +129,20 @@ const older = (row: Cursor) =>
 function hydrate(db: Database.Interface["db"], rows: (typeof MessageTable.$inferSelect)[]) {
   const ids = rows.map((row) => row.id)
   const partByMessage = new Map<string, Part[]>()
+  const modelByParent = new Map<string, User["model"]>()
+  for (const row of rows) {
+    const data = row.data as typeof row.data & {
+      modelID?: unknown
+      parentID?: unknown
+      providerID?: unknown
+      variant?: unknown
+    }
+    if (data.role !== "assistant" || typeof data.parentID !== "string") continue
+    modelByParent.set(
+      data.parentID,
+      legacyModel({ providerID: data.providerID, modelID: data.modelID, variant: data.variant }),
+    )
+  }
   return Effect.gen(function* () {
     if (ids.length > 0) {
       const partRows = yield* db
@@ -131,7 +161,7 @@ function hydrate(db: Database.Interface["db"], rows: (typeof MessageTable.$infer
     }
 
     return rows.map((row) => ({
-      info: info(row),
+      info: info(row, modelByParent.get(row.id)),
       parts: partByMessage.get(row.id) ?? [],
     }))
   })

packages/opencode/test/server/httpapi-session.test.ts

@@ -215,11 +215,12 @@ const insertLegacyMessageV2Assistant = (sessionID: SessionIDType, parentID: Mess
 
 const insertLegacyMessageV2User = (sessionID: SessionIDType) =>
   Effect.sync(() => {
+    const id = MessageID.ascending()
     Database.use((db) =>
       db
         .insert(MessageTable)
         .values({
-          id: MessageID.ascending(),
+          id,
           session_id: sessionID,
           time_created: 1,
           time_updated: 1,
@@ -231,6 +232,7 @@ const insertLegacyMessageV2User = (sessionID: SessionIDType) =>
         })
         .run(),
     )
+    return id
   })
 
 const setLegacySummaryDiff = (sessionID: SessionIDType) =>
@@ -691,31 +693,23 @@ describe("session HttpApi", () => {
     () =>
       Effect.gen(function* () {
         const test = yield* TestInstance
-        const userSession = yield* createSession({ title: "legacy user" })
-        const assistantSession = yield* createSession({ title: "legacy assistant" })
-        const message = yield* createTextMessage(assistantSession.id, "hello")
-        yield* insertLegacyMessageV2User(userSession.id)
-        yield* insertLegacyMessageV2Assistant(assistantSession.id, message.info.id)
+        const session = yield* createSession({ title: "legacy messages" })
+        const userID = yield* insertLegacyMessageV2User(session.id)
+        yield* insertLegacyMessageV2Assistant(session.id, userID)
 
         const headers = { "x-opencode-directory": test.directory }
-        const userResponse = yield* request(
-          `${pathFor(SessionPaths.messages, { sessionID: userSession.id })}?limit=80`,
-          { headers },
-        )
-        const assistantResponse = yield* request(
-          `${pathFor(SessionPaths.messages, { sessionID: assistantSession.id })}?limit=80`,
-          { headers },
-        )
+        const response = yield* request(`${pathFor(SessionPaths.messages, { sessionID: session.id })}?limit=80`, {
+          headers,
+        })
+        const messages = yield* json<MessageV2.WithParts[]>(response)
 
-        expect(userResponse.status).toBe(200)
-        expect((yield* json<MessageV2.WithParts[]>(userResponse))[0]?.info).toMatchObject({
+        expect(response.status).toBe(200)
+        expect(messages.find((item) => item.info.role === "user")?.info).toMatchObject({
           role: "user",
           agent: "build",
+          model: { providerID: "test", modelID: "test" },
         })
-        expect(assistantResponse.status).toBe(200)
-        expect(
-          (yield* json<MessageV2.WithParts[]>(assistantResponse)).find((item) => item.info.role === "assistant")?.info,
-        ).toMatchObject({
+        expect(messages.find((item) => item.info.role === "assistant")?.info).toMatchObject({
           role: "assistant",
           agent: "build",
         })