@cortexkit/opencode-magic-context 0.41.1 → 0.41.2

package/dist/{index-z893kjyt.js → index-y1yr57fw.js}

@@ -419,15 +419,38 @@ var SESSION_SCOPED_TABLES = [
   { table: "embedding_measurement_corpus" },
   { table: "pending_session_cleanup", harnessScoped: true },
   { table: "message_history_fts" },
+  { table: "message_fts_rowid_map" },
   { table: "message_history_source", harnessScoped: true },
   { table: "message_history_index", harnessScoped: true },
   { table: "lkg_slots" }
 ];
-function deleteSessionScopedRows(db, sessionIds, harness) {
+function deleteSessionScopedRows(db, sessionIds, harness, options = {}) {
   if (sessionIds.length === 0)
-    return;
-  const placeholders = sessionIds.map(() => "?").join(", ");
+    return 0;
+  let deletableSessionIds = [...sessionIds];
+  if (options.rustModuleCleanupAcknowledged !== true) {
+    const placeholders2 = sessionIds.map(() => "?").join(", ");
+    const harnessPredicate = harness === undefined ? "" : " AND harness = ?";
+    const protectedRows = db.prepare(`SELECT session_id
+                 FROM pending_session_cleanup
+                 WHERE session_id IN (${placeholders2})
+                   AND harness LIKE '%:rust'${harnessPredicate}`).all(...sessionIds, ...harness === undefined ? [] : [`${harness}:rust`]);
+    const protectedSessionIds = new Set(protectedRows.map((row) => row.session_id));
+    deletableSessionIds = sessionIds.filter((sessionId) => !protectedSessionIds.has(sessionId));
+  }
+  if (deletableSessionIds.length === 0)
+    return 0;
+  const placeholders = deletableSessionIds.map(() => "?").join(", ");
   for (const definition of SESSION_SCOPED_TABLES) {
+    if (definition.table === "message_history_fts") {
+      db.prepare(`DELETE FROM message_history_fts
+                 WHERE rowid IN (
+                     SELECT fts_rowid
+                     FROM message_fts_rowid_map
+                     WHERE session_id IN (${placeholders})
+                 )`).run(...deletableSessionIds);
+      continue;
+    }
     const predicates = [`session_id IN (${placeholders})`];
     if (definition.extraPredicate)
       predicates.push(definition.extraPredicate);
@@ -436,10 +459,11 @@ function deleteSessionScopedRows(db, sessionIds, harness) {
       predicates.push("harness = ?");
     const statement = db.prepare(`DELETE FROM ${definition.table} WHERE ${predicates.join(" AND ")}`);
     if (bindHarness)
-      statement.run(...sessionIds, harness);
+      statement.run(...deletableSessionIds, harness);
     else
-      statement.run(...sessionIds);
+      statement.run(...deletableSessionIds);
   }
+  return deletableSessionIds.length;
 }
 
 // src/features/magic-context/storage-meta-session.ts
@@ -540,15 +564,28 @@ function advanceToolReclaimWatermark(db, sessionId, maxTagNumber) {
     db.prepare("UPDATE session_meta SET tool_reclaim_watermark = MAX(COALESCE(tool_reclaim_watermark, 0), ?) WHERE session_id = ?").run(maxTagNumber, sessionId);
   })();
 }
-function markSessionCleanupPending(db, sessionId) {
-  db.prepare(`INSERT INTO pending_session_cleanup (session_id, harness, requested_at, last_attempt_at)
-         VALUES (?, ?, ?, NULL)
-         ON CONFLICT(session_id) DO UPDATE SET
-             harness = excluded.harness,
-             requested_at = MIN(pending_session_cleanup.requested_at, excluded.requested_at)`).run(sessionId, getHarness(), Date.now());
+function rustCleanupHarness() {
+  return `${getHarness()}:rust`;
+}
+function markSessionCleanupPending(db, sessionId, rustModuleCleanupRequired = false) {
+  const row = db.prepare(`INSERT INTO pending_session_cleanup (session_id, harness, requested_at, last_attempt_at)
+             VALUES (?, ?, ?, NULL)
+             ON CONFLICT(session_id) DO UPDATE SET
+                 harness = CASE
+                     WHEN pending_session_cleanup.harness LIKE '%:rust'
+                         THEN pending_session_cleanup.harness
+                     ELSE excluded.harness
+                 END,
+                 requested_at = MIN(pending_session_cleanup.requested_at, excluded.requested_at)
+             RETURNING harness`).get(sessionId, rustModuleCleanupRequired ? rustCleanupHarness() : getHarness(), Date.now());
+  return row.harness.endsWith(":rust");
 }
 function retryPendingSessionCleanups(db, limit = 200) {
-  const rows = db.prepare("SELECT session_id FROM pending_session_cleanup ORDER BY requested_at ASC, session_id ASC LIMIT ?").all(Math.max(1, Math.floor(limit)));
+  const rows = db.prepare(`SELECT session_id
+             FROM pending_session_cleanup
+             WHERE harness NOT LIKE '%:rust'
+             ORDER BY requested_at ASC, session_id ASC
+             LIMIT ?`).all(Math.max(1, Math.floor(limit)));
   const failedSessionIds = [];
   let cleared = 0;
   for (const row of rows) {
@@ -562,12 +599,39 @@ function retryPendingSessionCleanups(db, limit = 200) {
   }
   return { attempted: rows.length, cleared, failedSessionIds };
 }
-function clearSession(db, sessionId) {
+async function retryPendingRustSessionCleanupsForProject(db, projectPath, deleteSession, limit = 200) {
+  const harness = getHarness();
+  const rows = db.prepare(`SELECT pending.session_id
+             FROM pending_session_cleanup pending
+             JOIN session_projects projects
+               ON projects.session_id = pending.session_id
+              AND projects.harness = ?
+             WHERE pending.harness = ?
+               AND projects.project_path = ?
+             ORDER BY pending.requested_at ASC, pending.session_id ASC
+             LIMIT ?`).all(harness, rustCleanupHarness(), projectPath, Math.max(1, Math.floor(limit)));
+  const failedSessionIds = [];
+  let cleared = 0;
+  for (const row of rows) {
+    try {
+      db.prepare("UPDATE pending_session_cleanup SET last_attempt_at = ? WHERE session_id = ?").run(Date.now(), row.session_id);
+      await deleteSession(row.session_id);
+      clearSession(db, row.session_id, true);
+      cleared += 1;
+    } catch {
+      failedSessionIds.push(row.session_id);
+    }
+  }
+  return { attempted: rows.length, cleared, failedSessionIds };
+}
+function clearSession(db, sessionId, rustModuleCleanupAcknowledged = false) {
   const transactionStartedAt = performance.now();
   db.transaction(() => {
-    deleteSessionScopedRows(db, [sessionId]);
+    deleteSessionScopedRows(db, [sessionId], undefined, {
+      rustModuleCleanupAcknowledged
+    });
   })();
   logSlowWriteTransaction("clear-session", transactionStartedAt);
 }
 
-export { logSlowWriteTransaction, ensureSessionMetaRow, persistCachedM0, clearCachedM0M1, SESSION_SCOPED_TABLES, deleteSessionScopedRows, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, clearSession };
+export { logSlowWriteTransaction, ensureSessionMetaRow, persistCachedM0, clearCachedM0M1, SESSION_SCOPED_TABLES, deleteSessionScopedRows, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, clearSession };

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;AAm0BvE,QAAA,MAAM,MAAM,EAAE,YAGb,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;AA40BvE,QAAA,MAAM,MAAM,EAAE,YAGb,CAAC;AAEF,eAAe,MAAM,CAAC"}