bug: better session id picker

Author: WilliamJudge94

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode-dashboard",
-  "version": "0.3.1",
+  "version": "0.3.2-beta.0",
   "description": "Local-only, read-only dashboard for viewing OhMyOpenCode agent progress",
   "license": "SUL-1.0",
   "repository": {

src/ingest/session.test.ts

@@ -19,7 +19,7 @@ function mkStorageRoot(): string {
 }
 
 describe("pickActiveSessionId", () => {
-  it("prefers last boulder session_id that exists", () => {
+  it("uses a boulder session_id that exists when no session metadata is available", () => {
     const storageRoot = mkStorageRoot()
     const storage = getStorageRoots(storageRoot)
     const projectRoot = "/tmp/project"
@@ -34,6 +34,45 @@ describe("pickActiveSessionId", () => {
     expect(picked).toBe("ses_ok")
   })
 
+  it("prefers newest main session metadata over a stale boulder session_id", () => {
+    const storageRoot = mkStorageRoot()
+    const storage = getStorageRoots(storageRoot)
+    const projectRoot = "/tmp/project/"
+    const projectID = "proj_1"
+    fs.mkdirSync(path.join(storage.session, projectID), { recursive: true })
+
+    fs.writeFileSync(
+      path.join(storage.session, projectID, "ses_old.json"),
+      JSON.stringify({
+        id: "ses_old",
+        projectID,
+        directory: "/tmp/project",
+        time: { created: 1, updated: 10 },
+      }),
+      "utf8"
+    )
+    fs.writeFileSync(
+      path.join(storage.session, projectID, "ses_new.json"),
+      JSON.stringify({
+        id: "ses_new",
+        projectID,
+        directory: "/tmp/project",
+        time: { created: 2, updated: 20 },
+      }),
+      "utf8"
+    )
+
+    fs.mkdirSync(path.join(storage.message, "ses_old"), { recursive: true })
+    fs.mkdirSync(path.join(storage.message, "ses_new"), { recursive: true })
+
+    const picked = pickActiveSessionId({
+      projectRoot,
+      storage,
+      boulderSessionIds: ["ses_old"],
+    })
+    expect(picked).toBe("ses_new")
+  })
+
   it("falls back to newest main session metadata for directory", () => {
     const storageRoot = mkStorageRoot()
     const storage = getStorageRoots(storageRoot)

src/ingest/session.ts

@@ -129,14 +129,53 @@ export function pickActiveSessionId(opts: {
   storage: OpenCodeStorageRoots
   boulderSessionIds?: string[]
 }): string | null {
+  const metas = readMainSessionMetas(opts.storage.session, opts.projectRoot)
+  const metaById = new Map(metas.map((m) => [m.id, m] as const))
+
+  let bestId: string | null = metas[0]?.id ?? null
+  let bestUpdated = bestId ? (metaById.get(bestId)?.time.updated ?? -Infinity) : -Infinity
+  let bestIsBoulder = false
+
+  const consider = (candidateId: string, updatedAt: number, isBoulder: boolean): void => {
+    if (!bestId) {
+      bestId = candidateId
+      bestUpdated = updatedAt
+      bestIsBoulder = isBoulder
+      return
+    }
+    if (updatedAt > bestUpdated) {
+      bestId = candidateId
+      bestUpdated = updatedAt
+      bestIsBoulder = isBoulder
+      return
+    }
+    if (updatedAt === bestUpdated && isBoulder && !bestIsBoulder) {
+      bestId = candidateId
+      bestUpdated = updatedAt
+      bestIsBoulder = true
+    }
+  }
+
   const ids = opts.boulderSessionIds ?? []
   for (let i = ids.length - 1; i >= 0; i--) {
     const id = ids[i]
-    if (sessionExists(opts.storage.message, id)) return id
+    if (!sessionExists(opts.storage.message, id)) continue
+
+    const meta = metaById.get(id)
+    if (meta) {
+      consider(id, meta.time.updated ?? meta.time.created ?? 0, true)
+      continue
+    }
+
+    if (metas.length === 0) {
+      const messageDir = getMessageDir(opts.storage.message, id)
+      const recent = readMostRecentMessageMeta(messageDir, 200)
+      const created = typeof recent?.time?.created === "number" ? recent.time.created : 0
+      consider(id, created, true)
+    }
   }
 
-  const metas = readMainSessionMetas(opts.storage.session, opts.projectRoot)
-  return metas[0]?.id ?? null
+  return bestId
 }
 
 function readMostRecentMessageMeta(messageDir: string, maxMessages: number): StoredMessageMeta | null {

src/ingest/sqlite-derive.test.ts

@@ -330,11 +330,12 @@ describe("sqlite derive helpers", () => {
     },
   )
 
-  it("pickActiveSessionIdSqlite prefers boulder session ids when they have messages", () => {
+  it("pickActiveSessionIdSqlite prefers newest main session metadata over a stale boulder session_id", () => {
     const sqlitePath = mkSqliteDb()
     const db = new BunDatabase(sqlitePath)
     insertSession(db, { id: "ses_project_latest", directory: "/repo", created: 10, updated: 5000 })
     insertSession(db, { id: "ses_boulder", directory: "/repo", created: 20, updated: 100 })
+    insertMessage(db, { id: "msg_latest", sessionId: "ses_project_latest", created: 5000 })
     insertMessage(db, { id: "msg_boulder", sessionId: "ses_boulder", created: 100 })
     db.close()
 
@@ -345,6 +346,25 @@ describe("sqlite derive helpers", () => {
     })
     expect(result.ok).toBe(true)
     if (!result.ok) return
+    expect(result.value).toBe("ses_project_latest")
+  })
+
+  it("pickActiveSessionIdSqlite prefers a boulder session_id when it is most recent", () => {
+    const sqlitePath = mkSqliteDb()
+    const db = new BunDatabase(sqlitePath)
+    insertSession(db, { id: "ses_project_latest", directory: "/repo", created: 10, updated: 5000 })
+    insertSession(db, { id: "ses_boulder", directory: "/repo", created: 20, updated: 6000 })
+    insertMessage(db, { id: "msg_latest", sessionId: "ses_project_latest", created: 5000 })
+    insertMessage(db, { id: "msg_boulder", sessionId: "ses_boulder", created: 6000 })
+    db.close()
+
+    const result = pickActiveSessionIdSqlite({
+      sqlitePath,
+      projectRoot: "/repo",
+      boulderSessionIds: ["ses_boulder"],
+    })
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
     expect(result.value).toBe("ses_boulder")
   })
 })

src/ingest/sqlite-derive.ts

@@ -249,22 +249,59 @@ export function pickActiveSessionIdSqlite(opts: {
   projectRoot: string
   boulderSessionIds?: string[]
 }): SqliteDeriveResult<string | null> {
+  const metasResult = readMainSessionMetasSqlite({
+    sqlitePath: opts.sqlitePath,
+    directoryFilter: opts.projectRoot,
+  })
+  if (!metasResult.ok) return metasResult
+
+  const metas = metasResult.rows
+  const metaById = new Map(metas.map((m) => [m.id, m] as const))
+
+  let bestId: string | null = metas[0]?.id ?? null
+  let bestUpdated = bestId ? (metaById.get(bestId)?.time.updated ?? -Infinity) : -Infinity
+  let bestIsBoulder = false
+
+  const consider = (candidateId: string, updatedAt: number, isBoulder: boolean): void => {
+    if (!bestId) {
+      bestId = candidateId
+      bestUpdated = updatedAt
+      bestIsBoulder = isBoulder
+      return
+    }
+    if (updatedAt > bestUpdated) {
+      bestId = candidateId
+      bestUpdated = updatedAt
+      bestIsBoulder = isBoulder
+      return
+    }
+    if (updatedAt === bestUpdated && isBoulder && !bestIsBoulder) {
+      bestId = candidateId
+      bestUpdated = updatedAt
+      bestIsBoulder = true
+    }
+  }
+
   const ids = opts.boulderSessionIds ?? []
   for (let i = ids.length - 1; i >= 0; i--) {
     const id = ids[i]
     const messages = readRecentMessageMetasSqlite({ sqlitePath: opts.sqlitePath, sessionId: id, limit: 1 })
     if (!messages.ok) return messages
-    if (messages.rows.length > 0) {
-      return { ok: true, value: id }
+    if (messages.rows.length === 0) continue
+
+    const meta = metaById.get(id)
+    if (meta) {
+      consider(id, meta.time.updated ?? meta.time.created ?? 0, true)
+      continue
+    }
+
+    if (metas.length === 0) {
+      const created = typeof messages.rows[0]?.time?.created === "number" ? messages.rows[0].time.created : 0
+      consider(id, created, true)
     }
   }
 
-  const metas = readMainSessionMetasSqlite({
-    sqlitePath: opts.sqlitePath,
-    directoryFilter: opts.projectRoot,
-  })
-  if (!metas.ok) return metas
-  return { ok: true, value: metas.rows[0]?.id ?? null }
+  return { ok: true, value: bestId }
 }
 
 export function getMainSessionViewSqlite(opts: {