@cortexkit/opencode-magic-context 0.49.2 → 0.49.3

package/dist/v2/{message-index-bounded-p6v0n8qh.js → message-index-bounded-c0810p5w.js}

@@ -4,29 +4,30 @@ import {
   yieldIndexChunk2
 } from "./server-kb9nn0a0.js";
 import"./server-1zx87sdm.js";
-import"./server-4c7jt8gq.js";
+import"./server-pcygfdbs.js";
 import"./server-kzns2hbz.js";
 import"./server-pavzsdc6.js";
 import"./server-t4k4qexw.js";
 import"./server-6byqfbqf.js";
 import"./server-cw6521wn.js";
-import"./server-7h861yms.js";
+import"./server-51779zs2.js";
+import"./server-3dqjhchy.js";
 import"./server-2ra6pwf3.js";
 import"./server-czb2rkpk.js";
-import"./server-c7n2ftng.js";
+import"./server-4n2tknpc.js";
 import"./server-7ekna9zs.js";
 import {
-  MESSAGE_INDEX_MAX_FTS_BYTES,
-  messageIndexSkipKey,
-  getLastIndexedOrdinal,
-  markMessageIndexDirty,
-  getIndexableContent,
-  indexSingleMessage
-} from "./server-bgzy0phk.js";
+  MESSAGE_INDEX_MAX_FTS_BYTES2,
+  messageIndexSkipKey2,
+  getLastIndexedOrdinal2,
+  markMessageIndexDirty2,
+  getIndexableContent2,
+  indexSingleMessage2
+} from "./server-3bc6k4k4.js";
 import"./server-2htmbqbv.js";
 import"./server-cvgn49tr.js";
 import"./server-hb6xhh9q.js";
-import"./server-s2st631p.js";
+import"./server-8wcf79fe.js";
 import"./server-3t0q2cqx.js";
 
 // src/features/magic-context/message-index-bounded.ts
@@ -77,13 +78,13 @@ async function indexMessageInShortChunks(db, sessionId, message, coordination, i
   try {
     if (!isCurrent())
       return { inserted: false, measurements };
-    const content = getIndexableContent(message.role, message.parts);
+    const content = getIndexableContent2(message.role, message.parts);
     measurements.sourceBytes = Buffer.byteLength(content);
     const hash = createHash("sha256");
-    const oversized = measurements.sourceBytes > MESSAGE_INDEX_MAX_FTS_BYTES;
+    const oversized = measurements.sourceBytes > MESSAGE_INDEX_MAX_FTS_BYTES2;
     measurements.skipped = oversized;
     if (oversized) {
-      await transaction(() => markMessageIndexDirty(db, sessionId, Math.min(message.ordinal, getLastIndexedOrdinal(db, sessionId) + 1)));
+      await transaction(() => markMessageIndexDirty2(db, sessionId, Math.min(message.ordinal, getLastIndexedOrdinal2(db, sessionId) + 1)));
       const encoded = Buffer.from(content);
       const progress = db.prepare("INSERT INTO schema_migrations_meta(key,value) VALUES (?,?) ON CONFLICT(key) DO UPDATE SET value=excluded.value");
       for (let offset = 0;offset < encoded.length; offset += IDENTITY_CHUNK_BYTES) {
@@ -91,7 +92,7 @@ async function indexMessageInShortChunks(db, sessionId, message, coordination, i
           return { inserted: false, measurements };
         const end = Math.min(encoded.length, offset + IDENTITY_CHUNK_BYTES);
         hash.update(encoded.subarray(offset, end));
-        await transaction(() => progress.run(messageIndexSkipKey(sessionId, message.id), JSON.stringify({
+        await transaction(() => progress.run(messageIndexSkipKey2(sessionId, message.id), JSON.stringify({
           reason: "oversized",
           bytes: measurements.sourceBytes,
           processedBytes: end,
@@ -113,7 +114,7 @@ async function indexMessageInShortChunks(db, sessionId, message, coordination, i
       content: oversized ? "" : content,
       ...oversized ? { ftsSkippedBytes: measurements.sourceBytes } : {}
     };
-    const inserted = await withIndexChunk2(coordination, () => withSqliteBackgroundWriter2(() => indexSingleMessage(db, sessionId, message, isCurrent, source)));
+    const inserted = await withIndexChunk2(coordination, () => withSqliteBackgroundWriter2(() => indexSingleMessage2(db, sessionId, message, isCurrent, source)));
     return { inserted, measurements };
   } finally {
     db.exec = execute;

package/dist/v2/message-index-h8ssgq3q.js

@@ -0,0 +1,59 @@
+import {
+  MESSAGE_INDEX_MAX_FTS_BYTES2,
+  messageIndexSkipKey2,
+  toMessageIndexSource2,
+  getMessageIndexSourceIdentity2,
+  isMessageIndexSourceCurrent2,
+  getLastIndexedOrdinal2,
+  getIndexedMessageCorpusSize2,
+  markMessageIndexDirty2,
+  getMessageIndexReconciliationStartOrdinal2,
+  isMessageIndexReconciledThrough2,
+  deleteIndexedMessage2,
+  clearIndexedMessagesInTransaction2,
+  clearIndexedMessages2,
+  getIndexableContent2,
+  indexSingleMessage2,
+  indexMessagesAfterOrdinal2,
+  indexSourcesAfterOrdinal2,
+  sweepOrphanedOpenCodeMessageIndexes2
+} from "./server-3bc6k4k4.js";
+import"./server-8wcf79fe.js";
+import"./server-hb6xhh9q.js";
+import"./server-cvgn49tr.js";
+import"./server-2htmbqbv.js";
+import"./server-4n2tknpc.js";
+import"./server-pcygfdbs.js";
+import"./server-1zx87sdm.js";
+import"./server-czb2rkpk.js";
+import"./server-3dqjhchy.js";
+import"./server-51779zs2.js";
+import"./server-cw6521wn.js";
+import"./server-7ekna9zs.js";
+import"./server-6byqfbqf.js";
+import"./server-2ra6pwf3.js";
+import"./server-3t0q2cqx.js";
+import"./server-kb9nn0a0.js";
+import"./server-kzns2hbz.js";
+import"./server-t4k4qexw.js";
+import"./server-pavzsdc6.js";
+export {
+  MESSAGE_INDEX_MAX_FTS_BYTES2 as MESSAGE_INDEX_MAX_FTS_BYTES,
+  clearIndexedMessages2 as clearIndexedMessages,
+  clearIndexedMessagesInTransaction2 as clearIndexedMessagesInTransaction,
+  deleteIndexedMessage2 as deleteIndexedMessage,
+  getIndexableContent2 as getIndexableContent,
+  getIndexedMessageCorpusSize2 as getIndexedMessageCorpusSize,
+  getLastIndexedOrdinal2 as getLastIndexedOrdinal,
+  getMessageIndexReconciliationStartOrdinal2 as getMessageIndexReconciliationStartOrdinal,
+  getMessageIndexSourceIdentity2 as getMessageIndexSourceIdentity,
+  indexMessagesAfterOrdinal2 as indexMessagesAfterOrdinal,
+  indexSingleMessage2 as indexSingleMessage,
+  indexSourcesAfterOrdinal2 as indexSourcesAfterOrdinal,
+  isMessageIndexReconciledThrough2 as isMessageIndexReconciledThrough,
+  isMessageIndexSourceCurrent2 as isMessageIndexSourceCurrent,
+  markMessageIndexDirty2 as markMessageIndexDirty,
+  messageIndexSkipKey2 as messageIndexSkipKey,
+  sweepOrphanedOpenCodeMessageIndexes2 as sweepOrphanedOpenCodeMessageIndexes,
+  toMessageIndexSource2 as toMessageIndexSource
+};

package/dist/v2/migration-worker.js

@@ -9,16 +9,16 @@ import {
 import"./server-fr0wbhdn.js";
 import {
   runMigrationsWithRetry
-} from "./server-6tcrjfw8.js";
+} from "./server-8pqnnmf9.js";
 import"./server-6byqfbqf.js";
 import"./server-2ra6pwf3.js";
-import"./server-8xmq9h3f.js";
+import"./server-q6j5dasr.js";
 import"./server-cvgn49tr.js";
 import"./server-fb3zxn06.js";
 import {
   setSqlitePragmaConfig,
   initializeDatabase
-} from "./server-7vkj6zhb.js";
+} from "./server-9a6v0wth.js";
 import"./server-2htmbqbv.js";
 import"./server-kzns2hbz.js";
 import"./server-7ekna9zs.js";

package/dist/v2/{project-embedding-registry-nyq7z8y6.js → project-embedding-registry-42th7k1z.js}

@@ -33,18 +33,18 @@ import {
   sweepAllRegisteredProjects2,
   _setTestProviderFactoryForProject2,
   _resetProjectEmbeddingRegistryForTests2
-} from "./server-1fszbabv.js";
-import"./server-s2st631p.js";
+} from "./server-cjz51jm2.js";
+import"./server-8wcf79fe.js";
 import"./server-4dhv7mqz.js";
 import"./server-qt1qqasc.js";
 import"./server-ras2sxnc.js";
 import"./server-hb6xhh9q.js";
-import"./server-8xmq9h3f.js";
+import"./server-q6j5dasr.js";
 import"./server-2htmbqbv.js";
 import"./server-cw6521wn.js";
-import"./server-kzns2hbz.js";
 import"./server-3t0q2cqx.js";
 import"./server-kb9nn0a0.js";
+import"./server-kzns2hbz.js";
 import"./server-t4k4qexw.js";
 import"./server-pavzsdc6.js";
 export {

package/dist/v2/raw-ordinal-warmup-worker.js

@@ -7,14 +7,31 @@ var input = workerData;
 port.postMessage({ kind: "accepted" });
 var [{ Database }, { scanRawSessionSummaryRows }] = await Promise.all([
   import("./sqlite-mhjkerzq.js"),
-  import("./read-session-raw-j8dvp7f4.js")
+  import("./read-session-raw-3b3ehga4.js")
 ]);
 var db;
 var reply;
 try {
-  db = input.indexMessage ? new Database(input.path) : new Database(input.path, { readonly: true });
+  db = input.indexMessage || input.orphanSweep ? new Database(input.path) : new Database(input.path, { readonly: true });
   db.exec("PRAGMA busy_timeout = 250");
-  if (input.indexMessage) {
+  if (input.orphanSweep) {
+    const [
+      { setHarness },
+      { sweepOrphanedOpenCodeMessageIndexes },
+      { configureContextDatabasePragmas }
+    ] = await Promise.all([
+      import("./harness-e4avh192.js"),
+      import("./message-index-h8ssgq3q.js"),
+      import("./sqlite-context-pragmas-mv9jqwjh.js")
+    ]);
+    setHarness(input.harness ?? "opencode");
+    configureContextDatabasePragmas(db);
+    const sourcePath = input.orphanSweep.sourcePath;
+    reply = {
+      kind: "orphan-sweep",
+      result: sweepOrphanedOpenCodeMessageIndexes(db, () => sourcePath ? new Database(sourcePath, { readonly: true }) : null, input.orphanSweep.options)
+    };
+  } else if (input.indexMessage) {
     const { setHarness } = await import("./harness-e4avh192.js");
     setHarness(input.harness ?? "opencode");
     const [
@@ -22,7 +39,7 @@ try {
       { configureContextDatabasePragmas },
       { registerSqliteDiagnosticSink }
     ] = await Promise.all([
-      import("./message-index-bounded-p6v0n8qh.js"),
+      import("./message-index-bounded-c0810p5w.js"),
       import("./sqlite-context-pragmas-mv9jqwjh.js"),
       import("./sqlite-mhjkerzq.js")
     ]);
@@ -35,7 +52,7 @@ try {
     const result = await indexMessageInShortChunks(writer, input.sessionId, message, input, () => !cancellation || Atomics.load(cancellation, 0) === 0);
     reply = { kind: "indexed", inserted: result.inserted, measurements: result.measurements };
   } else if (input.tagRatio !== undefined) {
-    const { scanTagOwnerSummary, scanTagOwnerDelta } = await import("./storage-tags-5yxrvkaf.js");
+    const { scanTagOwnerSummary, scanTagOwnerDelta } = await import("./storage-tags-3a4cavqb.js");
     const delta = input.tagState ? scanTagOwnerDelta(db, input.sessionId, input.tagState) : null;
     if (delta)
       reply = { kind: "tag-delta", delta };

package/dist/v2/{read-session-chunk-fhyfe4qa.js → read-session-chunk-n86v9xfg.js}

@@ -34,21 +34,22 @@ import {
   readSessionChunk2,
   getRawSessionMessageIdsThrough2,
   readRawSessionSeedTail2
-} from "./server-c7n2ftng.js";
-import"./server-4c7jt8gq.js";
+} from "./server-4n2tknpc.js";
+import"./server-pcygfdbs.js";
 import"./server-1zx87sdm.js";
 import"./server-czb2rkpk.js";
-import"./server-7h861yms.js";
+import"./server-3dqjhchy.js";
+import"./server-51779zs2.js";
 import"./server-cw6521wn.js";
 import"./server-7ekna9zs.js";
 import"./server-6byqfbqf.js";
 import"./server-2ra6pwf3.js";
+import"./server-3t0q2cqx.js";
+import"./server-kb9nn0a0.js";
 import {
   hasMeaningfulUserText2,
   extractTexts2
 } from "./server-kzns2hbz.js";
-import"./server-3t0q2cqx.js";
-import"./server-kb9nn0a0.js";
 import"./server-t4k4qexw.js";
 import"./server-pavzsdc6.js";
 export {

package/dist/v2/{read-session-raw-j8dvp7f4.js → read-session-raw-3b3ehga4.js}

@@ -25,7 +25,8 @@ import {
   hasRawSessionMessageByIdFromDb2,
   readRawSeedTailFromDb2,
   readRawSessionBoundaryEndpointsFromDb2
-} from "./server-7h861yms.js";
+} from "./server-3dqjhchy.js";
+import"./server-51779zs2.js";
 import"./server-kb9nn0a0.js";
 import"./server-t4k4qexw.js";
 import"./server-pavzsdc6.js";

package/dist/v2/{recomp-orchestrator-5xy7w136.js → recomp-orchestrator-v168jwgg.js}

@@ -7,16 +7,17 @@ import {
   setRecompTerminal2,
   buildRecompDeps2,
   runManagedRecomp2
-} from "./server-7spkq1y6.js";
-import"./server-zbxjj2mz.js";
-import"./server-bgzy0phk.js";
+} from "./server-cxxjb33r.js";
+import"./server-9290a1mb.js";
+import"./server-rygvffsf.js";
+import"./server-3bc6k4k4.js";
+import"./server-5zrpr764.js";
 import"./server-7jzrrxap.js";
+import"./server-cjz51jm2.js";
+import"./server-8wcf79fe.js";
+import"./server-4dhv7mqz.js";
 import"./server-t528t8qm.js";
 import"./server-4enr7s6x.js";
-import"./server-kh958yj8.js";
-import"./server-1fszbabv.js";
-import"./server-s2st631p.js";
-import"./server-4dhv7mqz.js";
 import"./server-qt1qqasc.js";
 import"./server-676xw7at.js";
 import"./server-d6g4whc2.js";
@@ -24,25 +25,26 @@ import"./server-vb7pbd9p.js";
 import"./server-x8a7jmkh.js";
 import"./server-ras2sxnc.js";
 import"./server-hb6xhh9q.js";
-import"./server-7vkj6zhb.js";
+import"./server-9a6v0wth.js";
 import"./server-fb3zxn06.js";
-import"./server-6tcrjfw8.js";
+import"./server-8pqnnmf9.js";
 import"./server-cvgn49tr.js";
 import"./server-fr0wbhdn.js";
-import"./server-8xmq9h3f.js";
+import"./server-q6j5dasr.js";
 import"./server-2htmbqbv.js";
-import"./server-c7n2ftng.js";
-import"./server-4c7jt8gq.js";
+import"./server-4n2tknpc.js";
+import"./server-pcygfdbs.js";
 import"./server-1zx87sdm.js";
 import"./server-czb2rkpk.js";
-import"./server-7h861yms.js";
+import"./server-3dqjhchy.js";
+import"./server-51779zs2.js";
 import"./server-cw6521wn.js";
 import"./server-7ekna9zs.js";
 import"./server-6byqfbqf.js";
 import"./server-2ra6pwf3.js";
-import"./server-kzns2hbz.js";
 import"./server-3t0q2cqx.js";
 import"./server-kb9nn0a0.js";
+import"./server-kzns2hbz.js";
 import"./server-t4k4qexw.js";
 import"./server-pavzsdc6.js";
 export {

package/dist/v2/{search-j7bakcwa.js → search-048v8y02.js}

@@ -5,34 +5,35 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-mqvtz7wz.js";
-import"./server-zbxjj2mz.js";
-import"./server-bgzy0phk.js";
+} from "./server-hetyb88z.js";
+import"./server-rygvffsf.js";
+import"./server-3bc6k4k4.js";
+import"./server-5zrpr764.js";
 import"./server-7jzrrxap.js";
-import"./server-kh958yj8.js";
-import"./server-1fszbabv.js";
-import"./server-s2st631p.js";
+import"./server-cjz51jm2.js";
+import"./server-8wcf79fe.js";
 import"./server-4dhv7mqz.js";
 import"./server-qt1qqasc.js";
 import"./server-ras2sxnc.js";
 import"./server-hb6xhh9q.js";
-import"./server-6tcrjfw8.js";
+import"./server-8pqnnmf9.js";
 import"./server-cvgn49tr.js";
 import"./server-fr0wbhdn.js";
-import"./server-8xmq9h3f.js";
+import"./server-q6j5dasr.js";
 import"./server-2htmbqbv.js";
-import"./server-c7n2ftng.js";
-import"./server-4c7jt8gq.js";
+import"./server-4n2tknpc.js";
+import"./server-pcygfdbs.js";
 import"./server-1zx87sdm.js";
 import"./server-czb2rkpk.js";
-import"./server-7h861yms.js";
+import"./server-3dqjhchy.js";
+import"./server-51779zs2.js";
 import"./server-cw6521wn.js";
 import"./server-7ekna9zs.js";
 import"./server-6byqfbqf.js";
 import"./server-2ra6pwf3.js";
-import"./server-kzns2hbz.js";
 import"./server-3t0q2cqx.js";
 import"./server-kb9nn0a0.js";
+import"./server-kzns2hbz.js";
 import"./server-t4k4qexw.js";
 import"./server-pavzsdc6.js";
 export {

package/dist/v2/{send-session-notification-f6v698r5.js → send-session-notification-a4h2azxa.js}

@@ -12,7 +12,8 @@ import {
 import"./server-qt1qqasc.js";
 import"./server-676xw7at.js";
 import"./server-czb2rkpk.js";
-import"./server-7h861yms.js";
+import"./server-3dqjhchy.js";
+import"./server-51779zs2.js";
 import"./server-2ra6pwf3.js";
 import"./server-kb9nn0a0.js";
 import"./server-t4k4qexw.js";

package/dist/v2/{server-bgzy0phk.js → server-3bc6k4k4.js}

@@ -23,7 +23,7 @@ import {
 } from "./server-6byqfbqf.js";
 import {
   cleanUserText2
-} from "./server-c7n2ftng.js";
+} from "./server-4n2tknpc.js";
 import {
   recordMessageFtsRowid,
   recordIndexedMessageTime,
@@ -36,7 +36,7 @@ import {
 } from "./server-cvgn49tr.js";
 import {
   deleteChunkEmbedBackoffForSession
-} from "./server-s2st631p.js";
+} from "./server-8wcf79fe.js";
 import {
   ensurePrivateStorageDirectorySync,
   writeStorageFileSync,
@@ -705,7 +705,7 @@ var deleteMessageFtsStatements = new WeakMap;
 var deleteFtsMapStatements = new WeakMap;
 var deleteFtsMapRangeStatements = new WeakMap;
 var deleteMessageFtsMapStatements = new WeakMap;
-var MESSAGE_INDEX_MAX_FTS_BYTES = 64 * 1024;
+var MESSAGE_INDEX_MAX_FTS_BYTES2 = 64 * 1024;
 var skipStatements = new WeakMap;
 function skipStatement(db, sql) {
   const statements = skipStatements.get(db) ?? new Map;
@@ -717,10 +717,10 @@ function skipStatement(db, sql) {
   }
   return statement;
 }
-var messageIndexSkipKey = (sessionId, messageId) => `message_index_skip:${JSON.stringify([sessionId, messageId])}`;
+var messageIndexSkipKey2 = (sessionId, messageId) => `message_index_skip:${JSON.stringify([sessionId, messageId])}`;
 function deleteMessageIndexSkips(db, sessionId, messageId) {
   if (messageId !== undefined) {
-    skipStatement(db, "DELETE FROM schema_migrations_meta WHERE key=?").run(messageIndexSkipKey(sessionId, messageId));
+    skipStatement(db, "DELETE FROM schema_migrations_meta WHERE key=?").run(messageIndexSkipKey2(sessionId, messageId));
   } else {
     const prefix = `message_index_skip:${JSON.stringify([sessionId]).slice(0, -1)},`;
     skipStatement(db, "DELETE FROM schema_migrations_meta WHERE substr(key,1,length(?))=?").run(prefix, prefix);
@@ -905,8 +905,8 @@ function normalizeSourceVersion(version) {
     return `string:${version}`;
   return "null";
 }
-function toMessageIndexSource(message) {
-  const content = getIndexableContent(message.role, message.parts);
+function toMessageIndexSource2(message) {
+  const content = getIndexableContent2(message.role, message.parts);
   return {
     id: message.id,
     ordinal: message.ordinal,
@@ -918,7 +918,21 @@ function toMessageIndexSource(message) {
   };
 }
 function getMessageSourceSnapshot(message) {
-  return toMessageIndexSource(message);
+  return toMessageIndexSource2(message);
+}
+function getMessageIndexSourceIdentity2(message) {
+  const source = getMessageSourceSnapshot(message);
+  return JSON.stringify([
+    source.ordinal,
+    source.sourceVersion,
+    source.contentHash,
+    source.role,
+    message.createdAt ?? null
+  ]);
+}
+function isMessageIndexSourceCurrent2(db, sessionId, message) {
+  const source = getMessageSourceSnapshot(message);
+  return isIndexSourceCurrent(db, sessionId, source);
 }
 function isIndexSourceCurrent(db, sessionId, source) {
   const row = getMessageSourceStatement(db).get(sessionId, source.id);
@@ -927,8 +941,8 @@ function isIndexSourceCurrent(db, sessionId, source) {
 function writeMessageSource(db, sessionId, source, now) {
   getUpsertMessageSourceStatement(db).run(sessionId, source.id, source.ordinal, source.sourceVersion, source.contentHash, source.role, getHarness2(), now);
   const bytes = Buffer.byteLength(source.content);
-  if (source.ftsSkippedBytes !== undefined || bytes > MESSAGE_INDEX_MAX_FTS_BYTES) {
-    skipStatement(db, "INSERT INTO schema_migrations_meta(key,value) VALUES (?,?) ON CONFLICT(key) DO UPDATE SET value=excluded.value").run(messageIndexSkipKey(sessionId, source.id), JSON.stringify({
+  if (source.ftsSkippedBytes !== undefined || bytes > MESSAGE_INDEX_MAX_FTS_BYTES2) {
+    skipStatement(db, "INSERT INTO schema_migrations_meta(key,value) VALUES (?,?) ON CONFLICT(key) DO UPDATE SET value=excluded.value").run(messageIndexSkipKey2(sessionId, source.id), JSON.stringify({
       reason: "oversized",
       bytes: source.ftsSkippedBytes ?? bytes,
       contentHash: source.contentHash,
@@ -937,24 +951,24 @@ function writeMessageSource(db, sessionId, source, now) {
     }));
     return "";
   }
-  skipStatement(db, "DELETE FROM schema_migrations_meta WHERE key=?").run(messageIndexSkipKey(sessionId, source.id));
+  skipStatement(db, "DELETE FROM schema_migrations_meta WHERE key=?").run(messageIndexSkipKey2(sessionId, source.id));
   return source.content;
 }
-function getLastIndexedOrdinal(db, sessionId) {
+function getLastIndexedOrdinal2(db, sessionId) {
   const row = getLastIndexedStatement(db).get(sessionId);
   return typeof row?.last_indexed_ordinal === "number" ? row.last_indexed_ordinal : 0;
 }
-function getIndexedMessageCorpusSize(db, sessionId, maxOrdinal) {
-  const watermark = getLastIndexedOrdinal(db, sessionId);
+function getIndexedMessageCorpusSize2(db, sessionId, maxOrdinal) {
+  const watermark = getLastIndexedOrdinal2(db, sessionId);
   return maxOrdinal === null ? watermark : Math.min(watermark, Math.max(0, maxOrdinal));
 }
 function getDirtyIndexFloor(db, sessionId) {
   const row = getLastIndexedStatement(db).get(sessionId);
   return typeof row?.dirty_floor_ordinal === "number" && row.dirty_floor_ordinal > 0 ? row.dirty_floor_ordinal : null;
 }
-function markMessageIndexDirty(db, sessionId, floorOrdinal) {
+function markMessageIndexDirty2(db, sessionId, floorOrdinal) {
   const dirtyFloor = Math.max(1, Math.floor(floorOrdinal));
-  getUpsertDirtyFloorStatement(db).run(sessionId, getLastIndexedOrdinal(db, sessionId), dirtyFloor, Date.now(), getHarness2());
+  getUpsertDirtyFloorStatement(db).run(sessionId, getLastIndexedOrdinal2(db, sessionId), dirtyFloor, Date.now(), getHarness2());
 }
 function isMessageAlreadyIndexed(db, sessionId, messageId) {
   const row = getCountIndexedMessageStatement(db).get(sessionId, messageId);
@@ -963,16 +977,23 @@ function isMessageAlreadyIndexed(db, sessionId, messageId) {
 function setIndexProgress(db, sessionId, watermark, dirtyFloor, now) {
   getUpsertProgressStatement(db).run(sessionId, Math.max(0, Math.floor(watermark)), dirtyFloor ?? 0, now, getHarness2());
 }
-function getMessageIndexReconciliationStartOrdinal(db, sessionId) {
-  const watermark = getLastIndexedOrdinal(db, sessionId);
+function getMessageIndexReconciliationStartOrdinal2(db, sessionId) {
+  const watermark = getLastIndexedOrdinal2(db, sessionId);
   const dirtyFloor = getDirtyIndexFloor(db, sessionId);
   return dirtyFloor === null ? watermark : Math.min(watermark, dirtyFloor - 1);
 }
-function isMessageIndexReconciledThrough(db, sessionId, finalWatermark) {
+function isMessageIndexReconciledThrough2(db, sessionId, finalWatermark) {
   const dirtyFloor = getDirtyIndexFloor(db, sessionId);
-  return getLastIndexedOrdinal(db, sessionId) >= finalWatermark && dirtyFloor === null;
+  return getLastIndexedOrdinal2(db, sessionId) >= finalWatermark && dirtyFloor === null;
 }
-function clearIndexedMessagesInTransaction(db, sessionId) {
+function deleteIndexedMessage2(db, sessionId, messageId) {
+  deleteMessageIndexSkips(db, sessionId, messageId);
+  const row = getCountIndexedMessageStatement(db).get(sessionId, messageId);
+  const count = typeof row?.count === "number" ? row.count : 0;
+  clearIndexedMessages2(db, sessionId);
+  return count;
+}
+function clearIndexedMessagesInTransaction2(db, sessionId) {
   deleteMessageIndexSkips(db, sessionId);
   getDeleteFtsStatement(db).run(sessionId);
   deleteUnmappedMessageFtsRows(db, [sessionId]);
@@ -981,7 +1002,15 @@ function clearIndexedMessagesInTransaction(db, sessionId) {
   getDeleteIndexStatement(db).run(sessionId);
   clearCompressionDepth(db, sessionId);
 }
-function getIndexableContent(role, parts) {
+function clearIndexedMessages2(db, sessionId) {
+  let transactionStartedAt = 0;
+  db.transaction(() => {
+    transactionStartedAt = performance.now();
+    clearIndexedMessagesInTransaction2(db, sessionId);
+  }).immediate();
+  logSlowWriteTransaction("message_index_clear", transactionStartedAt);
+}
+function getIndexableContent2(role, parts) {
   if (role === "user") {
     if (!hasMeaningfulUserText2(parts)) {
       return "";
@@ -994,7 +1023,7 @@ function getIndexableContent(role, parts) {
   return "";
 }
 function indexSingleMessageInTransaction(db, sessionId, message, now, dirtyFloorBeforeAttempt, source) {
-  const currentWatermark = getLastIndexedOrdinal(db, sessionId);
+  const currentWatermark = getLastIndexedOrdinal2(db, sessionId);
   const dirtyFloor = getDirtyIndexFloor(db, sessionId);
   if (message.ordinal <= currentWatermark) {
     if (isIndexSourceCurrent(db, sessionId, source)) {
@@ -1025,17 +1054,17 @@ function indexSingleMessageInTransaction(db, sessionId, message, now, dirtyFloor
   setIndexProgress(db, sessionId, message.ordinal, dirtyFloorBeforeAttempt === message.ordinal ? null : dirtyFloorBeforeAttempt, now);
   return inserted;
 }
-function indexSingleMessage(db, sessionId, message, shouldCommit = () => true, preparedSource) {
+function indexSingleMessage2(db, sessionId, message, shouldCommit = () => true, preparedSource) {
   if (!shouldCommit())
     return false;
   const source = preparedSource ?? getMessageSourceSnapshot(message);
-  const currentWatermark = getLastIndexedOrdinal(db, sessionId);
+  const currentWatermark = getLastIndexedOrdinal2(db, sessionId);
   if (message.ordinal <= currentWatermark && isIndexSourceCurrent(db, sessionId, source)) {
     recordIndexedMessageTime(db, sessionId, message.ordinal, message.createdAt);
     return false;
   }
   const dirtyFloorBeforeAttempt = getDirtyIndexFloor(db, sessionId);
-  markMessageIndexDirty(db, sessionId, Math.min(message.ordinal, currentWatermark + 1));
+  markMessageIndexDirty2(db, sessionId, Math.min(message.ordinal, currentWatermark + 1));
   db.exec("BEGIN IMMEDIATE");
   const transactionStartedAt = performance.now();
   let committed = false;
@@ -1055,10 +1084,10 @@ function indexSingleMessage(db, sessionId, message, shouldCommit = () => true, p
     }
   }
 }
-function indexMessagesAfterOrdinal(db, sessionId, messages, _lastIndexedOrdinal, finalWatermark = messages.length) {
-  return indexItemsAfterOrdinal(db, sessionId, messages, finalWatermark, toMessageIndexSource);
+function indexMessagesAfterOrdinal2(db, sessionId, messages, _lastIndexedOrdinal, finalWatermark = messages.length) {
+  return indexItemsAfterOrdinal(db, sessionId, messages, finalWatermark, toMessageIndexSource2);
 }
-function indexSourcesAfterOrdinal(db, sessionId, sources, finalWatermark) {
+function indexSourcesAfterOrdinal2(db, sessionId, sources, finalWatermark) {
   return indexItemsAfterOrdinal(db, sessionId, sources, finalWatermark, (source) => source);
 }
 function indexItemsAfterOrdinal(db, sessionId, items, finalWatermark, toSource) {
@@ -1069,7 +1098,7 @@ function indexItemsAfterOrdinal(db, sessionId, items, finalWatermark, toSource)
   const transactionStartedAt = performance.now();
   let committed = false;
   try {
-    const currentWatermark = getLastIndexedOrdinal(db, sessionId);
+    const currentWatermark = getLastIndexedOrdinal2(db, sessionId);
     const dirtyFloor = getDirtyIndexFloor(db, sessionId);
     const effectiveWatermark = dirtyFloor === null ? currentWatermark : Math.min(currentWatermark, Math.max(0, dirtyFloor - 1));
     if (dirtyFloor !== null && dirtyFloor <= currentWatermark && !messageFtsOrdinalRangeIsMapped(db, sessionId, dirtyFloor, Math.min(currentWatermark, finalWatermark))) {
@@ -1223,7 +1252,7 @@ function sweepOrphanedOpenCodeMessageIndexesInBackground(db, openReadableOpenCod
                          AND message_history_index.updated_at > ?
                    )
                  LIMIT 1`);
-      const eligibleSessionIds = missingSessionIds.filter((sessionId) => stillEligible.get(sessionId, cutoff));
+      const eligibleSessionIds = missingSessionIds.filter((sessionId) => !sessionExists.get(sessionId) && stillEligible.get(sessionId, cutoff));
       deleted = deleteSessionScopedRows(db, eligibleSessionIds, harness);
       persistMessageHistoryOrphanSweepState(db, nextCursor, completedAt, harness);
       db.exec("COMMIT");
@@ -1246,8 +1275,8 @@ function sweepOrphanedOpenCodeMessageIndexesInBackground(db, openReadableOpenCod
     closeQuietly(openCodeDb);
   }
 }
-function sweepOrphanedOpenCodeMessageIndexes(db, openReadableOpenCodeDb, options = {}) {
+function sweepOrphanedOpenCodeMessageIndexes2(db, openReadableOpenCodeDb, options = {}) {
   return withoutSqliteTransformPass2(() => withSqliteBackgroundWriter2(() => sweepOrphanedOpenCodeMessageIndexesInBackground(db, openReadableOpenCodeDb, options)));
 }
 
-export { BoundedSessionMap, clearCompressionDepth, clearCompressionDepthRange, LkgRecoveryFenceError, clearLkgFenceProcessState, lkgServedArrayDigest, hasCleanLkgRecoveryFence, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, prepareLkgCaptureFence, certifyCommittedLkgCapture, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, advanceSessionActivity, backfillSessionActivity, deleteSessionScopedRows, MESSAGE_INDEX_MAX_FTS_BYTES, messageIndexSkipKey, toMessageIndexSource, getLastIndexedOrdinal, getIndexedMessageCorpusSize, markMessageIndexDirty, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, clearIndexedMessagesInTransaction, getIndexableContent, indexSingleMessage, indexMessagesAfterOrdinal, indexSourcesAfterOrdinal, sweepOrphanedOpenCodeMessageIndexes };
+export { BoundedSessionMap, clearCompressionDepth, clearCompressionDepthRange, LkgRecoveryFenceError, clearLkgFenceProcessState, lkgServedArrayDigest, hasCleanLkgRecoveryFence, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, prepareLkgCaptureFence, certifyCommittedLkgCapture, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, advanceSessionActivity, backfillSessionActivity, deleteSessionScopedRows, MESSAGE_INDEX_MAX_FTS_BYTES2, messageIndexSkipKey2, toMessageIndexSource2, getMessageIndexSourceIdentity2, isMessageIndexSourceCurrent2, getLastIndexedOrdinal2, getIndexedMessageCorpusSize2, markMessageIndexDirty2, getMessageIndexReconciliationStartOrdinal2, isMessageIndexReconciledThrough2, deleteIndexedMessage2, clearIndexedMessagesInTransaction2, clearIndexedMessages2, getIndexableContent2, indexSingleMessage2, indexMessagesAfterOrdinal2, indexSourcesAfterOrdinal2, sweepOrphanedOpenCodeMessageIndexes2 };