@cortexkit/pi-magic-context 0.49.23 → 0.49.25

package/dist/{index-gqjxy2p7.js → index-cm9e52mb.js}

@@ -55,7 +55,7 @@ import {
   recordOpenCodeDbReadFailure,
   clearOpenCodeDbReadFailure,
   claimOpenCodeDbDiagnosticOnce
-} from "./index-8976mezv.js";
+} from "./index-23t8ryqw.js";
 import {
   prewarmRawSessionOrdinalsForDb,
   readRawSessionMessagesFromDb2,
@@ -72,7 +72,7 @@ import {
   hasRawSessionMessageByIdFromDb2,
   readRawSeedTailFromDb2,
   readRawSessionBoundaryEndpointsFromDb2
-} from "./index-at6py2k3.js";
+} from "./index-8hmqdav2.js";
 import {
   logSlowWriteTransaction
 } from "./index-hqw0rt9k.js";
@@ -2941,6 +2941,70 @@ function expandToolPart(part, overrides, legacyPreview = false) {
   return renderToolTemplate(template, input, state?.output ?? state?.error, legacyPreview);
 }
 
+// ../plugin/src/hooks/magic-context/ask-answer-notice.ts
+var ANSWER_HEADER_PREFIX = /^Inbox [^\n]* notice from user via user_answer \(user_answer\)/;
+var ANSWER_TRAILER = /\n([\s\S]*?)\nThis ask is now closed; no dismiss is needed\. Continue accordingly\.$/;
+var ANSWER_ANSWER_LINE = /^The user answered your parked question (\S+)\.\nQuestion: ([^\n]+)\nAnswer: /;
+var ANSWER_QUESTION_LINE = /^Question: ([^\n]+)\nAnswer: /;
+var reminderEnvelopePattern = /<system-reminder>([\s\S]*?)<\/system-reminder>/gi;
+function reminderBodies(text) {
+  reminderEnvelopePattern.lastIndex = 0;
+  const bodies = [];
+  for (const match of text.matchAll(reminderEnvelopePattern)) {
+    const body = match[1];
+    if (body !== undefined)
+      bodies.push(body);
+  }
+  return bodies;
+}
+function parseAnswerBody(body) {
+  const lines = body.replace(/\r\n/g, `
+`).replace(/^\n+|\n+$/g, "");
+  if (!ANSWER_HEADER_PREFIX.test(lines))
+    return null;
+  if (lines.includes("The user dismissed this question"))
+    return null;
+  const framed = ANSWER_TRAILER.exec(lines);
+  if (framed === null)
+    return null;
+  const content = framed[1] ?? "";
+  const narrated = ANSWER_ANSWER_LINE.exec(content);
+  if (narrated !== null) {
+    const question = narrated[2] ?? "";
+    const answer = content.slice(narrated[0].length);
+    return closedAnswer(question, answer);
+  }
+  const bare = ANSWER_QUESTION_LINE.exec(content);
+  if (bare !== null) {
+    const question = bare[1] ?? "";
+    const answer = content.slice(bare[0].length);
+    return closedAnswer(question, answer);
+  }
+  return null;
+}
+function closedAnswer(question, answer) {
+  if (question.trim().length === 0)
+    return null;
+  if (answer.trim().length === 0)
+    return null;
+  return { question, answer };
+}
+function extractAskAnswerNotices(text) {
+  const notices = [];
+  for (const body of reminderBodies(text)) {
+    const notice = parseAnswerBody(body);
+    if (notice !== null)
+      notices.push(notice);
+  }
+  return notices;
+}
+function formatAskAnswerNotice(notice) {
+  return `U (answered "${notice.question}"): ${notice.answer}`;
+}
+function askAnswerLines(text) {
+  return extractAskAnswerNotices(text).map(formatAskAnswerNotice);
+}
+
 // ../plugin/src/hooks/magic-context/host-served-rows.ts
 var HOST_UNSERVED_ROW = "hostUnservedRow";
 function markHostUnservedRow(target) {
@@ -4238,6 +4302,9 @@ function withRawMessageProvider2(sessionId, provider, fn) {
 function cleanUserText2(text) {
   return stripOutsideSteeringWrappers(text, (segment) => removeSystemReminders(segment).replace(OMO_INTERNAL_INITIATOR_MARKER, "")).trim();
 }
+function answerLineParts(rawText) {
+  return askAnswerLines(rawText).map(normalizeText).filter((value) => value.length > 0);
+}
 function hasMeaningfulChunkUserText(parts) {
   for (const part of parts) {
     if (part === null || typeof part !== "object")
@@ -4254,7 +4321,7 @@ function hasMeaningfulChunkUserText(parts) {
       continue;
     return true;
   }
-  return false;
+  return parts.some((part) => part !== null && typeof part === "object" && part.type === "text" && typeof part.text === "string" && part.ignored !== true && askAnswerLines(part.text).length > 0);
 }
 function withRawSessionMessageCache2(fn) {
   const outerCache = activeRawMessageCache;
@@ -5008,8 +5075,10 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
     }
     const role = compactRole(msg.role);
     const textParts = extractTexts2(msg.parts).map((t) => msg.role === "user" ? cleanUserText2(t) : t).map(normalizeText).filter((value) => value.length > 0);
+    const answerParts = msg.role === "user" ? extractTexts2(msg.parts).flatMap((text) => answerLineParts(text)) : [];
+    const userParts = answerParts.length > 0 ? [...textParts, ...answerParts] : textParts;
     const allParts = options.expand === false ? [
-      ...textParts,
+      ...userParts,
       ...textParts.length === 0 ? extractToolCallSummaries(msg.parts) : []
     ] : msg.parts.flatMap((part) => {
       if (expandedResults.has(part))
@@ -5018,6 +5087,9 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
       if (expansion !== null)
         return [`TC: ${expansion}`];
       const texts = extractTexts2([part]).map((t) => msg.role === "user" ? cleanUserText2(t) : t).map(normalizeText).filter(Boolean);
+      if (msg.role === "user") {
+        texts.push(...extractTexts2([part]).flatMap((text) => answerLineParts(text)));
+      }
       return texts.length ? texts : textParts.length === 0 ? extractToolCallSummaries([part]) : [];
     });
     const compacted = compactTextForSummary(allParts.join(" / "), msg.role);
@@ -5026,7 +5098,7 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
       recordFilteredNoise(meta);
       continue;
     }
-    const msgHasNarrative = textParts.length > 0;
+    const msgHasNarrative = userParts.length > 0;
     if (currentBlock && currentBlock.role === role) {
       currentBlock.endOrdinal = msg.ordinal;
       currentBlock.parts.push(text);
@@ -5128,4 +5200,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, 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, COMPACTION_OFF_THINKING_FROZEN_PREFIX, getThinkingBindingRecoveryTarget, armThinkingBindingRecovery, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getProcessedImageStrippedIds, parseProcessedImageMarkers, serializeProcessedImageMarkers, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, setPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, logPiCompactionMarkerClear, getSessionsWithPendingPiMarker, setSessionWorkMetrics, getSessionWorkMetrics, resolveEpochFloorForPass, withReadOnlySessionDb, expandToolPart, retreatPastHostUnservedRows, isCoveredInstructionRow, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripSystemInjection, isFilePart, 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, estimatePartImageTokens, SKELETON_REAL_INPUT_MAX_BYTES, toolInputStringBytes, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, RAW_MESSAGE_VISIT_PAGE_SIZE2, visitRawSessionMessages2, visitRawSessionMessagesAsync2, 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, COMPACTION_OFF_THINKING_FROZEN_PREFIX, getThinkingBindingRecoveryTarget, armThinkingBindingRecovery, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getProcessedImageStrippedIds, parseProcessedImageMarkers, serializeProcessedImageMarkers, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, setPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, logPiCompactionMarkerClear, getSessionsWithPendingPiMarker, setSessionWorkMetrics, getSessionWorkMetrics, resolveEpochFloorForPass, withReadOnlySessionDb, expandToolPart, askAnswerLines, retreatPastHostUnservedRows, isCoveredInstructionRow, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripSystemInjection, isFilePart, 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, estimatePartImageTokens, SKELETON_REAL_INPUT_MAX_BYTES, toolInputStringBytes, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, RAW_MESSAGE_VISIT_PAGE_SIZE2, visitRawSessionMessages2, visitRawSessionMessagesAsync2, 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-st4gwt64.js → index-cms6wfmd.js}

@@ -6,7 +6,7 @@ import {
 } from "./index-my0dn413.js";
 import {
   readRawSessionMessageIdOrdinalsForRange2
-} from "./index-gqjxy2p7.js";
+} from "./index-cm9e52mb.js";
 
 // ../plugin/src/tools/ctx-expand/search-archive.ts
 var archiveReadsOnThisThread = 0;

package/dist/{index-dbgg6hsf.js → index-d53veb5e.js}

@@ -42,7 +42,7 @@ import {
 } from "./index-fapenpch.js";
 import {
   startMessageFtsRowidMapBackfill2
-} from "./index-579m1751.js";
+} from "./index-8a2wvrda.js";
 import {
   LKG_SLOT_CHUNKS_DDL,
   SESSION_REPLAY_DECISIONS_DDL,
@@ -52,7 +52,7 @@ import {
   hasPendingMigrations,
   getMainThreadMigrationBodyCount,
   runMigrations
-} from "./index-3c3ztwgc.js";
+} from "./index-0dr64gsy.js";
 import {
   closeQuietly,
   ensureColumn,
@@ -64,7 +64,7 @@ import {
   hasV1MessageTables,
   setDatabase,
   loadToolDefinitionMeasurements
-} from "./index-8976mezv.js";
+} from "./index-23t8ryqw.js";
 import {
   logSlowWriteTransaction
 } from "./index-hqw0rt9k.js";
@@ -1307,7 +1307,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-5dmc77q2.js"));
+        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-rndwjfrx.js"));
         const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-e3r8ddh1.js"));
         if (signal.aborted)
           return;

package/dist/{index-5j6vwg4z.js → index-fzfpq5bd.js}

@@ -15,7 +15,7 @@ import {
 } from "./index-2qtx0q6h.js";
 import {
   createFailClosedBlockingError
-} from "./index-dbgg6hsf.js";
+} from "./index-d53veb5e.js";
 import {
   createWorkerShutdown
 } from "./index-54wmg4rj.js";
@@ -407,7 +407,7 @@ function startPiTagSnapshotWorker(request, options = {}) {
         reject(new PiTagHydrationError(`worker exited with code ${code} before a clean complete result`));
     });
   });
-  function abort(error = new PiTagHydrationError("cancelled")) {
+  function abort(error = new PiTagHydrationError("cancelled", "cancelled")) {
     if (settled)
       return;
     settled = true;
@@ -535,9 +535,9 @@ function createPiTagSnapshotReader(db) {
   const managed = new Set;
   const epoch = ++connectionEpoch;
   const sessionEpochs = new Map;
+  let closed = false;
   let jobId = 0;
   let current;
-  let desiredSession;
   let failedUntil = 0;
   let lastFailure;
   let failedSession;
@@ -580,24 +580,30 @@ function createPiTagSnapshotReader(db) {
   };
   const cancel = (sessionId) => {
     sessionEpochs.set(sessionId, (sessionEpochs.get(sessionId) ?? 0) + 1);
-    if (desiredSession === sessionId)
-      desiredSession = undefined;
     if (current?.sessionId === sessionId)
       current.cancel();
   };
-  const load = (sessionId) => inSnapshotRoot(async () => {
+  const load = (sessionId, kind) => inSnapshotRoot(async () => {
+    if (closed)
+      throw new PiTagHydrationError("connection closed");
     managed.add(sessionId);
     if (ready(sessionId))
       return;
-    desiredSession = sessionId;
     if (current) {
-      if (current.sessionId === sessionId && !current.stale)
+      if (current.sessionId === sessionId && !current.retryable && !current.preempted) {
+        if (kind === "turn")
+          current.kind = "turn";
         return current.result;
-      current.cancel();
-      await current.released;
-      if (desiredSession !== sessionId)
-        throw new PiTagHydrationError("session hydration superseded", "stale");
-      return load(sessionId);
+      }
+      if (kind === "turn" && current.kind === "prewarm" && current.sessionId !== sessionId && !current.preempted) {
+        current.preempted = true;
+        current.cancel();
+      }
+      const epoch = sessionEpochs.get(sessionId) ?? 0;
+      await Promise.allSettled([current.result, current.released]);
+      if (epoch !== (sessionEpochs.get(sessionId) ?? 0))
+        throw new PiTagHydrationError("session hydration cancelled while queued", "cancelled");
+      return load(sessionId, kind);
     }
     if (failedSession === sessionId && performance.now() < failedUntil)
       throw lastFailure;
@@ -620,6 +626,7 @@ function createPiTagSnapshotReader(db) {
     }, previous?.tags ?? []);
     const destination = {
       sessionId,
+      kind,
       result: Promise.resolve(),
       released: worker.released,
       cancel: worker.cancel
@@ -639,8 +646,10 @@ function createPiTagSnapshotReader(db) {
     };
     jobs.add(lifetime);
     destination.result = worker.result.then(({ candidate, generation }) => {
+      if (destination.preempted)
+        throw new PiTagHydrationError("prewarm yielded to a turn", "cancelled");
       const live = stamps(sessionId, token.jobId);
-      if (current !== destination || desiredSession !== sessionId || !samePiTagSnapshotToken(token, live) || token.totalRevision !== live.totalRevision || generation.revision !== token.totalRevision || generation.durable !== token.durableVersion)
+      if (closed || current !== destination || !samePiTagSnapshotToken(token, live) || token.totalRevision !== live.totalRevision || generation.revision !== token.totalRevision || generation.durable !== token.durableVersion)
         throw new PiTagHydrationError("owner generation or lifetime changed", "stale");
       const snapshot = {
         firstAllocationPending: live.revisionPresent ? undefined : candidate.tags.length === 0 && !db.prepare("SELECT 1 FROM tags WHERE session_id = ? LIMIT 1").get(sessionId) ? "empty" : "legacy",
@@ -669,12 +678,13 @@ function createPiTagSnapshotReader(db) {
       }
       cache.set(sessionId, snapshot);
     }).catch((error) => {
-      if (error instanceof PiTagHydrationError && error.code === "stale")
-        destination.stale = true;
-      if (current === destination && desiredSession === sessionId && token.sessionEpoch === (sessionEpochs.get(sessionId) ?? 0)) {
+      const retryable = error instanceof PiTagHydrationError && (error.code === "stale" || error.code === "cancelled");
+      if (retryable)
+        destination.retryable = true;
+      if (!destination.preempted && current === destination && token.sessionEpoch === (sessionEpochs.get(sessionId) ?? 0)) {
         failedSession = sessionId;
         lastFailure = error;
-        failedUntil = performance.now() + (error instanceof PiTagHydrationError && error.code === "stale" ? 0 : 500);
+        failedUntil = performance.now() + (retryable ? 0 : 500);
       }
       throw error;
     });
@@ -795,7 +805,7 @@ function createPiTagSnapshotReader(db) {
     configurable: true,
     writable: true,
     value: (...args) => {
-      desiredSession = undefined;
+      closed = true;
       nativeWaiters.clear();
       current?.cancel();
       cache.clear();
@@ -979,7 +989,7 @@ var activeJobs = new Map;
 var waitDeadlines = new WeakMap;
 function prewarmPiTagSnapshot(db, sessionId) {
   createPiTagSnapshotReader(db);
-  owners.get(db)?.load(sessionId).catch(() => {});
+  owners.get(db)?.load(sessionId, "prewarm").catch(() => {});
 }
 function cancelPiTagSnapshotSession(sessionId) {
   for (const job of activeJobs.get(sessionId) ?? [])
@@ -1023,7 +1033,7 @@ function ensurePiTagSnapshotReady(db, sessionId, budget) {
       const releaseNativeWaiter = owner.addNativeWaiter(() => budget.remainingOutcome() - PI_CONTEXT_BUDGET.completionReserveMs);
       try {
         await budget.wait(Promise.race([
-          owner.load(sessionId),
+          owner.load(sessionId, "turn"),
           new Promise((_, reject) => {
             timer = setTimeout(() => reject(new PiTagHydrationError("remaining pass budget exhausted waiting for tag snapshot; turn not sent, retry", "deadline")), allowance);
           })
@@ -1033,7 +1043,7 @@ function ensurePiTagSnapshotReady(db, sessionId, budget) {
         return;
       } catch (error) {
         budget.assert();
-        if (!(error instanceof PiTagHydrationError && error.code === "stale"))
+        if (!(error instanceof PiTagHydrationError && (error.code === "stale" || error.code === "cancelled")))
           throw error;
       } finally {
         clearTimeout(timer);

package/dist/{index-pe5gz5c4.js → index-nxq2srg9.js}

@@ -15,7 +15,7 @@ import {
   OpenAICompatibleEmbeddingProvider,
   getProjectEmbeddingSnapshot2,
   embedBatchForProject2
-} from "./index-w1twp2kp.js";
+} from "./index-00c5a49f.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-9p40dgkm.js";

package/dist/{index-vx6f7wff.js → index-wb2t932e.js}

@@ -13,7 +13,7 @@ import {
 } from "./index-gwxaz0z5.js";
 import {
   messageFtsOrdinalRangeIsMapped2
-} from "./index-579m1751.js";
+} from "./index-8a2wvrda.js";
 
 // ../plugin/src/features/magic-context/compartment-chunk-embedding.ts
 import { createHash } from "node:crypto";

package/dist/{index-wgmhk91m.js → index-zmg1td73.js}

@@ -9,9 +9,10 @@ import {
   readProcessStartTime
 } from "./index-n4wyxcgr.js";
 import {
+  BoundedSessionMap,
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration
-} from "./index-8976mezv.js";
+} from "./index-23t8ryqw.js";
 import {
   Database2,
   getSqliteDatabasePath2,
@@ -31,10 +32,10 @@ import {
   messageFtsOrdinalRangeIsMapped2,
   getMessageFtsRowidMapBackfillProgress2,
   deleteUnmappedMessageFtsRows2
-} from "./index-579m1751.js";
+} from "./index-8a2wvrda.js";
 import {
   deleteChunkEmbedBackoffForSession2
-} from "./index-vx6f7wff.js";
+} from "./index-wb2t932e.js";
 import {
   closeQuietly,
   TAG_TOMBSTONE_OWNER_PREFIX,
@@ -46,7 +47,7 @@ import {
 } from "./index-w1avzkdt.js";
 import {
   cleanUserText2
-} from "./index-gqjxy2p7.js";
+} from "./index-cm9e52mb.js";
 import {
   sameProjectDirectory
 } from "./index-wrr9rp9a.js";
@@ -73,51 +74,6 @@ import {
 } from "node:fs";
 import { basename, dirname, join as join2 } from "node:path";
 
-// ../plugin/src/shared/bounded-session-map.ts
-class BoundedSessionMap {
-  maxEntries;
-  store = new Map;
-  constructor(maxEntries) {
-    if (!Number.isFinite(maxEntries) || maxEntries < 1) {
-      throw new Error(`BoundedSessionMap: maxEntries must be >= 1, got ${maxEntries}`);
-    }
-    this.maxEntries = maxEntries;
-  }
-  get(sessionId) {
-    const value = this.store.get(sessionId);
-    if (value === undefined)
-      return;
-    this.store.delete(sessionId);
-    this.store.set(sessionId, value);
-    return value;
-  }
-  peek(sessionId) {
-    return this.store.get(sessionId);
-  }
-  has(sessionId) {
-    return this.store.has(sessionId);
-  }
-  set(sessionId, value) {
-    if (this.store.has(sessionId)) {
-      this.store.delete(sessionId);
-    } else if (this.store.size >= this.maxEntries) {
-      const oldest = this.store.keys().next().value;
-      if (oldest !== undefined)
-        this.store.delete(oldest);
-    }
-    this.store.set(sessionId, value);
-  }
-  delete(sessionId) {
-    return this.store.delete(sessionId);
-  }
-  clear() {
-    this.store.clear();
-  }
-  get size() {
-    return this.store.size;
-  }
-}
-
 // ../plugin/src/shared/storage-file-mutex.ts
 import { execFileSync } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
@@ -2141,4 +2097,4 @@ async function sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, openSource,
   }));
 }
 
-export { BoundedSessionMap, LkgRecoveryFenceError, clearLkgFenceProcessState, takeLkgRecoveryLockSweepPage, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, gaDatabasePath, V2StoreReader, readSessionActivity, observeSessionActivity, backfillSessionActivity, deleteSessionScopedRows, clearCompressionDepth, clearCompressionDepthRange, cleanSearchText, keywordRelevance, matchedSearchSnippet, MESSAGE_INDEX_MAX_FTS_BYTES2, messageIndexSkipKey2, toMessageIndexSource2, getMessageIndexSourceIdentity2, isMessageIndexSourceCurrent2, getLastIndexedOrdinal2, getIndexedMessageCorpusSize2, markMessageIndexDirty2, getMessageIndexReconciliationStartOrdinal2, isMessageIndexReconciledThrough2, deleteIndexedMessage2, clearIndexedMessagesInTransaction2, clearIndexedMessages2, getIndexableContent2, indexSingleMessage2, indexMessagesAfterOrdinal2, indexSourcesAfterOrdinal2, sweepOrphanedOpenCodeMessageIndexesCooperatively2 };
+export { LkgRecoveryFenceError, clearLkgFenceProcessState, takeLkgRecoveryLockSweepPage, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, gaDatabasePath, V2StoreReader, readSessionActivity, observeSessionActivity, backfillSessionActivity, deleteSessionScopedRows, clearCompressionDepth, clearCompressionDepthRange, cleanSearchText, keywordRelevance, matchedSearchSnippet, MESSAGE_INDEX_MAX_FTS_BYTES2, messageIndexSkipKey2, toMessageIndexSource2, getMessageIndexSourceIdentity2, isMessageIndexSourceCurrent2, getLastIndexedOrdinal2, getIndexedMessageCorpusSize2, markMessageIndexDirty2, getMessageIndexReconciliationStartOrdinal2, isMessageIndexReconciledThrough2, deleteIndexedMessage2, clearIndexedMessagesInTransaction2, clearIndexedMessages2, getIndexableContent2, indexSingleMessage2, indexMessagesAfterOrdinal2, indexSourcesAfterOrdinal2, sweepOrphanedOpenCodeMessageIndexesCooperatively2 };

package/dist/{index-ftvm2acc.js → index-zn2xdbjy.js}

@@ -22,7 +22,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory,
   managedAuthorityNoteRow
-} from "./index-3c3ztwgc.js";
+} from "./index-0dr64gsy.js";
 import {
   isKnownAutocommit
 } from "./index-w1avzkdt.js";
@@ -34,7 +34,7 @@ import {
   loadCompartmentChunkEmbeddingsForSearch2,
   peekCompartmentChunkSearchPool2,
   warmCompartmentChunkSearchPool2
-} from "./index-vx6f7wff.js";
+} from "./index-wb2t932e.js";
 import {
   recordEmbeddingMeasurement,
   saveCommitEmbedding,
@@ -52,7 +52,7 @@ import {
   getProjectEmbeddingSnapshot2,
   embedTextForProject2,
   embedItemsForProject2
-} from "./index-w1twp2kp.js";
+} from "./index-00c5a49f.js";
 import {
   saveEmbeddingIfHashMatches,
   getProjectEmbeddings2
@@ -62,7 +62,7 @@ import {
   isEmbeddingEnabled,
   embedText,
   ensureMemoryEmbeddings2
-} from "./index-pe5gz5c4.js";
+} from "./index-nxq2srg9.js";
 import {
   getMemorySelectColumns2,
   isMemoryRow2,
@@ -82,7 +82,7 @@ import {
   keywordRelevance,
   matchedSearchSnippet,
   getIndexedMessageCorpusSize2
-} from "./index-wgmhk91m.js";
+} from "./index-zmg1td73.js";
 import {
   MESSAGE_FTS_SESSION_FILTER_SQL,
   withMessageFtsSessionFilter