From 3896f1a77a893cc6cbcbb281c58d2d4d21f64f02 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Wed, 11 Mar 2026 19:26:26 -0400
Subject: [PATCH] refactor(import): use .parse() at boundaries instead of
 manual .make() calls

Parse external SDK data through branded Zod schemas (Session.Info,
MessageV2.Info, MessageV2.Part) at the import boundary. This replaces
manual SessionID.make/MessageID.make/PartID.make wrapping with a single
.parse() call per entity, which both validates and brands in one step.
---
 packages/opencode/src/cli/cmd/import.ts | 30 +++++++++----------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/import.ts b/packages/opencode/src/cli/cmd/import.ts
index 8bd24cfec1b..a0c0101feaa 100644
--- a/packages/opencode/src/cli/cmd/import.ts
+++ b/packages/opencode/src/cli/cmd/import.ts
@@ -1,8 +1,7 @@
 import type { Argv } from "yargs"
 import type { Session as SDKSession, Message, Part } from "@opencode-ai/sdk/v2"
 import { Session } from "../../session"
-import { SessionID, MessageID, PartID } from "../../session/schema"
-import { WorkspaceID } from "../../control-plane/schema"
+import { MessageV2 } from "../../session/message-v2"
 import { cmd } from "./cmd"
 import { bootstrap } from "../bootstrap"
 import { Database } from "../../storage/db"
@@ -154,20 +153,11 @@ export const ImportCommand = cmd({
         return
       }
 
-      const row = Session.toRow({
+      const info = Session.Info.parse({
         ...exportData.info,
-        id: SessionID.make(exportData.info.id),
-        parentID: exportData.info.parentID ? SessionID.make(exportData.info.parentID) : undefined,
-        workspaceID: exportData.info.workspaceID ? WorkspaceID.make(exportData.info.workspaceID) : undefined,
         projectID: Instance.project.id,
-        revert: exportData.info.revert
-          ? {
-              ...exportData.info.revert,
-              messageID: MessageID.make(exportData.info.revert.messageID),
-              partID: exportData.info.revert.partID ? PartID.make(exportData.info.revert.partID) : undefined,
-            }
-          : undefined,
       })
+      const row = Session.toRow(info)
       Database.use((db) =>
         db
           .insert(SessionTable)
@@ -177,14 +167,15 @@ export const ImportCommand = cmd({
       )
 
       for (const msg of exportData.messages) {
-        const { id: _mid, sessionID: _msid, ...msgData } = msg.info
+        const msgInfo = MessageV2.Info.parse(msg.info)
+        const { id, sessionID: _, ...msgData } = msgInfo
         Database.use((db) =>
           db
             .insert(MessageTable)
             .values({
-              id: MessageID.make(msg.info.id),
+              id,
               session_id: row.id,
-              time_created: msg.info.time?.created ?? Date.now(),
+              time_created: msgInfo.time?.created ?? Date.now(),
               data: msgData,
             })
             .onConflictDoNothing()
@@ -192,13 +183,14 @@ export const ImportCommand = cmd({
         )
 
         for (const part of msg.parts) {
-          const { id: _pid, sessionID: _psid, messageID: _pmid, ...partData } = part
+          const partInfo = MessageV2.Part.parse(part)
+          const { id: partId, sessionID: _s, messageID, ...partData } = partInfo
           Database.use((db) =>
             db
               .insert(PartTable)
               .values({
-                id: PartID.make(part.id),
-                message_id: MessageID.make(msg.info.id),
+                id: partId,
+                message_id: messageID,
                 session_id: row.id,
                 data: partData,
               })