@cortexkit/opencode-magic-context 0.42.1 → 0.42.2

package/dist/index.js

@@ -296,6 +296,8 @@ import {
   clearDetectedContextLimit,
   getPersistedCompactionMarkerState,
   setPersistedCompactionMarkerState,
+  getDeferredClearedCompactionMarkerState,
+  retireDeferredClearedCompactionMarkerState,
   getStrippedPlaceholderIds,
   applyStrippedPlaceholderDelta,
   removeStrippedPlaceholderId,
@@ -540,7 +542,7 @@ import {
   setRecompTerminal2,
   runManagedRecomp2,
   runManagedUpgrade2
-} from "./index-1q9kay7n.js";
+} from "./index-953x7a79.js";
 import {
   stripJsonComments,
   isPrototypePollutionKey,
@@ -16893,6 +16895,116 @@ Output exactly JSON: {"met": false}`;
   }
 }
 
+// src/features/magic-context/dreamer/expire-memories.ts
+var MODULE_ARCHIVE_BATCH_SIZE = 100;
+var EXPIRED_ARCHIVE_REASON = "expired";
+function getExpiredActiveMemoryIds(db, projectIdentity, now = Date.now()) {
+  const rows = db.prepare(`SELECT id
+               FROM memories
+              WHERE project_path = ?
+                AND status = 'active'
+                AND expires_at IS NOT NULL
+                AND expires_at <= ?
+              ORDER BY id`).all(projectIdentity, now);
+  return rows.map((row) => row.id);
+}
+function assertSuccessfulModuleArchive(response) {
+  const result = response && typeof response === "object" && "result" in response ? response.result : response;
+  if (result && typeof result === "object") {
+    const record = result;
+    if (record.ok === false || record.error) {
+      throw new Error("module rejected expired-memory archive");
+    }
+  }
+}
+async function archiveExpiredThroughModule(args) {
+  if (!args.moduleRoute.moduleClient.mirrorPull) {
+    throw new DreamerModuleFailureError("mirror.pull expired archive", new Error("Rust dreamer client omitted the memory mirror route"));
+  }
+  for (let offset = 0;offset < args.expiredContextIds.length; offset += MODULE_ARCHIVE_BATCH_SIZE) {
+    if (!leaseOwnershipMatches(args.db, args.holderId, args.leaseAcquisition.generation, args.leaseKey)) {
+      throw new Error("Dream lease lost before expired-memory archive");
+    }
+    const contextBatch = args.expiredContextIds.slice(offset, offset + MODULE_ARCHIVE_BATCH_SIZE);
+    const identities = getModuleMemoryIdentities(args.db, args.projectIdentity, contextBatch);
+    if (identities.size !== contextBatch.length) {
+      throw new DreamerModuleFailureError("ctx_memory expired archive", new Error("expired memory is missing its module mirror identity"));
+    }
+    const moduleBatch = contextBatch.map((id) => {
+      const identity = identities.get(id);
+      if (!identity)
+        throw new Error(`missing module identity for expired memory ${id}`);
+      return identity.moduleId;
+    });
+    try {
+      const response = await args.moduleRoute.moduleClient.call({
+        sessionId: args.moduleRoute.moduleSessionId,
+        projectRoot: args.moduleRoute.moduleProjectRoot,
+        method: "ctx_memory",
+        body: {
+          name: "ctx_memory",
+          arguments: {
+            action: "archive",
+            memory_project: args.projectIdentity,
+            ids: moduleBatch,
+            reason: EXPIRED_ARCHIVE_REASON,
+            command_id: `${args.moduleRoute.moduleCommandId}:expire:${offset / MODULE_ARCHIVE_BATCH_SIZE}`
+          }
+        }
+      });
+      assertSuccessfulModuleArchive(response);
+    } catch (error) {
+      throw new DreamerModuleFailureError("ctx_memory expired archive", error);
+    }
+  }
+  const mirrorPull = args.moduleRoute.moduleClient.mirrorPull;
+  const drained = await drainMirrorPages({
+    db: args.db,
+    module: {
+      mirrorPull: (request) => mirrorPull({ ...request, projectRoot: args.moduleRoute.moduleProjectRoot })
+    },
+    domain: "memories",
+    limit: 1000
+  });
+  if (!drained.complete) {
+    throw new DreamerModuleFailureError("mirror.pull expired archive", new Error("memory mirror did not reach the module cursor"));
+  }
+  if (!leaseOwnershipMatches(args.db, args.holderId, args.leaseAcquisition.generation, args.leaseKey)) {
+    throw new Error("Dream lease lost during expired-memory archive");
+  }
+  return args.expiredContextIds.length;
+}
+async function archiveExpiredMemories(args) {
+  const expiredContextIds = getExpiredActiveMemoryIds(args.db, args.projectIdentity, args.now);
+  if (expiredContextIds.length === 0) {
+    if (!leaseOwnershipMatches(args.db, args.holderId, args.leaseAcquisition.generation, args.leaseKey)) {
+      throw new Error("Dream lease lost before expired-memory probe");
+    }
+    return 0;
+  }
+  if (args.moduleRoute) {
+    return archiveExpiredThroughModule({
+      ...args,
+      expiredContextIds,
+      moduleRoute: args.moduleRoute
+    });
+  }
+  const selectedIds = new Set(expiredContextIds);
+  return runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
+    const stillExpired = getExpiredActiveMemoryIds(args.db, args.projectIdentity, args.now).filter((id) => selectedIds.has(id));
+    for (const id of stillExpired) {
+      archiveMemory(args.db, id, EXPIRED_ARCHIVE_REASON);
+      queueMemoryMutation(args.db, {
+        projectPath: args.projectIdentity,
+        mutationType: "archive",
+        targetMemoryId: id,
+        queuedAt: args.now
+      });
+    }
+    return stillExpired.length;
+  });
+}
+
 // src/features/magic-context/dreamer/maintain-docs-protected-enforcement.ts
 import { existsSync as existsSync7, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "node:fs";
 import { join as join7 } from "node:path";
@@ -18202,14 +18314,25 @@ function countActiveMemories(db, projectPath) {
   const row = db.prepare("SELECT COUNT(*) AS cnt FROM memories WHERE project_path = ? AND status IN ('active','permanent')").get(projectPath);
   return row?.cnt ?? 0;
 }
+function countLiveMemories(db, projectPath, options = {}) {
+  const unclassified = options.unclassifiedOnly && hasMemoryClassifiedAtColumn(db);
+  const row = db.prepare(`SELECT COUNT(*) AS cnt
+               FROM memories
+              WHERE project_path = ?
+                AND status IN ('active','permanent')
+                AND (expires_at IS NULL OR expires_at > ?)
+                ${unclassified ? "AND classified_at IS NULL" : ""}`).get(projectPath, Date.now());
+  return row?.cnt ?? 0;
+}
 function countUnmappedActiveMemories(db, projectPath) {
   const row = db.prepare(`SELECT COUNT(*) AS cnt
                FROM memories m
               WHERE m.project_path = ?
                 AND m.status IN ('active','permanent')
+                AND (m.expires_at IS NULL OR m.expires_at > ?)
                 AND NOT EXISTS (
                     SELECT 1 FROM memory_verifications v WHERE v.memory_id = m.id
-                )`).get(projectPath);
+                )`).get(projectPath, Date.now());
   return row?.cnt ?? 0;
 }
 function countCompartmentsSince(db, projectPath, since) {
@@ -18229,7 +18352,8 @@ function countMappedMemories(db, projectPath) {
                JOIN memory_verifications v ON v.memory_id = m.id
               WHERE m.project_path = ?
                 AND m.status IN ('active','permanent')
-                AND v.file_path <> ''`).get(projectPath);
+                AND (m.expires_at IS NULL OR m.expires_at > ?)
+                AND v.file_path <> ''`).get(projectPath, Date.now());
   return row?.cnt ?? 0;
 }
 function countUnverifiedMappedMemories(db, projectPath) {
@@ -18238,8 +18362,9 @@ function countUnverifiedMappedMemories(db, projectPath) {
                JOIN memory_verifications v ON v.memory_id = m.id
               WHERE m.project_path = ?
                 AND m.status IN ('active','permanent')
+                AND (m.expires_at IS NULL OR m.expires_at > ?)
                 AND v.file_path <> ''
-                AND v.verified_at = 0`).get(projectPath);
+                AND v.verified_at = 0`).get(projectPath, Date.now());
   return row?.cnt ?? 0;
 }
 function countBroadCycleCandidates(db, projectPath, cycleStartAt) {
@@ -18247,22 +18372,24 @@ function countBroadCycleCandidates(db, projectPath, cycleStartAt) {
                FROM memories m
               WHERE m.project_path = ?
                 AND m.status IN ('active','permanent')
+                AND (m.expires_at IS NULL OR m.expires_at > ?)
                 AND (
                     SELECT MAX(v.verified_at)
                       FROM memory_verifications v
                      WHERE v.memory_id = m.id
                        AND v.file_path <> ''
-                ) < ?`).get(projectPath, cycleStartAt);
+                ) < ?`).get(projectPath, Date.now(), cycleStartAt);
   return row?.cnt ?? 0;
 }
 function countCueCandidates(db, projectPath) {
   if (!hasMuralCueColumns(db))
-    return countActiveMemories(db, projectPath);
+    return countLiveMemories(db, projectPath);
   const row = db.prepare(`SELECT COUNT(*) AS cnt
                FROM memories
               WHERE project_path = ?
                 AND status IN ('active','permanent')
-                AND (mural_cue IS NULL OR mural_cue_hash IS NULL OR updated_at > mural_cue_at)`).get(projectPath);
+                AND (expires_at IS NULL OR expires_at > ?)
+                AND (mural_cue IS NULL OR mural_cue_hash IS NULL OR updated_at > mural_cue_at)`).get(projectPath, Date.now());
   return row?.cnt ?? 0;
 }
 function countStalePrimers(db, projectPath) {
@@ -18274,16 +18401,6 @@ function countStalePrimers(db, projectPath) {
                      OR last_observed_at > answer_refreshed_at)`).get(projectPath);
   return row?.cnt ?? 0;
 }
-function countUnclassifiedActiveMemories(db, projectPath) {
-  if (!hasMemoryClassifiedAtColumn(db))
-    return countActiveMemories(db, projectPath);
-  const row = db.prepare(`SELECT COUNT(*) AS cnt
-               FROM memories
-              WHERE project_path = ?
-                AND status IN ('active','permanent')
-                AND classified_at IS NULL`).get(projectPath);
-  return row?.cnt ?? 0;
-}
 function countPendingSmartNotes(db, projectPath) {
   const row = db.prepare("SELECT COUNT(*) AS cnt FROM notes WHERE project_path = ? AND type = 'smart' AND status = 'pending'").get(projectPath);
   return row?.cnt ?? 0;
@@ -18299,7 +18416,7 @@ function countActivePrimers(db, projectPath) {
 function getDreamTaskBacklog(db, projectPath, task, options = {}) {
   switch (task) {
     case "map-memories": {
-      const total = countActiveMemories(db, projectPath);
+      const total = countLiveMemories(db, projectPath);
       return { pending: countUnmappedActiveMemories(db, projectPath), total };
     }
     case "verify": {
@@ -18315,16 +18432,19 @@ function getDreamTaskBacklog(db, projectPath, task, options = {}) {
       return { pending, total };
     }
     case "curate": {
-      const total = countActiveMemories(db, projectPath);
+      const total = countLiveMemories(db, projectPath);
       return { pending: total, total };
     }
     case "compress-cues": {
-      const total = countActiveMemories(db, projectPath);
+      const total = countLiveMemories(db, projectPath);
       return { pending: countCueCandidates(db, projectPath), total };
     }
     case "classify-memories": {
-      const total = countActiveMemories(db, projectPath);
-      return { pending: countUnclassifiedActiveMemories(db, projectPath), total };
+      const total = countLiveMemories(db, projectPath);
+      return {
+        pending: countLiveMemories(db, projectPath, { unclassifiedOnly: true }),
+        total
+      };
     }
     case "retrospective": {
       const pending = countProjectSessionsSince(db, projectPath, options.retrospectiveWatermarkMs ?? null);
@@ -18369,15 +18489,15 @@ function evaluateTaskGate(task, ctx) {
     case "map-memories":
       return countUnmappedActiveMemories(db, project) > 0;
     case "verify":
-      return countActiveMemories(db, project) > 0;
+      return countLiveMemories(db, project) > 0;
     case "verify-broad":
-      return getTaskScheduleState(db, project, "verify-broad")?.lastBroadRunAt != null || countActiveMemories(db, project) > 0;
+      return getTaskScheduleState(db, project, "verify-broad")?.lastBroadRunAt != null || countLiveMemories(db, project) > 0;
     case "curate":
       return countActiveMemories(db, project) > 0;
     case "compress-cues":
-      return countActiveMemories(db, project) > 0;
+      return countLiveMemories(db, project) > 0;
     case "classify-memories":
-      return countActiveMemories(db, project) > 0;
+      return countLiveMemories(db, project) > 0;
     case "retrospective":
       return countProjectSessionsSince(db, project, ctx.retrospectiveWatermarkMs ?? null) > 0;
     case "maintain-docs":
@@ -19115,6 +19235,9 @@ function inspectCurateMemoryOperations(messages) {
   }
   return summary;
 }
+function formatExpiredArchiveProgress(count) {
+  return `curate: archived ${count} expired ${count === 1 ? "memory" : "memories"}`;
+}
 function formatCurateMemoryOperations(actions) {
   const actionCounts = new Map;
   for (const action of actions)
@@ -19165,7 +19288,7 @@ function createDreamTaskExecutor(deps) {
     };
     const parent = await resolveParentSessionId();
     let moduleRoute;
-    if (config.task === "map-memories" || config.task === "compress-cues" || config.task === "classify-memories" || config.task === "verify" || config.task === "verify-broad" || config.task === "retrospective") {
+    if (config.task === "curate" || config.task === "map-memories" || config.task === "compress-cues" || config.task === "classify-memories" || config.task === "verify" || config.task === "verify-broad" || config.task === "retrospective") {
       try {
         moduleRoute = await resolveDreamerModuleRoute({
           db,
@@ -19494,7 +19617,9 @@ function createDreamTaskExecutor(deps) {
         parent,
         recordRun,
         computeMemoryDelta,
-        reportProgress
+        reportProgress,
+        leaseAcquisition,
+        moduleRoute
       });
     } catch (error) {
       const { transient, brief } = classifyFailure(error);
@@ -19795,17 +19920,6 @@ async function runAgenticTask(config, ctx, helpers) {
     architecture: existsSync9(`${docsDir}/ARCHITECTURE.md`),
     structure: existsSync9(`${docsDir}/STRUCTURE.md`)
   } : undefined;
-  let curateMemories;
-  if (task === "curate") {
-    curateMemories = loadActiveMemoryPromptMemories(db, projectIdentity);
-    log(`[dreamer] curate pool: in_scope=${curateMemories.length}`);
-  }
-  const taskPrompt = buildDreamTaskPrompt(task, {
-    projectPath: projectIdentity,
-    lastDreamAt: lastRunAt ? String(lastRunAt) : null,
-    existingDocs,
-    curate: curateMemories ? { memories: curateMemories } : undefined
-  });
   const abortController = new AbortController;
   let leaseLost = false;
   const heartbeat = startLeaseHeartbeat(db, holderId, leaseKey, () => {
@@ -19814,7 +19928,37 @@ async function runAgenticTask(config, ctx, helpers) {
   }, ctx.leaseAcquisition);
   let childSessionId = null;
   let promptSettled = false;
+  let expiredArchived = 0;
   try {
+    let curateMemories;
+    if (task === "curate") {
+      expiredArchived = await archiveExpiredMemories({
+        db,
+        projectIdentity,
+        holderId,
+        leaseKey,
+        leaseAcquisition: helpers.leaseAcquisition,
+        moduleRoute: helpers.moduleRoute
+      });
+      if (leaseLost)
+        throw new Error("Dream lease lost during expired-memory archive");
+      curateMemories = loadActiveMemoryPromptMemories(db, projectIdentity);
+      log(`[dreamer] curate pool: in_scope=${curateMemories.length} expired_archived=${expiredArchived}`);
+      if (curateMemories.length === 0 && expiredArchived > 0) {
+        const progress = formatExpiredArchiveProgress(expiredArchived);
+        helpers.recordRun("completed", null, {
+          memoryChanges: helpers.computeMemoryDelta(memoryBefore),
+          progress
+        });
+        return { status: "completed", detail: progress };
+      }
+    }
+    const taskPrompt = buildDreamTaskPrompt(task, {
+      projectPath: projectIdentity,
+      lastDreamAt: lastRunAt ? String(lastRunAt) : null,
+      existingDocs,
+      curate: curateMemories ? { memories: curateMemories } : undefined
+    });
     const createResponse = await createChildSessionWithFence({
       client: deps.client,
       db,
@@ -19906,6 +20050,7 @@ async function runAgenticTask(config, ctx, helpers) {
     }
     const curateOutput = task === "curate" ? run.validated : undefined;
     const progress = [
+      expiredArchived > 0 ? formatExpiredArchiveProgress(expiredArchived) : null,
       curateOutput && curateOutput.memoryOperations.completedActions.length > 0 ? formatCurateMemoryOperations(curateOutput.memoryOperations.completedActions) : null,
       curateRefused > 0 ? `curate: refused ${curateRefused} unsafe mutation(s)` : null
     ].filter((value) => Boolean(value)).join("; ");
@@ -20922,7 +21067,13 @@ function createDreamTimerModuleClient(moduleClient) {
       }
       return moduleClient.authorityStatus(args);
     } : undefined,
-    call: (args) => moduleClient.call(args)
+    call: (args) => moduleClient.call(args),
+    mirrorPull: moduleClient.mirrorPull ? (args) => {
+      if (!moduleClient.mirrorPull) {
+        throw new Error("Rust module mirror route became unavailable");
+      }
+      return moduleClient.mirrorPull(args);
+    } : undefined
   };
 }
 
@@ -29343,7 +29494,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = getDb();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await import("./recomp-orchestrator-m33b3rk9.js");
+    const { runManagedRecomp } = await import("./recomp-orchestrator-5g8f5rhy.js");
     const { sendIgnoredMessage } = await import("./send-session-notification-1qeqkswb.js");
     log(`[rpc] recomp requested for session ${sessionId}`);
     const ctx = await buildManagedCtx(db);
@@ -29362,7 +29513,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = getDb();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedUpgrade } = await import("./recomp-orchestrator-m33b3rk9.js");
+    const { runManagedUpgrade } = await import("./recomp-orchestrator-5g8f5rhy.js");
     const { sendIgnoredMessage } = await import("./send-session-notification-1qeqkswb.js");
     log(`[rpc] session-upgrade requested for session ${sessionId}`);
     const ctx = await buildManagedCtx(db);
@@ -30410,13 +30561,38 @@ function parsePersistedLkgSlot(row) {
   const jsonPrefix = record.json_prefix;
   const lastInputMessageId = record.last_input_message_id;
   const capturedAt = record.captured_at;
-  const inputIdSeq = parseStringArray(record.input_id_seq);
+  let inputIdsRaw = record.input_id_seq;
+  let piOutputEntryIds;
+  if (typeof inputIdsRaw === "string") {
+    try {
+      const metadata = JSON.parse(inputIdsRaw);
+      if (metadata && !Array.isArray(metadata) && metadata.version === 1 && Array.isArray(metadata.piOutputEntryIds)) {
+        if (!metadata.piOutputEntryIds.every((id) => id === null || typeof id === "string" && id.length > 0))
+          return;
+        piOutputEntryIds = metadata.piOutputEntryIds;
+        inputIdsRaw = JSON.stringify(metadata.inputIds);
+      }
+    } catch {
+      return;
+    }
+  }
+  const inputIdSeq = parseStringArray(inputIdsRaw);
   const inputContentDigests = parseStringArray(record.input_content_digests);
   const modelKey = parseNullableString(record.model_key);
   const providerKey = parseNullableString(record.provider_key);
   if (typeof jsonPrefix !== "string" || typeof lastInputMessageId !== "string" || lastInputMessageId.length === 0 || typeof capturedAt !== "number" || !Number.isFinite(capturedAt) || inputIdSeq === null || inputContentDigests === null || inputContentDigests.length !== inputIdSeq.length || modelKey === undefined || providerKey === undefined) {
     return;
   }
+  if (piOutputEntryIds) {
+    try {
+      const output = JSON.parse(jsonPrefix);
+      const inputs = new Set(inputIdSeq);
+      if (!Array.isArray(output) || output.length !== piOutputEntryIds.length || piOutputEntryIds.some((id) => id !== null && !inputs.has(id)))
+        return;
+    } catch {
+      return;
+    }
+  }
   let inputContentSignatures;
   if (record.input_content_signatures !== null && record.input_content_signatures !== undefined) {
     const parsed = parseStringArray(record.input_content_signatures);
@@ -30435,6 +30611,8 @@ function parsePersistedLkgSlot(row) {
   };
   if (inputContentSignatures)
     slot.inputContentSignatures = inputContentSignatures;
+  if (piOutputEntryIds)
+    slot.piOutputEntryIds = piOutputEntryIds;
   const rowVersion = parseNullableInteger(record.row_version);
   if (rowVersion !== undefined)
     slot.rowVersion = rowVersion;
@@ -30460,7 +30638,11 @@ function saveLkgSlotToDb(db, sessionId, slot) {
                 provider_key = excluded.provider_key,
                 captured_at = excluded.captured_at,
                 row_version = excluded.row_version,
-                capture_sequence = excluded.capture_sequence`).run(sessionId, slot.jsonPrefix, JSON.stringify(slot.inputIdSeq), JSON.stringify(slot.inputContentDigests), slot.inputContentSignatures ? JSON.stringify(slot.inputContentSignatures) : null, slot.lastInputMessageId, slot.modelKey, slot.providerKey, slot.capturedAt, slot.rowVersion ?? null, slot.captureSequence ?? null);
+                capture_sequence = excluded.capture_sequence`).run(sessionId, slot.jsonPrefix, JSON.stringify(slot.piOutputEntryIds ? {
+      version: 1,
+      inputIds: slot.inputIdSeq,
+      piOutputEntryIds: slot.piOutputEntryIds
+    } : slot.inputIdSeq), JSON.stringify(slot.inputContentDigests), slot.inputContentSignatures ? JSON.stringify(slot.inputContentSignatures) : null, slot.lastInputMessageId, slot.modelKey, slot.providerKey, slot.capturedAt, slot.rowVersion ?? null, slot.captureSequence ?? null);
     return true;
   } catch (error) {
     sessionLog(sessionId, "LKG snapshot persistence failed (in-memory slot retained):", error);
@@ -31944,7 +32126,7 @@ function applyHeuristicCleanup(sessionId, db, targets, messageTagNumbers, config
             emergencyReclaimedTokens += estimateEmergencyDropReclaimTokens(tag);
           }
         }
-      })();
+      }).immediate();
       sessionLog(sessionId, `emergency tiered drop: ${plan.reason}`);
     } else {
       sessionLog(sessionId, `emergency tiered drop skipped: ${plan.reason}`);
@@ -31991,7 +32173,7 @@ function applyHeuristicCleanup(sessionId, db, targets, messageTagNumbers, config
           }
         }
       }
-    })();
+    }).immediate();
   }
   const allMessages = Array.from(messageTagNumbers.keys());
   const toolFingerprints = buildToolFingerprints(allMessages);
@@ -32030,7 +32212,7 @@ function applyHeuristicCleanup(sessionId, db, targets, messageTagNumbers, config
           }
         }
       }
-    })();
+    }).immediate();
   }
   if (droppedTools > 0 || deduplicatedTools > 0 || droppedInjections > 0) {
     sessionLog(sessionId, `heuristic cleanup: dropped ${droppedTools} tool tags, deduplicated ${deduplicatedTools} tool calls, dropped ${droppedInjections} system injections`);
@@ -32295,78 +32477,93 @@ function buildReplacementContent(tagId) {
 }
 function applyPendingOperations(sessionId, db, targets, protectedTagIds, preloadedTags, preloadedPendingOps, syntheticPendingOps = [], editMarkerTagIds = new Set) {
   let didMutateMessage = false;
-  db.transaction(() => {
-    const tags = preloadedTags ?? getTagsBySession(db, sessionId);
-    const tagStatusById = new Map(tags.map((tag) => [tag.tagNumber, tag.status]));
-    const tagTypeById = new Map(tags.map((tag) => [tag.tagNumber, tag.type]));
-    const pendingOps = preloadedPendingOps ?? getPendingOps(db, sessionId);
-    const opsToApply = [
-      ...pendingOps.map((op) => ({ op, synthetic: false })),
-      ...syntheticPendingOps.map((op) => ({ op, synthetic: true }))
-    ];
-    const skeletonWindow = new Set(tags.filter((tag) => tag.type === "tool").map((tag) => tag.tagNumber).sort((left, right) => right - left).slice(0, RECENT_TOOL_SKELETON_WINDOW));
-    for (const { op: pendingOp, synthetic } of opsToApply) {
-      const tagStatus = tagStatusById.get(pendingOp.tagId);
-      if (tagStatus === "compacted" || tagStatus === "dropped") {
-        if (!synthetic)
-          removePendingOp(db, sessionId, pendingOp.tagId);
-        continue;
-      }
-      if (protectedTagIds.has(pendingOp.tagId)) {
-        continue;
-      }
-      const target = targets.get(pendingOp.tagId);
-      const isToolTag = tagTypeById.get(pendingOp.tagId) === "tool";
-      if (synthetic) {
-        if (!isToolTag || target?.canDrop?.() !== true)
+  let admitted = false;
+  let startedAt = 0;
+  try {
+    db.transaction(() => {
+      admitted = true;
+      startedAt = performance.now();
+      const tags = preloadedTags ?? getTagsBySession(db, sessionId);
+      const tagStatusById = new Map(tags.map((tag) => [tag.tagNumber, tag.status]));
+      const tagTypeById = new Map(tags.map((tag) => [tag.tagNumber, tag.type]));
+      const pendingOps = preloadedPendingOps ?? getPendingOps(db, sessionId);
+      const opsToApply = [
+        ...pendingOps.map((op) => ({ op, synthetic: false })),
+        ...syntheticPendingOps.map((op) => ({ op, synthetic: true }))
+      ];
+      const skeletonWindow = new Set(tags.filter((tag) => tag.type === "tool").map((tag) => tag.tagNumber).sort((left, right) => right - left).slice(0, RECENT_TOOL_SKELETON_WINDOW));
+      for (const { op: pendingOp, synthetic } of opsToApply) {
+        const tagStatus = tagStatusById.get(pendingOp.tagId);
+        if (tagStatus === "compacted" || tagStatus === "dropped") {
+          if (!synthetic)
+            removePendingOp(db, sessionId, pendingOp.tagId);
           continue;
-      }
-      let shouldPersistDrop = false;
-      if (isToolTag) {
-        if (editMarkerTagIds.has(pendingOp.tagId)) {
-          const markResult = target?.editMarker?.() ?? "absent";
-          if (markResult === "incomplete" || markResult === "absent") {
-            continue;
-          }
-          didMutateMessage = true;
-          updateTagDropMode(db, sessionId, pendingOp.tagId, "edit_marker");
-          shouldPersistDrop = true;
-        } else if (skeletonWindow.has(pendingOp.tagId)) {
-          const truncResult = target?.truncate?.() ?? "absent";
-          if (truncResult === "incomplete" || synthetic && truncResult !== "truncated") {
+        }
+        if (protectedTagIds.has(pendingOp.tagId)) {
+          continue;
+        }
+        const target = targets.get(pendingOp.tagId);
+        const isToolTag = tagTypeById.get(pendingOp.tagId) === "tool";
+        if (synthetic) {
+          if (!isToolTag || target?.canDrop?.() !== true)
             continue;
-          }
-          if (truncResult === "truncated") {
+        }
+        let shouldPersistDrop = false;
+        if (isToolTag) {
+          if (editMarkerTagIds.has(pendingOp.tagId)) {
+            const markResult = target?.editMarker?.() ?? "absent";
+            if (markResult === "incomplete" || markResult === "absent") {
+              continue;
+            }
             didMutateMessage = true;
+            updateTagDropMode(db, sessionId, pendingOp.tagId, "edit_marker");
+            shouldPersistDrop = true;
+          } else if (skeletonWindow.has(pendingOp.tagId)) {
+            const truncResult = target?.truncate?.() ?? "absent";
+            if (truncResult === "incomplete" || synthetic && truncResult !== "truncated") {
+              continue;
+            }
+            if (truncResult === "truncated") {
+              didMutateMessage = true;
+            }
+            updateTagDropMode(db, sessionId, pendingOp.tagId, "truncated");
+            shouldPersistDrop = true;
+          } else {
+            const dropResult = target?.drop?.() ?? "absent";
+            if (dropResult === "incomplete" || synthetic && dropResult !== "removed") {
+              continue;
+            }
+            if (dropResult === "removed") {
+              didMutateMessage = true;
+            }
+            updateTagDropMode(db, sessionId, pendingOp.tagId, "full");
+            shouldPersistDrop = true;
           }
-          updateTagDropMode(db, sessionId, pendingOp.tagId, "truncated");
-          shouldPersistDrop = true;
-        } else {
-          const dropResult = target?.drop?.() ?? "absent";
-          if (dropResult === "incomplete" || synthetic && dropResult !== "removed") {
-            continue;
-          }
-          if (dropResult === "removed") {
+        } else if (target) {
+          const changed = target.setContent(buildReplacementContent(pendingOp.tagId));
+          if (changed)
             didMutateMessage = true;
-          }
-          updateTagDropMode(db, sessionId, pendingOp.tagId, "full");
+          shouldPersistDrop = true;
+        } else if (!synthetic) {
           shouldPersistDrop = true;
         }
-      } else if (target) {
-        const changed = target.setContent(buildReplacementContent(pendingOp.tagId));
-        if (changed)
-          didMutateMessage = true;
-        shouldPersistDrop = true;
-      } else if (!synthetic) {
-        shouldPersistDrop = true;
+        if (!shouldPersistDrop)
+          continue;
+        updateTagStatus(db, sessionId, pendingOp.tagId, "dropped");
+        if (!synthetic)
+          removePendingOp(db, sessionId, pendingOp.tagId);
       }
-      if (!shouldPersistDrop)
-        continue;
-      updateTagStatus(db, sessionId, pendingOp.tagId, "dropped");
-      if (!synthetic)
-        removePendingOp(db, sessionId, pendingOp.tagId);
+    }).immediate();
+  } catch (error) {
+    if (!admitted && /database (?:table )?is locked|sqlite_(busy|locked)/i.test(String(error))) {
+      sessionLog(sessionId, "pending operations write admission busy; retaining prior bytes for retry");
+      return false;
     }
-  })();
+    throw error;
+  } finally {
+    if (admitted)
+      logSlowWriteTransaction("apply_pending_operations", startedAt);
+  }
   return didMutateMessage;
 }
 function applyFlushedStatuses(sessionId, db, targets, preloadedTags) {
@@ -33163,7 +33360,8 @@ function runRustModePostprocess(args) {
     db: args.db,
     sessionId: args.sessionId,
     tagger: args.tagger,
-    ctxReduceAvailability: args.ctxReduceAvailability
+    ctxReduceAvailability: args.ctxReduceAvailability,
+    isCacheBustingPass: args.materializedBoundary != null
   });
   for (const anchor of getNoteNudgeAnchors(args.db, args.sessionId)) {
     appendReminderToUserMessageById(args.messages, anchor.messageId, anchor.text);
@@ -33258,6 +33456,13 @@ function dropMarkerSummaryTag(db, sessionId, summaryMessageId) {
     updateTagStatus(db, sessionId, tagNumber, "dropped");
 }
 function reconcileMarkerRepresentation(messages, persistedMarkerState, options) {
+  if (persistedMarkerState === null) {
+    if (options.isCacheBustingPass === true) {
+      retireDeferredClearedCompactionMarkerState(options.db, options.sessionId);
+    } else {
+      persistedMarkerState = getDeferredClearedCompactionMarkerState(options.db, options.sessionId);
+    }
+  }
   const retainedMessages = [];
   const staleSummaryIds = new Set;
   for (const message of messages) {
@@ -33955,7 +34160,8 @@ async function runPostTransformPhase(args) {
       db: args.db,
       sessionId: args.sessionId,
       tagger: args.tagger,
-      ctxReduceAvailability: args.ctxReduceAvailability
+      ctxReduceAvailability: args.ctxReduceAvailability,
+      isCacheBustingPass
     });
   }
   const deferredHistoryDrainEligible = historyWasConsumedThisPass && args.deferredHistoryWasPendingAtPassStart && !suppressV12HistoryDrain;