@cortexkit/opencode-magic-context 0.42.6 → 0.43.0

package/dist/{index-a9ssj59b.js → index-ykg9sdzz.js}

@@ -111,9 +111,13 @@ function resolveOpenCodeDbPath(hostGeneration = "v1", options = {}) {
   return resolution;
 }
 function schemaTableNames(db, schema = "main") {
-  const rows = db.prepare(`SELECT name FROM ${schema}.sqlite_master WHERE type = 'table' AND name IN ('message', 'part', 'session', 'project', 'session_message')`).all();
+  const rows = db.prepare(`SELECT name FROM ${schema}.sqlite_master WHERE type = 'table' AND name IN ('message', 'part', 'session', 'project', 'session_message', 'session_v2')`).all();
   return new Set(rows.flatMap((row) => typeof row.name === "string" ? [row.name] : []));
 }
+function hasV1MessageTables(db, schema = "main") {
+  const tables = schemaTableNames(db, schema);
+  return tables.has("message") && tables.has("part");
+}
 function detectOpenCodeStoreGeneration(db, schema = "main") {
   const tables = schemaTableNames(db, schema);
   const hasV1Messages = tables.has("message") && tables.has("part");
@@ -125,10 +129,18 @@ function detectOpenCodeStoreGeneration(db, schema = "main") {
     return "v1";
   return "unknown";
 }
+function hasMigratedV2Schema(tables) {
+  return tables.has("session_message") && tables.has("session_v2");
+}
+function isOpenCodeV2Store(db, schema = "main") {
+  return detectOpenCodeStoreGeneration(db, schema) === "v2" || hasMigratedV2Schema(schemaTableNames(db, schema));
+}
 function assertOpenCodeStoreGeneration(db, expected, path, schema = "main") {
   const actual = detectOpenCodeStoreGeneration(db, schema);
   if (actual === expected)
     return;
+  if (expected === "v2" && isOpenCodeV2Store(db, schema))
+    return;
   if (actual === "unknown")
     return;
   throw new Error(`OpenCode store generation mismatch at ${path}: expected ${expected}, found ${actual}; refusing generation-specific database access`);
@@ -831,18 +843,44 @@ function getMessageTimesFromOpenCodeDb(sessionId, messageIds) {
   return result;
 }
 function findLastAssistantModelFromOpenCodeDb(sessionId) {
+  const resolution = resolveOpenCodeDbPath();
   try {
-    return withReadOnlySessionDb((db) => {
-      const row = db.prepare(`SELECT json_extract(data, '$.providerID') as providerID,
-                            json_extract(data, '$.modelID') as modelID,
-                            json_extract(data, '$.agent') as agent
-                     FROM message
-                     WHERE session_id = ?
-                       AND json_extract(data, '$.role') = 'assistant'
-                       AND json_extract(data, '$.providerID') IS NOT NULL
-                       AND json_extract(data, '$.modelID') IS NOT NULL
-                     ORDER BY time_created DESC
-                     LIMIT 1`).get(sessionId);
+    if (!openCodeDbPathExists(resolution)) {
+      throw new Error(`OpenCode session database is unavailable at ${resolution.path}`);
+    }
+    const db = new Database(resolution.path, { readonly: true });
+    try {
+      const queryV2 = () => db.prepare(`SELECT json_extract(data, '$.model.providerID') as providerID,
+                                json_extract(data, '$.model.id') as modelID,
+                                json_extract(data, '$.agent') as agent
+                         FROM session_message
+                         WHERE session_id = ?
+                           AND type = 'assistant'
+                           AND json_extract(data, '$.model.providerID') IS NOT NULL
+                           AND json_extract(data, '$.model.id') IS NOT NULL
+                         ORDER BY seq DESC
+                         LIMIT 1`).get(sessionId);
+      const queryV1 = () => db.prepare(`SELECT json_extract(data, '$.providerID') as providerID,
+                                json_extract(data, '$.modelID') as modelID,
+                                json_extract(data, '$.agent') as agent
+                         FROM message
+                         WHERE session_id = ?
+                           AND json_extract(data, '$.role') = 'assistant'
+                           AND json_extract(data, '$.providerID') IS NOT NULL
+                           AND json_extract(data, '$.modelID') IS NOT NULL
+                         ORDER BY time_created DESC
+                         LIMIT 1`).get(sessionId);
+      let row = null;
+      try {
+        assertOpenCodeStoreGeneration(db, "v2", resolution.path);
+        row = queryV2();
+      } catch {}
+      if (!row) {
+        try {
+          assertOpenCodeStoreGeneration(db, "v1", resolution.path);
+          row = queryV1();
+        } catch {}
+      }
       if (!row || typeof row.providerID !== "string" || typeof row.modelID !== "string") {
         return null;
       }
@@ -852,11 +890,13 @@ function findLastAssistantModelFromOpenCodeDb(sessionId) {
         modelID: row.modelID,
         ...agent ? { agent } : {}
       };
-    });
+    } finally {
+      closeQuietly(db);
+    }
   } catch (error) {
-    logProbeFailureOnce(resolveOpenCodeDbPath(), error);
+    logProbeFailureOnce(resolution, error);
     return null;
   }
 }
 
-export { resolveOpenCodeDbPath, assertOpenCodeStoreGeneration, openCodeDbPathExists, formatOpenCodeDbMissingBanner, formatOpenCodeDbMissingStatusLine, formatOpenCodeDbReadFailureStatusLine, recordOpenCodeDbReadFailure, clearOpenCodeDbReadFailure, getOpenCodeDbReadFailure, claimOpenCodeDbDiagnosticOnce, registerSlowWriteReporter, detectSqliteRuntime, Database, getSqliteMemoryStats, withPrivilegedWriter, closeQuietly, openCodeDbExists, withReadOnlySessionDb, getRawSessionMessageCountFromDb, observeOpenCodeTurnEvent, clearTrackedOpenCodeSession, assistantAwaitingTools, shouldHoldIgnoredNotification, latestPersistedMessageForRecovery, getMessageTimesFromOpenCodeDb, findLastAssistantModelFromOpenCodeDb };
+export { resolveOpenCodeDbPath, hasV1MessageTables, assertOpenCodeStoreGeneration, openCodeDbPathExists, getOpenCodeDbProbeDescriptions, formatOpenCodeDbMissingBanner, formatOpenCodeDbMissingStatusLine, formatOpenCodeDbReadFailureStatusLine, recordOpenCodeDbReadFailure, clearOpenCodeDbReadFailure, getOpenCodeDbReadFailure, claimOpenCodeDbDiagnosticOnce, registerSlowWriteReporter, detectSqliteRuntime, Database, getSqliteMemoryStats, withPrivilegedWriter, closeQuietly, openCodeDbExists, withReadOnlySessionDb, getRawSessionMessageCountFromDb, observeOpenCodeTurnEvent, clearTrackedOpenCodeSession, assistantAwaitingTools, shouldHoldIgnoredNotification, latestPersistedMessageForRecovery, getMessageTimesFromOpenCodeDb, findLastAssistantModelFromOpenCodeDb };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,qBAAqB,CAAC;AA6FvE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AA46BpC,QAAA,MAAM,MAAM,EAAE,YAAY,GAAG;IAAE,KAAK,EAAE,OAAO,KAAK,CAAA;CAIjD,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAgGvE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AA88BpC,QAAA,MAAM,MAAM,EAAE,YAAY,GAAG;IAAE,KAAK,EAAE,OAAO,KAAK,CAAA;CAIjD,CAAC;AAEF,eAAe,MAAM,CAAC"}