monadical/opencode
14
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: derive all IDs from file paths during json migration

Browse Source 
Earlier migrations moved data to new directories without updating JSON
fields. Now consistently derives all IDs from file paths:

- Projects: id from filename
- Sessions: id from filename, projectID from parent directory
- Messages: id from filename, sessionID from parent directory
- Parts: id from filename, messageID from parent directory

This ensures migrated data matches the actual file layout regardless of
stale values in JSON content.
This commit is contained in:
Dax Raad
2026-02-14 20:35:43 -05:00
parent 85b5f5b705
commit 2bab5e8c39
1 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
packages/opencode/src/storage/json-migration.ts
View File

@@ -152,6 +152,7 @@ export namespace JsonMigration {
sqlite.exec("BEGIN TRANSACTION") sqlite.exec("BEGIN TRANSACTION")
// Migrate projects first (no FK deps) // Migrate projects first (no FK deps)
// Derive all IDs from file paths, not JSON content
const projectIds = new Set<string>() const projectIds = new Set<string>()
const projectValues = [] as any[] const projectValues = [] as any[]
for (let i = 0; i < projectFiles.length; i += batchSize) { for (let i = 0; i < projectFiles.length; i += batchSize) {
@@ -161,13 +162,10 @@ export namespace JsonMigration {
for (let j = 0; j < batch.length; j++) { for (let j = 0; j < batch.length; j++) {
const data = batch[j] const data = batch[j]
if (!data) continue if (!data) continue
if (!data?.id) { const id = path.basename(projectFiles[i + j], ".json")
errs.push(`project missing id: ${projectFiles[i + j]}`) projectIds.add(id)
continue
}
projectIds.add(data.id)
projectValues.push({ projectValues.push({
id: data.id, id,
worktree: data.worktree ?? "/", worktree: data.worktree ?? "/",
vcs: data.vcs, vcs: data.vcs,
name: data.name ?? undefined, name: data.name ?? undefined,
@@ -186,6 +184,9 @@ export namespace JsonMigration {
log.info("migrated projects", { count: stats.projects, duration: Math.round(performance.now() - start) }) log.info("migrated projects", { count: stats.projects, duration: Math.round(performance.now() - start) })
// Migrate sessions (depends on projects) // Migrate sessions (depends on projects)
// Derive all IDs from directory/file paths, not JSON content, since earlier
// migrations may have moved sessions to new directories without updating the JSON
const sessionProjects = sessionFiles.map((file) => path.basename(path.dirname(file)))
const sessionIds = new Set<string>() const sessionIds = new Set<string>()
const sessionValues = [] as any[] const sessionValues = [] as any[]
for (let i = 0; i < sessionFiles.length; i += batchSize) { for (let i = 0; i < sessionFiles.length; i += batchSize) {
@@ -195,18 +196,16 @@ export namespace JsonMigration {
for (let j = 0; j < batch.length; j++) { for (let j = 0; j < batch.length; j++) {
const data = batch[j] const data = batch[j]
if (!data) continue if (!data) continue
if (!data?.id || !data?.projectID) { const id = path.basename(sessionFiles[i + j], ".json")
errs.push(`session missing id or projectID: ${sessionFiles[i + j]}`) const projectID = sessionProjects[i + j]
continue if (!projectIds.has(projectID)) {
}
if (!projectIds.has(data.projectID)) {
orphans.sessions++ orphans.sessions++
continue continue
} }
sessionIds.add(data.id) sessionIds.add(id)
sessionValues.push({ sessionValues.push({
id: data.id, id,
project_id: data.projectID, project_id: projectID,
parent_id: data.parentID ?? null, parent_id: data.parentID ?? null,
slug: data.slug ?? "", slug: data.slug ?? "",
directory: data.directory ?? "", directory: data.directory ?? "",
@@ -253,11 +252,7 @@ export namespace JsonMigration {
const data = batch[j] const data = batch[j]
if (!data) continue if (!data) continue
const file = allMessageFiles[i + j] const file = allMessageFiles[i + j]
const id = data.id ?? path.basename(file, ".json") const id = path.basename(file, ".json")
if (!id) {
errs.push(`message missing id: ${file}`)
continue
}
const sessionID = allMessageSessions[i + j] const sessionID = allMessageSessions[i + j]
messageSessions.set(id, sessionID) messageSessions.set(id, sessionID)
const rest = data const rest = data
@@ -287,12 +282,8 @@ export namespace JsonMigration {
const data = batch[j] const data = batch[j]
if (!data) continue if (!data) continue
const file = partFiles[i + j] const file = partFiles[i + j]
const id = data.id ?? path.basename(file, ".json") const id = path.basename(file, ".json")
const messageID = data.messageID ?? path.basename(path.dirname(file)) const messageID = path.basename(path.dirname(file))
if (!id || !messageID) {
errs.push(`part missing id/messageID/sessionID: ${file}`)
continue
}
const sessionID = messageSessions.get(messageID) const sessionID = messageSessions.get(messageID)
if (!sessionID) { if (!sessionID) {
errs.push(`part missing message session: ${file}`) errs.push(`part missing message session: ${file}`)