@cortexkit/opencode-magic-context 0.49.33 → 0.49.34

package/dist/{index-4s4zq97n.js → index-9gpw8hrm.js}

@@ -9,7 +9,7 @@ import {
 } from "./index-b88dwwrh.js";
 import {
   cleanUserText2
-} from "./index-0fe4q77z.js";
+} from "./index-7g9dr8gy.js";
 import {
   recordMessageFtsRowid2,
   recordIndexedMessageTime2,

package/dist/{index-2xh37qn5.js → index-atekmqef.js}

@@ -65,7 +65,10 @@ import {
   getOverflowState,
   clearEmergencyRecovery,
   getPersistedCompactionMarkerState,
+  getCompactionMarkerPublicationState,
+  compareAndSetCompactionMarkerPublicationState,
   setPersistedCompactionMarkerState,
+  getDeferredClearedCompactionMarkerState,
   parseStrippedPlaceholderState,
   serializeStrippedPlaceholderState,
   THINKING_BINDING_RECOVERY_FROZEN_PREFIX,
@@ -98,7 +101,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-0fe4q77z.js";
+} from "./index-7g9dr8gy.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -174,7 +177,7 @@ import {
   LATEST_SUPPORTED_VERSION,
   getPersistedSchemaVersion,
   openDatabase
-} from "./index-hbt0sbv2.js";
+} from "./index-fm36bjv4.js";
 import {
   inRootAsyncContext2,
   Database2,
@@ -254,7 +257,7 @@ import {
   toMessageIndexSource,
   clearIndexedMessagesInTransaction,
   indexSourcesAfterOrdinal
-} from "./index-4s4zq97n.js";
+} from "./index-9gpw8hrm.js";
 import {
   stripWellFormedLeadingTagPrefix,
   stripTagPrefix,
@@ -13405,6 +13408,80 @@ function getOpenCodeMessageById(sessionId, messageId) {
   const row = db.prepare(`SELECT id FROM message WHERE session_id = ? AND id = ? LIMIT 1`).get(sessionId, messageId);
   return row ?? null;
 }
+function planCompactionMarker(args, boundary) {
+  const identity = `${args.sessionId}\x00${args.endMessageId}`;
+  return {
+    boundaryMessageId: boundary.id,
+    summaryMessageId: generateMessageId(boundary.timeCreated + 1, 1n, `${identity}\x00summary-message`),
+    compactionPartId: generatePartId(boundary.timeCreated, 1n, `${identity}\x00compaction-part`),
+    summaryPartId: generatePartId(boundary.timeCreated + 1, 2n, `${identity}\x00summary-part`)
+  };
+}
+function isCompactionMarkerIntentAbsent(marker, targetEndMessageId) {
+  if (!targetEndMessageId)
+    return false;
+  const db = getWritableOpenCodeDb();
+  return !db.prepare(`SELECT 1 FROM message WHERE id IN (?, ?)
+        UNION ALL SELECT 1 FROM part WHERE id IN (?, ?) LIMIT 1`).get(targetEndMessageId, marker.summaryMessageId, marker.compactionPartId, marker.summaryPartId);
+}
+function withCompactionMarkerPublicationLock(operation) {
+  return runMarkerWriteTransaction(getWritableOpenCodeDb(), "compaction-marker-replace", operation);
+}
+function inspectCompactionMarkerPublication(sessionId, recognized, summaryText) {
+  const db = getWritableOpenCodeDb();
+  const basis = readMarkerCandidateBasis2(db, sessionId);
+  if (!basis)
+    return { kind: "deferred" };
+  const pairs = [];
+  for (const id of basis.ids) {
+    const rows = db.prepare(`SELECT m.id AS summaryId, p.message_id AS boundaryId, p.id AS partId
+             FROM message m JOIN part p ON p.message_id = json_extract(m.data, '$.parentID')
+               AND +p.session_id = m.session_id
+             WHERE m.id = ? AND m.session_id = ? AND json_extract(m.data, '$.summary') = 1
+               AND COALESCE(json_extract(m.data, '$.finish'), '') <> ''
+               AND json_extract(p.data, '$.type') = 'compaction'`).all(id, sessionId);
+    pairs.push(...rows);
+  }
+  if (pairs.length > 1)
+    return { kind: "ambiguous" };
+  if (pairs.length === 0) {
+    for (const marker of recognized) {
+      if (db.prepare(`SELECT 1 FROM message WHERE id = ?
+                UNION ALL SELECT 1 FROM part WHERE id IN (?, ?) LIMIT 1`).get(marker.summaryMessageId, marker.compactionPartId, marker.summaryPartId))
+        return { kind: "ambiguous" };
+    }
+    return { kind: "verified", marker: null };
+  }
+  const pair = pairs[0];
+  const marker = recognized.find((item) => item.summaryMessageId === pair.summaryId && item.boundaryMessageId === pair.boundaryId && item.compactionPartId === pair.partId);
+  if (!marker)
+    return { kind: "ambiguous" };
+  for (const other of recognized) {
+    if (other.summaryMessageId === marker.summaryMessageId && other.compactionPartId === marker.compactionPartId && other.summaryPartId === marker.summaryPartId)
+      continue;
+    if (db.prepare(`SELECT 1 FROM message WHERE id = ?
+            UNION ALL SELECT 1 FROM part WHERE id IN (?, ?) LIMIT 1`).get(other.summaryMessageId, other.compactionPartId, other.summaryPartId))
+      return { kind: "ambiguous" };
+  }
+  const row = db.prepare(`SELECT c.data AS compactionData FROM message m
+         JOIN message b ON b.id = ? AND b.session_id = m.session_id
+         JOIN part c ON c.id = ? AND c.message_id = b.id AND c.session_id = m.session_id
+         JOIN part t ON t.id = ? AND t.message_id = m.id AND t.session_id = m.session_id
+         WHERE m.id = ? AND m.session_id = ?
+           AND json_extract(b.data, '$.role') = 'user'
+           AND json_extract(m.data, '$.role') = 'assistant'
+           AND json_extract(m.data, '$.parentID') = b.id
+           AND json_extract(m.data, '$.summary') = 1
+           AND json_extract(m.data, '$.finish') = 'stop'
+           AND json_extract(m.data, '$.error') IS NULL
+           AND json_extract(m.data, '$.providerID') = 'magic-context'
+           AND json_extract(m.data, '$.modelID') = 'magic-context'
+           AND json_extract(t.data, '$.type') = 'text' AND json_extract(t.data, '$.text') = ?
+           AND (SELECT COUNT(*) FROM part p WHERE p.message_id = m.id AND +p.session_id = m.session_id) = 1`).get(marker.boundaryMessageId, marker.compactionPartId, marker.summaryPartId, marker.summaryMessageId, sessionId, summaryText);
+  if (!row || !isMcCanonicalCompactionPartData(JSON.parse(row.compactionData)) || findBoundaryUserMessage(sessionId, marker.boundaryMessageId)?.id !== marker.boundaryMessageId)
+    return { kind: "ambiguous" };
+  return { kind: "verified", marker };
+}
 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 <> ?
@@ -13454,10 +13531,11 @@ function injectCompactionMarkerFromBasis(args, validatedBasis) {
     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 {
+    summaryMessageId: summaryMsgId,
+    compactionPartId,
+    summaryPartId
+  } = planCompactionMarker(args, boundary);
   const summaryMsgData = JSON.stringify({
     role: "assistant",
     parentID: boundary.id,
@@ -13617,10 +13695,12 @@ function listSessionCompactionMarkers(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) {
+function removeForeignCompactionMarker(sessionId, marker, protectedSummaryMessageId, shouldRemove) {
   try {
     const db = getWritableOpenCodeDb("removal");
     runMarkerRemovalTransaction(db, () => {
+      if (shouldRemove && !shouldRemove())
+        return;
       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) {
@@ -13815,24 +13895,118 @@ function removeCompactionMarker(state) {
   }
 }
 
-// src/hooks/magic-context/compaction-marker-manager.ts
-var MARKER_SUMMARY_TEXT = "[Compacted by magic-context — session history is managed by the plugin]";
-function dropMarkerSummaryTag(db, sessionId, summaryMessageId) {
-  const tagNumber = getTagNumberByMessageId2(db, sessionId, `${summaryMessageId}:p0`);
-  if (tagNumber !== null)
-    updateTagStatus2(db, sessionId, tagNumber, "dropped");
+// src/hooks/magic-context/compaction-marker-publication.ts
+function samePair(left, right) {
+  return left.boundaryMessageId === right.boundaryMessageId && left.summaryMessageId === right.summaryMessageId && left.compactionPartId === right.compactionPartId && left.summaryPartId === right.summaryPartId;
 }
-function persistMarkerStateAndDropReplacedTag(db, sessionId, state, replacedSummaryMessageId) {
-  let transactionStartedAt = 0;
-  db.transaction(() => {
-    transactionStartedAt = performance.now();
-    setPersistedCompactionMarkerState(db, sessionId, state);
-    if (replacedSummaryMessageId !== null) {
-      dropMarkerSummaryTag(db, sessionId, replacedSummaryMessageId);
+function publishRecoverableCompactionMarker(db, args, targetIsCurrent) {
+  const { sessionId } = args;
+  let raw = "";
+  let previous = null;
+  let oldSummary = null;
+  let intended;
+  let reason = "publication-failed";
+  let recovered;
+  let cut = "uncertain";
+  let writingState = false;
+  const persist = (state) => {
+    writingState = true;
+    db.transaction(() => {
+      raw = compareAndSetCompactionMarkerPublicationState(db, sessionId, raw, state, null);
+      if (previous && previous.summaryMessageId !== state.summaryMessageId) {
+        const tag = getTagNumberByMessageId2(db, sessionId, `${previous.summaryMessageId}:p0`);
+        if (tag !== null)
+          updateTagStatus2(db, sessionId, tag, "dropped");
+      }
+    }).immediate();
+    writingState = false;
+    previous = state;
+  };
+  try {
+    cut = getCompactionMarkerPublicationState(db, sessionId).pending ? "uncertain" : "definitely-no-cut";
+    const result = withCompactionMarkerPublicationLock(() => {
+      const snapshot = getCompactionMarkerPublicationState(db, sessionId);
+      if (snapshot.pending)
+        cut = "uncertain";
+      raw = snapshot.raw;
+      previous = getPersistedCompactionMarkerState(db, sessionId) ?? getDeferredClearedCompactionMarkerState(db, sessionId);
+      oldSummary = previous?.summaryMessageId ?? null;
+      if (snapshot.pending && (snapshot.pending.boundaryOrdinal > args.endOrdinal || snapshot.pending.boundaryOrdinal === args.endOrdinal && snapshot.pending.targetEndMessageId !== args.endMessageId) && !isCompactionMarkerIntentAbsent(snapshot.pending, snapshot.pending.targetEndMessageId))
+        throw new Error("a newer marker publication intent is pending");
+      const boundary = findBoundaryUserMessage(sessionId, args.endMessageId);
+      if (!targetIsCurrent() || !boundary || boundary.id !== args.resolvedBoundary?.id || boundary.timeCreated !== args.resolvedBoundary.timeCreated)
+        throw new Error("marker publication frontier changed before publication");
+      intended = {
+        ...planCompactionMarker(args, boundary),
+        boundaryOrdinal: args.endOrdinal,
+        targetEndMessageId: args.endMessageId
+      };
+      let pending = snapshot.pending;
+      if (pending) {
+        const pendingTarget = pending.targetEndMessageId;
+        const pendingBoundary = pendingTarget ? findBoundaryUserMessage(sessionId, pendingTarget) : null;
+        const compartments = pendingTarget ? getCompartmentsByEndMessageId(db, sessionId, pendingTarget) : [];
+        const validTarget = pending.targetEndMessageId === args.endMessageId && pending.boundaryOrdinal === args.endOrdinal || compartments.length === 1 && compartments[0].endMessage === pending.boundaryOrdinal;
+        if (!validTarget || !pendingBoundary || !pendingTarget || !samePair(pending, planCompactionMarker({ ...args, endMessageId: pendingTarget }, pendingBoundary)))
+          pending = null;
+      }
+      const inspection = inspectCompactionMarkerPublication(sessionId, [intended, ...previous ? [previous] : [], ...pending ? [pending] : []], args.summaryText);
+      if (inspection.kind === "deferred") {
+        reason = "candidate-preparation";
+        return {
+          kind: cut === "uncertain" ? "uncertain" : "deferred",
+          error: new Error("marker candidate preparation pending")
+        };
+      }
+      if (inspection.kind === "ambiguous") {
+        reason = "ambiguous-left-alone";
+        return {
+          kind: cut,
+          error: new Error("unverified or ambiguous host marker pairs; left alone")
+        };
+      }
+      cut = "definitely-no-cut";
+      const host = inspection.marker;
+      if (host && (pending && samePair(host, pending) || samePair(host, intended))) {
+        const adopted = pending && samePair(host, pending) ? pending : intended;
+        recovered = adopted === pending ? "pending-intent-recovered" : "adopted-existing-pair";
+        cut = "uncertain";
+        if (samePair(host, intended))
+          return { kind: "committed", marker: host };
+        persist(adopted);
+      }
+      writingState = true;
+      raw = compareAndSetCompactionMarkerPublicationState(db, sessionId, raw, previous, intended);
+      writingState = false;
+      cut = "uncertain";
+      const replacement = replaceCompactionMarker(host, {
+        ...args,
+        resolvedBoundary: boundary
+      });
+      if (recovered && replacement.kind !== "committed")
+        return { kind: "uncertain", error: replacement.error };
+      if (replacement.kind !== "committed")
+        cut = replacement.kind === "uncertain" ? "uncertain" : "definitely-no-cut";
+      return replacement;
+    });
+    if (result.kind === "committed") {
+      if (!intended)
+        throw new Error("committed marker has no publication intent");
+      persist(intended);
+      reason = recovered ?? "published";
     }
-  }).immediate();
-  logSlowWriteTransaction("marker-drain", transactionStartedAt);
+    return result;
+  } catch (error) {
+    if (writingState)
+      reason = "state-write-failed";
+    return { kind: cut, error: error instanceof Error ? error : new Error(String(error)) };
+  } finally {
+    sessionLog2(sessionId, `compaction-marker publication reason=${reason} oldSummary=${oldSummary ?? "none"} newSummary=${intended?.summaryMessageId ?? "none"} target=${args.endMessageId} at=${Date.now()}`);
+  }
 }
+
+// src/hooks/magic-context/compaction-marker-manager.ts
+var MARKER_SUMMARY_TEXT = "[Compacted by magic-context — session history is managed by the plugin]";
 function markerUpdateDefinitelyDidNotCut(outcome) {
   return outcome.kind === "already-current" || outcome.kind === "deferred" || outcome.kind === "stale-skip" || outcome.kind === "retryable-failure" && outcome.cut === "definitely-no-cut";
 }
@@ -13901,7 +14075,7 @@ function boundaryWouldDiscardUncoveredMessage(db, sessionId, ordinal, boundaryMe
   return false;
 }
 function applyDeferredCompactionMarker(db, sessionId, pending, directory, trustedBoundary) {
-  let cut = "definitely-no-cut";
+  let cut = "uncertain";
   let stepStartedAt = performance.now();
   const stepMs = [];
   const endStep = (name) => {
@@ -13910,41 +14084,61 @@ function applyDeferredCompactionMarker(db, sessionId, pending, directory, truste
     stepStartedAt = now;
   };
   try {
+    cut = getCompactionMarkerPublicationState(db, sessionId).pending ? "uncertain" : "definitely-no-cut";
+    const unresolvedIntentFailure = () => {
+      const alreadyUncertain = cut === "uncertain";
+      cut = "uncertain";
+      if (getCompactionMarkerPublicationState(db, sessionId).pending || alreadyUncertain) {
+        return {
+          kind: "retryable-failure",
+          cut,
+          error: new Error("unresolved marker publication intent; retaining retry state")
+        };
+      }
+      cut = "definitely-no-cut";
+      return null;
+    };
     const responseFencesTarget = trustedBoundary !== undefined && Number.isSafeInteger(trustedBoundary.rowVersion) && trustedBoundary.rowVersion > 0 && trustedBoundary.ordinal === pending.ordinal && trustedBoundary.endMessageId === pending.endMessageId;
     const validation = responseFencesTarget ? "ok" : validatePendingTarget(db, sessionId, pending);
     endStep("validate");
     if (validation !== "ok") {
+      const unresolved = unresolvedIntentFailure();
+      if (unresolved)
+        return unresolved;
       sessionLog2(sessionId, `compaction-marker drain: stale-skip (${validation}) for ordinal ${pending.ordinal} endMessageId=${pending.endMessageId}`);
       return { kind: "stale-skip", reason: validation };
     }
     const existing = getPersistedCompactionMarkerState(db, sessionId);
     if (existing && existingMarkerAlreadyCoversTarget(sessionId, existing, pending.ordinal, pending.endMessageId)) {
-      return { kind: "already-current" };
+      if (!unresolvedIntentFailure())
+        return { kind: "already-current" };
     }
     const boundary = findBoundaryUserMessage(sessionId, pending.endMessageId);
     endStep("boundary");
     if (!boundary) {
-      return {
+      return unresolvedIntentFailure() ?? {
         kind: "retryable-failure",
         cut: "definitely-no-cut",
         error: new Error(`no user boundary found at or before endMessageId ${pending.endMessageId} (ordinal ${pending.ordinal}); preserving existing marker`)
       };
     }
     if (boundaryWouldDiscardUncoveredMessage(db, sessionId, pending.ordinal, boundary.id)) {
+      const unresolved = unresolvedIntentFailure();
+      if (unresolved)
+        return unresolved;
       sessionLog2(sessionId, `compaction-marker drain: stale-skip (partial-message-boundary) for ordinal ${pending.ordinal} endMessageId=${pending.endMessageId}`);
       return { kind: "stale-skip", reason: "partial-message-boundary" };
     }
     endStep("discardCheck");
-    const removedSummaryMessageId = existing?.summaryMessageId ?? null;
     cut = "uncertain";
-    const replacement = replaceCompactionMarker(existing, {
+    const replacement = publishRecoverableCompactionMarker(db, {
       sessionId,
       endOrdinal: pending.ordinal,
       endMessageId: pending.endMessageId,
       summaryText: MARKER_SUMMARY_TEXT,
       directory: directory ?? process.cwd(),
       resolvedBoundary: boundary
-    });
+    }, () => JSON.stringify(getPersistedCompactionMarkerState(db, sessionId)) === JSON.stringify(existing) && (responseFencesTarget || validatePendingTarget(db, sessionId, pending) === "ok"));
     endStep("replace");
     if (replacement.kind === "deferred")
       return { kind: "deferred", reason: "candidate-preparation" };
@@ -13955,14 +14149,8 @@ function applyDeferredCompactionMarker(db, sessionId, pending, directory, truste
         error: replacement.error
       };
     }
-    const result = replacement.marker;
-    persistMarkerStateAndDropReplacedTag(db, sessionId, {
-      ...result,
-      boundaryOrdinal: pending.ordinal,
-      targetEndMessageId: pending.endMessageId
-    }, removedSummaryMessageId);
     endStep("persist");
-    sessionLog2(sessionId, `compaction-marker drain: applied at ordinal ${pending.ordinal}, boundary user msg ${result.boundaryMessageId} ${stepMs.join(" ")}`);
+    sessionLog2(sessionId, `compaction-marker drain: applied at ordinal ${pending.ordinal}, boundary user msg ${replacement.marker.boundaryMessageId} ${stepMs.join(" ")}`);
     return {
       kind: "applied",
       markerOrdinal: pending.ordinal
@@ -13983,8 +14171,7 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
     return false;
   }
   const existing = getPersistedCompactionMarkerState(db, sessionId);
-  const removedSummaryMessageId = existing?.summaryMessageId ?? null;
-  if (existing) {
+  if (existing && !getCompactionMarkerPublicationState(db, sessionId).pending) {
     if (existingMarkerAlreadyCoversTarget(sessionId, existing, lastCompartmentEnd, targetEndMessageId)) {
       return true;
     }
@@ -13997,22 +14184,15 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
   if (boundaryWouldDiscardUncoveredMessage(db, sessionId, lastCompartmentEnd, boundary.id)) {
     return false;
   }
-  const replacement = replaceCompactionMarker(existing, {
+  const replacement = publishRecoverableCompactionMarker(db, {
     sessionId,
     endOrdinal: lastCompartmentEnd,
     endMessageId: targetEndMessageId,
     summaryText: MARKER_SUMMARY_TEXT,
     directory: directory ?? process.cwd(),
     resolvedBoundary: boundary
-  });
+  }, () => JSON.stringify(getPersistedCompactionMarkerState(db, sessionId)) === JSON.stringify(existing) && getCompartmentEndMessageIdForOrdinal(db, sessionId, lastCompartmentEnd) === targetEndMessageId);
   if (replacement.kind === "committed") {
-    const result = replacement.marker;
-    persistMarkerStateAndDropReplacedTag(db, sessionId, {
-      ...result,
-      boundaryOrdinal: lastCompartmentEnd,
-      targetEndMessageId
-    }, removedSummaryMessageId);
-    sessionLog2(sessionId, `compaction-marker: injected at ordinal ${lastCompartmentEnd}, boundary user msg ${result.boundaryMessageId}`);
     return true;
   }
   return false;
@@ -14030,13 +14210,13 @@ function removeCompactionMarkerForSession(db, sessionId) {
     }
   }
 }
-function reconcileForkOrphanedCompactionMarkers(db, sessionId) {
-  if (getHarness2() !== "opencode") {
+function reconcileForkOrphanedCompactionMarkers(db, sessionId, isCacheBusting) {
+  if (!isCacheBusting || getHarness2() !== "opencode") {
     return { removed: 0, failed: false };
   }
   try {
     const owned = getPersistedCompactionMarkerState(db, sessionId);
-    if (!owned) {
+    if (!owned || getCompactionMarkerPublicationState(db, sessionId).pending) {
       return { removed: 0, failed: false };
     }
     const markers = listSessionCompactionMarkers(sessionId);
@@ -14057,7 +14237,15 @@ function reconcileForkOrphanedCompactionMarkers(db, sessionId) {
       if (!currentOwned || marker.compactionPartId === currentOwned.compactionPartId) {
         continue;
       }
-      const ok = removeForeignCompactionMarker(sessionId, marker, currentOwned.summaryMessageId);
+      let protectedByState = false;
+      const ok = removeForeignCompactionMarker(sessionId, marker, currentOwned.summaryMessageId, () => db.transaction(() => {
+        const publication = getCompactionMarkerPublicationState(db, sessionId);
+        const latestOwned = getPersistedCompactionMarkerState(db, sessionId);
+        protectedByState = Boolean(publication.pending || !latestOwned || marker.compactionPartId === latestOwned.compactionPartId || marker.summaryMessageIds.includes(latestOwned.summaryMessageId) || compareOpenCodeMessagesByCanonicalOrder(sessionId, marker.boundaryMessageId, latestOwned.boundaryMessageId) !== 1);
+        return !protectedByState;
+      }).deferred());
+      if (protectedByState)
+        continue;
       if (ok) {
         removed += 1;
         sessionLog2(sessionId, `compaction-marker hygiene: removed fork-orphaned marker part=${marker.compactionPartId} boundary=${marker.boundaryMessageId} (outranked owned boundary ${currentOwned.boundaryMessageId})`);
@@ -14902,8 +15090,8 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, co
     resultEndMessageId = trimEndMessageId;
   } else {
     const degradedCount = noteDegradedRebuild(sessionId);
-    if (degradedCount === 1) {
-      reconcileForkOrphanedCompactionMarkers(db, sessionId);
+    if (isCacheBusting) {
+      reconcileForkOrphanedCompactionMarkers(db, sessionId, isCacheBusting);
     }
     let reAnchored = false;
     if (degradedCount >= REANCHOR_MIN_DEGRADED_PASSES && isCacheBusting) {

package/dist/{index-hbt0sbv2.js → index-fm36bjv4.js}

@@ -1279,7 +1279,7 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
       state.running = startMessageFtsRowidMapBackfill2(db, signal).then(async () => {
         if (signal.aborted || !readsOpenCodeStore)
           return;
-        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-1ndphmb8.js"));
+        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-kaghtr75.js"));
         const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-4qva0b4f.js"));
         if (signal.aborted)
           return;

package/dist/{index-dq5xzeb9.js → index-ftr84kkv.js}

@@ -3,12 +3,12 @@ import {
 } from "./index-h7tgn49j.js";
 import {
   clearEmergencyRecovery
-} from "./index-0fe4q77z.js";
+} from "./index-7g9dr8gy.js";
 import {
   requestPendingMaterialization,
   dropSlot,
   executeContextRecomp
-} from "./index-2xh37qn5.js";
+} from "./index-atekmqef.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode

package/dist/{index-b7w46fp2.js → index-hbx7m8he.js}

@@ -140,11 +140,11 @@ import {
   peekNoteNudgeText,
   markNoteNudgeDelivered,
   getActiveCompartmentRun
-} from "./index-2xh37qn5.js";
+} from "./index-atekmqef.js";
 import {
   cleanSearchText,
   matchedSearchSnippet
-} from "./index-4s4zq97n.js";
+} from "./index-9gpw8hrm.js";
 import {
   stripSystemInjection,
   isTextPart,
@@ -242,7 +242,7 @@ import {
   extractToolCallObservation,
   ToolMutationBatch,
   createToolDropTarget
-} from "./index-0fe4q77z.js";
+} from "./index-7g9dr8gy.js";
 import {
   isValidLanguageCode
 } from "./index-nxrsns5x.js";
@@ -260,7 +260,7 @@ import {
 import {
   getMessageIndexEpoch,
   isMessageIndexSearchable
-} from "./index-94ef0qe2.js";
+} from "./index-04z754rd.js";
 import {
   userFacingFailureCode
 } from "./index-as2amvn3.js";

package/dist/{index-3jmx3fae.js → index-m1x9ghk5.js}

@@ -17,7 +17,7 @@ import {
 import {
   hasRawMessageProvider2,
   readRawSessionMessageIdOrdinalsForRange2
-} from "./index-0fe4q77z.js";
+} from "./index-7g9dr8gy.js";
 
 // src/tools/ctx-expand/search-archive.ts
 var archiveReadsOnThisThread = 0;

package/dist/index.js

@@ -28,7 +28,7 @@ import {
   detectOverflow,
   isAnthropicFamilyRoute,
   readRawSessionMessages2
-} from "./index-0fe4q77z.js";
+} from "./index-7g9dr8gy.js";
 import {
   setHarness2
 } from "./index-pavzsdc6.js";
@@ -99,7 +99,7 @@ import {
   checkCompactionMarkerConsistency,
   clearInjectionCache,
   clearNoteNudgeTriggerOnly
-} from "./index-2xh37qn5.js";
+} from "./index-atekmqef.js";
 import"./index-sd3egckz.js";
 import {
   hasTrustedAbsoluteWall,
@@ -186,7 +186,7 @@ import {
   parameterDescriptionsFor,
   MagicContextRpcServer,
   applyHiddenSubagentTemperature
-} from "./index-3fkk2gwj.js";
+} from "./index-97spytxq.js";
 import {
   resolveOpenCodeDbPath,
   openCodeDbPathExists,
@@ -210,7 +210,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./index-hbt0sbv2.js";
+} from "./index-fm36bjv4.js";
 import {
   setHomeProjectPermission,
   ProjectIdentityError,
@@ -253,7 +253,7 @@ import"./index-wfybj1dw.js";
 import {
   getDefaultSubcConnectionFile,
   SubcModuleTransport
-} from "./index-qr2mb02j.js";
+} from "./index-0677w9sd.js";
 import"./index-qt1qqasc.js";
 import"./index-rrv26qjz.js";
 import {
@@ -292,7 +292,7 @@ import {
 import"./index-v7287tzq.js";
 import {
   deleteIndexedMessage
-} from "./index-4s4zq97n.js";
+} from "./index-9gpw8hrm.js";
 import"./index-as2amvn3.js";
 import {
   pushNotification2
@@ -309,13 +309,13 @@ import {
   clearToolPermissionDenied,
   collectForeignTextParts,
   resetDegradedCacheCount2
-} from "./index-b7w46fp2.js";
+} from "./index-hbx7m8he.js";
 import {
   scheduleClearAndReindex
-} from "./index-94ef0qe2.js";
+} from "./index-04z754rd.js";
 import {
   runManagedRecomp2
-} from "./index-dq5xzeb9.js";
+} from "./index-ftr84kkv.js";
 import {
   isValidSemver,
   compareSemverCore
@@ -323,9 +323,9 @@ import {
 import"./index-fmsr7v69.js";
 import {
   runManagedWrapup2
-} from "./index-43vqx0za.js";
+} from "./index-07vskjn8.js";
 import"./index-kaqs6h31.js";
-import"./index-3jmx3fae.js";
+import"./index-m1x9ghk5.js";
 import {
   isDreamerRunnable,
   isSmartNoteSurfaceAvailable,
@@ -8193,7 +8193,7 @@ var require_src2 = __commonJS(function(exports, module) {
 // package.json
 var package_default = {
   name: "@cortexkit/opencode-magic-context",
-  version: "0.49.33",
+  version: "0.49.34",
   type: "module",
   description: "OpenCode plugin for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -12047,7 +12047,7 @@ async function setup(context) {
   if (claimStorageBackupWarningCheck() && isMagicContextStorageOutsideEngram(storageDir)) {
     log2(`[magic-context] Magic Context storage is at ${storageDir}, outside the folder Engram backs up (~/.local/share/cortexkit/magic-context). It is not included in CortexKit backups.`);
   }
-  const { registerContext } = await import("./context-jyzkstnr.js");
+  const { registerContext } = await import("./context-p3xrarzt.js");
   setHarness2("opencode2");
   bindStaleBuildNotice({}, import.meta.url, "opencode2");
   const duties = await registerContext(context);
@@ -12520,7 +12520,7 @@ var server = async (ctx) => {
       rustReplayParticipant: () => magicContextRuntime.magicContext?.getRustReplayParticipant?.() ?? null,
       onStorageBusyRefusal: async (sessionId, message) => {
         const { sendStatusNotification } = await importPluginModule(() => import("./send-session-notification-vz86nt79.js"));
-        const { abortSessionFailClosed } = await importPluginModule(() => import("./transform-postprocess-phase-zx1peqma.js"));
+        const { abortSessionFailClosed } = await importPluginModule(() => import("./transform-postprocess-phase-ph38mhrs.js"));
         await sendStatusNotification(ctx.client, sessionId, message, {
           toastDurationMs: 15000
         });

package/dist/{message-index-bounded-zq7a5nm6.js → message-index-bounded-qh91fdr3.js}

@@ -16,7 +16,7 @@ import"./index-cpjk5jd2.js";
 import"./index-rverk2vz.js";
 import"./index-58e3y90n.js";
 import"./index-y1qwzvxn.js";
-import"./index-0fe4q77z.js";
+import"./index-7g9dr8gy.js";
 import"./index-s1n8dd2n.js";
 import {
   MESSAGE_INDEX_MAX_FTS_BYTES,
@@ -25,7 +25,7 @@ import {
   markMessageIndexDirty,
   getIndexableContent,
   indexSingleMessage
-} from "./index-4s4zq97n.js";
+} from "./index-9gpw8hrm.js";
 import"./index-v15ne3a3.js";
 import"./index-t5pck3ss.js";
 

package/dist/migration-worker.js

@@ -19,7 +19,7 @@ import"./index-fb3zxn06.js";
 import {
   setSqlitePragmaConfig,
   initializeDatabase
-} from "./index-hbt0sbv2.js";
+} from "./index-fm36bjv4.js";
 import"./index-v0p37hm2.js";
 import"./index-cpjk5jd2.js";
 import"./index-rverk2vz.js";