@cortexkit/opencode-magic-context 0.49.26 → 0.49.27

package/dist/{index-56tfs78r.js → index-qzbpbnqt.js}

@@ -144,11 +144,11 @@ import {
   getDroppedTagsByNumbers2,
   getMaxDroppedTagNumber2,
   getTagById2
-} from "./index-whcgcfrv.js";
+} from "./index-np3rgfw4.js";
 import {
   observeTemporalDecisions,
   stableStringify
-} from "./index-x9k3mqrf.js";
+} from "./index-xrnsygfq.js";
 import {
   withContentLanguageDirective,
   parseCron,
@@ -169,7 +169,7 @@ import {
   buildInMemoryTailRawMessages2,
   RawOrdinalsNotReady2,
   runSessionWarmupWorker
-} from "./index-m8va3mma.js";
+} from "./index-rverk2vz.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
@@ -177,7 +177,7 @@ import {
   latestPersistedMessageForRecovery,
   latestRealUserTurnIdFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./index-j43m40zd.js";
+} from "./index-v0dhhxsq.js";
 import {
   expandToolPart,
   askAnswerLines,
@@ -302,11 +302,11 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./index-dn2ke3b9.js";
+} from "./index-yzjhx10y.js";
 import {
   BoundedSessionMap,
   getMeasuredToolDefinitionTokens
-} from "./index-cfaet9cg.js";
+} from "./index-s1n8dd2n.js";
 import {
   isFailClosedBlockingError,
   shouldBypassFailClosedBlock,
@@ -320,7 +320,7 @@ import {
   runSqliteOptimize,
   openDatabase,
   openCurrentDatabase
-} from "./index-6g1zq1sk.js";
+} from "./index-4cpc59jv.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
@@ -339,7 +339,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./index-9q1g3c5q.js";
+} from "./index-7kkphb6c.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -368,6 +368,15 @@ import {
   getLastCompartmentEndMessage,
   getLastCompartmentEndMessageId,
   providerResponseFailed,
+  LkgRecoveryFenceError,
+  lkgServedArrayDigest,
+  hasCleanLkgRecoveryFence,
+  dirtyLkgRecoveryRevision,
+  ownsLkgDirtyFence,
+  invalidateCleanLkgRecoveryFence,
+  prepareLkgCaptureFence,
+  certifyCommittedLkgCapture,
+  markLkgRecoveryDirty,
   getOrCreateSessionMeta,
   updateSessionMeta,
   retryPendingSessionCleanups,
@@ -495,6 +504,7 @@ import {
   readCoordinateRebaseNotice,
   formatCoordinateRebaseNotice,
   rebaseSessionCoordinatesAsync,
+  shouldWaitForNewHistorianHistory,
   EMPTY_READ_REPLY,
   noteTouchedAt,
   renderGlance,
@@ -515,7 +525,7 @@ import {
   snapRangeToCompartments,
   getActiveCompartmentRun,
   startCompartmentAgent
-} from "./index-hjnrp6vy.js";
+} from "./index-dcqk0y27.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -543,7 +553,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-sgchhbvy.js";
+} from "./index-a2fz9hpa.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -553,27 +563,15 @@ import {
   SynapseEmbeddingProvider
 } from "./index-wfybj1dw.js";
 import {
-  LkgRecoveryFenceError,
-  lkgServedArrayDigest,
-  takeLkgRecoveryLockSweepPage,
-  hasCleanLkgRecoveryFence,
-  dirtyLkgRecoveryRevision,
-  ownsLkgDirtyFence,
-  invalidateCleanLkgRecoveryFence,
-  prepareLkgCaptureFence,
-  certifyCommittedLkgCapture,
-  markLkgRecoveryDirty,
-  gaDatabasePath,
-  getMessageIndexSourceIdentity2,
-  isMessageIndexSourceCurrent2,
-  getLastIndexedOrdinal2,
-  getMessageIndexReconciliationStartOrdinal2,
-  isMessageIndexReconciledThrough2,
-  clearIndexedMessages2,
-  indexSingleMessage2,
-  indexMessagesAfterOrdinal2,
-  sweepOrphanedOpenCodeMessageIndexesCooperatively2
-} from "./index-40ma8m0c.js";
+  getMessageIndexSourceIdentity,
+  isMessageIndexSourceCurrent,
+  getLastIndexedOrdinal,
+  getMessageIndexReconciliationStartOrdinal,
+  isMessageIndexReconciledThrough,
+  clearIndexedMessages,
+  indexSingleMessage,
+  indexMessagesAfterOrdinal
+} from "./index-7gbcg8xv.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode,
@@ -617,7 +615,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./index-mphkpyap.js";
+} from "./index-t3rbb8wr.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -637,7 +635,7 @@ import {
 } from "./index-4dhv7mqz.js";
 import {
   cosineSimilarity
-} from "./index-e5b61ty6.js";
+} from "./index-4ypqzvhf.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -683,17 +681,17 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./index-r3bteyev.js";
+} from "./index-dzfevacx.js";
 import {
   flushIgnoredMessages2,
   clearIgnoredMessages2,
   observeIgnoredNotificationEvent2,
   sendStatusNotification2
-} from "./index-w55zp7kf.js";
+} from "./index-077ht5cq.js";
 import {
   setRecompStarting2,
   setRecompTerminal2
-} from "./index-va2g2q57.js";
+} from "./index-n8qmmd7f.js";
 import {
   makeToolCompositeKey,
   searchMessageHistoryOffThread,
@@ -755,7 +753,7 @@ import {
   abortSessionFailClosed2,
   evaluateEmergencyFailClosed2,
   runPostTransformPhase2
-} from "./index-rp78nqvr.js";
+} from "./index-fq2p158w.js";
 import {
   ANNOUNCEMENT_VERSION2,
   ANNOUNCEMENT_FEATURES2,
@@ -768,7 +766,7 @@ import {
 } from "./index-fmsr7v69.js";
 import {
   renderSearchArchiveOffThread2
-} from "./index-zn2n24yr.js";
+} from "./index-89k1w6x2.js";
 import {
   COMPACTION_ENABLED_PATH,
   isDreamerRunnable,
@@ -9065,6 +9063,21 @@ function verifyAssistantText(messages) {
   const start = text.lastIndexOf("<verify>");
   return start >= 0 ? text.slice(start) : text;
 }
+function validateVerifyCompletion(messages, text, expectedIds, responseText = text) {
+  let parsed;
+  try {
+    parsed = validateVerifyManifest(text, expectedIds);
+  } catch (error) {
+    throw providerOutputFailureFromInvalidManifest(messages, responseText) ?? error;
+  }
+  const ids = [...parsed.verified, ...parsed.updated, ...parsed.archived, ...parsed.skipped].map((entry) => entry.id);
+  if (ids.length !== expectedIds.size || ids.some((id) => !expectedIds.has(id))) {
+    const providerFailure = providerOutputFailureFromInvalidManifest(messages, responseText);
+    if (providerFailure)
+      throw providerFailure;
+  }
+  return parsed;
+}
 var IDENTICAL_PROVIDER_FAILURE_BATCH_LIMIT = 2;
 var VERIFY_BATCH_FLOOR_MS = 30000;
 function computeVerifyBatchSliceMs(remainingMs, _batchesRemaining) {
@@ -9223,6 +9236,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
   const timer = setTimeout(() => batchController.abort(new Error(`verify slice timed out after ${sliceMs}ms`)), sliceMs);
   const batchSignal = batchController.signal;
   const tokenBudget = verifyBatchTokenBudget(batch.length, args.tokenBudget);
+  const expectedIds = new Set(batch.map((memory) => memory.id));
   let agentSessionId = null;
   let hiddenSessionId = null;
   let promptSettled = false;
@@ -9275,13 +9289,10 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
           onBudgetUpdate({ spent: 0, finalizeFired: false, sessionId });
         },
         parse: (text, completion) => {
-          const providerFailure = providerOutputFailureFromInvalidManifest(completion.messages ?? [], text);
-          if (providerFailure)
-            throw providerFailure;
           const manifest = verifyAssistantText(completion.messages ?? []) ?? (text.trim() ? text : null);
           if (!manifest)
             throw new Error("verify returned no output");
-          return validateVerifyManifest(manifest, new Set(batch.map((memory) => memory.id)));
+          return validateVerifyCompletion(completion.messages ?? [], manifest, expectedIds, text);
         }
       });
       recordInvocation4(args, startedAt, {
@@ -9343,10 +9354,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         const text = verifyAssistantText(messages);
         if (!text)
           throw new Error("verify returned no output");
-        const providerFailure = providerOutputFailureFromInvalidManifest(messages, text);
-        if (providerFailure)
-          throw providerFailure;
-        return validateVerifyManifest(text, new Set(batch.map((memory) => memory.id)));
+        return validateVerifyCompletion(messages, text, expectedIds);
       }
     });
     promptSettled = true;
@@ -11469,471 +11477,92 @@ function clearDreamerTickFailure(db) {
   db.prepare("DELETE FROM schema_migrations_meta WHERE key = ?").run(DREAMER_TICK_FAILURE_KEY);
 }
 
-// src/features/magic-context/message-index-async.ts
-var indexCancellations = new Map;
-var sessionEpochs = new Map;
-var workerMeasurements = new WeakMap;
-function isDatabaseLockedError(error) {
-  if (!error || typeof error !== "object")
+// src/plugin/dream-timer.ts
+var DREAM_TIMER_INTERVAL_MS = 15 * 60 * 1000;
+var GIT_COMMIT_BACKLOG_DRAIN_MAX_MS = 5 * 60 * 1000;
+var BOOT_PROJECT_JITTER_SLOT_MS = 1000;
+var activeTimer = null;
+var tickInFlight = false;
+var startupTickTimer = null;
+var startupTimers = new Map;
+var startupJitters = new Map;
+var nextStartupJitterSlot = 0;
+function directoryStillExists(directory) {
+  try {
+    return statSync2(directory).isDirectory();
+  } catch {
     return false;
-  const e = error;
-  if (typeof e.code === "string") {
-    if (e.code === "SQLITE_BUSY" || e.code === "SQLITE_LOCKED")
-      return true;
-  }
-  if (typeof e.message === "string") {
-    if (/database is locked/i.test(e.message))
-      return true;
-    if (/sqlite_(busy|locked)/i.test(e.message))
-      return true;
   }
-  return false;
-}
-var INCREMENTAL_DEBOUNCE_MS = 100;
-var RECONCILIATION_BATCH_SIZE = 100;
-
-class MagicContextMessageIndexHeapHolder {
-  reconciledSessions = new Set;
-  reconciledSnapshots = new Map;
-  stalledSessions = new Set;
-  reconciliationScheduledSessions = new Set;
-  clearAndReindexScheduledSessions = new Map;
-  sessionLocks = new Map;
-  incrementalTimers = new Map;
-  pendingIncrementalKeys = new Set;
-  completedIncrementalKeys = new Set;
-  activeReconcilerBuffers = new Map;
 }
-var heapHolder = new MagicContextMessageIndexHeapHolder;
-function clearCompletedIncrementalKeys(sessionId) {
-  const prefix = `${sessionId}\x00`;
-  for (const key of heapHolder.completedIncrementalKeys) {
-    if (key.startsWith(prefix))
-      heapHolder.completedIncrementalKeys.delete(key);
+function openTimerDatabaseOrNull(context) {
+  let db;
+  try {
+    db = openCurrentDatabase();
+  } catch (error) {
+    log2(`[dreamer] storage fatal; skipping ${context}: ${getErrorMessage(error)}`);
+    return null;
   }
-}
-var PREPARE_RETRY_MS = 60000;
-async function sourceReady(source, sessionId) {
-  const prepare = source?.prepare;
-  return typeof prepare === "function" ? prepare(sessionId) : true;
-}
-function defer(fn) {
-  const immediate = globalThis.setImmediate;
-  if (typeof immediate === "function") {
-    inRootAsyncContext2(() => immediate(fn));
-    return;
+  if (!db) {
+    log2(`[dreamer] storage unavailable; skipping ${context} (the cache schema is newer than this binary supports — restart/upgrade OpenCode/Pi/Magic Context to recover)`);
+    return null;
   }
-  inRootAsyncContext2(() => setTimeout(fn, 0));
-}
-function yieldToEventLoop() {
-  return new Promise((resolve) => defer(resolve));
+  return db;
 }
-function runWithSessionLock(sessionId, operation) {
-  const previous = heapHolder.sessionLocks.get(sessionId) ?? Promise.resolve();
-  const run = previous.catch(() => {
-    return;
-  }).then(async () => {
-    await operation();
-  });
-  heapHolder.sessionLocks.set(sessionId, run);
-  run.finally(() => {
-    if (heapHolder.sessionLocks.get(sessionId) === run) {
-      heapHolder.sessionLocks.delete(sessionId);
-    }
-  }).catch(() => {
+var refusedEmptyIdentityDirectories = new Set;
+function logEmptyIdentityRefusalOnce(directory) {
+  if (refusedEmptyIdentityDirectories.has(directory))
     return;
-  });
-  return run;
+  refusedEmptyIdentityDirectories.add(directory);
+  log2(`[dreamer] not registering ${directory}: it has no project identity, so no project-scoped work runs for it`);
 }
-function logIndexingError(sessionId, action, error) {
-  if (isDatabaseLockedError(error)) {
-    sessionLog2(sessionId, `message FTS async ${action} skipped (database busy; will retry on next reconciliation)`);
+var registeredProjects = new Map;
+function stopDreamScheduleTimerIfIdle() {
+  if (registeredProjects.size !== 0)
     return;
+  const stopped = activeTimer !== null || startupTickTimer !== null;
+  if (activeTimer) {
+    clearInterval(activeTimer);
+    activeTimer = null;
   }
-  sessionLog2(sessionId, `message FTS async ${action} failed: ${error instanceof Error ? error.message : String(error)}`);
-  log2(`[message-index-async] ${action} failed for ${sessionId}:`, error);
-}
-function serializedMessageBytes(messages) {
-  try {
-    return Buffer.byteLength(JSON.stringify(messages));
-  } catch {
-    return 0;
+  if (startupTickTimer) {
+    clearTimeout(startupTickTimer);
+    startupTickTimer = null;
   }
+  startupJitters.clear();
+  nextStartupJitterSlot = 0;
+  if (stopped)
+    log2("[dreamer] stopped dream schedule timer (no projects left)");
 }
-function logReconciliationStall(sessionId, reason) {
-  if (heapHolder.stalledSessions.has(sessionId))
+async function startDreamScheduleTimer(args) {
+  if (!isUsableProjectIdentity(args.projectIdentity)) {
+    logEmptyIdentityRefusalOnce(args.directory);
     return;
-  heapHolder.stalledSessions.add(sessionId);
-  sessionLog2(sessionId, `message FTS reconciliation stalled: ${reason}; will retry`);
-}
-async function reconcileSessionIndex(db, sessionId, readMessages) {
-  if (!await sourceReady(readMessages, sessionId)) {
-    logReconciliationStall(sessionId, "raw message reader is not ready");
-    return false;
   }
-  await runWithSessionLock(sessionId, async () => {
-    if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId))
-      return;
-    let fallbackSnapshot = null;
-    try {
-      const fullReader = typeof readMessages === "function" ? readMessages : null;
-      const revision = readMessages.getRevision?.(sessionId);
-      const previous = heapHolder.reconciledSnapshots.get(sessionId);
-      const finalWatermark = previous && revision === previous.revision ? previous.count : revision !== undefined && readMessages.getCountAfterRevision ? previous && revision > previous.revision ? previous.count + readMessages.getCountAfterRevision(sessionId, previous.revision, revision) : readMessages.getCountAfterRevision(sessionId, -1, revision) : readMessages.getCount ? readMessages.getCount(sessionId) : (fallbackSnapshot = fullReader?.(sessionId) ?? []).length;
-      let cursor = getMessageIndexReconciliationStartOrdinal2(db, sessionId);
-      let after = cursor === previous?.count ? previous.after : undefined;
-      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(() => indexMessagesAfterOrdinal2(db, sessionId, messages, cursor, pageEnd));
-        const nextCursor = getMessageIndexReconciliationStartOrdinal2(db, sessionId);
-        if (nextCursor <= cursor)
-          break;
-        cursor = nextCursor;
-        const last = messages.at(-1);
-        after = last?.ordinal === cursor && typeof last.createdAt === "number" ? { timeCreated: last.createdAt, id: last.id } : undefined;
-        if (cursor < finalWatermark) {
-          await yieldToEventLoop();
-        }
-      }
-      if (isMessageIndexReconciledThrough2(db, sessionId, finalWatermark)) {
-        heapHolder.reconciledSessions.add(sessionId);
-        if (revision !== undefined) {
-          if (!after && finalWatermark > 0 && readMessages.readPage) {
-            const last = readMessages.readPage(sessionId, finalWatermark - 1, 1, finalWatermark).at(-1);
-            if (last?.ordinal === finalWatermark && typeof last.createdAt === "number")
-              after = { timeCreated: last.createdAt, id: last.id };
-          }
-          heapHolder.reconciledSnapshots.set(sessionId, {
-            revision,
-            count: finalWatermark,
-            after
-          });
-        }
-      } else {
-        logReconciliationStall(sessionId, `gap after ordinal ${cursor} (store count ${finalWatermark})`);
-      }
-    } finally {
-      heapHolder.activeReconcilerBuffers.delete(sessionId);
-    }
-  });
-  return true;
-}
-function scheduleReconciliation(db, sessionId, readMessages) {
-  if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId) || heapHolder.reconciliationScheduledSessions.has(sessionId)) {
+  beginBootQuietPeriod();
+  const db = openTimerDatabaseOrNull("schedule timer registration");
+  if (!db)
     return;
+  const dreamingEnabled = Boolean(args.dreamerConfig && args.dreamerConfig.disable !== true);
+  const embeddingSweepEnabled = args.memoryEnabled === true;
+  const commitIndexingEnabled = args.gitCommitIndexing?.enabled === true;
+  const previousRegistration = registeredProjects.get(args.directory);
+  const isNewRegistration = previousRegistration === undefined;
+  if (previousRegistration && previousRegistration !== args) {
+    const pendingStartup = startupTimers.get(args.directory);
+    if (pendingStartup) {
+      clearTimeout(pendingStartup);
+      startupTimers.delete(args.directory);
+    }
   }
-  heapHolder.reconciliationScheduledSessions.add(sessionId);
-  scheduleAfterBootQuiet(() => {
-    defer(() => {
-      let appendedDuringReconciliation = false;
-      const previousSnapshot = heapHolder.reconciledSnapshots.get(sessionId);
-      reconcileSessionIndex(db, sessionId, readMessages).then((ran) => {
-        if (ran) {
-          const snapshot = heapHolder.reconciledSnapshots.get(sessionId);
-          appendedDuringReconciliation = snapshot !== undefined && snapshot !== previousSnapshot && readMessages.getRevision !== undefined && readMessages.getRevision(sessionId) !== snapshot.revision;
-          return;
-        }
-        inRootAsyncContext2(() => setTimeout(() => {
-          heapHolder.reconciliationScheduledSessions.delete(sessionId);
-          scheduleReconciliation(db, sessionId, readMessages);
-        }, PREPARE_RETRY_MS)).unref?.();
-      }).catch((error) => {
-        logReconciliationStall(sessionId, error instanceof Error ? error.message : String(error));
-        if (isDatabaseLockedError(error))
-          inRootAsyncContext2(() => setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000)).unref();
-      }).finally(() => {
-        heapHolder.reconciliationScheduledSessions.delete(sessionId);
-        if (appendedDuringReconciliation)
-          scheduleReconciliation(db, sessionId, readMessages);
-      });
-    });
-  });
-}
-function scheduleIncrementalIndex(db, sessionId, messageId, messageSource) {
-  const schedulingKey = `${sessionId}\x00${messageId}`;
-  const epoch = sessionEpochs.get(sessionId) ?? 0;
-  if (heapHolder.pendingIncrementalKeys.has(schedulingKey))
-    return;
-  const activeTimer = heapHolder.incrementalTimers.get(schedulingKey);
-  if (activeTimer)
-    clearTimeout(activeTimer);
-  const timer = inRootAsyncContext2(() => setTimeout(() => {
-    heapHolder.incrementalTimers.delete(schedulingKey);
-    heapHolder.pendingIncrementalKeys.add(schedulingKey);
-    const indexMessage = async () => {
-      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch || !heapHolder.pendingIncrementalKeys.has(schedulingKey))
-        return;
-      const message = typeof messageSource === "function" ? messageSource(sessionId, messageId) : messageSource;
-      if (!message)
-        return;
-      const revisionKey = `${schedulingKey}\x00${getMessageIndexSourceIdentity2(message)}`;
-      if (heapHolder.completedIncrementalKeys.has(revisionKey))
-        return;
-      const currentWatermark = getLastIndexedOrdinal2(db, sessionId);
-      if (message.ordinal <= currentWatermark && isMessageIndexSourceCurrent2(db, sessionId, message)) {
-        heapHolder.completedIncrementalKeys.add(revisionKey);
-        return;
-      }
-      const wasReconciled = heapHolder.reconciledSessions.delete(sessionId);
-      await indexSingleMessageOffThread(db, sessionId, message);
-      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch || !heapHolder.pendingIncrementalKeys.has(schedulingKey))
-        return;
-      const finalWatermark = getLastIndexedOrdinal2(db, sessionId);
-      if (wasReconciled && isMessageIndexReconciledThrough2(db, sessionId, finalWatermark)) {
-        heapHolder.reconciledSessions.add(sessionId);
-      }
-      heapHolder.completedIncrementalKeys.add(revisionKey);
-    };
-    sourceReady(messageSource, sessionId).then((ready) => {
-      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch)
-        return;
-      if (ready)
-        return runWithSessionLock(sessionId, indexMessage);
-      setTimeout(() => scheduleIncrementalIndex(db, sessionId, messageId, messageSource), PREPARE_RETRY_MS).unref?.();
-    }).catch((error) => {
-      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch)
-        return;
-      heapHolder.reconciledSessions.delete(sessionId);
-      logIndexingError(sessionId, `incremental index for ${messageId}`, error);
-      if (isDatabaseLockedError(error))
-        setTimeout(() => scheduleIncrementalIndex(db, sessionId, messageId, messageSource), 1000).unref();
-    }).finally(() => {
-      if ((sessionEpochs.get(sessionId) ?? 0) === epoch)
-        heapHolder.pendingIncrementalKeys.delete(schedulingKey);
-    });
-  }, INCREMENTAL_DEBOUNCE_MS));
-  heapHolder.incrementalTimers.set(schedulingKey, timer);
-}
-async function indexSingleMessageOffThread(db, sessionId, message) {
-  const path = getSqliteDatabasePath2(db);
-  if (!path)
-    return withSqliteBackgroundWriter2(() => indexSingleMessage2(db, sessionId, message));
-  const cancellation = new Int32Array(new SharedArrayBuffer(4));
-  const active = indexCancellations.get(sessionId) ?? new Set;
-  active.add(cancellation);
-  indexCancellations.set(sessionId, active);
-  const result = await runSessionWarmupWorker({
-    path,
-    sessionId,
-    indexMessage: message,
-    harness: getHarness2(),
-    indexCancellation: cancellation.buffer,
-    ...indexCoordinationInput2()
-  }, {}).finally(() => {
-    active.delete(cancellation);
-    if (active.size === 0)
-      indexCancellations.delete(sessionId);
-  });
-  if (!("inserted" in result))
-    throw new Error("failure" in result ? result.detail : "unexpected indexing worker reply");
-  if (result.measurements) {
-    const sessions = workerMeasurements.get(db) ?? new Map;
-    sessions.set(sessionId, result.measurements);
-    workerMeasurements.set(db, sessions);
-    if (result.measurements.skipped)
-      log2(`[magic-context] incremental FTS skipped oversized source ${message.id} (${result.measurements.sourceBytes} bytes); identity and progress persisted`);
-  }
-  return result.inserted;
-}
-async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, options = {}) {
-  if (getHarness2() === "opencode" || getHarness2() === "opencode2")
-    options = {
-      ...options,
-      fenceLockNames: options.fenceLockNames ?? takeLkgRecoveryLockSweepPage()
-    };
-  if (getHarness2() === "opencode2")
-    openSource = () => new Database2(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"), {
-      readonly: true,
-      fileMustExist: true
-    });
-  const path = getSqliteDatabasePath2(db);
-  if (!path || getHarness2() !== "opencode" && getHarness2() !== "opencode2")
-    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(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 sweepOrphanedOpenCodeMessageIndexesCooperatively2(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 scheduleClearAndReindex(db, sessionId, readMessages) {
-  heapHolder.reconciledSessions.delete(sessionId);
-  heapHolder.reconciledSnapshots.delete(sessionId);
-  heapHolder.reconciliationScheduledSessions.delete(sessionId);
-  clearCompletedIncrementalKeys(sessionId);
-  const existing = heapHolder.clearAndReindexScheduledSessions.get(sessionId);
-  if (existing) {
-    existing.source = readMessages;
-    return;
-  }
-  const pending = { source: readMessages };
-  heapHolder.clearAndReindexScheduledSessions.set(sessionId, pending);
-  scheduleAfterBootQuiet(() => {
-    defer(() => {
-      let cleared = false;
-      runWithSessionLock(sessionId, () => {
-        if (heapHolder.clearAndReindexScheduledSessions.get(sessionId) !== pending)
-          return;
-        heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
-        heapHolder.reconciledSessions.delete(sessionId);
-        heapHolder.reconciledSnapshots.delete(sessionId);
-        clearCompletedIncrementalKeys(sessionId);
-        clearIndexedMessages2(db, sessionId);
-        cleared = true;
-      }).then(() => cleared ? reconcileSessionIndex(db, sessionId, pending.source) : undefined).catch((error) => {
-        heapHolder.reconciledSessions.delete(sessionId);
-        if (heapHolder.clearAndReindexScheduledSessions.get(sessionId) === pending)
-          heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
-        logIndexingError(sessionId, "clear and reindex", error);
-      });
-    });
-  });
-}
-function getMessageIndexQueueHeapStats() {
-  return {
-    queueLength: heapHolder.reconciliationScheduledSessions.size + heapHolder.incrementalTimers.size + heapHolder.pendingIncrementalKeys.size,
-    reconciliationScheduled: heapHolder.reconciliationScheduledSessions.size,
-    incrementalTimers: heapHolder.incrementalTimers.size,
-    pendingIncremental: heapHolder.pendingIncrementalKeys.size,
-    activeSessionLocks: heapHolder.sessionLocks.size,
-    completedIncrementalKeys: heapHolder.completedIncrementalKeys.size,
-    activeBufferMessages: [...heapHolder.activeReconcilerBuffers.values()].reduce((sum, messages) => sum + messages.length, 0),
-    activeBufferBytes: [...heapHolder.activeReconcilerBuffers.values()].reduce((sum, messages) => sum + serializedMessageBytes(messages), 0)
-  };
-}
-function clearSessionTracking(sessionId) {
-  sessionEpochs.set(sessionId, (sessionEpochs.get(sessionId) ?? 0) + 1);
-  for (const cancellation of indexCancellations.get(sessionId) ?? [])
-    Atomics.store(cancellation, 0, 1);
-  heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
-  heapHolder.reconciledSessions.delete(sessionId);
-  heapHolder.reconciledSnapshots.delete(sessionId);
-  heapHolder.stalledSessions.delete(sessionId);
-  heapHolder.reconciliationScheduledSessions.delete(sessionId);
-  heapHolder.sessionLocks.delete(sessionId);
-  heapHolder.activeReconcilerBuffers.delete(sessionId);
-  const prefix = `${sessionId}\x00`;
-  for (const [key, timer] of heapHolder.incrementalTimers) {
-    if (key.startsWith(prefix)) {
-      clearTimeout(timer);
-      heapHolder.incrementalTimers.delete(key);
-    }
-  }
-  for (const key of heapHolder.pendingIncrementalKeys) {
-    if (key.startsWith(prefix)) {
-      heapHolder.pendingIncrementalKeys.delete(key);
-    }
-  }
-  for (const key of heapHolder.completedIncrementalKeys) {
-    if (key.startsWith(prefix))
-      heapHolder.completedIncrementalKeys.delete(key);
-  }
-}
-
-// src/plugin/dream-timer.ts
-var DREAM_TIMER_INTERVAL_MS = 15 * 60 * 1000;
-var GIT_COMMIT_BACKLOG_DRAIN_MAX_MS = 5 * 60 * 1000;
-var BOOT_PROJECT_JITTER_SLOT_MS = 1000;
-var activeTimer = null;
-var tickInFlight = false;
-var startupTickTimer = null;
-var startupTimers = new Map;
-var startupJitters = new Map;
-var nextStartupJitterSlot = 0;
-function directoryStillExists(directory) {
-  try {
-    return statSync2(directory).isDirectory();
-  } catch {
-    return false;
-  }
-}
-function openTimerDatabaseOrNull(context) {
-  let db;
-  try {
-    db = openCurrentDatabase();
-  } catch (error) {
-    log2(`[dreamer] storage fatal; skipping ${context}: ${getErrorMessage(error)}`);
-    return null;
-  }
-  if (!db) {
-    log2(`[dreamer] storage unavailable; skipping ${context} (the cache schema is newer than this binary supports — restart/upgrade OpenCode/Pi/Magic Context to recover)`);
-    return null;
-  }
-  return db;
-}
-var refusedEmptyIdentityDirectories = new Set;
-function logEmptyIdentityRefusalOnce(directory) {
-  if (refusedEmptyIdentityDirectories.has(directory))
-    return;
-  refusedEmptyIdentityDirectories.add(directory);
-  log2(`[dreamer] not registering ${directory}: it has no project identity, so no project-scoped work runs for it`);
-}
-var registeredProjects = new Map;
-function stopDreamScheduleTimerIfIdle() {
-  if (registeredProjects.size !== 0)
-    return;
-  const stopped = activeTimer !== null || startupTickTimer !== null;
-  if (activeTimer) {
-    clearInterval(activeTimer);
-    activeTimer = null;
-  }
-  if (startupTickTimer) {
-    clearTimeout(startupTickTimer);
-    startupTickTimer = null;
-  }
-  startupJitters.clear();
-  nextStartupJitterSlot = 0;
-  if (stopped)
-    log2("[dreamer] stopped dream schedule timer (no projects left)");
-}
-async function startDreamScheduleTimer(args) {
-  if (!isUsableProjectIdentity(args.projectIdentity)) {
-    logEmptyIdentityRefusalOnce(args.directory);
-    return;
-  }
-  beginBootQuietPeriod();
-  const db = openTimerDatabaseOrNull("schedule timer registration");
-  if (!db)
-    return;
-  const dreamingEnabled = Boolean(args.dreamerConfig && args.dreamerConfig.disable !== true);
-  const embeddingSweepEnabled = args.memoryEnabled === true;
-  const commitIndexingEnabled = args.gitCommitIndexing?.enabled === true;
-  const previousRegistration = registeredProjects.get(args.directory);
-  const isNewRegistration = previousRegistration === undefined;
-  if (previousRegistration && previousRegistration !== args) {
-    const pendingStartup = startupTimers.get(args.directory);
-    if (pendingStartup) {
-      clearTimeout(pendingStartup);
-      startupTimers.delete(args.directory);
-    }
-  }
-  registeredProjects.set(args.directory, args);
-  if (isNewRegistration) {
-    log2(`[dreamer] registered project ${args.projectIdentity} (dreaming=${dreamingEnabled} embeddings=${embeddingSweepEnabled} commits=${commitIndexingEnabled}; total=${registeredProjects.size})`);
-  }
-  if (!activeTimer) {
-    log2(`[dreamer] started independent schedule timer (every ${DREAM_TIMER_INTERVAL_MS / 60000}m)`);
-    startupTickTimer = scheduleAfterBootQuiet(() => {
-      startupTickTimer = null;
-      runTick("startup");
+  registeredProjects.set(args.directory, args);
+  if (isNewRegistration) {
+    log2(`[dreamer] registered project ${args.projectIdentity} (dreaming=${dreamingEnabled} embeddings=${embeddingSweepEnabled} commits=${commitIndexingEnabled}; total=${registeredProjects.size})`);
+  }
+  if (!activeTimer) {
+    log2(`[dreamer] started independent schedule timer (every ${DREAM_TIMER_INTERVAL_MS / 60000}m)`);
+    startupTickTimer = scheduleAfterBootQuiet(() => {
+      startupTickTimer = null;
+      runTick("startup");
     });
     const timer = inRootAsyncContext2(() => setInterval(() => runTick("interval"), DREAM_TIMER_INTERVAL_MS));
     if (typeof timer === "object" && "unref" in timer) {
@@ -12043,12 +11672,6 @@ async function runMessageHistoryMaintenance(db) {
       log2(`[message-index] pending Rust session cleanup: cleared=${rustCleanup.cleared} failed=${rustCleanup.failedSessionIds.length}`);
     }
   }
-  const sweep = await sweepOrphanedOpenCodeMessageIndexesOffThread(db, openOpenCodeDb);
-  if (sweep.reason)
-    log2(`[message-index] orphan sweep parked: ${sweep.reason}`);
-  if (sweep.deleted > 0) {
-    log2(`[message-index] orphan sweep: scanned=${sweep.scanned} deleted=${sweep.deleted} cursor=${sweep.cursor || "<complete>"}`);
-  }
 }
 function startupJitterMs(directory) {
   const existing = startupJitters.get(directory);
@@ -13141,12 +12764,355 @@ function getActiveMemoryImportanceHistogram(db, projectPath) {
   };
 }
 
-// src/features/magic-context/session-cache-ttl.ts
-function readSessionCacheTtl(db, sessionId) {
-  const saved = readReplayEnvelope(db, sessionId).cacheTtlPolicy;
-  return saved && typeof saved.value === "string" && saved.config !== undefined ? saved : undefined;
-}
-function resolveSessionCacheTtl(db, sessionId, config, modelKey, configuredExplicitly) {
+// src/features/magic-context/message-index-async.ts
+var indexCancellations = new Map;
+var sessionEpochs = new Map;
+var workerMeasurements = new WeakMap;
+function isDatabaseLockedError(error) {
+  if (!error || typeof error !== "object")
+    return false;
+  const e = error;
+  if (typeof e.code === "string") {
+    if (e.code === "SQLITE_BUSY" || e.code === "SQLITE_LOCKED")
+      return true;
+  }
+  if (typeof e.message === "string") {
+    if (/database is locked/i.test(e.message))
+      return true;
+    if (/sqlite_(busy|locked)/i.test(e.message))
+      return true;
+  }
+  return false;
+}
+var INCREMENTAL_DEBOUNCE_MS = 100;
+var RECONCILIATION_BATCH_SIZE = 100;
+
+class MagicContextMessageIndexHeapHolder {
+  reconciledSessions = new Set;
+  reconciledSnapshots = new Map;
+  stalledSessions = new Set;
+  reconciliationScheduledSessions = new Set;
+  clearAndReindexScheduledSessions = new Map;
+  sessionLocks = new Map;
+  incrementalTimers = new Map;
+  pendingIncrementalKeys = new Set;
+  completedIncrementalKeys = new Set;
+  activeReconcilerBuffers = new Map;
+}
+var heapHolder = new MagicContextMessageIndexHeapHolder;
+function clearCompletedIncrementalKeys(sessionId) {
+  const prefix = `${sessionId}\x00`;
+  for (const key of heapHolder.completedIncrementalKeys) {
+    if (key.startsWith(prefix))
+      heapHolder.completedIncrementalKeys.delete(key);
+  }
+}
+var PREPARE_RETRY_MS = 60000;
+async function sourceReady(source, sessionId) {
+  const prepare = source?.prepare;
+  return typeof prepare === "function" ? prepare(sessionId) : true;
+}
+function defer(fn) {
+  const immediate = globalThis.setImmediate;
+  if (typeof immediate === "function") {
+    inRootAsyncContext2(() => immediate(fn));
+    return;
+  }
+  inRootAsyncContext2(() => setTimeout(fn, 0));
+}
+function yieldToEventLoop() {
+  return new Promise((resolve) => defer(resolve));
+}
+function runWithSessionLock(sessionId, operation) {
+  const previous = heapHolder.sessionLocks.get(sessionId) ?? Promise.resolve();
+  const run = previous.catch(() => {
+    return;
+  }).then(async () => {
+    await operation();
+  });
+  heapHolder.sessionLocks.set(sessionId, run);
+  run.finally(() => {
+    if (heapHolder.sessionLocks.get(sessionId) === run) {
+      heapHolder.sessionLocks.delete(sessionId);
+    }
+  }).catch(() => {
+    return;
+  });
+  return run;
+}
+function logIndexingError(sessionId, action, error) {
+  if (isDatabaseLockedError(error)) {
+    sessionLog2(sessionId, `message FTS async ${action} skipped (database busy; will retry on next reconciliation)`);
+    return;
+  }
+  sessionLog2(sessionId, `message FTS async ${action} failed: ${error instanceof Error ? error.message : String(error)}`);
+  log2(`[message-index-async] ${action} failed for ${sessionId}:`, error);
+}
+function serializedMessageBytes(messages) {
+  try {
+    return Buffer.byteLength(JSON.stringify(messages));
+  } catch {
+    return 0;
+  }
+}
+function logReconciliationStall(sessionId, reason) {
+  if (heapHolder.stalledSessions.has(sessionId))
+    return;
+  heapHolder.stalledSessions.add(sessionId);
+  sessionLog2(sessionId, `message FTS reconciliation stalled: ${reason}; will retry`);
+}
+async function reconcileSessionIndex(db, sessionId, readMessages) {
+  if (!await sourceReady(readMessages, sessionId)) {
+    logReconciliationStall(sessionId, "raw message reader is not ready");
+    return false;
+  }
+  await runWithSessionLock(sessionId, async () => {
+    if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId))
+      return;
+    let fallbackSnapshot = null;
+    try {
+      const fullReader = typeof readMessages === "function" ? readMessages : null;
+      const revision = readMessages.getRevision?.(sessionId);
+      const previous = heapHolder.reconciledSnapshots.get(sessionId);
+      const finalWatermark = previous && revision === previous.revision ? previous.count : revision !== undefined && readMessages.getCountAfterRevision ? previous && revision > previous.revision ? previous.count + readMessages.getCountAfterRevision(sessionId, previous.revision, revision) : readMessages.getCountAfterRevision(sessionId, -1, revision) : readMessages.getCount ? readMessages.getCount(sessionId) : (fallbackSnapshot = fullReader?.(sessionId) ?? []).length;
+      let cursor = getMessageIndexReconciliationStartOrdinal(db, sessionId);
+      let after = cursor === previous?.count ? previous.after : undefined;
+      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);
+        if (nextCursor <= cursor)
+          break;
+        cursor = nextCursor;
+        const last = messages.at(-1);
+        after = last?.ordinal === cursor && typeof last.createdAt === "number" ? { timeCreated: last.createdAt, id: last.id } : undefined;
+        if (cursor < finalWatermark) {
+          await yieldToEventLoop();
+        }
+      }
+      if (isMessageIndexReconciledThrough(db, sessionId, finalWatermark)) {
+        heapHolder.reconciledSessions.add(sessionId);
+        if (revision !== undefined) {
+          if (!after && finalWatermark > 0 && readMessages.readPage) {
+            const last = readMessages.readPage(sessionId, finalWatermark - 1, 1, finalWatermark).at(-1);
+            if (last?.ordinal === finalWatermark && typeof last.createdAt === "number")
+              after = { timeCreated: last.createdAt, id: last.id };
+          }
+          heapHolder.reconciledSnapshots.set(sessionId, {
+            revision,
+            count: finalWatermark,
+            after
+          });
+        }
+      } else {
+        logReconciliationStall(sessionId, `gap after ordinal ${cursor} (store count ${finalWatermark})`);
+      }
+    } finally {
+      heapHolder.activeReconcilerBuffers.delete(sessionId);
+    }
+  });
+  return true;
+}
+function scheduleReconciliation(db, sessionId, readMessages) {
+  if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId) || heapHolder.reconciliationScheduledSessions.has(sessionId)) {
+    return;
+  }
+  heapHolder.reconciliationScheduledSessions.add(sessionId);
+  scheduleAfterBootQuiet(() => {
+    defer(() => {
+      let appendedDuringReconciliation = false;
+      const previousSnapshot = heapHolder.reconciledSnapshots.get(sessionId);
+      reconcileSessionIndex(db, sessionId, readMessages).then((ran) => {
+        if (ran) {
+          const snapshot = heapHolder.reconciledSnapshots.get(sessionId);
+          appendedDuringReconciliation = snapshot !== undefined && snapshot !== previousSnapshot && readMessages.getRevision !== undefined && readMessages.getRevision(sessionId) !== snapshot.revision;
+          return;
+        }
+        inRootAsyncContext2(() => setTimeout(() => {
+          heapHolder.reconciliationScheduledSessions.delete(sessionId);
+          scheduleReconciliation(db, sessionId, readMessages);
+        }, PREPARE_RETRY_MS)).unref?.();
+      }).catch((error) => {
+        logReconciliationStall(sessionId, error instanceof Error ? error.message : String(error));
+        if (isDatabaseLockedError(error))
+          inRootAsyncContext2(() => setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000)).unref();
+      }).finally(() => {
+        heapHolder.reconciliationScheduledSessions.delete(sessionId);
+        if (appendedDuringReconciliation)
+          scheduleReconciliation(db, sessionId, readMessages);
+      });
+    });
+  });
+}
+function scheduleIncrementalIndex(db, sessionId, messageId, messageSource) {
+  const schedulingKey = `${sessionId}\x00${messageId}`;
+  const epoch = sessionEpochs.get(sessionId) ?? 0;
+  if (heapHolder.pendingIncrementalKeys.has(schedulingKey))
+    return;
+  const activeTimer = heapHolder.incrementalTimers.get(schedulingKey);
+  if (activeTimer)
+    clearTimeout(activeTimer);
+  const timer = inRootAsyncContext2(() => setTimeout(() => {
+    heapHolder.incrementalTimers.delete(schedulingKey);
+    heapHolder.pendingIncrementalKeys.add(schedulingKey);
+    const indexMessage = async () => {
+      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch || !heapHolder.pendingIncrementalKeys.has(schedulingKey))
+        return;
+      const message = typeof messageSource === "function" ? messageSource(sessionId, messageId) : messageSource;
+      if (!message)
+        return;
+      const revisionKey = `${schedulingKey}\x00${getMessageIndexSourceIdentity(message)}`;
+      if (heapHolder.completedIncrementalKeys.has(revisionKey))
+        return;
+      const currentWatermark = getLastIndexedOrdinal(db, sessionId);
+      if (message.ordinal <= currentWatermark && isMessageIndexSourceCurrent(db, sessionId, message)) {
+        heapHolder.completedIncrementalKeys.add(revisionKey);
+        return;
+      }
+      const wasReconciled = heapHolder.reconciledSessions.delete(sessionId);
+      await indexSingleMessageOffThread(db, sessionId, message);
+      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch || !heapHolder.pendingIncrementalKeys.has(schedulingKey))
+        return;
+      const finalWatermark = getLastIndexedOrdinal(db, sessionId);
+      if (wasReconciled && isMessageIndexReconciledThrough(db, sessionId, finalWatermark)) {
+        heapHolder.reconciledSessions.add(sessionId);
+      }
+      heapHolder.completedIncrementalKeys.add(revisionKey);
+    };
+    sourceReady(messageSource, sessionId).then((ready) => {
+      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch)
+        return;
+      if (ready)
+        return runWithSessionLock(sessionId, indexMessage);
+      setTimeout(() => scheduleIncrementalIndex(db, sessionId, messageId, messageSource), PREPARE_RETRY_MS).unref?.();
+    }).catch((error) => {
+      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch)
+        return;
+      heapHolder.reconciledSessions.delete(sessionId);
+      logIndexingError(sessionId, `incremental index for ${messageId}`, error);
+      if (isDatabaseLockedError(error))
+        setTimeout(() => scheduleIncrementalIndex(db, sessionId, messageId, messageSource), 1000).unref();
+    }).finally(() => {
+      if ((sessionEpochs.get(sessionId) ?? 0) === epoch)
+        heapHolder.pendingIncrementalKeys.delete(schedulingKey);
+    });
+  }, INCREMENTAL_DEBOUNCE_MS));
+  heapHolder.incrementalTimers.set(schedulingKey, timer);
+}
+async function indexSingleMessageOffThread(db, sessionId, message) {
+  const path = getSqliteDatabasePath2(db);
+  if (!path)
+    return withSqliteBackgroundWriter2(() => indexSingleMessage(db, sessionId, message));
+  const cancellation = new Int32Array(new SharedArrayBuffer(4));
+  const active = indexCancellations.get(sessionId) ?? new Set;
+  active.add(cancellation);
+  indexCancellations.set(sessionId, active);
+  const result = await runSessionWarmupWorker({
+    path,
+    sessionId,
+    indexMessage: message,
+    harness: getHarness2(),
+    indexCancellation: cancellation.buffer,
+    ...indexCoordinationInput2()
+  }, {}).finally(() => {
+    active.delete(cancellation);
+    if (active.size === 0)
+      indexCancellations.delete(sessionId);
+  });
+  if (!("inserted" in result))
+    throw new Error("failure" in result ? result.detail : "unexpected indexing worker reply");
+  if (result.measurements) {
+    const sessions = workerMeasurements.get(db) ?? new Map;
+    sessions.set(sessionId, result.measurements);
+    workerMeasurements.set(db, sessions);
+    if (result.measurements.skipped)
+      log2(`[magic-context] incremental FTS skipped oversized source ${message.id} (${result.measurements.sourceBytes} bytes); identity and progress persisted`);
+  }
+  return result.inserted;
+}
+function scheduleClearAndReindex(db, sessionId, readMessages) {
+  heapHolder.reconciledSessions.delete(sessionId);
+  heapHolder.reconciledSnapshots.delete(sessionId);
+  heapHolder.reconciliationScheduledSessions.delete(sessionId);
+  clearCompletedIncrementalKeys(sessionId);
+  const existing = heapHolder.clearAndReindexScheduledSessions.get(sessionId);
+  if (existing) {
+    existing.source = readMessages;
+    return;
+  }
+  const pending = { source: readMessages };
+  heapHolder.clearAndReindexScheduledSessions.set(sessionId, pending);
+  scheduleAfterBootQuiet(() => {
+    defer(() => {
+      let cleared = false;
+      runWithSessionLock(sessionId, () => {
+        if (heapHolder.clearAndReindexScheduledSessions.get(sessionId) !== pending)
+          return;
+        heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
+        heapHolder.reconciledSessions.delete(sessionId);
+        heapHolder.reconciledSnapshots.delete(sessionId);
+        clearCompletedIncrementalKeys(sessionId);
+        clearIndexedMessages(db, sessionId);
+        cleared = true;
+      }).then(() => cleared ? reconcileSessionIndex(db, sessionId, pending.source) : undefined).catch((error) => {
+        heapHolder.reconciledSessions.delete(sessionId);
+        if (heapHolder.clearAndReindexScheduledSessions.get(sessionId) === pending)
+          heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
+        logIndexingError(sessionId, "clear and reindex", error);
+      });
+    });
+  });
+}
+function getMessageIndexQueueHeapStats() {
+  return {
+    queueLength: heapHolder.reconciliationScheduledSessions.size + heapHolder.incrementalTimers.size + heapHolder.pendingIncrementalKeys.size,
+    reconciliationScheduled: heapHolder.reconciliationScheduledSessions.size,
+    incrementalTimers: heapHolder.incrementalTimers.size,
+    pendingIncremental: heapHolder.pendingIncrementalKeys.size,
+    activeSessionLocks: heapHolder.sessionLocks.size,
+    completedIncrementalKeys: heapHolder.completedIncrementalKeys.size,
+    activeBufferMessages: [...heapHolder.activeReconcilerBuffers.values()].reduce((sum, messages) => sum + messages.length, 0),
+    activeBufferBytes: [...heapHolder.activeReconcilerBuffers.values()].reduce((sum, messages) => sum + serializedMessageBytes(messages), 0)
+  };
+}
+function clearSessionTracking(sessionId) {
+  sessionEpochs.set(sessionId, (sessionEpochs.get(sessionId) ?? 0) + 1);
+  for (const cancellation of indexCancellations.get(sessionId) ?? [])
+    Atomics.store(cancellation, 0, 1);
+  heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
+  heapHolder.reconciledSessions.delete(sessionId);
+  heapHolder.reconciledSnapshots.delete(sessionId);
+  heapHolder.stalledSessions.delete(sessionId);
+  heapHolder.reconciliationScheduledSessions.delete(sessionId);
+  heapHolder.sessionLocks.delete(sessionId);
+  heapHolder.activeReconcilerBuffers.delete(sessionId);
+  const prefix = `${sessionId}\x00`;
+  for (const [key, timer] of heapHolder.incrementalTimers) {
+    if (key.startsWith(prefix)) {
+      clearTimeout(timer);
+      heapHolder.incrementalTimers.delete(key);
+    }
+  }
+  for (const key of heapHolder.pendingIncrementalKeys) {
+    if (key.startsWith(prefix)) {
+      heapHolder.pendingIncrementalKeys.delete(key);
+    }
+  }
+  for (const key of heapHolder.completedIncrementalKeys) {
+    if (key.startsWith(prefix))
+      heapHolder.completedIncrementalKeys.delete(key);
+  }
+}
+
+// src/features/magic-context/session-cache-ttl.ts
+function readSessionCacheTtl(db, sessionId) {
+  const saved = readReplayEnvelope(db, sessionId).cacheTtlPolicy;
+  return saved && typeof saved.value === "string" && saved.config !== undefined ? saved : undefined;
+}
+function resolveSessionCacheTtl(db, sessionId, config, modelKey, configuredExplicitly) {
   const meta = getOrCreateSessionMeta(db, sessionId);
   const saved = readSessionCacheTtl(db, sessionId);
   const key = modelKey ?? saved?.modelKey;
@@ -14238,6 +14204,13 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
     }
     return { shouldFire: false };
   }
+  if (tailInfo.boundarySnapshot && shouldWaitForNewHistorianHistory(tailInfo.boundarySnapshot, {
+    usagePercentage: usage.percentage,
+    emergency: getOverflowState(db, sessionId).needsEmergencyRecovery
+  })) {
+    sessionLog2(sessionId, "compartment trigger: waiting for new history after no forward progress");
+    return { shouldFire: false };
+  }
   const canClearReasoning = reasoningProjection?.canClearReasoning ?? modelAcceptsEmptyContent(reasoningProjection?.providerID);
   const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession2(db, sessionId), keepReasoningTokens, sessionMeta.clearedReasoningThroughTag, canClearReasoning, reasoningProjection?.budgetCutoff, eligiblePendingDropTagIds);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
@@ -16481,8 +16454,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-qwcz86r1.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-kzazs7fy.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-02sa2ngr.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-afzzqy5b.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -16566,7 +16539,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-a9r8r4sk.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-n5h5sr1x.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -28614,7 +28587,7 @@ function singleLine(value) {
 // src/tools/ctx-note/tools.ts
 function captureAnchorOrdinal(db, sessionId) {
   try {
-    const ordinal = getLastIndexedOrdinal2(db, sessionId);
+    const ordinal = getLastIndexedOrdinal(db, sessionId);
     return ordinal > 0 ? ordinal : null;
   } catch {
     return null;
@@ -29798,4 +29771,4 @@ function applyHiddenSubagentTemperature(input, output, log) {
     output.temperature = temperature;
 }
 
-export { logConfigDependencyNotesOnce, openOpenCodeDb, DREAMER_SYSTEM_PROMPT, runSessionProjectBackfill, SMART_NOTE_COMPILER_SYSTEM_PROMPT, createLiveSessionState, RETROSPECTIVE_MAX_USER_MESSAGE_CHARS, RETROSPECTIVE_MESSAGE_TRUNCATION_MARKER, OpenCodeRetrospectiveRawProvider, createDreamTaskExecutor, runManualDream, runDueTasksForProject, scheduleClearAndReindex, startDreamScheduleTimer, createDreamTimerModuleClient, ensureProjectRegisteredFromOpenCodeDirectory, recordOpenCodeProvenInputFloor, resolveOpenCodeProvenInputFloor, resolveContextWindowGeometry, resolveContextLimit, resolveExecuteThresholdDetail, resolveModelKey, resolveSessionId, createScheduler, describeStorageUnavailability, resolveSessionCacheTtl, runEmbedHistoryDrain, pauseEmbedHistoryDrain, formatEmbedStatusText, getSessionProperties, getSessionCreatedInfo, getMessageUpdatedAssistantInfo, getMessageUpdatedInfo, getSessionErrorInfo, getMessageRemovedInfo, summarizeManualDream, createMagicContextCommandHandler, getLiveNotificationParams, createChatMessageHook, createEventHook, createCommandExecuteBeforeHook, createToolExecuteAfterHook, recordHiddenVariantWarning, buildStatusDetail, isDebugRpcEnabled, registerRpcHandlers, maybeAutoEmbedSessionBackfill, clearTransformDecisionSession, scheduleOpenCodeTransformDecisionWrite, stageOpenCodeV2TransformDecision, bindOpenCodeV2TransformDecision, maybeDeliverChannel2, armLatestThinkingRecovery, armBindingRecoverySafely, armLatestThinkingRecoveryFromError, createM0RenderOptions, lkgReplayLimit, measureLkgReplay, STORAGE_BUSY_MESSAGE, StorageBusyRefusalError, bindSystemDateRequestIdentity, bindSystemDateOutput, registerSystemDateRefresh, rustWrapupHistorianFields, UnmanagedOverWindowError, UnresolvedHistoryBoundaryError, clearMessageTokensCache, createTransform, createSubcModuleClient, createModuleToolBackends, createRustRefusalRecovery, createSystemPromptHashHandler, tryMessagesTransformLkgReplay, createMessagesTransformHandler, primaryOnlyToolIds, subagentToolRefusal, guardSubagentTools, hideSubagentTools, removePrimaryOnlyTools, storedSubagentMode, createCtxExpandTools, CTX_MEMORY_LIST_TOOL_NAME, CTX_MEMORY_ACTIONS, createCtxMemoryTools, createCtxMemoryListTools, CTX_NOTE_DESCRIPTION, withoutSmartNoteText, createCtxNoteTools, createCtxReduceTools, createCtxSearchTools, parameterDescriptionsFor, applyJsonSchemaParameterDescriptions, MagicContextRpcServer, subagentTemperature, applyHiddenSubagentTemperature };
+export { logConfigDependencyNotesOnce, openOpenCodeDb, DREAMER_SYSTEM_PROMPT, runSessionProjectBackfill, SMART_NOTE_COMPILER_SYSTEM_PROMPT, createLiveSessionState, RETROSPECTIVE_MAX_USER_MESSAGE_CHARS, RETROSPECTIVE_MESSAGE_TRUNCATION_MARKER, OpenCodeRetrospectiveRawProvider, createDreamTaskExecutor, runManualDream, runDueTasksForProject, startDreamScheduleTimer, createDreamTimerModuleClient, ensureProjectRegisteredFromOpenCodeDirectory, recordOpenCodeProvenInputFloor, resolveOpenCodeProvenInputFloor, resolveContextWindowGeometry, resolveContextLimit, resolveExecuteThresholdDetail, resolveModelKey, resolveSessionId, createScheduler, describeStorageUnavailability, scheduleClearAndReindex, resolveSessionCacheTtl, runEmbedHistoryDrain, pauseEmbedHistoryDrain, formatEmbedStatusText, getSessionProperties, getSessionCreatedInfo, getMessageUpdatedAssistantInfo, getMessageUpdatedInfo, getSessionErrorInfo, getMessageRemovedInfo, summarizeManualDream, createMagicContextCommandHandler, getLiveNotificationParams, createChatMessageHook, createEventHook, createCommandExecuteBeforeHook, createToolExecuteAfterHook, recordHiddenVariantWarning, buildStatusDetail, isDebugRpcEnabled, registerRpcHandlers, maybeAutoEmbedSessionBackfill, clearTransformDecisionSession, scheduleOpenCodeTransformDecisionWrite, stageOpenCodeV2TransformDecision, bindOpenCodeV2TransformDecision, maybeDeliverChannel2, armLatestThinkingRecovery, armBindingRecoverySafely, armLatestThinkingRecoveryFromError, createM0RenderOptions, lkgReplayLimit, measureLkgReplay, STORAGE_BUSY_MESSAGE, StorageBusyRefusalError, bindSystemDateRequestIdentity, bindSystemDateOutput, registerSystemDateRefresh, rustWrapupHistorianFields, UnmanagedOverWindowError, UnresolvedHistoryBoundaryError, clearMessageTokensCache, createTransform, createSubcModuleClient, createModuleToolBackends, createRustRefusalRecovery, createSystemPromptHashHandler, tryMessagesTransformLkgReplay, createMessagesTransformHandler, primaryOnlyToolIds, subagentToolRefusal, guardSubagentTools, hideSubagentTools, removePrimaryOnlyTools, storedSubagentMode, createCtxExpandTools, CTX_MEMORY_LIST_TOOL_NAME, CTX_MEMORY_ACTIONS, createCtxMemoryTools, createCtxMemoryListTools, CTX_NOTE_DESCRIPTION, withoutSmartNoteText, createCtxNoteTools, createCtxReduceTools, createCtxSearchTools, parameterDescriptionsFor, applyJsonSchemaParameterDescriptions, MagicContextRpcServer, subagentTemperature, applyHiddenSubagentTemperature };