@cortexkit/opencode-magic-context 0.49.19 → 0.49.21

package/dist/{index-9zcsy3hh.js → index-mnhcdfxg.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-pavzsdc6.js";
 import {
   sessionLog2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   UNKNOWN_FIT_RATIO,
   resolveDecisionCalibration,
@@ -13,6 +13,7 @@ import {
 } from "./index-1zx87sdm.js";
 import {
   stripWellFormedLeadingTagPrefix,
+  stripPersistedAssistantText,
   stripTagPrefix,
   isRecord,
   estimateImageTokensFromDataUrl,
@@ -23,7 +24,7 @@ import {
   TAG_SELECT_COLUMNS2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-cf74k5ak.js";
+} from "./index-whcgcfrv.js";
 import {
   OMO_INTERNAL_INITIATOR_MARKER,
   isSystemDirective,
@@ -41,18 +42,18 @@ import {
   formatBlock,
   compactTextForSummary,
   mergeCommitHashes
-} from "./index-c5pytzne.js";
+} from "./index-b88dwwrh.js";
 import {
   prepareCachedStatement2
-} from "./index-beht37jy.js";
+} from "./index-gzy5w8ya.js";
 import {
   stableStringify
-} from "./index-bp5083x2.js";
+} from "./index-x9k3mqrf.js";
 import {
   renderToolTemplate,
   resolveModelConfigValue,
   deriveDefaultProtectedTokens
-} from "./index-wgypt3cs.js";
+} from "./index-nxrsns5x.js";
 import {
   readRawSessionMessagesFromDb2,
   readRawSessionMessagePageFromDb2,
@@ -69,25 +70,25 @@ import {
   readRawSeedTailFromDb2,
   readRawSessionBoundaryEndpointsFromDb2,
   prewarmRawSessionOrdinalsForDb
-} from "./index-s734jcsr.js";
+} from "./index-jfem3dgz.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getRawSessionMessageCountFromDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-kq82mtg0.js";
+} from "./index-ksq50rg0.js";
 import {
   getToolDefinitionMeasurementSignature,
   getLargestMeasuredToolDefinitionTokens,
   getMeasuredToolDefinitionTokens
-} from "./index-ke416mdc.js";
+} from "./index-j76ah6d7.js";
 import {
   canonicalModelIdentity,
   piModelRefToCanonical
 } from "./index-avwt563y.js";
 import {
   logSlowWriteTransaction
-} from "./index-k29z4aqh.js";
+} from "./index-t5pck3ss.js";
 
 // src/shared/hidden-zen-read.ts
 function isToolFreeHiddenAgent(agent) {
@@ -3944,6 +3945,13 @@ function getCompactionMarkerHealth(db, sessionId, now = Date.now()) {
     pendingSinceMs: firstFailedAt
   };
 }
+function executeReclaimFromReplay(raw) {
+  try {
+    return parseReplayDocument(raw).executeReclaim;
+  } catch {
+    return;
+  }
+}
 function loadPostprocessReplaySnapshot(db, sessionId) {
   const row = db.prepare(`SELECT stale_reduce_stripped_ids, processed_image_stripped_ids,
                     stripped_placeholder_ids, note_nudge_anchors,
@@ -3958,6 +3966,14 @@ function loadPostprocessReplaySnapshot(db, sessionId) {
   const todoPermissionDenied = row?.todo_permission_denied === 1 ? true : row?.todo_permission_denied === 0 ? false : null;
   const thinkingBindingRecoveryTarget = row?.thinking_binding_recovery_target;
   return {
+    servedShapeRepair: (() => {
+      try {
+        return parseReplayDocument(row?.trailing_blank_decisions).servedShapeRepair;
+      } catch {
+        return;
+      }
+    })(),
+    executeReclaim: executeReclaimFromReplay(row?.trailing_blank_decisions),
     staleReduceStrippedIds: new Set(parseStrippedBlob(row?.stale_reduce_stripped_ids)),
     processedImageStrippedIds: new Set(parseProcessedImageMarkers(row?.processed_image_stripped_ids).keys()),
     processedImageMarkers: parseProcessedImageMarkers(row?.processed_image_stripped_ids),
@@ -4645,6 +4661,120 @@ function createProcessedImageEligibility(messages, messageTagNumbers, options) {
   };
 }
 
+// src/hooks/magic-context/served-shape-repair.ts
+var sources = new WeakMap;
+function markServedShapeRepair(info, parts, requiresPermission = false) {
+  const merged = new Map((sources.get(info) ?? []).map((part) => [part.index, part]));
+  for (const part of parts)
+    merged.set(part.index, { ...part, requiresPermission });
+  if (merged.size)
+    sources.set(info, [...merged.values()]);
+}
+function parseDecisions(value) {
+  if (value === undefined)
+    return {};
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    throw new Error("Invalid served-shape replay decisions");
+  for (const entries of Object.values(value)) {
+    if (!Array.isArray(entries) || entries.some((entry) => !entry || !Number.isSafeInteger(entry.index) || entry.index < 0 || typeof entry.text !== "string" || !entry.text.trim()))
+      throw new Error("Invalid served-shape text decision");
+  }
+  return value;
+}
+function readDecisions(db, sessionID) {
+  return parseDecisions(readReplayEnvelope(db, sessionID).servedShapeRepair);
+}
+function prepareServedShapeRepair(db, sessionID, messages, readPreviouslyServed, snapshot) {
+  let decisions = snapshot ? parseDecisions(snapshot.servedShapeRepair) : readDecisions(db, sessionID);
+  const collectPending = () => {
+    const pending = {};
+    for (const message of messages) {
+      const id = message.info.id;
+      if (typeof id !== "string")
+        continue;
+      const candidates = (sources.get(message.info) ?? []).filter(({ index }) => !decisions[id]?.some((part) => part.index === index));
+      if (candidates.length)
+        pending[id] = candidates;
+    }
+    return pending;
+  };
+  const pending = collectPending();
+  let previouslyServed = null;
+  try {
+    const evidence = Object.keys(pending).length ? readPreviouslyServed?.() : null;
+    if (Array.isArray(evidence))
+      previouslyServed = evidence;
+  } catch {}
+  const provenUnserved = new Set;
+  let needsRebuild = false;
+  for (const id of Object.keys(pending)) {
+    if (!previouslyServed)
+      continue;
+    const matches = previouslyServed.filter((value) => {
+      if (!value || typeof value !== "object")
+        return false;
+      const message = value;
+      return message.info?.id === id;
+    });
+    if (!matches.length)
+      provenUnserved.add(id);
+    const previous = matches.length === 1 ? matches[0] : undefined;
+    needsRebuild ||= previous !== undefined && Array.isArray(previous.parts) && pending[id].some(({ index }) => {
+      const part = previous.parts[index];
+      return part?.type === "text" && part.text === "";
+    });
+  }
+  return {
+    pending: Object.keys(pending).length > 0,
+    needsRebuild,
+    get messageIDs() {
+      return new Set(Object.keys(decisions));
+    },
+    apply(allowed) {
+      const eligible = {};
+      for (const [id, candidates] of Object.entries(collectPending())) {
+        const parts = candidates.filter(({ requiresPermission }) => allowed || !requiresPermission && !needsRebuild && provenUnserved.has(id)).map(({ index, text }) => ({ index, text }));
+        if (parts.length)
+          eligible[id] = parts;
+      }
+      if (Object.keys(eligible).length) {
+        if (!updateReplayDocument(db, sessionID, (doc) => {
+          doc.version = 2;
+          const current = parseDecisions(doc.servedShapeRepair);
+          for (const [id, parts] of Object.entries(eligible)) {
+            current[id] = [
+              ...current[id] ?? [],
+              ...parts.filter(({ index }) => !current[id]?.some((part) => part.index === index))
+            ];
+          }
+          doc.servedShapeRepair = current;
+          return true;
+        }))
+          throw new Error("Could not persist served-shape repair");
+        decisions = readDecisions(db, sessionID);
+      }
+      let changed = 0;
+      for (const message of messages) {
+        const id = message.info.id;
+        if (typeof id !== "string")
+          continue;
+        for (const decision of decisions[id] ?? []) {
+          const part = message.parts[decision.index];
+          if (part?.type !== "text")
+            continue;
+          if (typeof part.text !== "string" || stripPersistedAssistantText(part.text).trim())
+            continue;
+          if (part.text !== decision.text) {
+            part.text = decision.text;
+            changed++;
+          }
+        }
+      }
+      return changed;
+    }
+  };
+}
+
 // src/hooks/magic-context/strip-content.ts
 var MARKER_ONLY_PATTERN = /^(?:(?:§\d+§|\[dropped(?: §\d+§)?\]|\[cleared\])\s*)+$/;
 function isMarkerOnlyText(text) {
@@ -4799,9 +4929,11 @@ function replayClearedReasoning(messages, reasoningByMessage, messageTagNumbers,
   }
   return cleared;
 }
-function replayStrippedInlineThinking(messages, messageTagNumbers, persistedWatermark) {
+function replayStrippedInlineThinking(messages, messageTagNumbers, persistedWatermark, captureRepair = false) {
   if (persistedWatermark <= 0)
     return 0;
+  if (captureRepair)
+    captureInlineThinkingRepairs(messages, messageTagNumbers, persistedWatermark);
   let stripped = 0;
   for (const message of messages) {
     if (message.info.role !== "assistant")
@@ -4875,8 +5007,24 @@ function stripClearedReasoning(messages) {
   return stripped;
 }
 var INLINE_THINKING_PATTERN = /<(?:thinking|think)>[\s\S]*?<\/(?:thinking|think)>\s*/g;
-function stripInlineThinking(messages, messageTagNumbers, cutoff) {
+function captureInlineThinkingRepairs(messages, messageTagNumbers, watermark) {
+  for (const message of messages) {
+    const tag = messageTagNumbers.get(message) ?? 0;
+    if (message.info.role !== "assistant" || tag <= 0 || tag > watermark)
+      continue;
+    for (const [index, part] of message.parts.entries()) {
+      if (!isRecord(part) || part.type !== "text" || typeof part.text !== "string")
+        continue;
+      const cleaned = part.text.replace(INLINE_THINKING_PATTERN, "");
+      if (cleaned !== part.text && !cleaned.trim())
+        markServedShapeRepair(message.info, [{ index, text: "[cleared]" }], true);
+    }
+  }
+}
+function stripInlineThinking(messages, messageTagNumbers, cutoff, captureRepair = false) {
   const ageCutoff = cutoff;
+  if (captureRepair)
+    captureInlineThinkingRepairs(messages, messageTagNumbers, cutoff);
   let stripped = 0;
   for (const message of messages) {
     if (message.info.role !== "assistant")
@@ -7346,4 +7494,4 @@ function readRawSessionSeedTail2(sessionId, boundaryId, onQuery) {
   });
 }
 
-export { isToolFreeHiddenAgent, TOOL_USE_DISABLED, ZEN_READ_AGENT_SUFFIX, needsBlockedRead, withBlockedReadInstruction, rememberV1HiddenRun, shapeV1HiddenMessage, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, markCoveredInstructionRow, isCoveredInstructionRow, takeCoveredInstructionRows, cloneKeepingCoveredInstructionMarks, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, createDroppedInputToolExecuteBeforeHook, isEditTool, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, MAX_EXECUTE_THRESHOLD, escalationBands, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, readEpochFloorSnapshot, getProtectionWindowForSession, SESSION_META_SELECT_COLUMNS, META_COLUMNS, BOOLEAN_META_KEYS, NULL_BIND_META_KEYS, isSessionMetaRow, getDefaultSessionMeta, ensureSessionMetaRow, toSessionMeta, persistCachedM0, clearCachedM0M1, clearCachedM0, withReplayEnvelopeSnapshot, invalidateReplayEnvelopeSnapshot, isRustMarkerAdmissionFenced, setRustMarkerAdmissionFence, ReplayDocumentError, readReplayEnvelope, readReplayDocument, updateReplayDocument, writeReplayDocument, isEmergencyRecoveryArmed, isProviderOverflowReconfirmed, isProviderOverflowFailClosedProven, getEmergencyRecoveryArmedAt, describeProtectedTailDrainBudgetSkip, loadPersistedUsage, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, resetProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getProtectedTailDrainBudgetSkip, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, getPersistedReasoningWatermark, setPersistedReasoningWatermark, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, getChannel2NudgeClaim, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, removeNoteNudgeAnchorByMessageId, queueAutoSearchHintDecisionRetirement, flushAutoSearchHintDecisionRetirement, removeAutoSearchHintDecisionByMessageId, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, setNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, parseStrippedPlaceholderState, serializeStrippedPlaceholderState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, removeStrippedPlaceholderId, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, COMPACTION_OFF_THINKING_FROZEN_PREFIX, compactionOffThinkingFrozenId, compactionOffFrozenThinkingIds, getThinkingBindingRecoveryTarget, armThinkingBindingRecovery, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, getStaleReduceStrippedIds, addStaleReduceStrippedIds, getProcessedImageStrippedIds, parseProcessedImageMarkers, serializeProcessedImageMarkers, getProcessedImageMarkers, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, setPendingCompactionMarkerState, replacePendingCompactionMarkerStateIf, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, logPiCompactionMarkerClear, getSessionsWithPendingMarker, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, getReasoningRemovalState, addRemovedReasoningIds, markDropLeavesReasoning, detectThinkingBindingMismatch, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, isSentinel, replaySentinelByMessageIds, isInActiveAnthropicTurn, activeAnthropicTurnStart, hasAnthropicReasoning, stripSystemInjectedMessages, stripDroppedPlaceholderMessages, replayClearedReasoning, replayStrippedInlineThinking, clearOldReasoning, stripClearedReasoning, stripInlineThinking, findReasoningBearingAssistantIds, findLatestAssistantReasoningMutationExemptMessage, snapshotTrailingBlankSourceDecisions, findTrailingBlankDecisionCandidates, applyFrozenTrailingBlankDecisions, stripReasoningFromAssistantIds, findMergedReasoningStripDecisions, stripReasoningFromMergedAssistants, getEmptyImageParts, stripProcessedImages, projectOpencodeReasoningBudgetCutoff, DEFAULT_KEEP_REASONING_TOKENS, resolveKeepReasoningTokens, reasoningStepCost, reasoningBudgetCutoff, reasoningTextAndOpaque, opencodeReasoningBudgetCutoff, describeFinalWireTail, estimatePartImageTokens, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, estimateAppendedWireTokens, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, 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 { isToolFreeHiddenAgent, TOOL_USE_DISABLED, ZEN_READ_AGENT_SUFFIX, needsBlockedRead, withBlockedReadInstruction, rememberV1HiddenRun, shapeV1HiddenMessage, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, markCoveredInstructionRow, isCoveredInstructionRow, takeCoveredInstructionRows, cloneKeepingCoveredInstructionMarks, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, createDroppedInputToolExecuteBeforeHook, isEditTool, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, MAX_EXECUTE_THRESHOLD, escalationBands, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, readEpochFloorSnapshot, getProtectionWindowForSession, SESSION_META_SELECT_COLUMNS, META_COLUMNS, BOOLEAN_META_KEYS, NULL_BIND_META_KEYS, isSessionMetaRow, getDefaultSessionMeta, ensureSessionMetaRow, toSessionMeta, persistCachedM0, clearCachedM0M1, clearCachedM0, withReplayEnvelopeSnapshot, invalidateReplayEnvelopeSnapshot, isRustMarkerAdmissionFenced, setRustMarkerAdmissionFence, ReplayDocumentError, readReplayEnvelope, readReplayDocument, updateReplayDocument, writeReplayDocument, isEmergencyRecoveryArmed, isProviderOverflowReconfirmed, isProviderOverflowFailClosedProven, getEmergencyRecoveryArmedAt, describeProtectedTailDrainBudgetSkip, loadPersistedUsage, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, resetProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getProtectedTailDrainBudgetSkip, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, getPersistedReasoningWatermark, setPersistedReasoningWatermark, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, getChannel2NudgeClaim, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, removeNoteNudgeAnchorByMessageId, queueAutoSearchHintDecisionRetirement, flushAutoSearchHintDecisionRetirement, removeAutoSearchHintDecisionByMessageId, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, setNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, parseStrippedPlaceholderState, serializeStrippedPlaceholderState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, removeStrippedPlaceholderId, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, COMPACTION_OFF_THINKING_FROZEN_PREFIX, compactionOffThinkingFrozenId, compactionOffFrozenThinkingIds, getThinkingBindingRecoveryTarget, armThinkingBindingRecovery, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, getStaleReduceStrippedIds, addStaleReduceStrippedIds, getProcessedImageStrippedIds, parseProcessedImageMarkers, serializeProcessedImageMarkers, getProcessedImageMarkers, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, setPendingCompactionMarkerState, replacePendingCompactionMarkerStateIf, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, logPiCompactionMarkerClear, getSessionsWithPendingMarker, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, getReasoningRemovalState, addRemovedReasoningIds, markDropLeavesReasoning, detectThinkingBindingMismatch, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, isSentinel, replaySentinelByMessageIds, isInActiveAnthropicTurn, activeAnthropicTurnStart, hasAnthropicReasoning, markServedShapeRepair, prepareServedShapeRepair, stripSystemInjectedMessages, stripDroppedPlaceholderMessages, replayClearedReasoning, replayStrippedInlineThinking, clearOldReasoning, stripClearedReasoning, captureInlineThinkingRepairs, stripInlineThinking, findReasoningBearingAssistantIds, findLatestAssistantReasoningMutationExemptMessage, snapshotTrailingBlankSourceDecisions, findTrailingBlankDecisionCandidates, applyFrozenTrailingBlankDecisions, stripReasoningFromAssistantIds, findMergedReasoningStripDecisions, stripReasoningFromMergedAssistants, getEmptyImageParts, stripProcessedImages, projectOpencodeReasoningBudgetCutoff, DEFAULT_KEEP_REASONING_TOKENS, resolveKeepReasoningTokens, reasoningStepCost, reasoningBudgetCutoff, reasoningTextAndOpaque, opencodeReasoningBudgetCutoff, describeFinalWireTail, estimatePartImageTokens, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, estimateAppendedWireTokens, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, 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-se4m2g6w.js → index-mnnkgq0q.js}

@@ -5,7 +5,7 @@ import {
   tagRevisionKey,
   tagIdentityRevisionKey,
   deleteTagIdentityRevisions
-} from "./index-bp5083x2.js";
+} from "./index-x9k3mqrf.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
@@ -15,37 +15,37 @@ import {
 import {
   isPidAlive,
   readProcessStartTime
-} from "./index-nj7yykkx.js";
+} from "./index-c7phnbvk.js";
 import {
   removeSystemReminders,
   removeNestedBlocks,
   hasMeaningfulUserText2,
   extractTexts2
-} from "./index-c5pytzne.js";
+} from "./index-b88dwwrh.js";
 import {
   Database2,
   getSqliteDatabasePath2,
   prepareCachedStatement2,
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2
-} from "./index-beht37jy.js";
+} from "./index-gzy5w8ya.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration
 } from "./index-58e3y90n.js";
 import {
   cleanUserText2
-} from "./index-9zcsy3hh.js";
+} from "./index-mnhcdfxg.js";
 import {
   recordMessageFtsRowid2,
   recordIndexedMessageTime2,
   messageFtsOrdinalRangeIsMapped2,
   getMessageFtsRowidMapBackfillProgress2,
   deleteUnmappedMessageFtsRows2
-} from "./index-a6mc0v4d.js";
+} from "./index-x6cbrv9h.js";
 import {
-  deleteChunkEmbedBackoffForSession
-} from "./index-b5vqckbw.js";
+  deleteChunkEmbedBackoffForSession2
+} from "./index-m32esgmj.js";
 import {
   sameProjectDirectory
 } from "./index-knvkbfvh.js";
@@ -54,7 +54,7 @@ import {
 } from "./index-8ajstryz.js";
 import {
   logSlowWriteTransaction
-} from "./index-k29z4aqh.js";
+} from "./index-t5pck3ss.js";
 import {
   ensurePrivateStorageDirectorySync,
   writeStorageFileSync,
@@ -214,7 +214,14 @@ import { createHash as createHash4 } from "node:crypto";
 
 // src/hooks/magic-context/lkg-recovery-fence.ts
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
-import { lstatSync, readdirSync as readdirSync2, readFileSync as readFileSync2, rmdirSync, rmSync as rmSync2 } from "node:fs";
+import {
+  lstatSync,
+  opendirSync,
+  readdirSync as readdirSync2,
+  readFileSync as readFileSync2,
+  rmdirSync,
+  rmSync as rmSync2
+} from "node:fs";
 import { basename, dirname, join as join2 } from "node:path";
 
 // src/shared/storage-file-mutex.ts
@@ -357,6 +364,58 @@ var lkgServedArrayDigest = hash;
 function lkgRecoveryFencePath(sessionId) {
   return join2(getMagicContextStorageDir(), "lkg-recovery-fences", `${hash(sessionId)}.json`);
 }
+var lockSweepDirectory;
+function closeLkgLockSweepDirectory() {
+  lockSweepDirectory?.dir.closeSync();
+  lockSweepDirectory = undefined;
+}
+function takeLkgRecoveryLockSweepPage(maxEntries = 200) {
+  const path = join2(getMagicContextStorageDir(), "lkg-recovery-fences");
+  if (lockSweepDirectory?.path !== path)
+    closeLkgLockSweepDirectory();
+  const names = [];
+  try {
+    lockSweepDirectory ??= { path, dir: opendirSync(path) };
+    for (let i = 0;i < Math.min(200, Math.max(1, maxEntries)); i++) {
+      const entry = lockSweepDirectory.dir.readSync();
+      if (!entry) {
+        closeLkgLockSweepDirectory();
+        break;
+      }
+      if (entry.isDirectory() && /^[a-f0-9]{64}\.json\.locks$/.test(entry.name))
+        names.push(entry.name);
+    }
+  } catch {
+    closeLkgLockSweepDirectory();
+  }
+  return names;
+}
+function sweepEmptyLkgRecoveryLockDirectories(names, retainedSessionIds) {
+  if (!durableFencesSupported())
+    return 0;
+  const retainedHashes = new Set(Array.from(retainedSessionIds, hash));
+  const root = join2(getMagicContextStorageDir(), "lkg-recovery-fences");
+  let removed = 0;
+  for (const name of names.slice(0, 200)) {
+    if (!/^[a-f0-9]{64}\.json\.locks$/.test(name) || retainedHashes.has(name.slice(0, 64)))
+      continue;
+    const path = join2(root, name);
+    try {
+      try {
+        lstatSync(path.slice(0, -".locks".length));
+        continue;
+      } catch (error) {
+        if (error.code !== "ENOENT")
+          continue;
+      }
+      if (!lstatSync(path).isDirectory())
+        continue;
+      rmdirSync(path);
+      removed++;
+    } catch {}
+  }
+  return removed;
+}
 function metadata(slot) {
   return [
     slot.inputIdSeq,
@@ -934,6 +993,11 @@ class V2StoreReaderPool {
     this.idleWaiters.clear();
   }
 }
+function messageTimesQuery(count) {
+  return `SELECT id, COALESCE(time_created, json_extract(data, '$.time.created')) AS created,
+                   json_extract(data, '$.time.completed') AS completed
+            FROM session_message WHERE +session_id = ? AND id IN (${Array.from({ length: count }, () => "?").join(",")})`;
+}
 
 class V2StoreReader {
   path;
@@ -1030,6 +1094,12 @@ class V2StoreReader {
       return typeof row?.count === "number" ? row.count : 0;
     });
   }
+  messageCountAfterSequence(sessionID, after, through) {
+    const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
+    const row = this.prepare(`SELECT COUNT(*) AS count FROM session_message
+             WHERE session_id = ? AND seq > ? AND seq <= ? AND type IN (${rawTypes})`).get(sessionID, after, through, ...RAW_MESSAGE_TYPES);
+    return typeof row?.count === "number" ? row.count : 0;
+  }
   sessionDirectoryPage(afterSessionID, limit) {
     const rows = this.prepare(`SELECT id, COALESCE(directory, '') AS directory FROM session_v2
                  WHERE id > ? ORDER BY id ASC LIMIT ?`).all(afterSessionID ?? "", limit);
@@ -1157,9 +1227,7 @@ class V2StoreReader {
     const times = new Map;
     for (let offset = 0;offset < ids.length; offset += 500) {
       const batch = ids.slice(offset, offset + 500);
-      const rows = this.prepare(`SELECT id, COALESCE(time_created, json_extract(data, '$.time.created')) AS created,
-                        json_extract(data, '$.time.completed') AS completed
-                 FROM session_message WHERE session_id = ? AND id IN (${batch.map(() => "?").join(",")})`).all(sessionID, ...batch);
+      const rows = this.prepare(messageTimesQuery(batch.length)).all(sessionID, ...batch);
       for (const row of rows)
         times.set(row.id, {
           created: typeof row.created === "number" ? row.created : undefined,
@@ -1469,7 +1537,7 @@ function deleteSessionScopedRows(db, sessionIds, harness, options = {}) {
       fallback.run(tagTombstoneOwnerKey(id, getHarness2()), getHarness2(), ...tagTombstoneOwnerRange(id));
   }
   for (const sessionId of deletableSessionIds)
-    deleteChunkEmbedBackoffForSession(db, sessionId);
+    deleteChunkEmbedBackoffForSession2(db, sessionId);
   for (const definition of SESSION_SCOPED_TABLES) {
     if (definition.table === "message_history_fts") {
       cleanupStatement(db, `DELETE FROM message_history_fts
@@ -1520,7 +1588,7 @@ function deleteSessionScopedRowsSlice(db, sessionId, harness) {
   cleanupStatement(db, "INSERT OR IGNORE INTO schema_migrations_meta(key,value) VALUES (?,?)").run(tagTombstoneOwnerKey(sessionId, harness), harness);
   let remaining = SESSION_CLEANUP_SLICE_ROWS;
   const started = performance.now();
-  remaining -= deleteChunkEmbedBackoffForSession(db, sessionId, remaining);
+  remaining -= deleteChunkEmbedBackoffForSession2(db, sessionId, remaining);
   if (remaining <= 0)
     return { complete: false, deleted: 0 };
   for (const definition of SESSION_SCOPED_TABLES) {
@@ -2034,14 +2102,20 @@ function harnessSupportsOpenCodeOrphanSweep(harness) {
   return harness === "opencode" || harness === "opencode2";
 }
 function getMessageHistoryOrphanSweepState(db, harness) {
-  return db.prepare("SELECT cursor_session_id, last_swept_at FROM message_history_orphan_sweep WHERE harness = ?").get(harness) ?? {};
+  const state = db.prepare("SELECT cursor_session_id, last_swept_at FROM message_history_orphan_sweep WHERE harness = ?").get(harness) ?? {};
+  if (harness === "opencode2") {
+    if (!state.cursor_session_id?.startsWith("session_v2:"))
+      return {};
+    return { ...state, cursor_session_id: state.cursor_session_id.slice("session_v2:".length) };
+  }
+  return state;
 }
 function persistMessageHistoryOrphanSweepState(db, cursor, lastSweptAt, harness) {
   db.prepare(`INSERT INTO message_history_orphan_sweep (harness, cursor_session_id, last_swept_at)
           VALUES (?, ?, ?)
          ON CONFLICT(harness) DO UPDATE SET
              cursor_session_id = excluded.cursor_session_id,
-             last_swept_at = excluded.last_swept_at`).run(harness, cursor, lastSweptAt);
+             last_swept_at = excluded.last_swept_at`).run(harness, harness === "opencode2" ? `session_v2:${cursor}` : cursor, lastSweptAt);
 }
 function getOpenCodeSessionScopedCandidateSourceSql(harness) {
   const sources = SESSION_SCOPED_TABLES.filter((definition) => definition.harnessScoped === true).map((definition) => {
@@ -2089,13 +2163,14 @@ function* sweepOrphanedOpenCodeMessageIndexesInBackground(db, openReadableOpenCo
   let v2Reader;
   try {
     let sessionExists;
+    let liveIds;
     if (harness === "opencode2") {
       try {
         const path = getSqliteDatabasePath2(openCodeDb);
         if (!path)
           throw new Error("OpenCode 2 source has no durable path");
         v2Reader = new V2StoreReader(path);
-        const liveIds = new Set(v2Reader.sessionIds());
+        liveIds = new Set(v2Reader.sessionIds());
         if (liveIds.size === 0)
           throw new Error("OpenCode 2 source has no sessions");
         sessionExists = (id) => liveIds.has(id);
@@ -2104,9 +2179,26 @@ function* sweepOrphanedOpenCodeMessageIndexesInBackground(db, openReadableOpenCo
         return { status: "source_unavailable", scanned: 0, deleted: 0, cursor };
       }
     } else {
+      liveIds = new Set(openCodeDb.prepare("SELECT id FROM session").all().map((row) => row.id));
       const query = openCodeDb.prepare("SELECT 1 FROM session WHERE id = ? LIMIT 1");
       sessionExists = (id) => !!query.get(id);
     }
+    if (options.fenceLockNames?.length) {
+      const retainedIds = new Set(liveIds);
+      const sources = SESSION_SCOPED_TABLES.map((def) => `SELECT session_id FROM ${def.table}${def.extraPredicate ? ` WHERE ${def.extraPredicate}` : ""}`);
+      for (const row of db.prepare(sources.join(" UNION ")).all()) {
+        if (typeof row.session_id === "string")
+          retainedIds.add(row.session_id);
+      }
+      for (const row of db.prepare("SELECT key FROM schema_migrations_meta WHERE key >= ? AND key < ?").all(TAG_TOMBSTONE_OWNER_PREFIX, "tag_revision_owner;")) {
+        try {
+          const id = JSON.parse(row.key.slice(TAG_TOMBSTONE_OWNER_PREFIX.length, row.key.lastIndexOf(":")));
+          if (typeof id === "string")
+            retainedIds.add(id);
+        } catch {}
+      }
+      sweepEmptyLkgRecoveryLockDirectories(options.fenceLockNames, retainedIds);
+    }
     const cutoff = now - safetyAgeMs;
     const candidateSourceSql = getOpenCodeSessionScopedCandidateSourceSql(harness);
     const candidates = db.prepare(`SELECT session_id
@@ -2198,4 +2290,4 @@ async function sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, openSource,
   }));
 }
 
-export { BoundedSessionMap, advanceSessionActivity, observeSessionActivity, backfillSessionActivity, clearCompressionDepth, clearCompressionDepthRange, LkgRecoveryFenceError, clearLkgFenceProcessState, lkgServedArrayDigest, hasCleanLkgRecoveryFence, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, prepareLkgCaptureFence, certifyCommittedLkgCapture, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, cleanSearchText, keywordRelevance, matchedSearchSnippet, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, V2StoreReader, deleteSessionScopedRows, MESSAGE_INDEX_MAX_FTS_BYTES2, messageIndexSkipKey2, toMessageIndexSource2, getMessageIndexSourceIdentity2, isMessageIndexSourceCurrent2, getLastIndexedOrdinal2, getIndexedMessageCorpusSize2, markMessageIndexDirty2, getMessageIndexReconciliationStartOrdinal2, isMessageIndexReconciledThrough2, deleteIndexedMessage2, clearIndexedMessagesInTransaction2, clearIndexedMessages2, getIndexableContent2, indexSingleMessage2, indexMessagesAfterOrdinal2, indexSourcesAfterOrdinal2, sweepOrphanedOpenCodeMessageIndexesCooperatively2 };
+export { BoundedSessionMap, advanceSessionActivity, observeSessionActivity, backfillSessionActivity, clearCompressionDepth, clearCompressionDepthRange, LkgRecoveryFenceError, clearLkgFenceProcessState, lkgServedArrayDigest, takeLkgRecoveryLockSweepPage, hasCleanLkgRecoveryFence, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, prepareLkgCaptureFence, certifyCommittedLkgCapture, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, cleanSearchText, keywordRelevance, matchedSearchSnippet, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, V2StoreReader, deleteSessionScopedRows, 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-p5y3k4g7.js → index-nda0zgna.js}

@@ -1,6 +1,6 @@
 import {
   resolveDreamerTaskModel2
-} from "./index-8cd2j99z.js";
+} from "./index-5kym00ag.js";
 import {
   isDreamerRunnable
 } from "./index-ksdyrrav.js";
@@ -187,6 +187,7 @@ function buildDreamTaskRuntimeConfigs2(dreamer, harness, language, smartNotesEna
       schedule: resolved.schedule ?? "",
       model: resolved.primary,
       fallbackModels: resolved.fallbacks,
+      modelConfigKey: resolved.primary?.sourceConfigKey ?? resolved.fallbacks[0]?.sourceConfigKey,
       thinkingLevel: harness === "pi" ? resolved.primary?.qualifier : undefined,
       language,
       timeoutMinutes: resolved.timeoutMinutes ?? 20,