@cortexkit/opencode-magic-context 0.49.16 → 0.49.18

package/dist/v2/{context-acw1nhv8.js → context-f2xh7ba4.js}

@@ -6,7 +6,7 @@ import {
   resolveLegacyConfigSources,
   getProtectedTokensTierOverrides,
   loadPluginConfigDetailed
-} from "./server-y5pznjt9.js";
+} from "./server-nj659894.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -86,10 +86,6 @@ import {
   getUnpublishedAutoSearchNoHint,
   forgetUnpublishedAutoSearchNoHint,
   registerAutoSearchWork,
-  gaDatabasePath,
-  RAW_MESSAGE_TYPES,
-  V2StoreReaderPool,
-  V2StoreReader,
   getOrCreateSessionMeta,
   updateSessionMeta,
   advanceToolReclaimWatermark,
@@ -271,6 +267,7 @@ import {
   peekNoteNudgeText,
   markNoteNudgeDelivered,
   clearNoteNudgeTriggerAndCooldown,
+  omitIncompleteFileTokenTotals,
   RECOVERY_NO_HEAD_LIMIT,
   deriveProtectedTailTokenTarget,
   selectPerRunCap,
@@ -283,7 +280,7 @@ import {
   startCompartmentAgent,
   setRecompStarting2,
   setRecompTerminal2
-} from "./server-6fyp0v67.js";
+} from "./server-bfpda1tb.js";
 import {
   resolveHistorianModel2
 } from "./server-8cd2j99z.js";
@@ -308,8 +305,9 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./server-r9gjxcte.js";
+} from "./server-a2eqhkxr.js";
 import {
+  pruneMissingProjectIdentities,
   setHomeProjectPermission,
   shouldSkipHomeProjectMemory,
   ProjectIdentityError,
@@ -324,21 +322,25 @@ import {
   storedPathBelongsToIdentity,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./server-e3ftpk7v.js";
+} from "./server-rmygf5pn.js";
 import {
   detectLatestTurnThinkingMismatch,
   isPrefixBoundThinkingModel,
   detectOverflow,
   ensureSessionMetaRow,
   clearCachedM0M1,
+  clearCachedM0,
   expandToolPart,
   markHostUnservedRow,
+  markCoveredInstructionRow,
+  isCoveredInstructionRow,
+  takeCoveredInstructionRows,
+  cloneKeepingCoveredInstructionMarks,
   estimateTrueRawMessageTokens,
   stripSystemInjection,
   isTextPart,
   isToolPartWithOutput,
   isFilePart,
-  buildFileSourceContent,
   toolPartHasUserAnswer,
   DreamTokenBudgetExceeded,
   createDreamTokenBudget,
@@ -476,6 +478,7 @@ import {
   projectOpencodeReasoningBudgetCutoff,
   DEFAULT_KEEP_REASONING_TOKENS,
   resolveKeepReasoningTokens,
+  reasoningStepCost,
   reasoningBudgetCutoff,
   reasoningTextAndOpaque,
   opencodeReasoningBudgetCutoff,
@@ -512,7 +515,7 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./server-1hcbw661.js";
+} from "./server-xhab8jx8.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -541,7 +544,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./server-kr2kc9dz.js";
+} from "./server-8by8qfec.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -552,7 +555,7 @@ import {
   estimateTokens,
   estimateFixedPromptTokens,
   normalizeText
-} from "./server-0ppsweh6.js";
+} from "./server-tgnbmwah.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -560,7 +563,7 @@ import {
   toSynapseLaneDescriptor,
   formatSynapseLaneDescriptor,
   SynapseEmbeddingProvider
-} from "./server-rrqpvwqd.js";
+} from "./server-6tmj0s7j.js";
 import {
   inRootAsyncContext2,
   getTagIdentityWriteGeneration2,
@@ -574,7 +577,7 @@ import {
   isTransientSqliteError2,
   SqliteAcquisitionBusyError2,
   withAsyncPrivilegedWriter2
-} from "./server-wafzvyhg.js";
+} from "./server-beht37jy.js";
 import"./server-51779zs2.js";
 import {
   isRawCompactionSummaryInfo2,
@@ -582,11 +585,11 @@ import {
   buildInMemoryTailRawMessages2,
   RawOrdinalsNotReady2,
   runSessionWarmupWorker
-} from "./server-6714jebr.js";
-import"./server-785mb90s.js";
+} from "./server-xj136kt8.js";
+import"./server-1wy7b9de.js";
 import {
   deleteChunkEmbedBackoffForSession
-} from "./server-kqpawe1a.js";
+} from "./server-46neh5fa.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
@@ -605,14 +608,20 @@ import {
   prepareLkgCaptureFence,
   certifyCommittedLkgCapture,
   markLkgRecoveryDirty,
+  cleanSearchText,
+  matchedSearchSnippet,
+  gaDatabasePath,
+  RAW_MESSAGE_TYPES,
+  V2StoreReaderPool,
+  V2StoreReader,
   advanceSessionActivity,
   backfillSessionActivity,
   getLastIndexedOrdinal2,
   getMessageIndexReconciliationStartOrdinal2,
   isMessageIndexReconciledThrough2,
   indexMessagesAfterOrdinal2,
-  sweepOrphanedOpenCodeMessageIndexes2
-} from "./server-g59aatsz.js";
+  sweepOrphanedOpenCodeMessageIndexesCooperatively2
+} from "./server-2ehj0bw7.js";
 import {
   stableStringify,
   getTemporalDecisions,
@@ -671,12 +680,14 @@ import {
   getPendingOpsCount,
   clearPendingOps,
   removePendingOp,
+  updateTagByteSize2,
   getRecentTagOwnerMessageIds2,
   AGE_RECLAIM_MIN_TOKENS2,
   getOldestActiveUnprotectedToolTags2,
   getActiveToolTagsForAgeReclaim2,
   getTriggerTagTokenUpperBound2,
   getActiveTagTokenTotalsByMessage2,
+  updateTagTokenCount2,
   tryGetReasoningTokenEstimatesByMessage2,
   cachedTagOwnerRatios2,
   tagOwnerWarmupState2,
@@ -713,7 +724,7 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./server-0mzjjw3s.js";
+} from "./server-27gq4mfz.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -729,12 +740,12 @@ import {
   latestRealUserTurnIdFromOpenCodeDb,
   getMessageTimesFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./server-d8tj10db.js";
+} from "./server-n1prf1g6.js";
 import {
   getCurrentToolSetHash,
   recordToolDefinition,
   getMeasuredToolDefinitionTokens
-} from "./server-zs8d0s3b.js";
+} from "./server-g3qma5c0.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -747,7 +758,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./server-00hx04yn.js";
+} from "./server-gpvay0xz.js";
 import {
   configureContextDatabasePragmas2
 } from "./server-fb3zxn06.js";
@@ -793,7 +804,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./server-vgpab6rd.js";
+} from "./server-my7k4eds.js";
 import {
   deriveTriggerBudget2,
   deriveHistorianChunkTokens2,
@@ -801,7 +812,7 @@ import {
   resolveHistorianProducerLimits2,
   resolveHistorianContextLimit2
 } from "./server-34kwfsr4.js";
-import"./server-05xjtq6c.js";
+import"./server-d04vrx0j.js";
 import {
   isEmbeddingHostBusy2
 } from "./server-qt1qqasc.js";
@@ -814,7 +825,7 @@ import {
   releaseGitSweepLease,
   recordSessionProjectIdentity,
   hasRecordedSessionProjectIdentity
-} from "./server-hgg55hde.js";
+} from "./server-hy3d3vsx.js";
 import {
   saveEmbeddingIfHashMatches,
   invalidateProject2,
@@ -822,10 +833,10 @@ import {
 } from "./server-4dhv7mqz.js";
 import {
   getLocalEmbeddingNativeMemoryStats
-} from "./server-gha9x4qq.js";
+} from "./server-h1v0pyxb.js";
 import {
   cosineSimilarity
-} from "./server-aavz8pm6.js";
+} from "./server-zzkj2fch.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -850,7 +861,7 @@ import {
   mergeMemoryStats2,
   archiveMemory2,
   getMemoryCountsByStatus2
-} from "./server-n78avt2p.js";
+} from "./server-n37sebck.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -862,7 +873,7 @@ import"./server-h0410h0v.js";
 import {
   flushIgnoredMessages2,
   sendStatusNotification2
-} from "./server-vbe4se57.js";
+} from "./server-a9xqj88f.js";
 import {
   renderSingleStoreMigrationRequiredRefusal,
   SingleStoreMigrationRequiredError,
@@ -882,14 +893,14 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-n5q841qn.js";
+} from "./server-1nyybqan.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
 import"./server-kaqs6h31.js";
 import {
   renderSearchArchiveOffThread2
-} from "./server-zyw55ygv.js";
+} from "./server-qv7f0hhe.js";
 import {
   compareSemverCore
 } from "./server-84w6rvvf.js";
@@ -1636,6 +1647,9 @@ __export(exports_coerce, {
   string: () => string3
 });
 
+// src/v2/hooks/context.ts
+import { setTimeout as delay } from "node:timers/promises";
+
 // src/config/dependency-notes.ts
 function scheduledTasks(config) {
   const tasks = config.dreamer?.tasks ?? {};
@@ -3423,9 +3437,14 @@ function scheduleReconciliation(db, sessionId, readMessages) {
   });
 }
 async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, options = {}) {
+  if (getHarness2() === "opencode2")
+    openSource = () => new Database2(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"), {
+      readonly: true,
+      fileMustExist: true
+    });
   const path = getSqliteDatabasePath2(db);
-  if (!path || getHarness2() !== "opencode")
-    return sweepOrphanedOpenCodeMessageIndexes2(db, openSource, options);
+  if (!path || getHarness2() !== "opencode" && getHarness2() !== "opencode2")
+    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, openSource, options);
   let source = null;
   let sourcePath = null;
   try {
@@ -3437,7 +3456,7 @@ async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, opti
       source?.close();
   }
   if (!sourcePath)
-    return sweepOrphanedOpenCodeMessageIndexes2(db, () => source, options);
+    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, () => source, options);
   const reply = await runSessionWarmupWorker({
     path,
     sessionId: "",
@@ -3512,7 +3531,8 @@ function seedSessionCacheTtlIfUnsynced(args) {
 }
 
 // src/hooks/magic-context/auto-search-deadline.ts
-var AUTO_SEARCH_TIMEOUT_MS = 3000;
+var AUTO_SEARCH_TIMEOUT_MS = 1000;
+var AUTO_SEARCH_VECTOR_TIMEOUT_MS = 200;
 var operationDeadlines = new WeakMap;
 function autoSearchDeadlineUnixMs(signal) {
   const deadline = signal && operationDeadlines.get(signal);
@@ -4061,32 +4081,32 @@ function formatAge(committedAtMs) {
   const years = Math.floor(days / 365);
   return years === 1 ? "1y ago" : `${years}y ago`;
 }
-function renderFragment(result, charCap, wordRules) {
+function renderFragment(result, charCap, wordRules, query) {
   switch (result.source) {
     case "memory": {
-      const compressed = cavemanCompress(result.content, "ultra", CURRENT_CAVEMAN_RULES, wordRules);
+      const compressed = cavemanCompress(cleanSearchText(result.content), "ultra", CURRENT_CAVEMAN_RULES, wordRules);
       return truncate(compressed, charCap);
     }
     case "git_commit": {
-      const subject = result.content.split(/\r?\n/)[0] ?? result.content;
+      const subject = cleanSearchText(result.content.split(/\r?\n/)[0] ?? result.content);
       const body = truncate(subject, Math.max(10, charCap - 20));
       return `commit ${result.shortSha} ${formatAge(result.committedAtMs)}: ${body}`;
     }
     case "message": {
-      const compressed = cavemanCompress(result.content, "ultra", CURRENT_CAVEMAN_RULES, wordRules);
+      const compressed = cavemanCompress(query ? matchedSearchSnippet(result.content, query, charCap) : cleanSearchText(result.content), "ultra", CURRENT_CAVEMAN_RULES, wordRules);
       return truncate(compressed, charCap);
     }
     case "compartment": {
-      const source = result.snippet ?? result.title;
+      const source = cleanSearchText(result.title);
       const compressed = cavemanCompress(source, "ultra", CURRENT_CAVEMAN_RULES, wordRules);
       return truncate(compressed, charCap);
     }
     case "primer": {
-      const compressed = cavemanCompress(result.content, "ultra", CURRENT_CAVEMAN_RULES, wordRules);
+      const compressed = cavemanCompress(cleanSearchText(result.content), "ultra", CURRENT_CAVEMAN_RULES, wordRules);
       return truncate(compressed, charCap);
     }
     case "note": {
-      const compressed = cavemanCompress(result.content, "ultra", CURRENT_CAVEMAN_RULES, wordRules);
+      const compressed = cavemanCompress(cleanSearchText(result.content), "ultra", CURRENT_CAVEMAN_RULES, wordRules);
       return truncate(compressed, charCap);
     }
   }
@@ -4097,7 +4117,7 @@ function buildAutoSearchHint(results, options = {}) {
   const picks = results.slice(0, maxFragments);
   const lines = [];
   for (const result of picks) {
-    const fragment = renderFragment(result, fragmentCharCap, options.wordRules ?? "english");
+    const fragment = renderFragment(result, fragmentCharCap, options.wordRules ?? "english", options.query ?? "");
     if (fragment.length === 0)
       continue;
     lines.push(`- ${fragment}`);
@@ -4120,6 +4140,9 @@ ${trimmedBody}…
   }
   return wrapped;
 }
+function selectAutoSearchResults(results, threshold) {
+  return results.filter((result) => (result.relevanceScore ?? result.score) >= threshold);
+}
 
 // src/hooks/magic-context/auto-search-worker-client.ts
 import { Worker } from "node:worker_threads";
@@ -4215,6 +4238,63 @@ async function searchAutoHint(db, sessionId, projectPath, query, options, entry
   return executeAutoSearchWorker(db, sessionId, projectPath, query, options, entry, "search");
 }
 var pendingBackfills = new WeakMap;
+var searchWorkers = new WeakMap;
+var liveSearchWorkers = new Set;
+var MAX_IDLE_SEARCH_WORKERS = 4;
+var SEARCH_WORKER_IDLE_MS = 5 * 60000;
+var workersCreated = 0;
+var workersReused = 0;
+async function acquireSearchWorker(db, key, entry, input, signal) {
+  const pool = searchWorkers.get(db) ?? new Map;
+  searchWorkers.set(db, pool);
+  while (!signal.aborted) {
+    let slot = pool.get(key);
+    if (slot?.busy) {
+      const current = slot;
+      await new Promise((resolve) => {
+        const done = () => {
+          signal.removeEventListener("abort", done);
+          resolve();
+        };
+        signal.addEventListener("abort", done, { once: true });
+        current.busy?.then(done);
+        if (signal.aborted)
+          done();
+      });
+      continue;
+    }
+    const fresh = !slot;
+    if (!slot) {
+      const worker = inRootAsyncContext2(() => new Worker(entry, { workerData: { ...input, persistent: true } }));
+      slot = {
+        worker,
+        dispose() {
+          clearTimeout(this.idleTimer);
+          if (pool.get(key) === this)
+            pool.delete(key);
+          liveSearchWorkers.delete(this);
+          worker.terminate();
+          worker.unref();
+        }
+      };
+      workersCreated++;
+      pool.set(key, slot);
+      liveSearchWorkers.add(slot);
+      const current = slot;
+      worker.on("error", () => current.dispose());
+      worker.on("exit", () => current.dispose());
+    } else
+      workersReused++;
+    clearTimeout(slot.idleTimer);
+    const current = slot;
+    current.busy = new Promise((resolve) => {
+      current.release = resolve;
+    });
+    current.worker.ref();
+    return { slot: current, fresh };
+  }
+  return null;
+}
 function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
   if (isEmbeddingHostBusy2())
     return Promise.resolve();
@@ -4279,6 +4359,7 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     query,
     options: {
       ...serializable,
+      autoHint: true,
       backfillMemoryEmbeddings: false,
       countRetrievals: false,
       measurementDisabled: true
@@ -4288,8 +4369,20 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     snapshot,
     deadlineUnixMs: autoSearchDeadlineUnixMs(deadlineSignal)
   };
+  let lease;
+  try {
+    lease = await acquireSearchWorker(db, `${input.harness}\x00${projectPath}\x00${job}\x00${entry.href}`, entry, input, signal);
+  } catch (error) {
+    lifecycle.done();
+    throw error;
+  }
+  if (!lease) {
+    lifecycle.done();
+    return [];
+  }
+  const { slot, fresh } = lease;
+  const worker = slot.worker;
   return new Promise((resolve, reject) => {
-    const worker = inRootAsyncContext2(() => new Worker(entry, { workerData: input }));
     let settled = false;
     const finish = (results, error) => {
       if (settled)
@@ -4298,7 +4391,25 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
       signal?.removeEventListener("abort", abort);
       lifecycle.signal.removeEventListener("abort", abort);
       lifecycle.done();
-      worker.terminate();
+      worker.off("message", onMessage);
+      worker.off("error", onError);
+      worker.off("exit", onExit);
+      if (error || signal.aborted || entry.href !== defaultAutoSearchWorkerEntry().href)
+        slot.dispose();
+      else {
+        slot.idleTimer = setTimeout(() => slot.dispose(), SEARCH_WORKER_IDLE_MS);
+        slot.idleTimer.unref?.();
+      }
+      const release = slot.release;
+      slot.busy = undefined;
+      slot.release = undefined;
+      release?.();
+      const reusable = liveSearchWorkers.delete(slot);
+      if (reusable)
+        liveSearchWorkers.add(slot);
+      const idle = [...liveSearchWorkers].filter((candidate) => !candidate.busy);
+      for (const prior of idle.slice(0, Math.max(0, idle.length - MAX_IDLE_SEARCH_WORKERS)))
+        prior.dispose();
       worker.unref();
       if (error)
         reject(error);
@@ -4308,9 +4419,9 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     const abort = () => finish([]);
     signal?.addEventListener("abort", abort, { once: true });
     lifecycle.signal.addEventListener("abort", abort, { once: true });
-    worker.on("error", (error) => finish([], error));
-    worker.on("exit", (code) => finish([], new Error(`auto-search worker exited (${code})`)));
-    worker.on("message", async (reply) => {
+    const onError = (error) => finish([], error);
+    const onExit = (code) => finish([], new Error(`auto-search worker exited (${code})`));
+    const onMessage = async (reply) => {
       if (settled)
         return;
       if (reply.kind === "result") {
@@ -4329,7 +4440,7 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
       const response = { id: reply.id };
       try {
         if (reply.kind === "query")
-          response.result = await (job === "backfill" ? embedTextForProject2(projectPath, reply.text, signal, "query") : embedQuery?.(reply.text, signal)) ?? null;
+          response.result = await (job === "backfill" ? embedTextForProject2(projectPath, reply.text, signal, "query") : boundedHintEmbedding(embedQuery, reply.text, signal)) ?? null;
         else {
           const passage = await embedBatchForProject2(projectPath, reply.texts, signal, reply.purpose);
           const current = getProjectEmbeddingSnapshot2(projectPath);
@@ -4344,13 +4455,46 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
         response.error = error instanceof Error ? error.message : String(error);
       }
       response.embeddingHostBusy = isEmbeddingHostBusy2();
-      if (!settled && !signal?.aborted)
-        worker.postMessage(response);
-    });
+      if (!settled && !signal?.aborted) {
+        try {
+          worker.postMessage(response);
+        } catch (error) {
+          finish([], error instanceof Error ? error : new Error(String(error)));
+        }
+      }
+    };
+    worker.on("error", onError);
+    worker.on("exit", onExit);
+    worker.on("message", onMessage);
     if (signal?.aborted)
       abort();
+    else if (!fresh) {
+      try {
+        worker.postMessage({ kind: "run", input });
+      } catch (error) {
+        finish([], error instanceof Error ? error : new Error(String(error)));
+      }
+    }
   });
 }
+async function boundedHintEmbedding(embed, text, signal) {
+  const controller = new AbortController;
+  const combined = AbortSignal.any([signal, controller.signal]);
+  let timer;
+  try {
+    return await Promise.race([
+      Promise.resolve().then(() => embed?.(text, combined) ?? null),
+      new Promise((resolve) => {
+        timer = setTimeout(() => {
+          resolve(null);
+          controller.abort();
+        }, AUTO_SEARCH_VECTOR_TIMEOUT_MS);
+      })
+    ]);
+  } finally {
+    clearTimeout(timer);
+  }
+}
 function defaultAutoSearchWorkerEntry() {
   return new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./auto-search-worker.ts" : "./auto-search-worker.js", import.meta.url);
 }
@@ -4658,6 +4802,8 @@ async function runAutoSearchHint(args) {
         const gitCommitsEnabled = embeddingSnapshot?.gitCommitEnabled ?? options.gitCommitsEnabled ?? false;
         const searchOptions = {
           limit: 10,
+          maxMessageOrdinal: Math.max(0, getLastCompartmentEndMessage(db, sessionId)),
+          excludeMessageId: userMsgId,
           memoryEnabled,
           embeddingEnabled,
           gitCommitsEnabled,
@@ -4695,11 +4841,15 @@ async function runAutoSearchHint(args) {
       if (results.length === 0) {
         return writeNoHintAndReconcile("empty");
       }
-      if (results[0].score < options.scoreThreshold) {
-        sessionLog2(sessionId, `auto-search: top score ${results[0].score.toFixed(3)} below threshold ${options.scoreThreshold}`);
+      results = selectAutoSearchResults(results, options.scoreThreshold);
+      if (results.length === 0) {
+        sessionLog2(sessionId, `auto-search: no fragment meets relevance threshold ${options.scoreThreshold}`);
         return writeNoHintAndReconcile("below-threshold");
       }
-      const hintText = buildAutoSearchHint(results, { wordRules: options.wordRules });
+      const hintText = buildAutoSearchHint(results, {
+        wordRules: options.wordRules,
+        query: rawPrompt
+      });
       if (!hintText) {
         return writeNoHintAndReconcile("empty");
       }
@@ -5659,6 +5809,12 @@ function canConsumeDeferredOnThisPass(args) {
 function hasReclaimRide(signals) {
   return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory || signals.subagentExecute === true;
 }
+function prefixMutationPermitted(gate) {
+  return !gate.signedThinkingHold || gate.firstRender || gate.idleExpiry || gate.emergency;
+}
+function reclaimRidePermitted(signals, gate) {
+  return prefixMutationPermitted(gate) && hasReclaimRide(signals);
+}
 var RECLAIM_RIDE_NAMES = [
   "hardFold",
   "force",
@@ -5954,8 +6110,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) {
@@ -6878,6 +7035,27 @@ function resolveHistoryBudgetTokens(historyBudgetPercentage, contextUsage, execu
   }) / 100) * historyBudgetPercentage);
 }
 
+// src/features/magic-context/storage-host-instruction-retention.ts
+var NAMESPACE = "hostInstructionRetention";
+var enabled = true;
+function hostInstructionRetentionEnabled() {
+  return enabled;
+}
+function isHostInstructionRetentionOn(db, sessionId) {
+  const lane = readReplayEnvelope(db, sessionId)[NAMESPACE];
+  return typeof lane === "object" && lane !== null && lane.on === true;
+}
+function markHostInstructionRetention(db, sessionId) {
+  return updateReplayDocument(db, sessionId, (doc) => {
+    const lane = doc[NAMESPACE];
+    if (typeof lane === "object" && lane !== null && lane.on === true)
+      return false;
+    doc.version = 2;
+    doc[NAMESPACE] = { on: true };
+    return true;
+  });
+}
+
 // src/hooks/magic-context/pending-drop-eligibility.ts
 function pendingDropVeto(tagNumber, target, protectedTagIds) {
   if (protectedTagIds.has(tagNumber))
@@ -6954,27 +7132,43 @@ function buildReplacementContent(tagId) {
   return `[dropped §${tagId}§]`;
 }
 function applyNewToolDrop(target, options) {
-  if (options.persist && (target?.prepareDrop?.() ?? target?.canDrop?.()) === false) {
+  const plan = planNewToolDrop(target, options, !!options.persist);
+  if (!plan)
     return { result: "incomplete", mode: "full" };
+  options.persist?.(plan.mode);
+  return plan.apply();
+}
+function planNewToolDrop(target, options, prepare, plannedRemovals) {
+  if (prepare && (target?.prepareDrop?.() ?? target?.canDrop?.()) === false) {
+    return;
   }
   if (!target) {
-    options.persist?.("full");
-    return { result: "absent", mode: "full" };
+    return { mode: "full", apply: () => ({ result: "absent", mode: "full" }) };
   }
-  if (options.inWindow && hasSmallToolInput(target) || options.keepSkeleton === true || target.cannotRemove?.() === true || target.wouldStrandConversationEnd?.() === true) {
+  if (options.inWindow && hasSmallToolInput(target) || options.keepSkeleton === true || target.cannotRemove?.() === true || target.wouldStrandConversationEnd?.(plannedRemovals) === true) {
     const strip = target.hasAttachments?.() === true;
-    options.persist?.(strip ? "skeleton_stripped" : "skeleton_real");
+    const mode = strip ? "skeleton_stripped" : "skeleton_real";
     return {
-      result: (strip ? target.skeletonStripped?.() : target.skeletonReal?.()) ?? "absent",
-      mode: strip ? "skeleton_stripped" : "skeleton_real"
+      mode,
+      apply: () => ({
+        result: (strip ? target.skeletonStripped?.() : target.skeletonReal?.()) ?? "absent",
+        mode
+      })
     };
   }
-  options.persist?.("full");
-  const result = target.drop?.() ?? "absent";
-  if (result === "truncated" && target.hasAttachments?.() === true) {
-    return { result: target.skeletonStripped?.() ?? "absent", mode: "skeleton_stripped" };
-  }
-  return { result, mode: result === "truncated" ? "skeleton_real" : "full" };
+  return {
+    mode: "full",
+    apply: () => {
+      const result = target.drop?.() ?? "absent";
+      if (result === "truncated" && target.hasAttachments?.() === true) {
+        return {
+          result: target.skeletonStripped?.() ?? "absent",
+          mode: "skeleton_stripped"
+        };
+      }
+      return { result, mode: result === "truncated" ? "skeleton_real" : "full" };
+    }
+  };
 }
 function applyPersistedToolDrop(db, sessionId, tagNumber, target, options, afterWrite) {
   return applyNewToolDrop(target, {
@@ -7068,6 +7262,7 @@ function renderConvertedToolSkeletons(targets, converted) {
   }
   return didMutate;
 }
+var PENDING_OPERATION_CHUNK_SIZE = 64;
 function applyPendingOperations(sessionId, db, targets, protectedTagIds, preloadedTags, preloadedPendingOps, syntheticPendingOps = [], editMarkerTagIds = new Set, onTagReduced, onBatchComplete, onEligibilitySnapshot) {
   let didMutateMessage = false;
   let diagnostics;
@@ -7077,153 +7272,184 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
     diagnostics.reasons[reason] = (diagnostics.reasons[reason] ?? 0) + 1;
   };
   let admitted = false;
-  try {
-    db.transaction(() => {
-      admitted = true;
-    }).immediate();
-    {
-      const pendingOps = preloadedPendingOps ?? getPendingOps(db, sessionId);
-      onEligibilitySnapshot?.(capturePendingDropEligibility(targets, protectedTagIds));
-      const tags = preloadedTags ?? getTagsByNumbers2(db, sessionId, [
-        ...new Set([
-          ...pendingOps.map((op) => op.tagId),
-          ...syntheticPendingOps.map((op) => op.tagId)
-        ])
-      ]);
-      const tagById = new Map(tags.map((tag) => [tag.tagNumber, tag]));
-      const tagStatusById = new Map(tags.map((tag) => [tag.tagNumber, tag.status]));
-      const tagTypeById = new Map(tags.map((tag) => [tag.tagNumber, tag.type]));
-      const opsToApply = [
-        ...pendingOps.map((op) => ({ op, synthetic: false })),
-        ...syntheticPendingOps.map((op) => ({ op, synthetic: true }))
-      ];
-      diagnostics = {
-        source: pendingOps.length > 0 && syntheticPendingOps.length > 0 ? "mixed" : syntheticPendingOps.length > 0 ? "synthetic" : "pending",
-        total: opsToApply.length,
-        mutated: 0,
-        persistedWithoutMutation: 0,
-        reasons: {}
-      };
-      const skeletonWindow = new Set(preloadedTags ? tags.filter((tag) => tag.type === "tool").map((tag) => tag.tagNumber).sort((left, right) => right - left).slice(0, RECENT_TOOL_SKELETON_WINDOW) : getNewestToolTagNumbers2(db, sessionId, RECENT_TOOL_SKELETON_WINDOW));
-      for (const { op: pendingOp, synthetic } of opsToApply) {
-        let operationMutated = false;
-        const tagStatus = tagStatusById.get(pendingOp.tagId);
-        if (tagStatus === "compacted" || tagStatus === "dropped") {
-          reject("already_reduced");
-          if (!synthetic)
-            removePendingOp(db, sessionId, pendingOp.tagId);
-          continue;
-        }
-        const target = targets.get(pendingOp.tagId);
-        const veto = pendingDropVeto(pendingOp.tagId, target, protectedTagIds);
-        if (veto) {
-          reject(veto);
-          continue;
-        }
-        const isToolTag = tagTypeById.get(pendingOp.tagId) === "tool";
-        if (synthetic) {
-          if (!isToolTag) {
-            reject("synthetic_non_tool");
-            continue;
-          }
-          if (target?.canDrop?.() !== true) {
-            reject("synthetic_target_not_droppable");
-            continue;
-          }
+  let startedAt = 0;
+  const mutations = [];
+  let drainChunk;
+  let hasMore = false;
+  do {
+    admitted = false;
+    startedAt = 0;
+    try {
+      db.transaction(() => {
+        admitted = true;
+        startedAt = performance.now();
+        if (drainChunk) {
+          drainChunk();
+          return;
         }
-        const persistDrop = (mode) => {
-          let startedAt = 0;
-          try {
-            db.transaction(() => {
-              startedAt = performance.now();
-              markTagDropped2(db, sessionId, pendingOp.tagId, mode);
+        const pendingOps = preloadedPendingOps ?? getPendingOps(db, sessionId);
+        onEligibilitySnapshot?.(capturePendingDropEligibility(targets, protectedTagIds));
+        const tags = preloadedTags ?? getTagsByNumbers2(db, sessionId, [
+          ...new Set([
+            ...pendingOps.map((op) => op.tagId),
+            ...syntheticPendingOps.map((op) => op.tagId)
+          ])
+        ]);
+        const tagById = new Map(tags.map((tag) => [tag.tagNumber, tag]));
+        const tagStatusById = new Map(tags.map((tag) => [tag.tagNumber, tag.status]));
+        const tagTypeById = new Map(tags.map((tag) => [tag.tagNumber, tag.type]));
+        const opsToApply = [
+          ...pendingOps.map((op) => ({ op, synthetic: false })),
+          ...syntheticPendingOps.map((op) => ({ op, synthetic: true }))
+        ];
+        diagnostics = {
+          source: pendingOps.length > 0 && syntheticPendingOps.length > 0 ? "mixed" : syntheticPendingOps.length > 0 ? "synthetic" : "pending",
+          total: opsToApply.length,
+          mutated: 0,
+          persistedWithoutMutation: 0,
+          reasons: {}
+        };
+        const skeletonWindow = new Set(preloadedTags ? tags.filter((tag) => tag.type === "tool").map((tag) => tag.tagNumber).sort((left, right) => right - left).slice(0, RECENT_TOOL_SKELETON_WINDOW) : getNewestToolTagNumbers2(db, sessionId, RECENT_TOOL_SKELETON_WINDOW));
+        const plannedRemovals = new Set;
+        const removedTagIds = new Set;
+        const record = (mutated) => {
+          if (!diagnostics)
+            return;
+          if (mutated) {
+            didMutateMessage = true;
+            diagnostics.mutated += 1;
+          } else
+            diagnostics.persistedWithoutMutation += 1;
+        };
+        let cursor = 0;
+        drainChunk = () => {
+          const chunk = opsToApply.slice(cursor, cursor + PENDING_OPERATION_CHUNK_SIZE);
+          cursor += chunk.length;
+          hasMore = cursor < opsToApply.length;
+          for (const { op: pendingOp, synthetic } of chunk) {
+            const tagStatus = tagStatusById.get(pendingOp.tagId);
+            if (tagStatus === "compacted" || tagStatus === "dropped") {
+              reject("already_reduced");
               if (!synthetic)
                 removePendingOp(db, sessionId, pendingOp.tagId);
-            }).immediate();
-          } finally {
-            if (startedAt)
-              logSlowWriteTransaction("apply_pending_operation", startedAt);
-          }
-        };
-        let shouldPersistDrop = false;
-        if (isToolTag) {
-          if (editMarkerTagIds.has(pendingOp.tagId)) {
-            const strip = target?.hasAttachments?.() === true;
-            if (target?.canDrop?.() === false || target?.prepareDrop?.() === false || !target) {
-              reject("edit_marker_incomplete");
               continue;
             }
-            persistDrop(strip ? "edit_marker_stripped" : "edit_marker");
-            const markResult = (strip ? target?.editMarkerStripped?.() : target?.editMarker?.()) ?? "absent";
-            if (markResult === "incomplete" || markResult === "absent") {
-              reject(`edit_marker_${markResult}`);
+            if (removedTagIds.has(pendingOp.tagId)) {
+              reject("drop_incomplete");
               continue;
             }
-            didMutateMessage = true;
-            operationMutated = true;
-            onTagReduced?.({ tagNumber: pendingOp.tagId, mode: "edit_marker" });
-            shouldPersistDrop = true;
-          } else {
-            const { result: dropResult, mode: appliedMode } = applyNewToolDrop(target, {
-              inWindow: skeletonWindow.has(pendingOp.tagId),
-              persist: persistDrop
-            });
-            if (dropResult === "incomplete" || synthetic && dropResult !== "removed" && dropResult !== "truncated") {
-              reject(`drop_${dropResult}`);
+            const target = targets.get(pendingOp.tagId);
+            const veto = pendingDropVeto(pendingOp.tagId, target, protectedTagIds);
+            if (veto) {
+              reject(veto);
               continue;
             }
-            if (dropResult === "removed" || dropResult === "truncated") {
-              didMutateMessage = true;
-              operationMutated = true;
-              onTagReduced?.({
-                tagNumber: pendingOp.tagId,
-                mode: appliedMode === "full" ? "full" : "truncated"
+            const isToolTag = tagTypeById.get(pendingOp.tagId) === "tool";
+            if (synthetic) {
+              if (!isToolTag) {
+                reject("synthetic_non_tool");
+                continue;
+              }
+              if (target?.canDrop?.() !== true) {
+                reject("synthetic_target_not_droppable");
+                continue;
+              }
+            }
+            const persistDrop = (mode) => {
+              markTagDropped2(db, sessionId, pendingOp.tagId, mode);
+              if (!synthetic)
+                removePendingOp(db, sessionId, pendingOp.tagId);
+            };
+            if (isToolTag) {
+              if (editMarkerTagIds.has(pendingOp.tagId)) {
+                const strip = target?.hasAttachments?.() === true;
+                if (target?.canDrop?.() === false || target?.prepareDrop?.() === false || !target) {
+                  reject("edit_marker_incomplete");
+                  continue;
+                }
+                persistDrop(strip ? "edit_marker_stripped" : "edit_marker");
+                mutations.push(() => {
+                  const markResult = (strip ? target?.editMarkerStripped?.() : target?.editMarker?.()) ?? "absent";
+                  if (markResult === "incomplete" || markResult === "absent") {
+                    reject(`edit_marker_${markResult}`);
+                    return;
+                  }
+                  record(true);
+                  onTagReduced?.({
+                    tagNumber: pendingOp.tagId,
+                    mode: "edit_marker"
+                  });
+                });
+              } else {
+                const plan = planNewToolDrop(target, { inWindow: skeletonWindow.has(pendingOp.tagId) }, true, plannedRemovals);
+                if (!plan) {
+                  reject("drop_incomplete");
+                  continue;
+                }
+                persistDrop(plan.mode);
+                if (plan.mode === "full" && target?.drop) {
+                  target.notePlannedRemoval?.(plannedRemovals);
+                  removedTagIds.add(pendingOp.tagId);
+                }
+                mutations.push(() => {
+                  const { result: dropResult, mode: appliedMode } = plan.apply();
+                  if (dropResult === "incomplete" || synthetic && dropResult !== "removed" && dropResult !== "truncated") {
+                    reject(`drop_${dropResult}`);
+                    return;
+                  }
+                  if (dropResult === "removed" || dropResult === "truncated") {
+                    record(true);
+                    onTagReduced?.({
+                      tagNumber: pendingOp.tagId,
+                      mode: appliedMode === "full" ? "full" : "truncated"
+                    });
+                  } else {
+                    reject(`drop_${dropResult}`);
+                    record(false);
+                  }
+                });
+              }
+            } else if (target) {
+              const replacement = buildReplacementContent(pendingOp.tagId);
+              persistDrop();
+              mutations.push(() => {
+                const priorContent = target.getContent?.();
+                const changed = target.setContent(replacement);
+                record(changed);
+                if (changed) {
+                  const originalCharacters = typeof priorContent === "string" ? priorContent.length : tagById.get(pendingOp.tagId)?.byteSize ?? replacement.length;
+                  onTagReduced?.({
+                    tagNumber: pendingOp.tagId,
+                    mode: "partial",
+                    removedCharacters: Math.max(0, originalCharacters - replacement.length)
+                  });
+                } else {
+                  reject("content_unchanged");
+                }
               });
-            } else {
-              reject(`drop_${dropResult}`);
+            } else if (!synthetic) {
+              reject("target_absent");
+              persistDrop();
+              mutations.push(() => record(false));
             }
-            shouldPersistDrop = true;
           }
-        } else if (target) {
-          const replacement = buildReplacementContent(pendingOp.tagId);
-          const priorContent = target.getContent?.();
-          persistDrop();
-          const changed = target.setContent(replacement);
-          if (changed) {
-            didMutateMessage = true;
-            operationMutated = true;
-            const originalCharacters = typeof priorContent === "string" ? priorContent.length : tagById.get(pendingOp.tagId)?.byteSize ?? replacement.length;
-            onTagReduced?.({
-              tagNumber: pendingOp.tagId,
-              mode: "partial",
-              removedCharacters: Math.max(0, originalCharacters - replacement.length)
-            });
-          } else {
-            reject("content_unchanged");
-          }
-          shouldPersistDrop = true;
-        } else if (!synthetic) {
-          reject("target_absent");
-          persistDrop();
-          shouldPersistDrop = true;
-        }
-        if (!shouldPersistDrop) {
-          reject("not_persisted");
-          continue;
-        }
-        if (operationMutated)
-          diagnostics.mutated += 1;
-        else
-          diagnostics.persistedWithoutMutation += 1;
+        };
+        drainChunk();
+      }).immediate();
+    } catch (error) {
+      if (!admitted && /database (?:table )?is locked|sqlite_(busy|locked)/i.test(String(error))) {
+        sessionLog2(sessionId, "pending operations write admission busy; retaining remaining operations for retry");
+        hasMore = false;
+      } else {
+        throw error;
       }
+    } finally {
+      if (startedAt)
+        logSlowWriteTransaction("apply_pending_operations", startedAt);
     }
-  } catch (error) {
-    if (!admitted && /database (?:table )?is locked|sqlite_(busy|locked)/i.test(String(error))) {
-      sessionLog2(sessionId, "pending operations write admission busy; retaining prior bytes for retry");
-      return false;
-    }
-    throw error;
-  }
+    for (const mutate of mutations.splice(0))
+      mutate();
+  } while (hasMore);
   if (diagnostics) {
     onBatchComplete?.(diagnostics);
     if (diagnostics.total > 0 && diagnostics.mutated === 0) {
@@ -7453,7 +7679,7 @@ function foldExecutesThisPass(foldDue, materialized) {
 }
 
 // src/features/magic-context/storage-caveman-rules.ts
-var NAMESPACE = "caveman";
+var NAMESPACE2 = "caveman";
 var CURRENT_RULES_VERSION = 2;
 var ORIGINAL_RULES = {
   currentRules: false,
@@ -7472,7 +7698,7 @@ function parseState(lane) {
 }
 function getCavemanReplayState(db, sessionId) {
   try {
-    return parseState(readReplayEnvelope(db, sessionId)[NAMESPACE]);
+    return parseState(readReplayEnvelope(db, sessionId)[NAMESPACE2]);
   } catch (error) {
     if (error instanceof ReplayDocumentError)
       return ORIGINAL_RULES;
@@ -7482,11 +7708,11 @@ function getCavemanReplayState(db, sessionId) {
 function recordCavemanCurrentRules(db, sessionId, englishWordRules, legacyReasoningTags) {
   const tags = [...new Set(legacyReasoningTags)].sort((a, b) => a - b);
   const persisted = updateReplayDocument(db, sessionId, (doc) => {
-    const current = parseState(doc[NAMESPACE]);
+    const current = parseState(doc[NAMESPACE2]);
     if (current.currentRules && current.englishWordRules === englishWordRules)
       return false;
     doc.version = 2;
-    doc[NAMESPACE] = {
+    doc[NAMESPACE2] = {
       rules: CURRENT_RULES_VERSION,
       legacyReasoningTags: current.currentRules ? [...current.legacyReasoningTags].sort((a, b) => a - b) : tags,
       ...englishWordRules ? {} : { englishWordRules: false }
@@ -8475,10 +8701,41 @@ function createExistingTagResolver(sessionId, tagger, db) {
 }
 
 // src/hooks/magic-context/transform-stage-logger.ts
-function logTransformTiming(sessionId, stage, startMs, extra) {
-  const elapsed = (performance.now() - startMs).toFixed(1);
+import { AsyncLocalStorage } from "node:async_hooks";
+var SLOW_STAGE_MS = 100;
+var passes = new AsyncLocalStorage;
+async function withTransformTimingSummary(run) {
+  const pass = {
+    stages: [],
+    slow: [],
+    closed: false,
+    sessionId: undefined
+  };
+  return passes.run(pass, async () => {
+    try {
+      return await run();
+    } finally {
+      pass.closed = true;
+      if (pass.sessionId)
+        sessionLog2(pass.sessionId, `transform stages: ${pass.stages.join(" ")} slow>=${SLOW_STAGE_MS}ms=[${pass.slow.join(",")}]`);
+    }
+  });
+}
+function logTransformElapsed(sessionId, stage, elapsedMs, extra) {
+  const elapsed = elapsedMs.toFixed(1);
   const suffix = extra ? ` ${extra}` : "";
-  sessionLog2(sessionId, `transform stage: stage=${stage} elapsed=${elapsed}ms${suffix}`);
+  const pass = passes.getStore();
+  if (pass && !pass.closed) {
+    pass.sessionId = sessionId;
+    pass.stages.push(`${stage}=${elapsed}ms${extra ? `(${extra})` : ""}`);
+    if (elapsedMs >= SLOW_STAGE_MS)
+      pass.slow.push(stage);
+  }
+  if (elapsedMs >= SLOW_STAGE_MS)
+    sessionLog2(sessionId, `transform stage: stage=${stage} elapsed=${elapsed}ms${suffix}`);
+}
+function logTransformTiming(sessionId, stage, startMs, extra) {
+  logTransformElapsed(sessionId, stage, performance.now() - startMs, extra);
 }
 
 // src/hooks/magic-context/tag-messages.ts
@@ -8844,13 +9101,18 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
         }));
         accAssignTag += performance.now() - _tAssignText;
         const persistedSource = sourceContents.get(tagId);
-        if (persistedSource !== undefined) {
+        if (persistedSource !== undefined && !options.refreshSourceContents) {
           textPart.text = options.normalizeRestoredAssistantText && message.info.role === "assistant" ? options.normalizeRestoredAssistantText(persistedSource) : persistedSource;
         } else {
           const sourceContent = stripTagPrefix(textPart.text);
-          if (sourceContent.trim().length > 0) {
+          if (sourceContent.trim().length > 0 || options.refreshSourceContents) {
             const _tSaveText = performance.now();
-            saveSourceContent(db, sessionId, tagId, sourceContent);
+            if (options.refreshSourceContents) {
+              replaceSourceContent(db, sessionId, tagId, sourceContent);
+              updateTagByteSize2(db, sessionId, tagId, byteSize(sourceContent));
+              updateTagTokenCount2(db, sessionId, tagId, estimateTextTagTokenCount(sourceContent));
+            } else
+              saveSourceContent(db, sessionId, tagId, sourceContent);
             accSaveSource += performance.now() - _tSaveText;
           }
         }
@@ -8931,22 +9193,12 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
         const filePart = part;
         const messageParts = message.parts;
         const contentId = `${messageId}:file${partIndex}`;
-        const existingTagId = resolver.resolve(messageId, "file", contentId, fileOrdinal);
-        const _tAssignFile = performance.now();
-        const tagId = existingTagId ?? tagger.assignTag(sessionId, contentId, "file", byteSize(filePart.url), db, 0, null, 0, null, () => ({
-          tokenCount: estimateTextTagTokenCount(filePart.url),
-          inputTokenCount: null,
-          reasoningTokenCount: null
-        }));
-        accAssignTag += performance.now() - _tAssignFile;
-        if (existingTagId === undefined) {
-          const sourceContent = buildFileSourceContent(message.parts);
-          if (sourceContent) {
-            const _tSaveFile = performance.now();
-            saveSourceContent(db, sessionId, tagId, sourceContent);
-            accSaveSource += performance.now() - _tSaveFile;
-          }
-        }
+        const existingTagId = resolver.resolve(messageId, "file", contentId, fileOrdinal) ?? getTagNumberByMessageId2(db, sessionId, contentId) ?? undefined;
+        fileOrdinal += 1;
+        if (existingTagId === undefined)
+          continue;
+        const tagId = existingTagId;
+        tagger.bindTag(sessionId, contentId, tagId);
         messageTagNumbers.set(message, Math.max(messageTagNumbers.get(message) ?? 0, tagId));
         targets.set(tagId, {
           message,
@@ -8968,7 +9220,6 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
             return true;
           }
         });
-        fileOrdinal += 1;
       }
     }
     if (message.info.role === "assistant" && !messageHasTextPart) {
@@ -9732,7 +9983,7 @@ async function runPostTransformPhase(args) {
     routinePressureAppliedBySession.set(args.sessionId, true);
   }
   const routinePressureAlreadyApplied = args.fullFeatureMode && executePressureEligible && routinePressureAppliedBySession.get(args.sessionId) === true;
-  if (args.contextUsage.percentage > 0 && args.contextUsage.percentage < args.forceMaterializationPercentage - 5 && getEmergencyInputSample(args.db, args.sessionId) > 0) {
+  if (args.contextUsageFromEstimate !== true && args.contextUsage.percentage > 0 && args.contextUsage.percentage < args.forceMaterializationPercentage - 5 && getEmergencyInputSample(args.db, args.sessionId) > 0) {
     clearEmergencyDropSample(args.db, args.sessionId);
   }
   const activeCompartmentRun = args.canRunCompartments ? getActiveCompartmentRun(args.sessionId) : undefined;
@@ -9762,7 +10013,7 @@ async function runPostTransformPhase(args) {
     if (tag && tag > 0)
       safeReasoningCutoff = Math.min(safeReasoningCutoff, tag - 1);
   }
-  let activeThinkingPrefixHold = args.activeThinkingPrefixHold === true || activeThinkingTurn && args.thinkingBindingRecoveryEnabledForModel === true;
+  let activeThinkingPrefixHold = args.activeThinkingPrefixHold === true;
   let freezeM0M1 = args.freezeM0M1 === true || activeThinkingPrefixHold;
   let rewritingSignedPrefix = false;
   let thinkingReleasedForFit = false;
@@ -9784,7 +10035,7 @@ async function runPostTransformPhase(args) {
     rewritingSignedPrefix = true;
     thinkingReleasedForFit ||= forFit;
   };
-  if (activeThinkingPrefixHold && args.forceSignedRebuildForFit) {
+  if (args.forceSignedRebuildForFit && (activeThinkingPrefixHold || activeThinkingTurn && args.thinkingBindingRecoveryEnabledForModel === true)) {
     releaseThinkingForRewrite(true);
   }
   const foldDueDecision = m0M1EnabledForFold && args.m0M1 && !freezeM0M1 ? mustMaterialize({
@@ -9921,7 +10172,7 @@ async function runPostTransformPhase(args) {
   const shouldReadPendingOps = !compactionOff && (materializationRequested || publishedM1RefreshedThisPass || args.schedulerDecision === "execute" || forceMaterialization || foldExecutedThisPass || firstRenderBust || compartmentRunning);
   const pendingOps = shouldReadPendingOps ? getPendingOps(args.db, args.sessionId) : [];
   const hasPendingUserOps = pendingOps.length > 0;
-  if (args.schedulerDecision === "execute" && pendingOps.some((op) => newTargets.get(op.tagId)?.thinkingDropProtected))
+  if (args.schedulerDecision === "execute" && args.thinkingBindingRecoveryEnabledForModel !== true && pendingOps.some((op) => newTargets.get(op.tagId)?.thinkingDropProtected))
     requestPendingMaterialization(args.pendingMaterializationSessions, args.sessionId, "thinking_hold");
   const formatPendingOpsDepth = () => {
     const depth = getPendingOpsCount(args.db, args.sessionId);
@@ -9932,16 +10183,34 @@ async function runPostTransformPhase(args) {
   const rideSignals = {
     subagentExecute: !args.fullFeatureMode && args.schedulerDecision === "execute",
     hardFold: rewritingSignedPrefix || foldBustsServedPrefixThisPass || firstRenderBust || idleExpiryRebuild,
-    force: emergencyDropEligible && (args.contextUsage.percentage >= 95 || getEmergencyInputSample(args.db, args.sessionId) === 0),
+    force: emergencyDropEligible && (args.contextUsage.percentage >= 95 || args.contextUsageFromEstimate !== true && getEmergencyInputSample(args.db, args.sessionId) === 0),
     explicitFlush: isExplicitFlush && hasPendingMaterializationOrigin(args.pendingMaterializationSessions, args.sessionId, "user_flush"),
     publishedHistory: !prefixPreflightFailed && (publishedM1RefreshedThisPass || !m0M1EnabledForFold && (args.pendingCompartmentInjection?.compartmentCount ?? 0) > 0 && legacyPublishedHeadChanged(args))
   };
-  const publishedWorkDrainAllowed = !compactionOff && (!activeThinkingPrefixHold || firstRenderBust || idleExpiryRebuild || emergencyDropEligible) && hasReclaimRide(rideSignals);
+  const publishedWorkDrainAllowed = !compactionOff && reclaimRidePermitted(rideSignals, {
+    signedThinkingHold: activeThinkingPrefixHold,
+    firstRender: firstRenderBust,
+    idleExpiry: idleExpiryRebuild,
+    emergency: emergencyDropEligible
+  });
   const shouldApplyPendingOps = publishedWorkDrainAllowed;
   const shouldRunHeuristics = publishedWorkDrainAllowed && (rideSignals.publishedHistory || materializationRequested || forceMaterialization || foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild || emergencyDropEligible || args.schedulerDecision === "execute" && (!alreadyRanThisTurn || !args.fullFeatureMode));
   const isCacheBustingPass = publishedWorkDrainAllowed;
-  if (args.normalizeRecoveryTail && isCacheBustingPass) {
+  let unheldSignedTurnBust = false;
+  if (isCacheBustingPass && !activeThinkingPrefixHold && activeThinkingTurn && args.thinkingBindingRecoveryEnabledForModel === true) {
+    if (foldBustsServedPrefixThisPass || firstRenderBust || publishedM1RefreshedThisPass)
+      releaseThinkingForRewrite();
+    else {
+      unheldSignedTurnBust = true;
+      retainedThinking.clear();
+      protectedThinkingMessages.clear();
+      newTargets = args.targets;
+    }
+  }
+  let recoveryTailNormalizedThisPass = false;
+  if (args.normalizeRecoveryTail && isCacheBustingPass && !activeThinkingPrefixHold) {
     args.normalizeRecoveryTail();
+    recoveryTailNormalizedThisPass = true;
     args.tags = getTagsBySession2(args.db, args.sessionId);
     newTargets = protectNewTagMutations(args.messages, args.targets, retainedThinking, args.thinkingBindingRecoveryEnabledForModel === true);
   }
@@ -10412,6 +10681,26 @@ async function runPostTransformPhase(args) {
     }
   }
   const m0M1Enabled = m0M1EnabledForFold;
+  if (m0M1Enabled && args.m0M1 && !compactionOff && args.opencode2) {
+    const covered = args.coveredHostInstructions ?? [];
+    if (covered.length > 0 || canEditWholePrefix) {
+      let retain = false;
+      if (hostInstructionRetentionEnabled()) {
+        try {
+          retain = isHostInstructionRetentionOn(args.db, args.sessionId);
+        } catch (error) {
+          failPass("host-instruction-retention-read-failure", error);
+        }
+        if (!retain && canEditWholePrefix) {
+          if (!markHostInstructionRetention(args.db, args.sessionId))
+            failPass("host-instruction-retention-persistence-failure");
+          retain = true;
+        }
+      }
+      if (retain && covered.length > 0)
+        args.messages.unshift(...covered);
+    }
+  }
   if (m0M1Enabled && args.m0M1) {
     if (freezeM0M1 && !preparedPrefix) {
       preparedPrefix = prepareCachedM0M1Replay(args.db, args.sessionId);
@@ -10934,7 +11223,7 @@ async function runPostTransformPhase(args) {
       }
     }
   }
-  const prefixEditBesidesReasoningTrim = firstRenderBust || heldIdleExpiryRebuild || materializationRequested || explicitMaterializedSuccessfully || deferredMaterializedSuccessfully || foldBustsServedPrefixThisPass || publishedM1RefreshedThisPass || m0RematerializedThisPass || m0M1InjectedThisPass && historyWasConsumedThisPass || historyWasConsumedThisPass || pendingOpsDidMutate || heuristicOrReasoningEditBesidesTrim || emergency || autoReclaimDidMutateThisPass || convertedToolSkeletonsDidMutate || deferredClearedMarkerRetires || noteNudgeAppendedThisPass || todoAnchorMovedThisPass || autoSearchHintAppendedThisPass || dropModeSwitchesThisPass || firstApplicationEdits.beforeNewerThinking;
+  const prefixEditBesidesReasoningTrim = firstRenderBust || heldIdleExpiryRebuild || materializationRequested || explicitMaterializedSuccessfully || deferredMaterializedSuccessfully || foldBustsServedPrefixThisPass || publishedM1RefreshedThisPass || m0RematerializedThisPass || m0M1InjectedThisPass && historyWasConsumedThisPass || historyWasConsumedThisPass || pendingOpsDidMutate || heuristicOrReasoningEditBesidesTrim || emergency || autoReclaimDidMutateThisPass || convertedToolSkeletonsDidMutate || deferredClearedMarkerRetires || noteNudgeAppendedThisPass || todoAnchorMovedThisPass || autoSearchHintAppendedThisPass || dropModeSwitchesThisPass || recoveryTailNormalizedThisPass || firstApplicationEdits.beforeNewerThinking;
   let proactiveThinkingStrip = null;
   if (!compactionOff && args.thinkingBindingRecoveryEnabledForModel === true && proactiveThinkingStripPermitted && prefixEditBesidesReasoningTrim) {
     const outcome = freezeReasoningOnBustingPass({
@@ -10951,7 +11240,11 @@ async function runPostTransformPhase(args) {
         mergedReasoningStrippedIds.add(thinkingBindingRecoveryFrozenId(messageId));
       }
       bustedThisPass = true;
+      if (unheldSignedTurnBust)
+        rewritingSignedPrefix = true;
     } else if (outcome.persistenceFailed) {
+      if (unheldSignedTurnBust)
+        throw new Error("Cannot persist signed thinking omission after a mid-turn edit");
       failPass("proactive-thinking-strip-persistence-failure");
     }
   }
@@ -11110,7 +11403,8 @@ async function runPostTransformPhase(args) {
     prefixTrimStatus: deliveredPrefix?.prefixTrimStatus ?? null,
     thinkingBindingRecovery,
     proactiveThinkingStrip,
-    thinkingReleasedForFit
+    thinkingReleasedForFit,
+    openTurnSignedThinkingKept: args.thinkingBindingRecoveryEnabledForModel === true && activeThinkingTurn && !rewritingSignedPrefix
   };
 }
 function checkM0MutationDriftAndSignal(args) {
@@ -11190,6 +11484,26 @@ function systemPromptDates(prompt, sticky) {
   return { live: values.length ? JSON.stringify(values) : undefined, stable };
 }
 
+// src/hooks/magic-context/system-prompt-diagnostics.ts
+import { createHash } from "node:crypto";
+function snapshotSystemPrompt(system, preset) {
+  return { elements: system.map((element) => Buffer.from(element)), preset };
+}
+function describeSystemPromptChange(previous, current) {
+  const metadata = (element) => element === undefined ? "absent" : `bytes=${element.length},md5=${createHash("md5").update(element).digest("hex")}`;
+  const elements = [];
+  for (let index = 0;index < Math.max(previous?.elements.length ?? 0, current.elements.length); index++) {
+    const before = previous?.elements[index];
+    const after = current.elements[index];
+    let offset = 0;
+    while (before && after && offset < Math.min(before.length, after.length) && before[offset] === after[offset])
+      offset++;
+    const status = !previous ? "unknown" : !before ? "added" : !after ? "removed" : before.equals(after) ? "unchanged" : "changed";
+    elements.push(`${index}:${status}(${metadata(before)} -> ${metadata(after)},firstDiffByte=${!previous ? "unknown" : status === "unchanged" ? "none" : offset})`);
+  }
+  return `presetChanged=${previous ? previous.preset !== current.preset : "unknown"} elements=[${elements.join("; ")}]`;
+}
+
 // src/hooks/magic-context/system-date-refresh.ts
 var channels = new WeakMap;
 var outputUpdates = new WeakMap;
@@ -11347,6 +11661,7 @@ function createSystemPromptHashHandler(deps) {
   });
   const guidanceEpochs = createPromptSurfaceGuidanceEpochCache(promptSurfaceRuntime);
   const stickyDateBySession = new Map;
+  const diagnosticPrompts = new Map;
   const processSystemPrompt = async (input, output) => {
     const sessionId = input.sessionID;
     if (!sessionId)
@@ -11479,8 +11794,11 @@ function createSystemPromptHashHandler(deps) {
       return;
     }
     const sessionMeta = sessionMetaEarly;
+    const previousPrompt = diagnosticPrompts.get(sessionId);
+    const currentPrompt = previousPrompt && previousHash === currentHash ? previousPrompt : snapshotSystemPrompt(output.system, promptSurface.preset);
+    diagnosticPrompts.set(sessionId, currentPrompt);
     if (previousHash !== "" && previousHash !== "0" && previousHash !== currentHash) {
-      sessionLog2(sessionId, `system prompt hash changed: ${previousHash} → ${currentHash} (len=${systemContent.length}), ${idleCacheExpired ? "adopting on idle-expired request" : requestMessagesFinal ? "adopting on the request whose messages are already final" : "triggering flush"}`);
+      sessionLog2(sessionId, `system prompt hash changed: ${previousHash} → ${currentHash} (len=${systemContent.length}), ${idleCacheExpired ? "adopting on idle-expired request" : requestMessagesFinal ? "adopting on the request whose messages are already final" : "triggering flush"}; ${describeSystemPromptChange(previousPrompt, currentPrompt)}`);
       noteSystemPromptHashChange(sessionId);
       if (!adoptSystemChange) {
         deps.historyRefreshSessions.add(sessionId);
@@ -11524,6 +11842,7 @@ function createSystemPromptHashHandler(deps) {
   return {
     handler,
     clearSession: (sessionId) => {
+      diagnosticPrompts.delete(sessionId);
       clearSystemDateRefresh(deps.historyRefreshSessions, sessionId);
       guidanceEpochs.clear(sessionId);
       clearSystemPromptHashSession(sessionId, {
@@ -11724,7 +12043,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";
@@ -11753,7 +12074,7 @@ function createPassOutcome() {
 }
 
 // src/hooks/magic-context/rust-mode-transform.ts
-import { createHash as createHash4, randomUUID as randomUUID2 } from "node:crypto";
+import { createHash as createHash5, randomUUID as randomUUID2 } from "node:crypto";
 
 // src/features/magic-context/memory/single-store-embedding-drain.ts
 function isWatermarkRow(row) {
@@ -11817,7 +12138,7 @@ function advanceEmbeddedWatermark(db, projectPath, upTo) {
 }
 
 // src/features/magic-context/mural/source-revision.ts
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 var statements = new WeakMap;
 function muralSourceRevision(db, projectPath) {
   let statement = statements.get(db);
@@ -11834,7 +12155,7 @@ function muralSourceRevision(db, projectPath) {
     statements.set(db, statement);
   }
   const row = statement.get(projectPath, Date.now());
-  return createHash("sha256").update(row.revision).digest("hex");
+  return createHash2("sha256").update(row.revision).digest("hex");
 }
 
 // src/features/magic-context/install-instance-id.ts
@@ -12261,6 +12582,7 @@ class HistorianHostRunner {
         throw new Error("hidden completion carrier returned no session id");
       const run = await promptSyncWithValidatedOutputRetry(undefined, {
         path: { id: handle.id },
+        cacheTail: "skip",
         query: { directory: sessionDirectory },
         body: {
           agent: "historian",
@@ -14209,7 +14531,7 @@ function noteExternalLkgReplay(participant, sessionId, inputMessages, servedMess
 }
 
 // src/hooks/magic-context/rust-served-raw.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 class RustServedRawConflict extends EmergencyFailClosedError {
   reason;
   messageIds;
@@ -14223,7 +14545,7 @@ class RustServedRawConflict extends EmergencyFailClosedError {
 }
 function partDigest(part) {
   const serialized = JSON.stringify(part);
-  return createHash3("sha256").update(stableStringify(serialized === undefined ? undefined : JSON.parse(serialized))).digest("hex");
+  return createHash4("sha256").update(stableStringify(serialized === undefined ? undefined : JSON.parse(serialized))).digest("hex");
 }
 function records(doc) {
   if (doc.rustServedRaw === undefined)
@@ -14453,6 +14775,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;
@@ -14711,10 +15051,10 @@ function messageCacheSignature(message) {
   const parts = Array.isArray(message.parts) ? message.parts : [];
   const serializedParts = JSON.stringify(parts) ?? "null";
   const serializedMessage = JSON.stringify(message) ?? "null";
-  return `${messageIdOf(message) ?? ""}:${parts.length}:${Buffer.byteLength(serializedParts)}:${createHash4("sha256").update(serializedMessage).digest("hex")}`;
+  return `${messageIdOf(message) ?? ""}:${parts.length}:${Buffer.byteLength(serializedParts)}:${createHash5("sha256").update(serializedMessage).digest("hex")}`;
 }
 function advanceWireFingerprint(previous, encoded) {
-  return createHash4("sha256").update(previous).update("\\0").update(JSON.stringify(encoded) ?? "null").digest("hex");
+  return createHash5("sha256").update(previous).update("\\0").update(JSON.stringify(encoded) ?? "null").digest("hex");
 }
 function buildWireFingerprint(encoded) {
   let fingerprint = "rust-wire-v1";
@@ -16495,7 +16835,7 @@ function createRustModeTransform(deps, options) {
         const id = messageIdOf(message) ?? `index:${todoStart + offset}`;
         const parts = message.parts?.filter((part) => isRecord4(part) && part.type === "tool" && part.tool === "todowrite");
         if (parts?.length) {
-          todoCalls.set(id, createHash4("sha256").update(JSON.stringify(parts)).digest("hex"));
+          todoCalls.set(id, createHash5("sha256").update(JSON.stringify(parts)).digest("hex"));
         } else {
           todoCalls.delete(id);
         }
@@ -17660,6 +18000,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 role2(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 (role2(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);
@@ -17883,7 +18318,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;
     }
@@ -18174,7 +18609,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);
@@ -18372,8 +18808,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;
@@ -18501,13 +18937,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, {
@@ -18561,6 +18991,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";
@@ -18747,8 +19200,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})`);
@@ -18768,7 +19227,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);
@@ -18807,7 +19266,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       const tagged = tagMessages(sessionId, tail, deps.tagger, db, {
         skipPrefixInjection: !ctxReduceCallable,
         servedMessages: messages,
-        normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText
+        normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText,
+        refreshSourceContents: deps.refreshSourceContents?.(sessionId)
       });
       for (const [number, target] of tagged.targets)
         targets.set(number, target);
@@ -18832,7 +19292,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           skipPrefixInjection,
           scopedToolSweep,
           servedMessages: messages,
-          normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText
+          normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText,
+          refreshSourceContents: deps.refreshSourceContents?.(sessionId)
         });
         targets = result.targets;
         if (thinkingRecovery.restore)
@@ -18940,6 +19401,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       fallbackModels: historianRun?.fallbackModels ?? deps.fallbackModels,
       compartmentDirectory,
       messages,
+      coveredInstructions: coveredHostInstructions,
       pendingCompartmentInjection,
       fallbackModelId,
       projectPath: projectIdentity,
@@ -19011,30 +19473,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;
@@ -19075,6 +19560,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       activeAgent,
       batch,
       contextUsage,
+      contextUsageFromEstimate,
       usableWindow: resolvedContextLimit ?? 0,
       schedulerDecision,
       schedulerDeferReason,
@@ -19120,6 +19606,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       emergencyCeilingTokens,
       pendingCompartmentInjection,
       prefixTrimSourceOrder,
+      coveredHostInstructions,
       hiddenMessagesAtCompactionSeam,
       trimmedMessagesAtCompactionBoundary,
       didMutateFromFlushedStatuses,
@@ -19320,7 +19807,7 @@ 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);
+    finishSystemDateRefresh(deps.historyRefreshSessions, dateRequest, postTransformResult.bustedThisPass && !activeThinkingPrefixHold && postTransformResult.openTurnSignedThinkingKept !== true || postTransformResult.thinkingReleasedForFit === true);
     if (activeThinkingPrefixHold && !postTransformResult.thinkingReleasedForFit && sessionMeta.cachedM0Bytes != null && sessionMeta.cachedM1Bytes != null) {
       recordHeldHeadForRequest(sessionId, currentLkgRequestIdentity(sessionId), (ownsHistory) => deferDeliveredSystemRefresh(deps, sessionId, ownsHistory));
     }
@@ -19421,7 +19908,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;
       }
@@ -19516,7 +20003,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         systemPromptHash: sessionMeta.systemPromptHash
       });
   };
-  return Object.assign(transform, {
+  const timedTransform = (input, output) => withTransformTimingSummary(() => transform(input, output));
+  return Object.assign(timedTransform, {
     clearSessionLogState,
     invalidateRustWireState(sessionId) {
       rustModeTransform?.invalidateWireState(sessionId);
@@ -21183,7 +21671,7 @@ function computeOpenCodeWorkMetricsIncremental(openCodeDb, sessionId, carry) {
 import { readFileSync, statSync } from "node:fs";
 
 // src/plugin/embedding-bootstrap-helpers.ts
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 var EMBEDDING_AFFECTING_KEYS = new Set([
   "embedding.api_key",
   "embedding.endpoint",
@@ -21231,7 +21719,7 @@ var EMBEDDING_WARNING_TERMS = [
 ];
 var loggedFailureSignatures = new Map;
 function sha256Prefix(value, length = 16) {
-  return createHash5("sha256").update(value).digest("hex").slice(0, length);
+  return createHash6("sha256").update(value).digest("hex").slice(0, length);
 }
 function warningLooksEmbeddingRelated(message) {
   const lower = message.toLowerCase();
@@ -22738,8 +23226,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-hzpgg06e.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-hmr7q0nt.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-4vfxej9t.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-3pxn658x.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -22823,7 +23311,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-x4xj1782.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-psqz7yh0.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -23195,7 +23683,58 @@ function readOmoDisabledHooks(directory) {
 
 // src/shared/rpc-server.ts
 import { randomBytes, timingSafeEqual } from "node:crypto";
-import { readdirSync, readFileSync as readFileSync4, unlinkSync } from "node:fs";
+import { readdirSync, readFileSync as readFileSync4, rmdirSync, unlinkSync } from "node:fs";
+
+// src/shared/rpc-discovery-cleanup.ts
+import { promises as fs } from "node:fs";
+import { join as join6 } from "node:path";
+async function reapDeadRpcDiscovery(storageDir) {
+  const root = join6(storageDir, "rpc");
+  let directories;
+  try {
+    directories = await fs.readdir(root, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  const records = [];
+  const projectDirs = [];
+  for (const entry of directories) {
+    if (!entry.isDirectory() || !/^[0-9a-f]{16}$/.test(entry.name))
+      continue;
+    const directory = join6(root, entry.name);
+    projectDirs.push(directory);
+    try {
+      for (const name of await fs.readdir(directory)) {
+        const match = /^port-(\d+)(?:-[0-9a-f]+)?\.json$/.exec(name);
+        if (!match)
+          continue;
+        const path = join6(directory, name);
+        try {
+          const content = await fs.readFile(path, "utf8");
+          const record = parseRpcPortFile(content, Number(match[1]));
+          if (record && record.pid === Number(match[1]))
+            records.push({ path, content, pid: record.pid });
+        } catch {}
+      }
+    } catch {}
+  }
+  const processes = records.length ? await inspectProcessesAsync(true) : undefined;
+  for (const record of records) {
+    if (processes?.liveness(record.pid) !== "dead")
+      continue;
+    try {
+      if (await fs.readFile(record.path, "utf8") === record.content)
+        await fs.unlink(record.path);
+    } catch {}
+  }
+  for (const directory of projectDirs) {
+    try {
+      await fs.rmdir(directory);
+    } catch {}
+  }
+}
+
+// src/shared/rpc-server.ts
 var MAX_BODY_BYTES = 1048576;
 var WS_AUTH_TIMEOUT_MS = 5000;
 var WS_CLOSE_UNAUTHORIZED = 4401;
@@ -23218,17 +23757,20 @@ function websocketToken(req) {
 }
 
 class MagicContextRpcServer {
+  storageDir;
   server = null;
   port = 0;
   handlers = new Map;
   portFilePath;
   portDir;
   startedAt = Date.now();
+  stopped = false;
   instanceId = randomBytes(8).toString("hex");
   unregisterOwnInstance = null;
   sockets = new Set;
   token = randomBytes(32).toString("hex");
   constructor(storageDir, directory) {
+    this.storageDir = storageDir;
     this.portFilePath = rpcPortFilePath(storageDir, directory, process.pid, this.instanceId);
     this.portDir = rpcPortDir(storageDir, directory);
   }
@@ -23246,6 +23788,10 @@ class MagicContextRpcServer {
       log2("rpc server skipped: Bun runtime not available (no TUI consumer)");
       return 0;
     }
+    this.stopped = false;
+    await reapDeadRpcDiscovery(this.storageDir);
+    if (this.stopped)
+      return 0;
     this.startedAt = Date.now();
     const self = this;
     const server = inRootAsyncContext2(() => Bun.serve({
@@ -23277,7 +23823,7 @@ class MagicContextRpcServer {
     try {
       this.warnIfOtherLiveInstance();
       this.unregisterOwnInstance ??= registerOwnRpcServerInstance(this.instanceId);
-      writeStorageFileAtomicSync(this.portFilePath, JSON.stringify({
+      const publish = () => writeStorageFileAtomicSync(this.portFilePath, JSON.stringify({
         port: this.port,
         pid: process.pid,
         started_at: this.startedAt,
@@ -23285,6 +23831,13 @@ class MagicContextRpcServer {
         token: this.token,
         instance_id: this.instanceId
       }));
+      try {
+        publish();
+      } catch (error) {
+        if (error.code !== "ENOENT")
+          throw error;
+        publish();
+      }
       log2(`[rpc] server listening on 127.0.0.1:${this.port}`);
     } catch (err) {
       log2(`[rpc] failed to write port file: ${err}`);
@@ -23292,6 +23845,7 @@ class MagicContextRpcServer {
     return this.port;
   }
   stop() {
+    this.stopped = true;
     for (const ws of this.sockets) {
       try {
         if (ws.data.authTimer)
@@ -23308,6 +23862,9 @@ class MagicContextRpcServer {
     try {
       unlinkSync(this.portFilePath);
     } catch {}
+    try {
+      rmdirSync(this.portDir);
+    } catch {}
     this.unregisterOwnInstance?.();
     this.unregisterOwnInstance = null;
   }
@@ -23812,8 +24369,8 @@ function hostMediaFromEncoded(value) {
 import { randomUUID as randomUUID4 } from "node:crypto";
 
 // src/v2/fold/owner.ts
-import { createHash as createHash6 } from "node:crypto";
-var foldDigest = (value) => createHash6("sha256").update(value).digest("hex");
+import { createHash as createHash7 } from "node:crypto";
+var foldDigest = (value) => createHash7("sha256").update(value).digest("hex");
 
 class FoldOwner {
   storage;
@@ -24376,6 +24933,8 @@ function adaptPayload(draft, admittedIDs = new Set, messageTimes = new Map) {
       parts
     };
     originals.set(mapped, message);
+    if (isCoveredInstructionRow(message))
+      markCoveredInstructionRow(mapped.info);
     if (typeof message.id !== "string")
       bridgesByCarrier.set(mapped, byCallID);
     messages.push(mapped);
@@ -24732,24 +25291,31 @@ ${data.output?.output ?? ""}`
   const sameModel = sameProvider && previousModel?.id === model.id;
   const reuse = sameModel && data.error === undefined;
   const metadata = (state) => state === undefined ? undefined : { [model.providerID]: state };
+  const reasoningInterrupted = data.content?.some((part) => part.type === "reasoning" && part.time !== undefined && part.time.completed === undefined);
   const content = [];
   const results = [];
   for (const part of data.content ?? []) {
+    let native = "native" in part ? part.native : part.type === "tool" ? part.providerState : part.state;
+    if (part.type === "tool" && part.providerResultState !== null && typeof part.providerResultState === "object" && !Array.isArray(part.providerResultState))
+      native = {
+        ...native !== null && typeof native === "object" && !Array.isArray(native) ? native : {},
+        ...part.providerResultState
+      };
     if (part.type === "text") {
       if (part.text !== "")
         content.push({
           type: "text",
           text: part.text,
-          providerMetadata: reuse ? metadata(part.state) : undefined
+          providerMetadata: reuse ? metadata(native) : undefined
         });
       continue;
     }
     if (part.type === "reasoning") {
-      if (part.text !== "" || reuse && part.state !== undefined)
+      if (part.text !== "" || reuse && !reasoningInterrupted && native !== undefined)
         content.push({
-          type: reuse || data.error === undefined ? "reasoning" : "text",
+          type: data.error === undefined && !reasoningInterrupted ? "reasoning" : "text",
           text: part.text,
-          providerMetadata: reuse ? metadata(part.state) : undefined
+          providerMetadata: reuse && !reasoningInterrupted ? metadata(native) : undefined
         });
       continue;
     }
@@ -24768,7 +25334,7 @@ ${data.output?.output ?? ""}`
       name: part.name,
       input,
       providerExecuted: part.executed,
-      providerMetadata: toolReuse ? metadata(part.providerState) : undefined
+      providerMetadata: toolReuse ? metadata(native) : undefined
     });
     if (!completed)
       continue;
@@ -24779,7 +25345,7 @@ ${data.output?.output ?? ""}`
       id: part.id,
       name: part.name,
       providerExecuted: part.executed,
-      providerMetadata: toolReuse ? metadata(part.providerResultState ?? part.providerState) : sameProvider ? metadata(part.providerResultState) : undefined,
+      providerMetadata: (part.executed === true ? sameProvider : reuse) ? metadata(native) : undefined,
       result: state.status === "error" ? { error: state.error, content: toolContent } : single?.type === "text" ? { type: "text", value: single.text } : { type: "content", value: toolContent },
       ...state.status === "error" ? { resultType: "error" } : {}
     };
@@ -24807,13 +25373,50 @@ function copyNativeInput(messages) {
   return copies;
 }
 function isLocalCheckpoint(row) {
-  return row.type === "compaction" && row.data.status === "completed" && row.data.providerContext === undefined;
+  return row.type === "compaction" && row.data.status === "completed" && row.data.providerContext === undefined && row.data.native?.messages === undefined;
+}
+function isAdmittedLocalCheckpoint(storage, sessionID, cut) {
+  if (!isLocalCheckpoint(cut) || cut.session_id !== sessionID)
+    return false;
+  const admission = storage.admission(sessionID, cut.id);
+  if (!admission?.payload || admission.digest !== foldDigest(admission.payload))
+    return false;
+  try {
+    const snapshot = JSON.parse(admission.payload);
+    return snapshot.source === storage.sourceID && snapshot.sessionID === sessionID && snapshot.admissionID === cut.id && snapshot.summary === cut.data.summary;
+  } catch {
+    return false;
+  }
 }
 var conversational = (row) => RAW_MESSAGE_TYPES.includes(row.type) || row.type === "location-switched";
+var historyDigest = (reader, sessionID, through) => foldDigest(JSON.stringify(reader.range(sessionID, -1, through).filter(conversational)));
+var admissionKey = (sessionID) => `native-fold/v2/${encodeURIComponent(sessionID)}`;
+async function forgetNativeFoldProvenance(storage, sessionID, legacyOnly = false) {
+  const remove = async (key) => {
+    if (storage.remove)
+      await storage.remove(key);
+    else
+      await storage.set(key, null);
+  };
+  if (!legacyOnly)
+    await remove(admissionKey(sessionID));
+  if (!storage.scan)
+    return;
+  let after;
+  do {
+    const page = await storage.scan({ prefix: "native-fold/v1/", after, limit: 100 });
+    for (const { key } of page.entries) {
+      if (key.slice("native-fold/v1/".length).split("/").slice(1).join("/") === sessionID)
+        await remove(key);
+    }
+    after = page.next;
+  } while (after);
+}
 
 class NativeFoldReplay {
   storage;
   openReader;
+  admissions;
   changed = new Set;
   dirty = new Set;
   unavailable = new Set;
@@ -24821,9 +25424,11 @@ class NativeFoldReplay {
   metadataThrough = new Map;
   loaded = new Map;
   sources = new Map;
-  constructor(storage, openReader) {
+  staleHeads = new Set;
+  constructor(storage, openReader, admissions) {
     this.storage = storage;
     this.openReader = openReader;
+    this.admissions = admissions;
     storage.onEvict((sessionID) => this.clear(sessionID));
   }
   account(sessionID) {
@@ -24862,6 +25467,51 @@ class NativeFoldReplay {
   async baseline(sessionID) {
     return this.tail(sessionID)?.baseline;
   }
+  admissionKey(sessionID) {
+    return admissionKey(sessionID);
+  }
+  async removeAdmission(key) {
+    if (this.admissions?.remove)
+      await this.admissions.remove(key);
+    else
+      await this.admissions?.set(key, null);
+  }
+  async removeLegacyAdmissions(sessionID) {
+    if (this.admissions)
+      await forgetNativeFoldProvenance(this.admissions, sessionID, true);
+  }
+  async admits(sessionID, cut, reader) {
+    if (!isLocalCheckpoint(cut) || cut.session_id !== sessionID)
+      return false;
+    if (isAdmittedLocalCheckpoint(this.storage, sessionID, cut))
+      return true;
+    if (!this.admissions)
+      return false;
+    try {
+      const source = reader.hostIdentity();
+      const saved = await this.admissions.get(this.admissionKey(sessionID));
+      if (!saved?.payload || saved.digest !== foldDigest(saved.payload))
+        return false;
+      const snapshot = JSON.parse(saved.payload);
+      if (snapshot.sourceDigest !== foldDigest(source) || snapshot.sessionID !== sessionID || snapshot.admissionID !== cut.id || snapshot.summaryDigest !== foldDigest(cut.data.summary ?? ""))
+        return false;
+      if (snapshot.historyDigest !== historyDigest(reader, sessionID, cut.seq - 1)) {
+        this.staleHeads.add(sessionID);
+        this.invalidate(sessionID);
+        await this.removeAdmission(this.admissionKey(sessionID));
+        return false;
+      }
+      await this.storage.supply(sessionID, cut.id, JSON.stringify({
+        source: this.storage.sourceID,
+        sessionID,
+        admissionID: cut.id,
+        summary: cut.data.summary
+      }));
+      return true;
+    } catch {
+      return false;
+    }
+  }
   rendered(row, model) {
     return restoreRow(row, model, hostUsesMediaAssets() ? {
       asset: hostMediaAsset,
@@ -24939,6 +25589,7 @@ class NativeFoldReplay {
         this.loaded.set(draft.sessionID, through);
         this.unavailable.delete(draft.sessionID);
         this.changed.delete(draft.sessionID);
+        this.staleHeads.delete(draft.sessionID);
       } finally {
         reader.close();
       }
@@ -24965,7 +25616,8 @@ class NativeFoldReplay {
   async supplyHeld(args) {
     const { draft, reader, summary } = args;
     const tail = this.tail(draft.sessionID);
-    const id = reader.latestRunningCompaction(draft.sessionID)?.id;
+    const running = reader.latestRunningCompaction(draft.sessionID);
+    const id = running?.id;
     if (!id || !tail || tail.model !== `${draft.model.providerID}/${draft.model.id}`)
       return false;
     const through = reader.latestSequence(draft.sessionID);
@@ -24989,6 +25641,21 @@ class NativeFoldReplay {
       summary
     };
     await this.storage.supply(draft.sessionID, id, JSON.stringify(snapshot));
+    if (this.admissions) {
+      const provenance = {
+        sourceDigest: foldDigest(reader.hostIdentity()),
+        sessionID: draft.sessionID,
+        admissionID: id,
+        summaryDigest: foldDigest(summary),
+        historyDigest: historyDigest(reader, draft.sessionID, (running?.seq ?? through) - 1)
+      };
+      const payload = JSON.stringify(provenance);
+      await this.admissions.set(this.admissionKey(draft.sessionID), {
+        payload,
+        digest: foldDigest(payload)
+      });
+      await this.removeLegacyAdmissions(draft.sessionID);
+    }
     return true;
   }
   async restore(sessionID, cut, model, options = {}) {
@@ -25073,6 +25740,9 @@ class NativeFoldReplay {
   sourceChanged(sessionID) {
     return this.changed.has(sessionID);
   }
+  needsHeadRebuild(sessionID) {
+    return this.staleHeads.has(sessionID);
+  }
   clear(sessionID) {
     this.sources.delete(sessionID);
     this.metadata.delete(sessionID);
@@ -25081,8 +25751,11 @@ class NativeFoldReplay {
     this.unavailable.delete(sessionID);
     this.dirty.delete(sessionID);
     this.changed.delete(sessionID);
+    this.staleHeads.delete(sessionID);
   }
   async forget(sessionID) {
+    if (this.admissions)
+      await forgetNativeFoldProvenance(this.admissions, sessionID);
     await this.storage.forget(sessionID);
   }
 }
@@ -25097,11 +25770,7 @@ class HostFoldPolicy {
     this.deps = deps;
   }
   owned(sessionID, cut, id) {
-    const row = this.deps.storage.admission(sessionID, id);
-    if (!isLocalCheckpoint(cut) || cut.id !== id || !row?.payload || row.digest !== foldDigest(row.payload))
-      return false;
-    const snapshot = JSON.parse(row.payload);
-    return snapshot.summary === cut.data.summary && snapshot.source === this.deps.storage.sourceID && snapshot.sessionID === sessionID && snapshot.admissionID === id;
+    return cut.id === id && isAdmittedLocalCheckpoint(this.deps.storage, sessionID, cut);
   }
   async idle(sessionID) {
     const { storage, session, threshold } = this.deps;
@@ -25524,7 +26193,7 @@ async function cleanupLegacyHiddenChildren(db, remove, note, options = {}) {
 // src/shared/models-dev-temperature.ts
 import { readFileSync as readFileSync5, statSync as statSync2 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 var CATALOG_PROVIDER_ALIASES = {
   "google-antigravity": "google",
   "opencode-zen": "opencode"
@@ -25534,7 +26203,7 @@ var cached;
 function modelsDevCatalogPath(env = process.env) {
   if (env.OPENCODE_MODELS_PATH)
     return env.OPENCODE_MODELS_PATH;
-  return join6(env.XDG_CACHE_HOME || join6(homedir3(), ".cache"), "opencode", "models.json");
+  return join7(env.XDG_CACHE_HOME || join7(homedir3(), ".cache"), "opencode", "models.json");
 }
 function buildIndex(raw) {
   const index = new Map;
@@ -26532,11 +27201,11 @@ class DeletedSessionTombstones {
 }
 
 // src/features/magic-context/dreamer/task-executor.ts
-import { createHash as createHash13 } from "node:crypto";
+import { createHash as createHash14 } from "node:crypto";
 import { existsSync as existsSync7, readFileSync as readFileSync8 } from "node:fs";
 
 // src/features/magic-context/mural/compress-cues.ts
-import { createHash as createHash7 } from "node:crypto";
+import { createHash as createHash8 } from "node:crypto";
 
 // src/features/magic-context/dreamer/storage-dream-state.ts
 var getDreamStateStatements = new WeakMap;
@@ -27279,7 +27948,7 @@ async function applyCuesThroughModule(args, chunk, manifestText, signal) {
       log2(`[dreamer] compress-cues: skipped cue for memory ${entry.id} (${failure.reason}; rejection ${rejectionCount}/${CUE_REJECTION_LATCH_THRESHOLD})`);
     }
   }
-  const commandId = `mural-cues:${route.moduleCommandId}:${createHash7("sha256").update(chunk.map((candidate) => candidate.memory.id).join(",")).digest("hex").slice(0, 24)}`;
+  const commandId = `mural-cues:${route.moduleCommandId}:${createHash8("sha256").update(chunk.map((candidate) => candidate.memory.id).join(",")).digest("hex").slice(0, 24)}`;
   let response;
   try {
     response = await route.moduleClient.call({
@@ -27882,7 +28551,7 @@ function applyReviewVerdict(args, leaseKey, parsed, result) {
 }
 
 // src/features/magic-context/dreamer/classify.ts
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 
 // src/plugin/rust-tool-backends.ts
 function isRustAuthorityDrainingError(error) {
@@ -28319,7 +28988,7 @@ async function runClassifyThroughModule(args, chunk, anchors, signal, runOnHost)
     if (entry.qualifier)
       modelVariants[entry.model] = entry.qualifier;
   }
-  const commandId = `classify:${args.moduleCommandId ?? Date.now()}:${createHash8("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`;
+  const commandId = `classify:${args.moduleCommandId ?? Date.now()}:${createHash9("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`;
   const runTask = (hostCompletion) => args.moduleClient?.call({
     sessionId: args.moduleSessionId,
     projectRoot: args.moduleProjectRoot,
@@ -28594,7 +29263,7 @@ function takeCurateSafetyRefusalCount(sessionId) {
 
 // src/features/magic-context/dreamer/docs-proposals.ts
 import { execFileSync } from "node:child_process";
-import { createHash as createHash9 } from "node:crypto";
+import { createHash as createHash10 } from "node:crypto";
 import {
   existsSync as existsSync4,
   mkdirSync,
@@ -28607,19 +29276,19 @@ import {
   writeFileSync
 } from "node:fs";
 import { tmpdir } from "node:os";
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 var FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
-var hash = (text) => createHash9("sha256").update(text).digest("hex");
-var proposalDir = (projectDir) => join7(projectDir, ".cortexkit/magic-context/docs-update-proposals");
+var hash = (text) => createHash10("sha256").update(text).digest("hex");
+var proposalDir = (projectDir) => join8(projectDir, ".cortexkit/magic-context/docs-update-proposals");
 function docsBaseHashes(projectDir) {
   return Object.fromEntries(FILES.map((name) => [
     name,
-    hash(existsSync4(join7(projectDir, name)) ? readFileSync6(join7(projectDir, name), "utf8") : "")
+    hash(existsSync4(join8(projectDir, name)) ? readFileSync6(join8(projectDir, name), "utf8") : "")
   ]));
 }
 function listPendingDocsProposals(projectDir) {
   const dir = proposalDir(projectDir);
-  return existsSync4(dir) ? readdirSync2(dir).filter((name) => name.endsWith(".md")).sort().map((name) => join7(dir, name)) : [];
+  return existsSync4(dir) ? readdirSync2(dir).filter((name) => name.endsWith(".md")).sort().map((name) => join8(dir, name)) : [];
 }
 function hasCurrentDocsProposal(projectDir) {
   const hashes = docsBaseHashes(projectDir);
@@ -28677,7 +29346,7 @@ function docsChangeSet(projectDir, storedAnchor) {
       const files = [
         ...new Set(changed.flat().filter((file) => file !== "ARCHITECTURE.md" && file !== "STRUCTURE.md" && !/(?:^|[./-])(test|spec)(?:[./-]|$)/.test(file) && !file.endsWith(".lock")))
       ];
-      const docs = FILES.map((file) => existsSync4(join7(projectDir, file)) ? readFileSync6(join7(projectDir, file), "utf8") : "").join(`
+      const docs = FILES.map((file) => existsSync4(join8(projectDir, file)) ? readFileSync6(join8(projectDir, file), "utf8") : "").join(`
 `);
       const relevant = files.some((file) => {
         const directory = file.split("/").slice(0, -1).join("/");
@@ -28805,14 +29474,14 @@ function protectedBytes(text) {
   ].map((match) => match[0]);
 }
 function diff(name, before, after) {
-  const dir = mkdtempSync(join7(tmpdir(), "mc-doc-diff-"));
+  const dir = mkdtempSync(join8(tmpdir(), "mc-doc-diff-"));
   try {
-    writeFileSync(join7(dir, "before"), before);
-    writeFileSync(join7(dir, "after"), after);
+    writeFileSync(join8(dir, "before"), before);
+    writeFileSync(join8(dir, "after"), after);
     try {
-      return execFileSync("git", ["diff", "--no-index", "--", join7(dir, "before"), join7(dir, "after")], { windowsHide: true, encoding: "utf8" });
+      return execFileSync("git", ["diff", "--no-index", "--", join8(dir, "before"), join8(dir, "after")], { windowsHide: true, encoding: "utf8" });
     } catch (error) {
-      return error.stdout?.replaceAll(join7(dir, "before"), `a/${name}`).replaceAll(join7(dir, "after"), `b/${name}`) ?? "";
+      return error.stdout?.replaceAll(join8(dir, "before"), `a/${name}`).replaceAll(join8(dir, "after"), `b/${name}`) ?? "";
     }
   } finally {
     rmSync2(dir, { recursive: true, force: true });
@@ -28833,7 +29502,7 @@ function validateDocsProposal(projectDir, output, budget, expected) {
   let tokens = 0;
   let diffs = "";
   for (const file of FILES) {
-    const before = existsSync4(join7(projectDir, file)) ? readFileSync6(join7(projectDir, file), "utf8") : "";
+    const before = existsSync4(join8(projectDir, file)) ? readFileSync6(join8(projectDir, file), "utf8") : "";
     let after = before;
     const seen = new Set;
     for (const change of changes.filter((item) => item.file === file)) {
@@ -28883,9 +29552,9 @@ ${change.text.trimEnd()}
 function writeDocsProposal(projectDir, output, budget, expected, head) {
   const result = validateDocsProposal(projectDir, output, budget, expected);
   const dir = proposalDir(projectDir);
-  mkdirSync(join7(dir, "superseded"), { recursive: true });
+  mkdirSync(join8(dir, "superseded"), { recursive: true });
   const stamp = `${new Date().toISOString().replace(/[:.]/g, "-")}-${Math.random().toString(36).slice(2, 8)}`;
-  const path = join7(dir, `${stamp}.md`);
+  const path = join8(dir, `${stamp}.md`);
   const body = `# Docs update proposal
 
 Base commit: ${head}
@@ -28913,7 +29582,7 @@ ${result.diffs}
   writeFileSync(path, body, { flag: "wx" });
   for (const old of listPendingDocsProposals(projectDir))
     if (old !== path)
-      renameSync(old, join7(dir, "superseded", old.split("/").at(-1) ?? "proposal.md"));
+      renameSync(old, join8(dir, "superseded", old.split("/").at(-1) ?? "proposal.md"));
   return path;
 }
 
@@ -29145,7 +29814,7 @@ function throwIfAborted2(signal) {
 }
 
 // src/features/magic-context/smart-notes/compiler.ts
-import { createHash as createHash10 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 
 // src/features/magic-context/smart-notes/compiler-prompt.ts
 var SMART_NOTE_COMPILER_SYSTEM_PROMPT = `You are the Magic Context smart-note compiler for the magic-context system.
@@ -29484,7 +30153,7 @@ function manifestAdvisoryWarnings(code, manifest) {
   return warnings;
 }
 function hashCheck(surfaceCondition, compiledCheck, manifest, checkCron) {
-  return createHash10("sha256").update(surfaceCondition ?? "").update("\x00").update(compiledCheck).update("\x00").update(JSON.stringify(manifest)).update("\x00").update(checkCron).digest("hex");
+  return createHash11("sha256").update(surfaceCondition ?? "").update("\x00").update(compiledCheck).update("\x00").update(JSON.stringify(manifest)).update("\x00").update(checkCron).digest("hex");
 }
 function extractJsonObject(output) {
   const fenced = output.match(/```(?:json)?\s*([\s\S]*?)```/i);
@@ -29562,7 +30231,7 @@ function deterministicJitterMs(intervalMs, noteId, hash) {
 }
 
 // src/features/magic-context/smart-notes/wake-plane.ts
-import { join as join8 } from "node:path";
+import { join as join9 } from "node:path";
 var WAKE_PLANE_CAPABILITY = "wake.create";
 var WAKE_PLANE_STATUS_TTL_MS = 5 * 60 * 1000;
 var WAKE_PLANE_HANDSHAKE_TIMEOUT_MS = 2000;
@@ -29571,7 +30240,7 @@ var inFlightProbe = null;
 var catalogProbe = probeWakePlaneCatalog;
 var now = () => Date.now();
 function connectionFile() {
-  return join8(getDataDir(), "cortexkit", "run", "subc-connection.json");
+  return join9(getDataDir(), "cortexkit", "run", "subc-connection.json");
 }
 async function probeWakePlaneCatalog() {
   const file = connectionFile();
@@ -30234,12 +30903,12 @@ async function archiveExpiredMemories(args) {
 
 // src/features/magic-context/dreamer/maintain-docs-protected-enforcement.ts
 import { existsSync as existsSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync2 } from "node:fs";
-import { join as join9 } from "node:path";
+import { join as join10 } from "node:path";
 var MAINTAIN_DOCS_SNAPSHOT_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
 function snapshotMaintainDocsFiles(docsDir) {
   const snapshot = new Map;
   for (const name of MAINTAIN_DOCS_SNAPSHOT_FILES) {
-    const path = join9(docsDir, name);
+    const path = join10(docsDir, name);
     try {
       if (existsSync5(path)) {
         snapshot.set(name, readFileSync7(path, "utf8"));
@@ -30250,7 +30919,7 @@ function snapshotMaintainDocsFiles(docsDir) {
 }
 
 // src/features/magic-context/dreamer/map-memories.ts
-import { createHash as createHash11 } from "node:crypto";
+import { createHash as createHash12 } from "node:crypto";
 
 // src/features/magic-context/dreamer/map-memories-prompt.ts
 import { execFile as execFile2 } from "node:child_process";
@@ -30485,7 +31154,7 @@ function readRetries(db, project) {
   }
 }
 function contentKey2(memory) {
-  return createHash11("sha256").update(`${memory.category}
+  return createHash12("sha256").update(`${memory.category}
 ${memory.content}`).digest("hex");
 }
 function isDeferred(memory, retries) {
@@ -30907,7 +31576,7 @@ async function applyParsedBatchMappings(args, batch, parsed, budgetFinalized = f
           name: "memory.set_mapping",
           arguments: {
             memory_project: args.projectIdentity,
-            command_id: `${args.moduleRoute.moduleCommandId}:${createHash11("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
+            command_id: `${args.moduleRoute.moduleCommandId}:${createHash12("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
             rows
           }
         }
@@ -32208,7 +32877,7 @@ function insertDreamRun(db, run) {
 }
 
 // src/features/magic-context/dreamer/verify.ts
-import { createHash as createHash12 } from "node:crypto";
+import { createHash as createHash13 } from "node:crypto";
 
 // src/features/magic-context/dreamer/verify-diff.ts
 import { execFile as execFile3 } from "node:child_process";
@@ -33073,7 +33742,7 @@ async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt, budg
           name: "memory.set_verification",
           arguments: {
             memory_project: args.projectIdentity,
-            command_id: `${args.moduleRoute.moduleCommandId}:${createHash12("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
+            command_id: `${args.moduleRoute.moduleCommandId}:${createHash13("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
             rows
           }
         }
@@ -33907,7 +34576,7 @@ function parseFrictionGateVerdict(verdict) {
 }
 function computeRetrospectiveWindowKey(flagged) {
   const anchors = flagged.map((message) => `${message.sessionId}:${message.ts}`).sort().join("|");
-  return createHash13("sha256").update(anchors).digest("hex").slice(0, 32);
+  return createHash14("sha256").update(anchors).digest("hex").slice(0, 32);
 }
 function renderFrictionWindow(messages, flaggedOrdinals, radius = 2) {
   const flagged = new Set(flaggedOrdinals);
@@ -35345,7 +36014,7 @@ function runTick(origin) {
   if (tickInFlight)
     return;
   tickInFlight = true;
-  log2(`[dreamer] timer tick (${origin}) — projects=${registeredProjects.size}`);
+  log2(`[magic-context] maintenance tick (${origin}) — projects=${registeredProjects.size}`);
   (async () => {
     try {
       const db = openTimerDatabaseOrNull("maintenance tick");
@@ -35395,6 +36064,9 @@ function persistTickOutcome(db, failure) {
   }
 }
 async function runMessageHistoryMaintenance(db) {
+  const prunedIdentities = await pruneMissingProjectIdentities();
+  if (prunedIdentities > 0)
+    log2(`[magic-context] pruned ${prunedIdentities} missing project identities`);
   try {
     await drainStaleLkgSlots(db);
   } catch (error) {
@@ -35628,10 +36300,20 @@ async function sweepGitCommits(args) {
   const holderId = crypto.randomUUID();
   const lease = acquireGitSweepLease(db, projectIdentity, holderId);
   if (!lease.acquired) {
-    const reason = lease.reason === "cooldown_active" ? `cooldown active until ${lease.nextAllowedAt}` : `lease held by ${lease.leaseHolder ?? "another holder"} until ${lease.leaseExpiresAt ?? "unknown"}`;
+    if (lease.reason === "cooldown_active")
+      return;
+    const reason = `lease held by ${lease.leaseHolder ?? "another holder"} until ${lease.leaseExpiresAt ?? "unknown"}`;
     log2(`[git-commits] sweep skipped for ${projectIdentity}: ${reason}`);
     return;
   }
+  if (projectIdentity.startsWith("dir:")) {
+    if (parkGitSweepNonIndexable(db, projectIdentity, holderId)) {
+      log2(`[git-commits] sweep parked for ${projectIdentity}: directory identity has no commits`);
+    } else {
+      releaseGitSweepLease(db, projectIdentity, holderId);
+    }
+    return;
+  }
   const startedAt = Date.now();
   const stopRenewal = startGitSweepLeaseRenewal(db, projectIdentity, holderId);
   log2(`[git-commits] sweep starting for ${projectIdentity} (sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
@@ -35892,9 +36574,9 @@ function hiddenTerminalError(event) {
 }
 
 // src/v2/hooks/lkg-system.ts
-import { createHash as createHash14 } from "node:crypto";
+import { createHash as createHash15 } from "node:crypto";
 function identity(slot) {
-  return createHash14("sha256").update(JSON.stringify({
+  return createHash15("sha256").update(JSON.stringify({
     capturedAt: slot.capturedAt,
     captureSequence: slot.captureSequence,
     rowVersion: slot.rowVersion,
@@ -48722,7 +49404,7 @@ function resolveCtxExpandMode(args, domain) {
 }
 
 // src/tools/ctx-expand/render.ts
-import { createHash as createHash15 } from "node:crypto";
+import { createHash as createHash16 } from "node:crypto";
 function isRecord6(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -48946,7 +49628,7 @@ function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
   const index = scoped ? Number(scoped[2]) : 0;
   const piText = message.parts.filter((part) => isRecord6(part) && part.type === "text");
   const part = message.parts[index];
-  const matching = derived ? piText.filter((part) => isRecord6(part) && typeof part.text === "string" && createHash15("sha256").update(part.text).digest("hex") === derived[3]) : [];
+  const matching = derived ? piText.filter((part) => isRecord6(part) && typeof part.text === "string" && createHash16("sha256").update(part.text).digest("hex") === derived[3]) : [];
   const selected = derived ? matching[Number(derived[4])] : textIndexDomain === "text" ? piText[index] : part;
   return selected ? renderPartFull(selected) ?? "" : `Tag ${number}'s original text part is no longer in stored history.`;
 }
@@ -49701,7 +50383,7 @@ import { isAbsolute as isAbsolute2 } from "node:path";
 // ../retina-local-fs/src/path-fence.ts
 import { lstat as lstat2, realpath as realpath2 } from "node:fs/promises";
 import { homedir as homedir4 } from "node:os";
-import { basename, dirname as dirname2, isAbsolute, join as join10, relative, resolve as resolve2, sep } from "node:path";
+import { basename, dirname as dirname2, isAbsolute, join as join11, relative, resolve as resolve2, sep } from "node:path";
 
 // ../retina-local-fs/src/errors.ts
 class ProviderError extends Error {
@@ -49716,7 +50398,7 @@ class ProviderError extends Error {
 // ../retina-local-fs/src/path-fence.ts
 async function resolveAndFenceProviderPath(configuredPath, options) {
   const { home, dataDirectory, aliases } = await resolveFenceRoots(options);
-  const expanded = configuredPath.startsWith("~/") ? join10(home, configuredPath.slice(2)) : configuredPath === "~" ? home : configuredPath;
+  const expanded = configuredPath.startsWith("~/") ? join11(home, configuredPath.slice(2)) : configuredPath === "~" ? home : configuredPath;
   const absolute = isAbsolute(expanded) ? resolve2(expanded) : resolve2(options.cwd ?? process.cwd(), expanded);
   const canonical = await canonicalPath(absolute, options.allowMissing);
   if (fenceCandidates(canonical, aliases).some((candidate) => isFencedPath(candidate, home, dataDirectory))) {
@@ -49733,13 +50415,13 @@ async function resolveFenceRoots(options) {
   } catch (error) {
     throw fsError(configuredHomePath, error);
   }
-  const configuredDataDirectory = resolve2(options.dataDirectory ?? process.env.XDG_DATA_HOME ?? join10(home, ".local", "share"));
+  const configuredDataDirectory = resolve2(options.dataDirectory ?? process.env.XDG_DATA_HOME ?? join11(home, ".local", "share"));
   const dataDirectory = await canonicalPath(configuredDataDirectory, true);
   const aliases = [];
-  const logicalCortexkit = join10(dataDirectory, "cortexkit");
+  const logicalCortexkit = join11(dataDirectory, "cortexkit");
   for (const logical of [
     logicalCortexkit,
-    ...FENCED_CORTEXKIT_ROOTS.map((root) => join10(logicalCortexkit, root))
+    ...FENCED_CORTEXKIT_ROOTS.map((root) => join11(logicalCortexkit, root))
   ]) {
     const canonical = await canonicalPath(logical, true);
     if (canonical !== logical)
@@ -49753,7 +50435,7 @@ function fenceCandidates(canonical, aliases) {
     const relativeToAlias = relative(alias.canonical, canonical);
     const inside = relativeToAlias === "" || relativeToAlias !== ".." && !relativeToAlias.startsWith(`..${sep}`) && !isAbsolute(relativeToAlias);
     if (inside)
-      candidates.push(join10(alias.logical, relativeToAlias));
+      candidates.push(join11(alias.logical, relativeToAlias));
   }
   return candidates;
 }
@@ -49784,7 +50466,7 @@ async function canonicalPath(path, allowMissing) {
       suffix.unshift(basename(candidate));
       candidate = parent;
       try {
-        return join10(await realpath2(candidate), ...suffix);
+        return join11(await realpath2(candidate), ...suffix);
       } catch (parentError) {
         if (!isMissingError(parentError)) {
           throw fsError(path, parentError);
@@ -49793,8 +50475,8 @@ async function canonicalPath(path, allowMissing) {
     }
   }
 }
-function isFencedPath(canonicalPath, homeDirectory, dataDirectory = process.env.XDG_DATA_HOME ?? join10(resolve2(homeDirectory), ".local", "share")) {
-  const cortexkitRoot = join10(resolve2(dataDirectory), "cortexkit");
+function isFencedPath(canonicalPath, homeDirectory, dataDirectory = process.env.XDG_DATA_HOME ?? join11(resolve2(homeDirectory), ".local", "share")) {
+  const cortexkitRoot = join11(resolve2(dataDirectory), "cortexkit");
   const relativeToCortexkit = relative(cortexkitRoot, canonicalPath);
   const insideCortexkit = relativeToCortexkit !== "" && relativeToCortexkit !== ".." && !relativeToCortexkit.startsWith(`..${sep}`) && !isAbsolute(relativeToCortexkit);
   const parts = insideCortexkit ? relativeToCortexkit.split(sep) : [];
@@ -50473,7 +51155,7 @@ function formatCtxReduceReply(stampedCount, selfStampCount = 0) {
   return parts.join(" ");
 }
 // src/tools/ctx-reduce/tools.ts
-import { createHash as createHash16 } from "node:crypto";
+import { createHash as createHash17 } from "node:crypto";
 
 // src/features/magic-context/range-parser.ts
 function parseRangeString(input) {
@@ -50536,11 +51218,11 @@ function createCtxReduceTool(deps) {
       const stableId = `oc-${sessionId}-${callId}`;
       if (Buffer.byteLength(stableId) <= 128)
         return stableId;
-      return `oc-${createHash16("sha256").update(stableId).digest("hex")}`;
+      return `oc-${createHash17("sha256").update(stableId).digest("hex")}`;
     }
     fallbackCommandSequence += 1;
     const monotonicId = `oc-${sessionId}-${fallbackCommandSequence}`;
-    return Buffer.byteLength(monotonicId) <= 128 ? monotonicId : `oc-${createHash16("sha256").update(monotonicId).digest("hex")}`;
+    return Buffer.byteLength(monotonicId) <= 128 ? monotonicId : `oc-${createHash17("sha256").update(monotonicId).digest("hex")}`;
   };
   return tool({
     description: CTX_REDUCE_DESCRIPTION,
@@ -51343,6 +52025,11 @@ async function applyV2SystemPrompt(systemPrompt, draft) {
     text
   })));
 }
+function coveredInstructionRows(reader, sessionID, throughSeq, model) {
+  if (throughSeq < 0)
+    return [];
+  return reader.instructionRowsThrough(sessionID, throughSeq).flatMap((row) => restoreRow(row, model)).map((message) => markCoveredInstructionRow(message));
+}
 async function registerContext(context) {
   const directory = context.location.directory;
   const config = loadPluginConfigDetailed(directory).config;
@@ -51382,7 +52069,7 @@ async function registerContext(context) {
   }
   const folds = new FoldOwner(context.storage);
   const nativeFoldMemory = !compactionOff && process.env.MC_OC2_INVISIBLE_FOLD === "1" ? nativeFoldCache(() => storage.require()) : undefined;
-  const nativeFoldReplay = nativeFoldMemory ? new NativeFoldReplay(nativeFoldMemory, () => openStoreReader()) : undefined;
+  const nativeFoldReplay = nativeFoldMemory ? new NativeFoldReplay(nativeFoldMemory, () => openStoreReader(), context.storage) : undefined;
   setOutputReserveConfig(config.output_reserve);
   const queriedModels = new Set;
   const rawLimits = new Map;
@@ -51434,6 +52121,7 @@ async function registerContext(context) {
     memorySyncRequestedSessions: rustMemorySyncRequestedSessions
   }) : undefined;
   const hiddenChildHook = new HiddenChildHook;
+  await context.session.hook("http.request", (draft) => hiddenChildHook.cacheRequest(draft));
   const tools = db && isDatabasePersisted(db) ? await registerTools(context, db, config, moduleToolBackends?.backends, (id) => hiddenChildHook.owns(id)) : undefined;
   const usage = new Map;
   const generateReplay = new V2GenerateReplay;
@@ -51810,87 +52498,114 @@ async function registerContext(context) {
   }) : undefined;
   const usageController = new AbortController;
   const usageDone = (async () => {
-    try {
-      for await (const value of context.event.subscribe({ signal: usageController.signal })) {
-        if (usageController.signal.aborted)
-          break;
-        const event = value;
-        if (event.type === "provider.updated" || event.type === "model.updated") {
-          queriedModels.clear();
-          continue;
-        }
-        if (!event.data?.sessionID)
-          continue;
-        const sessionID = event.data.sessionID;
-        if (event.type?.startsWith("session.revert.") || event.type === "session.message.content.updated") {
-          nativeFoldReplay?.onEvent(event);
-          restoredRows.forget(sessionID);
-        }
-        if (event.type === "session.error" || event.type === "session.execution.failed") {
-          const error = hiddenTerminalError(event);
-          if (error !== undefined)
-            hiddenSessionErrors.set(sessionID, error);
-          if (error !== undefined && db && !compactionOff) {
+    let retry = 0;
+    while (!usageController.signal.aborted) {
+      const subscribedAt = Date.now();
+      try {
+        for await (const value of context.event.subscribe({
+          signal: usageController.signal
+        })) {
+          if (usageController.signal.aborted)
+            break;
+          const event = value;
+          try {
+            if (event.type === "provider.updated" || event.type === "model.updated") {
+              queriedModels.clear();
+              continue;
+            }
+            if (!event.data?.sessionID)
+              continue;
+            const sessionID = event.data.sessionID;
+            if (event.type?.startsWith("session.revert.") || event.type === "session.message.content.updated") {
+              nativeFoldReplay?.onEvent(event);
+              restoredRows.forget(sessionID);
+            }
+            if (event.type === "session.error" || event.type === "session.execution.failed") {
+              const error = hiddenTerminalError(event);
+              if (error !== undefined)
+                hiddenSessionErrors.set(sessionID, error);
+              if (error !== undefined && db && !compactionOff) {
+                const model = liveModels.get(sessionID);
+                try {
+                  armLatestThinkingRecoveryFromError({
+                    db,
+                    sessionId: sessionID,
+                    error,
+                    providerID: model?.providerID,
+                    modelID: model?.modelID
+                  });
+                } catch (armError) {
+                  log2("[magic-context] v2 latest-thinking recovery arm failed", armError);
+                }
+              }
+              continue;
+            }
+            if (event.type === "session.deleted") {
+              clearLkgMeasuredRequest(sessionID);
+              deletedSessions.add(sessionID);
+              transform?.clearSessionLogState(sessionID);
+              if (db) {
+                markSessionCleanupPending(db, sessionID);
+                clearSession(db, sessionID);
+              }
+              rawProviders.get(sessionID)?.();
+              rawProviders.delete(sessionID);
+              usage.delete(sessionID);
+              hiddenSessionErrors.delete(sessionID);
+              storageNoticeBySession.delete(sessionID);
+              liveModels.delete(sessionID);
+              variants.delete(sessionID);
+              agents.delete(sessionID);
+              channel1.delete(sessionID);
+              commitSeenLastPass.delete(sessionID);
+              clearEmbedSessionState(sessionID);
+              historyRefreshSessions.delete(sessionID);
+              clearPendingMaterialization(pendingMaterializationSessions, sessionID);
+              lastHeuristicsTurnId.delete(sessionID);
+              restoredRows.forget(sessionID);
+              if (nativeFoldReplay)
+                await nativeFoldReplay.forget(sessionID);
+              else
+                await forgetNativeFoldProvenance(context.storage, sessionID);
+              generateReplay.forget(sessionID);
+              systemPromptRefreshSessions.delete(sessionID);
+              systemPrompt?.clearSession(sessionID);
+              tagger.cleanup(sessionID);
+              continue;
+            }
+            if (event.type !== "session.execution.succeeded")
+              continue;
             const model = liveModels.get(sessionID);
-            try {
-              armLatestThinkingRecoveryFromError({
-                db,
-                sessionId: sessionID,
-                error,
-                providerID: model?.providerID,
-                modelID: model?.modelID
+            if (model) {
+              await recordUsage({
+                sessionID,
+                model: { providerID: model.providerID, id: model.modelID }
               });
-            } catch (armError) {
-              log2("[magic-context] v2 latest-thinking recovery arm failed", armError);
+              if (!compactionOff && typeof await nativeFoldReplay?.baseline(sessionID) === "string")
+                hostFolds?.idle(sessionID);
             }
+          } catch (error) {
+            log2(`[magic-context] v2 event handler failed (type=${event.type ?? "unknown"}, session=${event.data?.sessionID ?? "none"})`, error);
           }
-          continue;
-        }
-        if (event.type === "session.deleted") {
-          clearLkgMeasuredRequest(sessionID);
-          deletedSessions.add(sessionID);
-          transform?.clearSessionLogState(sessionID);
-          if (db) {
-            markSessionCleanupPending(db, sessionID);
-            clearSession(db, sessionID);
-          }
-          rawProviders.get(sessionID)?.();
-          rawProviders.delete(sessionID);
-          usage.delete(sessionID);
-          hiddenSessionErrors.delete(sessionID);
-          storageNoticeBySession.delete(sessionID);
-          liveModels.delete(sessionID);
-          variants.delete(sessionID);
-          agents.delete(sessionID);
-          channel1.delete(sessionID);
-          commitSeenLastPass.delete(sessionID);
-          clearEmbedSessionState(sessionID);
-          historyRefreshSessions.delete(sessionID);
-          clearPendingMaterialization(pendingMaterializationSessions, sessionID);
-          lastHeuristicsTurnId.delete(sessionID);
-          restoredRows.forget(sessionID);
-          await nativeFoldReplay?.forget(sessionID);
-          generateReplay.forget(sessionID);
-          systemPromptRefreshSessions.delete(sessionID);
-          systemPrompt?.clearSession(sessionID);
-          tagger.cleanup(sessionID);
-          continue;
-        }
-        if (event.type !== "session.execution.succeeded")
-          continue;
-        const model = liveModels.get(sessionID);
-        if (model) {
-          await recordUsage({
-            sessionID,
-            model: { providerID: model.providerID, id: model.modelID }
-          });
-          if (!compactionOff && typeof await nativeFoldReplay?.baseline(sessionID) === "string")
-            hostFolds?.idle(sessionID);
         }
+      } catch (error) {
+        if (!usageController.signal.aborted)
+          log2("[magic-context] v2 usage subscription failed", error);
+      }
+      if (usageController.signal.aborted)
+        break;
+      if (Date.now() - subscribedAt >= 30000)
+        retry = 0;
+      const ceiling = Math.min(30000, 250 * 2 ** retry);
+      retry = Math.min(retry + 1, 7);
+      try {
+        await delay(ceiling * (0.5 + Math.random() * 0.5), undefined, {
+          signal: usageController.signal
+        });
+      } catch (error) {
+        if (!usageController.signal.aborted)
+          throw error;
       }
-    } catch (error) {
-      if (!usageController.signal.aborted)
-        log2("[magic-context] v2 usage subscription failed", error);
     }
   })();
   const materialize = (draft) => {
@@ -52163,6 +52878,7 @@ async function registerContext(context) {
         compactionOff,
         storeGeneration: "v2",
         normalizeRestoredAssistantText: stripCopiedTagNotation,
+        refreshSourceContents: (sessionID) => nativeFoldReplay?.needsHeadRebuild(sessionID) ?? false,
         hostCleanupCompactionMarkers: () => ({
           verified: true,
           removedLineages: 0,
@@ -52251,12 +52967,13 @@ async function registerContext(context) {
           historyRefreshSessions.add(draft.sessionID);
           requestPendingMaterialization(pendingMaterializationSessions, draft.sessionID, "boundary_repair");
         }
-        const incoming = cut && draft.messages.find((message) => message.id === cut.id);
+        const localCut = cut && isLocalCheckpoint(cut) ? cut : undefined;
+        const incoming = localCut && draft.messages.find((message) => message.id === localCut.id);
         postFold = cut !== undefined;
-        if (cut && !incoming)
+        if (localCut && !incoming)
           throw new Error("The host checkpoint disappeared from the context draft");
         let nativeRestored;
-        if (cut && nativeFoldReplay && isLocalCheckpoint(cut)) {
+        if (cut && nativeFoldReplay && await nativeFoldReplay.admits(draft.sessionID, cut, reader)) {
           try {
             nativeRestored = await nativeFoldReplay.restore(draft.sessionID, cut, `${draft.model.providerID}/${draft.model.id}`, { bounded: !rustModeModuleClient });
           } catch (error) {
@@ -52265,7 +52982,11 @@ async function registerContext(context) {
             nativeRestored = await nativeFoldReplay.restoreRead(draft.sessionID, cut, draft.model);
           }
         }
-        if (nativeRestored && nativeFoldReplay?.sourceChanged(draft.sessionID)) {
+        if (cut && nativeFoldReplay?.sourceChanged(draft.sessionID)) {
+          if (db && !rustModeModuleClient && nativeFoldReplay.needsHeadRebuild(draft.sessionID))
+            clearCachedM0(db, draft.sessionID);
+          if (nativeFoldReplay.needsHeadRebuild(draft.sessionID))
+            restoredRows.forget(draft.sessionID);
           historyRefreshSessions.add(draft.sessionID);
           requestPendingMaterialization(pendingMaterializationSessions, draft.sessionID, "host_history_change");
         }
@@ -52276,25 +52997,27 @@ async function registerContext(context) {
             return !id || !present.has(id);
           });
           draft.messages.splice(0, draft.messages.length, ...hidden, ...draft.messages.filter((message) => message !== incoming));
-        } else if (cut && incoming) {
-          const identity = await folds.observe({
-            sessionID: draft.sessionID,
-            cutSeq: cut.seq,
-            summary: cut.data.summary ?? "",
-            rendered: incoming,
-            onHard: (reason) => {
-              sessionLog2(draft.sessionID, `HARD reason=${reason}`);
-              materialize(draft);
-              requestPendingMaterialization(pendingMaterializationSessions, draft.sessionID, "host_compaction");
-            }
-          });
-          checkpoint = structuredClone(identity.rendered ?? incoming);
-          submitted = identity.rendered ? identity.renderedSummary ?? identity.submitted : cut.data.summary ?? "";
+        } else if (localCut && cut && incoming) {
+          if (!nativeFoldReplay) {
+            const identity = await folds.observe({
+              sessionID: draft.sessionID,
+              cutSeq: cut.seq,
+              summary: cut.data.summary ?? "",
+              rendered: incoming,
+              onHard: (reason) => {
+                sessionLog2(draft.sessionID, `HARD reason=${reason}`);
+                materialize(draft);
+                requestPendingMaterialization(pendingMaterializationSessions, draft.sessionID, "host_compaction");
+              }
+            });
+            checkpoint = structuredClone(identity.rendered ?? incoming);
+            submitted = identity.rendered ? identity.renderedSummary ?? identity.submitted : cut.data.summary ?? "";
+          }
           const moduleBoundaryID = rustModeModuleClient ? getPersistedCompactionMarkerState(db, draft.sessionID)?.boundaryMessageId ?? null : null;
           const moduleBoundarySeq = moduleBoundaryID ? reader.sequenceForId(draft.sessionID, moduleBoundaryID) : undefined;
           const boundaryID = db.prepare("SELECT cached_m0_last_baseline_end_message_id AS id FROM session_meta WHERE session_id = ?").get(draft.sessionID)?.id ?? (boundaryRepair?.kind === "repaired" || boundaryRepair?.kind === "baseline-reset" ? boundaryRepair.anchorEndMessageId : null);
           const servedBoundary = boundaryID ? servedBoundaryRow(reader, draft.sessionID, boundaryID) : null;
-          const boundary = (moduleBoundarySeq !== undefined ? moduleBoundarySeq - 1 : undefined) ?? servedBoundary?.seq ?? reader.sequenceForId(draft.sessionID, boundaryID) ?? (reader.earliestSequence(draft.sessionID) ?? 0) - 1;
+          const boundary = (nativeFoldReplay?.sourceChanged(draft.sessionID) && !rustModeModuleClient ? (reader.earliestSequence(draft.sessionID) ?? 0) - 1 : undefined) ?? (moduleBoundarySeq !== undefined ? moduleBoundarySeq - 1 : undefined) ?? servedBoundary?.seq ?? reader.sequenceForId(draft.sessionID, boundaryID) ?? (reader.earliestSequence(draft.sessionID) ?? 0) - 1;
           if (moduleBoundarySeq !== undefined)
             sessionLog2(draft.sessionID, `v2 restore: from the module boundary ${moduleBoundaryID} to the host checkpoint`);
           const present = new Set(draft.messages.map((message) => message.id));
@@ -52302,7 +53025,7 @@ async function registerContext(context) {
             asset: hostMediaAsset,
             unavailable: (detail) => sessionLog2(draft.sessionID, `v2 restore: attachment replaced by a note row=${detail.rowID} name=${JSON.stringify(detail.name ?? null)} mediaType=${detail.mediaType} reason=${JSON.stringify(detail.reason)}`)
           } : undefined));
-          draft.messages.splice(0, draft.messages.length, ...restored, ...draft.messages.filter((message) => message !== incoming));
+          draft.messages.splice(0, draft.messages.length, ...rustModeModuleClient ? [] : coveredInstructionRows(reader, draft.sessionID, Math.min(boundary, cut.seq), draft.model), ...restored, ...draft.messages.filter((message) => message !== incoming));
         }
         if (config.temporal_awareness === true)
           messageTimes = reader.messageTimes(draft.sessionID, draft.messages.flatMap((message) => message.id ? [message.id] : []));
@@ -52545,13 +53268,13 @@ ${baseline}
   }, 0));
   return {
     async dispose() {
+      usageController.abort();
       await hiddenCompletionExecutor?.dispose();
+      await usageDone;
       rpcStopped = true;
       rpcServer.stop();
       transform?.disposeRust();
       tools?.dispose();
-      usageController.abort();
-      await usageDone;
       deletedSessions.clear();
       await dreamTrigger?.dispose();
       await maintenanceTimer?.dispose();