@cortexkit/opencode-magic-context 0.49.2 → 0.49.3

package/dist/{index-zfzdpeq2.js → index-s4ztdn8v.js}

@@ -64,7 +64,7 @@ import {
   LATEST_SUPPORTED_VERSION,
   getPersistedSchemaVersion,
   openDatabase
-} from "./index-zg8yq4ya.js";
+} from "./index-znzgze2v.js";
 import {
   isPidAlive
 } from "./index-6m7rdv7y.js";
@@ -87,7 +87,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-att4bfan.js";
+} from "./index-xfbfrngb.js";
 import {
   getTableColumnNames
 } from "./index-1bt88epp.js";
@@ -105,7 +105,7 @@ import {
 import {
   shouldSkipHomeProjectMemory,
   resolveProjectIdentity
-} from "./index-gzky5rva.js";
+} from "./index-41gqa557.js";
 import {
   getMeasuredToolDefinitionTokens
 } from "./index-h2wc01qk.js";
@@ -118,7 +118,7 @@ import {
   replaceCompartmentChunkEmbeddings,
   deleteChunkEmbedBackoffForSession,
   chunkWindowSourceKey
-} from "./index-p1hnwfd8.js";
+} from "./index-gcdb3rqw.js";
 import {
   BoundedSessionMap,
   clearCompressionDepth,
@@ -130,10 +130,10 @@ import {
   commitLkgWithRecoveryFence,
   clearLkgRecoveryFence,
   deleteSessionScopedRows,
-  toMessageIndexSource,
-  clearIndexedMessagesInTransaction,
-  indexSourcesAfterOrdinal
-} from "./index-sfhndpcb.js";
+  toMessageIndexSource2,
+  clearIndexedMessagesInTransaction2,
+  indexSourcesAfterOrdinal2
+} from "./index-3wckxwfp.js";
 import {
   retreatPastHostUnservedRows,
   snapTerminalCompartmentToServedRow,
@@ -218,7 +218,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-sv0bb7vg.js";
+} from "./index-7zg9dvx0.js";
 import {
   stripWellFormedLeadingTagPrefix,
   stripTagPrefix,
@@ -231,15 +231,15 @@ import {
   foldShrunkPartTags2,
   getTagNumberByMessageId2,
   getActiveTagsBySession2
-} from "./index-nydv6g8r.js";
+} from "./index-yqps2zsv.js";
 import {
   isStrictGapHealingMessage2,
   noteRawSessionSummaryRowWritten2
-} from "./index-h5zfkjyk.js";
+} from "./index-jpm52v9x.js";
 import {
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-0pjvpfkf.js";
+} from "./index-qvr78ej6.js";
 import {
   drainBackgroundBatches,
   contentSha2562,
@@ -247,7 +247,7 @@ import {
   getProjectChunkEmbeddingModelId2,
   getProjectEmbeddingMaxInputTokens2,
   embedItemsForProject2
-} from "./index-fg00p1cg.js";
+} from "./index-c0b01zrc.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode,
@@ -256,10 +256,16 @@ import {
   insertPrimerCandidates,
   promoteSessionFactsDurable,
   embedPromotedFacts
-} from "./index-rafsaxac.js";
+} from "./index-fjtgekd4.js";
 import {
   pushNotification2
 } from "./index-x8a7jmkh.js";
+import {
+  isMarkerCandidateBasisCurrent2,
+  invalidateMarkerCandidateBasis2,
+  readMarkerCandidateBasis2,
+  prepareMarkerCandidateBasis2
+} from "./index-yxawqmdd.js";
 import {
   computeCueContentHash,
   getMuralCueState,
@@ -270,7 +276,7 @@ import {
 } from "./index-7jzrrxap.js";
 import {
   sendStatusNotification2
-} from "./index-xgrwmj82.js";
+} from "./index-bhk710rw.js";
 import {
   getErrorMessage,
   describeError
@@ -8239,7 +8245,7 @@ function clampWatermark(value, maxCopiedTag) {
 function copySessionStateForClone(db, sourceSessionId, destinationSessionId, filter) {
   return runImmediate(db, () => {
     const hasTemporalDecisions = tableExists(db, "temporal_decisions");
-    if (countRows(db, "compartments", destinationSessionId) > 0 || countRows(db, "tags", destinationSessionId) > 0 || hasTemporalDecisions && countRows(db, "temporal_decisions", destinationSessionId) > 0 || filter.copySessionNotesAndFacts === true && (tableExists(db, "notes") && countRows(db, "notes", destinationSessionId) > 0 || tableExists(db, "session_facts") && countRows(db, "session_facts", destinationSessionId) > 0)) {
+    if (filter.requireEmptyDestinationMeta === true && countRows(db, "session_meta", destinationSessionId) > 0 || countRows(db, "compartments", destinationSessionId) > 0 || countRows(db, "tags", destinationSessionId) > 0 || hasTemporalDecisions && countRows(db, "temporal_decisions", destinationSessionId) > 0 || filter.copySessionNotesAndFacts === true && (tableExists(db, "notes") && countRows(db, "notes", destinationSessionId) > 0 || tableExists(db, "session_facts") && countRows(db, "session_facts", destinationSessionId) > 0)) {
       return {
         kind: "destination-not-empty",
         compartmentsCopied: 0,
@@ -11381,1367 +11387,1394 @@ function upsertMural(db, input) {
   db.prepare("INSERT INTO mural_manifest (project_path, image, content_hash, rendered_at, model, memory_ids_json, width, height) VALUES (?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(project_path) DO UPDATE SET image = excluded.image, content_hash = excluded.content_hash, rendered_at = excluded.rendered_at, model = excluded.model, memory_ids_json = excluded.memory_ids_json, width = excluded.width, height = excluded.height").run(input.projectPath, input.image, input.contentHash, input.renderedAt, input.model, JSON.stringify(input.memoryIds), input.width, input.height);
 }
 
-// src/features/magic-context/compartment-embedding.ts
-async function embedAndStoreCompartmentChunks(db, sessionId, projectPath, compartments) {
-  if (compartments.length === 0)
-    return;
-  if (getProjectChunkEmbeddingModelId2(projectPath) === "off")
-    return;
-  const maxInputTokens = getProjectEmbeddingMaxInputTokens2(projectPath);
-  for (const compartment of compartments) {
-    try {
-      const fromMemory = compartment.sourceChunkText ? canonicalizeInMemoryChunkTextForEmbedding(compartment.sourceChunkText, compartment.startMessage, compartment.endMessage) : "";
-      const mappedText = fromMemory ? fromMemory : buildCanonicalChunkTextFromFts(db, sessionId, compartment.startMessage, compartment.endMessage);
-      if (mappedText === null)
-        continue;
-      const canonicalText = mappedText || buildCompartmentSummaryFallbackText(db, compartment.id);
-      if (canonicalText.length === 0)
-        continue;
-      const windows = chunkCanonicalText(canonicalText, compartment.startMessage, compartment.endMessage, maxInputTokens);
-      if (windows.length === 0)
-        continue;
-      const windowSourceKey = chunkWindowSourceKey(canonicalText, compartment.startMessage, compartment.endMessage, maxInputTokens);
-      const currentModelId = getProjectChunkEmbeddingModelId2(projectPath);
-      if (currentModelId !== "off" && chunkEmbeddingWindowsAreCurrent(db, compartment.id, currentModelId, windows, projectPath)) {
-        continue;
-      }
-      const result = await embedItemsForProject2(projectPath, windows.map((window) => ({
-        id: `chunk:${compartment.id}:${window.windowIndex}`,
-        text: window.text,
-        contentSha256: contentSha2562(window.text)
-      })), undefined, db, sessionId);
-      if (!result)
-        continue;
-      if (chunkEmbeddingWindowsAreCurrent(db, compartment.id, currentModelId, windows, projectPath)) {
-        continue;
-      }
-      const rows = [];
-      for (const window of windows) {
-        const vector = result.vectors.get(`chunk:${compartment.id}:${window.windowIndex}`);
-        if (!vector)
-          continue;
-        rows.push({
-          compartmentId: compartment.id,
-          sessionId,
-          projectPath,
-          window,
-          modelId: currentModelId,
-          vector
-        });
-      }
-      if (rows.length === windows.length) {
-        replaceCompartmentChunkEmbeddings(db, rows, windowSourceKey);
-        enqueueShadowEmbeddingItems2(projectPath, "chunk", [String(compartment.id)]);
-      }
-    } catch (error) {
-      sessionLog2(sessionId, `compartment chunk embedding failed for compartment ${compartment.id}:`, error);
-    } finally {
-      await new Promise((resolve) => setTimeout(resolve, 0));
-    }
+// src/features/magic-context/compaction-marker.ts
+import { createHash as createHash9 } from "node:crypto";
+import { existsSync as existsSync6 } from "node:fs";
+var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+var ID_PREFIX_HEX_LENGTH = 12;
+var ID_SUFFIX_LENGTH = 14;
+var ID_PREFIX_MASK = (1n << BigInt(ID_PREFIX_HEX_LENGTH * 4)) - 1n;
+function deterministicBase62(seed, length) {
+  let value = BigInt(`0x${createHash9("sha256").update(seed).digest("hex")}`);
+  const chars = Array(length);
+  for (let index = length - 1;index >= 0; index -= 1) {
+    chars[index] = BASE62_CHARS[Number(value % 62n)];
+    value /= 62n;
   }
+  return chars.join("");
 }
-
-// src/features/magic-context/store-generation-rebase.ts
-function emptyOutcome(status, generation, previousGeneration) {
-  return {
-    status,
-    generation,
-    previousGeneration,
-    compartmentsRebased: 0,
-    compartmentsUnresolved: 0,
-    compartmentsDerived: 0,
-    compartmentsResolvedAgain: 0,
-    recompCompartmentsRebased: 0,
-    recompCompartmentsUnresolved: 0,
-    notesRebased: 0,
-    notesCleared: 0,
-    priorBoundaryRebased: false,
-    recompPartialRangeRebased: false,
-    compressionDepthRowsDropped: 0,
-    chunkEmbeddingsDeleted: 0,
-    indexRebuilt: false,
-    indexRowsRebuilt: 0,
-    partTagsFolded: 0,
-    partTagsRekeyed: 0,
-    queuedReductionsDiscarded: 0,
-    lkgSlotsDropped: 0,
-    frozenPartEntriesDropped: 0,
-    healedGaps: 0,
-    narrativeGaps: 0
-  };
+function generateId(prefix, timestampMs, counter, identity) {
+  const encoded = BigInt(Math.max(0, Math.floor(timestampMs))) * 0x1000n + counter & ID_PREFIX_MASK;
+  const hex = encoded.toString(16).padStart(ID_PREFIX_HEX_LENGTH, "0");
+  return `${prefix}_${hex}${deterministicBase62(`${prefix}\x00${identity}`, ID_SUFFIX_LENGTH)}`;
 }
-function sessionIsOpenCodeOwned(db, sessionId) {
-  const row = db.prepare("SELECT harness FROM session_meta WHERE session_id = ?").get(sessionId);
-  const harness = row?.harness;
-  if (harness === undefined || harness === null)
-    return true;
-  return harness === "opencode" || harness === "opencode2";
+function generateMessageId(timestampMs, counter = 0n, identity = "") {
+  return generateId("msg", timestampMs, counter, identity);
 }
-function generationImpliedByHarness(db, sessionId) {
-  const row = db.prepare("SELECT harness FROM session_meta WHERE session_id = ?").get(sessionId);
-  if (row?.harness === "opencode")
-    return "v1";
-  if (row?.harness === "opencode2")
-    return "v2";
-  return null;
+function generatePartId(timestampMs, counter = 0n, identity = "") {
+  return generateId("prt", timestampMs, counter, identity);
 }
-function readCoordinateGeneration(db, sessionId) {
-  const row = db.prepare("SELECT coordinate_generation FROM session_meta WHERE session_id = ?").get(sessionId);
-  const value = row?.coordinate_generation;
-  return value === "v1" || value === "v2" ? value : null;
+function getOpenCodeDbPath() {
+  return resolveOpenCodeDbPath().path;
 }
-function readCoordinateRebaseNotice(db, sessionId) {
-  const row = db.prepare("SELECT coordinate_rebase_notice FROM session_meta WHERE session_id = ?").get(sessionId);
-  const raw = row?.coordinate_rebase_notice;
-  if (typeof raw !== "string" || raw.length === 0)
-    return null;
+var cachedWriteDb = null;
+var cachedRemovalDb = null;
+var MARKER_BUSY_TIMEOUT_MS = 250;
+var MARKER_REMOVAL_BUSY_TIMEOUT_MS = 5000;
+function runMarkerRemovalTransaction(db, operation) {
+  return withoutSqliteTransformPass2(() => db.transaction(operation).immediate());
+}
+function runMarkerWriteTransaction(db, site, operation) {
+  if (db.inTransaction)
+    return db.transaction(operation).immediate();
+  const startedAt = performance.now();
+  let acquiredAt;
+  let workFinishedAt;
+  let committed = false;
   try {
-    const parsed = JSON.parse(raw);
-    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
-      return null;
-    const record = parsed;
-    if (record.generation !== "v1" && record.generation !== "v2")
-      return null;
-    const count = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0;
-    const ranges = (value) => Array.isArray(value) ? value.flatMap((entry) => {
-      if (!entry || typeof entry !== "object")
-        return [];
-      const { sequence, start, end } = entry;
-      return typeof sequence === "number" && typeof start === "number" && typeof end === "number" ? [{ sequence, start, end }] : [];
-    }) : [];
-    return {
-      generation: record.generation,
-      previousGeneration: record.previousGeneration === "v1" || record.previousGeneration === "v2" ? record.previousGeneration : null,
-      at: count(record.at),
-      unresolvedCompartments: count(record.unresolvedCompartments),
-      discardedReductions: count(record.discardedReductions),
-      droppedDepthRows: count(record.droppedDepthRows),
-      healedGaps: count(record.healedGaps),
-      narrativeGaps: count(record.narrativeGaps),
-      derivedCompartments: ranges(record.derivedCompartments),
-      unresolvedCompartmentRanges: ranges(record.unresolvedCompartmentRanges),
-      neighbourRecoveryAt: typeof record.neighbourRecoveryAt === "number" && Number.isFinite(record.neighbourRecoveryAt) ? record.neighbourRecoveryAt : null
-    };
-  } catch {
-    return null;
+    const result = db.transaction(() => {
+      acquiredAt = performance.now();
+      try {
+        return operation();
+      } finally {
+        workFinishedAt = performance.now();
+      }
+    }).immediate();
+    committed = true;
+    return result;
+  } finally {
+    const finishedAt = performance.now();
+    const acquireMs = (acquiredAt ?? finishedAt) - startedAt;
+    const holdMs = acquiredAt === undefined ? 0 : finishedAt - acquiredAt;
+    const workMs = acquiredAt === undefined ? 0 : (workFinishedAt ?? finishedAt) - acquiredAt;
+    const endMs = workFinishedAt === undefined ? 0 : finishedAt - workFinishedAt;
+    try {
+      log2(`[magic-context] sqlite writer site=${site} db=opencode acquire_ms=${Math.round(acquireMs)} hold_ms=${Math.round(holdMs)} work_ms=${Math.round(workMs)} end_ms=${Math.round(endMs)} outcome=${acquiredAt === undefined ? "not_acquired" : committed ? "committed" : "failed"}`);
+    } catch {}
   }
 }
-function formatCoordinateRebaseNotice(notice) {
-  const parts = [];
-  if (notice.discardedReductions > 0) {
-    parts.push(`${notice.discardedReductions} queued reduction${notice.discardedReductions === 1 ? " was" : "s were"} discarded because their targets merged in the host's store conversion`);
+var REQUIRED_MESSAGE_COLUMNS = ["id", "session_id", "time_created", "time_updated", "data"];
+var REQUIRED_PART_COLUMNS = [
+  "id",
+  "message_id",
+  "session_id",
+  "time_created",
+  "time_updated",
+  "data"
+];
+var cachedSchemaCompatible = null;
+function isOpenCodeSchemaCompatible(db, dbPath) {
+  if (cachedSchemaCompatible?.path === dbPath) {
+    return cachedSchemaCompatible.compatible;
   }
-  if (notice.derivedCompartments.length > 0) {
-    const count = notice.derivedCompartments.length;
-    parts.push(`${count} compartment${count === 1 ? " was" : "s were"} re-anchored from the compartments around ${count === 1 ? "it" : "them"} (${formatRangeNotes(notice.derivedCompartments)})`);
+  try {
+    const messageCols = new Set(db.prepare("PRAGMA table_info(message)").all().map((r) => r.name ?? "").filter((n) => n.length > 0));
+    const partCols = new Set(db.prepare("PRAGMA table_info(part)").all().map((r) => r.name ?? "").filter((n) => n.length > 0));
+    const missingMessage = REQUIRED_MESSAGE_COLUMNS.filter((c) => !messageCols.has(c));
+    const missingPart = REQUIRED_PART_COLUMNS.filter((c) => !partCols.has(c));
+    if (missingMessage.length > 0 || missingPart.length > 0) {
+      log2(`[magic-context] compaction-marker: OpenCode DB schema missing required columns ` + `(message: [${missingMessage.join(", ")}], part: [${missingPart.join(", ")}]). ` + `Marker injection disabled for this process. ` + `This usually means OpenCode was updated and magic-context is out of date.`);
+      cachedSchemaCompatible = { path: dbPath, compatible: false };
+      return false;
+    }
+    cachedSchemaCompatible = { path: dbPath, compatible: true };
+    return true;
+  } catch (error) {
+    log2(`[magic-context] compaction-marker: schema probe failed: ${error instanceof Error ? error.message : String(error)}. ` + `Marker injection disabled until next process restart.`);
+    cachedSchemaCompatible = { path: dbPath, compatible: false };
+    return false;
   }
-  if (notice.unresolvedCompartments > 0) {
-    const listed = notice.unresolvedCompartmentRanges.length > 0 ? ` (${formatRangeNotes(notice.unresolvedCompartmentRanges)})` : "";
-    parts.push(`${notice.unresolvedCompartments} compartment${notice.unresolvedCompartments === 1 ? "" : "s"} could not be re-anchored and are excluded from range recovery${listed}`);
+}
+function getWritableOpenCodeDb(purpose = "publication") {
+  if (!harnessOwnsOpenCodeStore2()) {
+    throw new Error("OpenCode database is not writable from a Pi-compatible process");
   }
-  if (notice.droppedDepthRows > 0) {
-    parts.push(`${notice.droppedDepthRows} compression-depth records were rebuilt from zero`);
+  const resolution = resolveOpenCodeDbPath();
+  const dbPath = resolution.path;
+  const cached = purpose === "removal" ? cachedRemovalDb : cachedWriteDb;
+  if (cached?.path === dbPath) {
+    return cached.db;
   }
-  if (notice.healedGaps > 0) {
-    parts.push(`${notice.healedGaps} non-narrative compartment gap${notice.healedGaps === 1 ? " was" : "s were"} healed`);
+  if (cached) {
+    try {
+      closeQuietly(cached.db);
+    } catch {}
   }
-  if (notice.narrativeGaps > 0) {
-    parts.push(`${notice.narrativeGaps} narrative compartment gap${notice.narrativeGaps === 1 ? " remains" : "s remain"} for review`);
+  if (!existsSync6(dbPath)) {
+    throw new Error(`OpenCode database not found at ${dbPath} (source=${resolution.source}; is OpenCode installed?)`);
   }
-  return parts.length === 0 ? null : parts.join("; ");
-}
-function formatRangeNotes(notes) {
-  return notes.map((note) => `messages ${note.start}-${note.end}`).join(", ");
-}
-function isCompartmentCoordinateRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const candidate = row;
-  return typeof candidate.id === "number" && typeof candidate.sequence === "number" && typeof candidate.start_message === "number" && typeof candidate.end_message === "number";
-}
-function emptyProjection() {
-  return {
-    ordinalById: new Map,
-    partCountById: new Map,
-    nonNarrativeOrdinals: new Set,
-    messageCount: 0,
-    indexSources: []
-  };
-}
-function addToProjection(projection, messages, withIndexSources) {
-  for (const message of messages) {
-    projection.ordinalById.set(message.id, message.ordinal);
-    projection.partCountById.set(message.id, Array.isArray(message.parts) ? message.parts.length : 0);
-    if (isStrictGapHealingMessage2(message))
-      projection.nonNarrativeOrdinals.add(message.ordinal);
-    if (withIndexSources)
-      projection.indexSources.push(toMessageIndexSource(message));
+  const db = new Database2(dbPath);
+  try {
+    assertOpenCodeStoreGeneration(db, "v1", dbPath);
+  } catch (error) {
+    closeQuietly(db);
+    throw error;
   }
-  projection.messageCount += messages.length;
-}
-function readProjectionPages(args) {
-  if (args.readMessagePages)
-    return args.readMessagePages(args.sessionId);
-  return [args.readMessages(args.sessionId)];
+  const timeoutMs = purpose === "removal" ? MARKER_REMOVAL_BUSY_TIMEOUT_MS : MARKER_BUSY_TIMEOUT_MS;
+  db.exec(`PRAGMA busy_timeout=${timeoutMs}`);
+  db.exec("PRAGMA journal_mode=WAL");
+  if (purpose === "removal")
+    cachedRemovalDb = { path: dbPath, db };
+  else
+    cachedWriteDb = { path: dbPath, db };
+  return db;
 }
-function* buildProjectionSteps(args, withIndexSources) {
-  const projection = emptyProjection();
-  for (const page of readProjectionPages(args)) {
-    addToProjection(projection, page, withIndexSources);
-    yield;
+function getNonSummaryMessageSortKey(sessionId, messageId) {
+  const db = getWritableOpenCodeDb();
+  const row = db.prepare(`SELECT time_created, id
+             FROM message
+             WHERE session_id = ?
+               AND id = ?
+               AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
+                        AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')
+             LIMIT 1`).get(sessionId, messageId);
+  if (typeof row?.time_created !== "number" || typeof row.id !== "string") {
+    return null;
   }
-  return projection;
+  return { id: row.id, timeCreated: row.time_created };
 }
-var INDEX_REBUILD_CHUNK = 2000;
-function messageIdFromAnchorBlockId(anchorBlockId) {
-  const hash = anchorBlockId.lastIndexOf("#");
-  return hash > 0 ? anchorBlockId.slice(0, hash) : anchorBlockId;
+function findBoundaryUserMessage(sessionId, endMessageId) {
+  const db = getWritableOpenCodeDb();
+  const target = getNonSummaryMessageSortKey(sessionId, endMessageId);
+  if (!target)
+    return null;
+  const boundary = db.prepare(`SELECT id, time_created, data
+             FROM message
+             WHERE session_id = ?
+               AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
+                        AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')
+               AND COALESCE(json_extract(data, '$.role'), '') = 'user'
+               AND (time_created, id) <= (?, ?)
+                AND NOT (
+                    EXISTS (SELECT 1 FROM part p
+                            WHERE likelihood(p.message_id = message.id, 0.000001) AND +p.session_id = message.session_id
+                              AND COALESCE(json_extract(p.data, '$.type'), '') <> 'compaction')
+                    AND NOT EXISTS (SELECT 1 FROM part p
+                                    WHERE likelihood(p.message_id = message.id, 0.000001) AND +p.session_id = message.session_id
+                                      AND COALESCE(json_extract(p.data, '$.type'), '') <> 'compaction'
+                                      AND COALESCE(json_extract(p.data, '$.synthetic'), 0) <> 1
+                                      AND COALESCE(json_extract(p.data, '$.syntheticTodoMarker'), 0) <> 1)
+                )
+              ORDER BY time_created DESC, id DESC
+             LIMIT 1`).get(sessionId, target.timeCreated, target.id);
+  if (typeof boundary?.id !== "string" || typeof boundary.time_created !== "number") {
+    return null;
+  }
+  return { id: boundary.id, timeCreated: boundary.time_created };
 }
-function readCompartmentRows(db, table, sessionId) {
-  return db.prepare(`SELECT id, sequence, start_message, end_message, start_message_id, end_message_id, rebase_status
-             FROM ${table} WHERE session_id = ? ORDER BY sequence ASC`).all(sessionId).filter(isCompartmentCoordinateRow);
+function compareOpenCodeMessagesByCanonicalOrder(sessionId, leftMessageId, rightMessageId) {
+  const left = getNonSummaryMessageSortKey(sessionId, leftMessageId);
+  const right = getNonSummaryMessageSortKey(sessionId, rightMessageId);
+  if (!left || !right)
+    return null;
+  if (left.timeCreated < right.timeCreated)
+    return -1;
+  if (left.timeCreated > right.timeCreated)
+    return 1;
+  if (left.id < right.id)
+    return -1;
+  if (left.id > right.id)
+    return 1;
+  return 0;
 }
-function resolveAnchor(messageId, resolveOrdinal) {
-  return messageId && messageId.length > 0 ? resolveOrdinal(messageId) : undefined;
+function isOpenCodeGapHistorianAbsent(sessionId, endId, nextId) {
+  const end = getNonSummaryMessageSortKey(sessionId, endId);
+  const next = getNonSummaryMessageSortKey(sessionId, nextId);
+  if (!end || !next || end.timeCreated > next.timeCreated || end.timeCreated === next.timeCreated && end.id >= next.id)
+    return false;
+  const row = getWritableOpenCodeDb().prepare(`SELECT 1 FROM message m
+        WHERE m.session_id=?
+          AND (m.time_created, m.id) > (?, ?)
+          AND (m.time_created, m.id) < (?, ?)
+          AND NOT (COALESCE(json_type(m.data,'$.summary'),'')='true' AND COALESCE(json_extract(m.data,'$.finish'),'')='stop')
+          AND NOT (
+            EXISTS (SELECT 1 FROM part p WHERE likelihood(p.message_id=m.id, 0.000001) AND +p.session_id=m.session_id AND COALESCE(json_extract(p.data,'$.type'),'')<>'compaction')
+            AND NOT EXISTS (SELECT 1 FROM part p WHERE likelihood(p.message_id=m.id, 0.000001) AND +p.session_id=m.session_id
+                AND COALESCE(json_extract(p.data,'$.type'),'')<>'compaction'
+                AND COALESCE(json_type(p.data,'$.synthetic'),'')<>'true'
+                AND COALESCE(json_type(p.data,'$.syntheticTodoMarker'),'')<>'true')
+          ) LIMIT 1`).get(sessionId, end.timeCreated, end.id, next.timeCreated, next.id);
+  return !row;
 }
-function planCompartments(rows, table, projection) {
-  const resolveOrdinal = (messageId) => projection.ordinalById.get(messageId);
-  return recoverFromNeighbours(rows, table, rows.map((row) => ({
-    start: resolveAnchor(row.start_message_id, resolveOrdinal),
-    end: resolveAnchor(row.end_message_id, resolveOrdinal)
-  })));
+function getOpenCodeMessageById(sessionId, messageId) {
+  const db = getWritableOpenCodeDb();
+  const row = db.prepare(`SELECT id FROM message WHERE session_id = ? AND id = ? LIMIT 1`).get(sessionId, messageId);
+  return row ?? null;
 }
-function recoverFromNeighbours(rows, table, known) {
-  const plans = rows.map((row, index) => {
-    const own = known[index] ?? { start: undefined, end: undefined };
-    const previousEnd = index === 0 ? 0 : known[index - 1]?.end;
-    const nextStart = index === rows.length - 1 ? undefined : known[index + 1]?.start;
-    const start = own.start ?? (previousEnd === undefined ? undefined : previousEnd + 1);
-    const end = own.end ?? (nextStart === undefined ? undefined : nextStart - 1);
-    const base = {
-      table,
-      id: row.id,
-      sequence: row.sequence,
-      previousStart: row.start_message,
-      previousEnd: row.end_message,
-      previousStatus: row.rebase_status === "unresolved" ? "unresolved" : "ok"
-    };
-    if (start !== undefined && end !== undefined && start <= end) {
-      return {
-        ...base,
-        start,
-        end,
-        status: "ok",
-        derived: own.start === undefined || own.end === undefined
-      };
-    }
-    return {
-      ...base,
-      start: start ?? row.start_message,
-      end: end ?? row.end_message,
-      status: "unresolved",
-      derived: false
-    };
-  });
-  for (let index = 0;index < plans.length; index += 1) {
-    const plan = plans[index];
-    if (plan?.status !== "unresolved")
-      continue;
-    const previous = plans[index - 1];
-    const next = plans[index + 1];
-    if (previous?.status === "ok" && plan.start <= previous.end) {
-      plan.start = previous.end + 1;
-    }
-    if (next?.status === "ok" && plan.end >= next.start) {
-      plan.end = next.start - 1;
-    }
+var LEGACY_MARKER_LINEAGE_SQL = `SELECT m.id
+    FROM message m
+    WHERE +m.session_id = ? AND m.id IN (SELECT value FROM json_each(?)) AND m.id <> ?
+      AND COALESCE(json_extract(m.data, '$.summary'), 0) = 1
+      AND COALESCE(json_extract(m.data, '$.finish'), '') = 'stop'
+      AND COALESCE(json_extract(m.data, '$.parentID'), '') = ?
+      AND EXISTS (SELECT 1 FROM part p
+        WHERE +p.session_id = m.session_id AND p.message_id = m.id
+          AND COALESCE(json_extract(p.data, '$.type'), '') = 'text'
+          AND COALESCE(json_extract(p.data, '$.text'), '') = ?)`;
+function removeLegacyMarkerLineageRows(db, args) {
+  const legacySummaries = db.prepare(LEGACY_MARKER_LINEAGE_SQL).all(args.sessionId, JSON.stringify(args.candidateIds), args.summaryMessageId, args.boundaryMessageId, args.summaryText);
+  const legacySummaryIds = legacySummaries.flatMap((row) => typeof row.id === "string" ? [row.id] : []);
+  if (legacySummaryIds.length === 0)
+    return;
+  const deleteSummaryParts = db.prepare("DELETE FROM part WHERE +session_id = ? AND message_id = ?");
+  const deleteSummary = db.prepare("DELETE FROM message WHERE session_id = ? AND id = ?");
+  for (const summaryMessageId of legacySummaryIds) {
+    deleteSummaryParts.run(args.sessionId, summaryMessageId);
+    deleteSummary.run(args.sessionId, summaryMessageId);
   }
-  return plans;
+  db.prepare(`DELETE FROM part
+         WHERE +session_id = ?
+           AND message_id = ?
+           AND id <> ?
+           AND COALESCE(json_extract(data, '$.type'), '') = 'compaction'
+           AND COALESCE(json_extract(data, '$.auto'), 0) = 1`).run(args.sessionId, args.boundaryMessageId, args.compactionPartId);
 }
-function healNonNarrativeCompartmentGaps(plans, projection) {
-  let healed = 0;
-  let narrative = 0;
-  for (let index = 1;index < plans.length; index += 1) {
-    const previous = plans[index - 1];
-    const current = plans[index];
-    if (!previous || !current || previous.status !== "ok" || current.status !== "ok")
-      continue;
-    const gapStart = previous.end + 1;
-    const gapEnd = current.start - 1;
-    if (gapEnd < gapStart)
-      continue;
-    let safeToHeal = true;
-    for (let ordinal = gapStart;ordinal <= gapEnd; ordinal += 1) {
-      if (!projection.nonNarrativeOrdinals.has(ordinal)) {
-        safeToHeal = false;
-        break;
-      }
-    }
-    if (safeToHeal) {
-      previous.end = gapEnd;
-      healed += 1;
-    } else {
-      narrative += 1;
-    }
+async function prepareCompactionMarkerCandidates(sessionId, options = {}) {
+  if (!harnessOwnsOpenCodeStore2())
+    return true;
+  try {
+    return await prepareMarkerCandidateBasis2(getWritableOpenCodeDb(), sessionId, options);
+  } catch (error) {
+    log2(`[magic-context] compaction-marker: deferred candidate preparation for ${sessionId}: ${error instanceof Error ? error.message : String(error)}; marker unchanged`);
+    return false;
   }
-  return { healed, narrative };
-}
-function compartmentPlanChanges(plan) {
-  return plan.status !== plan.previousStatus || plan.start !== plan.previousStart || plan.end !== plan.previousEnd;
-}
-function rangeNotes(plans, predicate) {
-  return plans.filter((plan) => plan.table === "compartments" && predicate(plan)).map((plan) => ({ sequence: plan.sequence, start: plan.start, end: plan.end }));
-}
-function planNotes(db, sessionId, projection) {
-  const rows = db.prepare("SELECT id, anchor_ordinal, anchor_block_id FROM notes WHERE session_id = ? AND anchor_ordinal IS NOT NULL").all(sessionId);
-  return rows.flatMap((row) => {
-    if (typeof row.id !== "number")
-      return [];
-    const previousOrdinal = typeof row.anchor_ordinal === "number" ? row.anchor_ordinal : null;
-    const anchorBlockId = typeof row.anchor_block_id === "string" ? row.anchor_block_id : "";
-    if (anchorBlockId.length === 0) {
-      return [{ id: row.id, ordinal: null, previousOrdinal }];
-    }
-    const ordinal = projection.ordinalById.get(messageIdFromAnchorBlockId(anchorBlockId));
-    return [{ id: row.id, ordinal: ordinal ?? null, previousOrdinal }];
-  });
-}
-function countRows2(db, sql, ...params) {
-  const row = db.prepare(sql).get(...params);
-  return typeof row?.count === "number" ? row.count : 0;
 }
-function stampGeneration(db, sessionId, generation, notice) {
-  ensureSessionMetaRow(db, sessionId);
-  if (notice === null) {
-    db.prepare("UPDATE session_meta SET coordinate_generation = ? WHERE session_id = ?").run(generation, sessionId);
-    return;
+function injectCompactionMarkerFromBasis(args, validatedBasis) {
+  const db = getWritableOpenCodeDb();
+  if (!isOpenCodeSchemaCompatible(db, getOpenCodeDbPath())) {
+    return null;
   }
-  db.prepare("UPDATE session_meta SET coordinate_generation = ?, coordinate_rebase_notice = ? WHERE session_id = ?").run(generation, JSON.stringify(notice), sessionId);
-}
-function pruneShrunkPartEntries(db, sessionId, column, shrunk) {
-  if (shrunk.length === 0)
-    return 0;
-  const row = db.prepare(`SELECT ${column} AS value FROM session_meta WHERE session_id = ?`).get(sessionId);
-  const raw = row?.value;
-  if (typeof raw !== "string" || raw.length === 0)
-    return 0;
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    return 0;
+  const boundary = args.resolvedBoundary ?? findBoundaryUserMessage(args.sessionId, args.endMessageId);
+  if (!boundary) {
+    log2(`[magic-context] compaction-marker: no user message found at or before endMessageId ${args.endMessageId} (ordinal ${args.endOrdinal})`);
+    return null;
   }
-  const partCountByMessage = new Map(shrunk.map((entry) => [entry.messageId, entry.partCount]));
-  const isStale = (candidate) => {
-    const marker = candidate.lastIndexOf(":p");
-    if (marker < 0)
-      return false;
-    const suffix = candidate.slice(marker + 2);
-    if (!/^\d+$/.test(suffix))
-      return false;
-    const partCount = partCountByMessage.get(candidate.slice(0, marker));
-    return partCount !== undefined && Number.parseInt(suffix, 10) >= partCount;
-  };
-  let dropped = 0;
-  const pruneArray = (values) => values.filter((value) => {
-    if (typeof value === "string" && isStale(value)) {
-      dropped += 1;
-      return false;
-    }
-    return true;
+  const boundaryTime = boundary.timeCreated;
+  const markerIdentity = `${args.sessionId}\x00${args.endMessageId}`;
+  const summaryMsgId = generateMessageId(boundaryTime + 1, 1n, `${markerIdentity}\x00summary-message`);
+  const compactionPartId = generatePartId(boundaryTime, 1n, `${markerIdentity}\x00compaction-part`);
+  const summaryPartId = generatePartId(boundaryTime + 1, 2n, `${markerIdentity}\x00summary-part`);
+  const summaryMsgData = JSON.stringify({
+    role: "assistant",
+    parentID: boundary.id,
+    summary: true,
+    finish: "stop",
+    mode: "compaction",
+    agent: "compaction",
+    path: { cwd: args.directory, root: args.directory },
+    cost: 0,
+    tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+    modelID: "magic-context",
+    providerID: "magic-context",
+    time: { created: boundaryTime + 1, completed: boundaryTime + 1 }
   });
-  let next;
-  if (Array.isArray(parsed)) {
-    next = pruneArray(parsed);
-  } else if (parsed && typeof parsed === "object") {
-    const source = parsed;
-    const result = {};
-    for (const [key, value] of Object.entries(source)) {
-      if (isStale(key)) {
-        dropped += 1;
-        continue;
-      }
-      result[key] = Array.isArray(value) ? pruneArray(value) : value;
-    }
-    next = result;
-  } else {
-    return 0;
-  }
-  if (dropped === 0)
-    return 0;
-  db.prepare(`UPDATE session_meta SET ${column} = ? WHERE session_id = ?`).run(JSON.stringify(next), sessionId);
-  return dropped;
-}
-var REBASE_SLICE_MS = 20;
-var rebasesInFlight = new WeakMap;
-async function rebaseSessionCoordinatesAsync(args) {
-  let sessions = rebasesInFlight.get(args.db);
-  if (!sessions) {
-    sessions = new Map;
-    rebasesInFlight.set(args.db, sessions);
-  }
-  const earlier = sessions.get(args.sessionId);
-  if (earlier)
-    await earlier.catch(() => {
-      return;
-    });
-  const run = runSliced(args);
-  sessions.set(args.sessionId, run);
   try {
-    return await run;
-  } finally {
-    if (sessions.get(args.sessionId) === run)
-      sessions.delete(args.sessionId);
+    const basis = validatedBasis ?? readMarkerCandidateBasis2(db, args.sessionId);
+    if (!basis)
+      return null;
+    runMarkerWriteTransaction(db, "compaction-marker-inject", () => {
+      if (!validatedBasis && !isMarkerCandidateBasisCurrent2(db, basis))
+        throw new Error("host store changed after marker candidate preparation; marker unchanged");
+      removeLegacyMarkerLineageRows(db, {
+        sessionId: args.sessionId,
+        boundaryMessageId: boundary.id,
+        candidateIds: basis.ids,
+        summaryText: args.summaryText,
+        summaryMessageId: summaryMsgId,
+        compactionPartId
+      });
+      db.prepare(`INSERT INTO part (id, message_id, session_id, time_created, time_updated, data)
+                 VALUES (?, ?, ?, ?, ?, ?)
+                 ON CONFLICT(id) DO UPDATE SET
+                     message_id = excluded.message_id,
+                     session_id = excluded.session_id,
+                     time_created = excluded.time_created,
+                     time_updated = excluded.time_updated,
+                     data = excluded.data`).run(compactionPartId, boundary.id, args.sessionId, boundaryTime, boundaryTime, '{"type":"compaction","auto":true}');
+      db.prepare(`INSERT INTO message (id, session_id, time_created, time_updated, data)
+                 VALUES (?, ?, ?, ?, ?)
+                 ON CONFLICT(id) DO UPDATE SET
+                     session_id = excluded.session_id,
+                     time_created = excluded.time_created,
+                     time_updated = excluded.time_updated,
+                     data = excluded.data`).run(summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, summaryMsgData);
+      noteRawSessionSummaryRowWritten2(args.sessionId, summaryMsgId);
+      invalidateMarkerCandidateBasis2(db, args.sessionId);
+      db.prepare(`INSERT INTO part (id, message_id, session_id, time_created, time_updated, data)
+                 VALUES (?, ?, ?, ?, ?, ?)
+                 ON CONFLICT(id) DO UPDATE SET
+                     message_id = excluded.message_id,
+                     session_id = excluded.session_id,
+                     time_created = excluded.time_created,
+                     time_updated = excluded.time_updated,
+                     data = excluded.data`).run(summaryPartId, summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, JSON.stringify({ type: "text", text: args.summaryText }));
+    });
+    log2(`[magic-context] compaction-marker: injected boundary at user msg ${boundary.id} (ordinal ~${args.endOrdinal}), summary msg ${summaryMsgId}`);
+    return {
+      boundaryMessageId: boundary.id,
+      summaryMessageId: summaryMsgId,
+      compactionPartId,
+      summaryPartId
+    };
+  } catch (error) {
+    log2(`[magic-context] compaction-marker: injection failed: ${error instanceof Error ? error.message : String(error)}`);
+    return null;
   }
 }
-async function runSliced(args) {
-  const steps = rebaseSteps(args);
-  let finished = false;
+
+class MarkerCandidateUnavailableError extends Error {
+}
+function replaceCompactionMarker(existing, args) {
+  let connection;
+  let entered = false;
+  let readyToCommit = false;
   try {
-    let sliceStartedAt = performance.now();
-    for (;; ) {
-      const step = steps.next();
-      if (step.done) {
-        finished = true;
-        return step.value;
+    const db = getWritableOpenCodeDb();
+    connection = db;
+    const basis = readMarkerCandidateBasis2(db, args.sessionId);
+    if (!basis) {
+      return {
+        kind: "deferred",
+        error: new Error("marker candidate preparation pending; marker unchanged")
+      };
+    }
+    const marker = runMarkerWriteTransaction(db, "compaction-marker-replace", () => {
+      entered = true;
+      if (!isMarkerCandidateBasisCurrent2(db, basis))
+        throw new MarkerCandidateUnavailableError("host store changed after marker candidate preparation; marker unchanged");
+      if (existing) {
+        db.prepare("DELETE FROM part WHERE id = ?").run(existing.summaryPartId);
+        db.prepare("DELETE FROM message WHERE id = ?").run(existing.summaryMessageId);
+        db.prepare("DELETE FROM part WHERE id = ?").run(existing.compactionPartId);
       }
-      if (performance.now() - sliceStartedAt >= REBASE_SLICE_MS) {
-        await new Promise((resolve) => setImmediate(resolve));
-        sliceStartedAt = performance.now();
+      const replacement = injectCompactionMarkerFromBasis(args, basis);
+      if (!replacement) {
+        throw new Error(`failed to inject replacement marker at ordinal ${args.endOrdinal}`);
       }
-    }
-  } finally {
-    if (!finished)
-      steps.return(emptyOutcome("unchanged", args.generation, null));
+      readyToCommit = true;
+      return replacement;
+    });
+    return { kind: "committed", marker };
+  } catch (error) {
+    if (error instanceof MarkerCandidateUnavailableError)
+      return { kind: "deferred", error };
+    log2(`[magic-context] compaction-marker: atomic replacement failed: ${error instanceof Error ? error.message : String(error)}`);
+    const definitelyNoCut = !entered || !readyToCommit && connection?.inTransaction === false;
+    return {
+      kind: definitelyNoCut ? "definitely-no-cut" : "uncertain",
+      error: error instanceof Error ? error : new Error(String(error))
+    };
   }
 }
-function* rebaseSteps(args) {
-  const { db, sessionId, generation } = args;
-  const startedAt = performance.now();
-  if (!sessionIsOpenCodeOwned(db, sessionId)) {
-    return emptyOutcome("unchanged", generation, null);
+function listSessionCompactionMarkers(sessionId) {
+  const db = getWritableOpenCodeDb();
+  const summaryRows = db.prepare(`SELECT id, json_extract(data, '$.parentID') AS boundary_message_id
+             FROM message
+             WHERE session_id = ?
+               AND COALESCE(json_extract(data, '$.summary'), 0) = 1
+               AND COALESCE(json_extract(data, '$.finish'), '') = 'stop'
+               AND COALESCE(json_extract(data, '$.providerID'), '') = 'magic-context'
+             ORDER BY time_created ASC, id ASC`).all(sessionId);
+  const summaryIdsByBoundary = new Map;
+  for (const row of summaryRows) {
+    if (typeof row.id !== "string" || typeof row.boundary_message_id !== "string")
+      continue;
+    const summaryIds = summaryIdsByBoundary.get(row.boundary_message_id) ?? [];
+    summaryIds.push(row.id);
+    summaryIdsByBoundary.set(row.boundary_message_id, summaryIds);
   }
-  const previousGeneration = readCoordinateGeneration(db, sessionId);
-  if (previousGeneration === generation) {
-    const outcome = emptyOutcome("unchanged", generation, previousGeneration);
-    const repair = repairStampedSessionOnce(db, sessionId, args);
-    if (repair !== null && repair.rowsRewritten > 0) {
-      outcome.status = "repaired";
-      outcome.compartmentsDerived = repair.derived.length;
-      outcome.compartmentsUnresolved = repair.unresolved.length;
+  const boundaryIds = [...summaryIdsByBoundary.keys()];
+  const markers = [];
+  const chunkSize = 800;
+  for (let offset = 0;offset < boundaryIds.length; offset += chunkSize) {
+    const boundaryChunk = boundaryIds.slice(offset, offset + chunkSize);
+    const placeholders = boundaryChunk.map(() => "?").join(", ");
+    const partRows = db.prepare(`SELECT id, message_id, time_created
+                 FROM part
+                 WHERE +session_id = ?
+                   AND likelihood(message_id IN (${placeholders}), 0.000001)
+                   AND COALESCE(json_extract(data, '$.type'), '') = 'compaction'
+                 ORDER BY time_created ASC, id ASC`).all(sessionId, ...boundaryChunk);
+    for (const row of partRows) {
+      if (typeof row.id !== "string" || typeof row.message_id !== "string" || typeof row.time_created !== "number") {
+        continue;
+      }
+      const summaryMessageIds = summaryIdsByBoundary.get(row.message_id);
+      if (!summaryMessageIds)
+        continue;
+      markers.push({
+        compactionPartId: row.id,
+        boundaryMessageId: row.message_id,
+        summaryMessageIds: [...summaryMessageIds],
+        timeCreated: row.time_created
+      });
     }
-    return outcome;
   }
-  const impliedGeneration = previousGeneration ?? generationImpliedByHarness(db, sessionId) ?? generation;
-  if (impliedGeneration === generation) {
-    stampGeneration(db, sessionId, generation, null);
-    return emptyOutcome("stamped", generation, previousGeneration);
-  }
-  const projection = yield* buildProjectionSteps(args, true);
-  const outcome = emptyOutcome("rebased", generation, impliedGeneration);
-  const compartmentRows = readCompartmentRows(db, "compartments", sessionId);
-  const recompRows = readCompartmentRows(db, "recomp_compartments", sessionId);
-  const compartmentPlans = planCompartments(compartmentRows, "compartments", projection);
-  const recompPlans = planCompartments(recompRows, "recomp_compartments", projection);
-  const compartmentGapResult = healNonNarrativeCompartmentGaps(compartmentPlans, projection);
-  const recompGapResult = healNonNarrativeCompartmentGaps(recompPlans, projection);
-  const notePlans = planNotes(db, sessionId, projection);
-  const shrunkMessages = [];
-  const taggedMessageIds = new Set(db.prepare("SELECT message_id FROM tags WHERE session_id = ? AND type = 'message'").all(sessionId).flatMap((row) => typeof row.message_id === "string" ? [row.message_id] : []));
-  const highestTaggedPartIndex = new Map;
-  for (const contentId of taggedMessageIds) {
-    const marker = contentId.lastIndexOf(":p");
-    if (marker <= 0)
-      continue;
-    const suffix = contentId.slice(marker + 2);
-    if (!/^\d+$/.test(suffix))
-      continue;
-    const messageId = contentId.slice(0, marker);
-    const partIndex = Number.parseInt(suffix, 10);
-    highestTaggedPartIndex.set(messageId, Math.max(highestTaggedPartIndex.get(messageId) ?? 0, partIndex));
-  }
-  for (const [messageId, highestIndex] of highestTaggedPartIndex) {
-    const partCount = projection.partCountById.get(messageId);
-    if (partCount === undefined || highestIndex < partCount)
-      continue;
-    shrunkMessages.push({ messageId, partCount });
-  }
-  const indexNeedsRebuild = indexDisagreesWithProjection(db, sessionId, projection);
-  const chunkEmbeddingCount = countRows2(db, "SELECT COUNT(*) AS count FROM compartment_chunk_embeddings WHERE session_id = ?", sessionId);
-  const depthRowCount = countRows2(db, "SELECT COUNT(*) AS count FROM compression_depth WHERE session_id = ?", sessionId);
-  const lkgSlotCount = countRows2(db, "SELECT COUNT(*) AS count FROM lkg_slots WHERE session_id = ?", sessionId);
-  const boundaryPlan = planPriorBoundary(db, sessionId, compartmentPlans);
-  const partialRangePlan = planRecompPartialRange(db, sessionId, recompPlans);
-  outcome.healedGaps = compartmentGapResult.healed + recompGapResult.healed;
-  outcome.narrativeGaps = compartmentGapResult.narrative + recompGapResult.narrative;
-  const movedCompartments = compartmentPlans.filter(compartmentPlanChanges);
-  const movedRecomp = recompPlans.filter(compartmentPlanChanges);
-  const movedNotes = notePlans.filter((plan) => plan.ordinal !== plan.previousOrdinal);
-  const anythingMoved = movedCompartments.length > 0 || movedRecomp.length > 0 || movedNotes.length > 0 || shrunkMessages.length > 0 || indexNeedsRebuild || boundaryPlan !== null || partialRangePlan !== null || outcome.healedGaps > 0 || outcome.narrativeGaps > 0;
-  if (!anythingMoved) {
-    stampGeneration(db, sessionId, generation, null);
-    return emptyOutcome("stamped", generation, impliedGeneration);
-  }
-  db.exec("BEGIN IMMEDIATE");
-  let closed = false;
+  markers.sort((left, right) => left.timeCreated - right.timeCreated || left.compactionPartId.localeCompare(right.compactionPartId));
+  return markers.map(({ timeCreated: _, ...marker }) => marker);
+}
+function removeForeignCompactionMarker(sessionId, marker, protectedSummaryMessageId) {
   try {
-    if (readCoordinateGeneration(db, sessionId) !== previousGeneration) {
-      db.exec("ROLLBACK");
-      closed = true;
-      return emptyOutcome("unchanged", generation, readCoordinateGeneration(db, sessionId));
-    }
-    clearCachedM0M1(db, sessionId);
-    db.prepare("UPDATE session_meta SET system_prompt_hash = '' WHERE session_id = ?").run(sessionId);
-    for (const column of [
-      "stripped_placeholder_ids",
-      "merged_reasoning_stripped_ids",
-      "trailing_blank_decisions"
-    ]) {
-      outcome.frozenPartEntriesDropped += pruneShrunkPartEntries(db, sessionId, column, shrunkMessages);
-    }
-    const fold = foldShrunkPartTags2(db, sessionId, shrunkMessages);
-    outcome.partTagsFolded = fold.foldedTagNumbers.length;
-    outcome.partTagsRekeyed = fold.rekeyedTagNumbers.length;
-    outcome.queuedReductionsDiscarded = fold.discardedDropTagNumbers.length;
-    const updateCompartment = {
-      compartments: db.prepare("UPDATE compartments SET start_message = ?, end_message = ?, rebase_status = ? WHERE id = ?"),
-      recomp_compartments: db.prepare("UPDATE recomp_compartments SET start_message = ?, end_message = ?, rebase_status = ? WHERE id = ?")
-    };
-    for (const plan of [...compartmentPlans, ...recompPlans]) {
-      if (!compartmentPlanChanges(plan))
-        continue;
-      updateCompartment[plan.table].run(plan.start, plan.end, plan.status, plan.id);
-      const rebased = plan.status === "ok" ? 1 : 0;
-      const unresolved = plan.status === "unresolved" ? 1 : 0;
-      if (plan.table === "compartments") {
-        outcome.compartmentsRebased += rebased;
-        outcome.compartmentsUnresolved += unresolved;
-        if (rebased === 1 && plan.derived)
-          outcome.compartmentsDerived += 1;
-        if (rebased === 1 && plan.previousStatus === "unresolved")
-          outcome.compartmentsResolvedAgain += 1;
-      } else {
-        outcome.recompCompartmentsRebased += rebased;
-        outcome.recompCompartmentsUnresolved += unresolved;
+    const db = getWritableOpenCodeDb("removal");
+    runMarkerRemovalTransaction(db, () => {
+      const deletePartsOfMessage = db.prepare("DELETE FROM part WHERE +session_id = ? AND message_id = ?");
+      const deleteMessage = db.prepare("DELETE FROM message WHERE session_id = ? AND id = ?");
+      for (const summaryMessageId of marker.summaryMessageIds) {
+        if (summaryMessageId === protectedSummaryMessageId)
+          continue;
+        deletePartsOfMessage.run(sessionId, summaryMessageId);
+        deleteMessage.run(sessionId, summaryMessageId);
       }
-    }
-    const updateNote = db.prepare("UPDATE notes SET anchor_ordinal = ? WHERE id = ? AND session_id = ?");
-    for (const plan of movedNotes) {
-      updateNote.run(plan.ordinal, plan.id, sessionId);
-      if (plan.ordinal === null)
-        outcome.notesCleared += 1;
-      else
-        outcome.notesRebased += 1;
-    }
-    if (boundaryPlan !== null) {
-      db.prepare("UPDATE session_meta SET prior_boundary_ordinal = ? WHERE session_id = ?").run(boundaryPlan, sessionId);
-      outcome.priorBoundaryRebased = true;
-    }
-    if (partialRangePlan !== null) {
-      db.prepare("UPDATE session_meta SET recomp_partial_range_start = ?, recomp_partial_range_end = ? WHERE session_id = ?").run(partialRangePlan.start, partialRangePlan.end, sessionId);
-      outcome.recompPartialRangeRebased = true;
-    }
-    if (indexNeedsRebuild) {
-      clearIndexedMessagesInTransaction(db, sessionId);
-      outcome.indexRebuilt = true;
-      outcome.compressionDepthRowsDropped = depthRowCount;
-    }
-    if (chunkEmbeddingCount > 0) {
-      db.prepare("DELETE FROM compartment_chunk_embeddings WHERE session_id = ?").run(sessionId);
-      outcome.chunkEmbeddingsDeleted = chunkEmbeddingCount;
-    }
-    if (lkgSlotCount > 0) {
-      db.prepare("DELETE FROM lkg_slot_chunks WHERE session_id = ?").run(sessionId);
-      db.prepare("DELETE FROM lkg_slots WHERE session_id = ?").run(sessionId);
-      outcome.lkgSlotsDropped = lkgSlotCount;
-    }
-    stampGeneration(db, sessionId, generation, {
-      generation,
-      previousGeneration: impliedGeneration,
-      at: Date.now(),
-      unresolvedCompartments: outcome.compartmentsUnresolved + outcome.recompCompartmentsUnresolved,
-      discardedReductions: outcome.queuedReductionsDiscarded,
-      droppedDepthRows: outcome.compressionDepthRowsDropped,
-      healedGaps: outcome.healedGaps,
-      narrativeGaps: outcome.narrativeGaps,
-      derivedCompartments: rangeNotes(compartmentPlans, (plan) => plan.status === "ok" && plan.derived),
-      unresolvedCompartmentRanges: rangeNotes(compartmentPlans, (plan) => plan.status === "unresolved"),
-      neighbourRecoveryAt: Date.now()
+      db.prepare("DELETE FROM part WHERE session_id = ? AND id = ?").run(sessionId, marker.compactionPartId);
     });
-    db.exec("COMMIT");
-    closed = true;
-  } finally {
-    if (!closed) {
-      try {
-        db.exec("ROLLBACK");
-      } catch {}
-    }
+    return true;
+  } catch (error) {
+    log2(`[magic-context] compaction-marker: foreign-marker removal failed (${sessionId}, part ${marker.compactionPartId}): ${error instanceof Error ? error.message : String(error)}`);
+    return false;
   }
-  if (outcome.indexRebuilt) {
-    const sources = projection.indexSources;
-    for (let start = 0;start < sources.length; start += INDEX_REBUILD_CHUNK) {
-      indexSourcesAfterOrdinal(db, sessionId, sources.slice(start, start + INDEX_REBUILD_CHUNK), sources.length);
-      yield;
-    }
-    outcome.indexRowsRebuilt = countRows2(db, "SELECT COUNT(*) AS count FROM message_history_source WHERE session_id = ?", sessionId);
+}
+function dataReferencesTailStart(data) {
+  if (typeof data !== "object" || data === null)
+    return null;
+  const record = data;
+  if (typeof record.tail_start_id === "string" && record.tail_start_id.length > 0) {
+    return record.tail_start_id;
   }
-  sessionLog2(sessionId, formatRebaseLogLine(outcome, performance.now() - startedAt));
-  return outcome;
+  const nested = record.compaction;
+  if (typeof nested === "object" && nested !== null) {
+    const nestedTail = nested.tail_start_id;
+    if (typeof nestedTail === "string" && nestedTail.length > 0)
+      return nestedTail;
+  }
+  return null;
 }
-function recoverUnresolvedCompartments(args) {
-  const { db, sessionId } = args;
-  const rows = readCompartmentRows(db, "compartments", sessionId);
-  const result = { rowsRewritten: 0, derived: [], unresolved: [] };
-  if (!rows.some((row) => row.rebase_status === "unresolved"))
-    return result;
-  const known = rows.map((row) => {
-    if (row.rebase_status !== "unresolved") {
-      return { start: row.start_message, end: row.end_message };
-    }
+function isMcCanonicalCompactionPartData(data) {
+  if (typeof data !== "object" || data === null || Array.isArray(data))
+    return false;
+  const record = data;
+  const keys = Object.keys(record).sort();
+  return keys.length === 2 && keys[0] === "auto" && keys[1] === "type" && record.type === "compaction" && record.auto === true;
+}
+function removeMcOwnedCompactionMarkers(sessionId, summaryText) {
+  const db = getWritableOpenCodeDb("removal");
+  if (!isOpenCodeSchemaCompatible(db, getOpenCodeDbPath())) {
     return {
-      start: resolveAnchor(row.start_message_id, args.resolveOrdinal),
-      end: resolveAnchor(row.end_message_id, args.resolveOrdinal)
+      verified: false,
+      removedLineages: 0,
+      removedRows: 0,
+      retainedLineages: 0
     };
-  });
-  const plans = recoverFromNeighbours(rows, "compartments", known);
-  const wasUnresolved = (plan) => plan.previousStatus === "unresolved";
-  result.derived = rangeNotes(plans, (plan) => wasUnresolved(plan) && plan.status === "ok" && plan.derived);
-  result.unresolved = rangeNotes(plans, (plan) => plan.status === "unresolved");
-  const changed = plans.filter(compartmentPlanChanges);
-  const now = Date.now();
-  db.exec("BEGIN IMMEDIATE");
-  let committed = false;
-  try {
-    for (const plan of changed) {
-      db.prepare("UPDATE compartments SET start_message = ?, end_message = ?, rebase_status = ? WHERE id = ?").run(plan.start, plan.end, plan.status, plan.id);
-    }
-    const previous = readCoordinateRebaseNotice(db, sessionId);
-    const generation = previous?.generation ?? readCoordinateGeneration(db, sessionId);
-    if (generation !== null) {
-      const derivedSequences = new Set(result.derived.map((note) => note.sequence));
-      const notice = {
-        generation,
-        previousGeneration: previous?.previousGeneration ?? null,
-        at: previous?.at ?? now,
-        unresolvedCompartments: result.unresolved.length,
-        discardedReductions: previous?.discardedReductions ?? 0,
-        droppedDepthRows: previous?.droppedDepthRows ?? 0,
-        healedGaps: previous?.healedGaps ?? 0,
-        narrativeGaps: previous?.narrativeGaps ?? 0,
-        derivedCompartments: [
-          ...(previous?.derivedCompartments ?? []).filter((note) => !derivedSequences.has(note.sequence)),
-          ...result.derived
-        ],
-        unresolvedCompartmentRanges: result.unresolved,
-        neighbourRecoveryAt: now
-      };
-      ensureSessionMetaRow(db, sessionId);
-      db.prepare("UPDATE session_meta SET coordinate_rebase_notice = ? WHERE session_id = ?").run(JSON.stringify(notice), sessionId);
-    }
-    db.exec("COMMIT");
-    committed = true;
-  } finally {
-    if (!committed) {
-      try {
-        db.exec("ROLLBACK");
-      } catch {}
+  }
+  const canonicalSummaries = db.prepare(`SELECT id, COALESCE(json_extract(data, '$.parentID'), '') AS parent_id
+             FROM message
+             WHERE session_id = ?
+               AND COALESCE(json_extract(data, '$.summary'), 0) = 1
+               AND COALESCE(json_extract(data, '$.finish'), '') = 'stop'
+               AND COALESCE(json_extract(data, '$.providerID'), '') = 'magic-context'`).all(sessionId);
+  const legacySummaries = db.prepare(`SELECT m.id, COALESCE(json_extract(m.data, '$.parentID'), '') AS parent_id
+             FROM message m
+             WHERE m.session_id = ?
+               AND COALESCE(json_extract(m.data, '$.summary'), 0) = 1
+               AND COALESCE(json_extract(m.data, '$.finish'), '') = 'stop'
+               AND COALESCE(json_extract(m.data, '$.providerID'), '') <> 'magic-context'
+               AND EXISTS (
+                   SELECT 1
+                   FROM part p
+                   WHERE +p.session_id = m.session_id
+                     AND p.message_id = m.id
+                     AND COALESCE(json_extract(p.data, '$.type'), '') = 'text'
+                     AND COALESCE(json_extract(p.data, '$.text'), '') = ?
+               )`).all(sessionId, summaryText);
+  const summariesByBoundary = new Map;
+  const orphanSummaryIds = new Set;
+  for (const row of [...canonicalSummaries, ...legacySummaries]) {
+    if (typeof row.id !== "string")
+      continue;
+    if (typeof row.parent_id === "string" && row.parent_id.length > 0) {
+      const set = summariesByBoundary.get(row.parent_id) ?? new Set;
+      set.add(row.id);
+      summariesByBoundary.set(row.parent_id, set);
+    } else {
+      orphanSummaryIds.add(row.id);
     }
   }
-  result.rowsRewritten = changed.length;
-  sessionLog2(sessionId, `INFO compartment neighbour recovery (${args.reason}) rows_rewritten=${changed.length} ` + `derived=${result.derived.map((note) => `${note.start}-${note.end}`).join(",") || "none"} ` + `unresolved=${result.unresolved.map((note) => `${note.start}-${note.end}`).join(",") || "none"}`);
-  return result;
-}
-var repairCheckedSessions = new WeakMap;
-function unresolvedRowBreaksTiling(rows) {
-  let expectedStart = 1;
-  for (let index = 0;index < rows.length; index += 1) {
-    const row = rows[index];
-    if (!row)
+  const compactionParts = db.prepare(`SELECT id, message_id, data
+             FROM part
+             WHERE session_id = ?
+               AND COALESCE(json_extract(data, '$.type'), '') = 'compaction'`).all(sessionId);
+  const parsedParts = [];
+  for (const part of compactionParts) {
+    if (typeof part.id !== "string" || typeof part.message_id !== "string")
       continue;
-    const broken = row.start_message !== expectedStart || row.end_message < row.start_message;
-    const touchesUnresolved = row.rebase_status === "unresolved" || rows[index - 1]?.rebase_status === "unresolved";
-    if (broken && touchesUnresolved)
-      return true;
-    expectedStart = row.end_message + 1;
+    let data;
+    try {
+      data = typeof part.data === "string" ? JSON.parse(part.data) : part.data;
+    } catch {
+      data = null;
+    }
+    parsedParts.push({
+      id: part.id,
+      messageId: part.message_id,
+      data,
+      tailStartId: dataReferencesTailStart(data)
+    });
   }
-  return false;
-}
-function repairStampedSessionOnce(db, sessionId, readArgs) {
-  let checked = repairCheckedSessions.get(db);
-  if (!checked) {
-    checked = new Set;
-    repairCheckedSessions.set(db, checked);
+  const messageTailRefs = db.prepare(`SELECT id, data
+             FROM message
+             WHERE session_id = ?
+               AND json_extract(data, '$.compaction.tail_start_id') IS NOT NULL`).all(sessionId);
+  const messageTailStartIds = new Set;
+  for (const row of messageTailRefs) {
+    if (typeof row.id !== "string")
+      continue;
+    let data;
+    try {
+      data = typeof row.data === "string" ? JSON.parse(row.data) : row.data;
+    } catch {
+      data = null;
+    }
+    const ref = dataReferencesTailStart(data);
+    if (ref)
+      messageTailStartIds.add(ref);
   }
-  if (checked.has(sessionId))
-    return null;
-  checked.add(sessionId);
-  const rows = readCompartmentRows(db, "compartments", sessionId);
-  if (!rows.some((row) => row.rebase_status === "unresolved"))
-    return null;
-  if (readCoordinateRebaseNotice(db, sessionId)?.neighbourRecoveryAt != null)
-    return null;
-  if (!unresolvedRowBreaksTiling(rows))
-    return null;
-  let ordinalById = null;
-  return recoverUnresolvedCompartments({
-    db,
-    sessionId,
-    resolveOrdinal: (messageId) => {
-      if (ordinalById === null) {
-        const projection = emptyProjection();
-        for (const page of readProjectionPages(readArgs)) {
-          addToProjection(projection, page, false);
-        }
-        ordinalById = projection.ordinalById;
+  let removedLineages = 0;
+  let removedRows = 0;
+  let retainedLineages = 0;
+  const deletePartsOfMessage = db.prepare("DELETE FROM part WHERE +session_id = ? AND message_id = ?");
+  const deleteMessage = db.prepare("DELETE FROM message WHERE session_id = ? AND id = ?");
+  const deletePart = db.prepare("DELETE FROM part WHERE session_id = ? AND id = ?");
+  const deleteSummaries = (summaryIds) => {
+    let rows = 0;
+    for (const summaryId of summaryIds) {
+      rows += deletePartsOfMessage.run(sessionId, summaryId).changes;
+      rows += deleteMessage.run(sessionId, summaryId).changes;
+    }
+    return rows;
+  };
+  for (const [boundaryMessageId, summaryIds] of summariesByBoundary) {
+    const boundaryParts = parsedParts.filter((part) => part.messageId === boundaryMessageId);
+    const mcPartIds = boundaryParts.filter((part) => isMcCanonicalCompactionPartData(part.data)).map((part) => part.id);
+    const rowsToDelete = new Set([...summaryIds, ...mcPartIds]);
+    const survivingPartsReferenceDeletion = parsedParts.some((part) => !mcPartIds.includes(part.id) && part.tailStartId !== null && rowsToDelete.has(part.tailStartId));
+    const messageFieldReferencesDeletion = [...rowsToDelete].some((id) => messageTailStartIds.has(id));
+    if (survivingPartsReferenceDeletion || messageFieldReferencesDeletion) {
+      retainedLineages += 1;
+      log2(`[magic-context] compaction-marker: flip-off cleanup RETAINED lineage at boundary ${boundaryMessageId} — a surviving tail_start_id references a row the deletion would remove`);
+      continue;
+    }
+    const rows = runMarkerRemovalTransaction(db, () => {
+      let changed = deleteSummaries(summaryIds);
+      for (const partId of mcPartIds) {
+        changed += deletePart.run(sessionId, partId).changes;
       }
-      return ordinalById.get(messageId);
-    },
-    reason: "stamped-session repair"
-  });
-}
-function formatRebaseLogLine(outcome, elapsedMs) {
-  const rowsRewritten = outcome.compartmentsRebased + outcome.recompCompartmentsRebased + outcome.notesRebased + outcome.notesCleared + (outcome.priorBoundaryRebased ? 1 : 0) + (outcome.recompPartialRangeRebased ? 1 : 0);
-  const unresolved = outcome.compartmentsUnresolved + outcome.recompCompartmentsUnresolved;
-  return `INFO store-generation-rebase ${outcome.previousGeneration ?? "unrecorded"}->${outcome.generation} ` + `rows_rewritten=${rowsRewritten} unresolved=${unresolved} derived=${outcome.compartmentsDerived} ` + `index_rows_rebuilt=${outcome.indexRowsRebuilt} drops_discarded=${outcome.queuedReductionsDiscarded} ` + `healed_gaps=${outcome.healedGaps} narrative_gaps=${outcome.narrativeGaps} ` + `ms=${Math.round(elapsedMs)} ` + `(chunk_windows_deleted=${outcome.chunkEmbeddingsDeleted} depth_rows_dropped=${outcome.compressionDepthRowsDropped} ` + `part_tags_folded=${outcome.partTagsFolded} lkg_slots_dropped=${outcome.lkgSlotsDropped} ` + `frozen_part_entries_dropped=${outcome.frozenPartEntriesDropped})`;
-}
-function planPriorBoundary(db, sessionId, plans) {
-  const row = db.prepare("SELECT prior_boundary_ordinal FROM session_meta WHERE session_id = ?").get(sessionId);
-  const current = typeof row?.prior_boundary_ordinal === "number" ? row.prior_boundary_ordinal : 1;
-  if (current <= 1)
-    return null;
-  const source = plans.find((plan) => plan.status === "ok" && plan.previousEnd === current && plan.end !== current);
-  return source ? source.end : null;
-}
-function planRecompPartialRange(db, sessionId, plans) {
-  const row = db.prepare("SELECT recomp_partial_range_start AS start, recomp_partial_range_end AS end FROM session_meta WHERE session_id = ?").get(sessionId);
-  const start = typeof row?.start === "number" ? row.start : 0;
-  const end = typeof row?.end === "number" ? row.end : 0;
-  if (start <= 0 && end <= 0)
-    return null;
-  const startSource = plans.find((plan) => plan.status === "ok" && plan.previousStart === start);
-  const endSource = plans.find((plan) => plan.status === "ok" && plan.previousEnd === end);
-  if (!startSource || !endSource)
-    return null;
-  if (startSource.start === start && endSource.end === end)
-    return null;
-  return { start: startSource.start, end: endSource.end };
-}
-function indexDisagreesWithProjection(db, sessionId, projection) {
-  const sourceRows = db.prepare("SELECT message_id, message_ordinal FROM message_history_source WHERE session_id = ?").all(sessionId);
-  if (sourceRows.length === 0) {
-    return countRows2(db, "SELECT COUNT(*) AS count FROM message_fts_rowid_map WHERE session_id = ?", sessionId) > 0;
+      return changed;
+    });
+    if (rows > 0 || summaryIds.size > 0 || mcPartIds.length > 0) {
+      removedLineages += 1;
+      removedRows += rows;
+    }
   }
-  for (const row of sourceRows) {
-    if (typeof row.message_id !== "string" || typeof row.message_ordinal !== "number") {
-      return true;
+  if (orphanSummaryIds.size > 0) {
+    const rowsToDelete = new Set(orphanSummaryIds);
+    const survivingPartsReferenceDeletion = parsedParts.some((part) => part.tailStartId !== null && rowsToDelete.has(part.tailStartId));
+    const messageFieldReferencesDeletion = [...rowsToDelete].some((id) => messageTailStartIds.has(id));
+    if (survivingPartsReferenceDeletion || messageFieldReferencesDeletion) {
+      retainedLineages += 1;
+    } else {
+      const rows = runMarkerRemovalTransaction(db, () => deleteSummaries(orphanSummaryIds));
+      removedLineages += 1;
+      removedRows += rows;
     }
-    if (projection.ordinalById.get(row.message_id) !== row.message_ordinal)
-      return true;
   }
-  const orphanedMapRows = countRows2(db, `SELECT COUNT(*) AS count FROM message_fts_rowid_map AS m
-         WHERE m.session_id = ?
-           AND NOT EXISTS (
-               SELECT 1 FROM message_history_source AS s
-               WHERE s.session_id = m.session_id AND s.message_ordinal = m.message_ordinal
-           )`, sessionId);
-  return orphanedMapRows > 0;
-}
-
-// src/features/magic-context/compaction-marker.ts
-import { createHash as createHash9 } from "node:crypto";
-import { existsSync as existsSync6 } from "node:fs";
-var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-var ID_PREFIX_HEX_LENGTH = 12;
-var ID_SUFFIX_LENGTH = 14;
-var ID_PREFIX_MASK = (1n << BigInt(ID_PREFIX_HEX_LENGTH * 4)) - 1n;
-function deterministicBase62(seed, length) {
-  let value = BigInt(`0x${createHash9("sha256").update(seed).digest("hex")}`);
-  const chars = Array(length);
-  for (let index = length - 1;index >= 0; index -= 1) {
-    chars[index] = BASE62_CHARS[Number(value % 62n)];
-    value /= 62n;
+  if (removedLineages > 0 || retainedLineages > 0) {
+    log2(`[magic-context] compaction-marker: flip-off cleanup for ${sessionId} removed ${removedLineages} lineage(s) (${removedRows} rows), retained ${retainedLineages}`);
   }
-  return chars.join("");
+  return {
+    verified: retainedLineages === 0,
+    removedLineages,
+    removedRows,
+    retainedLineages
+  };
 }
-function generateId(prefix, timestampMs, counter, identity) {
-  const encoded = BigInt(Math.max(0, Math.floor(timestampMs))) * 0x1000n + counter & ID_PREFIX_MASK;
-  const hex = encoded.toString(16).padStart(ID_PREFIX_HEX_LENGTH, "0");
-  return `${prefix}_${hex}${deterministicBase62(`${prefix}\x00${identity}`, ID_SUFFIX_LENGTH)}`;
+function removeCompactionMarker(state) {
+  try {
+    const db = getWritableOpenCodeDb("removal");
+    runMarkerRemovalTransaction(db, () => {
+      db.prepare("DELETE FROM part WHERE id = ?").run(state.summaryPartId);
+      db.prepare("DELETE FROM message WHERE id = ?").run(state.summaryMessageId);
+      db.prepare("DELETE FROM part WHERE id = ?").run(state.compactionPartId);
+    });
+    return true;
+  } catch (error) {
+    log2(`[magic-context] compaction-marker: removal failed: ${error instanceof Error ? error.message : String(error)}`);
+    return false;
+  }
 }
-function generateMessageId(timestampMs, counter = 0n, identity = "") {
-  return generateId("msg", timestampMs, counter, identity);
+
+// src/features/magic-context/compartment-embedding.ts
+async function embedAndStoreCompartmentChunks(db, sessionId, projectPath, compartments) {
+  if (compartments.length === 0)
+    return;
+  if (getProjectChunkEmbeddingModelId2(projectPath) === "off")
+    return;
+  const maxInputTokens = getProjectEmbeddingMaxInputTokens2(projectPath);
+  for (const compartment of compartments) {
+    try {
+      const fromMemory = compartment.sourceChunkText ? canonicalizeInMemoryChunkTextForEmbedding(compartment.sourceChunkText, compartment.startMessage, compartment.endMessage) : "";
+      const mappedText = fromMemory ? fromMemory : buildCanonicalChunkTextFromFts(db, sessionId, compartment.startMessage, compartment.endMessage);
+      if (mappedText === null)
+        continue;
+      const canonicalText = mappedText || buildCompartmentSummaryFallbackText(db, compartment.id);
+      if (canonicalText.length === 0)
+        continue;
+      const windows = chunkCanonicalText(canonicalText, compartment.startMessage, compartment.endMessage, maxInputTokens);
+      if (windows.length === 0)
+        continue;
+      const windowSourceKey = chunkWindowSourceKey(canonicalText, compartment.startMessage, compartment.endMessage, maxInputTokens);
+      const currentModelId = getProjectChunkEmbeddingModelId2(projectPath);
+      if (currentModelId !== "off" && chunkEmbeddingWindowsAreCurrent(db, compartment.id, currentModelId, windows, projectPath)) {
+        continue;
+      }
+      const result = await embedItemsForProject2(projectPath, windows.map((window) => ({
+        id: `chunk:${compartment.id}:${window.windowIndex}`,
+        text: window.text,
+        contentSha256: contentSha2562(window.text)
+      })), undefined, db, sessionId);
+      if (!result)
+        continue;
+      if (chunkEmbeddingWindowsAreCurrent(db, compartment.id, currentModelId, windows, projectPath)) {
+        continue;
+      }
+      const rows = [];
+      for (const window of windows) {
+        const vector = result.vectors.get(`chunk:${compartment.id}:${window.windowIndex}`);
+        if (!vector)
+          continue;
+        rows.push({
+          compartmentId: compartment.id,
+          sessionId,
+          projectPath,
+          window,
+          modelId: currentModelId,
+          vector
+        });
+      }
+      if (rows.length === windows.length) {
+        replaceCompartmentChunkEmbeddings(db, rows, windowSourceKey);
+        enqueueShadowEmbeddingItems2(projectPath, "chunk", [String(compartment.id)]);
+      }
+    } catch (error) {
+      sessionLog2(sessionId, `compartment chunk embedding failed for compartment ${compartment.id}:`, error);
+    } finally {
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    }
+  }
 }
-function generatePartId(timestampMs, counter = 0n, identity = "") {
-  return generateId("prt", timestampMs, counter, identity);
+
+// src/features/magic-context/store-generation-rebase.ts
+function emptyOutcome(status, generation, previousGeneration) {
+  return {
+    status,
+    generation,
+    previousGeneration,
+    compartmentsRebased: 0,
+    compartmentsUnresolved: 0,
+    compartmentsDerived: 0,
+    compartmentsResolvedAgain: 0,
+    recompCompartmentsRebased: 0,
+    recompCompartmentsUnresolved: 0,
+    notesRebased: 0,
+    notesCleared: 0,
+    priorBoundaryRebased: false,
+    recompPartialRangeRebased: false,
+    compressionDepthRowsDropped: 0,
+    chunkEmbeddingsDeleted: 0,
+    indexRebuilt: false,
+    indexRowsRebuilt: 0,
+    partTagsFolded: 0,
+    partTagsRekeyed: 0,
+    queuedReductionsDiscarded: 0,
+    lkgSlotsDropped: 0,
+    frozenPartEntriesDropped: 0,
+    healedGaps: 0,
+    narrativeGaps: 0
+  };
 }
-function getOpenCodeDbPath() {
-  return resolveOpenCodeDbPath().path;
+function sessionIsOpenCodeOwned(db, sessionId) {
+  const row = db.prepare("SELECT harness FROM session_meta WHERE session_id = ?").get(sessionId);
+  const harness = row?.harness;
+  if (harness === undefined || harness === null)
+    return true;
+  return harness === "opencode" || harness === "opencode2";
 }
-var cachedWriteDb = null;
-var cachedRemovalDb = null;
-var MARKER_BUSY_TIMEOUT_MS = 250;
-var MARKER_REMOVAL_BUSY_TIMEOUT_MS = 5000;
-function runMarkerRemovalTransaction(db, operation) {
-  return withoutSqliteTransformPass2(() => db.transaction(operation).immediate());
+function generationImpliedByHarness(db, sessionId) {
+  const row = db.prepare("SELECT harness FROM session_meta WHERE session_id = ?").get(sessionId);
+  if (row?.harness === "opencode")
+    return "v1";
+  if (row?.harness === "opencode2")
+    return "v2";
+  return null;
 }
-function runMarkerWriteTransaction(db, site, operation) {
-  if (db.inTransaction)
-    return db.transaction(operation).immediate();
-  const startedAt = performance.now();
-  let acquiredAt;
-  let workFinishedAt;
-  let committed = false;
-  try {
-    const result = db.transaction(() => {
-      acquiredAt = performance.now();
-      try {
-        return operation();
-      } finally {
-        workFinishedAt = performance.now();
-      }
-    }).immediate();
-    committed = true;
-    return result;
-  } finally {
-    const finishedAt = performance.now();
-    const acquireMs = (acquiredAt ?? finishedAt) - startedAt;
-    const holdMs = acquiredAt === undefined ? 0 : finishedAt - acquiredAt;
-    const workMs = acquiredAt === undefined ? 0 : (workFinishedAt ?? finishedAt) - acquiredAt;
-    const endMs = workFinishedAt === undefined ? 0 : finishedAt - workFinishedAt;
-    try {
-      log2(`[magic-context] sqlite writer site=${site} db=opencode acquire_ms=${Math.round(acquireMs)} hold_ms=${Math.round(holdMs)} work_ms=${Math.round(workMs)} end_ms=${Math.round(endMs)} outcome=${acquiredAt === undefined ? "not_acquired" : committed ? "committed" : "failed"}`);
-    } catch {}
-  }
+function readCoordinateGeneration(db, sessionId) {
+  const row = db.prepare("SELECT coordinate_generation FROM session_meta WHERE session_id = ?").get(sessionId);
+  const value = row?.coordinate_generation;
+  return value === "v1" || value === "v2" ? value : null;
 }
-var REQUIRED_MESSAGE_COLUMNS = ["id", "session_id", "time_created", "time_updated", "data"];
-var REQUIRED_PART_COLUMNS = [
-  "id",
-  "message_id",
-  "session_id",
-  "time_created",
-  "time_updated",
-  "data"
-];
-var cachedSchemaCompatible = null;
-function isOpenCodeSchemaCompatible(db, dbPath) {
-  if (cachedSchemaCompatible?.path === dbPath) {
-    return cachedSchemaCompatible.compatible;
-  }
+function readCoordinateRebaseNotice(db, sessionId) {
+  const row = db.prepare("SELECT coordinate_rebase_notice FROM session_meta WHERE session_id = ?").get(sessionId);
+  const raw = row?.coordinate_rebase_notice;
+  if (typeof raw !== "string" || raw.length === 0)
+    return null;
   try {
-    const messageCols = new Set(db.prepare("PRAGMA table_info(message)").all().map((r) => r.name ?? "").filter((n) => n.length > 0));
-    const partCols = new Set(db.prepare("PRAGMA table_info(part)").all().map((r) => r.name ?? "").filter((n) => n.length > 0));
-    const missingMessage = REQUIRED_MESSAGE_COLUMNS.filter((c) => !messageCols.has(c));
-    const missingPart = REQUIRED_PART_COLUMNS.filter((c) => !partCols.has(c));
-    if (missingMessage.length > 0 || missingPart.length > 0) {
-      log2(`[magic-context] compaction-marker: OpenCode DB schema missing required columns ` + `(message: [${missingMessage.join(", ")}], part: [${missingPart.join(", ")}]). ` + `Marker injection disabled for this process. ` + `This usually means OpenCode was updated and magic-context is out of date.`);
-      cachedSchemaCompatible = { path: dbPath, compatible: false };
-      return false;
-    }
-    cachedSchemaCompatible = { path: dbPath, compatible: true };
-    return true;
-  } catch (error) {
-    log2(`[magic-context] compaction-marker: schema probe failed: ${error instanceof Error ? error.message : String(error)}. ` + `Marker injection disabled until next process restart.`);
-    cachedSchemaCompatible = { path: dbPath, compatible: false };
-    return false;
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+      return null;
+    const record = parsed;
+    if (record.generation !== "v1" && record.generation !== "v2")
+      return null;
+    const count = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0;
+    const ranges = (value) => Array.isArray(value) ? value.flatMap((entry) => {
+      if (!entry || typeof entry !== "object")
+        return [];
+      const { sequence, start, end } = entry;
+      return typeof sequence === "number" && typeof start === "number" && typeof end === "number" ? [{ sequence, start, end }] : [];
+    }) : [];
+    return {
+      generation: record.generation,
+      previousGeneration: record.previousGeneration === "v1" || record.previousGeneration === "v2" ? record.previousGeneration : null,
+      at: count(record.at),
+      unresolvedCompartments: count(record.unresolvedCompartments),
+      discardedReductions: count(record.discardedReductions),
+      droppedDepthRows: count(record.droppedDepthRows),
+      healedGaps: count(record.healedGaps),
+      narrativeGaps: count(record.narrativeGaps),
+      derivedCompartments: ranges(record.derivedCompartments),
+      unresolvedCompartmentRanges: ranges(record.unresolvedCompartmentRanges),
+      neighbourRecoveryAt: typeof record.neighbourRecoveryAt === "number" && Number.isFinite(record.neighbourRecoveryAt) ? record.neighbourRecoveryAt : null
+    };
+  } catch {
+    return null;
   }
 }
-function getWritableOpenCodeDb(purpose = "publication") {
-  if (!harnessOwnsOpenCodeStore2()) {
-    throw new Error("OpenCode database is not writable from a Pi-compatible process");
-  }
-  const resolution = resolveOpenCodeDbPath();
-  const dbPath = resolution.path;
-  const cached = purpose === "removal" ? cachedRemovalDb : cachedWriteDb;
-  if (cached?.path === dbPath) {
-    return cached.db;
+function formatCoordinateRebaseNotice(notice) {
+  const parts = [];
+  if (notice.discardedReductions > 0) {
+    parts.push(`${notice.discardedReductions} queued reduction${notice.discardedReductions === 1 ? " was" : "s were"} discarded because their targets merged in the host's store conversion`);
   }
-  if (cached) {
-    try {
-      closeQuietly(cached.db);
-    } catch {}
+  if (notice.derivedCompartments.length > 0) {
+    const count = notice.derivedCompartments.length;
+    parts.push(`${count} compartment${count === 1 ? " was" : "s were"} re-anchored from the compartments around ${count === 1 ? "it" : "them"} (${formatRangeNotes(notice.derivedCompartments)})`);
   }
-  if (!existsSync6(dbPath)) {
-    throw new Error(`OpenCode database not found at ${dbPath} (source=${resolution.source}; is OpenCode installed?)`);
+  if (notice.unresolvedCompartments > 0) {
+    const listed = notice.unresolvedCompartmentRanges.length > 0 ? ` (${formatRangeNotes(notice.unresolvedCompartmentRanges)})` : "";
+    parts.push(`${notice.unresolvedCompartments} compartment${notice.unresolvedCompartments === 1 ? "" : "s"} could not be re-anchored and are excluded from range recovery${listed}`);
   }
-  const db = new Database2(dbPath);
-  try {
-    assertOpenCodeStoreGeneration(db, "v1", dbPath);
-  } catch (error) {
-    closeQuietly(db);
-    throw error;
+  if (notice.droppedDepthRows > 0) {
+    parts.push(`${notice.droppedDepthRows} compression-depth records were rebuilt from zero`);
   }
-  const timeoutMs = purpose === "removal" ? MARKER_REMOVAL_BUSY_TIMEOUT_MS : MARKER_BUSY_TIMEOUT_MS;
-  db.exec(`PRAGMA busy_timeout=${timeoutMs}`);
-  db.exec("PRAGMA journal_mode=WAL");
-  if (purpose === "removal")
-    cachedRemovalDb = { path: dbPath, db };
-  else
-    cachedWriteDb = { path: dbPath, db };
-  return db;
-}
-function getNonSummaryMessageSortKey(sessionId, messageId) {
-  const db = getWritableOpenCodeDb();
-  const row = db.prepare(`SELECT time_created, id
-             FROM message
-             WHERE session_id = ?
-               AND id = ?
-               AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
-                        AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')
-             LIMIT 1`).get(sessionId, messageId);
-  if (typeof row?.time_created !== "number" || typeof row.id !== "string") {
-    return null;
+  if (notice.healedGaps > 0) {
+    parts.push(`${notice.healedGaps} non-narrative compartment gap${notice.healedGaps === 1 ? " was" : "s were"} healed`);
   }
-  return { id: row.id, timeCreated: row.time_created };
-}
-function findBoundaryUserMessage(sessionId, endMessageId) {
-  const db = getWritableOpenCodeDb();
-  const target = getNonSummaryMessageSortKey(sessionId, endMessageId);
-  if (!target)
-    return null;
-  const boundary = db.prepare(`SELECT id, time_created, data
-             FROM message
-             WHERE session_id = ?
-               AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
-                        AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')
-               AND COALESCE(json_extract(data, '$.role'), '') = 'user'
-               AND (time_created, id) <= (?, ?)
-                AND NOT (
-                    EXISTS (SELECT 1 FROM part p
-                            WHERE likelihood(p.message_id = message.id, 0.000001) AND +p.session_id = message.session_id
-                              AND COALESCE(json_extract(p.data, '$.type'), '') <> 'compaction')
-                    AND NOT EXISTS (SELECT 1 FROM part p
-                                    WHERE likelihood(p.message_id = message.id, 0.000001) AND +p.session_id = message.session_id
-                                      AND COALESCE(json_extract(p.data, '$.type'), '') <> 'compaction'
-                                      AND COALESCE(json_extract(p.data, '$.synthetic'), 0) <> 1
-                                      AND COALESCE(json_extract(p.data, '$.syntheticTodoMarker'), 0) <> 1)
-                )
-              ORDER BY time_created DESC, id DESC
-             LIMIT 1`).get(sessionId, target.timeCreated, target.id);
-  if (typeof boundary?.id !== "string" || typeof boundary.time_created !== "number") {
-    return null;
+  if (notice.narrativeGaps > 0) {
+    parts.push(`${notice.narrativeGaps} narrative compartment gap${notice.narrativeGaps === 1 ? " remains" : "s remain"} for review`);
   }
-  return { id: boundary.id, timeCreated: boundary.time_created };
+  return parts.length === 0 ? null : parts.join("; ");
 }
-function compareOpenCodeMessagesByCanonicalOrder(sessionId, leftMessageId, rightMessageId) {
-  const left = getNonSummaryMessageSortKey(sessionId, leftMessageId);
-  const right = getNonSummaryMessageSortKey(sessionId, rightMessageId);
-  if (!left || !right)
-    return null;
-  if (left.timeCreated < right.timeCreated)
-    return -1;
-  if (left.timeCreated > right.timeCreated)
-    return 1;
-  if (left.id < right.id)
-    return -1;
-  if (left.id > right.id)
-    return 1;
-  return 0;
+function formatRangeNotes(notes) {
+  return notes.map((note) => `messages ${note.start}-${note.end}`).join(", ");
 }
-function isOpenCodeGapHistorianAbsent(sessionId, endId, nextId) {
-  const end = getNonSummaryMessageSortKey(sessionId, endId);
-  const next = getNonSummaryMessageSortKey(sessionId, nextId);
-  if (!end || !next || end.timeCreated > next.timeCreated || end.timeCreated === next.timeCreated && end.id >= next.id)
+function isCompartmentCoordinateRow(row) {
+  if (row === null || typeof row !== "object")
     return false;
-  const row = getWritableOpenCodeDb().prepare(`SELECT 1 FROM message m
-        WHERE m.session_id=?
-          AND (m.time_created, m.id) > (?, ?)
-          AND (m.time_created, m.id) < (?, ?)
-          AND NOT (COALESCE(json_type(m.data,'$.summary'),'')='true' AND COALESCE(json_extract(m.data,'$.finish'),'')='stop')
-          AND NOT (
-            EXISTS (SELECT 1 FROM part p WHERE likelihood(p.message_id=m.id, 0.000001) AND +p.session_id=m.session_id AND COALESCE(json_extract(p.data,'$.type'),'')<>'compaction')
-            AND NOT EXISTS (SELECT 1 FROM part p WHERE likelihood(p.message_id=m.id, 0.000001) AND +p.session_id=m.session_id
-                AND COALESCE(json_extract(p.data,'$.type'),'')<>'compaction'
-                AND COALESCE(json_type(p.data,'$.synthetic'),'')<>'true'
-                AND COALESCE(json_type(p.data,'$.syntheticTodoMarker'),'')<>'true')
-          ) LIMIT 1`).get(sessionId, end.timeCreated, end.id, next.timeCreated, next.id);
-  return !row;
+  const candidate = row;
+  return typeof candidate.id === "number" && typeof candidate.sequence === "number" && typeof candidate.start_message === "number" && typeof candidate.end_message === "number";
 }
-function getOpenCodeMessageById(sessionId, messageId) {
-  const db = getWritableOpenCodeDb();
-  const row = db.prepare(`SELECT id FROM message WHERE session_id = ? AND id = ? LIMIT 1`).get(sessionId, messageId);
-  return row ?? null;
+function emptyProjection() {
+  return {
+    ordinalById: new Map,
+    partCountById: new Map,
+    nonNarrativeOrdinals: new Set,
+    messageCount: 0,
+    indexSources: []
+  };
 }
-function removeLegacyMarkerLineageRows(db, args) {
-  const legacySummaries = db.prepare(`SELECT m.id
-             FROM message m
-             WHERE m.session_id = ?
-               AND m.id <> ?
-               AND COALESCE(json_extract(m.data, '$.summary'), 0) = 1
-               AND COALESCE(json_extract(m.data, '$.finish'), '') = 'stop'
-               AND COALESCE(json_extract(m.data, '$.parentID'), '') = ?
-               AND EXISTS (
-                   SELECT 1
-                   FROM part p
-                   WHERE +p.session_id = m.session_id
-                     AND p.message_id = m.id
-                     AND COALESCE(json_extract(p.data, '$.type'), '') = 'text'
-                     AND COALESCE(json_extract(p.data, '$.text'), '') = ?
-               )`).all(args.sessionId, args.summaryMessageId, args.boundaryMessageId, args.summaryText);
-  const legacySummaryIds = legacySummaries.flatMap((row) => typeof row.id === "string" ? [row.id] : []);
-  if (legacySummaryIds.length === 0)
-    return;
-  const deleteSummaryParts = db.prepare("DELETE FROM part WHERE +session_id = ? AND message_id = ?");
-  const deleteSummary = db.prepare("DELETE FROM message WHERE session_id = ? AND id = ?");
-  for (const summaryMessageId of legacySummaryIds) {
-    deleteSummaryParts.run(args.sessionId, summaryMessageId);
-    deleteSummary.run(args.sessionId, summaryMessageId);
+function addToProjection(projection, messages, withIndexSources) {
+  for (const message of messages) {
+    projection.ordinalById.set(message.id, message.ordinal);
+    projection.partCountById.set(message.id, Array.isArray(message.parts) ? message.parts.length : 0);
+    if (isStrictGapHealingMessage2(message))
+      projection.nonNarrativeOrdinals.add(message.ordinal);
+    if (withIndexSources)
+      projection.indexSources.push(toMessageIndexSource2(message));
   }
-  db.prepare(`DELETE FROM part
-         WHERE +session_id = ?
-           AND message_id = ?
-           AND id <> ?
-           AND COALESCE(json_extract(data, '$.type'), '') = 'compaction'
-           AND COALESCE(json_extract(data, '$.auto'), 0) = 1`).run(args.sessionId, args.boundaryMessageId, args.compactionPartId);
+  projection.messageCount += messages.length;
 }
-function injectCompactionMarker(args) {
-  const db = getWritableOpenCodeDb();
-  if (!isOpenCodeSchemaCompatible(db, getOpenCodeDbPath())) {
-    return null;
-  }
-  const boundary = args.resolvedBoundary ?? findBoundaryUserMessage(args.sessionId, args.endMessageId);
-  if (!boundary) {
-    log2(`[magic-context] compaction-marker: no user message found at or before endMessageId ${args.endMessageId} (ordinal ${args.endOrdinal})`);
-    return null;
-  }
-  const boundaryTime = boundary.timeCreated;
-  const markerIdentity = `${args.sessionId}\x00${args.endMessageId}`;
-  const summaryMsgId = generateMessageId(boundaryTime + 1, 1n, `${markerIdentity}\x00summary-message`);
-  const compactionPartId = generatePartId(boundaryTime, 1n, `${markerIdentity}\x00compaction-part`);
-  const summaryPartId = generatePartId(boundaryTime + 1, 2n, `${markerIdentity}\x00summary-part`);
-  const summaryMsgData = JSON.stringify({
-    role: "assistant",
-    parentID: boundary.id,
-    summary: true,
-    finish: "stop",
-    mode: "compaction",
-    agent: "compaction",
-    path: { cwd: args.directory, root: args.directory },
-    cost: 0,
-    tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-    modelID: "magic-context",
-    providerID: "magic-context",
-    time: { created: boundaryTime + 1, completed: boundaryTime + 1 }
-  });
-  try {
-    runMarkerWriteTransaction(db, "compaction-marker-inject", () => {
-      removeLegacyMarkerLineageRows(db, {
-        sessionId: args.sessionId,
-        boundaryMessageId: boundary.id,
-        summaryText: args.summaryText,
-        summaryMessageId: summaryMsgId,
-        compactionPartId
-      });
-      db.prepare(`INSERT INTO part (id, message_id, session_id, time_created, time_updated, data)
-                 VALUES (?, ?, ?, ?, ?, ?)
-                 ON CONFLICT(id) DO UPDATE SET
-                     message_id = excluded.message_id,
-                     session_id = excluded.session_id,
-                     time_created = excluded.time_created,
-                     time_updated = excluded.time_updated,
-                     data = excluded.data`).run(compactionPartId, boundary.id, args.sessionId, boundaryTime, boundaryTime, '{"type":"compaction","auto":true}');
-      db.prepare(`INSERT INTO message (id, session_id, time_created, time_updated, data)
-                 VALUES (?, ?, ?, ?, ?)
-                 ON CONFLICT(id) DO UPDATE SET
-                     session_id = excluded.session_id,
-                     time_created = excluded.time_created,
-                     time_updated = excluded.time_updated,
-                     data = excluded.data`).run(summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, summaryMsgData);
-      noteRawSessionSummaryRowWritten2(args.sessionId, summaryMsgId);
-      db.prepare(`INSERT INTO part (id, message_id, session_id, time_created, time_updated, data)
-                 VALUES (?, ?, ?, ?, ?, ?)
-                 ON CONFLICT(id) DO UPDATE SET
-                     message_id = excluded.message_id,
-                     session_id = excluded.session_id,
-                     time_created = excluded.time_created,
-                     time_updated = excluded.time_updated,
-                     data = excluded.data`).run(summaryPartId, summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, JSON.stringify({ type: "text", text: args.summaryText }));
-    });
-    log2(`[magic-context] compaction-marker: injected boundary at user msg ${boundary.id} (ordinal ~${args.endOrdinal}), summary msg ${summaryMsgId}`);
-    return {
-      boundaryMessageId: boundary.id,
-      summaryMessageId: summaryMsgId,
-      compactionPartId,
-      summaryPartId
-    };
-  } catch (error) {
-    log2(`[magic-context] compaction-marker: injection failed: ${error instanceof Error ? error.message : String(error)}`);
-    return null;
+function readProjectionPages(args) {
+  if (args.readMessagePages)
+    return args.readMessagePages(args.sessionId);
+  return [args.readMessages(args.sessionId)];
+}
+function* buildProjectionSteps(args, withIndexSources) {
+  const projection = emptyProjection();
+  for (const page of readProjectionPages(args)) {
+    addToProjection(projection, page, withIndexSources);
+    yield;
   }
+  return projection;
 }
-function replaceCompactionMarker(existing, args) {
-  let connection;
-  let entered = false;
-  let readyToCommit = false;
-  try {
-    const db = getWritableOpenCodeDb();
-    connection = db;
-    const marker = runMarkerWriteTransaction(db, "compaction-marker-replace", () => {
-      entered = true;
-      if (existing) {
-        db.prepare("DELETE FROM part WHERE id = ?").run(existing.summaryPartId);
-        db.prepare("DELETE FROM message WHERE id = ?").run(existing.summaryMessageId);
-        db.prepare("DELETE FROM part WHERE id = ?").run(existing.compactionPartId);
-      }
-      const replacement = injectCompactionMarker(args);
-      if (!replacement) {
-        throw new Error(`failed to inject replacement marker at ordinal ${args.endOrdinal}`);
-      }
-      readyToCommit = true;
-      return replacement;
-    });
-    return { kind: "committed", marker };
-  } catch (error) {
-    log2(`[magic-context] compaction-marker: atomic replacement failed: ${error instanceof Error ? error.message : String(error)}`);
-    const definitelyNoCut = !entered || !readyToCommit && connection?.inTransaction === false;
+var INDEX_REBUILD_CHUNK = 2000;
+function messageIdFromAnchorBlockId(anchorBlockId) {
+  const hash = anchorBlockId.lastIndexOf("#");
+  return hash > 0 ? anchorBlockId.slice(0, hash) : anchorBlockId;
+}
+function readCompartmentRows(db, table, sessionId) {
+  return db.prepare(`SELECT id, sequence, start_message, end_message, start_message_id, end_message_id, rebase_status
+             FROM ${table} WHERE session_id = ? ORDER BY sequence ASC`).all(sessionId).filter(isCompartmentCoordinateRow);
+}
+function resolveAnchor(messageId, resolveOrdinal) {
+  return messageId && messageId.length > 0 ? resolveOrdinal(messageId) : undefined;
+}
+function planCompartments(rows, table, projection) {
+  const resolveOrdinal = (messageId) => projection.ordinalById.get(messageId);
+  return recoverFromNeighbours(rows, table, rows.map((row) => ({
+    start: resolveAnchor(row.start_message_id, resolveOrdinal),
+    end: resolveAnchor(row.end_message_id, resolveOrdinal)
+  })));
+}
+function recoverFromNeighbours(rows, table, known) {
+  const plans = rows.map((row, index) => {
+    const own = known[index] ?? { start: undefined, end: undefined };
+    const previousEnd = index === 0 ? 0 : known[index - 1]?.end;
+    const nextStart = index === rows.length - 1 ? undefined : known[index + 1]?.start;
+    const start = own.start ?? (previousEnd === undefined ? undefined : previousEnd + 1);
+    const end = own.end ?? (nextStart === undefined ? undefined : nextStart - 1);
+    const base = {
+      table,
+      id: row.id,
+      sequence: row.sequence,
+      previousStart: row.start_message,
+      previousEnd: row.end_message,
+      previousStatus: row.rebase_status === "unresolved" ? "unresolved" : "ok"
+    };
+    if (start !== undefined && end !== undefined && start <= end) {
+      return {
+        ...base,
+        start,
+        end,
+        status: "ok",
+        derived: own.start === undefined || own.end === undefined
+      };
+    }
     return {
-      kind: definitelyNoCut ? "definitely-no-cut" : "uncertain",
-      error: error instanceof Error ? error : new Error(String(error))
+      ...base,
+      start: start ?? row.start_message,
+      end: end ?? row.end_message,
+      status: "unresolved",
+      derived: false
     };
+  });
+  for (let index = 0;index < plans.length; index += 1) {
+    const plan = plans[index];
+    if (plan?.status !== "unresolved")
+      continue;
+    const previous = plans[index - 1];
+    const next = plans[index + 1];
+    if (previous?.status === "ok" && plan.start <= previous.end) {
+      plan.start = previous.end + 1;
+    }
+    if (next?.status === "ok" && plan.end >= next.start) {
+      plan.end = next.start - 1;
+    }
   }
+  return plans;
 }
-function listSessionCompactionMarkers(sessionId) {
-  const db = getWritableOpenCodeDb();
-  const summaryRows = db.prepare(`SELECT id, json_extract(data, '$.parentID') AS boundary_message_id
-             FROM message
-             WHERE session_id = ?
-               AND COALESCE(json_extract(data, '$.summary'), 0) = 1
-               AND COALESCE(json_extract(data, '$.finish'), '') = 'stop'
-               AND COALESCE(json_extract(data, '$.providerID'), '') = 'magic-context'
-             ORDER BY time_created ASC, id ASC`).all(sessionId);
-  const summaryIdsByBoundary = new Map;
-  for (const row of summaryRows) {
-    if (typeof row.id !== "string" || typeof row.boundary_message_id !== "string")
+function healNonNarrativeCompartmentGaps(plans, projection) {
+  let healed = 0;
+  let narrative = 0;
+  for (let index = 1;index < plans.length; index += 1) {
+    const previous = plans[index - 1];
+    const current = plans[index];
+    if (!previous || !current || previous.status !== "ok" || current.status !== "ok")
       continue;
-    const summaryIds = summaryIdsByBoundary.get(row.boundary_message_id) ?? [];
-    summaryIds.push(row.id);
-    summaryIdsByBoundary.set(row.boundary_message_id, summaryIds);
+    const gapStart = previous.end + 1;
+    const gapEnd = current.start - 1;
+    if (gapEnd < gapStart)
+      continue;
+    let safeToHeal = true;
+    for (let ordinal = gapStart;ordinal <= gapEnd; ordinal += 1) {
+      if (!projection.nonNarrativeOrdinals.has(ordinal)) {
+        safeToHeal = false;
+        break;
+      }
+    }
+    if (safeToHeal) {
+      previous.end = gapEnd;
+      healed += 1;
+    } else {
+      narrative += 1;
+    }
   }
-  const boundaryIds = [...summaryIdsByBoundary.keys()];
-  const markers = [];
-  const chunkSize = 800;
-  for (let offset = 0;offset < boundaryIds.length; offset += chunkSize) {
-    const boundaryChunk = boundaryIds.slice(offset, offset + chunkSize);
-    const placeholders = boundaryChunk.map(() => "?").join(", ");
-    const partRows = db.prepare(`SELECT id, message_id, time_created
-                 FROM part
-                 WHERE +session_id = ?
-                   AND likelihood(message_id IN (${placeholders}), 0.000001)
-                   AND COALESCE(json_extract(data, '$.type'), '') = 'compaction'
-                 ORDER BY time_created ASC, id ASC`).all(sessionId, ...boundaryChunk);
-    for (const row of partRows) {
-      if (typeof row.id !== "string" || typeof row.message_id !== "string" || typeof row.time_created !== "number") {
+  return { healed, narrative };
+}
+function compartmentPlanChanges(plan) {
+  return plan.status !== plan.previousStatus || plan.start !== plan.previousStart || plan.end !== plan.previousEnd;
+}
+function rangeNotes(plans, predicate) {
+  return plans.filter((plan) => plan.table === "compartments" && predicate(plan)).map((plan) => ({ sequence: plan.sequence, start: plan.start, end: plan.end }));
+}
+function planNotes(db, sessionId, projection) {
+  const rows = db.prepare("SELECT id, anchor_ordinal, anchor_block_id FROM notes WHERE session_id = ? AND anchor_ordinal IS NOT NULL").all(sessionId);
+  return rows.flatMap((row) => {
+    if (typeof row.id !== "number")
+      return [];
+    const previousOrdinal = typeof row.anchor_ordinal === "number" ? row.anchor_ordinal : null;
+    const anchorBlockId = typeof row.anchor_block_id === "string" ? row.anchor_block_id : "";
+    if (anchorBlockId.length === 0) {
+      return [{ id: row.id, ordinal: null, previousOrdinal }];
+    }
+    const ordinal = projection.ordinalById.get(messageIdFromAnchorBlockId(anchorBlockId));
+    return [{ id: row.id, ordinal: ordinal ?? null, previousOrdinal }];
+  });
+}
+function countRows2(db, sql, ...params) {
+  const row = db.prepare(sql).get(...params);
+  return typeof row?.count === "number" ? row.count : 0;
+}
+function stampGeneration(db, sessionId, generation, notice) {
+  ensureSessionMetaRow(db, sessionId);
+  if (notice === null) {
+    db.prepare("UPDATE session_meta SET coordinate_generation = ? WHERE session_id = ?").run(generation, sessionId);
+    return;
+  }
+  db.prepare("UPDATE session_meta SET coordinate_generation = ?, coordinate_rebase_notice = ? WHERE session_id = ?").run(generation, JSON.stringify(notice), sessionId);
+}
+function pruneShrunkPartEntries(db, sessionId, column, shrunk) {
+  if (shrunk.length === 0)
+    return 0;
+  const row = db.prepare(`SELECT ${column} AS value FROM session_meta WHERE session_id = ?`).get(sessionId);
+  const raw = row?.value;
+  if (typeof raw !== "string" || raw.length === 0)
+    return 0;
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return 0;
+  }
+  const partCountByMessage = new Map(shrunk.map((entry) => [entry.messageId, entry.partCount]));
+  const isStale = (candidate) => {
+    const marker = candidate.lastIndexOf(":p");
+    if (marker < 0)
+      return false;
+    const suffix = candidate.slice(marker + 2);
+    if (!/^\d+$/.test(suffix))
+      return false;
+    const partCount = partCountByMessage.get(candidate.slice(0, marker));
+    return partCount !== undefined && Number.parseInt(suffix, 10) >= partCount;
+  };
+  let dropped = 0;
+  const pruneArray = (values) => values.filter((value) => {
+    if (typeof value === "string" && isStale(value)) {
+      dropped += 1;
+      return false;
+    }
+    return true;
+  });
+  let next;
+  if (Array.isArray(parsed)) {
+    next = pruneArray(parsed);
+  } else if (parsed && typeof parsed === "object") {
+    const source = parsed;
+    const result = {};
+    for (const [key, value] of Object.entries(source)) {
+      if (isStale(key)) {
+        dropped += 1;
         continue;
       }
-      const summaryMessageIds = summaryIdsByBoundary.get(row.message_id);
-      if (!summaryMessageIds)
-        continue;
-      markers.push({
-        compactionPartId: row.id,
-        boundaryMessageId: row.message_id,
-        summaryMessageIds: [...summaryMessageIds],
-        timeCreated: row.time_created
-      });
+      result[key] = Array.isArray(value) ? pruneArray(value) : value;
     }
+    next = result;
+  } else {
+    return 0;
+  }
+  if (dropped === 0)
+    return 0;
+  db.prepare(`UPDATE session_meta SET ${column} = ? WHERE session_id = ?`).run(JSON.stringify(next), sessionId);
+  return dropped;
+}
+var REBASE_SLICE_MS = 20;
+var rebasesInFlight = new WeakMap;
+async function rebaseSessionCoordinatesAsync(args) {
+  let sessions = rebasesInFlight.get(args.db);
+  if (!sessions) {
+    sessions = new Map;
+    rebasesInFlight.set(args.db, sessions);
+  }
+  const earlier = sessions.get(args.sessionId);
+  if (earlier)
+    await earlier.catch(() => {
+      return;
+    });
+  const run = runSliced(args);
+  sessions.set(args.sessionId, run);
+  try {
+    return await run;
+  } finally {
+    if (sessions.get(args.sessionId) === run)
+      sessions.delete(args.sessionId);
   }
-  markers.sort((left, right) => left.timeCreated - right.timeCreated || left.compactionPartId.localeCompare(right.compactionPartId));
-  return markers.map(({ timeCreated: _, ...marker }) => marker);
 }
-function removeForeignCompactionMarker(sessionId, marker, protectedSummaryMessageId) {
+async function runSliced(args) {
+  const steps = rebaseSteps(args);
+  let finished = false;
   try {
-    const db = getWritableOpenCodeDb("removal");
-    runMarkerRemovalTransaction(db, () => {
-      const deletePartsOfMessage = db.prepare("DELETE FROM part WHERE +session_id = ? AND message_id = ?");
-      const deleteMessage = db.prepare("DELETE FROM message WHERE session_id = ? AND id = ?");
-      for (const summaryMessageId of marker.summaryMessageIds) {
-        if (summaryMessageId === protectedSummaryMessageId)
-          continue;
-        deletePartsOfMessage.run(sessionId, summaryMessageId);
-        deleteMessage.run(sessionId, summaryMessageId);
+    let sliceStartedAt = performance.now();
+    for (;; ) {
+      const step = steps.next();
+      if (step.done) {
+        finished = true;
+        return step.value;
       }
-      db.prepare("DELETE FROM part WHERE session_id = ? AND id = ?").run(sessionId, marker.compactionPartId);
-    });
-    return true;
-  } catch (error) {
-    log2(`[magic-context] compaction-marker: foreign-marker removal failed (${sessionId}, part ${marker.compactionPartId}): ${error instanceof Error ? error.message : String(error)}`);
-    return false;
+      if (performance.now() - sliceStartedAt >= REBASE_SLICE_MS) {
+        await new Promise((resolve) => setImmediate(resolve));
+        sliceStartedAt = performance.now();
+      }
+    }
+  } finally {
+    if (!finished)
+      steps.return(emptyOutcome("unchanged", args.generation, null));
   }
 }
-function dataReferencesTailStart(data) {
-  if (typeof data !== "object" || data === null)
-    return null;
-  const record = data;
-  if (typeof record.tail_start_id === "string" && record.tail_start_id.length > 0) {
-    return record.tail_start_id;
+function* rebaseSteps(args) {
+  const { db, sessionId, generation } = args;
+  const startedAt = performance.now();
+  if (!sessionIsOpenCodeOwned(db, sessionId)) {
+    return emptyOutcome("unchanged", generation, null);
   }
-  const nested = record.compaction;
-  if (typeof nested === "object" && nested !== null) {
-    const nestedTail = nested.tail_start_id;
-    if (typeof nestedTail === "string" && nestedTail.length > 0)
-      return nestedTail;
+  const previousGeneration = readCoordinateGeneration(db, sessionId);
+  if (previousGeneration === generation) {
+    const outcome = emptyOutcome("unchanged", generation, previousGeneration);
+    const repair = repairStampedSessionOnce(db, sessionId, args);
+    if (repair !== null && repair.rowsRewritten > 0) {
+      outcome.status = "repaired";
+      outcome.compartmentsDerived = repair.derived.length;
+      outcome.compartmentsUnresolved = repair.unresolved.length;
+    }
+    return outcome;
   }
-  return null;
-}
-function isMcCanonicalCompactionPartData(data) {
-  if (typeof data !== "object" || data === null || Array.isArray(data))
-    return false;
-  const record = data;
-  const keys = Object.keys(record).sort();
-  return keys.length === 2 && keys[0] === "auto" && keys[1] === "type" && record.type === "compaction" && record.auto === true;
-}
-function removeMcOwnedCompactionMarkers(sessionId, summaryText) {
-  const db = getWritableOpenCodeDb("removal");
-  if (!isOpenCodeSchemaCompatible(db, getOpenCodeDbPath())) {
-    return {
-      verified: false,
-      removedLineages: 0,
-      removedRows: 0,
-      retainedLineages: 0
-    };
+  const impliedGeneration = previousGeneration ?? generationImpliedByHarness(db, sessionId) ?? generation;
+  if (impliedGeneration === generation) {
+    stampGeneration(db, sessionId, generation, null);
+    return emptyOutcome("stamped", generation, previousGeneration);
   }
-  const canonicalSummaries = db.prepare(`SELECT id, COALESCE(json_extract(data, '$.parentID'), '') AS parent_id
-             FROM message
-             WHERE session_id = ?
-               AND COALESCE(json_extract(data, '$.summary'), 0) = 1
-               AND COALESCE(json_extract(data, '$.finish'), '') = 'stop'
-               AND COALESCE(json_extract(data, '$.providerID'), '') = 'magic-context'`).all(sessionId);
-  const legacySummaries = db.prepare(`SELECT m.id, COALESCE(json_extract(m.data, '$.parentID'), '') AS parent_id
-             FROM message m
-             WHERE m.session_id = ?
-               AND COALESCE(json_extract(m.data, '$.summary'), 0) = 1
-               AND COALESCE(json_extract(m.data, '$.finish'), '') = 'stop'
-               AND COALESCE(json_extract(m.data, '$.providerID'), '') <> 'magic-context'
-               AND EXISTS (
-                   SELECT 1
-                   FROM part p
-                   WHERE +p.session_id = m.session_id
-                     AND p.message_id = m.id
-                     AND COALESCE(json_extract(p.data, '$.type'), '') = 'text'
-                     AND COALESCE(json_extract(p.data, '$.text'), '') = ?
-               )`).all(sessionId, summaryText);
-  const summariesByBoundary = new Map;
-  const orphanSummaryIds = new Set;
-  for (const row of [...canonicalSummaries, ...legacySummaries]) {
-    if (typeof row.id !== "string")
+  const projection = yield* buildProjectionSteps(args, true);
+  const outcome = emptyOutcome("rebased", generation, impliedGeneration);
+  const compartmentRows = readCompartmentRows(db, "compartments", sessionId);
+  const recompRows = readCompartmentRows(db, "recomp_compartments", sessionId);
+  const compartmentPlans = planCompartments(compartmentRows, "compartments", projection);
+  const recompPlans = planCompartments(recompRows, "recomp_compartments", projection);
+  const compartmentGapResult = healNonNarrativeCompartmentGaps(compartmentPlans, projection);
+  const recompGapResult = healNonNarrativeCompartmentGaps(recompPlans, projection);
+  const notePlans = planNotes(db, sessionId, projection);
+  const shrunkMessages = [];
+  const taggedMessageIds = new Set(db.prepare("SELECT message_id FROM tags WHERE session_id = ? AND type = 'message'").all(sessionId).flatMap((row) => typeof row.message_id === "string" ? [row.message_id] : []));
+  const highestTaggedPartIndex = new Map;
+  for (const contentId of taggedMessageIds) {
+    const marker = contentId.lastIndexOf(":p");
+    if (marker <= 0)
       continue;
-    if (typeof row.parent_id === "string" && row.parent_id.length > 0) {
-      const set = summariesByBoundary.get(row.parent_id) ?? new Set;
-      set.add(row.id);
-      summariesByBoundary.set(row.parent_id, set);
-    } else {
-      orphanSummaryIds.add(row.id);
-    }
+    const suffix = contentId.slice(marker + 2);
+    if (!/^\d+$/.test(suffix))
+      continue;
+    const messageId = contentId.slice(0, marker);
+    const partIndex = Number.parseInt(suffix, 10);
+    highestTaggedPartIndex.set(messageId, Math.max(highestTaggedPartIndex.get(messageId) ?? 0, partIndex));
   }
-  const compactionParts = db.prepare(`SELECT id, message_id, data
-             FROM part
-             WHERE session_id = ?
-               AND COALESCE(json_extract(data, '$.type'), '') = 'compaction'`).all(sessionId);
-  const parsedParts = [];
-  for (const part of compactionParts) {
-    if (typeof part.id !== "string" || typeof part.message_id !== "string")
+  for (const [messageId, highestIndex] of highestTaggedPartIndex) {
+    const partCount = projection.partCountById.get(messageId);
+    if (partCount === undefined || highestIndex < partCount)
       continue;
-    let data;
-    try {
-      data = typeof part.data === "string" ? JSON.parse(part.data) : part.data;
-    } catch {
-      data = null;
+    shrunkMessages.push({ messageId, partCount });
+  }
+  const indexNeedsRebuild = indexDisagreesWithProjection(db, sessionId, projection);
+  const chunkEmbeddingCount = countRows2(db, "SELECT COUNT(*) AS count FROM compartment_chunk_embeddings WHERE session_id = ?", sessionId);
+  const depthRowCount = countRows2(db, "SELECT COUNT(*) AS count FROM compression_depth WHERE session_id = ?", sessionId);
+  const lkgSlotCount = countRows2(db, "SELECT COUNT(*) AS count FROM lkg_slots WHERE session_id = ?", sessionId);
+  const boundaryPlan = planPriorBoundary(db, sessionId, compartmentPlans);
+  const partialRangePlan = planRecompPartialRange(db, sessionId, recompPlans);
+  outcome.healedGaps = compartmentGapResult.healed + recompGapResult.healed;
+  outcome.narrativeGaps = compartmentGapResult.narrative + recompGapResult.narrative;
+  const movedCompartments = compartmentPlans.filter(compartmentPlanChanges);
+  const movedRecomp = recompPlans.filter(compartmentPlanChanges);
+  const movedNotes = notePlans.filter((plan) => plan.ordinal !== plan.previousOrdinal);
+  const anythingMoved = movedCompartments.length > 0 || movedRecomp.length > 0 || movedNotes.length > 0 || shrunkMessages.length > 0 || indexNeedsRebuild || boundaryPlan !== null || partialRangePlan !== null || outcome.healedGaps > 0 || outcome.narrativeGaps > 0;
+  if (!anythingMoved) {
+    stampGeneration(db, sessionId, generation, null);
+    return emptyOutcome("stamped", generation, impliedGeneration);
+  }
+  db.exec("BEGIN IMMEDIATE");
+  let closed = false;
+  try {
+    if (readCoordinateGeneration(db, sessionId) !== previousGeneration) {
+      db.exec("ROLLBACK");
+      closed = true;
+      return emptyOutcome("unchanged", generation, readCoordinateGeneration(db, sessionId));
     }
-    parsedParts.push({
-      id: part.id,
-      messageId: part.message_id,
-      data,
-      tailStartId: dataReferencesTailStart(data)
+    clearCachedM0M1(db, sessionId);
+    db.prepare("UPDATE session_meta SET system_prompt_hash = '' WHERE session_id = ?").run(sessionId);
+    for (const column of [
+      "stripped_placeholder_ids",
+      "merged_reasoning_stripped_ids",
+      "trailing_blank_decisions"
+    ]) {
+      outcome.frozenPartEntriesDropped += pruneShrunkPartEntries(db, sessionId, column, shrunkMessages);
+    }
+    const fold = foldShrunkPartTags2(db, sessionId, shrunkMessages);
+    outcome.partTagsFolded = fold.foldedTagNumbers.length;
+    outcome.partTagsRekeyed = fold.rekeyedTagNumbers.length;
+    outcome.queuedReductionsDiscarded = fold.discardedDropTagNumbers.length;
+    const updateCompartment = {
+      compartments: db.prepare("UPDATE compartments SET start_message = ?, end_message = ?, rebase_status = ? WHERE id = ?"),
+      recomp_compartments: db.prepare("UPDATE recomp_compartments SET start_message = ?, end_message = ?, rebase_status = ? WHERE id = ?")
+    };
+    for (const plan of [...compartmentPlans, ...recompPlans]) {
+      if (!compartmentPlanChanges(plan))
+        continue;
+      updateCompartment[plan.table].run(plan.start, plan.end, plan.status, plan.id);
+      const rebased = plan.status === "ok" ? 1 : 0;
+      const unresolved = plan.status === "unresolved" ? 1 : 0;
+      if (plan.table === "compartments") {
+        outcome.compartmentsRebased += rebased;
+        outcome.compartmentsUnresolved += unresolved;
+        if (rebased === 1 && plan.derived)
+          outcome.compartmentsDerived += 1;
+        if (rebased === 1 && plan.previousStatus === "unresolved")
+          outcome.compartmentsResolvedAgain += 1;
+      } else {
+        outcome.recompCompartmentsRebased += rebased;
+        outcome.recompCompartmentsUnresolved += unresolved;
+      }
+    }
+    const updateNote = db.prepare("UPDATE notes SET anchor_ordinal = ? WHERE id = ? AND session_id = ?");
+    for (const plan of movedNotes) {
+      updateNote.run(plan.ordinal, plan.id, sessionId);
+      if (plan.ordinal === null)
+        outcome.notesCleared += 1;
+      else
+        outcome.notesRebased += 1;
+    }
+    if (boundaryPlan !== null) {
+      db.prepare("UPDATE session_meta SET prior_boundary_ordinal = ? WHERE session_id = ?").run(boundaryPlan, sessionId);
+      outcome.priorBoundaryRebased = true;
+    }
+    if (partialRangePlan !== null) {
+      db.prepare("UPDATE session_meta SET recomp_partial_range_start = ?, recomp_partial_range_end = ? WHERE session_id = ?").run(partialRangePlan.start, partialRangePlan.end, sessionId);
+      outcome.recompPartialRangeRebased = true;
+    }
+    if (indexNeedsRebuild) {
+      clearIndexedMessagesInTransaction2(db, sessionId);
+      outcome.indexRebuilt = true;
+      outcome.compressionDepthRowsDropped = depthRowCount;
+    }
+    if (chunkEmbeddingCount > 0) {
+      db.prepare("DELETE FROM compartment_chunk_embeddings WHERE session_id = ?").run(sessionId);
+      outcome.chunkEmbeddingsDeleted = chunkEmbeddingCount;
+    }
+    if (lkgSlotCount > 0) {
+      db.prepare("DELETE FROM lkg_slot_chunks WHERE session_id = ?").run(sessionId);
+      db.prepare("DELETE FROM lkg_slots WHERE session_id = ?").run(sessionId);
+      outcome.lkgSlotsDropped = lkgSlotCount;
+    }
+    stampGeneration(db, sessionId, generation, {
+      generation,
+      previousGeneration: impliedGeneration,
+      at: Date.now(),
+      unresolvedCompartments: outcome.compartmentsUnresolved + outcome.recompCompartmentsUnresolved,
+      discardedReductions: outcome.queuedReductionsDiscarded,
+      droppedDepthRows: outcome.compressionDepthRowsDropped,
+      healedGaps: outcome.healedGaps,
+      narrativeGaps: outcome.narrativeGaps,
+      derivedCompartments: rangeNotes(compartmentPlans, (plan) => plan.status === "ok" && plan.derived),
+      unresolvedCompartmentRanges: rangeNotes(compartmentPlans, (plan) => plan.status === "unresolved"),
+      neighbourRecoveryAt: Date.now()
     });
+    db.exec("COMMIT");
+    closed = true;
+  } finally {
+    if (!closed) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
+    }
   }
-  const messageTailRefs = db.prepare(`SELECT id, data
-             FROM message
-             WHERE session_id = ?
-               AND json_extract(data, '$.compaction.tail_start_id') IS NOT NULL`).all(sessionId);
-  const messageTailStartIds = new Set;
-  for (const row of messageTailRefs) {
-    if (typeof row.id !== "string")
-      continue;
-    let data;
-    try {
-      data = typeof row.data === "string" ? JSON.parse(row.data) : row.data;
-    } catch {
-      data = null;
+  if (outcome.indexRebuilt) {
+    const sources = projection.indexSources;
+    for (let start = 0;start < sources.length; start += INDEX_REBUILD_CHUNK) {
+      indexSourcesAfterOrdinal2(db, sessionId, sources.slice(start, start + INDEX_REBUILD_CHUNK), sources.length);
+      yield;
     }
-    const ref = dataReferencesTailStart(data);
-    if (ref)
-      messageTailStartIds.add(ref);
+    outcome.indexRowsRebuilt = countRows2(db, "SELECT COUNT(*) AS count FROM message_history_source WHERE session_id = ?", sessionId);
   }
-  let removedLineages = 0;
-  let removedRows = 0;
-  let retainedLineages = 0;
-  const deletePartsOfMessage = db.prepare("DELETE FROM part WHERE +session_id = ? AND message_id = ?");
-  const deleteMessage = db.prepare("DELETE FROM message WHERE session_id = ? AND id = ?");
-  const deletePart = db.prepare("DELETE FROM part WHERE session_id = ? AND id = ?");
-  const deleteSummaries = (summaryIds) => {
-    let rows = 0;
-    for (const summaryId of summaryIds) {
-      rows += deletePartsOfMessage.run(sessionId, summaryId).changes;
-      rows += deleteMessage.run(sessionId, summaryId).changes;
+  sessionLog2(sessionId, formatRebaseLogLine(outcome, performance.now() - startedAt));
+  return outcome;
+}
+function recoverUnresolvedCompartments(args) {
+  const { db, sessionId } = args;
+  const rows = readCompartmentRows(db, "compartments", sessionId);
+  const result = { rowsRewritten: 0, derived: [], unresolved: [] };
+  if (!rows.some((row) => row.rebase_status === "unresolved"))
+    return result;
+  const known = rows.map((row) => {
+    if (row.rebase_status !== "unresolved") {
+      return { start: row.start_message, end: row.end_message };
     }
-    return rows;
-  };
-  for (const [boundaryMessageId, summaryIds] of summariesByBoundary) {
-    const boundaryParts = parsedParts.filter((part) => part.messageId === boundaryMessageId);
-    const mcPartIds = boundaryParts.filter((part) => isMcCanonicalCompactionPartData(part.data)).map((part) => part.id);
-    const rowsToDelete = new Set([...summaryIds, ...mcPartIds]);
-    const survivingPartsReferenceDeletion = parsedParts.some((part) => !mcPartIds.includes(part.id) && part.tailStartId !== null && rowsToDelete.has(part.tailStartId));
-    const messageFieldReferencesDeletion = [...rowsToDelete].some((id) => messageTailStartIds.has(id));
-    if (survivingPartsReferenceDeletion || messageFieldReferencesDeletion) {
-      retainedLineages += 1;
-      log2(`[magic-context] compaction-marker: flip-off cleanup RETAINED lineage at boundary ${boundaryMessageId} — a surviving tail_start_id references a row the deletion would remove`);
-      continue;
+    return {
+      start: resolveAnchor(row.start_message_id, args.resolveOrdinal),
+      end: resolveAnchor(row.end_message_id, args.resolveOrdinal)
+    };
+  });
+  const plans = recoverFromNeighbours(rows, "compartments", known);
+  const wasUnresolved = (plan) => plan.previousStatus === "unresolved";
+  result.derived = rangeNotes(plans, (plan) => wasUnresolved(plan) && plan.status === "ok" && plan.derived);
+  result.unresolved = rangeNotes(plans, (plan) => plan.status === "unresolved");
+  const changed = plans.filter(compartmentPlanChanges);
+  const now = Date.now();
+  db.exec("BEGIN IMMEDIATE");
+  let committed = false;
+  try {
+    for (const plan of changed) {
+      db.prepare("UPDATE compartments SET start_message = ?, end_message = ?, rebase_status = ? WHERE id = ?").run(plan.start, plan.end, plan.status, plan.id);
     }
-    const rows = runMarkerRemovalTransaction(db, () => {
-      let changed = deleteSummaries(summaryIds);
-      for (const partId of mcPartIds) {
-        changed += deletePart.run(sessionId, partId).changes;
-      }
-      return changed;
-    });
-    if (rows > 0 || summaryIds.size > 0 || mcPartIds.length > 0) {
-      removedLineages += 1;
-      removedRows += rows;
+    const previous = readCoordinateRebaseNotice(db, sessionId);
+    const generation = previous?.generation ?? readCoordinateGeneration(db, sessionId);
+    if (generation !== null) {
+      const derivedSequences = new Set(result.derived.map((note) => note.sequence));
+      const notice = {
+        generation,
+        previousGeneration: previous?.previousGeneration ?? null,
+        at: previous?.at ?? now,
+        unresolvedCompartments: result.unresolved.length,
+        discardedReductions: previous?.discardedReductions ?? 0,
+        droppedDepthRows: previous?.droppedDepthRows ?? 0,
+        healedGaps: previous?.healedGaps ?? 0,
+        narrativeGaps: previous?.narrativeGaps ?? 0,
+        derivedCompartments: [
+          ...(previous?.derivedCompartments ?? []).filter((note) => !derivedSequences.has(note.sequence)),
+          ...result.derived
+        ],
+        unresolvedCompartmentRanges: result.unresolved,
+        neighbourRecoveryAt: now
+      };
+      ensureSessionMetaRow(db, sessionId);
+      db.prepare("UPDATE session_meta SET coordinate_rebase_notice = ? WHERE session_id = ?").run(JSON.stringify(notice), sessionId);
     }
-  }
-  if (orphanSummaryIds.size > 0) {
-    const rowsToDelete = new Set(orphanSummaryIds);
-    const survivingPartsReferenceDeletion = parsedParts.some((part) => part.tailStartId !== null && rowsToDelete.has(part.tailStartId));
-    const messageFieldReferencesDeletion = [...rowsToDelete].some((id) => messageTailStartIds.has(id));
-    if (survivingPartsReferenceDeletion || messageFieldReferencesDeletion) {
-      retainedLineages += 1;
-    } else {
-      const rows = runMarkerRemovalTransaction(db, () => deleteSummaries(orphanSummaryIds));
-      removedLineages += 1;
-      removedRows += rows;
+    db.exec("COMMIT");
+    committed = true;
+  } finally {
+    if (!committed) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
     }
   }
-  if (removedLineages > 0 || retainedLineages > 0) {
-    log2(`[magic-context] compaction-marker: flip-off cleanup for ${sessionId} removed ${removedLineages} lineage(s) (${removedRows} rows), retained ${retainedLineages}`);
+  result.rowsRewritten = changed.length;
+  sessionLog2(sessionId, `INFO compartment neighbour recovery (${args.reason}) rows_rewritten=${changed.length} ` + `derived=${result.derived.map((note) => `${note.start}-${note.end}`).join(",") || "none"} ` + `unresolved=${result.unresolved.map((note) => `${note.start}-${note.end}`).join(",") || "none"}`);
+  return result;
+}
+var repairCheckedSessions = new WeakMap;
+function unresolvedRowBreaksTiling(rows) {
+  let expectedStart = 1;
+  for (let index = 0;index < rows.length; index += 1) {
+    const row = rows[index];
+    if (!row)
+      continue;
+    const broken = row.start_message !== expectedStart || row.end_message < row.start_message;
+    const touchesUnresolved = row.rebase_status === "unresolved" || rows[index - 1]?.rebase_status === "unresolved";
+    if (broken && touchesUnresolved)
+      return true;
+    expectedStart = row.end_message + 1;
   }
-  return {
-    verified: retainedLineages === 0,
-    removedLineages,
-    removedRows,
-    retainedLineages
-  };
+  return false;
 }
-function removeCompactionMarker(state) {
-  try {
-    const db = getWritableOpenCodeDb("removal");
-    runMarkerRemovalTransaction(db, () => {
-      db.prepare("DELETE FROM part WHERE id = ?").run(state.summaryPartId);
-      db.prepare("DELETE FROM message WHERE id = ?").run(state.summaryMessageId);
-      db.prepare("DELETE FROM part WHERE id = ?").run(state.compactionPartId);
-    });
-    return true;
-  } catch (error) {
-    log2(`[magic-context] compaction-marker: removal failed: ${error instanceof Error ? error.message : String(error)}`);
-    return false;
+function repairStampedSessionOnce(db, sessionId, readArgs) {
+  let checked = repairCheckedSessions.get(db);
+  if (!checked) {
+    checked = new Set;
+    repairCheckedSessions.set(db, checked);
+  }
+  if (checked.has(sessionId))
+    return null;
+  checked.add(sessionId);
+  const rows = readCompartmentRows(db, "compartments", sessionId);
+  if (!rows.some((row) => row.rebase_status === "unresolved"))
+    return null;
+  if (readCoordinateRebaseNotice(db, sessionId)?.neighbourRecoveryAt != null)
+    return null;
+  if (!unresolvedRowBreaksTiling(rows))
+    return null;
+  let ordinalById = null;
+  return recoverUnresolvedCompartments({
+    db,
+    sessionId,
+    resolveOrdinal: (messageId) => {
+      if (ordinalById === null) {
+        const projection = emptyProjection();
+        for (const page of readProjectionPages(readArgs)) {
+          addToProjection(projection, page, false);
+        }
+        ordinalById = projection.ordinalById;
+      }
+      return ordinalById.get(messageId);
+    },
+    reason: "stamped-session repair"
+  });
+}
+function formatRebaseLogLine(outcome, elapsedMs) {
+  const rowsRewritten = outcome.compartmentsRebased + outcome.recompCompartmentsRebased + outcome.notesRebased + outcome.notesCleared + (outcome.priorBoundaryRebased ? 1 : 0) + (outcome.recompPartialRangeRebased ? 1 : 0);
+  const unresolved = outcome.compartmentsUnresolved + outcome.recompCompartmentsUnresolved;
+  return `INFO store-generation-rebase ${outcome.previousGeneration ?? "unrecorded"}->${outcome.generation} ` + `rows_rewritten=${rowsRewritten} unresolved=${unresolved} derived=${outcome.compartmentsDerived} ` + `index_rows_rebuilt=${outcome.indexRowsRebuilt} drops_discarded=${outcome.queuedReductionsDiscarded} ` + `healed_gaps=${outcome.healedGaps} narrative_gaps=${outcome.narrativeGaps} ` + `ms=${Math.round(elapsedMs)} ` + `(chunk_windows_deleted=${outcome.chunkEmbeddingsDeleted} depth_rows_dropped=${outcome.compressionDepthRowsDropped} ` + `part_tags_folded=${outcome.partTagsFolded} lkg_slots_dropped=${outcome.lkgSlotsDropped} ` + `frozen_part_entries_dropped=${outcome.frozenPartEntriesDropped})`;
+}
+function planPriorBoundary(db, sessionId, plans) {
+  const row = db.prepare("SELECT prior_boundary_ordinal FROM session_meta WHERE session_id = ?").get(sessionId);
+  const current = typeof row?.prior_boundary_ordinal === "number" ? row.prior_boundary_ordinal : 1;
+  if (current <= 1)
+    return null;
+  const source = plans.find((plan) => plan.status === "ok" && plan.previousEnd === current && plan.end !== current);
+  return source ? source.end : null;
+}
+function planRecompPartialRange(db, sessionId, plans) {
+  const row = db.prepare("SELECT recomp_partial_range_start AS start, recomp_partial_range_end AS end FROM session_meta WHERE session_id = ?").get(sessionId);
+  const start = typeof row?.start === "number" ? row.start : 0;
+  const end = typeof row?.end === "number" ? row.end : 0;
+  if (start <= 0 && end <= 0)
+    return null;
+  const startSource = plans.find((plan) => plan.status === "ok" && plan.previousStart === start);
+  const endSource = plans.find((plan) => plan.status === "ok" && plan.previousEnd === end);
+  if (!startSource || !endSource)
+    return null;
+  if (startSource.start === start && endSource.end === end)
+    return null;
+  return { start: startSource.start, end: endSource.end };
+}
+function indexDisagreesWithProjection(db, sessionId, projection) {
+  const sourceRows = db.prepare("SELECT message_id, message_ordinal FROM message_history_source WHERE session_id = ?").all(sessionId);
+  if (sourceRows.length === 0) {
+    return countRows2(db, "SELECT COUNT(*) AS count FROM message_fts_rowid_map WHERE session_id = ?", sessionId) > 0;
+  }
+  for (const row of sourceRows) {
+    if (typeof row.message_id !== "string" || typeof row.message_ordinal !== "number") {
+      return true;
+    }
+    if (projection.ordinalById.get(row.message_id) !== row.message_ordinal)
+      return true;
   }
+  const orphanedMapRows = countRows2(db, `SELECT COUNT(*) AS count FROM message_fts_rowid_map AS m
+         WHERE m.session_id = ?
+           AND NOT EXISTS (
+               SELECT 1 FROM message_history_source AS s
+               WHERE s.session_id = m.session_id AND s.message_ordinal = m.message_ordinal
+           )`, sessionId);
+  return orphanedMapRows > 0;
 }
 
 // src/hooks/magic-context/compaction-marker-manager.ts
@@ -12763,7 +12796,7 @@ function persistMarkerStateAndDropReplacedTag(db, sessionId, state, replacedSumm
   logSlowWriteTransaction("marker-drain", transactionStartedAt);
 }
 function markerUpdateDefinitelyDidNotCut(outcome) {
-  return outcome.kind === "already-current" || outcome.kind === "stale-skip" || outcome.kind === "retryable-failure" && outcome.cut === "definitely-no-cut";
+  return outcome.kind === "already-current" || outcome.kind === "deferred" || outcome.kind === "stale-skip" || outcome.kind === "retryable-failure" && outcome.cut === "definitely-no-cut";
 }
 function validatePendingTarget(db, sessionId, pending) {
   const ocMessage = getOpenCodeMessageById(sessionId, pending.endMessageId);
@@ -12875,6 +12908,8 @@ function applyDeferredCompactionMarker(db, sessionId, pending, directory, truste
       resolvedBoundary: boundary
     });
     endStep("replace");
+    if (replacement.kind === "deferred")
+      return { kind: "deferred", reason: "candidate-preparation" };
     if (replacement.kind !== "committed") {
       return {
         kind: "retryable-failure",
@@ -19260,7 +19295,7 @@ function resolveProtectedTailBoundary(ctx) {
   const offset = Math.max(1, ctx.lastCompartmentEndOrdinal + 1);
   const absoluteMessageCount = getCachedAbsoluteMessageCount2(ctx.sessionId) ?? getRawSessionMessageOrdinalCount2(ctx.sessionId);
   const messages = readRawSessionMessageRange2(ctx.sessionId, Math.max(1, offset - 1), absoluteMessageCount);
-  const storedTotals = ctx.storedTokenTotals;
+  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id)) ?? ctx.storedTokenTotals;
   const index = buildTrueRawTokenIndex(ctx.sessionId, messages, {
     providerShapeVersion: ctx.providerShapeVersion,
     cacheNamespace: ctx.cacheNamespace,
@@ -19503,12 +19538,14 @@ function resolveBoundaryContext(args) {
     migrationFloorActive = seedResult.seeded;
   }
   const calibration = sessionDecisionCalibration(args.db, args.sessionId);
-  let storedTokenTotals;
-  try {
-    storedTokenTotals = getAllStatusTagTokenTotalsFlat2(args.db, args.sessionId, args.taggerFloor ?? 0, calibration).totals;
-  } catch (error) {
-    sessionLog2(args.sessionId, "protected-tail stored-token map unavailable (live fallback):", error);
-  }
+  const storedTokenTotalsForMessages = (messageIds) => {
+    try {
+      return getAllStatusTagTokenTotalsFlat2(args.db, args.sessionId, args.taggerFloor ?? 0, calibration, messageIds).totals;
+    } catch (error) {
+      sessionLog2(args.sessionId, "protected-tail stored-token map unavailable (live fallback):", error);
+      return;
+    }
+  };
   return {
     sessionId: args.sessionId,
     mode: args.mode,
@@ -19525,7 +19562,7 @@ function resolveBoundaryContext(args) {
     emergencyTailScale: args.emergencyTailScale,
     providerShapeVersion: args.providerShapeVersion ?? "opencode-v1",
     cacheNamespace: args.cacheNamespace ?? `opencode:${args.sessionId}`,
-    storedTokenTotals,
+    storedTokenTotalsForMessages,
     calibration
   };
 }
@@ -19538,13 +19575,14 @@ function resolveWrapupProtectedTailBoundary(args) {
   const offset = Math.max(1, ctx.lastCompartmentEndOrdinal + 1);
   const absoluteMessageCount = getCachedAbsoluteMessageCount2(ctx.sessionId) ?? getRawSessionMessageOrdinalCount2(ctx.sessionId);
   const messages = readRawSessionMessageRange2(ctx.sessionId, Math.max(1, offset - 1), absoluteMessageCount);
+  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id)) ?? ctx.storedTokenTotals;
   const index = buildTrueRawTokenIndex(ctx.sessionId, messages, {
     providerShapeVersion: ctx.providerShapeVersion,
     cacheNamespace: ctx.cacheNamespace,
     calibration: ctx.calibration,
     absoluteMessageCount,
-    storedTotalForMessage: ctx.storedTokenTotals ? (m) => {
-      const value = ctx.storedTokenTotals?.get(m.id);
+    storedTotalForMessage: storedTotals ? (m) => {
+      const value = storedTotals?.get(m.id);
       return value === undefined ? null : value;
     } : undefined
   });
@@ -20338,6 +20376,8 @@ ${chunkText}`,
       deps.onDeferredMarkerPending?.(sessionId);
     } else {
       try {
+        if (!deps.compactionMarkerStrategy?.publish || deps.compactionMarkerStrategy.publish === updateCompactionMarkerAfterPublication)
+          await prepareCompactionMarkerCandidates(sessionId);
         (deps.compactionMarkerStrategy?.publish ?? updateCompactionMarkerAfterPublication)(db, sessionId, lastCompartmentEnd, sessionDirectory);
       } catch (error) {
         sessionLog2(sessionId, "compaction-marker update after publish failed:", error);
@@ -21446,4 +21486,4 @@ async function executeContextRecomp(deps, options = {}) {
   return (await executeContextRecompWithResult(deps, options)).message;
 }
 
-export { denyTaskRoutingToCallerAgents, buildHiddenAgentRegistrations, buildHiddenAgentConfig, getMagicContextBuiltinCommands, formatConfigParseStatusLine, claimConfigParseFailuresOnce, COMPACTION_ENABLED_PATH, isDreamerRunnable, isHistorianRunnable, isCompactionEnabled, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, resolveLegacyConfigSources, migrateMagicContextConfigLocations, getProtectedTokensTierOverrides, loadPluginConfigDetailed, historianRunConfig, dreamerRunConfig, pluginConfigReader, currentPluginConfigReader, withLiveDreamerOutputCap, createDreamerOutputCapSampler, COMPARTMENT_AGENT_SYSTEM_PROMPT, HISTORIAN_EDITOR_SYSTEM_PROMPT, COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, clampProducerAtomChars, producerInputTokenLimit, historianProducerReserve, producerPromptFailureReason, DREAMER_AGENT, DREAMER_RETROSPECTIVE_AGENT, DREAMER_PRIMER_INVESTIGATOR_AGENT, DREAMER_MEMORY_MAPPER_AGENT, DREAMER_CLASSIFIER_AGENT, DREAMER_DOCS_AGENT, DREAMER_REVIEWER_AGENT, embedPauseBySession, embedRunStateBySession, autoEmbedAttemptedBySession, autoEmbedIdentityBySession, invalidateAutoEmbedSession, getEmbedDrainUiStatus, clearEmbedSessionState, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getUncoveredCompartmentEndsThrough, providerResponseFailed, isSuccessfulProviderCompletion, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, cancelAutoSearchWork, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, V2StoreReader, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, clearSession, requestPendingMaterialization, pendingMaterializationOrigin, clearPendingMaterialization, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, isHeldHeadForRequest, deferDeliveredSystemRefresh, retirePendingSystemPromptDelivery, lkgProviderInputTotal, beginV2LkgRequest, claimLkgRequestIdentity, currentLkgRequestIdentity, noteCapturedLkgRequest, noteLkgProviderResponse, measuredLkgPrefix, clearLkgMeasuredRequest, saveLkgSlotToDb, clearPersistedLkgSlotStrict, loadPersistedLkgSlot, drainStaleLkgSlots, createDbLkgPersistence, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, replayLkg, coldStartRawServedIndex, coldStartUncapturedReplay, noteUncertifiedNormalLkg, hasProcessLocalLkgProof, lkgDirtyRevision, rememberLkgDirtyRevision, noteLkgRecoveryPrefix, readLkgRecoveryPrefix, noteLkgHealthyPrefix, lkgRecoveryReplayUnproven, lkgRecoveryEntryUnproven, registerLkgPersistence, beginLkgPass, visitMessageContentFields, contentSnapshotValue, messageContentFields, signatureForFields, exactReusablePrefix, incrementalLkgContentDigests, lkgSlotRejection, captureSlot, getInMemorySlot, getSlot, forgetInMemorySlot, dropSlot, noteEntry, getLkgSlotHeapStats, TOOL_SWEEP_SCOPED_MARKER, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, queueMemoryMutation, getMaxMemoryMutationIdForProjects, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, createChildSessionWithFence, HiddenCompletionRefusal, DreamerProviderOutputFailureError, withDreamerModelCooldown, providerOutputFailureFromInvalidManifest, HIDDEN_HISTORIAN_AGENT, HIDDEN_DREAMER_AGENT, HIDDEN_CURATE_AGENT, hiddenAgentFor, hiddenToolLoop, hiddenChildPermissions, registerHiddenChildAgents, hiddenToolCallRefusal, HiddenAgentStepLimit, HiddenChildHook, extractLatestAssistantText, hasLengthCappedOutput, parseProviderModel, modelBodyField, toModelEntry, isPromptTimeoutError, getPromptFailureDetail, promptSyncWithValidatedOutputRetry, normalizeSDKResponse, failedInvocationStatus, recordChildInvocation, recordPromptSessionError, createPromptAsyncTransport, CTX_NOTE_LIGHT_DESCRIPTION, ACTIVE_TOOL_IDS, promptSurfaceHashMaterial, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, setKeepSubagents, teardownChildSession, getCompartmentEvents, runTokenLog, formatRunTokenLog, resolveHiddenCompletionExecutor, createV1HiddenCompletionExecutor, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, getMuralIdentity, getMural, readCoordinateGeneration, readCoordinateRebaseNotice, formatCoordinateRebaseNotice, rebaseSessionCoordinatesAsync, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, removeMcOwnedCompactionMarkers, MARKER_SUMMARY_TEXT, markerUpdateDefinitelyDidNotCut, applyDeferredCompactionMarker, removeCompactionMarkerForSession, checkCompactionMarkerConsistency, buildMagicContextSection, modelKeyAcceptsImages, resolveMuralWire, extractM0Block, formatDate, TEMPORAL_MARKER_REPLAY_PATTERN, collectTemporalCandidates, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, MaterializeContentionError, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, hydrateCachedM0Mural, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, EMPTY_READ_REPLY, noteTouchedAt, renderGlance, renderNotesById, formatWriteReply, observeNoteNudgeServe, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, resetNoteNudgeCooldownOnly, clearNoteNudgeTriggerOnly, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, runCompartmentAgent, snapRangeToCompartments, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, executeContextRecomp };
+export { denyTaskRoutingToCallerAgents, buildHiddenAgentRegistrations, buildHiddenAgentConfig, getMagicContextBuiltinCommands, formatConfigParseStatusLine, claimConfigParseFailuresOnce, COMPACTION_ENABLED_PATH, isDreamerRunnable, isHistorianRunnable, isCompactionEnabled, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, resolveLegacyConfigSources, migrateMagicContextConfigLocations, getProtectedTokensTierOverrides, loadPluginConfigDetailed, historianRunConfig, dreamerRunConfig, pluginConfigReader, currentPluginConfigReader, withLiveDreamerOutputCap, createDreamerOutputCapSampler, COMPARTMENT_AGENT_SYSTEM_PROMPT, HISTORIAN_EDITOR_SYSTEM_PROMPT, COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, clampProducerAtomChars, producerInputTokenLimit, historianProducerReserve, producerPromptFailureReason, DREAMER_AGENT, DREAMER_RETROSPECTIVE_AGENT, DREAMER_PRIMER_INVESTIGATOR_AGENT, DREAMER_MEMORY_MAPPER_AGENT, DREAMER_CLASSIFIER_AGENT, DREAMER_DOCS_AGENT, DREAMER_REVIEWER_AGENT, embedPauseBySession, embedRunStateBySession, autoEmbedAttemptedBySession, autoEmbedIdentityBySession, invalidateAutoEmbedSession, getEmbedDrainUiStatus, clearEmbedSessionState, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getUncoveredCompartmentEndsThrough, providerResponseFailed, isSuccessfulProviderCompletion, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, cancelAutoSearchWork, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, V2StoreReader, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, clearSession, requestPendingMaterialization, pendingMaterializationOrigin, clearPendingMaterialization, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, isHeldHeadForRequest, deferDeliveredSystemRefresh, retirePendingSystemPromptDelivery, lkgProviderInputTotal, beginV2LkgRequest, claimLkgRequestIdentity, currentLkgRequestIdentity, noteCapturedLkgRequest, noteLkgProviderResponse, measuredLkgPrefix, clearLkgMeasuredRequest, saveLkgSlotToDb, clearPersistedLkgSlotStrict, loadPersistedLkgSlot, drainStaleLkgSlots, createDbLkgPersistence, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, replayLkg, coldStartRawServedIndex, coldStartUncapturedReplay, noteUncertifiedNormalLkg, hasProcessLocalLkgProof, lkgDirtyRevision, rememberLkgDirtyRevision, noteLkgRecoveryPrefix, readLkgRecoveryPrefix, noteLkgHealthyPrefix, lkgRecoveryReplayUnproven, lkgRecoveryEntryUnproven, registerLkgPersistence, beginLkgPass, visitMessageContentFields, contentSnapshotValue, messageContentFields, signatureForFields, exactReusablePrefix, incrementalLkgContentDigests, lkgSlotRejection, captureSlot, getInMemorySlot, getSlot, forgetInMemorySlot, dropSlot, noteEntry, getLkgSlotHeapStats, TOOL_SWEEP_SCOPED_MARKER, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, queueMemoryMutation, getMaxMemoryMutationIdForProjects, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, createChildSessionWithFence, HiddenCompletionRefusal, DreamerProviderOutputFailureError, withDreamerModelCooldown, providerOutputFailureFromInvalidManifest, HIDDEN_HISTORIAN_AGENT, HIDDEN_DREAMER_AGENT, HIDDEN_CURATE_AGENT, hiddenAgentFor, hiddenToolLoop, hiddenChildPermissions, registerHiddenChildAgents, hiddenToolCallRefusal, HiddenAgentStepLimit, HiddenChildHook, extractLatestAssistantText, hasLengthCappedOutput, parseProviderModel, modelBodyField, toModelEntry, isPromptTimeoutError, getPromptFailureDetail, promptSyncWithValidatedOutputRetry, normalizeSDKResponse, failedInvocationStatus, recordChildInvocation, recordPromptSessionError, createPromptAsyncTransport, CTX_NOTE_LIGHT_DESCRIPTION, ACTIVE_TOOL_IDS, promptSurfaceHashMaterial, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, setKeepSubagents, teardownChildSession, getCompartmentEvents, runTokenLog, formatRunTokenLog, resolveHiddenCompletionExecutor, createV1HiddenCompletionExecutor, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, getMuralIdentity, getMural, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, prepareCompactionMarkerCandidates, removeMcOwnedCompactionMarkers, readCoordinateGeneration, readCoordinateRebaseNotice, formatCoordinateRebaseNotice, rebaseSessionCoordinatesAsync, MARKER_SUMMARY_TEXT, markerUpdateDefinitelyDidNotCut, applyDeferredCompactionMarker, removeCompactionMarkerForSession, checkCompactionMarkerConsistency, buildMagicContextSection, modelKeyAcceptsImages, resolveMuralWire, extractM0Block, formatDate, TEMPORAL_MARKER_REPLAY_PATTERN, collectTemporalCandidates, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, MaterializeContentionError, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, hydrateCachedM0Mural, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, EMPTY_READ_REPLY, noteTouchedAt, renderGlance, renderNotesById, formatWriteReply, observeNoteNudgeServe, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, resetNoteNudgeCooldownOnly, clearNoteNudgeTriggerOnly, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, runCompartmentAgent, snapRangeToCompartments, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, executeContextRecomp };