@cortexkit/pi-magic-context 0.49.26 → 0.49.27

package/dist/index.js

@@ -4,7 +4,6 @@ import {
   harnessOwnsOpenCodeStore2
 } from "./index-0h2mkab2.js";
 import {
-  getDataDir,
   ensureCortexKitArtifactGitignore,
   getProjectMagicContextHistorianDir,
   getMagicContextStorageDir,
@@ -46,11 +45,21 @@ import {
   cortexKitProjectConfigBasePath,
   migrateMagicContextConfigLocations,
   getProtectedTokensTierOverrides,
+  LkgRecoveryFenceError,
+  clearLkgFenceProcessState,
+  lkgFenceRequiresRebuild,
+  lkgRecoveryFenceUnclean,
+  ownsLkgDirtyFence,
+  invalidateCleanLkgRecoveryFence,
+  markLkgRecoveryDirty,
   rememberUnpublishedAutoSearchNoHint,
   getUnpublishedAutoSearchNoHint,
   forgetUnpublishedAutoSearchNoHint,
   registerAutoSearchWork,
   cancelAutoSearchWork,
+  readSessionActivity,
+  observeSessionActivity,
+  backfillSessionActivity,
   readSessionMeta,
   getOrCreateSessionMeta,
   updateSessionMeta,
@@ -251,7 +260,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-zpmz6x24.js";
+} from "./index-bkcwcghx.js";
 import"./index-4knyh1kt.js";
 import {
   canonicalModelIdentity,
@@ -277,6 +286,7 @@ import {
   isFailClosedBlockingError,
   shouldBypassFailClosedBlock,
   createFailClosedController,
+  piHarnessKindFromExecutable,
   getErrorMessage,
   describeError,
   startBootDeadline,
@@ -292,8 +302,9 @@ import {
   openCurrentDatabase,
   openDatabaseAsync,
   closeDatabase
-} from "./index-r1hvaza0.js";
+} from "./index-5d506f7y.js";
 import {
+  sameProjectDirectory,
   pruneMissingProjectIdentities,
   setHomeProjectPermission,
   ProjectIdentityError,
@@ -304,7 +315,7 @@ import {
   resolveProjectIdentityForSession,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-hxp6q5f8.js";
+} from "./index-48twbev2.js";
 import {
   detectThinkingBindingMismatch,
   detectLatestTurnThinkingMismatch,
@@ -462,11 +473,12 @@ import {
   getCachedAbsoluteMessageCount2,
   primeInMemoryTailRawMessageCache2,
   readRawSessionMessageIdOrdinalsForRange2,
+  compareRawSessionMessageOrder2,
   getRawSessionMessageCount2,
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-rjnc6kkf.js";
+} from "./index-kagezf2h.js";
 import {
   UNKNOWN_FIT_RATIO,
   hasMeasuredDecisionCalibration,
@@ -553,7 +565,7 @@ import {
   getToolTagNumberByOwner2,
   getNullOwnerToolTag2,
   adoptNullOwnerToolTag2
-} from "./index-n8e5e9fp.js";
+} from "./index-0x1c054v.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -587,36 +599,7 @@ import {
   observeTemporalDecisions,
   freezeTemporalDecisions,
   tagIdentityRevisionKey
-} from "./index-w1avzkdt.js";
-import {
-  piHarnessKindFromExecutable
-} from "./index-n4wyxcgr.js";
-import {
-  LkgRecoveryFenceError,
-  clearLkgFenceProcessState,
-  takeLkgRecoveryLockSweepPage,
-  lkgFenceRequiresRebuild,
-  lkgRecoveryFenceUnclean,
-  ownsLkgDirtyFence,
-  invalidateCleanLkgRecoveryFence,
-  markLkgRecoveryDirty,
-  gaDatabasePath,
-  readSessionActivity,
-  observeSessionActivity,
-  backfillSessionActivity,
-  clearCompressionDepth,
-  clearCompressionDepthRange,
-  cleanSearchText,
-  matchedSearchSnippet,
-  getMessageIndexSourceIdentity2,
-  isMessageIndexSourceCurrent2,
-  getLastIndexedOrdinal2,
-  getMessageIndexReconciliationStartOrdinal2,
-  isMessageIndexReconciledThrough2,
-  indexSingleMessage2,
-  indexMessagesAfterOrdinal2,
-  sweepOrphanedOpenCodeMessageIndexesCooperatively2
-} from "./index-87xm7z44.js";
+} from "./index-g026ztby.js";
 import {
   BoundedSessionMap,
   resolveOpenCodeDbPath,
@@ -633,11 +616,11 @@ import {
 import {
   runSessionWarmupWorker,
   RAW_SUMMARY_TEXT_MAX_CHARS2
-} from "./index-z24d75tz.js";
+} from "./index-6981g1xv.js";
 import {
   formatSynapseLaneDescriptor
 } from "./index-gwxaz0z5.js";
-import"./index-g0d51qzc.js";
+import"./index-bvpar0bg.js";
 import {
   buildCanonicalChunkTextFromFts2,
   buildCompartmentSummaryFallbackText2,
@@ -647,7 +630,7 @@ import {
   replaceCompartmentChunkEmbeddings2,
   deleteChunkEmbedBackoffForSession2,
   chunkWindowSourceKey2
-} from "./index-dnadppqx.js";
+} from "./index-kmk3xpf9.js";
 import {
   recordSessionProjectIdentity,
   GIT_SWEEP_LEASE_RENEWAL_MS,
@@ -656,7 +639,7 @@ import {
   markGitSweepSuccessAndRelease,
   parkGitSweepNonIndexable,
   releaseGitSweepLease
-} from "./index-j3pz3a1b.js";
+} from "./index-4zemngt7.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -682,7 +665,20 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-z6k6jsmh.js";
+} from "./index-xa90f88m.js";
+import {
+  clearCompressionDepth,
+  clearCompressionDepthRange,
+  cleanSearchText,
+  matchedSearchSnippet,
+  getMessageIndexSourceIdentity,
+  isMessageIndexSourceCurrent,
+  getLastIndexedOrdinal,
+  getMessageIndexReconciliationStartOrdinal,
+  isMessageIndexReconciledThrough,
+  indexSingleMessage,
+  indexMessagesAfterOrdinal
+} from "./index-v0ht940m.js";
 import {
   rememberV1HiddenRun
 } from "./index-6x556c2q.js";
@@ -697,7 +693,7 @@ import {
   expandWorkspaceIdentitySetWithAliases,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-0dr64gsy.js";
+} from "./index-0s14xaca.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fapenpch.js";
@@ -747,7 +743,7 @@ import {
   normalizeVerificationFiles,
   indexCommitsForProject,
   embedUnembeddedCommits
-} from "./index-zz7dnyh6.js";
+} from "./index-sdsnb5b6.js";
 import {
   setEmbeddingSessionBusy2,
   isEmbeddingHostBusy2
@@ -783,7 +779,7 @@ import {
 } from "./index-wqpjhx1p.js";
 import {
   cosineSimilarity
-} from "./index-w5v0ntbw.js";
+} from "./index-wjbqw6r1.js";
 import"./index-6wdwv3a6.js";
 import {
   DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS,
@@ -811,10 +807,10 @@ import {
   drainPiTagSnapshotSession,
   assertPiTagSnapshotReady,
   ensurePiTagSnapshotReady
-} from "./index-wpy2rzb2.js";
+} from "./index-xw070axm.js";
 import"./index-jn44h81p.js";
 import"./index-1cvyaw9a.js";
-import"./index-kbswhkc8.js";
+import"./index-vea2d9ka.js";
 import {
   __toESM
 } from "./index-22jkk6wg.js";
@@ -824,9 +820,6 @@ import {
 import {
   normalizeProtectedToolName
 } from "./index-674f6qs2.js";
-import {
-  sameProjectDirectory
-} from "./index-wrr9rp9a.js";
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
@@ -3556,7 +3549,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.26",
+  version: "0.49.27",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -16930,6 +16923,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) {
@@ -17088,6 +17096,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;
@@ -17140,13 +17149,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, {
@@ -17208,10 +17214,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;
@@ -19481,541 +19484,215 @@ function clearDreamerTickFailure(db) {
   db.prepare("DELETE FROM schema_migrations_meta WHERE key = ?").run(DREAMER_TICK_FAILURE_KEY);
 }
 
-// ../plugin/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")
+// ../plugin/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 statSync3(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;
-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;
+function openTimerDatabaseOrNull(context) {
+  let db;
+  try {
+    db = openCurrentDatabase();
+  } catch (error) {
+    log2(`[dreamer] storage fatal; skipping ${context}: ${getErrorMessage(error)}`);
+    return null;
   }
-  inRootAsyncContext2(() => setTimeout(fn, 0));
-}
-function yieldToEventLoop() {
-  return new Promise((resolve) => defer(resolve));
+  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;
 }
-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);
+  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))
+  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");
+    });
+    const timer = inRootAsyncContext2(() => setInterval(() => runTick("interval"), DREAM_TIMER_INTERVAL_MS));
+    if (typeof timer === "object" && "unref" in timer) {
+      timer.unref();
+    }
+    activeTimer = timer;
+  } else if (isNewRegistration || previousRegistration !== args) {
+    scheduleInitialProjectRun(args, db);
+  }
+  return () => {
+    if (registeredProjects.get(args.directory) !== args) {
+      stopDreamScheduleTimerIfIdle();
       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;
+    registeredProjects.delete(args.directory);
+    const startupTimer = startupTimers.get(args.directory);
+    if (startupTimer) {
+      clearTimeout(startupTimer);
+      startupTimers.delete(args.directory);
+    }
+    log2(`[dreamer] unregistered project ${args.projectIdentity} (remaining=${registeredProjects.size})`);
+    stopDreamScheduleTimerIfIdle();
+  };
 }
-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))
+var tickStages = {
+  runMessageHistoryMaintenance,
+  runProjectMaintenance
+};
+function runTick(origin) {
+  if (tickInFlight)
     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);
+  tickInFlight = true;
+  log2(`[magic-context] maintenance tick (${origin}) — projects=${registeredProjects.size}`);
+  (async () => {
+    try {
+      const db = openTimerDatabaseOrNull("maintenance tick");
+      if (!db)
         return;
+      let failure = null;
+      const noteFailure = (stage, error) => {
+        failure ??= { at: Date.now(), stage, message: getErrorMessage(error) };
+      };
+      try {
+        await tickStages.runMessageHistoryMaintenance(db);
+      } catch (error) {
+        log2("[magic-context] timer-triggered message-history maintenance failed:", error);
+        noteFailure("message-history maintenance", error);
       }
-      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);
+      for (const reg of registeredProjects.values()) {
+        try {
+          if (origin === "startup") {
+            scheduleInitialProjectRun(reg, db);
+          } else {
+            await tickStages.runProjectMaintenance(reg, origin, db);
+          }
+        } catch (error) {
+          log2(`[magic-context] timer-triggered maintenance failed for ${reg.projectIdentity}:`, error);
+          noteFailure(`project ${reg.projectIdentity}`, error);
+        }
       }
-      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)
+      persistTickOutcome(db, failure);
+      if (origin === "startup")
         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 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);
+      runSqliteOptimize(db);
+    } catch (error) {
+      log2("[magic-context] timer-triggered maintenance check failed:", error);
+    } finally {
+      tickInFlight = false;
     }
-  }
-  for (const key of heapHolder.completedIncrementalKeys) {
-    if (key.startsWith(prefix))
-      heapHolder.completedIncrementalKeys.delete(key);
-  }
+  })();
 }
-
-// ../plugin/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) {
+function persistTickOutcome(db, failure) {
   try {
-    return statSync3(directory).isDirectory();
-  } catch {
-    return false;
+    if (failure)
+      recordDreamerTickFailure(db, failure);
+    else
+      clearDreamerTickFailure(db);
+  } catch (error) {
+    log2("[dreamer] could not persist the outcome of this tick:", error);
   }
 }
-function openTimerDatabaseOrNull(context) {
-  let db;
+async function runMessageHistoryMaintenance(db) {
+  const prunedIdentities = await pruneMissingProjectIdentities();
+  if (prunedIdentities > 0)
+    log2(`[magic-context] pruned ${prunedIdentities} missing project identities`);
   try {
-    db = openCurrentDatabase();
+    await drainStaleLkgSlots(db);
   } catch (error) {
-    log2(`[dreamer] storage fatal; skipping ${context}: ${getErrorMessage(error)}`);
-    return null;
+    log2("[magic-context] LKG pruning deferred:", error);
   }
-  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;
+  const cleanup = retryPendingSessionCleanups(db);
+  if (cleanup.cleared > 0 || cleanup.failedSessionIds.length > 0) {
+    log2(`[message-index] pending session cleanup: cleared=${cleanup.cleared} failed=${cleanup.failedSessionIds.length}`);
+  }
+  for (const registration of registeredProjects.values()) {
+    const moduleClient = registration.sessionCleanupModuleClient;
+    if (!moduleClient)
+      continue;
+    const rustCleanup = await retryPendingRustSessionCleanupsForProject(db, registration.projectIdentity, async (sessionId) => {
+      try {
+        await moduleClient.deleteSession(sessionId, registration.directory);
+      } finally {
+        moduleClient.closeSession?.(sessionId);
+      }
+    });
+    if (rustCleanup.cleared > 0 || rustCleanup.failedSessionIds.length > 0) {
+      log2(`[message-index] pending Rust session cleanup: cleared=${rustCleanup.cleared} failed=${rustCleanup.failedSessionIds.length}`);
+    }
   }
-  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`);
+function startupJitterMs(directory) {
+  const existing = startupJitters.get(directory);
+  if (existing !== undefined)
+    return existing;
+  const slot = nextStartupJitterSlot;
+  nextStartupJitterSlot += 1;
+  const hash = [...directory].reduce((value, character) => value * 33 + character.charCodeAt(0) >>> 0, 5381);
+  const jitter = slot * BOOT_PROJECT_JITTER_SLOT_MS + hash % BOOT_PROJECT_JITTER_SLOT_MS;
+  startupJitters.set(directory, jitter);
+  return jitter;
 }
-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");
-    });
-    const timer = inRootAsyncContext2(() => setInterval(() => runTick("interval"), DREAM_TIMER_INTERVAL_MS));
-    if (typeof timer === "object" && "unref" in timer) {
-      timer.unref();
-    }
-    activeTimer = timer;
-  } else if (isNewRegistration || previousRegistration !== args) {
-    scheduleInitialProjectRun(args, db);
-  }
-  return () => {
-    if (registeredProjects.get(args.directory) !== args) {
-      stopDreamScheduleTimerIfIdle();
-      return;
-    }
-    registeredProjects.delete(args.directory);
-    const startupTimer = startupTimers.get(args.directory);
-    if (startupTimer) {
-      clearTimeout(startupTimer);
-      startupTimers.delete(args.directory);
-    }
-    log2(`[dreamer] unregistered project ${args.projectIdentity} (remaining=${registeredProjects.size})`);
-    stopDreamScheduleTimerIfIdle();
-  };
-}
-var tickStages = {
-  runMessageHistoryMaintenance,
-  runProjectMaintenance
-};
-function runTick(origin) {
-  if (tickInFlight)
-    return;
-  tickInFlight = true;
-  log2(`[magic-context] maintenance tick (${origin}) — projects=${registeredProjects.size}`);
-  (async () => {
-    try {
-      const db = openTimerDatabaseOrNull("maintenance tick");
-      if (!db)
-        return;
-      let failure = null;
-      const noteFailure = (stage, error) => {
-        failure ??= { at: Date.now(), stage, message: getErrorMessage(error) };
-      };
-      try {
-        await tickStages.runMessageHistoryMaintenance(db);
-      } catch (error) {
-        log2("[magic-context] timer-triggered message-history maintenance failed:", error);
-        noteFailure("message-history maintenance", error);
-      }
-      for (const reg of registeredProjects.values()) {
-        try {
-          if (origin === "startup") {
-            scheduleInitialProjectRun(reg, db);
-          } else {
-            await tickStages.runProjectMaintenance(reg, origin, db);
-          }
-        } catch (error) {
-          log2(`[magic-context] timer-triggered maintenance failed for ${reg.projectIdentity}:`, error);
-          noteFailure(`project ${reg.projectIdentity}`, error);
-        }
-      }
-      persistTickOutcome(db, failure);
-      if (origin === "startup")
-        return;
-      runSqliteOptimize(db);
-    } catch (error) {
-      log2("[magic-context] timer-triggered maintenance check failed:", error);
-    } finally {
-      tickInFlight = false;
-    }
-  })();
-}
-function persistTickOutcome(db, failure) {
-  try {
-    if (failure)
-      recordDreamerTickFailure(db, failure);
-    else
-      clearDreamerTickFailure(db);
-  } catch (error) {
-    log2("[dreamer] could not persist the outcome of this tick:", error);
-  }
-}
-async function runMessageHistoryMaintenance(db) {
-  const prunedIdentities = await pruneMissingProjectIdentities();
-  if (prunedIdentities > 0)
-    log2(`[magic-context] pruned ${prunedIdentities} missing project identities`);
-  try {
-    await drainStaleLkgSlots(db);
-  } catch (error) {
-    log2("[magic-context] LKG pruning deferred:", error);
-  }
-  const cleanup = retryPendingSessionCleanups(db);
-  if (cleanup.cleared > 0 || cleanup.failedSessionIds.length > 0) {
-    log2(`[message-index] pending session cleanup: cleared=${cleanup.cleared} failed=${cleanup.failedSessionIds.length}`);
-  }
-  for (const registration of registeredProjects.values()) {
-    const moduleClient = registration.sessionCleanupModuleClient;
-    if (!moduleClient)
-      continue;
-    const rustCleanup = await retryPendingRustSessionCleanupsForProject(db, registration.projectIdentity, async (sessionId) => {
-      try {
-        await moduleClient.deleteSession(sessionId, registration.directory);
-      } finally {
-        moduleClient.closeSession?.(sessionId);
-      }
-    });
-    if (rustCleanup.cleared > 0 || rustCleanup.failedSessionIds.length > 0) {
-      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);
-  if (existing !== undefined)
-    return existing;
-  const slot = nextStartupJitterSlot;
-  nextStartupJitterSlot += 1;
-  const hash = [...directory].reduce((value, character) => value * 33 + character.charCodeAt(0) >>> 0, 5381);
-  const jitter = slot * BOOT_PROJECT_JITTER_SLOT_MS + hash % BOOT_PROJECT_JITTER_SLOT_MS;
-  startupJitters.set(directory, jitter);
-  return jitter;
-}
-function scheduleInitialProjectRun(reg, db) {
-  if (startupTimers.has(reg.directory))
+function scheduleInitialProjectRun(reg, db) {
+  if (startupTimers.has(reg.directory))
     return;
   const timer = scheduleAfterBootQuiet(() => {
     startupTimers.delete(reg.directory);
@@ -23796,144 +23473,428 @@ ${statusText}`,
         level: "info",
         rpcDisplay: "dialog"
       });
-    }
+    }
+  });
+}
+function maybeAutoEmbedPiSession(deps, sessionId, projectDir, projectIdentity) {
+  if (!isUsableProjectIdentity(projectIdentity))
+    return;
+  maybeAutoEmbedSessionBackfill({
+    db: deps.db,
+    projectIdentity,
+    ensureRegistered: () => ensureProjectRegisteredFromPiDirectory(projectDir, deps.db, {
+      preflightLocalPooling: true
+    })
+  }, sessionId);
+}
+
+// ../plugin/src/hooks/magic-context/execute-flush.ts
+function executeFlush(db, sessionId) {
+  try {
+    const pendingOps = getPendingOps(db, sessionId);
+    if (pendingOps.length === 0) {
+      return "No pending operations to flush.";
+    }
+    let dropped = 0;
+    db.transaction(() => {
+      for (const op of pendingOps) {
+        updateTagStatus2(db, sessionId, op.tagId, "dropped");
+        removePendingOp(db, sessionId, op.tagId);
+        dropped++;
+      }
+    }).immediate();
+    const parts = [];
+    if (dropped > 0)
+      parts.push(`${dropped} dropped`);
+    return `Flushed: ${parts.join(", ")}. Changes take effect on next message.`;
+  } catch (error) {
+    sessionLog2(sessionId, "ctx-flush failed:", error);
+    return `Error: Failed to flush context operations. ${getErrorMessage(error)}`;
+  }
+}
+
+// src/compaction-off-pi.ts
+var COMPACTION_OFF_COMMAND_UNAVAILABLE = `Unavailable: magic-context is in compaction-off mode (${COMPACTION_ENABLED_PATH}=false).`;
+var NO_TRANSITION = {
+  recordToWrite: null,
+  invalidatedBaseline: false,
+  clearDeferredMarkerState: false,
+  historianCatchUpSignaled: false,
+  notice: null
+};
+var PI_COMPACTION_OFF_NOTICE = "Magic Context is in compaction-off mode. Native Pi compaction now owns this session's context window; the first turn after disabling may trigger one native compaction cycle on long sessions.";
+var PI_COMPACTION_ON_NOTICE = "Magic Context context-window management resumed. Run /ctx-wrapup to digest history accumulated while compaction was off.";
+function reconcilePiCompactionMode(args) {
+  const stored = getCompactionModeRecord(args.db, args.sessionId);
+  if (stored === "on_notice_pending") {
+    return {
+      ...NO_TRANSITION,
+      recordToWrite: "on",
+      notice: PI_COMPACTION_ON_NOTICE
+    };
+  }
+  if (stored === "off_notice_pending") {
+    return {
+      ...NO_TRANSITION,
+      recordToWrite: "off",
+      notice: PI_COMPACTION_OFF_NOTICE
+    };
+  }
+  if (!args.compactionOff) {
+    if (stored === null || resolveCompactionModeRecord(stored) === "on") {
+      return stored === null ? { ...NO_TRANSITION, recordToWrite: "on" } : NO_TRANSITION;
+    }
+    clearCachedM0M1(args.db, args.sessionId);
+    if (!args.historianRunnable) {
+      return {
+        ...NO_TRANSITION,
+        recordToWrite: "on",
+        invalidatedBaseline: true
+      };
+    }
+    updateSessionMeta(args.db, args.sessionId, {
+      compartmentInProgress: true
+    });
+    setCompactionModeRecord(args.db, args.sessionId, "on_notice_pending");
+    return {
+      recordToWrite: "on",
+      invalidatedBaseline: true,
+      clearDeferredMarkerState: false,
+      historianCatchUpSignaled: true,
+      notice: PI_COMPACTION_ON_NOTICE
+    };
+  }
+  if (resolveCompactionModeRecord(stored) === "off")
+    return NO_TRANSITION;
+  let clearedSomething = false;
+  if (getPendingPiCompactionMarkerState(args.db, args.sessionId) !== null) {
+    setPendingPiCompactionMarkerState(args.db, args.sessionId, null, "compaction-disabled");
+    clearedSomething = true;
+  }
+  if (getOverflowState(args.db, args.sessionId).needsEmergencyRecovery) {
+    clearEmergencyRecovery(args.db, args.sessionId);
+    clearedSomething = true;
+  }
+  const channel2 = getChannel2NudgeState(args.db, args.sessionId);
+  if (channel2 === "pending" || channel2 === "claimed") {
+    setChannel2NudgeState(args.db, args.sessionId, "");
+    clearedSomething = true;
+  }
+  if (getPendingOps(args.db, args.sessionId).length > 0) {
+    clearPendingOps(args.db, args.sessionId);
+    clearedSomething = true;
+  }
+  const meta = getOrCreateSessionMeta(args.db, args.sessionId);
+  if (meta.compartmentInProgress) {
+    updateSessionMeta(args.db, args.sessionId, {
+      compartmentInProgress: false
+    });
+  }
+  clearCachedM0M1(args.db, args.sessionId);
+  sessionLog2(args.sessionId, `Pi compaction-off transition: clearedPendingMarker=${clearedSomething}`);
+  const notice = clearedSomething ? PI_COMPACTION_OFF_NOTICE : null;
+  if (notice) {
+    setCompactionModeRecord(args.db, args.sessionId, "off_notice_pending");
+  }
+  return {
+    recordToWrite: "off",
+    invalidatedBaseline: true,
+    clearDeferredMarkerState: true,
+    historianCatchUpSignaled: false,
+    notice
+  };
+}
+function commitPiCompactionModeRecord(db, sessionId, record) {
+  setCompactionModeRecord(db, sessionId, record);
+}
+
+// src/context-handler.ts
+import * as crypto3 from "node:crypto";
+
+// ../plugin/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;
+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 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 maybeAutoEmbedPiSession(deps, sessionId, projectDir, projectIdentity) {
-  if (!isUsableProjectIdentity(projectIdentity))
+function scheduleIncrementalIndex(db, sessionId, messageId, messageSource) {
+  const schedulingKey = `${sessionId}\x00${messageId}`;
+  const epoch = sessionEpochs.get(sessionId) ?? 0;
+  if (heapHolder.pendingIncrementalKeys.has(schedulingKey))
     return;
-  maybeAutoEmbedSessionBackfill({
-    db: deps.db,
-    projectIdentity,
-    ensureRegistered: () => ensureProjectRegisteredFromPiDirectory(projectDir, deps.db, {
-      preflightLocalPooling: true
-    })
-  }, sessionId);
-}
-
-// ../plugin/src/hooks/magic-context/execute-flush.ts
-function executeFlush(db, sessionId) {
-  try {
-    const pendingOps = getPendingOps(db, sessionId);
-    if (pendingOps.length === 0) {
-      return "No pending operations to flush.";
-    }
-    let dropped = 0;
-    db.transaction(() => {
-      for (const op of pendingOps) {
-        updateTagStatus2(db, sessionId, op.tagId, "dropped");
-        removePendingOp(db, sessionId, op.tagId);
-        dropped++;
+  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;
       }
-    }).immediate();
-    const parts = [];
-    if (dropped > 0)
-      parts.push(`${dropped} dropped`);
-    return `Flushed: ${parts.join(", ")}. Changes take effect on next message.`;
-  } catch (error) {
-    sessionLog2(sessionId, "ctx-flush failed:", error);
-    return `Error: Failed to flush context operations. ${getErrorMessage(error)}`;
-  }
-}
-
-// src/compaction-off-pi.ts
-var COMPACTION_OFF_COMMAND_UNAVAILABLE = `Unavailable: magic-context is in compaction-off mode (${COMPACTION_ENABLED_PATH}=false).`;
-var NO_TRANSITION = {
-  recordToWrite: null,
-  invalidatedBaseline: false,
-  clearDeferredMarkerState: false,
-  historianCatchUpSignaled: false,
-  notice: null
-};
-var PI_COMPACTION_OFF_NOTICE = "Magic Context is in compaction-off mode. Native Pi compaction now owns this session's context window; the first turn after disabling may trigger one native compaction cycle on long sessions.";
-var PI_COMPACTION_ON_NOTICE = "Magic Context context-window management resumed. Run /ctx-wrapup to digest history accumulated while compaction was off.";
-function reconcilePiCompactionMode(args) {
-  const stored = getCompactionModeRecord(args.db, args.sessionId);
-  if (stored === "on_notice_pending") {
-    return {
-      ...NO_TRANSITION,
-      recordToWrite: "on",
-      notice: PI_COMPACTION_ON_NOTICE
-    };
-  }
-  if (stored === "off_notice_pending") {
-    return {
-      ...NO_TRANSITION,
-      recordToWrite: "off",
-      notice: PI_COMPACTION_OFF_NOTICE
+      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);
     };
-  }
-  if (!args.compactionOff) {
-    if (stored === null || resolveCompactionModeRecord(stored) === "on") {
-      return stored === null ? { ...NO_TRANSITION, recordToWrite: "on" } : NO_TRANSITION;
-    }
-    clearCachedM0M1(args.db, args.sessionId);
-    if (!args.historianRunnable) {
-      return {
-        ...NO_TRANSITION,
-        recordToWrite: "on",
-        invalidatedBaseline: true
-      };
-    }
-    updateSessionMeta(args.db, args.sessionId, {
-      compartmentInProgress: true
+    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);
     });
-    setCompactionModeRecord(args.db, args.sessionId, "on_notice_pending");
-    return {
-      recordToWrite: "on",
-      invalidatedBaseline: true,
-      clearDeferredMarkerState: false,
-      historianCatchUpSignaled: true,
-      notice: PI_COMPACTION_ON_NOTICE
-    };
-  }
-  if (resolveCompactionModeRecord(stored) === "off")
-    return NO_TRANSITION;
-  let clearedSomething = false;
-  if (getPendingPiCompactionMarkerState(args.db, args.sessionId) !== null) {
-    setPendingPiCompactionMarkerState(args.db, args.sessionId, null, "compaction-disabled");
-    clearedSomething = true;
-  }
-  if (getOverflowState(args.db, args.sessionId).needsEmergencyRecovery) {
-    clearEmergencyRecovery(args.db, args.sessionId);
-    clearedSomething = true;
-  }
-  const channel2 = getChannel2NudgeState(args.db, args.sessionId);
-  if (channel2 === "pending" || channel2 === "claimed") {
-    setChannel2NudgeState(args.db, args.sessionId, "");
-    clearedSomething = true;
+  }, 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`);
   }
-  if (getPendingOps(args.db, args.sessionId).length > 0) {
-    clearPendingOps(args.db, args.sessionId);
-    clearedSomething = true;
+  return result.inserted;
+}
+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);
+    }
   }
-  const meta = getOrCreateSessionMeta(args.db, args.sessionId);
-  if (meta.compartmentInProgress) {
-    updateSessionMeta(args.db, args.sessionId, {
-      compartmentInProgress: false
-    });
+  for (const key of heapHolder.pendingIncrementalKeys) {
+    if (key.startsWith(prefix)) {
+      heapHolder.pendingIncrementalKeys.delete(key);
+    }
   }
-  clearCachedM0M1(args.db, args.sessionId);
-  sessionLog2(args.sessionId, `Pi compaction-off transition: clearedPendingMarker=${clearedSomething}`);
-  const notice = clearedSomething ? PI_COMPACTION_OFF_NOTICE : null;
-  if (notice) {
-    setCompactionModeRecord(args.db, args.sessionId, "off_notice_pending");
+  for (const key of heapHolder.completedIncrementalKeys) {
+    if (key.startsWith(prefix))
+      heapHolder.completedIncrementalKeys.delete(key);
   }
-  return {
-    recordToWrite: "off",
-    invalidatedBaseline: true,
-    clearDeferredMarkerState: true,
-    historianCatchUpSignaled: false,
-    notice
-  };
-}
-function commitPiCompactionModeRecord(db, sessionId, record) {
-  setCompactionModeRecord(db, sessionId, record);
 }
 
-// src/context-handler.ts
-import * as crypto3 from "node:crypto";
-
 // ../plugin/src/hooks/magic-context/event-resolvers.ts
 var DEFAULT_CONTEXT_LIMIT = 200000;
 var clampWarnSeen = new Set;
@@ -26380,6 +26341,60 @@ function isHistorianDrainBudgetSpent(args) {
   return true;
 }
 
+// ../plugin/src/hooks/magic-context/historian-history-wait.ts
+var historyWaits = new Map;
+function newestMessageId(snapshot) {
+  try {
+    const count = getRawSessionMessageOrdinalCount2(snapshot.sessionId);
+    const ids = readRawSessionMessageIdOrdinalsForRange2(snapshot.sessionId, count, count);
+    const newest = ids.keys().next().value;
+    if (newest)
+      return newest;
+  } catch {}
+  return snapshot.rawLastMessageIdAtTrigger;
+}
+function recoveryWindow(snapshot, percentage) {
+  return percentage >= escalationBands(snapshot.executeThresholdPercentage).forceMaterializationPercentage || snapshot.emergencyTailScale !== undefined;
+}
+function clearHistorianHistoryWait(sessionId) {
+  historyWaits.delete(sessionId);
+}
+function recordHistorianNoProgress(snapshot, emergency = false) {
+  const newest = newestMessageId(snapshot);
+  if (!newest)
+    return;
+  const previous = historyWaits.get(snapshot.sessionId);
+  const sameHistory = previous?.newestMessageId === newest;
+  historyWaits.set(snapshot.sessionId, {
+    newestMessageId: newest,
+    recoveryAttempted: sameHistory && previous.recoveryAttempted || emergency || recoveryWindow(snapshot, snapshot.usagePercentage),
+    floorLiftAttempted: sameHistory && previous.floorLiftAttempted || snapshot.liftLivePromptFloor === true
+  });
+}
+function shouldWaitForNewHistorianHistory(snapshot, options = {}) {
+  const wait = historyWaits.get(snapshot.sessionId);
+  if (!wait)
+    return false;
+  const newest = newestMessageId(snapshot);
+  if (newest && newest !== wait.newestMessageId) {
+    try {
+      const order = compareRawSessionMessageOrder2(snapshot.sessionId, newest, wait.newestMessageId);
+      if (order === null || order > 0)
+        return false;
+    } catch {}
+  }
+  const recovery = options.emergency || recoveryWindow(snapshot, options.usagePercentage ?? snapshot.usagePercentage);
+  const floorLift = snapshot.liftLivePromptFloor === true;
+  if (recovery && !wait.recoveryAttempted || floorLift && !wait.floorLiftAttempted) {
+    if (options.claim) {
+      wait.recoveryAttempted ||= recovery;
+      wait.floorLiftAttempted ||= floorLift;
+    }
+    return false;
+  }
+  return true;
+}
+
 // ../plugin/src/hooks/magic-context/compartment-trigger.ts
 var PROACTIVE_TRIGGER_OFFSET_PERCENTAGE = 2;
 var POST_DROP_TARGET_RATIO = 0.75;
@@ -26638,6 +26653,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;
@@ -30030,6 +30052,14 @@ async function runPiHistorian(deps) {
         return;
       }
       const protectedTailStart = boundarySnapshot.protectedTailStart;
+      if (!forceDrainQuota && shouldWaitForNewHistorianHistory(boundarySnapshot, {
+        emergency: getOverflowState(db, sessionId).needsEmergencyRecovery
+      })) {
+        telemetry.status = "noop";
+        telemetry.failureReason = "waiting for new history after no forward progress";
+        sessionLog2(sessionId, "historian no-op: waiting for new history after no forward progress");
+        return;
+      }
       const eligibleEndOrdinal = Math.min(boundarySnapshot.eligibleEndOrdinal, protectedTailStart);
       if (protectedTailStart <= offset || eligibleEndOrdinal <= offset) {
         telemetry.status = "noop";
@@ -30230,6 +30260,12 @@ ${chunkText}`,
       };
       retainDrainReservationForRetryThrottle = true;
       const historianEditorSystemPrompt = withContentLanguageDirective(HISTORIAN_EDITOR_SYSTEM_PROMPT, deps.language, { preserveUserQuotes: true });
+      if (!forceDrainQuota) {
+        shouldWaitForNewHistorianHistory(boundarySnapshot, {
+          emergency: getOverflowState(db, sessionId).needsEmergencyRecovery,
+          claim: true
+        });
+      }
       const firstResult = await runHistorianSubagentWithTransientRetries({
         runner,
         sessionId,
@@ -30393,6 +30429,7 @@ ${chunkText}`,
           const failCount = incrementHistorianFailure(db, sessionId, errorMsg);
           await notify(buildHistorianFailureNotice(failCount, errorMsg));
         }
+        recordHistorianNoProgress(boundarySnapshot, inEmergency);
         rollbackDrainReservation();
         return;
       }
@@ -30488,6 +30525,7 @@ ${chunkText}`,
         }
         db.exec("COMMIT");
         published = true;
+        clearHistorianHistoryWait(sessionId);
         logSlowWriteTransaction("pi_historian_publish", transactionStartedAt);
       } finally {
         if (!published) {