Merge branch 'dev' into feat/canceled-prompts-in-history

packages/opencode/src/cli/cmd/db.ts

@@ -0,0 +1,68 @@
+import type { Argv } from "yargs"
+import { spawn } from "child_process"
+import { Database } from "../../storage/db"
+import { Database as BunDatabase } from "bun:sqlite"
+import { UI } from "../ui"
+import { cmd } from "./cmd"
+
+const QueryCommand = cmd({
+  command: "$0 [query]",
+  describe: "open an interactive sqlite3 shell or run a query",
+  builder: (yargs: Argv) => {
+    return yargs
+      .positional("query", {
+        type: "string",
+        describe: "SQL query to execute",
+      })
+      .option("format", {
+        type: "string",
+        choices: ["json", "tsv"],
+        default: "tsv",
+        describe: "Output format",
+      })
+  },
+  handler: async (args: { query?: string; format: string }) => {
+    const query = args.query as string | undefined
+    if (query) {
+      const db = new BunDatabase(Database.Path, { readonly: true })
+      try {
+        const result = db.query(query).all() as Record<string, unknown>[]
+        if (args.format === "json") {
+          console.log(JSON.stringify(result, null, 2))
+        } else if (result.length > 0) {
+          const keys = Object.keys(result[0])
+          console.log(keys.join("\t"))
+          for (const row of result) {
+            console.log(keys.map((k) => row[k]).join("\t"))
+          }
+        }
+      } catch (err) {
+        UI.error(err instanceof Error ? err.message : String(err))
+        process.exit(1)
+      }
+      db.close()
+      return
+    }
+    const child = spawn("sqlite3", [Database.Path], {
+      stdio: "inherit",
+    })
+    await new Promise((resolve) => child.on("close", resolve))
+  },
+})
+
+const PathCommand = cmd({
+  command: "path",
+  describe: "print the database path",
+  handler: () => {
+    console.log(Database.Path)
+  },
+})
+
+export const DbCommand = cmd({
+  command: "db",
+  describe: "database tools",
+  builder: (yargs: Argv) => {
+    return yargs.command(QueryCommand).command(PathCommand).demandCommand()
+  },
+  handler: () => {},
+})

packages/opencode/src/index.ts

@@ -26,6 +26,7 @@ import { EOL } from "os"
 import { WebCommand } from "./cli/cmd/web"
 import { PrCommand } from "./cli/cmd/pr"
 import { SessionCommand } from "./cli/cmd/session"
+import { DbCommand } from "./cli/cmd/db"
 import path from "path"
 import { Global } from "./global"
 import { JsonMigration } from "./storage/json-migration"
@@ -81,14 +82,14 @@ const cli = yargs(hideBin(process.argv))
 
     const marker = path.join(Global.Path.data, "opencode.db")
     if (!(await Bun.file(marker).exists())) {
-      console.log("Performing one time database migration, may take a few minutes...")
-      const tty = process.stdout.isTTY
+      const tty = process.stderr.isTTY
+      process.stderr.write("Performing one time database migration, may take a few minutes..." + EOL)
       const width = 36
       const orange = "\x1b[38;5;214m"
       const muted = "\x1b[0;2m"
       const reset = "\x1b[0m"
       let last = -1
-      if (tty) process.stdout.write("\x1b[?25l")
+      if (tty) process.stderr.write("\x1b[?25l")
       try {
         await JsonMigration.run(Database.Client().$client, {
           progress: (event) => {
@@ -98,22 +99,22 @@ const cli = yargs(hideBin(process.argv))
             if (tty) {
               const fill = Math.round((percent / 100) * width)
               const bar = `${"■".repeat(fill)}${"･".repeat(width - fill)}`
-              process.stdout.write(
+              process.stderr.write(
                 `\r${orange}${bar} ${percent.toString().padStart(3)}%${reset} ${muted}${event.label.padEnd(12)} ${event.current}/${event.total}${reset}`,
               )
-              if (event.current === event.total) process.stdout.write("\n")
+              if (event.current === event.total) process.stderr.write("\n")
             } else {
-              console.log(`sqlite-migration:${percent}`)
+              process.stderr.write(`sqlite-migration:${percent}${EOL}`)
             }
           },
         })
       } finally {
-        if (tty) process.stdout.write("\x1b[?25h")
+        if (tty) process.stderr.write("\x1b[?25h")
         else {
-          console.log(`sqlite-migration:done`)
+          process.stderr.write(`sqlite-migration:done${EOL}`)
         }
       }
-      console.log("Database migration complete.")
+      process.stderr.write("Database migration complete." + EOL)
     }
   })
   .usage("\n" + UI.logo())
@@ -138,6 +139,7 @@ const cli = yargs(hideBin(process.argv))
   .command(GithubCommand)
   .command(PrCommand)
   .command(SessionCommand)
+  .command(DbCommand)
   .fail((msg, err) => {
     if (
       msg?.startsWith("Unknown argument") ||
@@ -188,7 +190,7 @@ try {
   if (formatted) UI.error(formatted)
   if (formatted === undefined) {
     UI.error("Unexpected error, check log file at " + Log.file() + " for more details" + EOL)
-    console.error(e instanceof Error ? e.message : String(e))
+    process.stderr.write((e instanceof Error ? e.message : String(e)) + EOL)
   }
   process.exitCode = 1
 } finally {

packages/opencode/src/storage/db.ts

@@ -25,6 +25,7 @@ export const NotFoundError = NamedError.create(
 const log = Log.create({ service: "db" })
 
 export namespace Database {
+  export const Path = path.join(Global.Path.data, "opencode.db")
   type Schema = typeof schema
   export type Transaction = SQLiteTransaction<"sync", void, Schema>
 

packages/opencode/src/storage/json-migration.ts

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