@cortexkit/opencode-magic-context 0.49.25 → 0.49.27

package/dist/v2/{context-y7wfvdve.js → context-na0esngr.js}

@@ -82,10 +82,25 @@ import {
   getUncoveredCompartmentEndsThrough,
   providerResponseFailed,
   isSuccessfulProviderCompletion,
+  LkgRecoveryFenceError,
+  lkgServedArrayDigest,
+  hasCleanLkgRecoveryFence,
+  dirtyLkgRecoveryRevision,
+  ownsLkgDirtyFence,
+  invalidateCleanLkgRecoveryFence,
+  prepareLkgCaptureFence,
+  certifyCommittedLkgCapture,
+  markLkgRecoveryDirty,
   rememberUnpublishedAutoSearchNoHint,
   getUnpublishedAutoSearchNoHint,
   forgetUnpublishedAutoSearchNoHint,
   registerAutoSearchWork,
+  gaDatabasePath,
+  RAW_MESSAGE_TYPES,
+  V2StoreReaderPool,
+  V2StoreReader,
+  advanceSessionActivity,
+  backfillSessionActivity,
   getOrCreateSessionMeta,
   updateSessionMeta,
   advanceToolReclaimWatermark,
@@ -263,6 +278,7 @@ import {
   producerPromptFailureReason,
   resolveHiddenCompletionExecutor,
   createV1HiddenCompletionExecutor,
+  shouldWaitForNewHistorianHistory,
   EMPTY_READ_REPLY,
   noteTouchedAt,
   renderGlance,
@@ -286,7 +302,7 @@ import {
   startCompartmentAgent,
   setRecompStarting2,
   setRecompTerminal2
-} from "./server-7weh65vd.js";
+} from "./server-jj9qye8y.js";
 import {
   resolveHistorianModel2
 } from "./server-5kym00ag.js";
@@ -311,7 +327,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./server-e75vag9d.js";
+} from "./server-e3hc93wk.js";
 import {
   pruneMissingProjectIdentities,
   setHomeProjectPermission,
@@ -329,39 +345,6 @@ import {
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
 } from "./server-qjvk4a9t.js";
-import {
-  registerOwnRpcServerInstance,
-  rpcPortDir,
-  rpcPortFilePath,
-  parseRpcPortFile,
-  inspectProcessesAsync
-} from "./server-k3t06fxr.js";
-import {
-  LkgRecoveryFenceError,
-  lkgServedArrayDigest,
-  takeLkgRecoveryLockSweepPage,
-  hasCleanLkgRecoveryFence,
-  dirtyLkgRecoveryRevision,
-  ownsLkgDirtyFence,
-  invalidateCleanLkgRecoveryFence,
-  prepareLkgCaptureFence,
-  certifyCommittedLkgCapture,
-  markLkgRecoveryDirty,
-  gaDatabasePath,
-  RAW_MESSAGE_TYPES,
-  V2StoreReaderPool,
-  V2StoreReader,
-  cleanSearchText,
-  matchedSearchSnippet,
-  advanceSessionActivity,
-  backfillSessionActivity,
-  getLastIndexedOrdinal2,
-  getMessageIndexReconciliationStartOrdinal2,
-  isMessageIndexReconciledThrough2,
-  clearIndexedMessages2,
-  indexMessagesAfterOrdinal2,
-  sweepOrphanedOpenCodeMessageIndexesCooperatively2
-} from "./server-6a8pxpxg.js";
 import"./server-51779zs2.js";
 import {
   inRootAsyncContext2,
@@ -387,15 +370,7 @@ import {
   buildInMemoryTailRawMessages2,
   RawOrdinalsNotReady2,
   runSessionWarmupWorker
-} from "./server-swvhxhxz.js";
-import {
-  resolveOpenCodeDbPath,
-  assertOpenCodeStoreGeneration,
-  openCodeDbPathExists,
-  recordOpenCodeDbReadFailure,
-  clearOpenCodeDbReadFailure,
-  claimOpenCodeDbDiagnosticOnce
-} from "./server-2ra6pwf3.js";
+} from "./server-6vd2n183.js";
 import {
   resolveModelCalibration,
   calibrateBuckets,
@@ -490,7 +465,7 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./server-fa7vtp40.js";
+} from "./server-nxas8v1d.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -509,7 +484,15 @@ import {
   freezeTemporalDecisions,
   tagRevisionKey,
   tagIdentityRevisionKey
-} from "./server-rqebawx1.js";
+} from "./server-v77xa5wj.js";
+import {
+  resolveOpenCodeDbPath,
+  assertOpenCodeStoreGeneration,
+  openCodeDbPathExists,
+  recordOpenCodeDbReadFailure,
+  clearOpenCodeDbReadFailure,
+  claimOpenCodeDbDiagnosticOnce
+} from "./server-2ra6pwf3.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
@@ -716,25 +699,23 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./server-5brp2rfn.js";
+} from "./server-xkvxss5g.js";
 import {
   BoundedSessionMap,
   recordToolDefinitionSet,
   getCurrentToolSetHash,
   getMeasuredToolDefinitionTokens
-} from "./server-7d6m1p2b.js";
-import"./server-wxrdher8.js";
+} from "./server-cqjvxyrp.js";
 import {
-  SubcClient,
-  connectionFileExists,
-  SYNAPSE_DEFAULT_MODEL,
-  toSynapseLaneDescriptor,
-  formatSynapseLaneDescriptor,
-  SynapseEmbeddingProvider
-} from "./server-ab1g0wn9.js";
-import {
-  deleteChunkEmbedBackoffForSession2
-} from "./server-pw21ypwb.js";
+  cleanSearchText,
+  matchedSearchSnippet,
+  getLastIndexedOrdinal,
+  getMessageIndexReconciliationStartOrdinal,
+  isMessageIndexReconciledThrough,
+  clearIndexedMessages,
+  indexMessagesAfterOrdinal
+} from "./server-z2n2xaeh.js";
+import"./server-awr8qa4c.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -764,7 +745,25 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./server-q5z0gag0.js";
+} from "./server-yqek3s4k.js";
+import {
+  SubcClient,
+  connectionFileExists,
+  SYNAPSE_DEFAULT_MODEL,
+  toSynapseLaneDescriptor,
+  formatSynapseLaneDescriptor,
+  SynapseEmbeddingProvider
+} from "./server-ab1g0wn9.js";
+import {
+  deleteChunkEmbedBackoffForSession2
+} from "./server-4sn3at8p.js";
+import {
+  registerOwnRpcServerInstance,
+  rpcPortDir,
+  rpcPortFilePath,
+  parseRpcPortFile,
+  inspectProcessesAsync
+} from "./server-k3t06fxr.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -777,7 +776,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./server-wwaw5npa.js";
+} from "./server-6g98c227.js";
 import {
   configureContextDatabasePragmas2
 } from "./server-fb3zxn06.js";
@@ -823,7 +822,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./server-9xbbaekh.js";
+} from "./server-z3mk9jdc.js";
 import {
   deriveTriggerBudget2,
   deriveHistorianChunkTokens2,
@@ -857,7 +856,7 @@ import {
 } from "./server-vr4szghm.js";
 import {
   cosineSimilarity
-} from "./server-8j2e7t31.js";
+} from "./server-6avtp9jp.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -914,14 +913,14 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-tfawsj08.js";
+} from "./server-txbc3czn.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
 import"./server-kaqs6h31.js";
 import {
   renderSearchArchiveOffThread2
-} from "./server-m6yyn961.js";
+} from "./server-zmcrvpm3.js";
 import {
   compareSemverCore
 } from "./server-84w6rvvf.js";
@@ -1847,15 +1846,15 @@ async function reconcileSessionIndex(db, sessionId, readMessages) {
       const revision = readMessages.getRevision?.(sessionId);
       const previous = heapHolder.reconciledSnapshots.get(sessionId);
       const finalWatermark = previous && revision === previous.revision ? previous.count : revision !== undefined && readMessages.getCountAfterRevision ? previous && revision > previous.revision ? previous.count + readMessages.getCountAfterRevision(sessionId, previous.revision, revision) : readMessages.getCountAfterRevision(sessionId, -1, revision) : readMessages.getCount ? readMessages.getCount(sessionId) : (fallbackSnapshot = fullReader?.(sessionId) ?? []).length;
-      let cursor = getMessageIndexReconciliationStartOrdinal2(db, sessionId);
+      let cursor = getMessageIndexReconciliationStartOrdinal(db, sessionId);
       let after = cursor === previous?.count ? previous.after : undefined;
       while (cursor < finalWatermark) {
         const pageEnd = Math.min(finalWatermark, cursor + RECONCILIATION_BATCH_SIZE);
         const messages = readMessages.readPage ? readMessages.readPage(sessionId, cursor, RECONCILIATION_BATCH_SIZE, finalWatermark, after) : (fallbackSnapshot ?? []).filter((message) => message.ordinal > cursor && message.ordinal <= pageEnd);
         const retainedMessages = fallbackSnapshot ?? messages;
         heapHolder.activeReconcilerBuffers.set(sessionId, retainedMessages);
-        withSqliteBackgroundWriter2(() => indexMessagesAfterOrdinal2(db, sessionId, messages, cursor, pageEnd));
-        const nextCursor = getMessageIndexReconciliationStartOrdinal2(db, sessionId);
+        withSqliteBackgroundWriter2(() => indexMessagesAfterOrdinal(db, sessionId, messages, cursor, pageEnd));
+        const nextCursor = getMessageIndexReconciliationStartOrdinal(db, sessionId);
         if (nextCursor <= cursor)
           break;
         cursor = nextCursor;
@@ -1865,7 +1864,7 @@ async function reconcileSessionIndex(db, sessionId, readMessages) {
           await yieldToEventLoop();
         }
       }
-      if (isMessageIndexReconciledThrough2(db, sessionId, finalWatermark)) {
+      if (isMessageIndexReconciledThrough(db, sessionId, finalWatermark)) {
         heapHolder.reconciledSessions.add(sessionId);
         if (revision !== undefined) {
           if (!after && finalWatermark > 0 && readMessages.readPage) {
@@ -1919,42 +1918,6 @@ function scheduleReconciliation(db, sessionId, readMessages) {
     });
   });
 }
-async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, options = {}) {
-  if (getHarness2() === "opencode" || getHarness2() === "opencode2")
-    options = {
-      ...options,
-      fenceLockNames: options.fenceLockNames ?? takeLkgRecoveryLockSweepPage()
-    };
-  if (getHarness2() === "opencode2")
-    openSource = () => new Database2(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"), {
-      readonly: true,
-      fileMustExist: true
-    });
-  const path = getSqliteDatabasePath2(db);
-  if (!path || getHarness2() !== "opencode" && getHarness2() !== "opencode2")
-    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, openSource, options);
-  let source = null;
-  let sourcePath = null;
-  try {
-    source = openSource();
-    if (source)
-      sourcePath = getSqliteDatabasePath2(source);
-  } catch {} finally {
-    if (sourcePath)
-      source?.close();
-  }
-  if (!sourcePath)
-    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, () => source, options);
-  const reply = await runSessionWarmupWorker({
-    path,
-    sessionId: "",
-    harness: getHarness2(),
-    orphanSweep: { sourcePath, options }
-  }, {});
-  if (!("orphanSweep" in reply))
-    throw new Error("message history orphan sweep worker failed");
-  return reply.orphanSweep;
-}
 function scheduleClearAndReindex(db, sessionId, readMessages) {
   heapHolder.reconciledSessions.delete(sessionId);
   heapHolder.reconciledSnapshots.delete(sessionId);
@@ -1977,7 +1940,7 @@ function scheduleClearAndReindex(db, sessionId, readMessages) {
         heapHolder.reconciledSessions.delete(sessionId);
         heapHolder.reconciledSnapshots.delete(sessionId);
         clearCompletedIncrementalKeys(sessionId);
-        clearIndexedMessages2(db, sessionId);
+        clearIndexedMessages(db, sessionId);
         cleared = true;
       }).then(() => cleared ? reconcileSessionIndex(db, sessionId, pending.source) : undefined).catch((error) => {
         heapHolder.reconciledSessions.delete(sessionId);
@@ -6578,6 +6541,13 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
     }
     return { shouldFire: false };
   }
+  if (tailInfo.boundarySnapshot && shouldWaitForNewHistorianHistory(tailInfo.boundarySnapshot, {
+    usagePercentage: usage.percentage,
+    emergency: getOverflowState(db, sessionId).needsEmergencyRecovery
+  })) {
+    sessionLog2(sessionId, "compartment trigger: waiting for new history after no forward progress");
+    return { shouldFire: false };
+  }
   const canClearReasoning = reasoningProjection?.canClearReasoning ?? modelAcceptsEmptyContent(reasoningProjection?.providerID);
   const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession2(db, sessionId), keepReasoningTokens, sessionMeta.clearedReasoningThroughTag, canClearReasoning, reasoningProjection?.budgetCutoff, eligiblePendingDropTagIds);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
@@ -8289,6 +8259,23 @@ function applyCompressedText(target, tagNumber, originalText, depth, state) {
   target.setContent(`${target.textPrefix ?? ""}${compressed}`, { keepReasoning: true });
   return target.getContent ? target.getContent() !== before : true;
 }
+function cavemanReplayText(tagNumber, originalText, depth, state, textPrefix) {
+  const level = DEPTH_TO_LEVEL[depth];
+  if (!level)
+    return null;
+  let served = null;
+  if (!state.currentRules || state.legacyReasoningTags.has(tagNumber)) {
+    const legacy = cavemanCompress(originalText, level, "ascii-v1");
+    if (legacy.length > 0)
+      served = { text: legacy, dropsReasoning: true };
+    if (!state.currentRules)
+      return served;
+  }
+  const compressed = cavemanCompress(originalText, level, CURRENT_CAVEMAN_RULES, wordRulesFor(state));
+  if (compressed.length === 0)
+    return served;
+  return { text: `${textPrefix}${compressed}`, dropsReasoning: served?.dropsReasoning ?? false };
+}
 function replayCavemanCompression(sessionId, db, targets, tags) {
   const compressedTags = tags.filter((tag) => tag.type === "message" && tag.status === "active" && tag.cavemanDepth > 0 && targets.has(tag.tagNumber));
   if (compressedTags.length === 0)
@@ -8997,6 +8984,42 @@ function stripStructuralNoise(messages) {
   }
   return strippedParts;
 }
+// src/hooks/magic-context/foreign-text-parts.ts
+function hasStringId(part) {
+  return part !== null && typeof part === "object" && typeof part.id === "string";
+}
+function lastStoredPartIndex(parts) {
+  for (let index = parts.length - 1;index >= 0; index -= 1) {
+    if (hasStringId(parts[index]))
+      return index;
+  }
+  return -1;
+}
+var legacyForeignTextTags = new Map;
+function rememberLegacyForeignTextTags(sessionId, tagNumbers) {
+  for (const tagNumber of tagNumbers) {
+    let known = legacyForeignTextTags.get(sessionId);
+    if (!known) {
+      known = new Set;
+      legacyForeignTextTags.set(sessionId, known);
+    }
+    known.add(tagNumber);
+  }
+}
+function isLegacyForeignTextTag(sessionId, tagNumber) {
+  return legacyForeignTextTags.get(sessionId)?.has(tagNumber) ?? false;
+}
+var pendingOpForTagStatements = new WeakMap;
+function discardPendingOpForForeignTag(db, sessionId, tagNumber) {
+  let statement = pendingOpForTagStatements.get(db);
+  if (!statement) {
+    statement = db.prepare("SELECT 1 AS present FROM pending_ops WHERE session_id = ? AND tag_id = ? LIMIT 1");
+    pendingOpForTagStatements.set(db, statement);
+  }
+  if (statement.get(sessionId, tagNumber))
+    removePendingOp(db, sessionId, tagNumber);
+}
+
 // src/hooks/magic-context/tag-id-fallback.ts
 function parseScopedContentId(contentId) {
   const match = /^(.*):(p|file)(\d+)$/.exec(contentId);
@@ -9188,6 +9211,62 @@ function deriveToolOwnerMessageId(sessionId, db, message, obs, unpaired, cache,
   }
   return obs.callId;
 }
+function serveLegacyForeignText(legacy, current, options) {
+  const prefixed = options.skipPrefixInjection ? current : prependTag(legacy.tagNumber, current);
+  if (options.pastPartialEnd)
+    return { text: prefixed, dropsReasoning: false };
+  if (legacy.status === "dropped") {
+    return { text: buildReplacementContent(legacy.tagNumber), dropsReasoning: true };
+  }
+  const unchanged = legacy.savedText !== undefined && stripTagPrefix(current) === legacy.savedText;
+  if (legacy.status === "active" && legacy.cavemanDepth > 0 && options.caveman && unchanged && legacy.savedText) {
+    const replayed = cavemanReplayText(legacy.tagNumber, legacy.savedText, legacy.cavemanDepth, options.caveman, options.skipPrefixInjection ? "" : prependTag(legacy.tagNumber, ""));
+    if (replayed)
+      return replayed;
+  }
+  return { text: prefixed, dropsReasoning: false };
+}
+function findLegacyForeignTextTags(sessionId, messages, assignments, db, isForeignTextPart, inertWhitespaceTagNumbers) {
+  const legacy = new Map;
+  for (const message of messages) {
+    const messageId = typeof message.info.id === "string" ? message.info.id : null;
+    if (!messageId)
+      continue;
+    const firstTrailingIndex = lastStoredPartIndex(message.parts) + 1;
+    for (let partIndex = firstTrailingIndex;partIndex < message.parts.length; partIndex += 1) {
+      const part = message.parts[partIndex];
+      if (!isTextPart(part) || !isForeignTextPart(part))
+        continue;
+      const contentId = `${messageId}:p${partIndex}`;
+      const tagNumber = assignments.get(contentId) ?? getTagNumberByMessageId2(db, sessionId, contentId);
+      if (tagNumber === null || tagNumber === undefined)
+        continue;
+      if (inertWhitespaceTagNumbers.has(tagNumber))
+        continue;
+      const tag = getTagById2(db, sessionId, tagNumber);
+      if (tag?.type !== "message")
+        continue;
+      legacy.set(part, {
+        tagNumber,
+        status: tag.status,
+        cavemanDepth: tag.cavemanDepth
+      });
+    }
+  }
+  if (legacy.size > 0) {
+    const tagNumbers = [...legacy.values()].map((entry) => entry.tagNumber);
+    rememberLegacyForeignTextTags(sessionId, tagNumbers);
+    for (const tagNumber of tagNumbers)
+      discardPendingOpForForeignTag(db, sessionId, tagNumber);
+    const compressed = [...legacy.values()].filter((entry) => entry.status === "active" && entry.cavemanDepth > 0);
+    if (compressed.length > 0) {
+      const saved = getSourceContents(db, sessionId, compressed.map((entry) => entry.tagNumber));
+      for (const entry of compressed)
+        entry.savedText = saved.get(entry.tagNumber);
+    }
+  }
+  return legacy;
+}
 function collectRelevantSourceTagIds(messages, assignments) {
   const currentMessageIds = new Set(messages.flatMap((message) => typeof message.info.id === "string" ? [message.info.id] : []));
   const relevantTagIds = new Set;
@@ -9310,8 +9389,17 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
   logTransformTiming(sessionId, "tag.inertWhitespace", tInertWhitespace);
   const assignments = tagger.getAssignments(sessionId);
   const resolver = createExistingTagResolver(sessionId, tagger, db);
+  const foreignTextParts = options.foreignTextParts;
+  const isForeignTextPart = (part) => foreignTextParts !== undefined && part !== null && typeof part === "object" && foreignTextParts.has(part);
+  const legacyForeignTags = findLegacyForeignTextTags(sessionId, messages, assignments, db, isForeignTextPart, inertWhitespaceTagNumbers);
+  const legacyForeignTagNumbers = new Set([...legacyForeignTags.values()].map((legacy) => legacy.tagNumber));
+  let cavemanState;
+  const legacyCavemanState = () => {
+    cavemanState ??= options.replaysCaveman ? getCavemanReplayState(db, sessionId) : null;
+    return cavemanState;
+  };
   const tGetSourceContents = performance.now();
-  const sourceContents = getSourceContents(db, sessionId, collectRelevantSourceTagIds(messages, assignments));
+  const sourceContents = getSourceContents(db, sessionId, collectRelevantSourceTagIds(messages, assignments).filter((tagNumber) => !legacyForeignTagNumbers.has(tagNumber)));
   logTransformTiming(sessionId, "tag.getSourceContents", tGetSourceContents);
   let partialEndsCache;
   const loadPartialEnds = () => {
@@ -9405,6 +9493,28 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
         }
         ownerByPartKey.set(part, { ownerMsgId, callId: toolObservation.callId });
       }
+      if (messageId && isTextPart(part) && isForeignTextPart(part)) {
+        const legacy = legacyForeignTags.get(part);
+        if (legacy) {
+          const partialEnd = getPartialEnds().get(messageId);
+          const served = serveLegacyForeignText(legacy, part.text, {
+            skipPrefixInjection,
+            pastPartialEnd: partialEnd !== undefined && partIndex > partialEnd,
+            caveman: legacy.cavemanDepth > 0 ? legacyCavemanState() : null
+          });
+          part.text = served.text;
+          if (served.dropsReasoning) {
+            for (const thinkingPart of messageThinkingParts) {
+              if (protectedThinkingParts.has(thinkingPart))
+                continue;
+              if (partialEnd !== undefined && message.parts.indexOf(thinkingPart) > partialEnd)
+                continue;
+              neutralizeDroppedReasoningPart(thinkingPart);
+            }
+          }
+        }
+        continue;
+      }
       if (messageId && isTextPart(part)) {
         const textPart = part;
         const thinkingParts = messageThinkingParts;
@@ -9446,7 +9556,7 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
           }
         } else {
           existingTagId = resolver.resolve(messageId, "message", contentId, textOrdinal, {
-            accept: (tagNumber) => !inertWhitespaceTagNumbers.has(tagNumber)
+            accept: (tagNumber) => !inertWhitespaceTagNumbers.has(tagNumber) && !legacyForeignTagNumbers.has(tagNumber)
           });
           if (existingTagId === undefined && inertWhitespaceTagNumbers.has(tagger.getTag(sessionId, contentId, "message") ?? -1)) {
             tagger.unbindTag(sessionId, contentId);
@@ -19158,6 +19268,7 @@ function createTransform(deps) {
     const startTime = performance.now();
     const historianRun = deps.resolveHistorianRun?.();
     const messages = output.messages;
+    const foreignTextParts = deps.transformMode === "rust" ? undefined : deps.collectForeignTextParts?.(messages);
     const entryOrderForThinkingFit = messages.slice();
     const coveredHostInstructions = takeCoveredInstructionRows(messages);
     const passOutcome = createPassOutcome();
@@ -19822,6 +19933,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       }
       logTransformTiming(sessionId, "injectTemporalMarkers", tTemporal);
     }
+    const replaysCaveman = !reducedMode && !compactionOff && deps.cavemanTextCompression?.enabled === true;
     let taggingSucceeded = false;
     let recoveryBatch = null;
     let recoveryNormalized = false;
@@ -19834,7 +19946,9 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         skipPrefixInjection: !ctxReduceCallable,
         servedMessages: messages,
         normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText,
-        refreshSourceContents: deps.refreshSourceContents?.(sessionId)
+        refreshSourceContents: deps.refreshSourceContents?.(sessionId),
+        foreignTextParts,
+        replaysCaveman
       });
       for (const [number, target] of tagged.targets)
         targets.set(number, target);
@@ -19860,7 +19974,9 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           scopedToolSweep,
           servedMessages: messages,
           normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText,
-          refreshSourceContents: deps.refreshSourceContents?.(sessionId)
+          refreshSourceContents: deps.refreshSourceContents?.(sessionId),
+          foreignTextParts,
+          replaysCaveman
         });
         targets = result.targets;
         if (thinkingRecovery.restore)
@@ -19916,7 +20032,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const t3 = performance.now();
     const strippedStructuralNoise = canUseEmptySentinels && !compactionOff ? stripStructuralNoise(messages) : 0;
     logTransformTiming(sessionId, "stripStructuralNoise", t3, `strippedParts=${strippedStructuralNoise}`);
-    if (!reducedMode && !compactionOff && deps.cavemanTextCompression?.enabled) {
+    if (replaysCaveman) {
       const tCavemanReplay = performance.now();
       const replayedCaveman = replayCavemanCompression(sessionId, db, targets, activeTags);
       if (replayedCaveman > 0) {
@@ -23825,8 +23941,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-e8a4jpvr.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-f8scq6ae.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-txsmbnvw.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-vdsgnf4c.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -23910,7 +24026,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-ycs8y6n4.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-gjkszser.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -34067,6 +34183,21 @@ function verifyAssistantText(messages) {
   const start = text.lastIndexOf("<verify>");
   return start >= 0 ? text.slice(start) : text;
 }
+function validateVerifyCompletion(messages, text, expectedIds, responseText = text) {
+  let parsed;
+  try {
+    parsed = validateVerifyManifest(text, expectedIds);
+  } catch (error) {
+    throw providerOutputFailureFromInvalidManifest(messages, responseText) ?? error;
+  }
+  const ids = [...parsed.verified, ...parsed.updated, ...parsed.archived, ...parsed.skipped].map((entry) => entry.id);
+  if (ids.length !== expectedIds.size || ids.some((id) => !expectedIds.has(id))) {
+    const providerFailure = providerOutputFailureFromInvalidManifest(messages, responseText);
+    if (providerFailure)
+      throw providerFailure;
+  }
+  return parsed;
+}
 var IDENTICAL_PROVIDER_FAILURE_BATCH_LIMIT = 2;
 var VERIFY_BATCH_FLOOR_MS = 30000;
 function computeVerifyBatchSliceMs(remainingMs, _batchesRemaining) {
@@ -34225,6 +34356,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
   const timer = setTimeout(() => batchController.abort(new Error(`verify slice timed out after ${sliceMs}ms`)), sliceMs);
   const batchSignal = batchController.signal;
   const tokenBudget = verifyBatchTokenBudget(batch.length, args.tokenBudget);
+  const expectedIds = new Set(batch.map((memory) => memory.id));
   let agentSessionId = null;
   let hiddenSessionId = null;
   let promptSettled = false;
@@ -34277,13 +34409,10 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
           onBudgetUpdate({ spent: 0, finalizeFired: false, sessionId });
         },
         parse: (text, completion) => {
-          const providerFailure = providerOutputFailureFromInvalidManifest(completion.messages ?? [], text);
-          if (providerFailure)
-            throw providerFailure;
           const manifest = verifyAssistantText(completion.messages ?? []) ?? (text.trim() ? text : null);
           if (!manifest)
             throw new Error("verify returned no output");
-          return validateVerifyManifest(manifest, new Set(batch.map((memory) => memory.id)));
+          return validateVerifyCompletion(completion.messages ?? [], manifest, expectedIds, text);
         }
       });
       recordInvocation4(args, startedAt, {
@@ -34345,10 +34474,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         const text = verifyAssistantText(messages);
         if (!text)
           throw new Error("verify returned no output");
-        const providerFailure = providerOutputFailureFromInvalidManifest(messages, text);
-        if (providerFailure)
-          throw providerFailure;
-        return validateVerifyManifest(text, new Set(batch.map((memory) => memory.id)));
+        return validateVerifyCompletion(messages, text, expectedIds);
       }
     });
     promptSettled = true;
@@ -36892,12 +37018,6 @@ async function runMessageHistoryMaintenance(db) {
       log2(`[message-index] pending Rust session cleanup: cleared=${rustCleanup.cleared} failed=${rustCleanup.failedSessionIds.length}`);
     }
   }
-  const sweep = await sweepOrphanedOpenCodeMessageIndexesOffThread(db, openOpenCodeDb);
-  if (sweep.reason)
-    log2(`[message-index] orphan sweep parked: ${sweep.reason}`);
-  if (sweep.deleted > 0) {
-    log2(`[message-index] orphan sweep: scanned=${sweep.scanned} deleted=${sweep.deleted} cursor=${sweep.cursor || "<complete>"}`);
-  }
 }
 function startupJitterMs(directory) {
   const existing = startupJitters.get(directory);
@@ -51803,7 +51923,7 @@ function singleLine(value) {
 // src/tools/ctx-note/tools.ts
 function captureAnchorOrdinal(db, sessionId) {
   try {
-    const ordinal = getLastIndexedOrdinal2(db, sessionId);
+    const ordinal = getLastIndexedOrdinal(db, sessionId);
     return ordinal > 0 ? ordinal : null;
   } catch {
     return null;
@@ -52200,23 +52320,26 @@ function createCtxReduceTool(deps) {
       dropIds = dropIds.filter((id) => !ctxReduceSelfStampIds.has(id));
       const tagStatusMap = new Map(allTags.map((tag) => [tag.tagNumber, tag.status]));
       const inertWhitespaceTagNumbers = new Set(getInertWhitespaceAssistantTagsByNumbers2(deps.db, sessionId, dropIds).map((tag) => tag.tagNumber));
-      const inertDropIds = [
-        ...new Set(dropIds.filter((id) => inertWhitespaceTagNumbers.has(id)))
-      ];
-      const inertNote = inertDropIds.length > 0 ? `Skipped: ${inertDropIds.map((id) => `§${id}§ is provider framing, nothing to reclaim`).join("; ")}.` : "";
+      const foreignTextTagNumbers = new Set(dropIds.filter((id) => isLegacyForeignTextTag(sessionId, id)));
+      const skippedTagNumbers = new Set([
+        ...inertWhitespaceTagNumbers,
+        ...foreignTextTagNumbers
+      ]);
+      const skippedDropIds = [...new Set(dropIds.filter((id) => skippedTagNumbers.has(id)))];
+      const inertNote = skippedDropIds.length > 0 ? `Skipped: ${skippedDropIds.map((id) => inertWhitespaceTagNumbers.has(id) ? `§${id}§ is provider framing, nothing to reclaim` : `§${id}§ is another plugin's text, nothing to reclaim`).join("; ")}.` : "";
       const pendingOps = getPendingOps(deps.db, sessionId);
       const pendingMap = new Map(pendingOps.map((op) => [op.tagId, op.operation]));
       const conflicts = [];
       for (const id of dropIds) {
-        if (tagStatusMap.get(id) === "compacted" && !inertWhitespaceTagNumbers.has(id)) {
+        if (tagStatusMap.get(id) === "compacted" && !skippedTagNumbers.has(id)) {
           conflicts.push(`§${id}§ is from before compaction`);
         }
       }
       if (conflicts.length > 0) {
         return `Error: Conflicting operations — ${conflicts.join("; ")}.`;
       }
-      const stampedCount = new Set(dropIds.filter((id) => !inertWhitespaceTagNumbers.has(id))).size;
-      dropIds = dropIds.filter((id) => !inertWhitespaceTagNumbers.has(id) && tagStatusMap.get(id) !== "dropped" && pendingMap.get(id) !== "drop");
+      const stampedCount = new Set(dropIds.filter((id) => !skippedTagNumbers.has(id))).size;
+      dropIds = dropIds.filter((id) => !skippedTagNumbers.has(id) && tagStatusMap.get(id) !== "dropped" && pendingMap.get(id) !== "drop");
       if (dropIds.length === 0) {
         const reply = formatCtxReduceReply(stampedCount, ctxReduceSelfStampCount);
         if (reply)
@@ -53709,6 +53832,88 @@ async function registerContext(context) {
       ...args.messages.filter((message) => message !== args.incoming)
     ];
   };
+  const initializeTransform = (database) => transform ??= createTransform({
+    ...createV2TransformFeatureDeps(config, compactionOff, directory, embeddings.ensureRegistered),
+    cacheTtlConfig: config.cache_ttl,
+    cacheTtlConfigured: config.cacheTtlConfigured,
+    sampleCacheTtlConfig: () => liveConfigReader.poll().effective,
+    db: database,
+    tagger,
+    ...createV2ThresholdDeps(config),
+    contextUsageMap: usage,
+    compactionOff,
+    storeGeneration: "v2",
+    normalizeRestoredAssistantText: (text, providerID) => stripCopiedTagNotation(text, providerID === "anthropic"),
+    refreshSourceContents: (sessionID) => nativeFoldReplay?.needsHeadRebuild(sessionID) ?? false,
+    hostCleanupCompactionMarkers: () => ({
+      verified: true,
+      removedLineages: 0,
+      removedRows: 0,
+      retainedLineages: 0
+    }),
+    protectedTokens: config.protected_tokens,
+    protectedTokenTierOverrides: getProtectedTokensTierOverrides(config),
+    liveModelBySession: liveModels,
+    getToolSetHash: (sessionId) => {
+      const model = liveModels.get(sessionId);
+      if (!model)
+        return "";
+      return getCurrentToolSetHash(model.providerID, model.modelID, agents.get(sessionId), sessionId);
+    },
+    channel1StateBySession: channel1,
+    historyRefreshSessions,
+    pendingMaterializationSessions,
+    lastHeuristicsTurnId,
+    commitSeenLastPass,
+    variantBySession: variants,
+    keepReasoningTokens: config.keep_reasoning_tokens,
+    directory,
+    sessionDirectoryBySession: sessionDirectories,
+    projectPath: resolveProjectIdentityForSession(directory, config.allow_home_project),
+    getHistorianChunkTokens: () => sampleHistorian().chunkTokens,
+    getFallbackModelId: (sessionID) => {
+      const model = liveModels.get(sessionID);
+      return model ? `${model.providerID}/${model.modelID}` : undefined;
+    },
+    maybeAutoEmbedSession: createV2AutoEmbedSession({
+      db: database,
+      resolveDirectory: (sessionID) => sessionDirectories.get(sessionID) ?? directory,
+      allowHomeProject: config.allow_home_project,
+      recompProgressBySession: new Map
+    }, embeddings.ensureRegistered),
+    hiddenCompletionExecutor,
+    historianRunnable: !compactionOff && hiddenCompletionExecutor !== undefined && config.historian?.disable !== true,
+    historianModel: historianModels.primary,
+    historianContextLimit: sampleHistorian().contextLimit,
+    fallbackModels: historianModels.fallbacks,
+    resolveHistorianRun: sampleHistorian,
+    historianTimeoutMs: config.historian_timeout_ms,
+    historianMaxOutputTokens: config.historian?.maxTokens,
+    historianTwoPass: config.historian?.two_pass,
+    historianExpandTools: config.historian?.expand_tools,
+    historianRunner: config.historian?.runner,
+    historianHostRunnerEnabled: config.historian?.host_runner?.enabled,
+    compactionMarkerStrategy: rustModeModuleClient ? createV2RustCompactionMarkerStrategy((sessionID, endMessageID) => {
+      const reader = openStoreReader();
+      try {
+        return resolveV2BoundaryUserMessage(reader, sessionID, endMessageID);
+      } finally {
+        reader.close();
+      }
+    }) : v2CompactionMarkerStrategy,
+    transformMode: config.transform_mode,
+    rustModeModuleClient,
+    rustModeProjectRoot: directory,
+    rustMemorySyncRequestedSessions,
+    onRustModeParked: (sessionId, message) => pushNotification2("toast", {
+      message: `Rust Magic Context paused: ${message}`,
+      variant: "warning"
+    }, sessionId),
+    promptSurface: config.prompt_surface,
+    promptSurfaceRuntime,
+    onRustEngineReconnectRefusal: (refusal) => rustRefusalRecovery?.arm(refusal),
+    ...createHostSeams(context, readAllForConversion, pagedRead, liveModels)
+  });
   const runManagedContext = async (draft) => {
     rememberHostMedia(draft.messages);
     if (hiddenChildHook.apply(draft))
@@ -53974,88 +54179,7 @@ async function registerContext(context) {
       });
       await cacheV2SessionDirectory(context.session, draft.sessionID, sessionDirectories);
       prepareHistorySession(draft.sessionID);
-      transform ??= createTransform({
-        ...createV2TransformFeatureDeps(config, compactionOff, directory, embeddings.ensureRegistered),
-        cacheTtlConfig: config.cache_ttl,
-        cacheTtlConfigured: config.cacheTtlConfigured,
-        sampleCacheTtlConfig: () => liveConfigReader.poll().effective,
-        db,
-        tagger,
-        ...createV2ThresholdDeps(config),
-        contextUsageMap: usage,
-        compactionOff,
-        storeGeneration: "v2",
-        normalizeRestoredAssistantText: (text, providerID) => stripCopiedTagNotation(text, providerID === "anthropic"),
-        refreshSourceContents: (sessionID) => nativeFoldReplay?.needsHeadRebuild(sessionID) ?? false,
-        hostCleanupCompactionMarkers: () => ({
-          verified: true,
-          removedLineages: 0,
-          removedRows: 0,
-          retainedLineages: 0
-        }),
-        protectedTokens: config.protected_tokens,
-        protectedTokenTierOverrides: getProtectedTokensTierOverrides(config),
-        liveModelBySession: liveModels,
-        getToolSetHash: (sessionId) => {
-          const model = liveModels.get(sessionId);
-          if (!model)
-            return "";
-          return getCurrentToolSetHash(model.providerID, model.modelID, agents.get(sessionId), sessionId);
-        },
-        channel1StateBySession: channel1,
-        historyRefreshSessions,
-        pendingMaterializationSessions,
-        lastHeuristicsTurnId,
-        commitSeenLastPass,
-        variantBySession: variants,
-        keepReasoningTokens: config.keep_reasoning_tokens,
-        directory,
-        sessionDirectoryBySession: sessionDirectories,
-        projectPath: resolveProjectIdentityForSession(directory, config.allow_home_project),
-        getHistorianChunkTokens: () => sampleHistorian().chunkTokens,
-        getFallbackModelId: (sessionID) => {
-          const model = liveModels.get(sessionID);
-          return model ? `${model.providerID}/${model.modelID}` : undefined;
-        },
-        maybeAutoEmbedSession: createV2AutoEmbedSession({
-          db,
-          resolveDirectory: (sessionID) => sessionDirectories.get(sessionID) ?? directory,
-          allowHomeProject: config.allow_home_project,
-          recompProgressBySession: new Map
-        }, embeddings.ensureRegistered),
-        hiddenCompletionExecutor,
-        historianRunnable: !compactionOff && hiddenCompletionExecutor !== undefined && config.historian?.disable !== true,
-        historianModel: historianModels.primary,
-        historianContextLimit: sampleHistorian().contextLimit,
-        fallbackModels: historianModels.fallbacks,
-        resolveHistorianRun: sampleHistorian,
-        historianTimeoutMs: config.historian_timeout_ms,
-        historianMaxOutputTokens: config.historian?.maxTokens,
-        historianTwoPass: config.historian?.two_pass,
-        historianExpandTools: config.historian?.expand_tools,
-        historianRunner: config.historian?.runner,
-        historianHostRunnerEnabled: config.historian?.host_runner?.enabled,
-        compactionMarkerStrategy: rustModeModuleClient ? createV2RustCompactionMarkerStrategy((sessionID, endMessageID) => {
-          const reader = openStoreReader();
-          try {
-            return resolveV2BoundaryUserMessage(reader, sessionID, endMessageID);
-          } finally {
-            reader.close();
-          }
-        }) : v2CompactionMarkerStrategy,
-        transformMode: config.transform_mode,
-        rustModeModuleClient,
-        rustModeProjectRoot: directory,
-        rustMemorySyncRequestedSessions,
-        onRustModeParked: (sessionId, message) => pushNotification2("toast", {
-          message: `Rust Magic Context paused: ${message}`,
-          variant: "warning"
-        }, sessionId),
-        promptSurface: config.prompt_surface,
-        promptSurfaceRuntime,
-        onRustEngineReconnectRefusal: (refusal) => rustRefusalRecovery?.arm(refusal),
-        ...createHostSeams(context, readAllForConversion, pagedRead, liveModels)
-      });
+      transform = initializeTransform(db);
       const admitted = new Set;
       let messageTimes;
       const reader = openStoreReader();