@cortexkit/pi-magic-context 0.42.1 → 0.42.2

package/dist/index.js

@@ -174,6 +174,7 @@ import {
   escapeXmlContent,
   getModuleNoteEvaluationBridge,
   getContextStoreUuid,
+  drainMirrorPages,
   parseCompartmentOutput,
   resolveWorkspaceShareCategories,
   resolveWorkspaceIdentitySet,
@@ -463,7 +464,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-pknkkpnp.js";
+} from "./index-6zjn0r2z.js";
 import {
   pushNotification2
 } from "./index-b3eqj1g6.js";
@@ -2414,14 +2415,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) {
@@ -2441,7 +2453,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) {
@@ -2450,8 +2463,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) {
@@ -2459,22 +2473,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) {
@@ -2486,16 +2502,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;
@@ -2511,7 +2517,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": {
@@ -2527,16 +2533,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);
@@ -2581,15 +2590,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":
@@ -7049,6 +7058,116 @@ Output exactly JSON: {"met": false}`;
   }
 }
 
+// ../plugin/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;
+  });
+}
+
 // ../plugin/src/features/magic-context/dreamer/maintain-docs-protected-enforcement.ts
 import { existsSync as existsSync3, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { join as join2 } from "node:path";
@@ -9388,6 +9507,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)
@@ -9438,7 +9560,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,
@@ -9767,7 +9889,9 @@ function createDreamTaskExecutor(deps) {
         parent,
         recordRun,
         computeMemoryDelta,
-        reportProgress
+        reportProgress,
+        leaseAcquisition,
+        moduleRoute
       });
     } catch (error) {
       const { transient, brief } = classifyFailure(error);
@@ -10068,17 +10192,6 @@ async function runAgenticTask(config, ctx, helpers) {
     architecture: existsSync5(`${docsDir}/ARCHITECTURE.md`),
     structure: existsSync5(`${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, () => {
@@ -10087,7 +10200,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,
@@ -10179,6 +10322,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("; ");
@@ -14210,78 +14354,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) {
@@ -16456,11 +16615,16 @@ function buildAggregateTarget(tagId, occurrences, requiresToolArcSkeleton) {
       const complete = occurrences.some((occ) => occ.kind === "tool_use") && occurrences.some((occ) => occ.kind === "tool_result");
       if (!complete)
         return "incomplete";
-      if (!requiresToolArcSkeleton && occurrences.every((occ) => occ.part.remove && occ.part.canRemove?.() !== false)) {
-        let removed = false;
-        for (const occ of occurrences)
-          removed = occ.part.remove?.() || removed;
-        return removed ? "removed" : "absent";
+      if (!requiresToolArcSkeleton) {
+        const authorization = occurrences.map((occ) => occ.part.canRemove?.());
+        if (authorization.includes("defer"))
+          return "incomplete";
+        if (occurrences.every((occ, index) => occ.part.remove && authorization[index] !== false)) {
+          let removed = false;
+          for (const occ of occurrences)
+            removed = occ.part.remove?.() || removed;
+          return removed ? "removed" : "absent";
+        }
       }
       const sentinel = `[dropped §${tagId}§]`;
       let any = false;
@@ -21104,7 +21268,7 @@ function applyPiHeuristicCleanup(sessionId, db, targets, piMessages, config, pre
             emergencyDroppedTools++;
           }
         }
-      })();
+      }).immediate();
       sessionLog(sessionId, `emergency tiered drop: ${plan.reason}`);
     } else {
       sessionLog(sessionId, `emergency tiered drop skipped: ${plan.reason}`);
@@ -21133,7 +21297,7 @@ function applyPiHeuristicCleanup(sessionId, db, targets, piMessages, config, pre
           droppedStaleReduceCalls++;
         }
       }
-    })();
+    }).immediate();
   }
   if (routine) {
     db.transaction(() => {
@@ -21170,7 +21334,7 @@ function applyPiHeuristicCleanup(sessionId, db, targets, piMessages, config, pre
           }
         }
       }
-    })();
+    }).immediate();
   }
   const toolFingerprints = routine ? buildPiToolFingerprints(piMessages, resolveStableId) : new Map;
   if (toolFingerprints.size > 0) {
@@ -21208,7 +21372,7 @@ function applyPiHeuristicCleanup(sessionId, db, targets, piMessages, config, pre
           }
         }
       }
-    })();
+    }).immediate();
   }
   if (droppedTools > 0 || deduplicatedTools > 0 || droppedInjections > 0 || droppedStaleReduceCalls > 0) {
     sessionLog(sessionId, `heuristic cleanup: dropped ${droppedTools} tool tags, stale ctx_reduce=${droppedStaleReduceCalls}, deduplicated ${deduplicatedTools} tool calls, dropped ${droppedInjections} system injections`);
@@ -23544,6 +23708,23 @@ function applyNativeReasoningReplayPi(args, saved) {
     args.messages[index] = message;
   return nextIds.size;
 }
+function authorizePiToolRemoval(args) {
+  if (!args.saved)
+    return false;
+  if (args.saved.get(args.callId) === NATIVE_TOOL_REMOVAL_MARKER)
+    return true;
+  if (!args.canApply)
+    return false;
+  try {
+    saveNativeToolInputs(args.db, args.sessionId, new Map([[args.callId, NATIVE_TOOL_REMOVAL_MARKER]]));
+    args.saved.set(args.callId, NATIVE_TOOL_REMOVAL_MARKER);
+    return true;
+  } catch (error) {
+    sessionLog(args.sessionId, `tool arc removal persistence failed; retaining pair: ${String(error)}`);
+    const priorDrop = args.db.prepare("SELECT 1 FROM tags WHERE session_id = ? AND type = 'tool' AND message_id = ? AND status = 'dropped' LIMIT 1").get(args.sessionId, args.callId);
+    return priorDrop ? false : "defer";
+  }
+}
 
 // src/note-visibility-pi.ts
 var NOTE_TOOL_NAME = "ctx_note";
@@ -23703,13 +23884,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);
@@ -23728,6 +23934,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;
@@ -23753,7 +23961,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);
@@ -23812,7 +24024,8 @@ function registerLkgPersistence(backend) {
 }
 function slotBytes(slot) {
   const digestBytes = slot.inputContentDigests.reduce((total, digest) => total + 2 * digest.length, 0);
-  return 2 * slot.jsonPrefix.length + digestBytes + LKG_METADATA_BYTES;
+  const ownershipBytes = slot.piOutputEntryIds?.reduce((total, id) => total + (id?.length ?? 0) * 2 + 8, 0) ?? 0;
+  return 2 * slot.jsonPrefix.length + digestBytes + ownershipBytes + LKG_METADATA_BYTES;
 }
 var LKG_SNAPSHOT_ARRAY = Symbol("array");
 var LKG_SNAPSHOT_OBJECT = Symbol("object");
@@ -23973,6 +24186,7 @@ function captureSlot(sessionId, slot) {
   const entry = {
     slot: {
       ...slot,
+      ...slot.piOutputEntryIds ? { piOutputEntryIds: [...slot.piOutputEntryIds] } : {},
       inputIdSeq: [...slot.inputIdSeq],
       inputContentDigests: [...slot.inputContentDigests],
       inputContentSignatures: slot.inputContentSignatures ? [...slot.inputContentSignatures] : undefined
@@ -24011,6 +24225,7 @@ function installHydratedSlot(sessionId, slot) {
   const entry = {
     slot: {
       ...slot,
+      ...slot.piOutputEntryIds ? { piOutputEntryIds: [...slot.piOutputEntryIds] } : {},
       inputIdSeq: [...slot.inputIdSeq],
       inputContentDigests: [...slot.inputContentDigests],
       inputContentSignatures: slot.inputContentSignatures ? [...slot.inputContentSignatures] : undefined
@@ -24043,6 +24258,7 @@ function hydrateSlotFromPersistence(sessionId) {
 function copySlotForRead(slot) {
   return {
     ...slot,
+    ...slot.piOutputEntryIds ? { piOutputEntryIds: [...slot.piOutputEntryIds] } : {},
     inputIdSeq: [...slot.inputIdSeq],
     inputContentDigests: [...slot.inputContentDigests],
     inputContentSignatures: slot.inputContentSignatures ? [...slot.inputContentSignatures] : undefined
@@ -24521,16 +24737,13 @@ function snapshotInputs(messages, entryIds) {
   }
   const inputs = [];
   const seen = new Set;
-  for (let index = firstStableIndex;index < entryIds.length; index += 1) {
-    const id = entryIds[index];
-    if (typeof id !== "string" || id.length === 0) {
-      return { inputs: [], failure: "lkg_entry_id_gap" };
-    }
-    if (seen.has(id))
-      return { inputs: [], failure: "lkg_duplicate_entry_id" };
+  for (let index = 0;index < entryIds.length; index += 1) {
     const fields = lkgContentFields(messages[index]);
     if (!fields)
       return { inputs: [], failure: "lkg_content_snapshot_failed" };
+    const id = entryIds[index] || `pi-lkg-unmapped:${lkgContentDigestFromFields(fields)}`;
+    if (seen.has(id))
+      return { inputs: [], failure: "lkg_duplicate_entry_id" };
     seen.add(id);
     inputs.push({ id, messageIndex: index, fields });
   }
@@ -24626,6 +24839,29 @@ function createPiLkgCoordinator(db, scheduleCapture = (capture) => setImmediate(
     if (snapshot.replayAnchorInputIndex === null || snapshot.pristineTail === null) {
       return { ok: false, reason: "lkg_miss" };
     }
+    const slot = getSlot(snapshot.sessionId);
+    const start = slot?.inputIdSeq.indexOf(snapshot.inputs[0]?.id ?? "") ?? -1;
+    if (slot && start > 0) {
+      const ownership = slot.piOutputEntryIds;
+      if (!ownership)
+        return { ok: false, reason: "lkg_output_mapping_unavailable" };
+      if (slot.modelKey !== snapshot.modelKey || slot.providerKey !== snapshot.providerKey)
+        return { ok: false, reason: "lkg_model_mismatch" };
+      const surviving = snapshot.inputs.slice(0, snapshot.replayAnchorInputIndex + 1);
+      if (surviving.length !== slot.inputIdSeq.length - start || surviving.some((input, index) => input.id !== slot.inputIdSeq[start + index]))
+        return { ok: false, reason: "lkg_invalidated_reshape" };
+      if (surviving.some((input, index) => lkgContentDigestFromFields(input.fields) !== slot.inputContentDigests[start + index]))
+        return { ok: false, reason: "lkg_content_mismatch" };
+      const removed = new Set(slot.inputIdSeq.slice(0, start));
+      const prefix = JSON.parse(slot.jsonPrefix);
+      return {
+        ok: true,
+        messages: [
+          ...prefix.filter((_, index) => ownership[index] === null || !removed.has(ownership[index] ?? "")),
+          ...snapshot.pristineTail
+        ]
+      };
+    }
     const entry = {
       pristineTail: snapshot.pristineTail,
       entryInputIds: snapshot.inputs.map((input) => input.id),
@@ -24662,6 +24898,22 @@ function createPiLkgCoordinator(db, scheduleCapture = (capture) => setImmediate(
       return;
     }
     const state = stateFor(snapshot.sessionId);
+    const idsByDigest = new Map;
+    if (!args.outputEntryIds)
+      for (const input of snapshot.inputs) {
+        const digest = lkgContentDigestFromFields(input.fields);
+        idsByDigest.set(digest, idsByDigest.has(digest) ? undefined : input.id);
+      }
+    const inferredIds = args.outputEntryIds ?? args.outputMessages.map((message) => {
+      const fields = lkgContentFields(message);
+      if (!fields)
+        return;
+      const digest = lkgContentDigestFromFields(fields);
+      return idsByDigest.get(digest);
+    });
+    const outputIds = args.outputEntryIds ?? inferredIds;
+    const inputIds = new Set(snapshot.inputs.map((input) => input.id));
+    const ownership = outputIds.length === args.outputMessages.length && outputIds.every((id) => id === null || typeof id === "string" && inputIds.has(id)) ? [...outputIds] : undefined;
     state.captureSequence += 1;
     const plan = {
       sessionId: snapshot.sessionId,
@@ -24702,6 +24954,7 @@ function createPiLkgCoordinator(db, scheduleCapture = (capture) => setImmediate(
         reusedPrefix = incremental.reusedPrefix;
         const slot = {
           jsonPrefix: plan.jsonPrefix,
+          piOutputEntryIds: ownership,
           inputIdSeq,
           inputContentDigests: incremental.digests,
           inputContentSignatures,
@@ -24749,6 +25002,24 @@ function createPiLkgCoordinator(db, scheduleCapture = (capture) => setImmediate(
   };
   return { beginPass, replay, captureAppliedPass };
 }
+function resolvePiLkgOutputEntryIds(messages, syntheticLeadingCount, entryId) {
+  const ids = messages.map((message, index) => index < syntheticLeadingCount ? null : isRecord(message) ? entryId(message) : undefined);
+  const syntheticOwners = new Map;
+  for (let index = 0;index < messages.length; index++) {
+    const message = messages[index];
+    const owner = ids[index];
+    if (typeof owner !== "string" || !isRecord(message) || message.role !== "assistant" || !Array.isArray(message.content))
+      continue;
+    for (const part of message.content) {
+      if (isRecord(part) && part.type === "toolCall" && part.syntheticTodoMarker === true && typeof part.id === "string")
+        syntheticOwners.set(part.id, syntheticOwners.has(part.id) ? undefined : owner);
+    }
+  }
+  return ids.map((id, index) => {
+    const message = messages[index];
+    return id === undefined && isRecord(message) && message.role === "toolResult" && message.syntheticTodoMarker === true && typeof message.toolCallId === "string" ? syntheticOwners.get(message.toolCallId) : id;
+  });
+}
 
 // src/pi-pressure.ts
 function extractAssistantUsage(message) {
@@ -26593,7 +26864,9 @@ function createPiAssistantPart(working, messageIndex, partIndex, markDirty) {
     canRemove() {
       const message = working[messageIndex];
       const part = message.content[partIndex];
-      return part?.type === "toolCall" && canRemoveNativeToolCall(message, part.id) && toolRemovalAuthorization.get(working)?.(part.id) !== false;
+      if (part?.type !== "toolCall" || !canRemoveNativeToolCall(message, part.id))
+        return false;
+      return toolRemovalAuthorization.get(working)?.(part.id) ?? true;
     },
     remove() {
       return markToolRemoval(working, messageIndex, partIndex);
@@ -27627,6 +27900,9 @@ function registerPiContextHandler(pi, baseOptions) {
         modelKey: lkgModelKey,
         providerKey: lkgProviderKey
       });
+      const lkgInputIdByRef = new Map;
+      for (const input of lkgPassSnapshot.inputs)
+        lkgInputIdByRef.set(event.messages[input.messageIndex], input.id);
       const thinkingBindingRecoveryApplied = applyPiThinkingBindingRecovery({
         db: options.db,
         sessionId,
@@ -27935,6 +28211,7 @@ function registerPiContextHandler(pi, baseOptions) {
         projectDirectory,
         sessionMeta,
         messages: event.messages,
+        lkgEntryIds: event.messages.map((message) => lkgInputIdByRef.get(message)),
         smartDrops: options.smartDrops === true,
         protectedTags: options.protectedTags ?? 20,
         protectedTokens: options.protectedTokens,
@@ -28214,6 +28491,7 @@ function registerPiContextHandler(pi, baseOptions) {
         lkgCoordinator.captureAppliedPass({
           snapshot: lkgPassSnapshot,
           outputMessages,
+          outputEntryIds: resolvePiLkgOutputEntryIds(outputMessages, result.syntheticLeadingCount, (message) => result.postCommitEntryIdByRef.get(message) ?? result.lkgEntryIdByRef.get(message)),
           cacheBusting: result.bustedThisPass
         });
       }
@@ -28774,7 +29052,8 @@ async function runCompactionOffPipeline(args) {
       protectedTagNumbers: new Set,
       pendingDropTagNumbers: new Set
     },
-    postCommitEntryIdByRef: new Map
+    postCommitEntryIdByRef: new Map,
+    lkgEntryIdByRef: new Map
   };
 }
 async function runPipeline(args) {
@@ -28816,22 +29095,13 @@ async function runPipeline(args) {
   const tTranscriptBuild = performance.now();
   const transcript = createPiTranscript(args.messages, args.sessionId, args.entryIds, {
     preserveReasoningToolArcs: args.reasoningClearing?.preserveReasoningToolArcs,
-    authorizeToolRemoval: (callId) => {
-      if (!nativeRemovalInputs)
-        return false;
-      if (nativeRemovalInputs.get(callId) === NATIVE_TOOL_REMOVAL_MARKER)
-        return true;
-      if (!isCacheBustingPass)
-        return false;
-      try {
-        saveNativeToolInputs(args.db, args.sessionId, new Map([[callId, NATIVE_TOOL_REMOVAL_MARKER]]));
-        nativeRemovalInputs.set(callId, NATIVE_TOOL_REMOVAL_MARKER);
-        return true;
-      } catch (error) {
-        sessionLog(args.sessionId, `tool arc removal persistence failed; retaining pair: ${String(error)}`);
-        return false;
-      }
-    }
+    authorizeToolRemoval: (callId) => authorizePiToolRemoval({
+      db: args.db,
+      sessionId: args.sessionId,
+      callId,
+      saved: nativeRemovalInputs,
+      canApply: isCacheBustingPass
+    })
   });
   logTransformTiming(args.sessionId, "transcriptBuild", tTranscriptBuild);
   const workingMessages = transcript.getWorkingMessages();
@@ -29377,6 +29647,7 @@ async function runPipeline(args) {
   const tPostCommitStableIdMaps = performance.now();
   const postCommitStableIdByRef = new Map;
   const postCommitEntryIdByRef = new Map;
+  const lkgEntryIdByRef = new Map;
   for (let i = 0;i < args.messages.length; i++) {
     const m = args.messages[i];
     if (!m || typeof m !== "object")
@@ -29384,6 +29655,9 @@ async function runPipeline(args) {
     const id = resolvePiStableId(m, i, args.entryIds, args.entryIdByRef ?? undefined);
     if (id)
       postCommitStableIdByRef.set(m, id);
+    const lkgId = args.lkgEntryIds?.[i];
+    if (lkgId)
+      lkgEntryIdByRef.set(m, lkgId);
     const realId = args.entryIds?.[i];
     if (typeof realId === "string" && realId.length > 0) {
       postCommitEntryIdByRef.set(m, realId);
@@ -29548,7 +29822,8 @@ async function runPipeline(args) {
     reasoningWatermark: args.sessionMeta.clearedReasoningThroughTag ?? 0,
     activeTags,
     channelBaselineSnapshot,
-    postCommitEntryIdByRef
+    postCommitEntryIdByRef,
+    lkgEntryIdByRef
   };
 }
 var AUTO_SEARCH_NO_HINT_REASONS = new Set([
@@ -32364,7 +32639,7 @@ function formatTailHygiene(status) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.42.1",
+  version: "0.42.2",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -32395,7 +32670,7 @@ var package_default = {
     build: "tsc -p ../retina-local-fs/tsconfig.build.json && rm -f dist/index.js dist/subagent-entry.js dist/historian-calibration-extension.js dist/transformers-web.js dist/transformers-node-wasm.js dist/*-*.js && bun build ../plugin/src/features/magic-context/memory/transformers-web-entry.ts --outfile dist/transformers-web.js --target browser --format esm --external onnxruntime-web && bun ../plugin/scripts/build-transformers-node-wasm.ts dist && bun build src/index.ts src/subagent-entry.ts src/historian-calibration-extension.ts --outdir dist --target node --format esm --splitting --external @earendil-works/pi-coding-agent --external @earendil-works/pi-tui --external onnxruntime-node --external onnxruntime-web --external sharp --external node:sqlite",
     "build:e2e-argv": "bun build src/subagent-runner.ts --outfile ../../tests/docker/.generated/subagent-runner-e2e.mjs --target node --format esm --external node:sqlite",
     typecheck: "tsc -p ../retina-local-fs/tsconfig.build.json && tsc --noEmit",
-    test: "bun install --frozen-lockfile && bun test",
+    test: "bun install --frozen-lockfile && bun test --parallel --timeout 30000",
     lint: "biome check src",
     "lint:fix": "biome check --write src",
     format: "biome format --write src",