@retaw106/mmc-oc 2.5.0 → 2.7.1

package/dist/{index-bpjjcdy9.js → index-8rmt6s4f.js}

@@ -3,6 +3,7 @@ import {
   getSqliteDatabasePath
 } from "./index-pte3cfs9.js";
 import {
+  getHarness,
   harnessOwnsOpenCodeStore,
   log
 } from "./index-k59af64t.js";
@@ -477,6 +478,9 @@ var ordinalWatermarks = new WeakMap;
 var ordinalWatermarkEpochs = new Map;
 var ordinalRowsVisited = 0;
 var STABLE_STORE_ATTEMPTS = 3;
+function forgetRawSessionOrdinalWatermark(sessionId) {
+  ordinalWatermarkEpochs.set(sessionId, (ordinalWatermarkEpochs.get(sessionId) ?? 0) + 1);
+}
 function compareOrdinalKeys(left, right) {
   if (left.timeCreated !== right.timeCreated)
     return left.timeCreated < right.timeCreated ? -1 : 1;
@@ -503,6 +507,11 @@ var writtenSummaryIds = new Map;
 var indexedCountUnsupported = new WeakSet;
 var ordinalJsonRowsRead = 0;
 var summaryFullScans = 0;
+function forgetRawSessionSummaryRows(sessionId) {
+  summaryCandidateEpochs.set(sessionId, (summaryCandidateEpochs.get(sessionId) ?? 0) + 1);
+  writtenSummaryIds.delete(sessionId);
+  forgetRawSessionOrdinalWatermark(sessionId);
+}
 var ANCHOR_ROWS_SQL = `SELECT rowid AS rid, id, 1 AS kind FROM message
     WHERE rowid > (SELECT MAX(rowid) FROM message) - ${SUMMARY_ANCHOR_SPAN}`;
 var SUMMARY_FULL_SCAN_SQL = `${ANCHOR_ROWS_SQL}
@@ -523,6 +532,20 @@ function survivingAnchor(db, set) {
 }
 var ordinalCheckpoints = new WeakMap;
 var ordinalSummarySeeds = new WeakMap;
+function hasLateCommitBehindCheckpoint(db, sessionId, scan) {
+  const tail = scan.checkpoints?.at(-1);
+  if (!tail || scan.maxRowid === undefined)
+    return false;
+  const row = db.prepare(`SELECT COUNT(*) AS count FROM message
+             WHERE rowid > ? AND +session_id = ?
+               AND (time_created, id) <= (?, ?)
+               AND NOT (${EXCLUDED_ROW_SQL})`).get(scan.maxRowid, sessionId, tail.timeCreated, tail.id);
+  return typeof row?.count === "number" && row.count > 0;
+}
+function discardRetainedOrdinalRanks(db, sessionId) {
+  ordinalCheckpoints.get(db)?.delete(sessionId);
+  ordinalSummarySeeds.get(db)?.delete(sessionId);
+}
 var ORDINAL_LOOKUP_LIMIT = 512;
 function currentOrdinalCheckpoints(db, sessionId) {
   const cached = ordinalCheckpoints.get(db)?.get(sessionId);
@@ -553,10 +576,16 @@ function extendOrdinalCheckpoints(db, sessionId, scan, limit) {
     scan.sessionRows = points.at(-1)?.storedCount ?? 0;
   }
   const tail = points.at(-1);
-  const rows = db.prepare(`SELECT id, time_created AS timeCreated, ${EXCLUDED_ROW_SQL} AS excluded FROM message
+  const rows = db.prepare(`SELECT id, time_created AS timeCreated, rowid AS rowid, ${EXCLUDED_ROW_SQL} AS excluded FROM message
         WHERE session_id=?${tail ? " AND (time_created,id) > (?,?)" : ""}
         ORDER BY time_created,id${limit === undefined ? "" : ` LIMIT ${limit + 1}`}`).all(sessionId, ...tail ? [tail.timeCreated, tail.id] : []);
   ordinalJsonRowsRead += rows.length;
+  if (hasLateCommitBehindCheckpoint(db, sessionId, scan)) {
+    discardRetainedOrdinalRanks(db, sessionId);
+    if (isMainThread)
+      forgetRawSessionSummaryRows(sessionId);
+    return false;
+  }
   if (limit !== undefined && rows.length > limit)
     return false;
   let total = scan.total ?? 0;
@@ -573,6 +602,13 @@ function extendOrdinalCheckpoints(db, sessionId, scan, limit) {
   scan.checkpoints = points;
   scan.sessionRows += rows.length;
   scan.total = total;
+  if (rows.length > 0) {
+    let maxRowid = scan.maxRowid ?? -1;
+    for (const row of rows)
+      if (row.rowid > maxRowid)
+        maxRowid = row.rowid;
+    scan.maxRowid = maxRowid;
+  }
   return true;
 }
 function warmRawSessionOrdinalsForDb(db, sessionId) {
@@ -587,6 +623,10 @@ function warmRawSessionOrdinalsForDb(db, sessionId) {
   }
   return isRawSessionSummaryWarm(db, sessionId);
 }
+function dropRawSessionOrdinalCheckpoints(db, sessionId) {
+  discardRetainedOrdinalRanks(db, sessionId);
+  forgetRawSessionSummaryRows(sessionId);
+}
 function boundedOrdinalPrefix(db, sessionId, through) {
   try {
     return boundedOrdinalPrefixBounded(db, sessionId, through);
@@ -648,8 +688,7 @@ function boundedOrdinalPrefixBounded(db, sessionId, through) {
 }
 function scanRawSessionSummaryRows(db, sessionId, previous) {
   return withReadSnapshot(db, () => {
-    if (previous?.checkpoints) {
-      extendOrdinalCheckpoints(db, sessionId, previous);
+    if (previous?.checkpoints && extendOrdinalCheckpoints(db, sessionId, previous)) {
       return previous;
     }
     if (previous) {
@@ -681,12 +720,15 @@ function scanRawSessionSummaryRows(db, sessionId, previous) {
     }
     anchors.sort((left, right) => right.rowid - left.rowid);
     anchors.length = Math.min(anchors.length, SUMMARY_ANCHOR_LIMIT);
-    const keys = db.prepare(`SELECT id, time_created AS timeCreated, ${EXCLUDED_ROW_SQL} AS excluded FROM message WHERE session_id = ?
+    const keys = db.prepare(`SELECT id, time_created AS timeCreated, rowid AS rowid, ${EXCLUDED_ROW_SQL} AS excluded FROM message WHERE session_id = ?
         ORDER BY time_created, id`).all(sessionId);
     const checkpoints = [];
     let total = 0;
+    let maxRowid;
     for (let index = 0;index < keys.length; index++) {
       const key = keys[index];
+      if (typeof key.rowid === "number")
+        maxRowid = maxRowid === undefined ? key.rowid : Math.max(maxRowid, key.rowid);
       if (key.excluded !== 1)
         total++;
       if (index % 256 === 255 || index === keys.length - 1)
@@ -697,7 +739,7 @@ function scanRawSessionSummaryRows(db, sessionId, previous) {
           storedCount: index + 1
         });
     }
-    return { anchors, ids, sessionRows, checkpoints, total };
+    return { anchors, ids, sessionRows, checkpoints, total, maxRowid };
   });
 }
 function getRawSessionSummaryEpoch(sessionId) {
@@ -1130,48 +1172,53 @@ function isKnownAutocommit(db) {
 }
 
 // src/hooks/magic-context/read-session-db.ts
-function openCodeDbExists() {
-  return harnessOwnsOpenCodeStore() && openCodeDbPathExists(resolveOpenCodeDbPath());
-}
-var cachedReadOnlyDb = null;
-function closeCachedReadOnlyDb() {
-  if (!cachedReadOnlyDb) {
+function openCodeDbExists(generation = "v1") {
+  return harnessOwnsOpenCodeStore() && openCodeDbPathExists(resolveOpenCodeDbPath(generation));
+}
+var cachedReadOnlyDbs = {
+  v1: null,
+  v2: null
+};
+function closeCachedReadOnlyDb(generation) {
+  const cached = cachedReadOnlyDbs[generation];
+  if (!cached) {
     return;
   }
   try {
-    closeQuietly(cachedReadOnlyDb.db);
+    closeQuietly(cached.db);
   } catch (error) {
     log("[magic-context] failed to close cached OpenCode read-only DB:", error);
   } finally {
-    cachedReadOnlyDb = null;
+    cachedReadOnlyDbs[generation] = null;
   }
 }
-function getReadOnlySessionDb() {
+function getReadOnlySessionDb(generation = "v1") {
   if (!harnessOwnsOpenCodeStore()) {
     throw new Error("OpenCode session database is not readable from a Pi-compatible process; its history lives in Pi sessions");
   }
-  const resolution = resolveOpenCodeDbPath();
+  const resolution = resolveOpenCodeDbPath(generation);
   const dbPath = resolution.path;
   if (!openCodeDbPathExists(resolution)) {
     throw new Error(`OpenCode session database is unavailable at ${dbPath} (source=${resolution.source})`);
   }
-  if (cachedReadOnlyDb?.path === dbPath) {
-    return cachedReadOnlyDb.db;
+  const cached = cachedReadOnlyDbs[generation];
+  if (cached?.path === dbPath) {
+    return cached.db;
   }
-  closeCachedReadOnlyDb();
+  closeCachedReadOnlyDb(generation);
   const db = new Database(dbPath, { readonly: true });
   try {
-    assertOpenCodeStoreGeneration(db, "v1", dbPath);
+    assertOpenCodeStoreGeneration(db, generation, dbPath);
   } catch (error) {
     closeQuietly(db);
     throw error;
   }
-  cachedReadOnlyDb = { path: dbPath, db };
+  cachedReadOnlyDbs[generation] = { path: dbPath, db };
   clearOpenCodeDbReadFailure();
   return db;
 }
-function withReadOnlySessionDb(fn) {
-  return fn(getReadOnlySessionDb());
+function withReadOnlySessionDb(fn, generation = "v1") {
+  return fn(getReadOnlySessionDb(generation));
 }
 function getRawSessionMessageCountFromDb(db, sessionId) {
   const row = db.prepare(`SELECT COUNT(*) as count FROM message WHERE session_id = ?
@@ -1401,15 +1448,14 @@ function getMessageTimesFromOpenCodeDb(sessionId, messageIds) {
   if (messageIds.length === 0 || !harnessOwnsOpenCodeStore())
     return result;
   try {
-    withReadOnlySessionDb((db) => {
-      const placeholders = messageIds.map(() => "?").join(",");
-      const rows = db.prepare(`SELECT id, time_created FROM message WHERE +session_id = ? AND id IN (${placeholders})`).all(sessionId, ...messageIds);
-      for (const row of rows) {
-        if (typeof row.id === "string" && typeof row.time_created === "number") {
-          result.set(row.id, row.time_created);
-        }
+    const placeholders = messageIds.map(() => "?").join(",");
+    const rows = getHarness() === "opencode2" ? getReadOnlySessionDb("v2").prepare(`SELECT id, COALESCE(time_created, json_extract(data, '$.time.created')) AS time_created
+                             FROM session_message WHERE +session_id = ? AND id IN (${placeholders})`).all(sessionId, ...messageIds) : withReadOnlySessionDb((db) => db.prepare(`SELECT id, time_created FROM message WHERE +session_id = ? AND id IN (${placeholders})`).all(sessionId, ...messageIds));
+    for (const row of rows) {
+      if (typeof row.id === "string" && typeof row.time_created === "number") {
+        result.set(row.id, row.time_created);
       }
-    });
+    }
   } catch (error) {
     logProbeFailureOnce(resolveOpenCodeDbPath(), error);
   }
@@ -1474,4 +1520,4 @@ function findLastAssistantModelFromOpenCodeDb(sessionId) {
   }
 }
 
-export { closeQuietly, isKnownAutocommit, resolveOpenCodeDbPath, hasV1MessageTables, assertOpenCodeStoreGeneration, openCodeDbPathExists, claimOpenCodeDbDiagnosticOnce, isStrictGapHealingMessage, readRawSessionMessagesFromDb, readRawSessionMessagePageFromDb, readRawSessionMessageSummaryPageFromDb, countRawSessionMessageOrdinalsFromDb, readRawSessionMessageIdOrdinalsForRangeFromDb, readRawSessionTailFromDb, extractInMemoryMessageViews, buildInMemoryTailRawMessages, warmRawSessionOrdinalsForDb, readRawSessionMessageOrdinalByIdFromDb, readRawSessionMessageByIdFromDb, hasRawSessionMessageByIdFromDb, openCodeDbExists, withReadOnlySessionDb, getRawSessionMessageCountFromDb, shouldHoldIgnoredNotification, latestRealUserTurnIdFromOpenCodeDb, getMessageTimesFromOpenCodeDb, findLastAssistantModelFromOpenCodeDb };
+export { closeQuietly, isKnownAutocommit, resolveOpenCodeDbPath, hasV1MessageTables, assertOpenCodeStoreGeneration, openCodeDbPathExists, claimOpenCodeDbDiagnosticOnce, isStrictGapHealingMessage, readRawSessionMessagesFromDb, readRawSessionMessagePageFromDb, readRawSessionMessageSummaryPageFromDb, countRawSessionMessageOrdinalsFromDb, readRawSessionMessageIdOrdinalsForRangeFromDb, readRawSessionTailFromDb, extractInMemoryMessageViews, buildInMemoryTailRawMessages, warmRawSessionOrdinalsForDb, dropRawSessionOrdinalCheckpoints, readRawSessionMessageOrdinalByIdFromDb, readRawSessionMessageByIdFromDb, hasRawSessionMessageByIdFromDb, openCodeDbExists, withReadOnlySessionDb, getRawSessionMessageCountFromDb, shouldHoldIgnoredNotification, latestRealUserTurnIdFromOpenCodeDb, getMessageTimesFromOpenCodeDb, findLastAssistantModelFromOpenCodeDb };

package/dist/{index-mjf0p7yq.js → index-cgjyhwdk.js}

@@ -4,7 +4,7 @@ import {
   renderUserFacingFailure,
   userFacingFailureCode,
   executeContextRecomp
-} from "./index-0d40b4q8.js";
+} from "./index-xrxpbe74.js";
 import {
   sessionLog
 } from "./index-k59af64t.js";

package/dist/{index-k25thxq7.js → index-s3ebcy63.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-k59af64t.js";
 import {
   shouldHoldIgnoredNotification
-} from "./index-bpjjcdy9.js";
+} from "./index-8rmt6s4f.js";
 
 // src/shared/error-message.ts
 function getErrorMessage(error) {