sync

Author: thdxr

AGENTS.md

@@ -19,16 +19,16 @@
 
 ### Naming
 
-Prefer single word variable names. Only use multiple words if necessary.
+Prefer single word names for variables and functions. Only use multiple words if necessary.
 
 ```ts
 // Good
 const foo = 1
-const bar = 2
+function journal(dir: string) {}
 
 // Bad
 const fooBar = 1
-const barBaz = 2
+function prepareJournal(dir: string) {}
 ```
 
 Reduce total variable count by inlining when a value is only used once.
@@ -87,6 +87,26 @@ function foo() {
 }
 ```
 
+### Schema Definitions (Drizzle)
+
+Use snake_case for field names so column names don't need to be redefined as strings.
+
+```ts
+// Good
+const table = sqliteTable("session", {
+  id: text().primaryKey(),
+  project_id: text().notNull(),
+  created_at: integer().notNull(),
+})
+
+// Bad
+const table = sqliteTable("session", {
+  id: text("id").primaryKey(),
+  projectID: text("project_id").notNull(),
+  createdAt: integer("created_at").notNull(),
+})
+```
+
 ## Testing
 
 - Avoid mocks as much as possible

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

@@ -65,7 +65,7 @@ const ExportCommand = cmd({
       // Export sessions (organized by projectID)
       const sessionDir = path.join(outDir, "session")
       for (const row of Database.use((db) => db.select().from(SessionTable).all())) {
-        const dir = path.join(sessionDir, row.projectID)
+        const dir = path.join(sessionDir, row.project_id)
         await fs.mkdir(dir, { recursive: true })
         await Bun.write(path.join(dir, `${row.id}.json`), JSON.stringify(Session.fromRow(row), null, 2))
         stats.sessions++
@@ -74,7 +74,7 @@ const ExportCommand = cmd({
       // Export messages (organized by sessionID)
       const messageDir = path.join(outDir, "message")
       for (const row of Database.use((db) => db.select().from(MessageTable).all())) {
-        const dir = path.join(messageDir, row.sessionID)
+        const dir = path.join(messageDir, row.session_id)
         await fs.mkdir(dir, { recursive: true })
         await Bun.write(path.join(dir, `${row.id}.json`), JSON.stringify(row.data, null, 2))
         stats.messages++
@@ -83,7 +83,7 @@ const ExportCommand = cmd({
       // Export parts (organized by messageID)
       const partDir = path.join(outDir, "part")
       for (const row of Database.use((db) => db.select().from(PartTable).all())) {
-        const dir = path.join(partDir, row.messageID)
+        const dir = path.join(partDir, row.message_id)
         await fs.mkdir(dir, { recursive: true })
         await Bun.write(path.join(dir, `${row.id}.json`), JSON.stringify(row.data, null, 2))
         stats.parts++
@@ -93,39 +93,39 @@ const ExportCommand = cmd({
       const diffDir = path.join(outDir, "session_diff")
       await fs.mkdir(diffDir, { recursive: true })
       for (const row of Database.use((db) => db.select().from(SessionDiffTable).all())) {
-        await Bun.write(path.join(diffDir, `${row.sessionID}.json`), JSON.stringify(row.data, null, 2))
+        await Bun.write(path.join(diffDir, `${row.session_id}.json`), JSON.stringify(row.data, null, 2))
         stats.diffs++
       }
 
       // Export todos
       const todoDir = path.join(outDir, "todo")
       await fs.mkdir(todoDir, { recursive: true })
       for (const row of Database.use((db) => db.select().from(TodoTable).all())) {
-        await Bun.write(path.join(todoDir, `${row.sessionID}.json`), JSON.stringify(row.data, null, 2))
+        await Bun.write(path.join(todoDir, `${row.session_id}.json`), JSON.stringify(row.data, null, 2))
         stats.todos++
       }
 
       // Export permissions
       const permDir = path.join(outDir, "permission")
       await fs.mkdir(permDir, { recursive: true })
       for (const row of Database.use((db) => db.select().from(PermissionTable).all())) {
-        await Bun.write(path.join(permDir, `${row.projectID}.json`), JSON.stringify(row.data, null, 2))
+        await Bun.write(path.join(permDir, `${row.project_id}.json`), JSON.stringify(row.data, null, 2))
         stats.permissions++
       }
 
       // Export session shares
       const sessionShareDir = path.join(outDir, "session_share")
       await fs.mkdir(sessionShareDir, { recursive: true })
       for (const row of Database.use((db) => db.select().from(SessionShareTable).all())) {
-        await Bun.write(path.join(sessionShareDir, `${row.sessionID}.json`), JSON.stringify(row.data, null, 2))
+        await Bun.write(path.join(sessionShareDir, `${row.session_id}.json`), JSON.stringify(row.data, null, 2))
         stats.sessionShares++
       }
 
       // Export shares
       const shareDir = path.join(outDir, "share")
       await fs.mkdir(shareDir, { recursive: true })
       for (const row of Database.use((db) => db.select().from(ShareTable).all())) {
-        await Bun.write(path.join(shareDir, `${row.sessionID}.json`), JSON.stringify(row.data, null, 2))
+        await Bun.write(path.join(shareDir, `${row.session_id}.json`), JSON.stringify(row.data, null, 2))
         stats.shares++
       }
 

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

@@ -90,8 +90,8 @@ export const ImportCommand = cmd({
             .insert(MessageTable)
             .values({
               id: msg.info.id,
-              sessionID: exportData.info.id,
-              createdAt: msg.info.time?.created ?? Date.now(),
+              session_id: exportData.info.id,
+              created_at: msg.info.time?.created ?? Date.now(),
               data: msg.info,
             })
             .onConflictDoNothing()
@@ -104,8 +104,8 @@ export const ImportCommand = cmd({
               .insert(PartTable)
               .values({
                 id: part.id,
-                messageID: msg.info.id,
-                sessionID: exportData.info.id,
+                message_id: msg.info.id,
+                session_id: exportData.info.id,
                 data: part,
               })
               .onConflictDoNothing()

packages/opencode/src/permission/next.ts

@@ -109,7 +109,7 @@ export namespace PermissionNext {
   const state = Instance.state(() => {
     const projectID = Instance.project.id
     const row = Database.use((db) =>
-      db.select().from(PermissionTable).where(eq(PermissionTable.projectID, projectID)).get(),
+      db.select().from(PermissionTable).where(eq(PermissionTable.project_id, projectID)).get(),
     )
     const stored = row?.data ?? ([] as Ruleset)
 

packages/opencode/src/project/project.sql.ts

@@ -1,14 +1,14 @@
 import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core"
 
 export const ProjectTable = sqliteTable("project", {
-  id: text("id").primaryKey(),
-  worktree: text("worktree").notNull(),
-  vcs: text("vcs"),
-  name: text("name"),
-  icon_url: text("icon_url"),
-  icon_color: text("icon_color"),
-  time_created: integer("time_created").notNull(),
-  time_updated: integer("time_updated").notNull(),
-  time_initialized: integer("time_initialized"),
-  sandboxes: text("sandboxes", { mode: "json" }).notNull().$type<string[]>(),
+  id: text().primaryKey(),
+  worktree: text().notNull(),
+  vcs: text(),
+  name: text(),
+  icon_url: text(),
+  icon_color: text(),
+  time_created: integer().notNull(),
+  time_updated: integer().notNull(),
+  time_initialized: integer(),
+  sandboxes: text({ mode: "json" }).notNull().$type<string[]>(),
 })

packages/opencode/src/project/project.ts

@@ -299,7 +299,7 @@ export namespace Project {
     if (!globalRow) return
 
     const globalSessions = Database.use((db) =>
-      db.select().from(SessionTable).where(eq(SessionTable.projectID, "global")).all(),
+      db.select().from(SessionTable).where(eq(SessionTable.project_id, "global")).all(),
     )
     if (globalSessions.length === 0) return
 
@@ -311,7 +311,7 @@ export namespace Project {
 
       log.info("migrating session", { sessionID: row.id, from: "global", to: newProjectID })
       Database.use((db) =>
-        db.update(SessionTable).set({ projectID: newProjectID }).where(eq(SessionTable.id, row.id)).run(),
+        db.update(SessionTable).set({ project_id: newProjectID }).where(eq(SessionTable.id, row.id)).run(),
       )
     }).catch((error) => {
       log.error("failed to migrate sessions from global to project", { error, projectId: newProjectID })

packages/opencode/src/server/routes/session.ts

@@ -276,18 +276,15 @@ export const SessionRoutes = lazy(() =>
         const sessionID = c.req.valid("param").sessionID
         const updates = c.req.valid("json")
 
-        const updatedSession = await Session.update(
-          sessionID,
-          (session) => {
-            if (updates.title !== undefined) {
-              session.title = updates.title
-            }
-            if (updates.time?.archived !== undefined) session.time.archived = updates.time.archived
-          },
-          { touch: false },
-        )
+        let session = await Session.get(sessionID)
+        if (updates.title !== undefined) {
+          session = await Session.setTitle({ sessionID, title: updates.title })
+        }
+        if (updates.time?.archived !== undefined) {
+          session = await Session.setArchived({ sessionID, time: updates.time.archived })
+        }
 
-        return c.json(updatedSession)
+        return c.json(session)
       },
     )
     .post(