From 7bfbb1fcf84e0b1d5f096ec2caf36f0ff50f7a30 Mon Sep 17 00:00:00 2001
From: Noam Bressler <noamzbr@gmail.com>
Date: Mon, 2 Mar 2026 09:39:53 +0200
Subject: [PATCH] fix: project ID conflict, and update on same session id
 (#15596)

---
 packages/opencode/src/cli/cmd/import.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/opencode/src/cli/cmd/import.ts b/packages/opencode/src/cli/cmd/import.ts
index 4d65060f1..58c192825 100644
--- a/packages/opencode/src/cli/cmd/import.ts
+++ b/packages/opencode/src/cli/cmd/import.ts
@@ -131,7 +131,14 @@ export const ImportCommand = cmd({
         return
       }
 
-      Database.use((db) => db.insert(SessionTable).values(Session.toRow(exportData.info)).onConflictDoNothing().run())
+      const row = { ...Session.toRow(exportData.info), project_id: Instance.project.id }
+      Database.use((db) =>
+        db
+          .insert(SessionTable)
+          .values(row)
+          .onConflictDoUpdate({ target: SessionTable.id, set: { project_id: row.project_id } })
+          .run(),
+      )
 
       for (const msg of exportData.messages) {
         Database.use((db) =>