@cortexkit/pi-magic-context 0.49.2 → 0.49.3

package/dist/auto-search-worker.js

@@ -17,11 +17,11 @@ var [
   { setHarness },
   { Database }
 ] = await Promise.all([
-  import("./embedding-backfill-scywarbn.js"),
+  import("./embedding-backfill-r7n7dj50.js"),
   import("./embedding-cache-7rp4gqzr.js"),
   import("./storage-memory-1z20y55x.js"),
-  import("./project-embedding-registry-64t0mw8y.js"),
-  import("./search-7z3w8pmz.js"),
+  import("./project-embedding-registry-fzc4eb29.js"),
+  import("./search-5m0jjf29.js"),
   import("./embedding-activity-ew6dshfd.js"),
   import("./harness-9872e0ym.js"),
   import("./sqlite-3yye76ht.js")

package/dist/compaction-marker-candidates-cd17s4ys.js

@@ -0,0 +1,18 @@
+import {
+  isMarkerCandidateBasisCurrent2,
+  invalidateMarkerCandidateBasis2,
+  readMarkerCandidateBasis2,
+  prepareMarkerCandidateBasis2,
+  scanMarkerCandidateSnapshot2
+} from "./index-g3600tpw.js";
+import"./index-399p688g.js";
+import"./index-3cgbv47m.js";
+import"./index-x3dcnxh0.js";
+import"./index-0h2mkab2.js";
+export {
+  invalidateMarkerCandidateBasis2 as invalidateMarkerCandidateBasis,
+  isMarkerCandidateBasisCurrent2 as isMarkerCandidateBasisCurrent,
+  prepareMarkerCandidateBasis2 as prepareMarkerCandidateBasis,
+  readMarkerCandidateBasis2 as readMarkerCandidateBasis,
+  scanMarkerCandidateSnapshot2 as scanMarkerCandidateSnapshot
+};

package/dist/compaction-marker-candidates-worker.js

@@ -0,0 +1,24 @@
+// ../plugin/src/features/magic-context/compaction-marker-candidates-worker.ts
+import { parentPort, workerData } from "node:worker_threads";
+var port = parentPort;
+if (!port)
+  throw new Error("marker candidate worker requires a parent port");
+port.postMessage({ kind: "accepted" });
+var [{ Database }, { scanMarkerCandidateSnapshot }] = await Promise.all([
+  import("./sqlite-3yye76ht.js"),
+  import("./compaction-marker-candidates-cd17s4ys.js")
+]);
+var input = workerData;
+var db;
+var reply;
+try {
+  db = new Database(input.path, { readonly: true });
+  db.exec("PRAGMA busy_timeout=250");
+  reply = { kind: "candidates", snapshot: scanMarkerCandidateSnapshot(db, input.sessionId) };
+} catch (error) {
+  reply = { kind: "error", error: error instanceof Error ? error.message : String(error) };
+} finally {
+  db?.close();
+}
+port.postMessage(reply);
+port.close();

package/dist/{embedding-backfill-scywarbn.js → embedding-backfill-r7n7dj50.js}

@@ -1,14 +1,14 @@
 import {
   ensureMemoryEmbeddings2
-} from "./index-rdtgp48t.js";
-import"./index-r874cgmv.js";
+} from "./index-xvm5cdyn.js";
+import"./index-g1csz24n.js";
+import"./index-9p40dgkm.js";
 import"./index-27jh224p.js";
 import"./index-yhzhdp3m.js";
-import"./index-9p40dgkm.js";
 import"./index-gc2749rx.js";
 import"./index-21v1kfs7.js";
 import"./index-cyrnv16r.js";
-import"./index-g7hndmqm.js";
+import"./index-g7984a4r.js";
 import"./index-4gfq5t09.js";
 import"./index-0vrkp1jq.js";
 import"./index-3cgbv47m.js";

package/dist/{index-vakawmbc.js → index-2apf1afe.js}

@@ -2,6 +2,9 @@ import {
   getSqliteDatabasePath2,
   releaseIndexOwner2
 } from "./index-3cgbv47m.js";
+import {
+  registerExitAbort
+} from "./index-399p688g.js";
 import {
   log2
 } from "./index-x3dcnxh0.js";
@@ -11,26 +14,6 @@ import { isMainThread } from "node:worker_threads";
 
 // ../plugin/src/hooks/magic-context/raw-ordinal-warmup.ts
 import { Worker } from "node:worker_threads";
-
-// ../plugin/src/shared/exit-abort-registry.ts
-var controllers = new Set;
-var listenerRegistered = false;
-function abortAll() {
-  for (const controller of controllers) {
-    try {
-      controller.abort();
-    } catch {}
-  }
-}
-function registerExitAbort(controller) {
-  controllers.add(controller);
-  if (listenerRegistered)
-    return;
-  listenerRegistered = true;
-  process.once("exit", abortAll);
-}
-
-// ../plugin/src/hooks/magic-context/raw-ordinal-warmup.ts
 var ACCEPT_TIMEOUT_MS = 2000;
 var RESULT_TIMEOUT_MS = 10 * 60000;
 var FAILURE_BACKOFF_MS = 5 * 60000;
@@ -105,6 +88,8 @@ function runSessionWarmupWorker(input, options) {
         finish({ delta: reply.delta });
       else if (reply.kind === "indexed")
         finish({ inserted: reply.inserted, measurements: reply.measurements });
+      else if (reply.kind === "orphan-sweep")
+        finish({ orphanSweep: reply.result });
       else
         finish({ failure: "worker-error", detail: reply.error });
     });

package/dist/index-399p688g.js

@@ -0,0 +1,19 @@
+// ../plugin/src/shared/exit-abort-registry.ts
+var controllers = new Set;
+var listenerRegistered = false;
+function abortAll() {
+  for (const controller of controllers) {
+    try {
+      controller.abort();
+    } catch {}
+  }
+}
+function registerExitAbort(controller) {
+  controllers.add(controller);
+  if (listenerRegistered)
+    return;
+  listenerRegistered = true;
+  process.once("exit", abortAll);
+}
+
+export { registerExitAbort };

package/dist/{index-0rasmwm8.js → index-57njcjax.js}

@@ -21,7 +21,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory,
   managedAuthorityNoteRow
-} from "./index-rd53pk0h.js";
+} from "./index-mzn6t38b.js";
 import {
   isKnownAutocommit
 } from "./index-mcgehvgw.js";
@@ -49,7 +49,7 @@ import {
   getProjectEmbeddingSnapshot2,
   embedTextForProject2,
   embedItemsForProject2
-} from "./index-r874cgmv.js";
+} from "./index-g1csz24n.js";
 import {
   saveEmbeddingIfHashMatches,
   getProjectEmbeddings2
@@ -59,7 +59,7 @@ import {
   isEmbeddingEnabled,
   embedText,
   ensureMemoryEmbeddings2
-} from "./index-rdtgp48t.js";
+} from "./index-xvm5cdyn.js";
 import {
   getMemorySelectColumns2,
   isMemoryRow2,
@@ -75,8 +75,8 @@ import {
   updateMemoryRetrievalCount2
 } from "./index-xjqheg7a.js";
 import {
-  getIndexedMessageCorpusSize
-} from "./index-b2anqqad.js";
+  getIndexedMessageCorpusSize2
+} from "./index-9ygacw4e.js";
 import {
   computeNormalizedHash
 } from "./index-9x1f96r8.js";
@@ -2984,7 +2984,7 @@ function searchMessagesInSnapshot(args, sessionFirst) {
     return renderRows(args.limit);
   }
   const sanitizedProbes = probes.map((probe) => ({ probe, query: sanitizeFtsQuery(probe) })).filter((entry) => entry.query.length > 0);
-  const corpusSize = getIndexedMessageCorpusSize(args.db, args.sessionId, cutoff);
+  const corpusSize = getIndexedMessageCorpusSize2(args.db, args.sessionId, cutoff);
   const probeCounts = countSessionFtsMatchesBatch(args.db, args.sessionId, sanitizedProbes.map((entry) => entry.query), cutoff, args.dateRange, sessionFirst);
   const collectBaseDiagnostics = args.diagnostics !== undefined && cutoff !== null;
   const baseOutcome = collectBaseDiagnostics && baseQuery.length > 0 ? runMessageFtsQueryWithDiagnostics({

package/dist/{index-fqb1bddn.js → index-590pwxvr.js}

@@ -21,7 +21,7 @@ import {
   TAG_SELECT_COLUMNS2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-kjd1fj55.js";
+} from "./index-9n88gmpf.js";
 import {
   OMO_INTERNAL_INITIATOR_MARKER,
   isSystemDirective,
@@ -69,7 +69,7 @@ import {
   hasRawSessionMessageByIdFromDb2,
   readRawSeedTailFromDb2,
   readRawSessionBoundaryEndpointsFromDb2
-} from "./index-vakawmbc.js";
+} from "./index-2apf1afe.js";
 import {
   logSlowWriteTransaction
 } from "./index-0vrkp1jq.js";
@@ -1254,6 +1254,9 @@ var providerOverflowKnownLimitSessions = new Set;
 function isProviderOverflowFailClosedProven(sessionId) {
   return providerOverflowKnownLimitSessions.has(sessionId) || providerOverflowReconfirmedSessions.has(sessionId);
 }
+function getEmergencyRecoveryArmedAt(sessionId) {
+  return emergencyRecoveryArmedAtBySession.get(sessionId) ?? null;
+}
 function describeProtectedTailDrainBudgetSkip(result) {
   const state = result.budgetState;
   if (!state)
@@ -4887,6 +4890,14 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
     pinComponentWhenFormattedBudgetCrosses(msg.ordinal, text);
   }
   if (flushCurrentBlock() && pendingNoiseMeta.length > 0) {
+    const lastNoise = pendingNoiseMeta[pendingNoiseMeta.length - 1];
+    if (messagesProcessed > 0 && lastNoise) {
+      lineMeta.push(...pendingNoiseMeta);
+      messagesProcessed += pendingNoiseMeta.length;
+      lastOrdinal = lastNoise.ordinal;
+      lastMessageId = lastNoise.messageId;
+      pendingNoiseMeta = [];
+    }
     highestScannedOrdinal = Math.max(highestScannedOrdinal, pendingNoiseMeta[pendingNoiseMeta.length - 1]?.ordinal ?? highestScannedOrdinal);
   }
   const toolOnlyRanges = [];
@@ -4944,4 +4955,4 @@ function readRawSessionSeedTail2(sessionId, boundaryId, onQuery) {
   });
 }
 
-export { detectThinkingBindingMismatch, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, MAX_EXECUTE_THRESHOLD, escalationBands, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, computeProtectionWindow, readEpochFloorSnapshot, getProtectionWindowForSession, SESSION_META_SELECT_COLUMNS, META_COLUMNS, BOOLEAN_META_KEYS, NULL_BIND_META_KEYS, isSessionMetaRow, getDefaultSessionMeta, ensureSessionMetaRow, toSessionMeta, persistCachedM0, clearCachedM0M1, isRustMarkerAdmissionFenced, ReplayDocumentError, readReplayEnvelope, readReplayDocument, updateReplayDocument, writeReplayDocument, isProviderOverflowFailClosedProven, describeProtectedTailDrainBudgetSkip, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getProtectedTailDrainBudgetSkip, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, getChannel2NudgeClaim, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, queueAutoSearchHintDecisionRetirement, flushAutoSearchHintDecisionRetirement, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, setNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, recordOverflowDetected, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, parseStrippedPlaceholderState, serializeStrippedPlaceholderState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, armThinkingBindingRecovery, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getProcessedImageStrippedIds, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, setPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, getSessionsWithPendingPiMarker, setSessionWorkMetrics, getSessionWorkMetrics, resolveEpochFloorForPass, withReadOnlySessionDb, expandToolPart, retreatPastHostUnservedRows, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripSystemInjection, hasUserAnswerMetadata, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, TOKEN_BUDGET_TOOL_REFUSAL, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, droppedInputMarker, createDroppedInputGuard, isEditTool, applyEditMarkerToInput, modelAcceptsEmptyContent, isAnthropicFamilyRoute, variantChangeBustsProviderCache, isInActiveAnthropicTurn, activeAnthropicTurnStart, hasAnthropicReasoning, findLatestAssistantReasoningMutationExemptMessage, DEFAULT_KEEP_REASONING_TOKENS, resolveKeepReasoningTokens, reasoningStepCost, reasoningBudgetCutoff, reasoningTextAndOpaque, opaqueThinkingCost, SKELETON_REAL_INPUT_MAX_BYTES, toolInputStringBytes, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, RAW_MESSAGE_VISIT_PAGE_SIZE2, visitRawSessionMessages2, readRawSessionMessageRange2, prepareRawSessionOrdinals2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessageIdOrdinals2, readRawSessionMessagePartsById2, readRawSessionBoundaryEndpoints2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, RAW_SESSION_TAG_KEY_PAGE_SIZE2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, getProtectedTailStartOrdinal2, readSessionChunk2, getRawSessionMessageIdsThrough2, readRawSessionSeedTail2 };
+export { detectThinkingBindingMismatch, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, MAX_EXECUTE_THRESHOLD, escalationBands, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, computeProtectionWindow, readEpochFloorSnapshot, getProtectionWindowForSession, SESSION_META_SELECT_COLUMNS, META_COLUMNS, BOOLEAN_META_KEYS, NULL_BIND_META_KEYS, isSessionMetaRow, getDefaultSessionMeta, ensureSessionMetaRow, toSessionMeta, persistCachedM0, clearCachedM0M1, isRustMarkerAdmissionFenced, ReplayDocumentError, readReplayEnvelope, readReplayDocument, updateReplayDocument, writeReplayDocument, isProviderOverflowFailClosedProven, getEmergencyRecoveryArmedAt, describeProtectedTailDrainBudgetSkip, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, EMERGENCY_DRAIN_FAILURE_BACKOFF_MS, getProtectedTailDrainBudgetSkip, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, getChannel2NudgeClaim, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, queueAutoSearchHintDecisionRetirement, flushAutoSearchHintDecisionRetirement, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, setNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, recordOverflowDetected, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, parseStrippedPlaceholderState, serializeStrippedPlaceholderState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, armThinkingBindingRecovery, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getProcessedImageStrippedIds, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, setPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, getSessionsWithPendingPiMarker, setSessionWorkMetrics, getSessionWorkMetrics, resolveEpochFloorForPass, withReadOnlySessionDb, expandToolPart, retreatPastHostUnservedRows, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripSystemInjection, hasUserAnswerMetadata, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, TOKEN_BUDGET_TOOL_REFUSAL, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, droppedInputMarker, createDroppedInputGuard, isEditTool, applyEditMarkerToInput, modelAcceptsEmptyContent, isAnthropicFamilyRoute, variantChangeBustsProviderCache, isInActiveAnthropicTurn, activeAnthropicTurnStart, hasAnthropicReasoning, findLatestAssistantReasoningMutationExemptMessage, DEFAULT_KEEP_REASONING_TOKENS, resolveKeepReasoningTokens, reasoningStepCost, reasoningBudgetCutoff, reasoningTextAndOpaque, opaqueThinkingCost, SKELETON_REAL_INPUT_MAX_BYTES, toolInputStringBytes, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, RAW_MESSAGE_VISIT_PAGE_SIZE2, visitRawSessionMessages2, readRawSessionMessageRange2, prepareRawSessionOrdinals2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessageIdOrdinals2, readRawSessionMessagePartsById2, readRawSessionBoundaryEndpoints2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, RAW_SESSION_TAG_KEY_PAGE_SIZE2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, getProtectedTailStartOrdinal2, readSessionChunk2, getRawSessionMessageIdsThrough2, readRawSessionSeedTail2 };

package/dist/{index-kjd1fj55.js → index-9n88gmpf.js}

@@ -631,6 +631,7 @@ function isRecord(value) {
 
 // ../plugin/src/shared/tag-owner-id.ts
 var TEXT_TAG_IDENTITY_MARKER = ":mc-text-v1:";
+var PI_FALLBACK_PREFIXES_JSON = JSON.stringify([..."pi-msg-"].reduce((prefixes, char) => prefixes.flatMap((prefix) => /[a-z]/.test(char) ? [prefix + char, prefix + char.toUpperCase()] : [prefix + char]), [""]));
 var POSITIONAL_CONTENT_SUFFIX = /:(?:p|file)\d+$/;
 var CONTENT_DERIVED_TEXT_SUFFIX = /:mc-text-v1:[0-9a-f]+:[0-9a-f]+:o\d+$/;
 function contentTagOwnerMessageId(contentId) {
@@ -1906,8 +1907,41 @@ function getPersistedToolTagAccounting2(db, sessionId, tagNumber) {
   }
   return row;
 }
-function getAllStatusTagTokenTotalsFlat2(db, sessionId, floor = 0, calibration = { proseRatio: 1, toolsRatio: 1 }) {
-  const rows = floor > 0 ? db.prepare(`SELECT type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count
+function getAllStatusTagTokenTotalsFlat2(db, sessionId, floor = 0, calibration = { proseRatio: 1, toolsRatio: 1 }, ownerMessageIds) {
+  const columns = "type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count";
+  const owners = ownerMessageIds ? new Set(ownerMessageIds) : undefined;
+  let scanOrder = "id";
+  if (owners) {
+    const planStatement = db.prepare(`EXPLAIN QUERY PLAN SELECT ${columns} FROM tags WHERE session_id = ?${floor > 0 ? " AND tag_number >= ?" : ""}`);
+    let plan;
+    try {
+      plan = planStatement.all(sessionId, ...floor > 0 ? [floor] : []);
+    } finally {
+      planStatement.finalize?.();
+    }
+    const index = plan.map((row) => /USING (?:COVERING )?INDEX (\S+)/.exec(row.detail)?.[1]).find(Boolean);
+    if (index) {
+      const keyStatement = db.prepare("SELECT name, coll, desc FROM pragma_index_xinfo(?) WHERE key = 1 ORDER BY seqno");
+      let keys;
+      try {
+        keys = keyStatement.all(index);
+      } finally {
+        keyStatement.finalize?.();
+      }
+      scanOrder = [
+        ...keys.map((key) => `"${(key.name ?? "id").replaceAll('"', '""')}" COLLATE "${key.coll.replaceAll('"', '""')}"${key.desc ? " DESC" : ""}`),
+        "id"
+      ].join(", ");
+    }
+  }
+  const rows = owners ? db.prepare(`SELECT ${columns} FROM tags WHERE id IN (
+                SELECT t.id FROM json_each(?) o CROSS JOIN tags t INDEXED BY idx_tags_session_message_id
+                ON t.session_id = ? AND t.message_id >= o.value AND t.message_id < o.value || ';'
+                UNION
+                SELECT t.id FROM json_each(?) o CROSS JOIN tags t INDEXED BY idx_tags_pi_fallback_tool_owner
+                ON t.session_id = ? AND t.tool_owner_message_id = o.value
+                WHERE t.type = 'tool'
+              ) AND tag_number >= ? ORDER BY ${scanOrder}`).all(JSON.stringify([...owners]), sessionId, JSON.stringify([...owners]), sessionId, floor) : floor > 0 ? db.prepare(`SELECT type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count
                        FROM tags
                        WHERE session_id = ? AND tag_number >= ?`).all(sessionId, floor) : db.prepare(`SELECT type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count
                        FROM tags
@@ -1918,6 +1952,8 @@ function getAllStatusTagTokenTotalsFlat2(db, sessionId, floor = 0, calibration =
     if (row.type === "tool" && row.tool_owner_message_id === null)
       continue;
     const owner = ownerMessageIdForTagRow(row);
+    if (owners && !owners.has(owner))
+      continue;
     if (row.token_count === null) {
       nullMessageIds.add(owner);
       totals.delete(owner);
@@ -2594,11 +2630,13 @@ function findPiFallbackToolOwnerTags2(db, sessionId) {
                     message_id AS callId,
                     tool_owner_message_id AS toolOwnerMessageId,
                     status
-             FROM tags
+             FROM json_each(?) prefix CROSS JOIN tags
              WHERE session_id = ?
-               AND type = 'tool'
-               AND tool_owner_message_id LIKE 'pi-msg-%'
-             ORDER BY tag_number ASC`).all(sessionId).filter(isPiFallbackToolOwnerTag);
+               AND tags.type = 'tool'
+                AND tool_owner_message_id >= prefix.value
+                AND tool_owner_message_id < substr(prefix.value, 1, 6) || '.'
+                AND tool_owner_message_id LIKE 'pi-msg-%'
+             ORDER BY tag_number ASC`).all(PI_FALLBACK_PREFIXES_JSON, sessionId).filter(isPiFallbackToolOwnerTag);
 }
 
 class PiTagIdentityConflictError2 extends Error {
@@ -3103,4 +3141,4 @@ function deleteToolTagsByOwner(db, sessionId, ownerMsgId) {
   return getDeleteToolTagsByOwnerStatement(db).all(sessionId, ownerMsgId).length;
 }
 
-export { UNKNOWN_FIT_RATIO, resolveDecisionCalibration, hasMeasuredDecisionCalibration, providerMass, localBudget, calibrationForModelKey, historyLocalBudget, adoptedProtectedToolsPolicy, protectedToolTagNumbers, protectedToolTokenCount, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isRecord, TEXT_TAG_IDENTITY_MARKER, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, providerVisiblePart, providerVisibleMessage, TODO_STATUSES, TODO_PRIORITIES, TITLE_DONE_STATUSES, normalizeTodoStateJson, buildSyntheticTodoPart, stripChannel1ReminderSpans, compareMeasuredTailPrefix, formatTailHygienePrefixMismatch, freezeTailHygieneMeasurement, effectiveTailHygiene, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, decideChannel1, evaluateChannel2, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, planEmergencyDrop, measureEmergencyTag, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, getPendingOpsCount, clearPendingOps, removePendingOp, updateTagByteSize2, getRecentTagOwnerMessageIds2, getActiveTagTokenAggregate2, AGE_RECLAIM_MIN_TOKENS2, getOldestActiveUnprotectedToolTags2, getActiveToolTagsForAgeReclaim2, getTriggerTagTokenUpperBound2, getActiveTagTokenTotalsByMessage2, updateTagInputByteSize2, updateTagTokenCount2, getPersistedToolTagAccounting2, getAllStatusTagTokenTotalsFlat2, getReasoningTokenEstimatesByMessage2, tryGetReasoningTokenEstimatesByMessage2, getMaxTagNumberByOwnerMessage2, scanTagOwnerSummary2, scanTagOwnerDelta2, updateTagInputTokenCount2, tagTokenCountIsNull2, backfillTagTokenCounts2, insertTag2, updateTagStatus2, getInertWhitespaceAssistantTagsByNumbers2, updateTagDropMode2, updateCavemanDepth2, updateTagMessageId2, hasPiFallbackMessageTags2, findAdoptableFallbackTags2, adoptFallbackTagMessageId2, foldShrunkPartTags2, hasPiFallbackToolOwnerTags2, findPiFallbackToolOwnerTags2, PiTagIdentityConflictError2, getPiMessageTagCandidates2, findPiTagIdentityConflict2, adoptPiFallbackToolOwnerTag2, adoptPiFallbackMessageTag2, markTagsCompactedByMessageIds2, deleteTagsByMessageId2, getMaxTagNumberBySession2, getTagNumberByMessageId2, getAssignableTagNumberByMessageId2, getMinMessageTagNumberForRawId2, deriveTagLoadFloor2, TAG_SELECT_COLUMNS2, getTagsBySession2, getActiveTagsBySession2, getTagsForPendingOperations2, getTagsByNumbers2, getNewestToolTagNumbers2, getDroppedTagsByNumbers2, getMaxDroppedTagNumber2, getTagById2, getTopNBySize2, getToolTagNumberByOwner2, getNullOwnerToolTag2, adoptNullOwnerToolTag2, getCandidateToolOwners2, pickNearestPriorOwner2 };
+export { UNKNOWN_FIT_RATIO, resolveDecisionCalibration, hasMeasuredDecisionCalibration, providerMass, localBudget, calibrationForModelKey, historyLocalBudget, adoptedProtectedToolsPolicy, protectedToolTagNumbers, protectedToolTokenCount, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isRecord, TEXT_TAG_IDENTITY_MARKER, PI_FALLBACK_PREFIXES_JSON, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, providerVisiblePart, providerVisibleMessage, TODO_STATUSES, TODO_PRIORITIES, TITLE_DONE_STATUSES, normalizeTodoStateJson, buildSyntheticTodoPart, stripChannel1ReminderSpans, compareMeasuredTailPrefix, formatTailHygienePrefixMismatch, freezeTailHygieneMeasurement, effectiveTailHygiene, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, decideChannel1, evaluateChannel2, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, planEmergencyDrop, measureEmergencyTag, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, getPendingOpsCount, clearPendingOps, removePendingOp, updateTagByteSize2, getRecentTagOwnerMessageIds2, getActiveTagTokenAggregate2, AGE_RECLAIM_MIN_TOKENS2, getOldestActiveUnprotectedToolTags2, getActiveToolTagsForAgeReclaim2, getTriggerTagTokenUpperBound2, getActiveTagTokenTotalsByMessage2, updateTagInputByteSize2, updateTagTokenCount2, getPersistedToolTagAccounting2, getAllStatusTagTokenTotalsFlat2, getReasoningTokenEstimatesByMessage2, tryGetReasoningTokenEstimatesByMessage2, getMaxTagNumberByOwnerMessage2, scanTagOwnerSummary2, scanTagOwnerDelta2, updateTagInputTokenCount2, tagTokenCountIsNull2, backfillTagTokenCounts2, insertTag2, updateTagStatus2, getInertWhitespaceAssistantTagsByNumbers2, updateTagDropMode2, updateCavemanDepth2, updateTagMessageId2, hasPiFallbackMessageTags2, findAdoptableFallbackTags2, adoptFallbackTagMessageId2, foldShrunkPartTags2, hasPiFallbackToolOwnerTags2, findPiFallbackToolOwnerTags2, PiTagIdentityConflictError2, getPiMessageTagCandidates2, findPiTagIdentityConflict2, adoptPiFallbackToolOwnerTag2, adoptPiFallbackMessageTag2, markTagsCompactedByMessageIds2, deleteTagsByMessageId2, getMaxTagNumberBySession2, getTagNumberByMessageId2, getAssignableTagNumberByMessageId2, getMinMessageTagNumberForRawId2, deriveTagLoadFloor2, TAG_SELECT_COLUMNS2, getTagsBySession2, getActiveTagsBySession2, getTagsForPendingOperations2, getTagsByNumbers2, getNewestToolTagNumbers2, getDroppedTagsByNumbers2, getMaxDroppedTagNumber2, getTagById2, getTopNBySize2, getToolTagNumberByOwner2, getNullOwnerToolTag2, adoptNullOwnerToolTag2, getCandidateToolOwners2, pickNearestPriorOwner2 };

package/dist/{index-b2anqqad.js → index-9ygacw4e.js}

@@ -37,7 +37,7 @@ import {
 } from "./index-mcgehvgw.js";
 import {
   cleanUserText2
-} from "./index-fqb1bddn.js";
+} from "./index-590pwxvr.js";
 import {
   logSlowWriteTransaction
 } from "./index-0vrkp1jq.js";
@@ -696,7 +696,7 @@ var deleteMessageFtsStatements = new WeakMap;
 var deleteFtsMapStatements = new WeakMap;
 var deleteFtsMapRangeStatements = new WeakMap;
 var deleteMessageFtsMapStatements = new WeakMap;
-var MESSAGE_INDEX_MAX_FTS_BYTES = 64 * 1024;
+var MESSAGE_INDEX_MAX_FTS_BYTES2 = 64 * 1024;
 var skipStatements = new WeakMap;
 function skipStatement(db, sql) {
   const statements = skipStatements.get(db) ?? new Map;
@@ -708,7 +708,15 @@ function skipStatement(db, sql) {
   }
   return statement;
 }
-var messageIndexSkipKey = (sessionId, messageId) => `message_index_skip:${JSON.stringify([sessionId, messageId])}`;
+var messageIndexSkipKey2 = (sessionId, messageId) => `message_index_skip:${JSON.stringify([sessionId, messageId])}`;
+function deleteMessageIndexSkips(db, sessionId, messageId) {
+  if (messageId !== undefined) {
+    skipStatement(db, "DELETE FROM schema_migrations_meta WHERE key=?").run(messageIndexSkipKey2(sessionId, messageId));
+  } else {
+    const prefix = `message_index_skip:${JSON.stringify([sessionId]).slice(0, -1)},`;
+    skipStatement(db, "DELETE FROM schema_migrations_meta WHERE substr(key,1,length(?))=?").run(prefix, prefix);
+  }
+}
 function normalizeIndexText(text) {
   return text.replace(/\s+/g, " ").trim();
 }
@@ -744,6 +752,17 @@ function getUpsertDirtyFloorStatement(db) {
   }
   return stmt;
 }
+function getDeleteFtsStatement(db) {
+  let stmt = deleteFtsStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`DELETE FROM message_history_fts
+             WHERE rowid IN (
+                 SELECT fts_rowid FROM message_fts_rowid_map WHERE session_id = ?
+             )`);
+    deleteFtsStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function getDeleteFtsRangeStatement(db) {
   let stmt = deleteFtsRangeStatements.get(db);
   if (!stmt) {
@@ -757,6 +776,14 @@ function getDeleteFtsRangeStatement(db) {
   }
   return stmt;
 }
+function getDeleteIndexStatement(db) {
+  let stmt = deleteIndexStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM message_history_index WHERE session_id = ?");
+    deleteIndexStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function getCountIndexedMessageStatement(db) {
   let stmt = countIndexedMessageStatements.get(db);
   if (!stmt) {
@@ -796,6 +823,14 @@ function getUpsertMessageSourceStatement(db) {
   }
   return stmt;
 }
+function getDeleteMessageSourceStatement(db) {
+  let stmt = deleteMessageSourceStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM message_history_source WHERE session_id = ?");
+    deleteMessageSourceStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function getDeleteMessageSourceRangeStatement(db) {
   let stmt = deleteMessageSourceRangeStatements.get(db);
   if (!stmt) {
@@ -820,6 +855,14 @@ function getDeleteMessageFtsStatement(db) {
   }
   return stmt;
 }
+function getDeleteFtsMapStatement(db) {
+  let stmt = deleteFtsMapStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM message_fts_rowid_map WHERE session_id = ?");
+    deleteFtsMapStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function getDeleteFtsMapRangeStatement(db) {
   let stmt = deleteFtsMapRangeStatements.get(db);
   if (!stmt) {
@@ -853,8 +896,8 @@ function normalizeSourceVersion(version) {
     return `string:${version}`;
   return "null";
 }
-function toMessageIndexSource(message) {
-  const content = getIndexableContent(message.role, message.parts);
+function toMessageIndexSource2(message) {
+  const content = getIndexableContent2(message.role, message.parts);
   return {
     id: message.id,
     ordinal: message.ordinal,
@@ -866,9 +909,9 @@ function toMessageIndexSource(message) {
   };
 }
 function getMessageSourceSnapshot(message) {
-  return toMessageIndexSource(message);
+  return toMessageIndexSource2(message);
 }
-function getMessageIndexSourceIdentity(message) {
+function getMessageIndexSourceIdentity2(message) {
   const source = getMessageSourceSnapshot(message);
   return JSON.stringify([
     source.ordinal,
@@ -878,7 +921,7 @@ function getMessageIndexSourceIdentity(message) {
     message.createdAt ?? null
   ]);
 }
-function isMessageIndexSourceCurrent(db, sessionId, message) {
+function isMessageIndexSourceCurrent2(db, sessionId, message) {
   const source = getMessageSourceSnapshot(message);
   return isIndexSourceCurrent(db, sessionId, source);
 }
@@ -889,8 +932,8 @@ function isIndexSourceCurrent(db, sessionId, source) {
 function writeMessageSource(db, sessionId, source, now) {
   getUpsertMessageSourceStatement(db).run(sessionId, source.id, source.ordinal, source.sourceVersion, source.contentHash, source.role, getHarness2(), now);
   const bytes = Buffer.byteLength(source.content);
-  if (source.ftsSkippedBytes !== undefined || bytes > MESSAGE_INDEX_MAX_FTS_BYTES) {
-    skipStatement(db, "INSERT INTO schema_migrations_meta(key,value) VALUES (?,?) ON CONFLICT(key) DO UPDATE SET value=excluded.value").run(messageIndexSkipKey(sessionId, source.id), JSON.stringify({
+  if (source.ftsSkippedBytes !== undefined || bytes > MESSAGE_INDEX_MAX_FTS_BYTES2) {
+    skipStatement(db, "INSERT INTO schema_migrations_meta(key,value) VALUES (?,?) ON CONFLICT(key) DO UPDATE SET value=excluded.value").run(messageIndexSkipKey2(sessionId, source.id), JSON.stringify({
       reason: "oversized",
       bytes: source.ftsSkippedBytes ?? bytes,
       contentHash: source.contentHash,
@@ -899,24 +942,24 @@ function writeMessageSource(db, sessionId, source, now) {
     }));
     return "";
   }
-  skipStatement(db, "DELETE FROM schema_migrations_meta WHERE key=?").run(messageIndexSkipKey(sessionId, source.id));
+  skipStatement(db, "DELETE FROM schema_migrations_meta WHERE key=?").run(messageIndexSkipKey2(sessionId, source.id));
   return source.content;
 }
-function getLastIndexedOrdinal(db, sessionId) {
+function getLastIndexedOrdinal2(db, sessionId) {
   const row = getLastIndexedStatement(db).get(sessionId);
   return typeof row?.last_indexed_ordinal === "number" ? row.last_indexed_ordinal : 0;
 }
-function getIndexedMessageCorpusSize(db, sessionId, maxOrdinal) {
-  const watermark = getLastIndexedOrdinal(db, sessionId);
+function getIndexedMessageCorpusSize2(db, sessionId, maxOrdinal) {
+  const watermark = getLastIndexedOrdinal2(db, sessionId);
   return maxOrdinal === null ? watermark : Math.min(watermark, Math.max(0, maxOrdinal));
 }
 function getDirtyIndexFloor(db, sessionId) {
   const row = getLastIndexedStatement(db).get(sessionId);
   return typeof row?.dirty_floor_ordinal === "number" && row.dirty_floor_ordinal > 0 ? row.dirty_floor_ordinal : null;
 }
-function markMessageIndexDirty(db, sessionId, floorOrdinal) {
+function markMessageIndexDirty2(db, sessionId, floorOrdinal) {
   const dirtyFloor = Math.max(1, Math.floor(floorOrdinal));
-  getUpsertDirtyFloorStatement(db).run(sessionId, getLastIndexedOrdinal(db, sessionId), dirtyFloor, Date.now(), getHarness2());
+  getUpsertDirtyFloorStatement(db).run(sessionId, getLastIndexedOrdinal2(db, sessionId), dirtyFloor, Date.now(), getHarness2());
 }
 function isMessageAlreadyIndexed(db, sessionId, messageId) {
   const row = getCountIndexedMessageStatement(db).get(sessionId, messageId);
@@ -925,16 +968,40 @@ function isMessageAlreadyIndexed(db, sessionId, messageId) {
 function setIndexProgress(db, sessionId, watermark, dirtyFloor, now) {
   getUpsertProgressStatement(db).run(sessionId, Math.max(0, Math.floor(watermark)), dirtyFloor ?? 0, now, getHarness2());
 }
-function getMessageIndexReconciliationStartOrdinal(db, sessionId) {
-  const watermark = getLastIndexedOrdinal(db, sessionId);
+function getMessageIndexReconciliationStartOrdinal2(db, sessionId) {
+  const watermark = getLastIndexedOrdinal2(db, sessionId);
   const dirtyFloor = getDirtyIndexFloor(db, sessionId);
   return dirtyFloor === null ? watermark : Math.min(watermark, dirtyFloor - 1);
 }
-function isMessageIndexReconciledThrough(db, sessionId, finalWatermark) {
+function isMessageIndexReconciledThrough2(db, sessionId, finalWatermark) {
   const dirtyFloor = getDirtyIndexFloor(db, sessionId);
-  return getLastIndexedOrdinal(db, sessionId) >= finalWatermark && dirtyFloor === null;
+  return getLastIndexedOrdinal2(db, sessionId) >= finalWatermark && dirtyFloor === null;
 }
-function getIndexableContent(role, parts) {
+function deleteIndexedMessage2(db, sessionId, messageId) {
+  deleteMessageIndexSkips(db, sessionId, messageId);
+  const row = getCountIndexedMessageStatement(db).get(sessionId, messageId);
+  const count = typeof row?.count === "number" ? row.count : 0;
+  clearIndexedMessages2(db, sessionId);
+  return count;
+}
+function clearIndexedMessagesInTransaction2(db, sessionId) {
+  deleteMessageIndexSkips(db, sessionId);
+  getDeleteFtsStatement(db).run(sessionId);
+  deleteUnmappedMessageFtsRows(db, [sessionId]);
+  getDeleteFtsMapStatement(db).run(sessionId);
+  getDeleteMessageSourceStatement(db).run(sessionId);
+  getDeleteIndexStatement(db).run(sessionId);
+  clearCompressionDepth(db, sessionId);
+}
+function clearIndexedMessages2(db, sessionId) {
+  let transactionStartedAt = 0;
+  db.transaction(() => {
+    transactionStartedAt = performance.now();
+    clearIndexedMessagesInTransaction2(db, sessionId);
+  }).immediate();
+  logSlowWriteTransaction("message_index_clear", transactionStartedAt);
+}
+function getIndexableContent2(role, parts) {
   if (role === "user") {
     if (!hasMeaningfulUserText2(parts)) {
       return "";
@@ -947,7 +1014,7 @@ function getIndexableContent(role, parts) {
   return "";
 }
 function indexSingleMessageInTransaction(db, sessionId, message, now, dirtyFloorBeforeAttempt, source) {
-  const currentWatermark = getLastIndexedOrdinal(db, sessionId);
+  const currentWatermark = getLastIndexedOrdinal2(db, sessionId);
   const dirtyFloor = getDirtyIndexFloor(db, sessionId);
   if (message.ordinal <= currentWatermark) {
     if (isIndexSourceCurrent(db, sessionId, source)) {
@@ -978,17 +1045,17 @@ function indexSingleMessageInTransaction(db, sessionId, message, now, dirtyFloor
   setIndexProgress(db, sessionId, message.ordinal, dirtyFloorBeforeAttempt === message.ordinal ? null : dirtyFloorBeforeAttempt, now);
   return inserted;
 }
-function indexSingleMessage(db, sessionId, message, shouldCommit = () => true, preparedSource) {
+function indexSingleMessage2(db, sessionId, message, shouldCommit = () => true, preparedSource) {
   if (!shouldCommit())
     return false;
   const source = preparedSource ?? getMessageSourceSnapshot(message);
-  const currentWatermark = getLastIndexedOrdinal(db, sessionId);
+  const currentWatermark = getLastIndexedOrdinal2(db, sessionId);
   if (message.ordinal <= currentWatermark && isIndexSourceCurrent(db, sessionId, source)) {
     recordIndexedMessageTime(db, sessionId, message.ordinal, message.createdAt);
     return false;
   }
   const dirtyFloorBeforeAttempt = getDirtyIndexFloor(db, sessionId);
-  markMessageIndexDirty(db, sessionId, Math.min(message.ordinal, currentWatermark + 1));
+  markMessageIndexDirty2(db, sessionId, Math.min(message.ordinal, currentWatermark + 1));
   db.exec("BEGIN IMMEDIATE");
   const transactionStartedAt = performance.now();
   let committed = false;
@@ -1008,8 +1075,11 @@ function indexSingleMessage(db, sessionId, message, shouldCommit = () => true, p
     }
   }
 }
-function indexMessagesAfterOrdinal(db, sessionId, messages, _lastIndexedOrdinal, finalWatermark = messages.length) {
-  return indexItemsAfterOrdinal(db, sessionId, messages, finalWatermark, toMessageIndexSource);
+function indexMessagesAfterOrdinal2(db, sessionId, messages, _lastIndexedOrdinal, finalWatermark = messages.length) {
+  return indexItemsAfterOrdinal(db, sessionId, messages, finalWatermark, toMessageIndexSource2);
+}
+function indexSourcesAfterOrdinal2(db, sessionId, sources, finalWatermark) {
+  return indexItemsAfterOrdinal(db, sessionId, sources, finalWatermark, (source) => source);
 }
 function indexItemsAfterOrdinal(db, sessionId, items, finalWatermark, toSource) {
   const now = Date.now();
@@ -1019,7 +1089,7 @@ function indexItemsAfterOrdinal(db, sessionId, items, finalWatermark, toSource)
   const transactionStartedAt = performance.now();
   let committed = false;
   try {
-    const currentWatermark = getLastIndexedOrdinal(db, sessionId);
+    const currentWatermark = getLastIndexedOrdinal2(db, sessionId);
     const dirtyFloor = getDirtyIndexFloor(db, sessionId);
     const effectiveWatermark = dirtyFloor === null ? currentWatermark : Math.min(currentWatermark, Math.max(0, dirtyFloor - 1));
     if (dirtyFloor !== null && dirtyFloor <= currentWatermark && !messageFtsOrdinalRangeIsMapped(db, sessionId, dirtyFloor, Math.min(currentWatermark, finalWatermark))) {
@@ -1173,7 +1243,7 @@ function sweepOrphanedOpenCodeMessageIndexesInBackground(db, openReadableOpenCod
                          AND message_history_index.updated_at > ?
                    )
                  LIMIT 1`);
-      const eligibleSessionIds = missingSessionIds.filter((sessionId) => stillEligible.get(sessionId, cutoff));
+      const eligibleSessionIds = missingSessionIds.filter((sessionId) => !sessionExists.get(sessionId) && stillEligible.get(sessionId, cutoff));
       deleted = deleteSessionScopedRows(db, eligibleSessionIds, harness);
       persistMessageHistoryOrphanSweepState(db, nextCursor, completedAt, harness);
       db.exec("COMMIT");
@@ -1196,8 +1266,8 @@ function sweepOrphanedOpenCodeMessageIndexesInBackground(db, openReadableOpenCod
     closeQuietly(openCodeDb);
   }
 }
-function sweepOrphanedOpenCodeMessageIndexes(db, openReadableOpenCodeDb, options = {}) {
+function sweepOrphanedOpenCodeMessageIndexes2(db, openReadableOpenCodeDb, options = {}) {
   return withoutSqliteTransformPass2(() => withSqliteBackgroundWriter2(() => sweepOrphanedOpenCodeMessageIndexesInBackground(db, openReadableOpenCodeDb, options)));
 }
 
-export { BoundedSessionMap, LkgRecoveryFenceError, clearLkgFenceProcessState, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, readSessionActivity, observeSessionActivity, backfillSessionActivity, deleteSessionScopedRows, clearCompressionDepth, clearCompressionDepthRange, MESSAGE_INDEX_MAX_FTS_BYTES, messageIndexSkipKey, getMessageIndexSourceIdentity, isMessageIndexSourceCurrent, getLastIndexedOrdinal, getIndexedMessageCorpusSize, markMessageIndexDirty, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, getIndexableContent, indexSingleMessage, indexMessagesAfterOrdinal, sweepOrphanedOpenCodeMessageIndexes };
+export { BoundedSessionMap, LkgRecoveryFenceError, clearLkgFenceProcessState, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, readSessionActivity, observeSessionActivity, backfillSessionActivity, deleteSessionScopedRows, clearCompressionDepth, clearCompressionDepthRange, MESSAGE_INDEX_MAX_FTS_BYTES2, messageIndexSkipKey2, toMessageIndexSource2, getMessageIndexSourceIdentity2, isMessageIndexSourceCurrent2, getLastIndexedOrdinal2, getIndexedMessageCorpusSize2, markMessageIndexDirty2, getMessageIndexReconciliationStartOrdinal2, isMessageIndexReconciledThrough2, deleteIndexedMessage2, clearIndexedMessagesInTransaction2, clearIndexedMessages2, getIndexableContent2, indexSingleMessage2, indexMessagesAfterOrdinal2, indexSourcesAfterOrdinal2, sweepOrphanedOpenCodeMessageIndexes2 };