@cortexkit/opencode-magic-context 0.49.17 → 0.49.19

package/dist/{index-aabzay3h.js → index-3esx8tkf.js}

@@ -144,7 +144,7 @@ import {
   getDroppedTagsByNumbers2,
   getMaxDroppedTagNumber2,
   getTagById2
-} from "./index-hqhm3wke.js";
+} from "./index-cf74k5ak.js";
 import {
   observeTemporalDecisions,
   stableStringify
@@ -179,6 +179,8 @@ import {
 } from "./index-kq82mtg0.js";
 import {
   expandToolPart,
+  takeCoveredInstructionRows,
+  cloneKeepingCoveredInstructionMarks,
   estimateTrueRawMessageTokens,
   isTextPart,
   toolPartHasUserAnswer,
@@ -268,6 +270,7 @@ import {
   snapshotTrailingBlankSourceDecisions,
   projectOpencodeReasoningBudgetCutoff,
   resolveKeepReasoningTokens,
+  reasoningStepCost,
   reasoningBudgetCutoff,
   describeFinalWireTail,
   estimateMessageTokens,
@@ -297,7 +300,7 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./index-p7m7j0cp.js";
+} from "./index-9zcsy3hh.js";
 import {
   getMeasuredToolDefinitionTokens
 } from "./index-ke416mdc.js";
@@ -314,7 +317,7 @@ import {
   runSqliteOptimize,
   openDatabase,
   openCurrentDatabase
-} from "./index-fb2qxs2y.js";
+} from "./index-jrr131e0.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
@@ -333,7 +336,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./index-qn7xstt2.js";
+} from "./index-63k48rv9.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -367,6 +370,7 @@ import {
   retryPendingSessionCleanups,
   retryPendingRustSessionCleanupsForProject,
   requestPendingMaterialization,
+  hasPendingMaterializationOrigin,
   clearPendingMaterialization,
   recordSystemPromptForRequest,
   recordHeldHeadForRequest,
@@ -393,6 +397,8 @@ import {
   hasProcessLocalLkgProof,
   lkgDirtyRevision,
   rememberLkgDirtyRevision,
+  readPersistedLkgUntaggedInputIds,
+  persistLkgUntaggedInputIds,
   noteLkgRecoveryPrefix,
   readLkgRecoveryPrefix,
   noteLkgHealthyPrefix,
@@ -493,6 +499,7 @@ import {
   onNoteTrigger,
   clearNoteNudgeTriggerAndCooldown,
   resetNoteNudgeCooldownOnly,
+  omitIncompleteFileTokenTotals,
   RECOVERY_NO_HEAD_LIMIT,
   deriveProtectedTailTokenTarget,
   selectPerRunCap,
@@ -504,7 +511,7 @@ import {
   snapRangeToCompartments,
   getActiveCompartmentRun,
   startCompartmentAgent
-} from "./index-a7c4r5re.js";
+} from "./index-rpxdjkm0.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -562,7 +569,7 @@ import {
   indexSingleMessage2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexesCooperatively2
-} from "./index-cwzfcbtq.js";
+} from "./index-se4m2g6w.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode,
@@ -606,7 +613,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./index-v8awdgvd.js";
+} from "./index-3h4dp9wb.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -670,7 +677,7 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./index-vrzjhftj.js";
+} from "./index-dxmq29t1.js";
 import {
   flushIgnoredMessages2,
   clearIgnoredMessages2,
@@ -680,7 +687,7 @@ import {
 import {
   setRecompStarting2,
   setRecompTerminal2
-} from "./index-nkpmm9q8.js";
+} from "./index-c1p88z1y.js";
 import {
   makeToolCompositeKey,
   searchMessageHistoryOffThread,
@@ -699,6 +706,7 @@ import {
   resolveTodowriteAvailability,
   canConsumeDeferredOnThisPass,
   hasReclaimRide,
+  reclaimRidePermitted,
   reclaimRideLabel,
   captureOpencodeReasoningBudgetStatus,
   reasoningBudgetStatusLine,
@@ -734,7 +742,7 @@ import {
   abortSessionFailClosed2,
   evaluateEmergencyFailClosed2,
   runPostTransformPhase2
-} from "./index-4yt7dtf4.js";
+} from "./index-jhghdnsm.js";
 import {
   ANNOUNCEMENT_VERSION2,
   ANNOUNCEMENT_FEATURES2,
@@ -747,7 +755,7 @@ import {
 } from "./index-fmsr7v69.js";
 import {
   renderSearchArchiveOffThread2
-} from "./index-kmdj7dsq.js";
+} from "./index-edmpdxcw.js";
 import {
   COMPACTION_ENABLED_PATH,
   isDreamerRunnable,
@@ -2855,6 +2863,7 @@ async function applyCuesThroughModule(args, chunk, manifestText, signal) {
 }
 
 // src/features/magic-context/dreamer/hidden-single-shot.ts
+var DREAMER_FIRST_OUTPUT_TIMEOUT_MS = 90000;
 async function runHiddenSingleShotPrompt(args) {
   const system = withContentLanguageDirective(args.system, args.language);
   const opening = args.executor.open({
@@ -2896,6 +2905,7 @@ async function runHiddenSingleShotPrompt(args) {
     }, {
       transport: Object.assign((request) => args.executor.attempt(handle, request), { childSessionId: handle.childSessionId }),
       timeoutMs: args.timeoutMs,
+      ...args.firstOutputTimeoutMs !== undefined ? { firstOutputTimeoutMs: args.firstOutputTimeoutMs } : {},
       ...args.signal ? { signal: args.signal } : {},
       fallbackModels: args.fallbackModels,
       callContext: args.callContext,
@@ -3550,6 +3560,7 @@ async function classifyOneChunk(args, chunk, anchors, sliceMs, signal) {
       }, {
         transport: Object.assign((request) => executor.attempt(opened, request), { childSessionId: opened.childSessionId }),
         timeoutMs: sliceMs,
+        firstOutputTimeoutMs: args.firstOutputTimeoutMs ?? DREAMER_FIRST_OUTPUT_TIMEOUT_MS,
         signal,
         fallbackModels: args.fallbackModels,
         callContext: "dreamer:classify-memories",
@@ -7218,6 +7229,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
         model: args.model,
         fallbackModels: args.fallbackModels,
         timeoutMs: sliceMs,
+        firstOutputTimeoutMs: args.firstOutputTimeoutMs ?? DREAMER_FIRST_OUTPUT_TIMEOUT_MS,
         signal,
         onOpened: () => {
           stage = "prompt";
@@ -7272,6 +7284,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
         onBudgetUpdate
       }),
       timeoutMs: sliceMs,
+      firstOutputTimeoutMs: args.firstOutputTimeoutMs ?? DREAMER_FIRST_OUTPUT_TIMEOUT_MS,
       signal,
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:map-memories",
@@ -9205,6 +9218,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         fallbackModels: args.fallbackModels,
         language: args.language,
         timeoutMs: sliceMs,
+        firstOutputTimeoutMs: args.firstOutputTimeoutMs ?? DREAMER_FIRST_OUTPUT_TIMEOUT_MS,
         signal: batchSignal,
         onFailureOutput: (completion) => {
           failedCompletion = completion;
@@ -9262,6 +9276,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         onBudgetUpdate
       }),
       timeoutMs: sliceMs,
+      firstOutputTimeoutMs: args.firstOutputTimeoutMs ?? DREAMER_FIRST_OUTPUT_TIMEOUT_MS,
       signal: batchSignal,
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:verify",
@@ -14076,8 +14091,9 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
   const canClearReasoning = reasoningProjection?.canClearReasoning ?? modelAcceptsEmptyContent(reasoningProjection?.providerID);
   const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession2(db, sessionId), keepReasoningTokens, sessionMeta.clearedReasoningThroughTag, canClearReasoning, reasoningProjection?.budgetCutoff, eligiblePendingDropTagIds);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
+  const ridePermitted = reclaimRide !== undefined && (reclaimRide.permission ? reclaimRidePermitted(reclaimRide, reclaimRide.permission) : hasReclaimRide(reclaimRide));
   const rideLabel = reclaimRide ? reclaimRideLabel(reclaimRide) : "ride=none";
-  const dropsCanLand = reclaimRide !== undefined && hasReclaimRide(reclaimRide);
+  const dropsCanLand = ridePermitted;
   const forceMaterializationPercentage = escalationBands(executeThresholdPercentage).forceMaterializationPercentage;
   if (usage.percentage >= forceMaterializationPercentage) {
     if (dropsCanLand && projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
@@ -16293,7 +16309,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-z3ecszx6.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-999jj4bc.js"));
     const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-6ve0e8p4.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
@@ -16378,7 +16394,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-j7d7ry5b.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-whhbjmaz.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -17304,7 +17320,9 @@ var PASS_DEGRADATION_EFFECTS = {
   "trailing-blank-decision-exception": "changes-request",
   "proactive-thinking-strip-persistence-failure": "changes-request",
   "reasoning-removal-read-failure": "changes-request",
-  "reasoning-removal-persistence-failure": "changes-request"
+  "reasoning-removal-persistence-failure": "changes-request",
+  "host-instruction-retention-read-failure": "changes-request",
+  "host-instruction-retention-persistence-failure": "changes-request"
 };
 function degradationChangesRequest(site) {
   return PASS_DEGRADATION_EFFECTS[site] === "changes-request";
@@ -20175,6 +20193,24 @@ function contextUsagePassSnapshot(sessionMeta) {
     } : null
   };
 }
+function savedProviderReadingForPass(input) {
+  const persisted = input.persisted;
+  if (!persisted)
+    return null;
+  const { percentage, inputTokens } = persisted.usage;
+  if (!Number.isFinite(percentage) || percentage <= 0 || !Number.isFinite(inputTokens) || inputTokens <= 0) {
+    return null;
+  }
+  if (!(input.lastResponseTime > 0) || input.cacheExpired)
+    return null;
+  if (persisted.lastObservedModelKey === null || input.currentModelKey === undefined || input.currentModelKey.length === 0 || piModelRefToCanonical(persisted.lastObservedModelKey) !== piModelRefToCanonical(input.currentModelKey)) {
+    return null;
+  }
+  if (typeof input.contextLimit !== "number" || !(input.contextLimit > 0) || persisted.lastUsageContextLimit !== input.contextLimit) {
+    return null;
+  }
+  return { percentage, inputTokens };
+}
 function resolveUnknownUsageFromWireEstimate(input) {
   if (input.usage.inputTokens > 0 || !input.pricedPass)
     return input.usage;
@@ -20303,6 +20339,7 @@ function beginSystemDateRequest(history, sessionId, stage, turnId, identity) {
       systemDone: false,
       messagesSeen: false,
       permitted: undefined,
+      signedThinkingKept: undefined,
       ambiguous: identity === undefined && (turnId === undefined || sameTurn)
     };
     const blocked = [...requests.values()].filter((candidate) => !candidate.explicit && candidate.ambiguous && !(candidate.systemSeen && candidate.messagesSeen) && candidate.turnId === turnId).length;
@@ -20325,6 +20362,10 @@ function systemDateRefreshPermission(history, request) {
   const current = state(history, request);
   return current?.ambiguous ? undefined : current?.permitted;
 }
+function systemDateSignedThinkingKept(history, request) {
+  const current = state(history, request);
+  return current?.ambiguous ? undefined : current?.signedThinkingKept;
+}
 function waitForSystemDateRefresh(history, request, apply) {
   const current = state(history, request);
   if (!current)
@@ -20339,7 +20380,7 @@ function retire(history, current) {
   if (unpairable) {
     const apply = current.waiting;
     current.waiting = undefined;
-    apply?.(false);
+    apply?.(false, undefined);
   }
   const channel = channels.get(history);
   const requests = channel?.get(current.sessionId);
@@ -20347,14 +20388,15 @@ function retire(history, current) {
   if (requests?.size === 0)
     channel?.delete(current.sessionId);
 }
-function finishSystemDateRefresh(history, request, permitted) {
+function finishSystemDateRefresh(history, request, permitted, signedThinkingKept) {
   const current = state(history, request);
   if (!current)
     return;
   current.permitted = current.ambiguous ? false : permitted;
+  current.signedThinkingKept = current.ambiguous ? undefined : signedThinkingKept;
   const apply = current.waiting;
   current.waiting = undefined;
-  apply?.(current.permitted);
+  apply?.(current.permitted, current.signedThinkingKept);
   retire(history, current);
 }
 function finishSystemDateHook(history, request) {
@@ -23527,6 +23569,101 @@ function createRustModeTransform(deps, options) {
   return adapter;
 }
 
+// src/hooks/magic-context/signed-thinking-hold.ts
+var HEAVY_REASONING_TOKENS = 1500;
+var HEAVY_REASONING_WINDOW_STEPS = 15;
+var HOLD_CAP_POINTS = 10;
+var REASONING_TYPES = new Set(["reasoning", "thinking"]);
+function role(message) {
+  if (!isRecord(message))
+    return;
+  return isRecord(message.info) ? message.info.role : message.role;
+}
+function parts(message) {
+  if (!isRecord(message))
+    return [];
+  if (Array.isArray(message.parts))
+    return message.parts;
+  return Array.isArray(message.content) ? message.content : [];
+}
+function recordedReasoningTokens(message) {
+  if (!isRecord(message))
+    return;
+  const info = isRecord(message.info) ? message.info : undefined;
+  const candidates = [];
+  if (info && isRecord(info.tokens))
+    candidates.push(info.tokens.reasoning);
+  if (isRecord(message.usage)) {
+    candidates.push(message.usage.reasoning, message.usage.reasoningTokens);
+  }
+  for (const value of candidates) {
+    if (typeof value === "number" && Number.isFinite(value) && value > 0)
+      return value;
+  }
+  return;
+}
+function stepReasoningTokens(message, estimateTextTokens) {
+  let text = "";
+  let opaque = false;
+  for (const part of parts(message)) {
+    if (!isRecord(part))
+      continue;
+    const type = String(part.type ?? part.kind);
+    if (type === "redacted_thinking" || part.redacted === true) {
+      opaque = true;
+      continue;
+    }
+    if (!REASONING_TYPES.has(type))
+      continue;
+    const body = typeof part.thinking === "string" ? part.thinking : typeof part.text === "string" ? part.text : "";
+    if (body.length > 0)
+      text += body;
+    else
+      opaque = true;
+  }
+  if (!text && !opaque)
+    return 0;
+  return reasoningStepCost(recordedReasoningTokens(message), text ? estimateTextTokens(text) : 0, opaque);
+}
+function decideSignedThinkingHold(args) {
+  const capPercentage = args.executeThresholdPercentage + HOLD_CAP_POINTS;
+  let heavyStepsBack = null;
+  let heavyStepTokens = 0;
+  const start = latestAssistantTurnStart(args.messages);
+  let stepsBack = 0;
+  for (let index = args.messages.length - 1;index >= start; index--) {
+    const message = args.messages[index];
+    if (role(message) !== "assistant" || parts(message).length === 0)
+      continue;
+    stepsBack++;
+    if (stepsBack > HEAVY_REASONING_WINDOW_STEPS)
+      break;
+    const tokens = stepReasoningTokens(message, args.estimateTextTokens);
+    if (tokens > HEAVY_REASONING_TOKENS) {
+      heavyStepsBack = stepsBack;
+      heavyStepTokens = tokens;
+      break;
+    }
+  }
+  if (heavyStepsBack === null)
+    return {
+      held: false,
+      reason: "no_recent_heavy_reasoning",
+      heavyStepsBack,
+      heavyStepTokens,
+      capPercentage
+    };
+  if (!(args.usagePercentage < capPercentage))
+    return { held: false, reason: "above_cap", heavyStepsBack, heavyStepTokens, capPercentage };
+  return {
+    held: true,
+    reason: "heavy_reasoning",
+    heavyStepsBack,
+    heavyStepTokens,
+    capPercentage
+  };
+}
+
 // src/hooks/magic-context/temporal-served-projection.ts
 function readLkgTemporalDecisions(db, sessionId, runtime) {
   const slot = getInMemorySlot(sessionId) ?? loadPersistedLkgSlot(db, sessionId);
@@ -23750,7 +23887,7 @@ async function runCompartmentPhaseImpl(args) {
     justAwaitedPublication = activeRun.published;
     published = published || activeRun.published;
     const historyReprepareShouldBust = activeRun.published && args.deferredHistoryRefreshSessions.has(args.sessionId);
-    pendingCompartmentInjection = prepareCompartmentInjection(args.db, args.resolvedSessionId, args.messages, historyReprepareShouldBust, args.projectPath, args.injectionBudgetTokens, args.experimentalTemporalAwareness);
+    pendingCompartmentInjection = prepareCompartmentInjection(args.db, args.resolvedSessionId, args.messages, historyReprepareShouldBust, args.coveredInstructions, args.projectPath, args.injectionBudgetTokens, args.experimentalTemporalAwareness);
     if (historyReprepareShouldBust) {
       rebuiltHistoryThisPass = true;
     }
@@ -24050,7 +24187,8 @@ function createTransform(deps) {
     const startTime = performance.now();
     const historianRun = deps.resolveHistorianRun?.();
     const messages = output.messages;
-    const originalForThinkingFit = messages.some((message) => message.parts.some((part) => isRecord(part) && ["reasoning", "thinking", "redacted_thinking"].includes(String(part.type)))) ? structuredClone(messages) : null;
+    const originalForThinkingFit = messages.some((message) => message.parts.some((part) => isRecord(part) && ["reasoning", "thinking", "redacted_thinking"].includes(String(part.type)))) ? cloneKeepingCoveredInstructionMarks(messages) : null;
+    const coveredHostInstructions = takeCoveredInstructionRows(messages);
     const passOutcome = createPassOutcome();
     const tSessionId = performance.now();
     const sessionId = findSessionId(messages);
@@ -24066,6 +24204,11 @@ function createTransform(deps) {
     const tLkgEntry = performance.now();
     const lkgInput = deps.transformMode === "rust" ? [] : projectEntry(sessionId, messages);
     const recovery = deps.compactionOff || deps.transformMode === "rust" ? {} : readLkgRecoveryPrefix(sessionId, lkgInput, messages, deps.db);
+    const persistedUntaggedInputIds = deps.compactionOff || deps.transformMode === "rust" ? [] : readPersistedLkgUntaggedInputIds(deps.db, sessionId);
+    const untaggedReplayIds = new Set([
+      ...recovery.prefix?.untaggedInputIds ?? [],
+      ...persistedUntaggedInputIds
+    ]);
     logTransformTiming(sessionId, "lkg.entryProjection", tLkgEntry, deps.transformMode === "rust" || !entryReuse ? undefined : `reused=${entryReuse.reused} retained=${entryReuse.retained} retainedBytes=${entryReuse.retainedBytes}`);
     const resolvedSessionId = sessionId;
     const runNotificationParams = (sid) => {
@@ -24248,8 +24391,8 @@ function createTransform(deps) {
         return true;
       }
     })();
-    let activeThinkingPrefixHold = activeThinkingTurn && isPrefixBoundThinkingModel(activeThinkingModel?.providerID, activeThinkingModel?.modelID);
-    let freezeM0M1 = unresolvedDirectoryHold || activeThinkingPrefixHold;
+    let activeThinkingPrefixHold = false;
+    let freezeM0M1 = unresolvedDirectoryHold;
     const compartmentDirectory = sessionDirectory;
     const historianRunnable = deps.historianRunnable !== false;
     const canRunCompartments = fullFeatureMode && !compactionOff && historianRunnable && (deps.client !== undefined || deps.hiddenCompletionExecutor !== undefined) && compartmentDirectory.length > 0;
@@ -24377,13 +24520,7 @@ function createTransform(deps) {
     }
     const resolvedProviderID = modelForBudget?.providerID;
     activeThinkingTurn ||= hasActiveAnthropicThinkingTurn(messages, resolvedProviderID, modelForBudget?.modelID);
-    activeThinkingPrefixHold ||= activeThinkingTurn && isPrefixBoundThinkingModel(resolvedProviderID, modelForBudget?.modelID);
-    freezeM0M1 ||= activeThinkingPrefixHold;
-    if (freezeM0M1 && prefixHoldLogTurnIds.get(sessionId) !== currentTurnId) {
-      prefixHoldLogTurnIds.set(sessionId, currentTurnId);
-      const reason = activeThinkingPrefixHold ? "active thinking turn (prefix-bound model)" : "session directory unresolved";
-      sessionLog2(sessionId, `m[0]/m[1] frozen: ${reason}; replaying the frozen prefix and deferring any rebuild`);
-    }
+    const signedThinkingPrefixBound = activeThinkingTurn && (isPrefixBoundThinkingModel(activeThinkingModel?.providerID, activeThinkingModel?.modelID) || isPrefixBoundThinkingModel(resolvedProviderID, modelForBudget?.modelID));
     const canUseEmptySentinels = modelAcceptsEmptyContent(resolvedProviderID);
     const protectedThinkingMessages = activeThinkingTurn || isAnthropicFamilyRoute(resolvedProviderID, modelForBudget?.modelID) ? latestAssistantTurnMessages(messages) : new Set;
     const resolvedContextLimit = modelForBudget ? resolveTrustedContextLimit(modelForBudget.providerID, modelForBudget.modelID, {
@@ -24437,6 +24574,29 @@ function createTransform(deps) {
     const effectiveExecuteThresholdPercentage = executeThresholdDetail.percentage;
     sessionLog2(sessionId, `transform threshold: model=${currentModelKeyForBoundary ?? "unknown"} matchedModel=${executeThresholdDetail.matchedKey ?? "scalar"} mode=${executeThresholdDetail.mode} threshold=${effectiveExecuteThresholdPercentage}% proactiveFloor=${getProactiveCompartmentTriggerPercentage(effectiveExecuteThresholdPercentage)}%`);
     const { forceMaterializationPercentage } = escalationBands(effectiveExecuteThresholdPercentage);
+    let holdProseRatio;
+    const signedThinkingHold = signedThinkingPrefixBound ? decideSignedThinkingHold({
+      messages,
+      usagePercentage: contextUsageEarly.percentage,
+      executeThresholdPercentage: effectiveExecuteThresholdPercentage,
+      estimateTextTokens: (text) => {
+        holdProseRatio ??= sessionDecisionCalibration(db, sessionId).proseRatio;
+        return estimateTokens(text) * holdProseRatio;
+      }
+    }) : null;
+    activeThinkingPrefixHold = signedThinkingPrefixBound && (compactionOff || signedThinkingHold?.held === true);
+    freezeM0M1 ||= activeThinkingPrefixHold;
+    const prefixHoldLogKey = signedThinkingHold ? `${currentTurnId}:${signedThinkingHold.reason}:${signedThinkingHold.heavyStepsBack ?? "none"}` : freezeM0M1 ? `${currentTurnId}:directory` : null;
+    if (prefixHoldLogKey !== null && prefixHoldLogTurnIds.get(sessionId) !== prefixHoldLogKey) {
+      prefixHoldLogTurnIds.set(sessionId, prefixHoldLogKey);
+      if (signedThinkingHold) {
+        sessionLog2(sessionId, `signed thinking hold: held=${signedThinkingHold.held} reason=${signedThinkingHold.reason} heavyStepsBack=${signedThinkingHold.heavyStepsBack ?? "none"} heavyStepTokens=${signedThinkingHold.heavyStepTokens} usage=${contextUsageEarly.percentage.toFixed(1)}% cap=${signedThinkingHold.capPercentage}%`);
+      }
+      if (freezeM0M1) {
+        const reason = activeThinkingPrefixHold ? compactionOff ? "active thinking turn in compaction-off mode (prefix-bound model)" : "recent heavy reasoning in the active thinking turn (prefix-bound model)" : "session directory unresolved";
+        sessionLog2(sessionId, `m[0]/m[1] frozen: ${reason}; replaying the frozen prefix and deferring any rebuild`);
+      }
+    }
     const persistedUsageFreshForBoundary = persistedUsageBeforeResets && Date.now() - persistedUsageBeforeResets.updatedAt <= 10 * 60 * 1000 && (persistedUsageBeforeResets.lastObservedModelKey === null || currentModelKeyForBoundary === undefined || piModelRefToCanonical(persistedUsageBeforeResets.lastObservedModelKey) === piModelRefToCanonical(currentModelKeyForBoundary)) && (resolvedContextLimit === undefined || persistedUsageBeforeResets.lastUsageContextLimit === 0 || persistedUsageBeforeResets.lastUsageContextLimit === resolvedContextLimit) ? persistedUsageBeforeResets.usage : null;
     const boundaryUsageForProtectedTail = persistedUsageFreshForBoundary ?? contextUsageEarly;
     const boundaryUsageSource = persistedUsageFreshForBoundary ? "persisted" : "live";
@@ -24623,8 +24783,14 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         }, {
           hardFold: false,
           force: contextUsageEarly.percentage >= forceMaterializationPercentage && (contextUsageEarly.percentage >= 95 || getEmergencyInputSample(db, sessionId) === 0),
-          explicitFlush: deps.pendingMaterializationSessions.has(sessionId),
-          publishedHistory: isCacheBusting
+          explicitFlush: hasPendingMaterializationOrigin(deps.pendingMaterializationSessions, sessionId, "user_flush"),
+          publishedHistory: isCacheBusting,
+          permission: {
+            signedThinkingHold: activeThinkingPrefixHold,
+            firstRender: false,
+            idleExpiry: false,
+            emergency: contextUsageEarly.percentage >= forceMaterializationPercentage
+          }
         }, pendingDropEligibility.read(sessionId, dropProjectionKey()));
         if (triggerResult.shouldFire) {
           sessionLog2(sessionId, `compartment trigger: firing (reason=${triggerResult.reason})`);
@@ -24644,7 +24810,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const messagesBeforeInitialPrepare = isCacheBusting && deferredHistoryWasPendingAtPassStart ? [...messages] : null;
     if (fullFeatureMode && !compactionOff) {
       const tInj = performance.now();
-      pendingCompartmentInjection = prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, projectIdentity, deps.memoryConfig?.injectionBudgetTokens, deps.experimentalTemporalAwareness);
+      pendingCompartmentInjection = prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, coveredHostInstructions, projectIdentity, deps.memoryConfig?.injectionBudgetTokens, deps.experimentalTemporalAwareness);
       if (messagesBeforeInitialPrepare) {
         const skippedVisibleMessages = pendingCompartmentInjection?.skippedVisibleMessages ?? 0;
         trimmedMessagesAtCompactionBoundary = messagesBeforeInitialPrepare.slice(0, skippedVisibleMessages);
@@ -24676,10 +24842,11 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     let taggingSucceeded = false;
     let recoveryBatch = null;
     let recoveryNormalized = false;
-    const normalizeRecoveryTail = recovery.prefix ? () => {
+    const untaggedReplayTailServed = !!recovery.prefix || untaggedReplayIds.size > 0 && messages.some((message) => untaggedReplayIds.has(message.info.id ?? ""));
+    const normalizeRecoveryTail = untaggedReplayTailServed ? () => {
       if (recoveryNormalized)
         return;
-      const tail = messages.filter((message) => recovery.prefix?.untaggedInputIds.has(message.info.id ?? ""));
+      const tail = messages.filter((message) => untaggedReplayIds.has(message.info.id ?? ""));
       const tagged = tagMessages(sessionId, tail, deps.tagger, db, {
         skipPrefixInjection: !ctxReduceCallable,
         servedMessages: messages,
@@ -24705,7 +24872,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         const messagesForTagging = messagesBeforeInitialPrepare && hiddenMessagesAtCompactionSeam.length > 0 ? messagesBeforeInitialPrepare : messages;
         const canAdoptScopedToolSweep = isCacheBusting || canConsumeDeferredEarly;
         const scopedToolSweep = useScopedToolSweep(db, sessionId, canAdoptScopedToolSweep) ? true : createPreAdoptionToolSweepResolver(db, sessionId);
-        const result = tagMessages(sessionId, recovery.prefix ? messagesForTagging.filter((message) => !recovery.prefix?.untaggedInputIds.has(message.info.id ?? "")) : messagesForTagging, deps.tagger, db, {
+        const result = tagMessages(sessionId, untaggedReplayIds.size > 0 ? messagesForTagging.filter((message) => !untaggedReplayIds.has(message.info.id ?? "")) : messagesForTagging, deps.tagger, db, {
           skipPrefixInjection,
           scopedToolSweep,
           servedMessages: messages,
@@ -24818,6 +24985,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       fallbackModels: historianRun?.fallbackModels ?? deps.fallbackModels,
       compartmentDirectory,
       messages,
+      coveredInstructions: coveredHostInstructions,
       pendingCompartmentInjection,
       fallbackModelId,
       projectPath: projectIdentity,
@@ -24889,30 +25057,53 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       bustReason: calibrationBustReason,
       onAdopt: (message) => sessionLog2(sessionId, message)
     });
+    let contextUsageFromEstimate = false;
     if (contextUsage.inputTokens <= 0 && protectionCacheBustingPass) {
+      const overflowRecoveryPass = usagePercentageSynthetic || emergencyRecoveryArmed;
+      const savedProviderReading = overflowRecoveryPass ? null : savedProviderReadingForPass({
+        persisted: persistedUsageBeforeResets,
+        currentModelKey: currentModelKeyForBoundary ?? (hardModelKey || undefined),
+        contextLimit: resolvedContextLimit,
+        lastResponseTime: sessionMeta.lastResponseTime,
+        cacheExpired: hardCacheExpired
+      });
+      let pressureEstimate;
       try {
-        const pressureEstimate = estimateFinalWireInputTokens({
+        pressureEstimate = estimateFinalWireInputTokens({
           messages,
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
           agentName: notificationParams.agent
         });
+      } catch (error) {
+        sessionLog2(sessionId, `transform: wire-estimate pressure fallback unavailable: ${getErrorMessage(error)}`);
+      }
+      const usableHard = windowGeometry?.usableHard;
+      const countPercentage = pressureEstimate?.pressureTokens !== undefined && Number.isFinite(pressureEstimate.pressureTokens) && typeof usableHard === "number" && usableHard > 0 ? pressureEstimate.pressureTokens / usableHard * 100 : 0;
+      const grewPastSavedReading = savedProviderReading !== null && countPercentage >= 95 && countPercentage > savedProviderReading.percentage;
+      if (savedProviderReading && !grewPastSavedReading) {
+        contextUsage = {
+          inputTokens: savedProviderReading.inputTokens,
+          percentage: Math.max(contextUsage.percentage, savedProviderReading.percentage)
+        };
+        sessionLog2(sessionId, `transform: unknown provider usage; using saved provider reading for priced pass inputTokens=${contextUsage.inputTokens} percentage=${contextUsage.percentage.toFixed(1)} countPercentage=${countPercentage.toFixed(1)}`);
+      } else if (pressureEstimate) {
+        const percentageBeforeEstimate = contextUsage.percentage;
         contextUsage = resolveUnknownUsageFromWireEstimate({
           usage: contextUsage,
           pricedPass: true,
-          wireEstimateTokens: pressureEstimate.tokens,
+          wireEstimateTokens: overflowRecoveryPass ? pressureEstimate.tokens : pressureEstimate.pressureTokens,
           wireEstimateTrusted: pressureEstimate.trusted,
           providerProvenInputTokens: providerProvenInputForRecovery,
           providerProvenLimitTokens: providerProvenLimitForRecovery,
-          usableHardLimit: windowGeometry?.usableHard
+          usableHardLimit: usableHard
         });
         if (contextUsage.inputTokens > 0) {
           const usedProviderInput = !pressureEstimate.trusted && providerProvenLimitForRecovery !== undefined && providerProvenInputForRecovery !== undefined && contextUsage.inputTokens >= providerProvenInputForRecovery;
-          sessionLog2(sessionId, `transform: unknown provider usage; using ${usedProviderInput ? "provider-proven input" : "wire estimate"} for priced pass inputTokens=${contextUsage.inputTokens} percentage=${contextUsage.percentage.toFixed(1)} trusted=${pressureEstimate.trusted} wireTokens=${pressureEstimate.tokens}`);
+          contextUsageFromEstimate = !overflowRecoveryPass && !usedProviderInput && !usagePercentageSynthetic && contextUsage.percentage > percentageBeforeEstimate;
+          sessionLog2(sessionId, `transform: unknown provider usage; using ${usedProviderInput ? "provider-proven input" : "wire estimate"} for priced pass inputTokens=${contextUsage.inputTokens} percentage=${contextUsage.percentage.toFixed(1)} trusted=${pressureEstimate.trusted} wireTokens=${pressureEstimate.tokens} pressureTokens=${pressureEstimate.pressureTokens}${grewPastSavedReading ? ` grewPastSavedReading=${savedProviderReading?.percentage.toFixed(1)}` : ""}`);
         }
-      } catch (error) {
-        sessionLog2(sessionId, `transform: wire-estimate pressure fallback unavailable: ${getErrorMessage(error)}`);
       }
     }
     const protectionUsableSoft = windowGeometry?.usableSoft ?? boundaryContextLimit;
@@ -24953,6 +25144,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       activeAgent,
       batch,
       contextUsage,
+      contextUsageFromEstimate,
       usableWindow: resolvedContextLimit ?? 0,
       schedulerDecision,
       schedulerDeferReason,
@@ -24998,6 +25190,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       emergencyCeilingTokens,
       pendingCompartmentInjection,
       prefixTrimSourceOrder,
+      coveredHostInstructions,
       hiddenMessagesAtCompactionSeam,
       trimmedMessagesAtCompactionBoundary,
       didMutateFromFlushedStatuses,
@@ -25037,7 +25230,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       postTransformResult.bustedThisPass = true;
     passOutcome.markFinalized();
     const finalWireTail = describeFinalWireTail(messages);
-    const signedFitPreviouslyRefused = !compactionOff && getMergedReasoningStrippedIds(db, sessionId).has(SIGNED_FIT_REFUSED_MARKER);
+    const signedFitPreviouslyRefused = !compactionOff && activeThinkingPrefixHold && getMergedReasoningStrippedIds(db, sessionId).has(SIGNED_FIT_REFUSED_MARKER);
     let finalWireEstimate;
     if (postTransformResult.bustedThisPass) {
       try {
@@ -25198,7 +25391,12 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     if (!finalWireEstimate) {
       sessionLog2(sessionId, `transform: final-wire telemetry estimate=unavailable trusted=false conversation=unknown tools=unknown system=unknown toolDefinitions=unknown tail=${finalWireTail}`);
     }
-    finishSystemDateRefresh(deps.historyRefreshSessions, dateRequest, postTransformResult.bustedThisPass && !activeThinkingPrefixHold || postTransformResult.thinkingReleasedForFit === true);
+    if (!compactionOff) {
+      const stillUntagged = untaggedReplayTailServed && !recoveryNormalized ? [...untaggedReplayIds] : [];
+      if (JSON.stringify([...new Set(stillUntagged)].sort()) !== JSON.stringify([...new Set(persistedUntaggedInputIds)].sort()) && !persistLkgUntaggedInputIds(db, sessionId, stillUntagged))
+        throw new Error("Cannot persist the last-good untagged-message record");
+    }
+    finishSystemDateRefresh(deps.historyRefreshSessions, dateRequest, postTransformResult.bustedThisPass && !activeThinkingPrefixHold && postTransformResult.openTurnSignedThinkingKept !== true || postTransformResult.thinkingReleasedForFit === true, postTransformResult.openTurnSignedThinkingKept === true);
     if (activeThinkingPrefixHold && !postTransformResult.thinkingReleasedForFit && sessionMeta.cachedM0Bytes != null && sessionMeta.cachedM1Bytes != null) {
       recordHeldHeadForRequest(sessionId, currentLkgRequestIdentity(sessionId), (ownsHistory) => deferDeliveredSystemRefresh(deps, sessionId, ownsHistory));
     }
@@ -25299,7 +25497,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     });
     if (uncachedMessageIds.length > 0) {
       try {
-        storedByMessage = getActiveTagTokenTotalsByMessage2(db, sessionId, uncachedMessageIds);
+        storedByMessage = omitIncompleteFileTokenTotals(db, sessionId, messages.flatMap((message) => message.info.id ? [{ id: message.info.id, parts: message.parts }] : []), getActiveTagTokenTotalsByMessage2(db, sessionId, uncachedMessageIds));
       } catch {
         storedByMessage = new Map;
       }
@@ -25734,11 +25932,14 @@ function createSystemPromptHashHandler(deps) {
     const stableCandidateHash = systemPromptFingerprint(stableCandidate, promptSurface.preset);
     const contentOrPresetChanged = hasPersistedHash && stableCandidateHash !== previousHash;
     const rewritePermission = systemDateRefreshPermission(deps.historyRefreshSessions, dateRequest);
+    const signedThinkingKept = systemDateSignedThinkingKept(deps.historyRefreshSessions, dateRequest);
+    const idleDateMayAdvance = idleCacheExpired && signedThinkingKept !== true;
+    const prefixBoundModel = isPrefixBoundThinkingModel(liveModel?.providerID, liveModel?.modelID);
     let deferredDateRefresh = false;
-    if (currentDate && stickyDate && currentDate !== stickyDate && isCacheBusting && !idleCacheExpired && !contentOrPresetChanged && !requestMessagesFinal) {
+    if (currentDate && stickyDate && currentDate !== stickyDate && (idleCacheExpired ? prefixBoundModel : isCacheBusting) && !contentOrPresetChanged && !requestMessagesFinal) {
       const liveElements = [...output.system];
-      deferredDateRefresh = waitForSystemDateRefresh(deps.historyRefreshSessions, dateRequest, (permitted) => {
-        if (!permitted) {
+      deferredDateRefresh = waitForSystemDateRefresh(deps.historyRefreshSessions, dateRequest, (permitted, keptSignedThinking) => {
+        if (!permitted && !(idleCacheExpired && keptSignedThinking !== true)) {
           deps.systemPromptRefreshSessions.add(sessionId);
           return;
         }
@@ -25762,7 +25963,7 @@ function createSystemPromptHashHandler(deps) {
         }
       });
     }
-    const dateMayAdvance = idleCacheExpired || contentOrPresetChanged || isCacheBusting && !deferredDateRefresh && (dateRequest ? rewritePermission === true : rewritePermission !== false);
+    const dateMayAdvance = idleDateMayAdvance && !deferredDateRefresh || contentOrPresetChanged || isCacheBusting && !deferredDateRefresh && (dateRequest ? rewritePermission === true : rewritePermission !== false);
     if (currentDate && !stickyDate) {
       stickyDateBySession.set(sessionId, currentDate);
     } else if (currentDate && stickyDate && currentDate !== stickyDate) {
@@ -26166,7 +26367,8 @@ function tryMessagesTransformLkgReplay(args) {
             sessionId,
             entry,
             messages: replay.messages,
-            ...keys
+            ...keys,
+            db
           }))
             return false;
           retirePendingSystemPromptDelivery(sessionId);
@@ -26798,6 +27000,7 @@ function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
 }
 
 // src/tools/ctx-expand/tools.ts
+var CTX_EXPAND_RUST_TAG_REFUSAL = "Tag lookup isn't available on this session: its §N§ tags are numbered by the Rust transform engine and ctx_expand cannot resolve those numbers, so no content was returned. Expand by message instead: ctx_expand(message=<ordinal>) or ctx_expand(start=<ordinal>, end=<ordinal>), using ordinals from a <session-history> heading or a ctx_search hit.";
 var ctxExpandArgsShape = {
   tag: tool.schema.union([tool.schema.number(), tool.schema.string()]).optional().describe("Tag number from a §N§ tag or a [dropped §N§] placeholder, not a message ordinal. Returns that one item in full. Use alone."),
   start: tool.schema.number().optional().describe("First message ordinal of the range (a <session-history> heading's start, or a ctx_search hit), not a tag number."),
@@ -26820,9 +27023,12 @@ function createCtxExpandTool(deps) {
         message: "number"
       });
       const sessionId = toolContext.sessionID;
+      const mode = resolveCtxExpandMode(args, "positive");
+      if (mode.kind === "tag" && deps.transformMode === "rust") {
+        return CTX_EXPAND_RUST_TAG_REFUSAL;
+      }
       if (!await prepareRawSessionOrdinals2(sessionId))
         return "Session ordinals are warming in the background. Retry ctx_expand shortly; no approximate ordinal was served.";
-      const mode = resolveCtxExpandMode(args, "positive");
       if (mode.kind === "error") {
         return mode.message;
       }