@cortexkit/pi-magic-context 0.49.30 → 0.49.32

package/dist/index.js

@@ -139,6 +139,7 @@ import {
   decodePiContentDecision,
   getPiContentDecisions,
   freezePiContentDecision,
+  withNativeReplayWriteBarrier,
   getNativeReplayState,
   saveNativeToolInputs,
   addNativeReasoningIds,
@@ -262,7 +263,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-gxjppvsh.js";
+} from "./index-d0n9yjnc.js";
 import"./index-4knyh1kt.js";
 import {
   canonicalModelIdentity,
@@ -304,7 +305,7 @@ import {
   openCurrentDatabase,
   openDatabaseAsync,
   closeDatabase
-} from "./index-y5x5wt5t.js";
+} from "./index-r9y6tbbm.js";
 import {
   sameProjectDirectory,
   pruneMissingProjectIdentities,
@@ -329,6 +330,7 @@ import {
   HYGIENE_PROVIDER_UNITS_VERSION,
   sessionDecisionCalibration,
   transitionSessionHygieneUnits,
+  rowWindowMass,
   computeProtectionWindow,
   readEpochFloorSnapshot,
   getProtectionWindowForSession,
@@ -481,7 +483,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-n2ayqhbx.js";
+} from "./index-87xkw8xm.js";
 import {
   UNKNOWN_FIT_RATIO,
   hasMeasuredDecisionCalibration,
@@ -568,7 +570,7 @@ import {
   getToolTagNumberByOwner2,
   getNullOwnerToolTag2,
   adoptNullOwnerToolTag2
-} from "./index-0x1c054v.js";
+} from "./index-eqw9t2ty.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -592,18 +594,15 @@ import {
   guardSqliteTransformPass2,
   assertTransformWrite2,
   isTransientSqliteError2,
-  withAsyncPrivilegedWriter2,
-  indexCoordinationInput2
+  withAsyncPrivilegedWriter2
 } from "./index-2qtx0q6h.js";
 import {
   stableStringify,
-  closeQuietly,
-  isKnownAutocommit,
   getTableColumnNames,
   observeTemporalDecisions,
   freezeTemporalDecisions,
   tagIdentityRevisionKey
-} from "./index-g026ztby.js";
+} from "./index-c474g0gj.js";
 import {
   BoundedSessionMap,
   resolveOpenCodeDbPath,
@@ -618,7 +617,6 @@ import {
   createWorkerShutdown
 } from "./index-54wmg4rj.js";
 import {
-  runSessionWarmupWorker,
   RAW_SUMMARY_TEXT_MAX_CHARS2
 } from "./index-6981g1xv.js";
 import {
@@ -634,7 +632,7 @@ import {
   replaceCompartmentChunkEmbeddings2,
   deleteChunkEmbedBackoffForSession2,
   chunkWindowSourceKey2
-} from "./index-kmk3xpf9.js";
+} from "./index-0gymvr5j.js";
 import {
   recordSessionProjectIdentity,
   GIT_SWEEP_LEASE_RENEWAL_MS,
@@ -669,20 +667,13 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-0jykn0dw.js";
+} from "./index-xn5yh0pn.js";
 import {
   clearCompressionDepth,
   clearCompressionDepthRange,
   cleanSearchText,
-  matchedSearchSnippet,
-  getMessageIndexSourceIdentity,
-  isMessageIndexSourceCurrent,
-  getLastIndexedOrdinal,
-  getMessageIndexReconciliationStartOrdinal,
-  isMessageIndexReconciledThrough,
-  indexSingleMessage,
-  indexMessagesAfterOrdinal
-} from "./index-74bc8ts8.js";
+  matchedSearchSnippet
+} from "./index-wpazxe9x.js";
 import {
   rememberV1HiddenRun
 } from "./index-6x556c2q.js";
@@ -697,7 +688,7 @@ import {
   expandWorkspaceIdentitySetWithAliases,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-0s14xaca.js";
+} from "./index-pb3ea2tq.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fapenpch.js";
@@ -746,8 +737,14 @@ import {
   verificationFileExists,
   normalizeVerificationFiles,
   indexCommitsForProject,
-  embedUnembeddedCommits
-} from "./index-0cq3g9y5.js";
+  embedUnembeddedCommits,
+  getMessageIndexEpoch,
+  isMessageIndexSearchable,
+  scheduleReconciliation,
+  scheduleIncrementalIndex,
+  scheduleClearAndReindex,
+  clearSessionTracking
+} from "./index-e59j3yq5.js";
 import {
   setEmbeddingSessionBusy2,
   isEmbeddingHostBusy2
@@ -783,7 +780,7 @@ import {
 } from "./index-wqpjhx1p.js";
 import {
   cosineSimilarity
-} from "./index-4nny4r40.js";
+} from "./index-9xd7qveg.js";
 import"./index-6wdwv3a6.js";
 import {
   DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS,
@@ -803,7 +800,7 @@ import {
   PiContextSupersededError,
   PiContextBudget,
   PiTagHydrationError,
-  getPiTagSnapshotView,
+  getPiPassTagSnapshotView,
   getPiActiveTagSnapshotView,
   readPiFallbackTagRows,
   prewarmPiTagSnapshot,
@@ -811,10 +808,10 @@ import {
   drainPiTagSnapshotSession,
   assertPiTagSnapshotReady,
   ensurePiTagSnapshotReady
-} from "./index-2pnhk4gc.js";
+} from "./index-drmr22ac.js";
 import"./index-jn44h81p.js";
 import"./index-1cvyaw9a.js";
-import"./index-5qh6z3sn.js";
+import"./index-d5q1q700.js";
 import {
   __toESM
 } from "./index-22jkk6wg.js";
@@ -824,6 +821,10 @@ import {
 import {
   normalizeProtectedToolName
 } from "./index-674f6qs2.js";
+import {
+  closeQuietly,
+  isKnownAutocommit
+} from "./index-nrzkqte4.js";
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
@@ -3559,7 +3560,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.30",
+  version: "0.49.32",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -3625,12 +3626,14 @@ var package_default = {
     "@types/node": "^22.20.0",
     "omp-coding-agent-1812": "npm:@oh-my-pi/pi-coding-agent@18.12.3",
     "omp-coding-agent-18126": "npm:@oh-my-pi/pi-coding-agent@18.12.6",
+    "omp-coding-agent-18132": "npm:@oh-my-pi/pi-coding-agent@18.13.2",
     "omp-pi-ai-171": "npm:@oh-my-pi/pi-ai@17.1.7",
     "omp-pi-ai-1889": "npm:@oh-my-pi/pi-ai@18.8.9",
     "omp-pi-ai-1811": "npm:@oh-my-pi/pi-ai@18.11.3",
     "omp-pi-ai-1812": "npm:@oh-my-pi/pi-ai@18.12.3",
     "omp-pi-ai-18126": "npm:@oh-my-pi/pi-ai@18.12.6",
     "omp-pi-ai-1813": "npm:@oh-my-pi/pi-ai@18.13.0",
+    "omp-pi-ai-18132": "npm:@oh-my-pi/pi-ai@18.13.2",
     "pi-agent-core-087": "npm:@earendil-works/pi-agent-core@0.87.1",
     "pi-ai-086": "npm:@earendil-works/pi-ai@0.86.0",
     "pi-ai-087": "npm:@earendil-works/pi-ai@0.87.1",
@@ -4366,16 +4369,47 @@ function getDreamTaskBacklog(db, projectPath, task, options = {}) {
   }
 }
 var backlogCaches = new WeakMap;
+var displayBacklogCaches = new WeakMap;
+var DISPLAY_BACKLOG_MAX_AGE_MS = 60000;
 function getDreamTaskBacklogs(db, projectPath, tasks = CANONICAL_DREAM_TASKS, options = {}) {
   if (tasks.length === 0)
     return {};
   if (!isKnownAutocommit(db)) {
     backlogCaches.delete(db);
+    displayBacklogCaches.delete(db);
     const result = {};
     for (const task of tasks)
       result[task] = getDreamTaskBacklog(db, projectPath, task, options);
     return result;
   }
+  if (options.display) {
+    let entries = displayBacklogCaches.get(db);
+    if (!entries) {
+      entries = new Map;
+      displayBacklogCaches.set(db, entries);
+    }
+    const optionKey = (value) => value === undefined ? "omitted" : value === null ? "null" : `number:${value}`;
+    const key = JSON.stringify([
+      projectPath,
+      tasks,
+      optionKey(options.lastRunAt),
+      optionKey(options.retrospectiveWatermarkMs)
+    ]);
+    const now = Date.now();
+    const cached = entries.get(key);
+    if (cached && now < cached.expiresAt && now >= cached.expiresAt - DISPLAY_BACKLOG_MAX_AGE_MS)
+      return structuredClone(cached.value);
+    const value = {};
+    for (const task of tasks)
+      value[task] = getDreamTaskBacklog(db, projectPath, task, options);
+    if (entries.size >= 256)
+      entries.delete(entries.keys().next().value);
+    entries.set(key, {
+      expiresAt: now + DISPLAY_BACKLOG_MAX_AGE_MS,
+      value: structuredClone(value)
+    });
+    return value;
+  }
   let cache = backlogCaches.get(db);
   if (!cache) {
     cache = {
@@ -14762,7 +14796,6 @@ function parseMapMemoriesManifest(text) {
 }
 function validateMapMemoriesManifest(text, expectedIds) {
   const parsed = parseMapMemoriesManifest(text);
-  assertParsedManifestNonEmpty(parsed.length, expectedIds.size, text, "mappings", "memory");
   assertNoDuplicateManifestIds(parsed.filter((entry) => expectedIds.has(entry.id)).map((entry) => entry.id), "mappings");
   return parsed;
 }
@@ -16949,8 +16982,7 @@ function parsePartialVerifyManifest(text, expectedIds) {
 var VERIFY_BATCH_SIZE = 5;
 var VERIFY_TOKENS_PER_MEMORY = 1e5;
 var VERIFY_RUN_TOKEN_BUDGET = 2500000;
-var VERIFY_RUN_SLICE_MS = 240000;
-var VERIFY_IN_FLIGHT_GRACE_MS = 120000;
+var VERIFY_BATCH_DEFAULT_MS = 240000;
 function verifyBatchTokenBudget(size, configured) {
   return Math.min(configured ?? Number.MAX_SAFE_INTEGER, size * VERIFY_TOKENS_PER_MEMORY);
 }
@@ -16980,8 +17012,8 @@ function validateVerifyCompletion(messages, text, expectedIds, responseText = te
 }
 var IDENTICAL_PROVIDER_FAILURE_BATCH_LIMIT = 2;
 var VERIFY_BATCH_FLOOR_MS = 30000;
-function computeVerifyBatchSliceMs(remainingMs, _batchesRemaining) {
-  return Math.min(remainingMs, VERIFY_RUN_SLICE_MS);
+function computeVerifyBatchSliceMs(remainingMs, batchesRemaining) {
+  return Math.min(remainingMs, Math.max(VERIFY_BATCH_DEFAULT_MS, remainingMs / Math.max(1, batchesRemaining)));
 }
 function closeBroadCycle(args, cycleStartAt) {
   if (!args.forceBroad || cycleStartAt === undefined)
@@ -17005,7 +17037,6 @@ async function runVerify(args) {
 }
 async function runVerifyWithCooldown(args) {
   const runStartedAt = Date.now();
-  const sliceDeadline = runStartedAt + VERIFY_RUN_SLICE_MS;
   const result = {
     verified: 0,
     updated: 0,
@@ -17053,12 +17084,10 @@ async function runVerifyWithCooldown(args) {
   try {
     for (let i = 0;i < batches.length; i += 1) {
       const now = Date.now();
-      const startCutoff = Math.min(args.deadline, sliceDeadline);
-      const hardStop = Math.min(args.deadline, sliceDeadline + VERIFY_IN_FLIGHT_GRACE_MS);
-      const remainingMs = Math.max(0, hardStop - now);
-      if (now >= startCutoff) {
+      const remainingMs = Math.max(0, args.deadline - now);
+      if (now >= args.deadline) {
         result.stopReason = "deadline";
-        log2(`[dreamer] ${args.forceBroad ? "verify-broad" : "verify"}: stopping before batch ${i + 1}/${batches.length} — the run deadline passed ${now - startCutoff}ms ago`);
+        log2(`[dreamer] ${args.forceBroad ? "verify-broad" : "verify"}: stopping before batch ${i + 1}/${batches.length} — the run deadline passed ${now - args.deadline}ms ago`);
         break;
       }
       if (remainingMs < VERIFY_BATCH_FLOOR_MS) {
@@ -17997,7 +18026,7 @@ function createDreamTaskExecutor(deps) {
             return { status: "failed", transient: true, error };
           }
           const processed = result.mapped + result.independent;
-          if (processed > 0) {
+          if (processed > 0 || result.failure === undefined) {
             const progress = `map-memories: committed ${processed} mapping(s) (mapped ${result.mapped}, independent ${result.independent}); ${result.remaining} remain`;
             recordRun("completed", null, { progress });
             return { status: "completed" };
@@ -22427,7 +22456,7 @@ function normalizePiUserEntry(entry, sessionId, ordinal, followsAssistantReply)
     return null;
   if (message.role !== "user" || typeof message.timestamp !== "number")
     return null;
-  const text = extractPiTextContent(message.content).trim();
+  const text = cleanUserText2(extractPiTextContent(message.content));
   if (!text)
     return null;
   return {
@@ -22461,7 +22490,7 @@ function extractPiTextContent(content) {
     if (part === null || typeof part !== "object")
       return [];
     const record = part;
-    return record.type === "text" && typeof record.text === "string" ? [record.text] : [];
+    return record.synthetic !== true && record.type === "text" && typeof record.text === "string" ? [record.text] : [];
   }).join(`
 `);
 }
@@ -23677,290 +23706,6 @@ function commitPiCompactionModeRecord(db, sessionId, record) {
 // src/context-handler.ts
 import * as crypto3 from "node:crypto";
 
-// ../plugin/src/features/magic-context/message-index-async.ts
-var indexCancellations = new Map;
-var sessionEpochs = new Map;
-var workerMeasurements = new WeakMap;
-function isDatabaseLockedError(error) {
-  if (!error || typeof error !== "object")
-    return false;
-  const e = error;
-  if (typeof e.code === "string") {
-    if (e.code === "SQLITE_BUSY" || e.code === "SQLITE_LOCKED")
-      return true;
-  }
-  if (typeof e.message === "string") {
-    if (/database is locked/i.test(e.message))
-      return true;
-    if (/sqlite_(busy|locked)/i.test(e.message))
-      return true;
-  }
-  return false;
-}
-var INCREMENTAL_DEBOUNCE_MS = 100;
-var RECONCILIATION_BATCH_SIZE = 100;
-
-class MagicContextMessageIndexHeapHolder {
-  reconciledSessions = new Set;
-  reconciledSnapshots = new Map;
-  stalledSessions = new Set;
-  reconciliationScheduledSessions = new Set;
-  clearAndReindexScheduledSessions = new Map;
-  sessionLocks = new Map;
-  incrementalTimers = new Map;
-  pendingIncrementalKeys = new Set;
-  completedIncrementalKeys = new Set;
-  activeReconcilerBuffers = new Map;
-}
-var heapHolder = new MagicContextMessageIndexHeapHolder;
-var PREPARE_RETRY_MS = 60000;
-async function sourceReady(source, sessionId) {
-  const prepare = source?.prepare;
-  return typeof prepare === "function" ? prepare(sessionId) : true;
-}
-function defer(fn) {
-  const immediate = globalThis.setImmediate;
-  if (typeof immediate === "function") {
-    inRootAsyncContext2(() => immediate(fn));
-    return;
-  }
-  inRootAsyncContext2(() => setTimeout(fn, 0));
-}
-function yieldToEventLoop() {
-  return new Promise((resolve) => defer(resolve));
-}
-function runWithSessionLock(sessionId, operation) {
-  const previous = heapHolder.sessionLocks.get(sessionId) ?? Promise.resolve();
-  const run = previous.catch(() => {
-    return;
-  }).then(async () => {
-    await operation();
-  });
-  heapHolder.sessionLocks.set(sessionId, run);
-  run.finally(() => {
-    if (heapHolder.sessionLocks.get(sessionId) === run) {
-      heapHolder.sessionLocks.delete(sessionId);
-    }
-  }).catch(() => {
-    return;
-  });
-  return run;
-}
-function logIndexingError(sessionId, action, error) {
-  if (isDatabaseLockedError(error)) {
-    sessionLog2(sessionId, `message FTS async ${action} skipped (database busy; will retry on next reconciliation)`);
-    return;
-  }
-  sessionLog2(sessionId, `message FTS async ${action} failed: ${error instanceof Error ? error.message : String(error)}`);
-  log2(`[message-index-async] ${action} failed for ${sessionId}:`, error);
-}
-function logReconciliationStall(sessionId, reason) {
-  if (heapHolder.stalledSessions.has(sessionId))
-    return;
-  heapHolder.stalledSessions.add(sessionId);
-  sessionLog2(sessionId, `message FTS reconciliation stalled: ${reason}; will retry`);
-}
-async function reconcileSessionIndex(db, sessionId, readMessages) {
-  if (!await sourceReady(readMessages, sessionId)) {
-    logReconciliationStall(sessionId, "raw message reader is not ready");
-    return false;
-  }
-  await runWithSessionLock(sessionId, async () => {
-    if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId))
-      return;
-    let fallbackSnapshot = null;
-    try {
-      const fullReader = typeof readMessages === "function" ? readMessages : null;
-      const revision = readMessages.getRevision?.(sessionId);
-      const previous = heapHolder.reconciledSnapshots.get(sessionId);
-      const finalWatermark = previous && revision === previous.revision ? previous.count : revision !== undefined && readMessages.getCountAfterRevision ? previous && revision > previous.revision ? previous.count + readMessages.getCountAfterRevision(sessionId, previous.revision, revision) : readMessages.getCountAfterRevision(sessionId, -1, revision) : readMessages.getCount ? readMessages.getCount(sessionId) : (fallbackSnapshot = fullReader?.(sessionId) ?? []).length;
-      let cursor = getMessageIndexReconciliationStartOrdinal(db, sessionId);
-      let after = cursor === previous?.count ? previous.after : undefined;
-      while (cursor < finalWatermark) {
-        const pageEnd = Math.min(finalWatermark, cursor + RECONCILIATION_BATCH_SIZE);
-        const messages = readMessages.readPage ? readMessages.readPage(sessionId, cursor, RECONCILIATION_BATCH_SIZE, finalWatermark, after) : (fallbackSnapshot ?? []).filter((message) => message.ordinal > cursor && message.ordinal <= pageEnd);
-        const retainedMessages = fallbackSnapshot ?? messages;
-        heapHolder.activeReconcilerBuffers.set(sessionId, retainedMessages);
-        withSqliteBackgroundWriter2(() => indexMessagesAfterOrdinal(db, sessionId, messages, cursor, pageEnd));
-        const nextCursor = getMessageIndexReconciliationStartOrdinal(db, sessionId);
-        if (nextCursor <= cursor)
-          break;
-        cursor = nextCursor;
-        const last = messages.at(-1);
-        after = last?.ordinal === cursor && typeof last.createdAt === "number" ? { timeCreated: last.createdAt, id: last.id } : undefined;
-        if (cursor < finalWatermark) {
-          await yieldToEventLoop();
-        }
-      }
-      if (isMessageIndexReconciledThrough(db, sessionId, finalWatermark)) {
-        heapHolder.reconciledSessions.add(sessionId);
-        if (revision !== undefined) {
-          if (!after && finalWatermark > 0 && readMessages.readPage) {
-            const last = readMessages.readPage(sessionId, finalWatermark - 1, 1, finalWatermark).at(-1);
-            if (last?.ordinal === finalWatermark && typeof last.createdAt === "number")
-              after = { timeCreated: last.createdAt, id: last.id };
-          }
-          heapHolder.reconciledSnapshots.set(sessionId, {
-            revision,
-            count: finalWatermark,
-            after
-          });
-        }
-      } else {
-        logReconciliationStall(sessionId, `gap after ordinal ${cursor} (store count ${finalWatermark})`);
-      }
-    } finally {
-      heapHolder.activeReconcilerBuffers.delete(sessionId);
-    }
-  });
-  return true;
-}
-function scheduleReconciliation(db, sessionId, readMessages) {
-  if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId) || heapHolder.reconciliationScheduledSessions.has(sessionId)) {
-    return;
-  }
-  heapHolder.reconciliationScheduledSessions.add(sessionId);
-  scheduleAfterBootQuiet(() => {
-    defer(() => {
-      let appendedDuringReconciliation = false;
-      const previousSnapshot = heapHolder.reconciledSnapshots.get(sessionId);
-      reconcileSessionIndex(db, sessionId, readMessages).then((ran) => {
-        if (ran) {
-          const snapshot = heapHolder.reconciledSnapshots.get(sessionId);
-          appendedDuringReconciliation = snapshot !== undefined && snapshot !== previousSnapshot && readMessages.getRevision !== undefined && readMessages.getRevision(sessionId) !== snapshot.revision;
-          return;
-        }
-        inRootAsyncContext2(() => setTimeout(() => {
-          heapHolder.reconciliationScheduledSessions.delete(sessionId);
-          scheduleReconciliation(db, sessionId, readMessages);
-        }, PREPARE_RETRY_MS)).unref?.();
-      }).catch((error) => {
-        logReconciliationStall(sessionId, error instanceof Error ? error.message : String(error));
-        if (isDatabaseLockedError(error))
-          inRootAsyncContext2(() => setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000)).unref();
-      }).finally(() => {
-        heapHolder.reconciliationScheduledSessions.delete(sessionId);
-        if (appendedDuringReconciliation)
-          scheduleReconciliation(db, sessionId, readMessages);
-      });
-    });
-  });
-}
-function scheduleIncrementalIndex(db, sessionId, messageId, messageSource) {
-  const schedulingKey = `${sessionId}\x00${messageId}`;
-  const epoch = sessionEpochs.get(sessionId) ?? 0;
-  if (heapHolder.pendingIncrementalKeys.has(schedulingKey))
-    return;
-  const activeTimer = heapHolder.incrementalTimers.get(schedulingKey);
-  if (activeTimer)
-    clearTimeout(activeTimer);
-  const timer = inRootAsyncContext2(() => setTimeout(() => {
-    heapHolder.incrementalTimers.delete(schedulingKey);
-    heapHolder.pendingIncrementalKeys.add(schedulingKey);
-    const indexMessage = async () => {
-      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch || !heapHolder.pendingIncrementalKeys.has(schedulingKey))
-        return;
-      const message = typeof messageSource === "function" ? messageSource(sessionId, messageId) : messageSource;
-      if (!message)
-        return;
-      const revisionKey = `${schedulingKey}\x00${getMessageIndexSourceIdentity(message)}`;
-      if (heapHolder.completedIncrementalKeys.has(revisionKey))
-        return;
-      const currentWatermark = getLastIndexedOrdinal(db, sessionId);
-      if (message.ordinal <= currentWatermark && isMessageIndexSourceCurrent(db, sessionId, message)) {
-        heapHolder.completedIncrementalKeys.add(revisionKey);
-        return;
-      }
-      const wasReconciled = heapHolder.reconciledSessions.delete(sessionId);
-      await indexSingleMessageOffThread(db, sessionId, message);
-      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch || !heapHolder.pendingIncrementalKeys.has(schedulingKey))
-        return;
-      const finalWatermark = getLastIndexedOrdinal(db, sessionId);
-      if (wasReconciled && isMessageIndexReconciledThrough(db, sessionId, finalWatermark)) {
-        heapHolder.reconciledSessions.add(sessionId);
-      }
-      heapHolder.completedIncrementalKeys.add(revisionKey);
-    };
-    sourceReady(messageSource, sessionId).then((ready) => {
-      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch)
-        return;
-      if (ready)
-        return runWithSessionLock(sessionId, indexMessage);
-      setTimeout(() => scheduleIncrementalIndex(db, sessionId, messageId, messageSource), PREPARE_RETRY_MS).unref?.();
-    }).catch((error) => {
-      if ((sessionEpochs.get(sessionId) ?? 0) !== epoch)
-        return;
-      heapHolder.reconciledSessions.delete(sessionId);
-      logIndexingError(sessionId, `incremental index for ${messageId}`, error);
-      if (isDatabaseLockedError(error))
-        setTimeout(() => scheduleIncrementalIndex(db, sessionId, messageId, messageSource), 1000).unref();
-    }).finally(() => {
-      if ((sessionEpochs.get(sessionId) ?? 0) === epoch)
-        heapHolder.pendingIncrementalKeys.delete(schedulingKey);
-    });
-  }, INCREMENTAL_DEBOUNCE_MS));
-  heapHolder.incrementalTimers.set(schedulingKey, timer);
-}
-async function indexSingleMessageOffThread(db, sessionId, message) {
-  const path = getSqliteDatabasePath2(db);
-  if (!path)
-    return withSqliteBackgroundWriter2(() => indexSingleMessage(db, sessionId, message));
-  const cancellation = new Int32Array(new SharedArrayBuffer(4));
-  const active = indexCancellations.get(sessionId) ?? new Set;
-  active.add(cancellation);
-  indexCancellations.set(sessionId, active);
-  const result = await runSessionWarmupWorker({
-    path,
-    sessionId,
-    indexMessage: message,
-    harness: getHarness2(),
-    indexCancellation: cancellation.buffer,
-    ...indexCoordinationInput2()
-  }, {}).finally(() => {
-    active.delete(cancellation);
-    if (active.size === 0)
-      indexCancellations.delete(sessionId);
-  });
-  if (!("inserted" in result))
-    throw new Error("failure" in result ? result.detail : "unexpected indexing worker reply");
-  if (result.measurements) {
-    const sessions = workerMeasurements.get(db) ?? new Map;
-    sessions.set(sessionId, result.measurements);
-    workerMeasurements.set(db, sessions);
-    if (result.measurements.skipped)
-      log2(`[magic-context] incremental FTS skipped oversized source ${message.id} (${result.measurements.sourceBytes} bytes); identity and progress persisted`);
-  }
-  return result.inserted;
-}
-function clearSessionTracking(sessionId) {
-  sessionEpochs.set(sessionId, (sessionEpochs.get(sessionId) ?? 0) + 1);
-  for (const cancellation of indexCancellations.get(sessionId) ?? [])
-    Atomics.store(cancellation, 0, 1);
-  heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
-  heapHolder.reconciledSessions.delete(sessionId);
-  heapHolder.reconciledSnapshots.delete(sessionId);
-  heapHolder.stalledSessions.delete(sessionId);
-  heapHolder.reconciliationScheduledSessions.delete(sessionId);
-  heapHolder.sessionLocks.delete(sessionId);
-  heapHolder.activeReconcilerBuffers.delete(sessionId);
-  const prefix = `${sessionId}\x00`;
-  for (const [key, timer] of heapHolder.incrementalTimers) {
-    if (key.startsWith(prefix)) {
-      clearTimeout(timer);
-      heapHolder.incrementalTimers.delete(key);
-    }
-  }
-  for (const key of heapHolder.pendingIncrementalKeys) {
-    if (key.startsWith(prefix)) {
-      heapHolder.pendingIncrementalKeys.delete(key);
-    }
-  }
-  for (const key of heapHolder.completedIncrementalKeys) {
-    if (key.startsWith(prefix))
-      heapHolder.completedIncrementalKeys.delete(key);
-  }
-}
-
 // ../plugin/src/hooks/magic-context/event-resolvers.ts
 var DEFAULT_CONTEXT_LIMIT = 200000;
 var clampWarnSeen = new Set;
@@ -24957,6 +24702,7 @@ function prepareLegacyToolSkeletonConversions(db, sessionId, targets, options =
     });
   };
   const rows = readRows(db);
+  options.prepareRemovals?.(rows);
   const converted = new Map;
   for (const row of rows) {
     const target = targets.get(row.tagNumber);
@@ -25188,6 +24934,15 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
   }
   return didMutateMessage;
 }
+function prepareFlushedToolRemovals(targets, tags) {
+  for (const tag of tags) {
+    if (tag.status !== "dropped" || tag.type !== "tool")
+      continue;
+    if (tag.dropMode != null && tag.dropMode !== "full")
+      continue;
+    targets.get(tag.tagNumber)?.prepareReplayDrop?.();
+  }
+}
 function applyFlushedStatuses(sessionId, db, targets, preloadedTags) {
   let didMutateMessage = false;
   const tags = preloadedTags ?? getDroppedTagsByNumbers2(db, sessionId, [...targets.keys()]);
@@ -27884,7 +27639,7 @@ function tagTranscript(sessionId, transcript, tagger, db, options = {}) {
           skipPrefixInjection,
           preserveTagOnlyAssistantText: options.preserveTagOnlyAssistantText,
           entryFingerprint: options.entryFingerprintByMessageId?.get(messageId) ?? null,
-          reuseIdentity: reuseIdentity || contentDerivedTextIds !== undefined,
+          reuseIdentity: reuseIdentity || options.reuseTextMessageIds?.has(messageId) === true || contentDerivedTextIds !== undefined,
           timing,
           textIdentitySourceCache: options.textIdentitySourceCache,
           textTokenCache: options.textTokenCache
@@ -27953,7 +27708,11 @@ function tagTranscript(sessionId, transcript, tagger, db, options = {}) {
             if (timing)
               timing.identity += performance.now() - identityStart;
           } else {
-            const accounting = readAggregateToolAccounting(part, timing, options.toolTokenCache, tokenCacheKey);
+            const accounting = readAggregateToolAccounting(part, timing, options.toolTokenCache, tokenCacheKey, {
+              byteSize: existing.maxByteSize,
+              tokenCount: existing.maxTokenCount,
+              inputTokenCount: existing.inputTokenCount
+            });
             text = accounting.text;
             if (part.kind === "tool_result") {
               applyGrownToolResultAccounting({
@@ -28035,7 +27794,7 @@ function tagTranscript(sessionId, transcript, tagger, db, options = {}) {
           if (timing)
             timing.identity += performance.now() - identityStart;
         } else {
-          const accounting = readAggregateToolAccounting(part, timing, options.toolTokenCache, tokenCacheKey);
+          const accounting = readAggregateToolAccounting(part, timing, options.toolTokenCache, tokenCacheKey, tagger.getToolTagAccounting(sessionId, callId, messageId));
           text = accounting.text;
           const outputByteSize = part.kind === "tool_result" ? accounting.byteSize : 0;
           const outputTokenCount = part.kind === "tool_result" ? accounting.tokenCount : 0;
@@ -28131,12 +27890,14 @@ function applyGrownToolResultAccounting(args) {
   updateTagTokenCount2(args.db, args.sessionId, args.aggregate.tagId, tokenCount);
   syncToolAggregateAccounting(args.tagger, args.sessionId, args.aggregate);
 }
-function readAggregateToolAccounting(part, timing, tokenCache, tokenCacheKey) {
+function readAggregateToolAccounting(part, timing, tokenCache, tokenCacheKey, persisted) {
   const text = part.getText() ?? "";
   const byteSize = getToolPartByteSize(part, text);
-  const metadata = part.getToolMetadata();
+  const metadata = part.getToolMetadata({
+    skipInputTokenCount: persisted?.inputTokenCount != null
+  });
   let tokenCount = 0;
-  if (part.kind === "tool_result") {
+  if (part.kind === "tool_result" && (!persisted || persisted.tokenCount === null || byteSize > persisted.byteSize)) {
     const tokenStart = timing ? performance.now() : 0;
     tokenCount = getCachedToolPartTokenCount(part, text, tokenCache, tokenCacheKey);
     if (timing)
@@ -28523,6 +28284,12 @@ function buildAggregateTarget(tagId, occurrences, requiresToolArcSkeleton, conve
       return any ? "truncated" : "absent";
     },
     prepareDrop: () => !occurrences.some((occ) => occ.part.canRemove?.() === "defer"),
+    prepareReplayDrop: () => {
+      if (complete() && !requiresToolArcSkeleton) {
+        for (const occ of occurrences)
+          occ.part.canRemove?.();
+      }
+    },
     canDrop: () => complete() && !occurrences.some((occ) => occ.part.hasUserAnswer?.()),
     requiresToolArcSkeleton,
     readInput() {
@@ -28866,6 +28633,8 @@ class AutoSearchBusyError extends Error {
   }
 }
 async function searchAutoHint(db, sessionId, projectPath, query, options, entry = new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./auto-search-worker.ts" : "./auto-search-worker.js", import.meta.url)) {
+  const messageIndexEpoch = getMessageIndexEpoch(sessionId);
+  const messageIndexWasSearchable = isMessageIndexSearchable(sessionId);
   const {
     rerankConfig: _rerankConfig,
     rerankClient: _rerankClient,
@@ -28874,7 +28643,8 @@ async function searchAutoHint(db, sessionId, projectPath, query, options, entry
     captureRerankLanes: _captureRerankLanes,
     ...hintOptions
   } = options;
-  return executeAutoSearchWorker(db, sessionId, projectPath, query, { ...hintOptions, explicitSearch: false, rerank: false }, entry, "search");
+  const results = await executeAutoSearchWorker(db, sessionId, projectPath, query, { ...hintOptions, explicitSearch: false, rerank: false }, entry, "search");
+  return messageIndexWasSearchable && isMessageIndexSearchable(sessionId) && getMessageIndexEpoch(sessionId) === messageIndexEpoch ? results : results.filter((result) => result.source !== "message");
 }
 var pendingBackfills = new WeakMap;
 var searchWorkers = new WeakMap;
@@ -31359,7 +31129,8 @@ function tagAttribution(input) {
   if (!cached) {
     removed.length = 0;
     added.length = 0;
-    added.push(...input.tags);
+    for (const tag of input.tags)
+      added.push(tag);
     cached = {
       tags: input.tags,
       messageTags: new Map,
@@ -31448,7 +31219,10 @@ function attributeTags(input, arcs, messageIds) {
     exactToolTags,
     orphanTagsByCall,
     boundsByOwner
-  } = tagAttribution(input);
+  } = tagAttribution({
+    ...input,
+    tags: attributionProjection(input, arcs, messageIds)
+  });
   const messageIndexById = new Map;
   for (let index = 0;index < messageIds.length; index += 1) {
     const id = input.stableId?.(input.messages[index], index);
@@ -31511,6 +31285,61 @@ function attributeTags(input, arcs, messageIds) {
   }
   return { messageTags, tagsByNumber };
 }
+var attributionProjections = new WeakMap;
+function attributionProjection(input, arcs, messageIds) {
+  const owners = new Set(messageIds);
+  const calls = new Set;
+  const numbers = new Set;
+  for (const arc of arcs) {
+    owners.add(arc.ownerId);
+    calls.add(arc.callId);
+  }
+  const notePrefix = (text) => {
+    for (const candidate of [text, stripChannel1ReminderSpans(text)]) {
+      const match = candidate.trimStart().match(TAG_PREFIX);
+      if (match)
+        numbers.add(Number(match[1]));
+    }
+  };
+  for (let index = 0;index < input.messages.length; index++) {
+    const id = input.stableId?.(input.messages[index], index);
+    if (id)
+      owners.add(id);
+    const message = input.messages[index];
+    if (!isRecord5(message))
+      continue;
+    if (typeof message.content === "string")
+      notePrefix(message.content);
+    else if (Array.isArray(message.content)) {
+      for (const part of message.content)
+        if (isRecord5(part) && typeof part.text === "string")
+          notePrefix(part.text);
+    }
+  }
+  const cacheable = input.tagCacheKey !== undefined;
+  const cached = cacheable ? attributionProjections.get(input.tags) : undefined;
+  const content = cacheable ? input.messages.map(safeStableStringify) : undefined;
+  if (cached && cached.messageIds.length === messageIds.length && messageIds.every((id, index) => id === cached.messageIds[index]) && content?.length === cached.content.length && content.every((value, index) => value === cached.content[index]) && owners.size === cached.owners.size && [...owners].every((owner) => cached.owners.has(owner)) && calls.size === cached.calls.size && [...calls].every((call) => cached.calls.has(call)) && numbers.size === cached.numbers.size && [...numbers].every((number) => cached.numbers.has(number)))
+    return cached.projection;
+  const projection = input.tags.filter((tag) => {
+    if (numbers.has(tag.tagNumber))
+      return true;
+    const owner = messageIdForTag(tag);
+    if (owner !== null && owners.has(owner))
+      return true;
+    return tag.type === "tool" && tag.toolOwnerMessageId === null && calls.has(tag.messageId);
+  });
+  if (cacheable && content)
+    attributionProjections.set(input.tags, {
+      messageIds,
+      content,
+      owners,
+      calls,
+      numbers,
+      projection
+    });
+  return projection;
+}
 var partJsonMemo = new TailHygieneJsonMemo;
 var excludedViews = new WeakMap;
 function excludedDraftForApi(key, value, providerApi) {
@@ -35221,6 +35050,76 @@ function canRemoveNativeToolCall(message, toolCallId) {
 var NATIVE_TOOL_REMOVAL_MARKER = '{"__magic_context_remove_tool_arc__":true}';
 
 // src/native-replay-state-pi.ts
+var removalBatches = new WeakMap;
+
+class PiToolRemovalBatchError extends Error {
+  constructor(cause) {
+    super("Native tool removal batch could not be persisted", { cause });
+  }
+}
+function withPiToolRemovalBatch(args, edit) {
+  let sessions = removalBatches.get(args.db);
+  const enclosing = sessions?.get(args.sessionId);
+  if (enclosing)
+    return edit(enclosing.flush);
+  if (!sessions) {
+    sessions = new Map;
+    removalBatches.set(args.db, sessions);
+  }
+  let publishing = false;
+  const batch = {
+    saved: args.saved,
+    planned: new Map(args.saved),
+    requested: new Map,
+    pending: new Map,
+    flushed: false,
+    flush() {
+      if (batch.flushed)
+        return;
+      batch.persistPending();
+      batch.flushed = true;
+    },
+    persistPending() {
+      if (publishing || batch.pending.size === 0)
+        return;
+      const connection = args.db;
+      if (connection.inTransaction !== true && connection.isTransaction !== true)
+        throw new Error("Native removal publication requires a caller-owned transaction");
+      try {
+        publishing = true;
+        saveNativeToolInputs(args.db, args.sessionId, batch.pending);
+        batch.pending.clear();
+      } catch (cause) {
+        throw new PiToolRemovalBatchError(cause);
+      } finally {
+        publishing = false;
+      }
+    }
+  };
+  sessions.set(args.sessionId, batch);
+  try {
+    const result = withNativeReplayWriteBarrier(args.db, args.sessionId, batch.persistPending, () => edit(batch.flush));
+    if (batch.requested.size > 0 && !batch.flushed)
+      throw new Error("Native removal markers were not flushed in the caller's transaction");
+    const saved = args.saved;
+    if (saved && batch.requested.size > 0) {
+      const prior = new Map([...batch.requested.keys()].map((id) => [id, saved.get(id)]));
+      args.rollbackObservations?.push(() => {
+        for (const [id, value] of prior) {
+          if (value === undefined)
+            saved.delete(id);
+          else
+            saved.set(id, value);
+        }
+      });
+      for (const [id, marker] of batch.requested)
+        saved.set(id, marker);
+    }
+    return result;
+  } finally {
+    sessions.delete(args.sessionId);
+  }
+}
 function applyNativeToolInputReplayPi(args, saved) {
   if (saved.size === 0 && (!args.canApply || args.changes.size === 0))
     return 0;
@@ -35332,6 +35231,12 @@ function applyNativeReasoningReplayPi(args, saved) {
 function preparePiToolRemovalMeasurements(args) {
   if (!args.saved || !args.canApply)
     return;
+  const batch = removalBatches.get(args.db)?.get(args.sessionId);
+  if (batch?.saved === args.saved) {
+    for (const callId of args.callIds)
+      authorizePiToolRemoval({ ...args, callId });
+    return;
+  }
   const requested = new Map;
   for (const callId of args.callIds) {
     if (args.saved.get(callId) !== NATIVE_TOOL_REMOVAL_MARKER)
@@ -35347,9 +35252,54 @@ function preparePiToolRemovalMeasurements(args) {
       args.saved.set(callId, marker);
   } catch {}
 }
+function preparePiToolRemovalChecks(args) {
+  if (!args.db?.inTransaction || args.rows.length === 0)
+    return;
+  const occurrences = new Map;
+  for (const raw of args.messages) {
+    if (!raw || typeof raw !== "object")
+      continue;
+    const message = raw;
+    if (message.role !== "assistant" || !Array.isArray(message.content))
+      continue;
+    for (const rawPart of message.content) {
+      if (!rawPart || typeof rawPart !== "object")
+        continue;
+      const part = rawPart;
+      if (part.type === "toolCall" && typeof part.id === "string")
+        occurrences.set(part.id, (occurrences.get(part.id) ?? 0) + 1);
+    }
+  }
+  const requested = [];
+  for (const row of args.rows) {
+    if (row.callId === null || occurrences.get(row.callId) !== 1)
+      continue;
+    const target = args.targets.get(row.tagNumber);
+    if (target?.requiresToolArcSkeleton || target?.canDrop?.() !== true)
+      continue;
+    if (!target.mutationParts?.some(({ part }) => part !== null && typeof part === "object" && ("kind" in part) && part.kind === "tool_use" && ("id" in part) && part.id === row.callId))
+      continue;
+    requested.push(row.callId);
+  }
+  if (requested.length)
+    args.prepare(requested);
+}
 function authorizePiToolRemoval(args) {
   if (!args.saved)
     return false;
+  const batch = removalBatches.get(args.db)?.get(args.sessionId);
+  if (batch?.saved === args.saved) {
+    if (batch.planned.get(args.callId) === NATIVE_TOOL_REMOVAL_MARKER)
+      return true;
+    if (!args.canApply)
+      return false;
+    if (batch.flushed)
+      throw new Error("Tool removal requested after lane publication");
+    batch.planned.set(args.callId, NATIVE_TOOL_REMOVAL_MARKER);
+    batch.requested.set(args.callId, NATIVE_TOOL_REMOVAL_MARKER);
+    batch.pending.set(args.callId, NATIVE_TOOL_REMOVAL_MARKER);
+    return true;
+  }
   if (args.saved.get(args.callId) === NATIVE_TOOL_REMOVAL_MARKER)
     return true;
   if (!args.canApply)
@@ -35406,6 +35356,57 @@ function isSentinelPart(part) {
   return p.type === "text" && typeof p.text === "string" && (p.text === "" || p.text === WHOLE_MESSAGE_PLACEHOLDER_TEXT);
 }
 
+// src/pass-tag-projection-pi.ts
+function projectPiReplayDrops(transcript, metadata) {
+  const owners = new Set;
+  const addresses = new Set;
+  const calls = new Set;
+  const prefixes = new Set;
+  for (const message of transcript.messages) {
+    owners.add(message.info.id ?? "");
+    let ordinal = 0;
+    for (const part of message.parts) {
+      if (part.kind === "text") {
+        addresses.add(`${message.info.id}:p${ordinal++}`);
+        const prefix = /^§(\d+)§\s/.exec(part.getText() ?? "");
+        if (prefix)
+          prefixes.add(Number(prefix[1]));
+      } else if ((part.kind === "tool_use" || part.kind === "tool_result") && part.id)
+        calls.add(part.id);
+    }
+  }
+  const numbers = new Set;
+  for (const tag of metadata) {
+    if (tag.status !== "dropped")
+      continue;
+    if (prefixes.has(tag.tagNumber) || (tag.type === "tool" ? calls.has(tag.messageId) && (tag.toolOwnerMessageId === null || tag.toolOwnerMessageId === "" || owners.has(tag.toolOwnerMessageId)) : addresses.has(tag.messageId)))
+      numbers.add(tag.tagNumber);
+  }
+  return metadata.filter((tag) => tag.status === "dropped" && numbers.has(tag.tagNumber));
+}
+function protectedPiPassTagNumbers(rows, floor, toolsRatio = 1) {
+  if (!(toolsRatio >= 0) || rows.some((row) => !Number.isFinite(row.tagNumber)))
+    return computeProtectionWindow(rows, floor, toolsRatio).protectedTagNumbers;
+  const numbers = [];
+  let group;
+  let groups = 0;
+  let mass = 0;
+  for (let index = rows.length - 1;index >= 0; index--) {
+    const row = rows[index];
+    if (row?.type !== "tool")
+      continue;
+    if (row.tagNumber !== group) {
+      if (groups >= 3 && Math.ceil(mass * toolsRatio) >= floor)
+        break;
+      group = row.tagNumber;
+      groups++;
+      numbers.push(row.tagNumber);
+    }
+    mass += rowWindowMass(row);
+  }
+  return new Set(numbers.reverse());
+}
+
 // src/pi-append-compaction.ts
 var loggedIncompatibleHost = false;
 var failedWrites2 = new WeakMap;
@@ -36562,23 +36563,113 @@ function piMatchesChatImages(content, urls) {
   return true;
 }
 
-// src/pi-dispatch-image-budget.ts
+// src/pi-dispatch-date-reminder.ts
 function object8(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
+function piDateReminderText(value, cwd) {
+  if (typeof value !== "string")
+    return false;
+  const match = /^<system-reminder>\nToday: (\d{4}-\d{2}-\d{2}); current working directory: '([^\r\n<>§]+)'\. Do not repeat this information in your reply\.\n<\/system-reminder>$/u.exec(value);
+  if (!match)
+    return false;
+  const [, date, path] = match;
+  if ([...path].some((character) => character.charCodeAt(0) < 32 || character.charCodeAt(0) === 127))
+    return false;
+  const parsed = new Date(`${date}T00:00:00Z`);
+  if (!Number.isFinite(parsed.getTime()) || parsed.toISOString().slice(0, 10) !== date)
+    return false;
+  if (!/^(?:\/|[A-Za-z]:\/)/u.test(path) || path.includes("\\"))
+    return false;
+  return cwd === undefined || path === cwd.replace(/\\/gu, "/");
+}
+function piDateReminderWireText(content, cwd) {
+  if (typeof content === "string")
+    return piDateReminderText(content, cwd) ? content : undefined;
+  if (!Array.isArray(content) || content.length !== 1)
+    return;
+  const block = object8(content[0]);
+  const cache = object8(block?.cache_control);
+  if (block?.type !== "text" || !cache || cache.type !== "ephemeral" || Object.keys(block).some((key) => !["type", "text", "cache_control"].includes(key)) || Object.keys(cache).some((key) => !["type", "ttl", "scope"].includes(key)) || cache.ttl !== undefined && cache.ttl !== "5m" && cache.ttl !== "1h" || cache.scope !== undefined && cache.scope !== "global")
+    return;
+  return piDateReminderText(block.text, cwd) ? block.text : undefined;
+}
+var PI_DATE_REMINDER_APIS = new Set([
+  "anthropic-messages",
+  "openai-completions",
+  "openai-responses",
+  "azure-openai-responses",
+  "openai-codex-responses",
+  "bedrock-converse-stream",
+  "google-generative-ai",
+  "google-vertex",
+  "google-gemini-cli",
+  "ollama-chat"
+]);
+function singleText(value, type) {
+  if (!Array.isArray(value) || value.length !== 1)
+    return;
+  const part = object8(value[0]);
+  return part && (type === undefined ? Object.keys(part).length === 1 : part.type === type && Object.keys(part).length === 2) ? part.text : undefined;
+}
+function piWithoutDateReminders(payload, api, cwd, developerRole, includesPreparedFirstUser) {
+  const body = object8(payload);
+  if (!body)
+    return;
+  const google = api.startsWith("google-");
+  const envelope = google ? object8(body.request) ?? body : body;
+  const field = google ? "contents" : api.endsWith("responses") ? "input" : "messages";
+  const messages = envelope[field];
+  if (!Array.isArray(messages))
+    return;
+  let firstUser = false;
+  let removed = false;
+  const kept = [];
+  for (const value of messages) {
+    const row = object8(value);
+    if (!row)
+      return;
+    const text = google ? singleText(row.parts) : api === "bedrock-converse-stream" ? singleText(row.content) : api.endsWith("responses") ? singleText(row.content, "input_text") ?? (api === "openai-codex-responses" ? row.content : undefined) : row.content;
+    if (piDateReminderText(text, cwd)) {
+      const keys = google ? ["role", "parts"] : api.endsWith("responses") ? ["role", "content", "type"] : ["role", "content"];
+      const role = api === "ollama-chat" ? "system" : api === "openai-completions" && developerRole ? "developer" : "user";
+      if (!firstUser || row.role !== role || Object.keys(row).some((key) => !keys.includes(key)) || row.type !== undefined && row.type !== "message")
+        return;
+      if (!removed) {
+        const prefix = { ...envelope, [field]: kept };
+        if (!includesPreparedFirstUser(google && body.request !== undefined ? { ...body, request: prefix } : prefix))
+          return;
+      }
+      removed = true;
+      continue;
+    }
+    if (row.role === "user" && (typeof row.content === "string" || Array.isArray(row.content) && row.content.some((part) => object8(part)?.type === "input_text" || object8(part)?.type === "text" || typeof object8(part)?.text === "string") || Array.isArray(row.parts) && row.parts.some((part) => typeof object8(part)?.text === "string")))
+      firstUser = true;
+    kept.push(value);
+  }
+  if (!removed)
+    return;
+  const filtered = { ...envelope, [field]: kept };
+  return google && body.request !== undefined ? { ...body, request: filtered } : filtered;
+}
+
+// src/pi-dispatch-image-budget.ts
+function object9(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
 function piImageBudgetPlan(model) {
-  if (!model?.input?.includes("image") || object8(model.compat)?.stripImageInput === true)
+  if (!model?.input?.includes("image") || object9(model.compat)?.stripImageInput === true)
     return;
   return {
     count: 0,
     api: model.api,
     rows: new Map,
-    hoistToolImages: model.api?.startsWith("google-") === true && object8(model.compat)?.multimodalFunctionResponse !== true || model.api === "bedrock-converse-stream" && model.requiresToolResultImageHoisting === true,
+    hoistToolImages: model.api?.startsWith("google-") === true && object9(model.compat)?.multimodalFunctionResponse !== true || model.api === "bedrock-converse-stream" && model.requiresToolResultImageHoisting === true,
     hoistErrorImages: model.api === "anthropic-messages" || model.api === "bedrock-converse-stream"
   };
 }
 function inputImage(block, api) {
-  const file = object8(block.providerFile);
+  const file = object9(block.providerFile);
   if (api === "ollama-chat")
     return { kind: "bytes", value: String(block.data ?? "") };
   if ((api?.endsWith("responses") && file?.provider === "openai" || api === "anthropic-messages" && file?.provider === "anthropic") && typeof file?.id === "string")
@@ -36598,7 +36689,7 @@ function piRecordImages(plan, row, source) {
     return;
   const images = [];
   for (const value of source.content) {
-    const block = object8(value);
+    const block = object9(value);
     if (block?.type === "image")
       images.push(inputImage(block, plan.api));
   }
@@ -36624,20 +36715,20 @@ function piWireImages(content, ollamaImages) {
     return [];
   const images = [];
   for (const value of content) {
-    const block = object8(value);
+    const block = object9(value);
     if (!block)
       continue;
-    const source = object8(block.source);
-    const inline = object8(block.inlineData);
-    const file = object8(block.fileData);
-    const bedrock = object8(block.image);
+    const source = object9(block.source);
+    const inline = object9(block.inlineData);
+    const file = object9(block.fileData);
+    const bedrock = object9(block.image);
     if (block.type === "image_url" || block.type === "input_image") {
       if (typeof block.file_id === "string")
         images.push({ kind: "file", value: block.file_id });
       else
         images.push({
           kind: "url",
-          value: String(typeof block.image_url === "string" ? block.image_url : object8(block.image_url)?.url)
+          value: String(typeof block.image_url === "string" ? block.image_url : object9(block.image_url)?.url)
         });
     } else if (block.type === "image") {
       if (source?.type === "file")
@@ -36661,7 +36752,7 @@ function piWireImages(content, ollamaImages) {
     else if (bedrock)
       images.push({
         kind: "data",
-        value: String(object8(bedrock.source)?.bytes),
+        value: String(object9(bedrock.source)?.bytes),
         mime: `image/${bedrock.format}`
       });
   }
@@ -36683,11 +36774,11 @@ function piMatchesImages(actual, expected) {
   return true;
 }
 function piWireImageCount(payload) {
-  const body = object8(payload);
+  const body = object9(payload);
   const visit = (value) => {
     if (Array.isArray(value))
       return value.reduce((n, item) => n + visit(item), 0);
-    const block = object8(value);
+    const block = object9(value);
     if (!block)
       return 0;
     if (["image", "image_url", "input_image"].includes(String(block.type)) || block.inlineData || block.fileData || block.image)
@@ -36701,12 +36792,12 @@ function piWireImageCount(payload) {
       block.response
     ].reduce((n, item) => n + visit(item), Array.isArray(block.images) ? block.images.length : 0);
   };
-  return visit(body?.messages ?? body?.input ?? body?.contents ?? object8(body?.request)?.contents);
+  return visit(body?.messages ?? body?.input ?? body?.contents ?? object9(body?.request)?.contents);
 }
 
 // src/pi-dispatch-responses-history.ts
 var MAX_TEXT_UNITS = 32 * 1024 * 1024;
-function object9(value) {
+function object10(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function wellFormed2(text) {
@@ -36721,7 +36812,7 @@ function textIdentity2(text, phase) {
 function signaturePhase(block) {
   try {
     if (typeof block.textSignature === "string") {
-      const signature = object9(JSON.parse(block.textSignature));
+      const signature = object10(JSON.parse(block.textSignature));
       if (signature?.v === 1 && typeof signature.id === "string")
         return signature.phase;
     }
@@ -36743,19 +36834,19 @@ ${wellFormed2(text)}
 function coldReplayable(items) {
   let reasoning = false;
   for (const value of items) {
-    const item = object9(value);
+    const item = object10(value);
     if (typeof item?.encrypted_content === "string")
       return false;
     if (item?.type !== "reasoning")
       continue;
-    if (!Array.isArray(item.content) || !item.content.some((part) => object9(part)?.type === "reasoning_text"))
+    if (!Array.isArray(item.content) || !item.content.some((part) => object10(part)?.type === "reasoning_text"))
       return false;
     reasoning = true;
   }
   return reasoning;
 }
 function piResponsesAssistantTexts(value, model, host, alternatives) {
-  const message = object9(value);
+  const message = object10(value);
   if (!message || !Array.isArray(message.content))
     return;
   if (piOmitsTruncatedAssistant(message))
@@ -36765,7 +36856,7 @@ function piResponsesAssistantTexts(value, model, host, alternatives) {
   const sameModel = model !== undefined && typeof model.api === "string" && typeof model.id === "string" && typeof model.provider === "string" && message.api === model.api && message.model === model.id && message.provider === model.provider;
   let units = 0;
   for (const value of message.content) {
-    const block = object9(value);
+    const block = object10(value);
     if (block?.type === "toolCall")
       continue;
     if (block?.type === "thinking") {
@@ -36775,7 +36866,7 @@ function piResponsesAssistantTexts(value, model, host, alternatives) {
         return;
       if (!block.thinking.trim())
         continue;
-      const compat = object9(model.compat);
+      const compat = object10(model.compat);
       if (block.summary === false && (compat?.requiresReasoningContentForToolCalls === true || compat?.requiresReasoningContentForAllAssistantTurns === true))
         return;
       const text = demotedThinking(block.thinking, model);
@@ -36795,7 +36886,7 @@ function piResponsesAssistantTexts(value, model, host, alternatives) {
     texts.push(textIdentity2(wellFormed2(block.text), sameModel ? signaturePhase(block) : undefined));
     blocks.push(block);
   }
-  const payload = object9(message.providerPayload);
+  const payload = object10(message.providerPayload);
   if (message.api !== model?.api || typeof model?.id !== "string" || typeof model?.provider !== "string" || message.model !== model?.id || (payload?.provider ?? message.provider) !== model?.provider || payload?.type !== "openaiResponsesHistory" || payload.dt !== true || !Array.isArray(payload.items))
     return texts;
   const replay = [];
@@ -36809,7 +36900,7 @@ function piResponsesAssistantTexts(value, model, host, alternatives) {
   let unsigned = false;
   let rewrittenText = false;
   for (const value of payload.items) {
-    const item = object9(value);
+    const item = object10(value);
     if (item?.type === "reasoning")
       continue;
     if (item?.type === "function_call" || item?.type === "custom_tool_call") {
@@ -36820,14 +36911,14 @@ function piResponsesAssistantTexts(value, model, host, alternatives) {
       return texts;
     const itemTexts = [];
     for (const value of item.content) {
-      const part = object9(value);
+      const part = object10(value);
       const block = blocks[bound];
       if (!block || part?.type !== "output_text" || typeof part.text !== "string")
         return texts;
       let signature;
       try {
         if (typeof block.textSignature === "string")
-          signature = object9(JSON.parse(block.textSignature));
+          signature = object10(JSON.parse(block.textSignature));
       } catch {
         return texts;
       }
@@ -36837,7 +36928,7 @@ function piResponsesAssistantTexts(value, model, host, alternatives) {
         if (!allowUnsigned || "textSignature" in block || stripped !== block.text.replace(/^§\d+§ /u, ""))
           return texts;
         unsigned = true;
-        rewrittenText ||= part.text !== stripped && part.text !== block.text;
+        rewrittenText ||= part.text !== stripped;
       }
       bound++;
       itemTexts.push(part.text);
@@ -36866,7 +36957,7 @@ function piResponsesWireTexts(value, phase) {
   const texts = [];
   let units = 0;
   for (const partValue of value) {
-    const part = object9(partValue);
+    const part = object10(partValue);
     if (part?.type !== "output_text" || typeof part.text !== "string")
       return;
     units += part.text.length;
@@ -36878,6 +36969,7 @@ function piResponsesWireTexts(value, phase) {
 }
 
 // src/pi-dispatch-structure.ts
+var dateReminderPlans = new WeakMap;
 var MAX_MESSAGES = 1e5;
 var ORPHAN_NOTE = Symbol("prepared orphan tool result");
 var ANTHROPIC_CONTINUE_PAD_TEXT = "Continue.";
@@ -36904,11 +36996,11 @@ var TRANSFORM_MESSAGES_APIS = new Set([
   "devin-agent",
   "apple-foundation-models"
 ]);
-function object10(value) {
+function object11(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function messageStructure(value) {
-  const message = object10(value);
+  const message = object11(value);
   if (!message)
     return;
   const role = [
@@ -36937,7 +37029,7 @@ function messageStructure(value) {
   }
   if (role === "assistant" && Array.isArray(message.content)) {
     for (const value of message.content) {
-      const block = object10(value);
+      const block = object11(value);
       if (block?.type !== "toolCall" && block?.type !== "tool_use")
         continue;
       if (typeof block.id !== "string")
@@ -36953,7 +37045,7 @@ function windowCalls(message) {
   if (!Array.isArray(message.content))
     return [];
   return message.content.flatMap((value) => {
-    const block = object10(value);
+    const block = object11(value);
     return block?.type === "toolCall" && typeof block.id === "string" ? [
       {
         id: block.id,
@@ -36963,7 +37055,7 @@ function windowCalls(message) {
   });
 }
 function duplicateSuffix(model) {
-  const compat = object10(model?.compat);
+  const compat = object11(model?.compat);
   if (model?.api === "openai-completions") {
     if (compat?.requiresMistralToolIds === true)
       return { prefix: "dup", max: 9 };
@@ -36980,7 +37072,7 @@ function appendDuplicateSuffix(id, suffix, max) {
 }
 function projectMissingToolResults(messages, model, host = "omp") {
   const input = messages.filter((value) => {
-    const message = object10(value);
+    const message = object11(value);
     return !((message?.role === "bashExecution" || message?.role === "pythonExecution") && message.excludeFromContext === true);
   });
   if (host === "pi")
@@ -36995,7 +37087,7 @@ function projectMissingToolResults(messages, model, host = "omp") {
   const realResults = new Map;
   const validToolUseIds = new Set;
   const deduplicated = input.map((value, index) => {
-    const message = object10(value);
+    const message = object11(value);
     if (message?.role === "toolResult" && typeof message.toolCallId === "string") {
       let key = pairingId(message.toolCallId);
       let output = value;
@@ -37022,7 +37114,7 @@ function projectMissingToolResults(messages, model, host = "omp") {
     const touched = new Set;
     let changed = false;
     const content = message.content.map((part) => {
-      const block = object10(part);
+      const block = object11(part);
       if (block?.type !== "toolCall" || typeof block.id !== "string")
         return part;
       const key = pairingId(block.id);
@@ -37101,7 +37193,7 @@ function projectMissingToolResults(messages, model, host = "omp") {
   };
   for (let index = 0;index < deduplicated.length; index++) {
     const value = deduplicated[index];
-    const message = object10(value);
+    const message = object11(value);
     if (message?.role === "assistant") {
       flush(message.timestamp);
       if (piOmitsTruncatedAssistant(message))
@@ -37142,7 +37234,7 @@ function projectMissingToolResults(messages, model, host = "omp") {
     if (pending.some((call) => !answered.has(pairingId(call.id))) || aborted.size > 0)
       continue;
     const parts = message.content.flatMap((value) => {
-      const part = object10(value);
+      const part = object11(value);
       return part?.type === "text" && typeof part.text === "string" && part.text.trim() ? [part.text] : [];
     });
     if (!parts.length)
@@ -37170,11 +37262,11 @@ function projectUnmodeledToolResults(messages) {
     return pipe > 0 ? id.slice(0, pipe) : id;
   };
   for (const value of messages) {
-    const message = object10(value);
+    const message = object11(value);
     if (message?.role !== "assistant" || !Array.isArray(message.content))
       continue;
     for (const value of message.content) {
-      const block = object10(value);
+      const block = object11(value);
       if (block?.type !== "toolCall" || typeof block.id !== "string")
         continue;
       if ([
@@ -37190,7 +37282,7 @@ function projectUnmodeledToolResults(messages) {
   const pairingId = (id) => !opaqueIds.has(id) && responsesComponents.has(component(id)) ? component(id) : id;
   const lastResult = new Map;
   messages.forEach((value, index) => {
-    const message = object10(value);
+    const message = object11(value);
     if (message?.role === "toolResult" && typeof message.toolCallId === "string")
       lastResult.set(pairingId(message.toolCallId), index);
   });
@@ -37221,7 +37313,7 @@ function projectUnmodeledToolResults(messages) {
   };
   for (let index = 0;index < messages.length; index++) {
     const value = messages[index];
-    const message = object10(value);
+    const message = object11(value);
     if ((message?.role === "bashExecution" || message?.role === "pythonExecution") && message.excludeFromContext === true)
       continue;
     if (message?.role !== "toolResult")
@@ -37263,7 +37355,7 @@ function projectPiToolResults(messages) {
     held.length = 0;
   };
   for (const value of messages) {
-    const message = object10(value);
+    const message = object11(value);
     const role = message?.role;
     if (role === "assistant") {
       close(message?.timestamp);
@@ -37291,23 +37383,26 @@ function projectPiToolResults(messages) {
   close();
   return projected;
 }
-function preparePiDispatch(messages, model, omp) {
+function preparePiDispatch(messages, model, omp, cwd) {
   let output = messages;
   const structure = buildPiPreparedStructure(messages, model, omp ? (index, source) => {
-    if (object10(source.providerPayload)?.type !== "openaiResponsesHistory")
+    if (object11(source.providerPayload)?.type !== "openaiResponsesHistory")
       return;
     if (output === messages)
       output = messages.slice();
     const { providerPayload: _payload, ...copy } = source;
     output[index] = copy;
   } : undefined, omp ? "omp" : "pi");
+  const reminders = structure && dateReminderPlans.get(structure);
+  if (reminders)
+    reminders.cwd = cwd;
   return { messages: output, structure };
 }
 function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
   if (!messages.length || messages.length > MAX_MESSAGES)
     return;
   for (let index = 0;index < messages.length; index++) {
-    const source = object10(messages[index]);
+    const source = object11(messages[index]);
     if (source?.role === "user" || source?.role === "compactionSummary")
       prepareUser?.(index, source);
   }
@@ -37319,11 +37414,12 @@ function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
   const toolIds = new Map;
   const responsesToolIds = new Map;
   const byIndex = new Map;
+  let firstUserRow;
   const imageBudget = piImageBudgetPlan(model);
   let valid = true;
   for (let index = 0;index < projectedMessages.length; index++) {
     const message = projectedMessages[index];
-    const source = object10(message);
+    const source = object11(message);
     if (rows.length === 0 && (source?.role === "system" || source?.role === "developer"))
       continue;
     if ((source?.role === "bashExecution" || source?.role === "pythonExecution") && source.excludeFromContext === true)
@@ -37347,7 +37443,7 @@ function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
       "azure-openai-responses",
       "openai-codex-responses"
     ].includes(model?.api ?? "") && (source?.role === "user" || source?.role === "developer") && (typeof source.content === "string" ? !source.content.trim() : Array.isArray(source.content) && !source.content.some((value) => {
-      const block = object10(value);
+      const block = object11(value);
       return block?.type === "image" || block?.type === "text" && typeof block.text === "string" && block.text.trim();
     })))
       continue;
@@ -37379,6 +37475,8 @@ function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
         row.wireResults = row.results.map((id) => toolIds.has(id) ? toolIds.get(id) : responsesToolIds.get(id.split("|", 1)[0]));
     }
     rows.push(row);
+    if (source?.role === "user")
+      firstUserRow ??= row;
     byIndex.set(index, row);
     piRecordImages(imageBudget, row, source);
   }
@@ -37389,12 +37487,12 @@ function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
   const positionedRows = [...byIndex];
   for (let position = positionedRows.length - 1;position >= 0; position--) {
     const [index, row] = positionedRows[position];
-    const source = object10(projectedMessages[index]);
+    const source = object11(projectedMessages[index]);
     if (!source)
       return;
     const content = source.content;
     const parts = typeof content === "string" ? [{ type: "text", text: content }] : content;
-    const textOnly = Array.isArray(parts) && parts.every((part) => object10(part)?.type === "text" && typeof object10(part)?.text === "string");
+    const textOnly = Array.isArray(parts) && parts.every((part) => object11(part)?.type === "text" && typeof object11(part)?.text === "string");
     const systemTexts = () => {
       const texts = parts.map((part) => part.text);
       return model?.api === "anthropic-messages" ? texts.filter((text) => text.trim()).map((text) => new TextDecoder().decode(new TextEncoder().encode(text))) : texts;
@@ -37402,7 +37500,7 @@ function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
     if (piIsDeveloperHistory(source) && source.attribution !== "user") {
       const previous = rows[position - 1];
       const next = rows[position + 1];
-      const anthropicPromotable = model?.api === "anthropic-messages" && object10(model.compat)?.supportsMidConversationSystem === true && textOnly;
+      const anthropicPromotable = model?.api === "anthropic-messages" && object11(model.compat)?.supportsMidConversationSystem === true && textOnly;
       if (anthropicPromotable)
         promotable.set(row, systemTexts());
       if (model?.api === "ollama-chat" || anthropicPromotable && (previous?.role === "user" || previous?.role === "toolResult") && (!next || next.role === "assistant"))
@@ -37493,7 +37591,7 @@ function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
     }
     return [row];
   });
-  return {
+  const prepared = {
     messages: rows,
     ...imageBudget?.count ? { imageBudget } : {},
     ...responsesApi && !responsesMessages ? { structuralSkipReason: "Responses history transform is not modeled" } : model?.api === "openai-completions" && !chatMessages ? { structuralSkipReason: "Chat history transform is not modeled" } : {},
@@ -37504,9 +37602,17 @@ function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
     ...modelsContinuePad ? { anthropicContinuePad: true } : {},
     ...modelsContinuePad && baseRows.some((row) => row.optionalThinking) ? { anthropicOptional: { rows: baseRows, promotable } } : {},
     ...model?.api?.startsWith("google-") ? {
-      googleFunctionIds: object10(model.compat)?.supportsFunctionPartId === true
+      googleFunctionIds: object11(model.compat)?.supportsFunctionPartId === true
     } : {}
   };
+  if (host === "omp" && PI_DATE_REMINDER_APIS.has(model?.api ?? ""))
+    dateReminderPlans.set(prepared, {
+      ...modelsContinuePad ? { plan: { rows: baseRows, promotable } } : {},
+      firstUser: firstUserRow ? baseRows.indexOf(firstUserRow) : -1,
+      midConversationSystem: object11(model?.compat)?.supportsMidConversationSystem === true,
+      developerRole: object11(model?.compat)?.supportsDeveloperRole === true
+    });
+  return prepared;
 }
 function responsesLane(api) {
   return [
@@ -37516,7 +37622,7 @@ function responsesLane(api) {
   ].includes(api ?? "");
 }
 function payloadStructure(payload, ollama = false, responsesItems = false, imageProjection = false) {
-  const body = object10(payload);
+  const body = object11(payload);
   if (!body)
     return;
   const google = piGoogleConversation(payload);
@@ -37531,12 +37637,12 @@ function payloadStructure(payload, ollama = false, responsesItems = false, image
     return;
   const rows = [];
   for (const value of messages) {
-    const message = object10(value);
+    const message = object11(value);
     if (!message)
       return;
     if (rows.length === 0 && (message.role === "system" || message.role === "developer"))
       continue;
-    if (message.role === "system" && Array.isArray(message.content) && message.content.every((block) => ["tool_addition", "tool_removal"].includes(String(object10(block)?.type))))
+    if (message.role === "system" && Array.isArray(message.content) && message.content.every((block) => ["tool_addition", "tool_removal"].includes(String(object11(block)?.type))))
       continue;
     if (responses && message.type === "reasoning")
       continue;
@@ -37593,7 +37699,7 @@ function payloadStructure(payload, ollama = false, responsesItems = false, image
       continue;
     }
     if (message.role === "user" && Array.isArray(message.content)) {
-      const results = message.content.filter((block) => object10(block)?.type === "tool_result" || bedrock && object10(block)?.toolResult);
+      const results = message.content.filter((block) => object11(block)?.type === "tool_result" || bedrock && object11(block)?.toolResult);
       if (results.length) {
         for (const block of results) {
           const id = bedrock ? block.toolResult?.toolUseId : block.tool_use_id;
@@ -37640,11 +37746,11 @@ function payloadStructure(payload, ollama = false, responsesItems = false, image
     }
     if (Array.isArray(message.tool_calls)) {
       for (const call of message.tool_calls) {
-        const source = object10(call);
+        const source = object11(call);
         if (!source)
           return;
         if (source.id === undefined && ollama) {
-          const fn = object10(source.function);
+          const fn = object11(source.function);
           if (typeof fn?.name !== "string")
             return;
           row.calls.push("");
@@ -37680,7 +37786,7 @@ function googleStructure(contents, imageProjection = false) {
     return;
   const rows = [];
   for (const value of contents) {
-    const message = object10(value);
+    const message = object11(value);
     if (!message || !Array.isArray(message.parts))
       return;
     if (message.role !== "user" && message.role !== "model")
@@ -37695,11 +37801,11 @@ function googleStructure(contents, imageProjection = false) {
     };
     const results = [];
     for (const value of message.parts) {
-      const part = object10(value);
+      const part = object11(value);
       if (!part)
         return;
       if (part.functionCall) {
-        const call = object10(part.functionCall);
+        const call = object11(part.functionCall);
         if (row.role !== "assistant" || typeof call?.name !== "string" || call.id !== undefined && typeof call.id !== "string")
           return;
         row.calls.push(call.id ?? "");
@@ -37707,7 +37813,7 @@ function googleStructure(contents, imageProjection = false) {
         row.callNames.push(call.name);
       }
       if (part.functionResponse) {
-        const result = object10(part.functionResponse);
+        const result = object11(part.functionResponse);
         if (row.role !== "user" || typeof result?.name !== "string" || result.id !== undefined && typeof result.id !== "string")
           return;
         results.push({
@@ -37741,11 +37847,11 @@ function matchesUserText(content, text, api, responses, googleOrBedrock) {
   if (responses || googleOrBedrock) {
     if (!Array.isArray(content) || content.length !== 1)
       return false;
-    const block = object10(content[0]);
+    const block = object11(content[0]);
     return !!block && block.text === text && (responses ? block.type === "input_text" : Object.keys(block).length === 1);
   }
   if ((api === "anthropic-messages" || api === "factory-droid-agent") && Array.isArray(content)) {
-    const block = content.length === 1 ? object10(content[0]) : undefined;
+    const block = content.length === 1 ? object11(content[0]) : undefined;
     return block?.type === "text" && block.text === text;
   }
   return content === text;
@@ -37798,7 +37904,7 @@ function trimPreparedImageRows(rows, budget, drops) {
   flush();
   return projected;
 }
-function countAnthropicOptionalAlignments(plan, base, wire, compare) {
+function countAnthropicOptionalAlignments(plan, base, wire, compare, reminders, firstUser = -1) {
   const pad = {
     role: "user",
     calls: [],
@@ -37830,11 +37936,16 @@ function countAnthropicOptionalAlignments(plan, base, wire, compare) {
     const place = (next) => {
       if (current < 0)
         return at;
-      const nextRole = next === undefined ? undefined : role(next);
+      let after = at + 1;
+      while (after < wire.length && reminders?.has(wire[after]))
+        after++;
+      const controls = after > at + 1;
+      if (controls && (firstUser < 0 || current < firstUser))
+        return;
+      const nextRole = controls ? wire[at + 1].role : next === undefined ? undefined : role(next);
       if (!matches(final(current, previous, nextRole), at))
         return;
-      let after = at + 1;
-      if (role(current) === "assistant" && nextRole === "assistant") {
+      if (!controls && role(current) === "assistant" && nextRole === "assistant") {
         if (!matches(pad, after))
           return;
         after++;
@@ -37844,7 +37955,7 @@ function countAnthropicOptionalAlignments(plan, base, wire, compare) {
     for (let next = current + 1;next < base.length; next++) {
       const after = place(next);
       if (after !== undefined)
-        add(next, current < 0 ? undefined : role(current), after, count);
+        add(next, current < 0 ? undefined : wire[after - 1]?.role, after, count);
       if (!base[next].optionalThinking)
         return;
     }
@@ -37854,7 +37965,7 @@ function countAnthropicOptionalAlignments(plan, base, wire, compare) {
       return;
     }
     const after = place(undefined);
-    if (after === wire.length || after === wire.length - 1 && role(current) === "assistant" && isAnthropicContinuePadRow(wire[after]))
+    if (after === wire.length || after === wire.length - 1 && wire[after - 1]?.role === "assistant" && isAnthropicContinuePadRow(wire[after]))
       complete = Math.min(2, complete + count);
   };
   advance(-1, undefined, 0, 1);
@@ -37872,6 +37983,70 @@ function countAnthropicOptionalAlignments(plan, base, wire, compare) {
   return complete;
 }
 function piPreparedStructureMismatch(payload, prepared, onImageTrim) {
+  const plan = prepared && dateReminderPlans.get(prepared);
+  try {
+    const messages = plan ? object11(payload)?.messages : undefined;
+    if (Array.isArray(messages)) {
+      for (const value of messages) {
+        const message = object11(value);
+        if (message?.role !== "system" && message?.role !== "developer")
+          break;
+        if (piDateReminderWireText(message.content, plan?.cwd) !== undefined)
+          return "comparison=role";
+      }
+    }
+  } catch {}
+  const mismatch = preparedStructureMismatch(payload, prepared, onImageTrim);
+  if (!mismatch)
+    return mismatch;
+  try {
+    if (!prepared || !plan)
+      return mismatch;
+    if (!plan.plan) {
+      if (plan.firstUser < 0)
+        return mismatch;
+      const root = prepared.messages[plan.firstUser];
+      const body = object11(payload);
+      const routeRows = Array.isArray(body?.input) ? prepared.responsesMessages ?? prepared.messages : prepared.api === "openai-completions" ? prepared.chatMessages ?? prepared.messages : prepared.messages;
+      const firstUser = routeRows.indexOf(root);
+      if (firstUser < 0)
+        return mismatch;
+      const filtered = piWithoutDateReminders(payload, prepared.api ?? "", plan.cwd, plan.developerRole, (prefix) => {
+        const rows = payloadStructure(prefix, prepared.api === "ollama-chat", !!prepared.responsesMessages);
+        return !!rows && rows.length > firstUser;
+      });
+      return filtered === undefined ? mismatch : preparedStructureMismatch(filtered, prepared, onImageTrim);
+    }
+    const messages = object11(payload)?.messages;
+    if (!Array.isArray(messages))
+      return mismatch;
+    for (const value of messages) {
+      const message = object11(value);
+      if (piDateReminderWireText(message?.content, plan.cwd) !== undefined && Object.keys(message ?? {}).some((key) => !["role", "content"].includes(key)))
+        return mismatch;
+    }
+    const wire = payloadStructure(payload, false, false, !!prepared.imageBudget && piWireImageCount(payload) < prepared.imageBudget.count);
+    if (!wire)
+      return mismatch;
+    const reminders = new Set(wire.filter((row) => piDateReminderWireText(row.wireContent, plan.cwd) !== undefined));
+    if (!reminders.size)
+      return mismatch;
+    for (let index = 0;index < wire.length; index++) {
+      const row = wire[index];
+      if (!reminders.has(row))
+        continue;
+      const previous = wire[index - 1];
+      const next = wire[index + 1];
+      const promoted = plan.midConversationSystem && (previous?.role === "user" || previous?.role === "toolResult") && (!next || next.role === "assistant");
+      if (row.wireRole !== (promoted ? "system" : "user") || row.calls.length || row.results.length)
+        return mismatch;
+    }
+    return preparedStructureMismatch(payload, { ...prepared, anthropicOptional: plan.plan }, onImageTrim, reminders, wire, plan.firstUser);
+  } catch {
+    return mismatch;
+  }
+}
+function preparedStructureMismatch(payload, prepared, onImageTrim, reminders, reminderWire, firstUser) {
   let stage = "image count";
   let row = 0;
   let expectedRows;
@@ -37886,10 +38061,10 @@ function piPreparedStructureMismatch(payload, prepared, onImageTrim) {
       return "comparison=image count";
     const imageProjection = trimmed > 0;
     stage = "wire rows";
-    const body = object10(payload);
+    const body = object11(payload);
     const ollama = prepared?.api === "ollama-chat" && !!body && Array.isArray(body.messages) && body.input === undefined && body.system === undefined && body.inferenceConfig === undefined;
     const responses = body?.messages === undefined && Array.isArray(body?.input);
-    rows = payloadStructure(payload, ollama, responses && !!prepared?.responsesMessages, imageProjection);
+    rows = reminderWire ?? payloadStructure(payload, ollama, responses && !!prepared?.responsesMessages, imageProjection);
     const chat = !!body && Array.isArray(body.messages) && (prepared?.api === "openai-completions" || body.system === undefined) && body.input === undefined && body.inferenceConfig === undefined;
     stage = "prepared rows";
     expectedRows = responses && prepared?.responsesMessages ? prepared.responsesMessages : chat && prepared?.chatMessages ? prepared.chatMessages : prepared?.messages;
@@ -37913,7 +38088,7 @@ function piPreparedStructureMismatch(payload, prepared, onImageTrim) {
       if (expected.systemText !== undefined) {
         const texts = expected.systemText;
         const content = actual.wireContent;
-        const actualTexts = typeof content === "string" ? [content] : Array.isArray(content) && content.every((part) => object10(part)?.type === "text" && typeof object10(part)?.text === "string") ? content.map((part) => part.text) : undefined;
+        const actualTexts = typeof content === "string" ? [content] : Array.isArray(content) && content.every((part) => object11(part)?.type === "text" && typeof object11(part)?.text === "string") ? content.map((part) => part.text) : undefined;
         if (!actualTexts || (typeof content === "string" ? content !== texts.join(`
 `) : JSON.stringify(actualTexts) !== JSON.stringify(texts)))
           return "content";
@@ -37944,7 +38119,7 @@ function piPreparedStructureMismatch(payload, prepared, onImageTrim) {
     };
     if (optionalPlan) {
       stage = "optional assistants";
-      const alignments = countAnthropicOptionalAlignments(optionalPlan, imageProjection && imageBudget ? trimPreparedImageRows(optionalPlan.rows, imageBudget, trimmed) : optionalPlan.rows, rows, compareRow);
+      const alignments = countAnthropicOptionalAlignments(optionalPlan, imageProjection && imageBudget ? trimPreparedImageRows(optionalPlan.rows, imageBudget, trimmed) : optionalPlan.rows, rows, compareRow, reminders, firstUser);
       if (alignments > 1)
         return structureDetail(0, expectedRows, rows, "alignment");
       if (alignments === 1) {
@@ -39704,7 +39879,7 @@ function registerPiGuardedContext(pi, handler, options = {}) {
       }
       const result = await budget.waitMandatory(Promise.resolve(withSqliteTurnDeadline2(() => Math.max(0, budget.remainingOutcome() - PI_CONTEXT_BUDGET.completionReserveMs), () => withSqliteTransformPass2(() => handler(event, ctx, budget)))));
       if (result?.messages) {
-        const prepared = preparePiDispatch(result.messages, fenceEnabled ? ctx.model : undefined, fenceEnabled);
+        const prepared = preparePiDispatch(result.messages, fenceEnabled ? ctx.model : undefined, fenceEnabled, ctx.cwd);
         if (prepared.messages !== result.messages)
           result.messages = prepared.messages;
         active.managedSignature = piManagedSignature(result.messages);
@@ -42883,7 +43058,7 @@ function createPiAssistantPart(working, messageIndex, partIndex, markDirty) {
     setToolOutput() {
       throw new Error("setToolOutput on assistant part");
     },
-    getToolMetadata() {
+    getToolMetadata(options) {
       const current = working[messageIndex].content;
       const p = current[partIndex];
       if (p?.type !== "toolCall") {
@@ -42894,7 +43069,7 @@ function createPiAssistantPart(working, messageIndex, partIndex, markDirty) {
       try {
         const serialized = JSON.stringify(p.arguments);
         inputByteSize = serialized.length;
-        inputTokenCount = serialized ? estimateTokens(serialized) : 0;
+        inputTokenCount = serialized && !options?.skipInputTokenCount ? estimateTokens(serialized) : 0;
       } catch {
         inputByteSize = 0;
         inputTokenCount = 0;
@@ -43255,6 +43430,7 @@ function buildPiTextIdentityPlan(db, sessionId, tagger, transcript, reuseCandida
       sourceCache.set(tagId, source);
   }
   const driftedMessageIds = new Set;
+  const reusableTextMessageIds = new Set;
   const legacyReminderTagNumbers = new Set;
   for (const [messageId, currentSources] of currentSourcesByMessageId) {
     const legacyRows = legacyRowsByMessageId.get(messageId) ?? [];
@@ -43282,6 +43458,8 @@ function buildPiTextIdentityPlan(db, sessionId, tagger, transcript, reuseCandida
     });
     if (!vectorMatches)
       driftedMessageIds.add(messageId);
+    else if (!messageId.startsWith("pi-msg-") && legacyRows.every((row) => sourceCache.has(row.tagId) && !legacyReminderTagNumbers.has(row.tagId)))
+      reusableTextMessageIds.add(messageId);
   }
   const reusableMessageIds = new Set;
   for (const messageId of reuseCandidates) {
@@ -43292,7 +43470,8 @@ function buildPiTextIdentityPlan(db, sessionId, tagger, transcript, reuseCandida
     driftedMessageIds,
     legacyReminderTagNumbers,
     reusableMessageIds,
-    sourceCache
+    sourceCache,
+    reusableTextMessageIds
   };
 }
 var piBranchProjectionBySession = new Map;
@@ -44746,6 +44925,27 @@ function registerPiContextHandler(pi, baseOptions) {
     }
     return s;
   };
+  pi.on("session_tree", (event, ctx) => {
+    if (event.oldLeafId === event.newLeafId)
+      return;
+    const sessionId = resolveSessionId2(ctx);
+    if (!sessionId)
+      return;
+    let entries = [];
+    let offset = 0;
+    scheduleClearAndReindex(baseOptions.db, sessionId, {
+      prepare: async () => {
+        if (resolveSessionId2(ctx) !== sessionId)
+          return false;
+        entries = ctx.sessionManager.getBranch();
+        const alignment = resolvePiOrdinalAlignment(baseOptions.db, sessionId, entries);
+        offset = alignment.offset;
+        return !isPiOrdinalAlignmentUnanchored(alignment);
+      },
+      getCount: () => countPiRawMessages(entries, offset),
+      readPage: (_session, after, limit, watermark) => convertEntriesToRawMessagePage(entries, after, limit, watermark, offset)
+    });
+  });
   pi.on("thinking_level_select", async (event, ctx) => {
     if (event.previousLevel === event.level)
       return;
@@ -44839,7 +45039,7 @@ function registerPiContextHandler(pi, baseOptions) {
       withoutSqliteTransformPass2(() => options.maybeAutoEmbedSession?.(sessionId, projectDirectory, projectIdentity));
       if (!options.compactionOff) {
         budget.stage = "tag snapshot hydration";
-        const hydration = ensurePiTagSnapshotReady(options.db, sessionId, budget);
+        const hydration = ensurePiTagSnapshotReady(options.db, sessionId, budget, "pass");
         if (hydration)
           await guardAwait(hydration);
       }
@@ -46071,7 +46271,7 @@ function registerPiContextHandler(pi, baseOptions) {
         budget.failureReason = err.message;
         if (sessionIdForError) {
           try {
-            prewarmPiTagSnapshot(lkgOptions.db, sessionIdForError);
+            prewarmPiTagSnapshot(lkgOptions.db, sessionIdForError, "pass");
           } catch {}
         }
         throw err;
@@ -46137,7 +46337,7 @@ function registerPiContextHandler(pi, baseOptions) {
               })
             });
             assertPiTagSnapshotReady(lkgOptions.db, sessionIdForError);
-            const drops = getPiTagSnapshotView(lkgOptions.db, sessionIdForError).filter((tag) => tag.status === "dropped");
+            const drops = projectPiReplayDrops(recoveryTranscript, getPiPassTagSnapshotView(lkgOptions.db, sessionIdForError));
             const changed = applyFlushedStatuses(sessionIdForError, lkgOptions.db, buildPersistedDropTargets(recoveryTranscript, drops, {
               allowReasoningPrefixRewrite: true
             }), drops);
@@ -47136,6 +47336,21 @@ async function runPipeline(args) {
   try {
     nativeRemovalInputs = getNativeReplayState(args.db, args.sessionId).toolInputs;
   } catch {}
+  const removalBatch = (edit) => withPiToolRemovalBatch({ db: args.db, sessionId: args.sessionId, saved: nativeRemovalInputs }, edit);
+  const applyToolRemovalGroup = (edit) => {
+    const savedRemovalInputs = nativeRemovalInputs;
+    nativeRemovalInputs = savedRemovalInputs && new Map(savedRemovalInputs);
+    try {
+      return args.db.transaction(() => removalBatch((flush) => {
+        const result = edit();
+        flush();
+        return result;
+      })).immediate();
+    } catch (cause) {
+      nativeRemovalInputs = savedRemovalInputs;
+      throw cause instanceof PiToolRemovalBatchError ? cause : new PiToolRemovalBatchError(cause);
+    }
+  };
   const tTranscriptBuild = performance.now();
   const transcript = createPiTranscript(args.messages, args.sessionId, args.messages.map(stableIdResolver), {
     preserveReasoningToolArcs: args.reasoningClearing?.preserveReasoningToolArcs,
@@ -47328,6 +47543,7 @@ async function runPipeline(args) {
       preserveTagOnlyAssistantText: true,
       entryFingerprintByMessageId,
       reuseMessageIds: textIdentityPlan.reusableMessageIds,
+      reuseTextMessageIds: textIdentityPlan.reusableTextMessageIds,
       textIdentityDriftMessageIds: textIdentityPlan.driftedMessageIds,
       textIdentitySourceCache: textIdentityPlan.sourceCache,
       textTokenCache: tagTextTokenCache,
@@ -47408,21 +47624,40 @@ async function runPipeline(args) {
       message.content = content;
     });
   }
+  const tLegacyToolConversion = performance.now();
   if (foldBustsServedPrefixThisPass) {
+    const savedRemovalInputs = nativeRemovalInputs;
     try {
+      nativeRemovalInputs = savedRemovalInputs && new Map(savedRemovalInputs);
       let converted = 0;
-      args.db.transaction(() => {
+      args.db.transaction(() => removalBatch((flush) => {
         converted = convertLegacyToolSkeletons(args.db, args.sessionId, targets, {
-          keepFullDrop: (callId) => nativeRemovalInputs === undefined || callId !== null && nativeRemovalInputs.get(callId) === NATIVE_TOOL_REMOVAL_MARKER
+          prepareRemovals: (rows) => preparePiToolRemovalChecks({
+            db: args.db,
+            rows,
+            targets,
+            messages: args.messages,
+            prepare: transcript.prepareToolRemovalMeasurements
+          }),
+          keepFullDrop: (callId) => nativeRemovalInputs === undefined || callId !== null && authorizePiToolRemoval({
+            db: args.db,
+            sessionId: args.sessionId,
+            callId,
+            saved: nativeRemovalInputs,
+            canApply: false
+          }) === true
         }).size;
-      }).immediate();
+        flush();
+      })).immediate();
       if (converted > 0) {
         sessionLog2(args.sessionId, `pi HARD fold converted ${converted} legacy dropped-tool skeleton(s) to real-or-absent`);
       }
     } catch (error) {
+      nativeRemovalInputs = savedRemovalInputs;
       sessionLog2(args.sessionId, `pi legacy dropped-tool skeleton conversion failed (kept legacy bytes): ${error instanceof Error ? error.message : String(error)}`);
     }
   }
+  logTransformTiming(args.sessionId, "convertLegacyToolSkeletons", tLegacyToolConversion);
   try {
     if (!args.sessionMeta.isSubagent) {
       const hasRecentCommit = detectRecentCommit(args.messages);
@@ -47440,7 +47675,9 @@ async function runPipeline(args) {
   const deferredHistoryRefreshWasPending = deferredHistoryWasPendingAtPassStart;
   const shouldReadPendingOps = !args.compactionOff && (publishedWorkDrainAllowed || args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal || foldExecutedThisPass || firstRenderBust);
   const pendingOps = shouldReadPendingOps ? getPendingOps(args.db, args.sessionId) : [];
+  const tReclaimDistance = performance.now();
   const reclaimDistance = isCacheBustingPass ? toolReclaimDistanceEntries(mutationView, targets) : [];
+  logTransformTiming(args.sessionId, "toolReclaimDistanceEntries", tReclaimDistance);
   const protectedToolTags = protectedToolTagNumbers(getActiveTagsBySession2(args.db, args.sessionId), args.protectedTools);
   for (const number of identityAdoption.protectedTagNumbers)
     protectedToolTags.add(number);
@@ -47477,13 +47714,14 @@ async function runPipeline(args) {
         try {
           nativeRemovalInputs = saved && new Map(saved);
           probingExecuteRemoval = true;
-          args.db.transaction(() => {
+          args.db.transaction(() => removalBatch((flush) => {
             for (const [number, target] of targets) {
               if (target.prepareDrop?.() !== false)
                 allowed.add(number);
             }
+            flush();
             throw rollback;
-          }).immediate();
+          })).immediate();
         } catch (error) {
           if (error !== rollback)
             allowed.clear();
@@ -47522,13 +47760,13 @@ async function runPipeline(args) {
     pendingDecisionLogObserverForTests?.(pendingDecisionLog);
     try {
       const tApplyPending = performance.now();
-      pendingOpsDidMutate = applyPendingOperations(args.sessionId, args.db, newTargets, new Set([
+      pendingOpsDidMutate = applyToolRemovalGroup(() => applyPendingOperations(args.sessionId, args.db, newTargets, new Set([
         ...args.contextUsage.percentage >= 95 ? [] : protectedTagNumbersForPass,
         ...protectedToolTags,
         ...identityAdoption.protectedTagNumbers
       ]), pendingOperationTags, pendingOps, [], new Set, (reduction) => droppedTokenReductions.push(reduction), undefined, (eligible) => {
         eligiblePendingDropTagIds = eligible;
-      });
+      }));
       if (pendingOpsDidMutate) {
         droppedCount += pendingOps.length;
       }
@@ -47558,7 +47796,26 @@ async function runPipeline(args) {
   const flushedDroppedTags = getDroppedTagsByNumbers2(args.db, args.sessionId, targetTagNumbers);
   logTransformTiming(args.sessionId, "getDroppedTagsByNumbers", tGetTags, `targets=${targetTagNumbers.length} fetched=${flushedDroppedTags.length}`);
   const tFlushed = performance.now();
-  runPersistedReplayStage("flushed-status-failure", undefined, () => applyFlushedStatuses(args.sessionId, args.db, targets, flushedDroppedTags));
+  runPersistedReplayStage("flushed-status-failure", undefined, () => {
+    const render = () => applyFlushedStatuses(args.sessionId, args.db, targets, flushedDroppedTags);
+    const savedRemovalInputs = nativeRemovalInputs;
+    const needsRemovalPreparation = savedRemovalInputs !== undefined && flushedDroppedTags.some((tag) => tag.type === "tool" && tag.dropMode === "full" && savedRemovalInputs.get(tag.messageId) !== NATIVE_TOOL_REMOVAL_MARKER);
+    if (!isCacheBustingPass || !needsRemovalPreparation)
+      return render();
+    try {
+      nativeRemovalInputs = savedRemovalInputs && new Map(savedRemovalInputs);
+      return args.db.transaction(() => removalBatch((flush) => {
+        prepareFlushedToolRemovals(targets, flushedDroppedTags);
+        flush();
+        return render();
+      })).immediate();
+    } catch (error) {
+      nativeRemovalInputs = savedRemovalInputs;
+      if (error instanceof PiToolRemovalBatchError)
+        return render();
+      throw error;
+    }
+  });
   logTransformTiming(args.sessionId, "applyFlushedStatuses", tFlushed);
   logTransformTiming(args.sessionId, "batchFinalize:flushed", tFlushed);
   const messageIdToMaxTag = buildMessageIdToMaxTag(targets);
@@ -47607,7 +47864,7 @@ async function runPipeline(args) {
   let routineCleanupApplied = false;
   let heuristicsResult = null;
   const tActiveTags = performance.now();
-  const allTagsForPass = getPiTagSnapshotView(args.db, args.sessionId);
+  const allTagsForPass = getPiPassTagSnapshotView(args.db, args.sessionId);
   const activeTags = getPiActiveTagSnapshotView(args.db, args.sessionId, allTagsForPass);
   logTransformTiming(args.sessionId, "getTagsBySessionSnapshot", tActiveTags, `all=${allTagsForPass.length} active=${activeTags.length}`);
   if (shouldRunHeuristics) {
@@ -47629,7 +47886,7 @@ async function runPipeline(args) {
         clearEmergencyDropSample(args.db, args.sessionId);
       }
       routineCleanupApplied = (emergencyDropEligible ? args.contextUsage.percentage >= 95 || getEmergencyInputSample(args.db, args.sessionId) === 0 : args.sessionMeta.isSubagent || !routinePressureAlreadyApplied) || hasPendingMaterializeSignal || rideSignals.explicitFlush || deferredMaterialize || independentMutationBeforeHeuristics;
-      heuristicsResult = applyPiHeuristicCleanup(args.sessionId, args.db, newTargets, args.messages, {
+      heuristicsResult = applyToolRemovalGroup(() => applyPiHeuristicCleanup(args.sessionId, args.db, newTargets, args.messages, {
         protectedTags: args.protectedTags,
         prepareToolRemovalMeasurements: transcript.prepareToolRemovalMeasurements,
         protectedToolTags,
@@ -47643,18 +47900,18 @@ async function runPipeline(args) {
           usagePercentage: args.contextUsage.percentage,
           passAlreadyPriced: independentMutationBeforeHeuristics
         } : undefined,
-        caveman: args.isSubagent ? undefined : args.heuristics.caveman
-      }, activeTags, stableIdResolver);
+        caveman: args.isSubagent ? undefined : args.heuristics?.caveman
+      }, activeTags, stableIdResolver));
       if (!routineCleanupApplied && heuristicsResult.emergencyDroppedTools > 0) {
-        const ridingCleanup = applyPiHeuristicCleanup(args.sessionId, args.db, newTargets, args.messages, {
+        const ridingCleanup = applyToolRemovalGroup(() => applyPiHeuristicCleanup(args.sessionId, args.db, newTargets, args.messages, {
           protectedTags: args.protectedTags,
           protectedToolTags,
           protectedCutoff: usesTokenProtection ? protectionWindowForPass.cutoff : undefined,
           routine: true,
           staleReduceStripEnabled: true,
           onStaleReduceEdit: recordStaleReduceEdit,
-          caveman: args.isSubagent ? undefined : args.heuristics.caveman
-        }, getActiveTagsBySession2(args.db, args.sessionId), stableIdResolver);
+          caveman: args.isSubagent ? undefined : args.heuristics?.caveman
+        }, getActiveTagsBySession2(args.db, args.sessionId), stableIdResolver));
         heuristicsResult = {
           droppedTools: heuristicsResult.droppedTools + ridingCleanup.droppedTools,
           deduplicatedTools: heuristicsResult.deduplicatedTools + ridingCleanup.deduplicatedTools,
@@ -47693,6 +47950,8 @@ async function runPipeline(args) {
       }
       logTransformTiming(args.sessionId, "applyHeuristicCleanup", tHeuristic, `droppedTools=${heuristicsResult.droppedTools} deduplicatedTools=${heuristicsResult.deduplicatedTools} droppedInjections=${heuristicsResult.droppedInjections} staleReduce=${heuristicsResult.droppedStaleReduceCalls} compressedTextTags=${heuristicsResult.compressedTextTags} mutatedTextTags=${heuristicsResult.mutatedTextTags}`);
     } catch (err) {
+      if (err instanceof PiToolRemovalBatchError)
+        throw err;
       sessionLog2(args.sessionId, `heuristic cleanup failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
     }
   }
@@ -47831,7 +48090,7 @@ async function runPipeline(args) {
     }
     autoReclaimTargetCount = syntheticPendingOps.length;
     if (syntheticPendingOps.length > 0) {
-      autoReclaimDidMutate = applyPendingOperations(args.sessionId, args.db, newTargets, protectedTagNumbersForPass, undefined, [], syntheticPendingOps, editMarkerTagIds, (reduction) => droppedTokenReductions.push(reduction));
+      autoReclaimDidMutate = applyToolRemovalGroup(() => applyPendingOperations(args.sessionId, args.db, newTargets, protectedTagNumbersForPass, undefined, [], syntheticPendingOps, editMarkerTagIds, (reduction) => droppedTokenReductions.push(reduction)));
       if (autoReclaimDidMutate) {
         droppedCount += syntheticPendingOps.length;
         autoReclaimDidMutateThisPass = true;
@@ -47852,10 +48111,7 @@ async function runPipeline(args) {
             noteImagePosition(message.info.id, tagNumber);
         }
       }
-      const imageToolTags = new Map(allTagsForPass.filter((tag) => tag.type === "tool").map((tag) => [
-        `${tag.toolOwnerMessageId ?? ""}\x00${tag.messageId}`,
-        tag.tagNumber
-      ]));
+      const imageToolCoordinates = [];
       const imageToolOwners = new Map;
       for (let index = 0;index < workingMessages.length; index++) {
         const message = workingMessages[index];
@@ -47865,12 +48121,26 @@ async function runPipeline(args) {
             if (part.type !== "toolCall")
               continue;
             imageToolOwners.set(part.id, id ?? "");
-            noteImagePosition(id, imageToolTags.get(`${id ?? ""}\x00${part.id}`) ?? 0);
+            imageToolCoordinates.push({ id, key: `${id ?? ""}\x00${part.id}` });
           }
         } else if (message.role === "toolResult") {
-          noteImagePosition(id, imageToolTags.get(`${imageToolOwners.get(message.toolCallId) ?? ""}\x00${message.toolCallId}`) ?? 0);
+          imageToolCoordinates.push({
+            id,
+            key: `${imageToolOwners.get(message.toolCallId) ?? ""}\x00${message.toolCallId}`
+          });
         }
       }
+      const imageToolKeys = new Set(imageToolCoordinates.map(({ key }) => key));
+      const imageToolTags = new Map;
+      for (const tag of allTagsForPass) {
+        if (tag.type !== "tool")
+          continue;
+        const key = `${tag.toolOwnerMessageId ?? ""}\x00${tag.messageId}`;
+        if (imageToolKeys.has(key))
+          imageToolTags.set(key, tag.tagNumber);
+      }
+      for (const { id, key } of imageToolCoordinates)
+        noteImagePosition(id, imageToolTags.get(key) ?? 0);
       const protectedImageToolKeys = new Set(activeTags.filter((tag) => tag.type === "tool" && protectedToolTags.has(tag.tagNumber)).map((tag) => tag.toolOwnerMessageId ? `${tag.toolOwnerMessageId}\x00${tag.messageId}` : tag.messageId));
       const imageResult = stripPiProcessedImages({
         db: args.db,
@@ -48205,7 +48475,7 @@ async function runPipeline(args) {
     onAdopt: (message) => sessionLog2(args.sessionId, message)
   });
   protectionFloorResolution = resolveProtectionFloor();
-  const protectedTagNumbers = usesTokenProtection ? computeProtectionWindow(allTagsForPass, protectionFloorResolution.floor, activeCalibration.toolsRatio).protectedTagNumbers : newestActiveTagNumbersByCount(activeTags, args.protectedTags);
+  const protectedTagNumbers = usesTokenProtection ? protectedPiPassTagNumbers(allTagsForPass, protectionFloorResolution.floor, activeCalibration.toolsRatio) : newestActiveTagNumbersByCount(activeTags, args.protectedTags);
   const channelPendingOps = shouldApplyPendingOps ? getPendingOps(args.db, args.sessionId) : shouldReadPendingOps ? pendingOps : getPendingOps(args.db, args.sessionId);
   const channelBaselineSnapshot = {
     tagCacheKey: fallbackCache.index,
@@ -50892,7 +51162,7 @@ function buildStatusDetail(pi, ctx, deps, sessionId, state, host = readStatusHos
       enabled: deps.dreamer?.runnable === true,
       scheduleSummary: deps.dreamer?.scheduleSummary ?? null,
       lastRunAt: safeRead(() => getMostRecentTaskRunAt(deps.db, deps.projectIdentity), null),
-      backlog: safeRead(() => getDreamTaskBacklogs(deps.db, deps.projectIdentity, CANONICAL_DREAM_TASKS.filter((task) => deps.smartNotesEnabled !== false || task !== "evaluate-smart-notes")), {}),
+      backlog: safeRead(() => getDreamTaskBacklogs(deps.db, deps.projectIdentity, CANONICAL_DREAM_TASKS.filter((task) => deps.smartNotesEnabled !== false || task !== "evaluate-smart-notes"), { display: true }), {}),
       failures: safeRead(() => getFailingDreamTasks(deps.db, deps.projectIdentity).filter((state) => deps.smartNotesEnabled !== false || state.task !== "evaluate-smart-notes"), []),
       skipped: safeRead(() => getSkippedDreamTasks(deps.db, deps.projectIdentity).filter((task) => deps.smartNotesEnabled !== false || task !== "evaluate-smart-notes"), []),
       tickFailure: safeRead(() => getDreamerTickFailure(deps.db), null)
@@ -52775,7 +53045,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
         return;
       }
       const emptyHistorian = empty.find((chain) => chain.owner === "historian");
-      const historianLine = historian ? `registered historian trigger (model=${historian.model}${historian.fallbackModels?.length ? `, fallbacks=${historian.fallbackModels.join(",")}` : ""}, executeThreshold=${formatExecuteThresholdForLog(historian.executeThresholdPercentage)})` : emptyHistorian ? `registered historian trigger: DISABLED (no configured model is registered in Pi: ${formatEmptyPiModelChain(emptyHistorian)})` : undefined;
+      const historianLine = historian ? `registered historian trigger (model=${historian.model}${historian.fallbackModels?.length ? `, fallbacks=${historian.fallbackModels.map(formatPiModelForLog).join(",")}` : ""}, executeThreshold=${formatExecuteThresholdForLog(historian.executeThresholdPercentage)})` : emptyHistorian ? `registered historian trigger: DISABLED (no configured model is registered in Pi: ${formatEmptyPiModelChain(emptyHistorian)})` : undefined;
       if (historianLine && !loggedPiModelChainLines.has(historianLine)) {
         loggedPiModelChainLines.add(historianLine);
         info(historianLine);
@@ -52899,7 +53169,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
   registerPiCloneSessionTransitions(pi.on.bind(pi), {
     db,
     signalPendingMarker: signalPiDeferredCompactionMarkerDrain,
-    onInherited: (sessionId) => prewarmPiTagSnapshot(db, sessionId)
+    onInherited: (sessionId) => prewarmPiTagSnapshot(db, sessionId, "pass")
   });
   pi.on("session_start", async (event, ctx) => {
     bindStaleBuildNotice(ctx, import.meta.url);
@@ -52921,7 +53191,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
     await handlePiCloneSessionStart(event, ctx, {
       db,
       signalPendingMarker: signalPiDeferredCompactionMarkerDrain,
-      onInherited: (sessionId) => prewarmPiTagSnapshot(db, sessionId)
+      onInherited: (sessionId) => prewarmPiTagSnapshot(db, sessionId, "pass")
     });
     const sessionId = resolveSessionId(ctx);
     if (!piMarkerRehydrationLogged && pendingPiMarkerSessions.length > 0 && sessionId) {
@@ -52938,7 +53208,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
       });
     }
     if (sessionId)
-      prewarmPiTagSnapshot(db, sessionId);
+      prewarmPiTagSnapshot(db, sessionId, "pass");
   });
   pi.on("agent_start", (_event, ctx) => {
     setEmbeddingSessionBusy2(ctx.sessionManager.getSessionId(), true);
@@ -53514,7 +53784,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
     try {
       const incomingSessionId = readSessionId(ctx);
       if (incomingSessionId && _event?.reason !== "fork")
-        prewarmPiTagSnapshot(db, incomingSessionId);
+        prewarmPiTagSnapshot(db, incomingSessionId, "pass");
       if (!outgoingSessionId || outgoingSessionId === readSessionId(ctx))
         return;
       clearPiSystemPromptSession(outgoingSessionId);
@@ -53535,6 +53805,11 @@ function formatExecuteThresholdForLog(value) {
   const base = `${value.default}%`;
   return overrides.length > 0 ? `${base} (${overrides.join(", ")})` : base;
 }
+function formatPiModelForLog(entry) {
+  if (typeof entry === "string")
+    return entry;
+  return `${entry.model}${entry.qualifier ? ` (thinking_level=${entry.qualifier})` : ""}`;
+}
 export {
   __test,
   canonicalPiModelKey,