@cortexkit/opencode-magic-context 0.49.2 → 0.49.3

package/dist/{send-session-notification-xffh3bbe.js → send-session-notification-yp9m5g4p.js}

@@ -8,11 +8,12 @@ import {
   clearIgnoredMessages2,
   observeIgnoredNotificationEvent2,
   sendStatusNotification2
-} from "./index-xgrwmj82.js";
+} from "./index-bhk710rw.js";
 import"./index-qt1qqasc.js";
 import"./index-tqf7yg27.js";
-import"./index-0pjvpfkf.js";
-import"./index-h5zfkjyk.js";
+import"./index-qvr78ej6.js";
+import"./index-jpm52v9x.js";
+import"./index-v0p37hm2.js";
 import"./index-58e3y90n.js";
 import"./index-kb9nn0a0.js";
 import"./index-nsjyysj0.js";

package/dist/shared/tag-owner-id.d.ts

@@ -11,6 +11,7 @@
  * tag is treated as belonging to a message that does not exist.
  */
 export declare const TEXT_TAG_IDENTITY_MARKER = ":mc-text-v1:";
+export declare const PI_FALLBACK_PREFIXES_JSON: string;
 /**
  * The owning message id of a content tag id. An id with neither suffix is
  * returned unchanged: it already is the message id.

package/dist/shared/tag-owner-id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tag-owner-id.d.ts","sourceRoot":"","sources":["../../src/shared/tag-owner-id.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,eAAO,MAAM,wBAAwB,iBAAiB,CAAC;AAKvD;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAMlE"}
+{"version":3,"file":"tag-owner-id.d.ts","sourceRoot":"","sources":["../../src/shared/tag-owner-id.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,eAAO,MAAM,wBAAwB,iBAAiB,CAAC;AAKvD,eAAO,MAAM,yBAAyB,QAQrC,CAAC;AAKF;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAMlE"}

package/dist/{storage-tags-k0pda32s.js → storage-tags-0ssbmzg9.js}

@@ -60,11 +60,11 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-nydv6g8r.js";
+} from "./index-yqps2zsv.js";
 import"./index-1zx87sdm.js";
 import"./index-1bt88epp.js";
-import"./index-qx53vezw.js";
 import"./index-kb9nn0a0.js";
+import"./index-qx53vezw.js";
 import"./index-nsjyysj0.js";
 import"./index-0sahzkwr.js";
 import"./index-pavzsdc6.js";

package/dist/{transform-postprocess-phase-481j5a7z.js → transform-postprocess-phase-113rwew1.js}

@@ -18,42 +18,44 @@ import {
   finalizeMessageRepresentation2,
   runPostTransformPhase2,
   checkM0MutationDriftAndSignal2
-} from "./index-p0n5ryq8.js";
-import"./index-zfzdpeq2.js";
-import"./index-rafsaxac.js";
-import"./index-sfhndpcb.js";
-import"./index-r2zcs71c.js";
+} from "./index-ws3gcy5m.js";
+import"./index-s4ztdn8v.js";
+import"./index-yxawqmdd.js";
+import"./index-sd3egckz.js";
+import"./index-fjtgekd4.js";
+import"./index-3wckxwfp.js";
+import"./index-7ndnvw7a.js";
 import"./index-7jzrrxap.js";
-import"./index-fg00p1cg.js";
-import"./index-p1hnwfd8.js";
+import"./index-c0b01zrc.js";
+import"./index-gcdb3rqw.js";
 import"./index-4dhv7mqz.js";
 import"./index-w23dh319.js";
-import"./index-sd3egckz.js";
-import"./index-xgrwmj82.js";
+import"./index-bhk710rw.js";
 import"./index-qt1qqasc.js";
 import"./index-x8a7jmkh.js";
 import"./index-tqf7yg27.js";
 import"./index-gbmqa9x9.js";
 import"./index-vkbqdnkj.js";
-import"./index-zg8yq4ya.js";
+import"./index-znzgze2v.js";
 import"./index-fb3zxn06.js";
-import"./index-att4bfan.js";
+import"./index-xfbfrngb.js";
 import"./index-6m7rdv7y.js";
 import"./index-fr0wbhdn.js";
-import"./index-gzky5rva.js";
+import"./index-41gqa557.js";
 import"./index-7w18gg78.js";
-import"./index-sv0bb7vg.js";
-import"./index-nydv6g8r.js";
+import"./index-7zg9dvx0.js";
+import"./index-yqps2zsv.js";
 import"./index-1zx87sdm.js";
-import"./index-0pjvpfkf.js";
-import"./index-h5zfkjyk.js";
+import"./index-qvr78ej6.js";
+import"./index-jpm52v9x.js";
+import"./index-v0p37hm2.js";
 import"./index-k6xvbj2e.js";
 import"./index-h2wc01qk.js";
 import"./index-1bt88epp.js";
 import"./index-58e3y90n.js";
-import"./index-qx53vezw.js";
 import"./index-4mjhqadz.js";
 import"./index-kb9nn0a0.js";
+import"./index-qx53vezw.js";
 import"./index-nsjyysj0.js";
 import"./index-0sahzkwr.js";
 import"./index-pavzsdc6.js";

package/dist/v2/auto-search-worker.js

@@ -17,11 +17,11 @@ var [
   { setHarness },
   { Database }
 ] = await Promise.all([
-  import("./embedding-backfill-dbvjbcmm.js"),
+  import("./embedding-backfill-9hbkfvnz.js"),
   import("./embedding-cache-mgyr73ef.js"),
   import("./storage-memory-07fx57k6.js"),
-  import("./project-embedding-registry-nyq7z8y6.js"),
-  import("./search-j7bakcwa.js"),
+  import("./project-embedding-registry-42th7k1z.js"),
+  import("./search-048v8y02.js"),
   import("./embedding-activity-g1dhes6g.js"),
   import("./harness-e4avh192.js"),
   import("./sqlite-mhjkerzq.js")

package/dist/v2/compaction-marker-candidates-1s21e2fz.js

@@ -0,0 +1,18 @@
+import {
+  isMarkerCandidateBasisCurrent2,
+  invalidateMarkerCandidateBasis2,
+  readMarkerCandidateBasis2,
+  prepareMarkerCandidateBasis2,
+  scanMarkerCandidateSnapshot2
+} from "./server-9290a1mb.js";
+import"./server-51779zs2.js";
+import"./server-kb9nn0a0.js";
+import"./server-t4k4qexw.js";
+import"./server-pavzsdc6.js";
+export {
+  invalidateMarkerCandidateBasis2 as invalidateMarkerCandidateBasis,
+  isMarkerCandidateBasisCurrent2 as isMarkerCandidateBasisCurrent,
+  prepareMarkerCandidateBasis2 as prepareMarkerCandidateBasis,
+  readMarkerCandidateBasis2 as readMarkerCandidateBasis,
+  scanMarkerCandidateSnapshot2 as scanMarkerCandidateSnapshot
+};

package/dist/v2/compaction-marker-candidates-worker.js

@@ -0,0 +1,24 @@
+// src/features/magic-context/compaction-marker-candidates-worker.ts
+import { parentPort, workerData } from "node:worker_threads";
+var port = parentPort;
+if (!port)
+  throw new Error("marker candidate worker requires a parent port");
+port.postMessage({ kind: "accepted" });
+var [{ Database }, { scanMarkerCandidateSnapshot }] = await Promise.all([
+  import("./sqlite-mhjkerzq.js"),
+  import("./compaction-marker-candidates-1s21e2fz.js")
+]);
+var input = workerData;
+var db;
+var reply;
+try {
+  db = new Database(input.path, { readonly: true });
+  db.exec("PRAGMA busy_timeout=250");
+  reply = { kind: "candidates", snapshot: scanMarkerCandidateSnapshot(db, input.sessionId) };
+} catch (error) {
+  reply = { kind: "error", error: error instanceof Error ? error.message : String(error) };
+} finally {
+  db?.close();
+}
+port.postMessage(reply);
+port.close();

package/dist/v2/{context-gsdtha5v.js → context-p1xf3w5q.js}

@@ -151,6 +151,10 @@ import {
   readCoordinateGeneration,
   rebaseSessionCoordinatesAsync,
   HiddenCompletionRefusal,
+  getOpenCodeDbPath,
+  compareOpenCodeMessagesByCanonicalOrder,
+  prepareCompactionMarkerCandidates,
+  removeMcOwnedCompactionMarkers,
   getCompartmentEvents,
   USER_MEMORY_CANDIDATE_TTL_MS,
   insertUserMemoryCandidates,
@@ -198,9 +202,6 @@ import {
   promptSurfaceHashMaterial,
   createPromptSurfaceRuntime,
   createPromptSurfaceGuidanceEpochCache,
-  getOpenCodeDbPath,
-  compareOpenCodeMessagesByCanonicalOrder,
-  removeMcOwnedCompactionMarkers,
   MARKER_SUMMARY_TEXT,
   markerUpdateDefinitelyDidNotCut,
   applyDeferredCompactionMarker,
@@ -262,7 +263,7 @@ import {
   startCompartmentAgent,
   setRecompStarting2,
   setRecompTerminal2
-} from "./server-7spkq1y6.js";
+} from "./server-cxxjb33r.js";
 import {
   CANONICAL_DREAM_TASKS,
   DREAM_TASK_CAPABILITIES,
@@ -300,7 +301,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./server-7vkj6zhb.js";
+} from "./server-9a6v0wth.js";
 import {
   setHomeProjectPermission,
   shouldSkipHomeProjectMemory,
@@ -316,7 +317,7 @@ import {
   storedPathBelongsToIdentity,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./server-8xmq9h3f.js";
+} from "./server-q6j5dasr.js";
 import {
   detectLatestTurnThinkingMismatch,
   isPrefixBoundThinkingModel,
@@ -421,6 +422,8 @@ import {
   setPendingCompactionMarkerState,
   replacePendingCompactionMarkerStateIf,
   clearPendingCompactionMarkerStateIf,
+  getPendingPiCompactionMarkerState,
+  clearPendingPiCompactionMarkerStateIf,
   setSessionWorkMetrics,
   getObservedEpochFloor,
   resolveEpochFloorForPass,
@@ -492,7 +495,7 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./server-c7n2ftng.js";
+} from "./server-4n2tknpc.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -531,7 +534,7 @@ import {
 } from "./server-2htmbqbv.js";
 import {
   deleteChunkEmbedBackoffForSession
-} from "./server-s2st631p.js";
+} from "./server-8wcf79fe.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
@@ -552,12 +555,12 @@ import {
   markLkgRecoveryDirty,
   advanceSessionActivity,
   backfillSessionActivity,
-  getLastIndexedOrdinal,
-  getMessageIndexReconciliationStartOrdinal,
-  isMessageIndexReconciledThrough,
-  indexMessagesAfterOrdinal,
-  sweepOrphanedOpenCodeMessageIndexes
-} from "./server-bgzy0phk.js";
+  getLastIndexedOrdinal2,
+  getMessageIndexReconciliationStartOrdinal2,
+  isMessageIndexReconciledThrough2,
+  indexMessagesAfterOrdinal2,
+  sweepOrphanedOpenCodeMessageIndexes2
+} from "./server-3bc6k4k4.js";
 import {
   stableStringify,
   getTemporalDecisions,
@@ -656,13 +659,14 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./server-4c7jt8gq.js";
+} from "./server-pcygfdbs.js";
+import"./server-51779zs2.js";
 import {
   isRawCompactionSummaryInfo2,
   extractInMemoryMessageViews2,
   buildInMemoryTailRawMessages2,
   runSessionWarmupWorker
-} from "./server-7h861yms.js";
+} from "./server-3dqjhchy.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -696,7 +700,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./server-6tcrjfw8.js";
+} from "./server-8pqnnmf9.js";
 import {
   GIT_SWEEP_LEASE_RENEWAL_MS,
   acquireGitSweepLease,
@@ -723,7 +727,7 @@ import {
   drainCommitBacklogForProject2,
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2
-} from "./server-1fszbabv.js";
+} from "./server-cjz51jm2.js";
 import"./server-fb3zxn06.js";
 import {
   SESSION_NOTE_CONDITION_ERROR,
@@ -767,7 +771,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./server-zbxjj2mz.js";
+} from "./server-rygvffsf.js";
 import {
   deriveTriggerBudget2,
   deriveHistorianChunkTokens2,
@@ -775,6 +779,7 @@ import {
   resolveHistorianProducerLimits2,
   resolveHistorianContextLimit2
 } from "./server-t528t8qm.js";
+import"./server-9290a1mb.js";
 import {
   isEmbeddingHostBusy2
 } from "./server-qt1qqasc.js";
@@ -788,7 +793,7 @@ import {
 } from "./server-ras2sxnc.js";
 import {
   cosineSimilarity
-} from "./server-kh958yj8.js";
+} from "./server-5zrpr764.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -845,7 +850,7 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-mqvtz7wz.js";
+} from "./server-hetyb88z.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
@@ -2774,7 +2779,7 @@ function forgetCachedPrefix(sessionId) {
   clearInjectionCache(sessionId);
   resetPrefixTrimFallbackState(sessionId);
 }
-function dropCompartmentsAfter(db, sessionId, anchor, holderId) {
+function dropCompartmentsAfter(db, sessionId, anchor, holderId, activeBranch = false, onRetire) {
   db.exec("BEGIN IMMEDIATE");
   let finished = false;
   try {
@@ -2783,12 +2788,19 @@ function dropCompartmentsAfter(db, sessionId, anchor, holderId) {
       finished = true;
       return null;
     }
-    const dropped = db.prepare("SELECT id, sequence FROM compartments WHERE session_id = ? AND sequence > ? ORDER BY sequence").all(sessionId, anchor.sequence);
+    const dropped = db.prepare("SELECT id, sequence FROM compartments WHERE session_id = ? AND sequence > ? ORDER BY sequence").all(sessionId, anchor?.sequence ?? -1);
+    onRetire?.();
     const deleteEmbeddings = db.prepare("DELETE FROM compartment_chunk_embeddings WHERE compartment_id = ?");
     for (const row of dropped)
       deleteEmbeddings.run(row.id);
-    db.prepare("DELETE FROM compartments WHERE session_id = ? AND sequence > ?").run(sessionId, anchor.sequence);
-    db.prepare("DELETE FROM compression_depth WHERE session_id = ? AND message_ordinal > ?").run(sessionId, anchor.endMessage);
+    db.prepare("DELETE FROM compartments WHERE session_id = ? AND sequence > ?").run(sessionId, anchor?.sequence ?? -1);
+    db.prepare("DELETE FROM compression_depth WHERE session_id = ? AND message_ordinal > ?").run(sessionId, anchor?.endMessage ?? 0);
+    if (activeBranch) {
+      db.prepare("UPDATE session_meta SET prior_boundary_ordinal = ? WHERE session_id = ?").run((anchor?.endMessage ?? 0) + 1, sessionId);
+      const marker = getPendingPiCompactionMarkerState(db, sessionId);
+      if (marker)
+        clearPendingPiCompactionMarkerStateIf(db, sessionId, marker);
+    }
     deleteChunkEmbedBackoffForSession(db, sessionId);
     queueM0Mutation(db, { sessionId, mutationType: "recomp_boundary_change" });
     clearCachedM0M1(db, sessionId);
@@ -2804,24 +2816,38 @@ function dropCompartmentsAfter(db, sessionId, anchor, holderId) {
   }
 }
 function repairMissingHistoryBoundary(args) {
-  const { db, sessionId, isInHostStore } = args;
-  const compartments = getCompartments(db, sessionId);
+  const { db, sessionId, isInHostStore, scope = "store" } = args;
+  const compartments = scope === "active-branch" ? db.prepare("SELECT sequence, COALESCE(end_message_id, '') AS endMessageId FROM compartments WHERE session_id = ? ORDER BY sequence").all(sessionId) : getCompartments(db, sessionId);
   let latestIndex = compartments.length - 1;
   while (latestIndex >= 0 && !compartments[latestIndex]?.endMessageId)
     latestIndex -= 1;
   if (latestIndex < 0)
     return { kind: "intact" };
+  if (scope === "active-branch") {
+    for (let index = 0;index <= latestIndex; index += 1) {
+      const endId = compartments[index]?.endMessageId;
+      if (!endId)
+        continue;
+      const present = isInHostStore(endId);
+      if (present === null)
+        return { kind: "unknown" };
+      if (!present) {
+        latestIndex = index;
+        break;
+      }
+    }
+  }
   const latestEnd = compartments[latestIndex].endMessageId;
   const latestPresent = isInHostStore(latestEnd);
   if (latestPresent === null)
     return { kind: "unknown" };
   if (!latestPresent) {
     const missing = latestEnd;
-    const problem = `newest compartment end ${latestEnd} is not in the host store`;
+    const problem = `compartment end ${latestEnd} is not in ${scope === "active-branch" ? "the active host branch" : "the host store"}`;
     const anchor = findAnchor(compartments, latestIndex, isInHostStore);
     if (anchor === "unknown")
       return { kind: "unknown" };
-    if (anchor === null) {
+    if (anchor === null && scope === "store") {
       sessionLog2(sessionId, `history boundary unresolved: ${problem} and no older compartment end is in the host store; nothing to re-anchor on`);
       return { kind: "unresolved", reason: "no-anchor", missingEndMessageId: missing };
     }
@@ -2833,8 +2859,15 @@ function repairMissingHistoryBoundary(args) {
       return { kind: "unresolved", reason: "busy", missingEndMessageId: missing };
     }
     let dropped;
+    let anchorForDrop = anchor;
     try {
-      dropped = dropCompartmentsAfter(db, sessionId, anchor, holderId);
+      if (scope === "active-branch" && anchor) {
+        const row = db.prepare("SELECT end_message AS endMessage FROM compartments WHERE session_id = ? AND sequence = ?").get(sessionId, anchor.sequence);
+        if (!row)
+          return { kind: "unresolved", reason: "busy", missingEndMessageId: missing };
+        anchorForDrop = { ...anchor, endMessage: row.endMessage };
+      }
+      dropped = dropCompartmentsAfter(db, sessionId, anchorForDrop, holderId, scope === "active-branch", () => args.onRetire?.(compartments.slice(latestIndex), anchor));
     } finally {
       releaseCompartmentLeaseBestEffort(db, sessionId, holderId);
     }
@@ -2844,14 +2877,16 @@ function repairMissingHistoryBoundary(args) {
     invalidateAutoEmbedSession(sessionId);
     forgetCachedPrefix(sessionId);
     const range = dropped.length === 0 ? "none" : `${dropped[0]}-${dropped[dropped.length - 1]} (${dropped.length})`;
-    sessionLog2(sessionId, `history boundary repair: ${problem}; re-anchored on compartment ${anchor.sequence} ending at ${anchor.endMessageId} (ordinal ${anchor.endMessage}); removed compartments ${range} for the historian to rebuild; the cached prefix is rebuilt on this pass`);
+    sessionLog2(sessionId, `history boundary repair: ${problem}; re-anchored on ${anchorForDrop ? `compartment ${anchorForDrop.sequence} ending at ${anchorForDrop.endMessageId} (ordinal ${anchorForDrop.endMessage})` : "the start of history"}; removed compartments ${range} for the historian to rebuild; the cached prefix is rebuilt on this pass`);
     return {
       kind: "repaired",
       missingEndMessageId: missing,
-      anchorEndMessageId: anchor.endMessageId,
+      anchorEndMessageId: anchor?.endMessageId ?? "",
       droppedSequences: dropped
     };
   }
+  if (scope === "active-branch")
+    return { kind: "intact" };
   const baseline = readBaseline(db, sessionId);
   if (!baseline.hasCachedM0 || baseline.boundary === null || baseline.boundary === latestEnd) {
     return { kind: "intact" };
@@ -2971,15 +3006,15 @@ async function reconcileSessionIndex(db, sessionId, readMessages) {
     try {
       const fullReader = typeof readMessages === "function" ? readMessages : null;
       const finalWatermark = readMessages.getCount ? readMessages.getCount(sessionId) : (fallbackSnapshot = fullReader?.(sessionId) ?? []).length;
-      let cursor = getMessageIndexReconciliationStartOrdinal(db, sessionId);
+      let cursor = getMessageIndexReconciliationStartOrdinal2(db, sessionId);
       let after;
       while (cursor < finalWatermark) {
         const pageEnd = Math.min(finalWatermark, cursor + RECONCILIATION_BATCH_SIZE);
         const messages = readMessages.readPage ? readMessages.readPage(sessionId, cursor, RECONCILIATION_BATCH_SIZE, finalWatermark, after) : (fallbackSnapshot ?? []).filter((message) => message.ordinal > cursor && message.ordinal <= pageEnd);
         const retainedMessages = fallbackSnapshot ?? messages;
         heapHolder.activeReconcilerBuffers.set(sessionId, retainedMessages);
-        withSqliteBackgroundWriter2(() => indexMessagesAfterOrdinal(db, sessionId, messages, cursor, pageEnd));
-        const nextCursor = getMessageIndexReconciliationStartOrdinal(db, sessionId);
+        withSqliteBackgroundWriter2(() => indexMessagesAfterOrdinal2(db, sessionId, messages, cursor, pageEnd));
+        const nextCursor = getMessageIndexReconciliationStartOrdinal2(db, sessionId);
         if (nextCursor <= cursor)
           break;
         cursor = nextCursor;
@@ -2989,7 +3024,7 @@ async function reconcileSessionIndex(db, sessionId, readMessages) {
           await yieldToEventLoop();
         }
       }
-      if (isMessageIndexReconciledThrough(db, sessionId, finalWatermark)) {
+      if (isMessageIndexReconciledThrough2(db, sessionId, finalWatermark)) {
         heapHolder.reconciledSessions.add(sessionId);
       }
     } finally {
@@ -3022,6 +3057,32 @@ function scheduleReconciliation(db, sessionId, readMessages) {
     });
   });
 }
+async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, options = {}) {
+  const path = getSqliteDatabasePath2(db);
+  if (!path || getHarness2() !== "opencode")
+    return sweepOrphanedOpenCodeMessageIndexes2(db, openSource, options);
+  let source = null;
+  let sourcePath = null;
+  try {
+    source = openSource();
+    if (source)
+      sourcePath = getSqliteDatabasePath2(source);
+  } catch {} finally {
+    if (sourcePath)
+      source?.close();
+  }
+  if (!sourcePath)
+    return sweepOrphanedOpenCodeMessageIndexes2(db, () => source, options);
+  const reply = await runSessionWarmupWorker({
+    path,
+    sessionId: "",
+    harness: getHarness2(),
+    orphanSweep: { sourcePath, options }
+  }, {});
+  if (!("orphanSweep" in reply))
+    throw new Error("message history orphan sweep worker failed");
+  return reply.orphanSweep;
+}
 function getMessageIndexQueueHeapStats() {
   return {
     queueLength: heapHolder.reconciliationScheduledSessions.size + heapHolder.incrementalTimers.size + heapHolder.pendingIncrementalKeys.size,
@@ -8629,6 +8690,9 @@ function applyRustModeDeferredCompactionMarker(args) {
   const outcome = (args.applyDeferred ?? applyDeferredCompactionMarker)(args.db, args.sessionId, pending, args.sessionDirectory, trustedBoundary);
   args.afterApply?.(outcome);
   switch (outcome.kind) {
+    case "deferred":
+      sessionLog2(args.sessionId, "rust compaction-marker drain: candidate preparation deferred; pending target retained");
+      break;
     case "applied":
     case "already-current":
     case "stale-skip":
@@ -9839,9 +9903,15 @@ async function runPostTransformPhase(args) {
         sessionLog2(args.sessionId, `compaction-marker drain: refusing ordinal ${pending.ordinal} because prefix trim through ${args.pendingCompartmentInjection?.compartmentEndMessageId ?? "<none>"} was not proven; preserving deferred history refresh signal`);
       } else {
         const tMarkerDrain = performance.now();
-        const outcome = (args.compactionMarkerStrategy ?? defaultCompactionMarkerStrategy).applyDeferred(args.db, args.sessionId, pending, args.sessionDirectory);
+        const strategy = args.compactionMarkerStrategy ?? defaultCompactionMarkerStrategy;
+        const candidatesReady = strategy.applyDeferred !== applyDeferredCompactionMarker || await prepareCompactionMarkerCandidates(args.sessionId);
+        const outcome = candidatesReady ? strategy.applyDeferred(args.db, args.sessionId, pending, args.sessionDirectory) : { kind: "deferred", reason: "candidate-preparation" };
         logTransformTiming(args.sessionId, "pp.markerDrain", tMarkerDrain, `outcome=${outcome.kind}`);
         switch (outcome.kind) {
+          case "deferred":
+            suppressV12HistoryDrain = true;
+            sessionLog2(args.sessionId, "compaction-marker drain: candidate preparation deferred; preserving deferred history refresh signal");
+            break;
           case "applied":
           case "already-current":
           case "stale-skip":
@@ -16123,7 +16193,8 @@ function createRustModeTransform(deps, options) {
         }
         pendingWireCache.nativeOutput = moduleMessages;
         if (!replayedFrozenRepresentation) {
-          if (materializedBoundary && !deps.compactionOff) {
+          if ((materializedBoundary || getPendingCompactionMarkerState(deps.db, sessionId) !== null) && !deps.compactionOff) {
+            await prepareCompactionMarkerCandidates(sessionId);
             try {
               await withAsyncPrivilegedWriter2(deps.db, () => {
                 return;
@@ -19530,7 +19601,7 @@ function getAsyncModule() {
       await beforeModuleLoad();
     const [{ default: singlefileAsyncifyVariant }, { newQuickJSAsyncWASMModuleFromVariant }] = await importPluginModule(() => Promise.all([
       import("./index-6e4mwffh.js").then((m)=>__toESM(m.default,1)),
-      import("./index-69vas84q.js")
+      import("./index-e6xnpach.js")
     ]));
     const module = await newQuickJSAsyncWASMModuleFromVariant(singlefileAsyncifyVariant);
     return module;
@@ -21591,8 +21662,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-5xy7w136.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-f6v698r5.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-v168jwgg.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-a4h2azxa.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -21661,7 +21732,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-yem5422s.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-zcyf8ymw.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -33659,7 +33730,7 @@ async function runMessageHistoryMaintenance(db) {
       log2(`[message-index] pending Rust session cleanup: cleared=${rustCleanup.cleared} failed=${rustCleanup.failedSessionIds.length}`);
     }
   }
-  const sweep = sweepOrphanedOpenCodeMessageIndexes(db, openOpenCodeDb);
+  const sweep = await sweepOrphanedOpenCodeMessageIndexesOffThread(db, openOpenCodeDb);
   if (sweep.reason)
     log2(`[message-index] orphan sweep parked: ${sweep.reason}`);
   if (sweep.deleted > 0) {
@@ -48429,7 +48500,7 @@ function singleLine(value) {
 // src/tools/ctx-note/tools.ts
 function captureAnchorOrdinal(db, sessionId) {
   try {
-    const ordinal = getLastIndexedOrdinal(db, sessionId);
+    const ordinal = getLastIndexedOrdinal2(db, sessionId);
     return ordinal > 0 ? ordinal : null;
   } catch {
     return null;

package/dist/v2/{embedding-backfill-dbvjbcmm.js → embedding-backfill-9hbkfvnz.js}

@@ -1,18 +1,18 @@
 import {
   ensureMemoryEmbeddings2
-} from "./server-kh958yj8.js";
-import"./server-1fszbabv.js";
-import"./server-s2st631p.js";
+} from "./server-5zrpr764.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-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 {